From: Zhao Yakui <yakui.zhao@xxxxxxxxx> Sometimes one IPMI system interface will be detected by several methods. For example: ACPI mechanism, SPMI table, DMI. Maybe one IPMI system interface can be detected in two mechanism. In such case the second mechanism will fail in the detection and can't record which IPMI system interface is detected by it. Use the ACPI detection mechanism firstly to detect the IPMI system interface so that we can know which IPMI system interface is detected in ACPI namespace and then install the IPMI opregion to enable ACPI to access the BMC controller. But the hardcode detection mechanism is still put in the first order. Signed-off-by: Zhao Yakui <yakui.zhao@xxxxxxxxx> cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx> cc: Myron Stowe <myron.stowe@xxxxxx> --- drivers/char/ipmi/ipmi_si_intf.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 87b5722..2807749 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -3763,16 +3763,16 @@ static __devinit int init_ipmi_si(void) } mutex_unlock(&smi_infos_lock); +#ifdef CONFIG_ACPI + pnp_register_driver(&ipmi_pnp_driver); +#endif + #ifdef CONFIG_PCI rv = pci_register_driver(&ipmi_pci_driver); if (rv) printk(KERN_ERR PFX "Unable to register PCI driver: %d\n", rv); #endif -#ifdef CONFIG_ACPI - pnp_register_driver(&ipmi_pnp_driver); -#endif - #ifdef CONFIG_DMI dmi_find_bmc(); #endif @@ -3933,6 +3933,7 @@ static __exit void cleanup_ipmi_si(void) #ifdef CONFIG_PCI pci_unregister_driver(&ipmi_pci_driver); #endif + #ifdef CONFIG_ACPI pnp_unregister_driver(&ipmi_pnp_driver); #endif -- 1.5.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
