[<prev] [next>] [day] [month] [year] [list]
Message-id: <20100503133450.GC8130@minyard.local>
Date: Mon, 03 May 2010 08:34:50 -0500
From: Corey Minyard <minyard@....org>
To: Linux Kernel <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...l.org>
Cc: OpenIPMI Developers <openipmi-developer@...ts.sourceforge.net>,
Matthew Garrett <mjg@...hat.com>
Subject: [PATCH 3/8] ipmi: Only register one si per bmc
From: Matthew Garrett <mjg@...hat.com>
Only register one si per bmc. Use any user-provided devices first, followed
by the first device with an irq, followed by the first device discovered.
Signed-off-by: Matthew Garrett <mjg@...hat.com>
Signed-off-by: Corey Minyard <cminyard@...sta.com>
---
Index: linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
===================================================================
--- linux-2.6.orig/drivers/char/ipmi/ipmi_si_intf.c
+++ linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
@@ -3300,6 +3300,14 @@ static __devinit int init_ipmi_si(void)
hardcode_find_bmc();
+ /* If the user gave us a device, they presumably want us to use it */
+ mutex_lock(&smi_infos_lock);
+ if (!list_empty(&smi_infos)) {
+ mutex_unlock(&smi_infos_lock);
+ return 0;
+ }
+ mutex_unlock(&smi_infos_lock);
+
#ifdef CONFIG_DMI
dmi_find_bmc();
#endif
@@ -3323,10 +3331,27 @@ static __devinit int init_ipmi_si(void)
of_register_platform_driver(&ipmi_of_platform_driver);
#endif
+ /* Try to register something with interrupts first */
+
mutex_lock(&smi_infos_lock);
list_for_each_entry(e, &smi_infos, link) {
- if (!e->si_sm)
- try_smi_init(e);
+ if (e->irq) {
+ if (!try_smi_init(e)) {
+ 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 (!try_smi_init(e)) {
+ mutex_unlock(&smi_infos_lock);
+ return 0;
+ }
+ }
}
mutex_unlock(&smi_infos_lock);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists