The patch titled ipmi: raise precedence of PNP based discovery mechanisms (ACPI, PCI) has been added to the -mm tree. Its filename is ipmi-raise-precedence-of-pnp-based-discovery-mechanisms-acpi-pci.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ipmi: raise precedence of PNP based discovery mechanisms (ACPI, PCI) From: Myron Stowe <myron.stowe@xxxxxx> This raises the precedence of PNP discovery mechanisms, ACPI and PCI, above SMBIOS and SPMI as indicated by Appendix C1 of the IPMI specification. Reference: IPMI - Intelligent Platform Management Interface Specification v2.0, Document Revision 1.0, 05.05.2005 Markup Appendix C1 - Locating IPMI System Interfaces via SMBIOS Tables "Note that the settings that this structure reports may be over- ridden by `Plug-and-Play' reassignment by the OS. Therefore, this structure should be used only when the interface cannot be discovered via `Plug-and-Play' discovery mechanisms incorporated in interfaces such as PCI and ACPI." Signed-off-by: Myron Stowe <myron.stowe@xxxxxx> Cc: Zhao Yakui <yakui.zhao@xxxxxxxxx> Cc: Corey Minyard <minyard@xxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/ipmi/ipmi_si_intf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff -puN drivers/char/ipmi/ipmi_si_intf.c~ipmi-raise-precedence-of-pnp-based-discovery-mechanisms-acpi-pci drivers/char/ipmi/ipmi_si_intf.c --- a/drivers/char/ipmi/ipmi_si_intf.c~ipmi-raise-precedence-of-pnp-based-discovery-mechanisms-acpi-pci +++ a/drivers/char/ipmi/ipmi_si_intf.c @@ -3260,13 +3260,6 @@ static __devinit int init_ipmi_si(void) hardcode_find_bmc(); -#ifdef CONFIG_DMI - dmi_find_bmc(); -#endif - -#ifdef CONFIG_ACPI - spmi_find_bmc(); -#endif #ifdef CONFIG_ACPI pnp_register_driver(&ipmi_pnp_driver); #endif @@ -3283,6 +3276,14 @@ static __devinit int init_ipmi_si(void) of_register_platform_driver(&ipmi_of_platform_driver); #endif +#ifdef CONFIG_DMI + dmi_find_bmc(); +#endif + +#ifdef CONFIG_ACPI + spmi_find_bmc(); +#endif + if (si_trydefaults) { mutex_lock(&smi_infos_lock); if (list_empty(&smi_infos)) { _ Patches currently in -mm which might be from myron.stowe@xxxxxx are ipmi-raise-precedence-of-pnp-based-discovery-mechanisms-acpi-pci.patch ipmi-convert-tracking-of-the-acpi-device-pointer-to-a-pnp-device.patch ipmi-update-driver-to-use-dev_printk-and-its-constructs.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html