Skip to contentSkip to conversation

pci: don't load acpi_php when acpi is disabled

PATCH In review Yinghai Lu 3 participants 3 messages Dec 12, 2007

Subsystems (2)
ACPI PCI
lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 pci: don't load acpi_php when acpi is disabled

[PATCH] pci: don't load acpi_php when acpi is disabled

when acpi=off and pci=nomsi, don't load acpiphp

Signed-off-by Yinghai Lu <[email protected]>
drivers/pci/hotplug/acpiphp_core.c +6 -0
index c8c2638..84d66ba 100644
@@ -392,6 +392,9 @@ static int __init acpiphp_init(void)
 {
 	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
+	if (acpi_pci_disabled)
+		return 0;
+
 	acpiphp_debug = debug;
 
 	/* read all the ACPI info from the system */

@@ -401,6 +404,9 @@ static int __init acpiphp_init(void)
 
 static void __exit acpiphp_exit(void)
 {
+	if (acpi_pci_disabled)
+		return 0;
+
 	/* deallocate internal data structures etc. */
 	acpiphp_glue_exit();
 }
#1 lore raw
Quoted 21 lines · On Tue, 11 Dec 2007 20:14:40 -0800 Yinghai Lu <[email protected]> wrote:

[PATCH] pci: don't load acpi_php when acpi is disabled

when acpi=off and pci=nomsi, don't load acpiphp

Signed-off-by Yinghai Lu <[email protected]>
drivers/pci/hotplug/acpiphp_core.c +3 -0
index c8c2638..84d66ba 100644
@@ -392,6 +392,9 @@ static int __init acpiphp_init(void)
 {
 	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
+	if (acpi_pci_disabled)
+		return 0;
+
 	acpiphp_debug = debug;
 
 	/* read all the ACPI info from the system */

drivers/pci/hotplug/acpiphp_core.c static int __init acpiphp_init(void) · line 412

Quoted 9 lines
drivers/pci/hotplug/acpiphp_core.c +3 -0
@@ -401,6 +404,9 @@ static int __init acpiphp_init(void)
 
 static void __exit acpiphp_exit(void)
 {
+	if (acpi_pci_disabled)
+		return 0;
+
 	/* deallocate internal data structures etc. */
 	acpiphp_glue_exit();
 }

OK, but there is some information missing in your patch descriptions: what effect do these patches have? Does the kernel crash without them? Or is there no effect at all? Or something in between?

Thanks.

#2 lore raw
Quoted 24 lines · Andrew Morton
Quoted 22 lines · On Tue, 11 Dec 2007 20:14:40 -0800 Yinghai Lu <[email protected]> wrote:

[PATCH] pci: don't load acpi_php when acpi is disabled

when acpi=off and pci=nomsi, don't load acpiphp

Signed-off-by Yinghai Lu <[email protected]>
drivers/pci/hotplug/acpiphp_core.c +3 -0
index c8c2638..84d66ba 100644
@@ -392,6 +392,9 @@ static int __init acpiphp_init(void)
 {
      info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
+     if (acpi_pci_disabled)
+             return 0;
+
      acpiphp_debug = debug;
 
      /* read all the ACPI info from the system */

@@ -401,6 +404,9 @@ static int __init acpiphp_init(void)
Quoted 12 lines

drivers/pci/hotplug/acpiphp_core.c static int __init acpiphp_init(void) · line 412

Quoted 8 lines
drivers/pci/hotplug/acpiphp_core.c +3 -0
 static void __exit acpiphp_exit(void)
 {
+     if (acpi_pci_disabled)
+             return 0;
+
      /* deallocate internal data structures etc. */
      acpiphp_glue_exit();
 }

OK, but there is some information missing in your patch descriptions: what effect do these patches have? Does the kernel crash without them? Or is there no effect at all? Or something in between?

warning when use acpi=off to disable acpi in kernel

AER service couldn't init device 0000:00:0a.0:pcie01 - no _OSC support AER service couldn't init device 0000:00:0e.0:pcie01 - no _OSC support AER service couldn't init device 0000:00:0f.0:pcie01 - no _OSC support AER service couldn't init device 0000:80:0b.0:pcie01 - no _OSC support AER service couldn't init device 0000:80:0e.0:pcie01 - no _OSC support AER service couldn't init device 0000:80:0f.0:pcie01 - no _OSC support

pci_hotplug: PCI Hot Plug PCI Core version: 0.5
acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5 ACPI Exception (utmutex-0263): AE_BAD_PARAMETER, Thread FFFF81103CC54000 could not acquire Mutex [1] [20070126]

Thanks

Yinghai Lu