Re: [PATCH] PCI / ACPI: Make acpiphp ignore root bridges using SHPC native hotplug

Kenji Kaneshige
2011-11-07T01:43:32Z

Thank you for doing this.
Looks good to me.

Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

Regards,
Kenji Kaneshige

(2011/11/07 7:11), Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki<rjw@sisk.pl>
>
> If the kernel has requested control of the SHPC native hotplug
> feature for a given root bridge, the acpiphp driver should not try
> to handle that root bridge and it should leave it to shpchp.
> Failing to do so causes problems to happen if shpchp is loaded
> and unloaded before loading acpiphp (ACPI-based hotplug won't work
> in that case anyway).
>
> To address this issue make find_root_bridges() ignore PCI root
> bridges with SHPC native hotplug enabled and make add_bridge()
> return error code if SHPC native hotplug is enabled for the given
> root bridge. This causes acpiphp to refuse to load if SHPC native
> hotplug is enabled for all root bridges and to refuse binding to
> the root bridges with SHPC native hotplug enabled.
>
> Signed-off-by: Rafael J. Wysocki<rjw@sisk.pl>
> ---
>
> Jesse,
>
> This should apply to your linux-next branch.
>
> Thanks,
> Rafael
>
> ---
> drivers/pci/hotplug/acpiphp_glue.c | 4 ++--
> include/linux/acpi.h | 4 ++++
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> Index: linux/include/linux/acpi.h
> ===================================================================
> --- linux.orig/include/linux/acpi.h
> +++ linux/include/linux/acpi.h
> @@ -302,6 +302,10 @@ extern bool osc_sb_apei_support_acked;
> OSC_PCI_EXPRESS_PME_CONTROL | \
> OSC_PCI_EXPRESS_AER_CONTROL | \
> OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)
> +
> +#define OSC_PCI_NATIVE_HOTPLUG (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL | \
> + OSC_SHPC_NATIVE_HP_CONTROL)
> +
> extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
> u32 *mask, u32 req);
> extern void acpi_early_init(void);
> Index: linux/drivers/pci/hotplug/acpiphp_glue.c
> ===================================================================
> --- linux.orig/drivers/pci/hotplug/acpiphp_glue.c
> +++ linux/drivers/pci/hotplug/acpiphp_glue.c
> @@ -467,7 +467,7 @@ static int add_bridge(acpi_handle handle
> * granted by the BIOS for it.
> */
> root = acpi_pci_find_root(handle);
> - if (root&& (root->osc_control_set& OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
> + if (root&& (root->osc_control_set& OSC_PCI_NATIVE_HOTPLUG))
> return -ENODEV;
>
> /* if the bridge doesn't have _STA, we assume it is always there */
> @@ -1395,7 +1395,7 @@ find_root_bridges(acpi_handle handle, u3
> if (!root)
> return AE_OK;
>
> - if (root->osc_control_set& OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)
> + if (root->osc_control_set& OSC_PCI_NATIVE_HOTPLUG)
> return AE_OK;
>
> (*count)++;
>