Patched in Tegra support.

1 files changed, 67 insertions, 45 deletions

diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index a14f634248e..c316294c48b 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -36,7 +36,6 @@
 #include <linux/platform_device.h>
 #include <linux/math64.h>
 #include <linux/time.h>
-#include <linux/err.h>
 
 #define REFRESH_INTERVAL        (HZ)
 #define IPMI_TIMEOUT            (30 * HZ)
@@ -89,7 +88,8 @@
 #define AEM_MIN_POWER_INTERVAL  200
 #define UJ_PER_MJ               1000L
 
-static DEFINE_IDA(aem_ida);
+static DEFINE_IDR(aem_idr);
+static DEFINE_SPINLOCK(aem_idr_lock);
 
 static struct platform_driver aem_driver = {
         .driver = {
@@ -148,9 +148,8 @@ struct aem_data {
         int                     id;
         struct aem_ipmi_data    ipmi;
 
-        /* Function and buffer to update sensors */
+        /* Function to update sensors */
         void (*update)(struct aem_data *data);
-        struct aem_read_sensor_resp *rs_resp;
 
         /*
          * AEM 1.x sensors:
@@ -247,6 +246,8 @@ static void aem_bmc_gone(int iface);
 static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data);
 
 static void aem_remove_sensors(struct aem_data *data);
+static int aem_init_aem1(struct aem_ipmi_data *probe);
+static int aem_init_aem2(struct aem_ipmi_data *probe);
 static int aem1_find_sensors(struct aem_data *data);
 static int aem2_find_sensors(struct aem_data *data);
 static void update_aem1_sensors(struct aem_data *data);
@@ -355,16 +356,47 @@ static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
         complete(&data->read_complete);
 }
 
+/* ID functions */
+
+/* Obtain an id */
+static int aem_idr_get(int *id)
+{
+        int i, err;
+
+again:
+        if (unlikely(!idr_pre_get(&aem_idr, GFP_KERNEL)))
+                return -ENOMEM;
+
+        spin_lock(&aem_idr_lock);
+        err = idr_get_new(&aem_idr, NULL, &i);
+        spin_unlock(&aem_idr_lock);
+
+        if (unlikely(err == -EAGAIN))
+                goto again;
+        else if (unlikely(err))
+                return err;
+
+        *id = i & MAX_ID_MASK;
+        return 0;
+}
+
+/* Release an object ID */
+static void aem_idr_put(int id)
+{
+        spin_lock(&aem_idr_lock);
+        idr_remove(&aem_idr, id);
+        spin_unlock(&aem_idr_lock);
+}
+
 /* Sensor support functions */
 
-/* Read a sensor value; must be called with data->lock held */
+/* Read a sensor value */
 static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
                            void *buf, size_t size)
 {
         int rs_size, res;
         struct aem_read_sensor_req rs_req;
-        /* Use preallocated rx buffer */
-        struct aem_read_sensor_resp *rs_resp = data->rs_resp;
+        struct aem_read_sensor_resp *rs_resp;
         struct aem_ipmi_data *ipmi = &data->ipmi;
 
         /* AEM registers are 1, 2, 4 or 8 bytes */
@@ -390,6 +422,10 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
         ipmi->tx_message.data_len = sizeof(rs_req);
 
         rs_size = sizeof(*rs_resp) + size;
+        rs_resp = kzalloc(rs_size, GFP_KERNEL);
+        if (!rs_resp)
+                return -ENOMEM;
+
         ipmi->rx_msg_data = rs_resp;
         ipmi->rx_msg_len = rs_size;
 
@@ -432,6 +468,7 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
         res = 0;
 
 out:
+        kfree(rs_resp);
         return res;
 }
 
@@ -489,12 +526,11 @@ static void aem_delete(struct aem_data *data)
 {
         list_del(&data->list);
         aem_remove_sensors(data);
-        kfree(data->rs_resp);
         hwmon_device_unregister(data->hwmon_dev);
         ipmi_destroy_user(data->ipmi.user);
         platform_set_drvdata(data->pdev, NULL);
         platform_device_unregister(data->pdev);
-        ida_simple_remove(&aem_ida, data->id);
+        aem_idr_put(data->id);
         kfree(data);
 }
 
@@ -551,8 +587,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
                 data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;
 
         /* Create sub-device for this fw instance */
-        data->id = ida_simple_get(&aem_ida, 0, 0, GFP_KERNEL);
-        if (data->id < 0)
+        if (aem_idr_get(&data->id))
                 goto id_err;
 
         data->pdev = platform_device_alloc(DRVNAME, data->id);
@@ -567,31 +602,24 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
         platform_set_drvdata(data->pdev, data);
 
         /* Set up IPMI interface */
-        res = aem_init_ipmi_data(&data->ipmi, probe->interface,
-                                 probe->bmc_device);
-        if (res)
+        if (aem_init_ipmi_data(&data->ipmi, probe->interface,
+                               probe->bmc_device))
                 goto ipmi_err;
 
         /* Register with hwmon */
         data->hwmon_dev = hwmon_device_register(&data->pdev->dev);
+
         if (IS_ERR(data->hwmon_dev)) {
                 dev_err(&data->pdev->dev, "Unable to register hwmon "
                         "device for IPMI interface %d\n",
                         probe->interface);
-                res = PTR_ERR(data->hwmon_dev);
                 goto hwmon_reg_err;
         }
 
         data->update = update_aem1_sensors;
-        data->rs_resp = kzalloc(sizeof(*(data->rs_resp)) + 8, GFP_KERNEL);
-        if (!data->rs_resp) {
-                res = -ENOMEM;
-                goto alloc_resp_err;
-        }
 
         /* Find sensors */
-        res = aem1_find_sensors(data);
-        if (res)
+        if (aem1_find_sensors(data))
                 goto sensor_err;
 
         /* Add to our list of AEM devices */
@@ -603,8 +631,6 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
         return 0;
 
 sensor_err:
-        kfree(data->rs_resp);
-alloc_resp_err:
         hwmon_device_unregister(data->hwmon_dev);
 hwmon_reg_err:
         ipmi_destroy_user(data->ipmi.user);
@@ -612,7 +638,7 @@ ipmi_err:
         platform_set_drvdata(data->pdev, NULL);
         platform_device_unregister(data->pdev);
 dev_err:
-        ida_simple_remove(&aem_ida, data->id);
+        aem_idr_put(data->id);
 id_err:
         kfree(data);
 
@@ -620,7 +646,7 @@ id_err:
 }
 
 /* Find and initialize all AEM1 instances */
-static void aem_init_aem1(struct aem_ipmi_data *probe)
+static int aem_init_aem1(struct aem_ipmi_data *probe)
 {
         int num, i, err;
 
@@ -631,8 +657,11 @@ static void aem_init_aem1(struct aem_ipmi_data *probe)
                         dev_err(probe->bmc_device,
                                 "Error %d initializing AEM1 0x%X\n",
                                 err, i);
+                        return err;
                 }
         }
+
+        return 0;
 }
 
 /* Probe functions for AEM2 devices */
@@ -691,8 +720,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
                 data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;
 
         /* Create sub-device for this fw instance */
-        data->id = ida_simple_get(&aem_ida, 0, 0, GFP_KERNEL);
-        if (data->id < 0)
+        if (aem_idr_get(&data->id))
                 goto id_err;
 
         data->pdev = platform_device_alloc(DRVNAME, data->id);
@@ -707,31 +735,24 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
         platform_set_drvdata(data->pdev, data);
 
         /* Set up IPMI interface */
-        res = aem_init_ipmi_data(&data->ipmi, probe->interface,
-                                 probe->bmc_device);
-        if (res)
+        if (aem_init_ipmi_data(&data->ipmi, probe->interface,
+                               probe->bmc_device))
                 goto ipmi_err;
 
         /* Register with hwmon */
         data->hwmon_dev = hwmon_device_register(&data->pdev->dev);
+
         if (IS_ERR(data->hwmon_dev)) {
                 dev_err(&data->pdev->dev, "Unable to register hwmon "
                         "device for IPMI interface %d\n",
                         probe->interface);
-                res = PTR_ERR(data->hwmon_dev);
                 goto hwmon_reg_err;
         }
 
         data->update = update_aem2_sensors;
-        data->rs_resp = kzalloc(sizeof(*(data->rs_resp)) + 8, GFP_KERNEL);
-        if (!data->rs_resp) {
-                res = -ENOMEM;
-                goto alloc_resp_err;
-        }
 
         /* Find sensors */
-        res = aem2_find_sensors(data);
-        if (res)
+        if (aem2_find_sensors(data))
                 goto sensor_err;
 
         /* Add to our list of AEM devices */
@@ -743,8 +764,6 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
         return 0;
 
 sensor_err:
-        kfree(data->rs_resp);
-alloc_resp_err:
         hwmon_device_unregister(data->hwmon_dev);
 hwmon_reg_err:
         ipmi_destroy_user(data->ipmi.user);
@@ -752,7 +771,7 @@ ipmi_err:
         platform_set_drvdata(data->pdev, NULL);
         platform_device_unregister(data->pdev);
 dev_err:
-        ida_simple_remove(&aem_ida, data->id);
+        aem_idr_put(data->id);
 id_err:
         kfree(data);
 
@@ -760,7 +779,7 @@ id_err:
 }
 
 /* Find and initialize all AEM2 instances */
-static void aem_init_aem2(struct aem_ipmi_data *probe)
+static int aem_init_aem2(struct aem_ipmi_data *probe)
 {
         struct aem_find_instance_resp fi_resp;
         int err;
@@ -779,9 +798,12 @@ static void aem_init_aem2(struct aem_ipmi_data *probe)
                         dev_err(probe->bmc_device,
                                 "Error %d initializing AEM2 0x%X\n",
                                 err, fi_resp.module_handle);
+                        return err;
                 }
                 i++;
         }
+
+        return 0;
 }
 
 /* Probe a BMC for AEM firmware instances */
@@ -905,7 +927,7 @@ static ssize_t aem_set_power_period(struct device *dev,
         unsigned long temp;
         int res;
 
-        res = kstrtoul(buf, 10, &temp);
+        res = strict_strtoul(buf, 10, &temp);
         if (res)
                 return res;
 
@@ -1046,7 +1068,7 @@ static struct aem_ro_sensor_template aem2_ro_sensors[] = {
 {"power6_average",        aem2_show_pcap_value, POWER_CAP_MIN_WARNING},
 {"power7_average",        aem2_show_pcap_value, POWER_CAP_MIN},
 
-{"power3_average",        aem2_show_pcap_value, POWER_AUX},
+{"power3_average",        aem2_show_pcap_value, POWER_AUX},
 {"power_cap",             aem2_show_pcap_value, POWER_CAP},
 {NULL,                    NULL,                 0},
 };