ipmi: attempt to register multiple SIs of the same type

Some odd systems may have multiple BMCs, and we want to be able to support
them.  Let's make the assumption that if a system legitimately has
multiple BMCs then each BMC's SI will be of the same type, and also that
we won't see multiple SIs of the same type unless we have multiple BMCs.
If these hold true then we should register all SIs of the same type.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 46bf2a97d6cb30682b65a8351453b44cddd9699e..6503d995b727cfacb7326fffe5b08fa1dbb66300 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -3278,6 +3278,7 @@ static __devinit int init_ipmi_si(void)
        char *str;
        int  rv;
        struct smi_info *e;
+       enum ipmi_addr_src type = SI_INVALID;
 
        if (initialized)
                return 0;
@@ -3344,30 +3345,43 @@ static __devinit int init_ipmi_si(void)
        of_register_platform_driver(&ipmi_of_platform_driver);
 #endif
 
-       /* Try to register something with interrupts first */
+       /* We prefer devices with interrupts, but in the case of a machine
+          with multiple BMCs we assume that there will be several instances
+          of a given type so if we succeed in registering a type then also
+          try to register everything else of the same type */
 
        mutex_lock(&smi_infos_lock);
        list_for_each_entry(e, &smi_infos, link) {
-               if (e->irq) {
+               /* Try to register a device if it has an IRQ and we either
+                  haven't successfully registered a device yet or this
+                  device has the same type as one we successfully registered */
+               if (e->irq && (!type || e->addr_source == type)) {
                        if (!try_smi_init(e)) {
-                               mutex_unlock(&smi_infos_lock);
-                               return 0;
+                               type = e->addr_source;
                        }
                }
        }
 
+       /* type will only have been set if we successfully registered an si */
+       if (type) {
+               mutex_unlock(&smi_infos_lock);
+               return 0;
+       }
+
        /* Fall back to the preferred device */
 
        list_for_each_entry(e, &smi_infos, link) {
-               if (!e->irq) {
+               if (!e->irq && (!type || e->addr_source == type)) {
                        if (!try_smi_init(e)) {
-                               mutex_unlock(&smi_infos_lock);
-                               return 0;
+                               type = e->addr_source;
                        }
                }
        }
        mutex_unlock(&smi_infos_lock);
 
+       if (type)
+               return 0;
+
        if (si_trydefaults) {
                mutex_lock(&smi_infos_lock);
                if (list_empty(&smi_infos)) {