PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug
PATCH 1/1 PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug
From: Rafael J. Wysocki <[email protected]>
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.
--- drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
drivers/pci/hotplug/acpiphp_glue.c +24 -5
@@ -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(acstatic 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 ; }
Quoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
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.
Should pciehp be built-in kernel instead of as a module?
Yinghai
Quoted 10 lines · Yinghai Lu
Quoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
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.
Should pciehp be built-in kernel instead of as a module?
Well, perhaps. Still, though, if someone doesn't build pciehp and the control of the native PCIe hotplug is granted for a given root complex, acpiphp won't work anyway.
Thanks,
Rafael
Looks good.
This is also needed for SHPC native hotplug.
Regards,
Kenji Kaneshige
Quoted 76 lines · Rafael J. Wysocki
From: Rafael J. Wysocki<[email protected]>
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 makeadd_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<[email protected]>--- drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)Index:
linux/drivers/pci/hotplug/acpiphp_glue.c
===================================================================drivers/pci/hotplug/acpiphp_glue.c +24
-6@@ -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(acstatic 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 2 lines · Kenji Kaneshige
Looks good.
This is also needed for SHPC native hotplug.
I don't think so, we still leave the SHPC _OSC for the driver to take care of (which may not be the right thing, but I don't feel confident enough to decide :-)).
Thanks,
Rafael
Quoted 80 lines
Quoted 76 lines · Rafael J. Wysocki
From: Rafael J. Wysocki<[email protected]>
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 makeadd_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<[email protected]>--- drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)Index:
linux/drivers/pci/hotplug/acpiphp_glue.c
===================================================================drivers/pci/hotplug/acpiphp_glue.c +24
-6@@ -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(acstatic 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Rafael J. Wysocki
Quoted 2 lines · Kenji Kaneshige
Looks good.
This is also needed for SHPC native hotplug.I don't think so, we still leave the SHPC
_OSCfor the driver to take care of (which may not be the right thing, but I don't feel confident enough to decide :-)).
I think of the case that acpiphp driver is loaded after shpchp driver is unloaded. Once native hotplug control is granted to OS, there is no way to return the control to firmware. So once shpchp gets the native hotplug control on a given root bridge, acpiphp should not try to handle the hotplug slots under it.
Regards,
Kenji Kaneshige
Quoted 87 lines
Thanks,
RafaelQuoted 80 lines
Quoted 76 lines · Rafael J. Wysocki
From: Rafael J. Wysocki<[email protected]>
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 makeadd_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<[email protected]>--- drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)Index:
linux/drivers/pci/hotplug/acpiphp_glue.c
===================================================================drivers/pci/hotplug/acpiphp_glue.c +24
-6@@ -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(acstatic 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 5 lines · Kenji Kaneshige
Quoted 4 lines · Rafael J. Wysocki
Quoted 2 lines · Kenji Kaneshige
Looks good.
This is also needed for SHPC native hotplug.
Quoted 8 lines
Quoted 3 lines
I don't think so, we still leave the SHPC
_OSCfor the driver to take care of (which may not be the right thing, but I don't feel confident enough to decide :-)).I think of the case that acpiphp driver is loaded after shpchp driver is unloaded. Once native hotplug control is granted to OS, there is no way to return the control to firmware. So once shpchp gets the native hotplug control on a given root bridge, acpiphp should not try to handle the hotplug slots under it.
Good point, but that would be a separate patch I think?
Rafael
Quoted 85 lines
Quoted 82 lines
Quoted 80 lines
Quoted 76 lines · Rafael J. Wysocki
From: Rafael J. Wysocki<[email protected]>
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 makeadd_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<[email protected]>--- drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)Index:
linux/drivers/pci/hotplug/acpiphp_glue.c
===================================================================drivers/pci/hotplug/acpiphp_glue.c +24
-6@@ -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(acstatic 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 10 lines · Rafael J. Wysocki
Quoted 9 lines · Kenji Kaneshige
Quoted 7 lines · Rafael J. Wysocki
Quoted 2 lines · Kenji Kaneshige
Looks good.
This is also needed for SHPC native hotplug.I don't think so, we still leave the SHPC
_OSCfor the driver to take care of (which may not be the right thing, but I don't feel confident enough to decide :-)).
Quoted 6 lines
Quoted 4 lines
I think of the case that acpiphp driver is loaded after shpchp driver is unloaded. Once native hotplug control is granted to OS, there is no way to return the control to firmware. So once shpchp gets the native hotplug control on a given root bridge, acpiphp should not try to handle the hotplug slots under it.
Good point, but that would be a separate patch I think?
I think separate patch is ok.
Kenji Kaneshige
Quoted 95 lines
Rafael
Quoted 72 lines
Quoted 72 lines
Quoted 72 lines
Quoted 71 lines · Rafael J. Wysocki
From: Rafael J. Wysocki<[email protected]>
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 makeadd_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<[email protected]>--- drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)Index:
linux/drivers/pci/hotplug/acpiphp_glue.c
===================================================================drivers/pci/hotplug/acpiphp_glue.c +24
-5@@ -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(acstatic 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 ; }Quoted 13 lines
Quoted 10 lines
Quoted 8 lines
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 PCI / ACPI: Make acpiphp ignore root bridges using SHPC native hotplug
From: Rafael J. Wysocki <[email protected]>
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.
---
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(-)
include/linux/acpi.h +4 -0
@@ -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 );
drivers/pci/hotplug/acpiphp_glue.c +2 -2
@@ -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, u3if (!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)++;
Re: [PATCH] PCI / ACPI: Make acpiphp ignore root bridges using SHPC native hotplug
Thank you for doing this.
Looks good to me.
Regards,
Kenji Kaneshige
Quoted 69 lines · Rafael J. Wysocki
From: Rafael J. Wysocki<[email protected]>
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 makeadd_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<[email protected]>---
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
===================================================================include/linux/acpi.h +4
-0@@ -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
===================================================================drivers/pci/hotplug/acpiphp_glue.c +2
-2@@ -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, u3if (!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)++;
Jesse Barnes
AppliedRe: [PATCH] PCI / ACPI: Make acpiphp ignore root bridges using SHPC native hotplug
Quoted 4 lines · On Mon, 07 Nov 2011 10:43:04 +0900 Kenji Kaneshige…
Thank you for doing this.
Looks good to me.Reviewed-by Kenji Kaneshige <[email protected]>
Applied to my -next branch, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center