Messages in this thread | | | Date | Mon, 17 Mar 2008 14:13:41 -0700 | From | Kristen Carlson Accardi <> | Subject | Re: [PATCH] pciehp dont enable slot unless forced |
| |
On Mon, 17 Mar 2008 16:04:23 -0400 Mark Lord <lkml@rtr.ca> wrote:
> This fixes a 2.6.25 regression reported by Alex Chiang. > > Invoke pciehp_enable_slot() at startup only when pciehp_force=1. > Some HP equipment apparently cannot cope with it otherwise. > > This restores the (previously working) 2.6.24 behaviour here, > while allowing machines that need a kick to use pciehp_force=1. > > This was the original design back in October 2007, > but Kristen suggested we try without it first: > > Kristen Carlson Accardi wrote: > >I think it would be ok to try allowing the slot to be enabled > >when not using pciehp_force mode. We can wrap it later if it > >proves to break things > > This ended up breaking one of Alex's setups, > so it's time to put the wrapper back in now. > > Signed-off-by: Mark Lord <mlord@pobox.com> > Acked-by: Alex Chiang <achiang@hp.com> > --- > > --- old/drivers/pci/hotplug/pciehp_core.c 2008-03-12 > 13:21:46.000000000 -0400 +++ > linux/drivers/pci/hotplug/pciehp_core.c 2008-03-12 > 13:23:54.000000000 -0400 @@ -467,7 +467,7 @@ t_slot = > pciehp_find_slot(ctrl, ctrl->slot_device_offset); > t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* > Check if slot is occupied */ > - if (value) { > + if (value && pciehp_force) { > rc = pciehp_enable_slot(t_slot); > if (rc) /* -ENODEV: shouldn't happen, but > deal with it */ value = 0; >
Acked-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
| |