From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ogre.sisk.pl ([217.79.144.158]:54455 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750790Ab1LLXGQ (ORCPT ); Mon, 12 Dec 2011 18:06:16 -0500 From: "Rafael J. Wysocki" To: Jesse Barnes Subject: Re: [PATCH][Regression fix] PCI / Hotplug: Always allow acpiphp to handle non-PCIe bridges Date: Tue, 13 Dec 2011 00:09:12 +0100 Cc: LKML , Linus Torvalds , linux-pci@vger.kernel.org, Kenji Kaneshige References: <201112130002.28907.rjw@sisk.pl> In-Reply-To: <201112130002.28907.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Message-Id: <201112130009.13088.rjw@sisk.pl> Sender: linux-pci-owner@vger.kernel.org List-ID: Hi Jesse, On Tuesday, December 13, 2011, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > 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 > --- Sorry for the breakage, I clearly should have been more careful here. Please also revert this commit from your linux-next branch: http://git.kernel.org/?p=linux/kernel/git/jbarnes/pci.git;a=commit;h=71c50ab7a32968b73b533dd27620eef563ace6b7 as it makes the same mistake and depends on the code being removed by this patch. Thanks, Rafael