Merge branch 'ipmi' into release

2 files changed, 43 insertions, 4 deletions

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 2fe72f8edf44..38223e93aa98 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -970,6 +970,33 @@ out_kfree:
 }
 EXPORT_SYMBOL(ipmi_create_user);
 
+int ipmi_get_smi_info(int if_num, struct ipmi_smi_info *data)
+{
+        int           rv = 0;
+        ipmi_smi_t    intf;
+        struct ipmi_smi_handlers *handlers;
+
+        mutex_lock(&ipmi_interfaces_mutex);
+        list_for_each_entry_rcu(intf, &ipmi_interfaces, link) {
+                if (intf->intf_num == if_num)
+                        goto found;
+        }
+        /* Not found, return an error */
+        rv = -EINVAL;
+        mutex_unlock(&ipmi_interfaces_mutex);
+        return rv;
+
+found:
+        handlers = intf->handlers;
+        rv = -ENOSYS;
+        if (handlers->get_smi_info)
+                rv = handlers->get_smi_info(intf->send_info, data);
+        mutex_unlock(&ipmi_interfaces_mutex);
+
+        return rv;
+}
+EXPORT_SYMBOL(ipmi_get_smi_info);
+
 static void free_user(struct kref *ref)
 {
         ipmi_user_t user = container_of(ref, struct ipmi_user, refcount);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index c4bacc6ec450..3a3643c6a579 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -57,6 +57,7 @@
 #include <asm/irq.h>
 #include <linux/interrupt.h>
 #include <linux/rcupdate.h>
+#include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <asm/io.h>
 #include "ipmi_si_sm.h"
@@ -107,10 +108,6 @@ enum si_type {
 };
 static char *si_to_str[] = { "kcs", "smic", "bt" };
 
-enum ipmi_addr_src {
-        SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS,
-        SI_PCI, SI_DEVICETREE, SI_DEFAULT
-};
 static char *ipmi_addr_src_to_str[] = { NULL, "hotmod", "hardcoded", "SPMI",
                                         "ACPI", "SMBIOS", "PCI",
                                         "device-tree", "default" };
@@ -291,6 +288,7 @@ struct smi_info {
         struct task_struct *thread;
 
         struct list_head link;
+        union ipmi_smi_info_union addr_info;
 };
 
 #define smi_inc_stat(smi, stat) \
@@ -1186,6 +1184,18 @@ static int smi_start_processing(void       *send_info,
         return 0;
 }
 
+static int get_smi_info(void *send_info, struct ipmi_smi_info *data)
+{
+        struct smi_info *smi = send_info;
+
+        data->addr_src = smi->addr_source;
+        data->dev = smi->dev;
+        data->addr_info = smi->addr_info;
+        get_device(smi->dev);
+
+        return 0;
+}
+
 static void set_maintenance_mode(void *send_info, int enable)
 {
         struct smi_info   *smi_info = send_info;
@@ -1197,6 +1207,7 @@ static void set_maintenance_mode(void *send_info, int enable)
 static struct ipmi_smi_handlers handlers = {
         .owner                  = THIS_MODULE,
         .start_processing       = smi_start_processing,
+        .get_smi_info           = get_smi_info,
         .sender                 = sender,
         .request_events         = request_events,
         .set_maintenance_mode   = set_maintenance_mode,
@@ -2157,6 +2168,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
         printk(KERN_INFO PFX "probing via ACPI\n");
 
         handle = acpi_dev->handle;
+        info->addr_info.acpi_info.acpi_handle = handle;
 
         /* _IFT tells us the interface type: KCS, BT, etc */
         status = acpi_evaluate_integer(handle, "_IFT", NULL, &tmp);