On Mon, Apr 1, 2013 at 4:52 PM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote: > On Fri, Mar 29, 2013 at 11:04:48AM -0700, Yinghai Lu wrote: >> attatched -v3 again >> >> > Please check attached -v3. > > It's getting late in the v3.9 cycle already, and while your v3 patch > probably fixes Roman's problem, I can't convince myself that it is > safe in general. > > I think the safest thing to do at this point is to revert 8c33f51df > ("PCI/ACPI: Request _OSC control before scanning PCI root bus") with a > patch like the one below. Agreed. > > That does mean the booting path and hotplug paths will be different (we set > aspm_disabled after boot but before hotplug), but it was that way for a > long time before 8c33f51df. I think it's more important to fix this recent > ath5k regression than to fix a long-standing hotplug bug that nobody ever > complained about. > > Obviously, I think we should fix the hotplug bug and clean up the ASPM > mess, too. But we need to do that when we have more time to do it right > and test it. Sure. > > Bjorn > > > commit 96e5d01cd536458435ef0678d9fa3dc542afb41f > Author: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > Date: Mon Apr 1 15:47:39 2013 -0600 > > Revert "PCI/ACPI: Request _OSC control before scanning PCI root bus" > > This reverts commit 8c33f51df406e1a1f7fa4e9b244845b7ebd61fa6. > > Conflicts: > drivers/acpi/pci_root.c > > Reference: https://bugzilla.kernel.org/show_bug.cgi?id=55211 > Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx> stable need this reverting too. Yinghai -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html