From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756553Ab1JYNKf (ORCPT ); Tue, 25 Oct 2011 09:10:35 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:53639 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756355Ab1JYNKd (ORCPT ); Tue, 25 Oct 2011 09:10:33 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Message-ID: <4EA6B538.7020401@jp.fujitsu.com> Date: Tue, 25 Oct 2011 22:10:16 +0900 From: Kenji Kaneshige User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:6.0) Gecko/20110812 Thunderbird/6.0 MIME-Version: 1.0 To: "Rafael J. Wysocki" CC: Linux PCI , Jesse Barnes , LKML , Linux PM list , ACPI Devel Mailing List , Matthew Garrett Subject: Re: [PATCH] PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug References: <201110220043.38635.rjw@sisk.pl> In-Reply-To: <201110220043.38635.rjw@sisk.pl> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Looks good. This is also needed for SHPC native hotplug. Regards, Kenji Kaneshige (2011/10/22 7:43), Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > If the kernel has requested control of the PCIe native hotplug > feature for a given root complex, the acpiphp driver should not try > to handle that root complex and it should leave it to pciehp. > Failing to do so causes problems to happen if acpiphp is loaded > before pciehp on such systems. > > To address this issue make find_root_bridges() ignore PCIe root > complexes with PCIe native hotplug enabled and make add_bridge() > return error code if PCIe native hotplug is enabled for the given > root port. This causes acpiphp to refuse to load if PCIe native > hotplug is enabled for all complexes and to refuse binding to > the root complexes with PCIe native hotplug is enabled. > > Signed-off-by: Rafael J. Wysocki > --- > drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- > 1 file changed, 24 insertions(+), 5 deletions(-) > > Index: linux/drivers/pci/hotplug/acpiphp_glue.c > =================================================================== > --- linux.orig/drivers/pci/hotplug/acpiphp_glue.c > +++ linux/drivers/pci/hotplug/acpiphp_glue.c > @@ -458,8 +458,17 @@ static int add_bridge(acpi_handle handle > { > acpi_status status; > unsigned long long tmp; > + struct acpi_pci_root *root; > acpi_handle dummy_handle; > > + /* > + * We shouldn't use this bridge if PCIe native hotplug control has been > + * granted by the BIOS for it. > + */ > + root = acpi_pci_find_root(handle); > + if (root&& (root->osc_control_set& OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)) > + return -ENODEV; > + > /* if the bridge doesn't have _STA, we assume it is always there */ > status = acpi_get_handle(handle, "_STA",&dummy_handle); > if (ACPI_SUCCESS(status)) { > @@ -1297,13 +1306,23 @@ static void handle_hotplug_event_func(ac > static acpi_status > find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv) > { > + struct acpi_pci_root *root; > int *count = (int *)context; > > - if (acpi_is_root_bridge(handle)) { > - acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, > - handle_hotplug_event_bridge, NULL); > - (*count)++; > - } > + if (!acpi_is_root_bridge(handle)) > + return AE_OK; > + > + root = acpi_pci_find_root(handle); > + if (!root) > + return AE_OK; > + > + if (root->osc_control_set& OSC_PCI_EXPRESS_NATIVE_HP_CONTROL) > + return AE_OK; > + > + (*count)++; > + acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, > + handle_hotplug_event_bridge, NULL); > + > return AE_OK ; > } > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >