Changeset 1646

Timestamp:

11/26/02 01:12:11 (10 years ago)

Author:

mds

Message:

updates, cleanup, wait for update before returning values

Files:

• lm-sensors/trunk/kernel/chips/bmcsensors.c (modified) (12 diffs)

lm-sensors/trunk/kernel/chips/bmcsensors.c

@@ -75 +75 @@
 
 static void bmcsensors_update_client(struct i2c_client *client);
-static void bmcsensors_init_client(struct i2c_client *client);
 static int bmcsensors_find(int *address);
 static void bmcsensors_reserve_sdr(void);
@@ -406 +405 @@
         bmc_data.sysctl_id = i;
 
-        bmcsensors_init_client(&bmc_client);
         printk(KERN_INFO "bmcsensors.o: %d reservations cancelled\n", errorcount);
         printk(KERN_INFO "bmcsensors.o: registered %d temp, %d volt, %d current, %d fan sensors\n",
                         temps, volts, currs, fans);
-        bmcsensors_update_client(&bmc_client);
+/*
+        This completes the initialization. The first userspace read
+        of a /proc value will force the first
+        bmcsensors_update_client() which starts the
+        reading of the sensors themselves via IPMI messages.
+*/
 }
 
@@ -591 +594 @@
                 if(sdrd_count == 0) {
                         printk(KERN_INFO "bmcsensors.o: No recognized sensors found.\n");
-                        rstate = STATE_DONE;
                         /* unregister?? */
                 } else {
                         bmcsensors_build_proc_table();
-                        rstate = STATE_READING;
-                }
+                }
+                rstate = STATE_DONE;
         } else {
                 bmcsensors_get_sdr(0, nextrecord, 0);
@@ -611 +613 @@
                 case STATE_RESERVE:
                         resid = (((u16)msg->data[2]) << 8) || msg->data[1];
-#if 1
-                        printk(KERN_INFO "bmcsensors.o: Got first resid 0x%.4x\n", resid);
+#ifdef DEBUG
+                        printk(KERN_DEBUG "bmcsensors.o: Got first resid 0x%.4x\n", resid);
 #endif
                         bmcsensors_get_sdr(0, 0, 0);
@@ -629 +631 @@
                 case STATE_UNCANCEL:
                         resid = (((u16)msg->data[2]) << 8) || msg->data[1];
-#if 1
-                        printk(KERN_INFO "bmcsensors.o: Got new resid 0x%.4x\n", resid);
+#ifdef DEBUG
+                        printk(KERN_DEBUG "bmcsensors.o: Got new resid 0x%.4x\n", resid);
 #endif
                         rx_msg_data_offset = 0;
@@ -652 +654 @@
         if(state == STATE_SDR && msg->msg.data[0] == 0xc5) {
                 /* )(*&@(*&#@$ reservation cancelled, get new resid */
-                if(++errorcount > 1000) {
+                if(++errorcount > 275) {
                         printk(KERN_ERR
                                "bmcsensors.o: Too many reservations cancelled, giving up\n");
                         state = STATE_DONE;
                 } else {
-#if 1
-                        printk(KERN_ERR
+#ifdef DEBUG
+                        printk(KERN_DEBUG
                                "bmcsensors.o: resid 0x%04x cancelled, getting new one\n", resid);
 #endif
@@ -708 +710 @@
 static void bmcsensors_get_sdr(u16 res_id, u16 record, u8 offset)
 {
-#if 1
-        printk(KERN_INFO "bmcsensors.o: Get SDR 0x%x 0x%x 0x%x\n",
+#ifdef DEBUG
+        printk(KERN_DEBUG "bmcsensors.o: Get SDR 0x%x 0x%x 0x%x\n",
                        res_id, record, offset);
 #endif
@@ -819 +821 @@
 }
 
-static void bmcsensors_init_client(struct i2c_client *client)
-{
-/*******************************************/
-
-
-
+static void bmc_do_pause(unsigned int amount)
+{
+        current->state = TASK_INTERRUPTIBLE;
+        schedule_timeout(amount);
 }
 
@@ -830 +830 @@
 {
         struct bmcsensors_data *data = client->data;
-        int i;
+        int j = 0;
 
 /*
@@ -836 +836 @@
 */
 
+        /* if within 3 seconds you get old data */
         if ((jiffies - data->last_updated > 3 * HZ) ||
             (jiffies < data->last_updated) || !data->valid) {
@@ -841 +842 @@
                 if(state != STATE_READING) {
                         state = STATE_READING;
+#ifdef DEBUG
+                        printk(KERN_DEBUG "bmcsensors.o: starting update\n", j);
+#endif
                         bmcsensors_get_reading(client, 0);
                 }
+                /* wait 4 seconds max */
+                while(state == STATE_READING && j++ < 100)
+                        bmc_do_pause(HZ / 25);
+#ifdef DEBUG
+                printk("bmcsensors.o: update complete; j = %d\n", j);
+#endif
+                data->last_updated = jiffies;
+                data->valid = 1;
         }
 
@@ -910 +922 @@
         int i;
         struct bmcsensors_data *data = client->data;
-        int nr = ctl_name - BMC_SYSCTL_TEMP1 + 1;
 
         if((i = find_sdrd(ctl_name)) < 0) {