On Tue, 13 Dec 2011 00:02:28 +0100 "Rafael J. Wysocki" <rjw@xxxxxxx> wrote: > From: Rafael J. Wysocki <rjw@xxxxxxx> > > Commit 0d52f54e2ef64c189dedc332e680b2eb4a34590a (PCI / ACPI: Make > acpiphp ignore root bridges using PCIe native hotplug) added code > that made the acpiphp driver completely ignore PCIe root complexes > for which the kernel had been granted control of the native PCIe > hotplug feature by the BIOS through _OSC. Unfortunately, however, > this was a mistake, because on some systems there were PCI bridges > supporting PCI (non-PCIe) hotplug under such root complexes and > those bridges should have been handled by acpiphp. > > For this reason, revert the changes made by the commit mentioned > above and make register_slot() in drivers/pci/hotplug/acpiphp_glue.c > avoid registering hotplug slots for PCIe ports that belong to > root complexes with native PCIe hotplug enabled (which means that > the BIOS has granted the kernel control of this feature for the > given root complex). This is reported to address the original > issue fixed by commit 0d52f54e2ef64c189dedc332e680b2eb4a34590a and > to work on the system where that commit broke things. > > Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> > --- Applied to my for-linus branch. I'll probably send to Linus on Thu. or so. I also rebased the breakage out of linux-next. Thanks, -- Jesse Barnes, Intel Open Source Technology Center
Attachment:
signature.asc
Description: PGP signature
