Changeset 1615

Timestamp:

11/16/02 20:40:06 (6 years ago)

Author:

mds

Message:

BMC cleanup

Files:

• lm-sensors/trunk/kernel/busses/i2c-ipmi.c (modified) (13 diffs)
• lm-sensors/trunk/kernel/chips/bmcsensors.c (modified) (13 diffs)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (2 diffs)

lm-sensors/trunk/kernel/busses/i2c-ipmi.c

@@ -1 +1 @@
-/*
-bmc
+ipmi
-            monitoring
-    Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
@@ -20 +20 @@
-
-/*
-
+
+
-*/
-
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
@@ -31 +31 @@
-#include "version.h"
-
-
-bmc_in
-void bmc_dec_use
-u32 bmc_func(struct i2c_adapter *adapter
+
+i2c_ipmi_de
+u32 i2c_ipmi_func
+int bmcclient_i2c_send_message(struct i2c_adapter *, char *, int
-
-#ifdef MODULE
@@ -41 +41 @@
-extern
-#endif
-bmc
-bmc
+ipmi
+i2c_ipmi
-
-#ifdef MODULE
@@ -50 +50 @@
-
-/* I2C Data */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Other fields not initialized */
-};
-
-/* IPMI Data */
-static ipmi_user_t i2c_bmc_user;
-static ipmi_user_t i2c_ipmi_user;
-static unsigned char ipmi_version_major;
@@ -82 +80 @@
-        IPMI_SYSTEM_INTERFACE_ADDR_TYPE,
-        IPMI_BMC_CHANNEL,
-NULL
+{0}
-};      /* send address */
-static struct ipmi_msg message; /* send message */
-static long msgid;              /* message ID */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-{
-#ifdef MODULE
@@ -101 +95 @@
-}
-
-bmc
+i2c_ipmi
-{
-#ifdef MODULE
@@ -108 +102 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        rcv_callback = client->driver->command;
-
-
-
+
+
+
+
+
-
-static void ipmi_i2c_msg_handler(struct ipmi_recv_msg *msg,
-                                  void            *handler_data)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        if(client == 1 && rcv_callback != NULL)
-                (*rcv_callback)(NULL, client, msg);
@@ -158 +156 @@
-};
-
+/**************** Initialization ****************/
+
-/* callback for each BMC found */
-static void ipmi_register_bmc(int ipmi_intf)
-{
-        unsigned long flags;
-          rv = -EBUSY
+rv
-
-        if(interfaces > 0) {    /* 1 max for now */
-                printk(KERN_INFO
-bmc
+ipmi
-                       ipmi_intf);
-                return;
-        }
-
-bmc
+ipmi
-        if (rv < 0) {
-bmc
+ipmi
-                return;
-        }
-
-
-
-
-
-
-
-
+
+
+
-                return;
-        }
-
+        ipmi_get_version(i2c_ipmi_user, &ipmi_version_major,
+                         &ipmi_version_minor);
-        printk(KERN_INFO
-bmc
+ipmi
-               ipmi_intf, ipmi_version_major, ipmi_version_minor);
-        interfaces++;
-}
-
-
-static void ipmi_new_smi(int if_num)
-{
@@ -201 +198 @@
-static void ipmi_smi_gone(int if_num)
-{
-
+
+
+
+
+
-}
-
@@ -210 +211 @@
-};
-
-bmc
+ipmi
-{
-        int rv;
-
-bmc
+ipmi
-
-        rv = ipmi_smi_watcher_register(&smi_watcher);
@@ -223 +224 @@
-        }
-
-bmc
-
-
-
-bmc
+ipmi
+
+
+
+ipmi
-{
-        ipmi_smi_watcher_unregister(&smi_watcher);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-MODULE_AUTHOR("M. D. Studebaker <mdsxyz123@yahoo.com>");
-BMC bus
+IPMI-BMC
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
@@ -249 +244 @@
-int init_module(void)
-{
-bmc
+ipmi
-}
-
-int cleanup_module(void)
-{
-bmc
+ipmi
-}
-

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

@@ -130 +130 @@
-        u8 capab;
-        u16 thresh_mask;
+        u8 format;
-        u8 linear;
-        s16 m;
@@ -233 +234 @@
-        "lower critical threshold",
-        "lower non-critical threshold",
- /* not used */
-
+
+    /* unused */
-};
-
@@ -270 +271 @@
-                /* select lower threshold */
-                if(((capab & 0x30) == 0x10) ||  /* readable hysteresis ? */
-neg
-7
+pos
+6
-                else if(mask & 0x02) {          /* lower crit */
-                        sdrd[i].lim2 = 4;
@@ -359 +360 @@
-                }
-                sdrd[i].sysctl = bmcsensors_dir_table[i].ctl_name;
-
-
-
-
-
-
-
-
+
+
+
-                        sdrd[i].m, sdrd[i].b,sdrd[i].k & 0xf, sdrd[i].k >> 4,
-                        sdrd[i].capab, sdrd[i].thresh_mask);
+                if(sdrd[i].id_length) {
+                        ipmi_sprintf(id, sdrd[i].id, sdrd[i].string_type, sdrd[i].id_length);
+                        printk(KERN_INFO "bmcsensors.o: sensors.conf: label %s \"%s\"\n",
+                                bmcsensors_dir_table[i].procname, id);
+                }
-                bmcsensors_select_thresholds(i);
+                if(sdrd[i].linear != 0) {
+                        printk(KERN_INFO "bmcsensors.o: sensor %d: nonlinear function 0x%.2x unsupported\n",
+                                i, sdrd[i].linear);
+                }
+                if((sdrd[i].format & 0x03) == 0x02) {
+                        printk(KERN_INFO "bmcsensors.o: sensor %d: 1's complement format unsupported\n",
+                                i);
+                } else if((sdrd[i].format & 0x03) == 0x03) {
+                        printk(KERN_INFO "bmcsensors.o: sensor %d: threshold sensor only, no readings available",
+                                i);
+                }
-                if(sdrd[i].lim1_write || sdrd[i].lim2_write)
-                        bmcsensors_dir_table[i].mode = 0644;
@@ -495 +507 @@
-                                        sdrd[sdrd_count].thresh_mask = (data[22] << 8) | data[21];
-                                        if(type == 1) {
+                                                sdrd[sdrd_count].format = data[24] >> 6;
-                                                sdrd[sdrd_count].linear = data[26] & 0x7f;
-                                                sdrd[sdrd_count].m = data[27];
@@ -529 +542 @@
-                        }
-                }
-/*
-                                } else {
-                                        printk(KERN_INFO "bmcsensors.o: Ignoring sensor type 0x%x\n", stype);
-                                }
-*/
-                        /*
-                                printk(KERN_INFO "bmcsensors.o: STATE_SDR: record = 0x%x; version = 0x%x, type = 0x%x; length=0x%x\n",
-                                record, version, type, length);
-                                printk(KERN_INFO "bmcsensors.o: STATE_SDR: owner = 0x%x; lun = 0x%x, number = 0x%x; entity=0x%x\n",
-                                owner, lun, number, entity);
-                                printk(KERN_INFO "bmcsensors.o: STATE_SDR: instance = 0x%x; init = 0x%x, capab = 0x%x; stype=0x%x\n",
-                                instance, init, capab, stype);
-                                printk(KERN_INFO "bmcsensors.o: STATE_SDR: code = 0x%x\n",
-                                code);
-                                printk(KERN_INFO "bmcsensors.o: STATE_SDR: next = 0x%x\n", nextrecord);
-                        } else {
-                                printk(KERN_INFO "bmcsensors.o: unknown STATE_SDR type 0x%x\n", type);
-                        */
-        }
-                        
@@ -616 +611 @@
-                       msg->cmd);
-#endif
+/*
-        bmcclient_i2c_send_message(&bmc_client, msgid++, msg);
+*/
+        bmc_client.adapter->algo->slave_send((struct i2c_adapter *) &bmc_client,
+                                             (char *) msg, msgid++);
-
-}
@@ -661 +660 @@
-int bmcsensors_attach_adapter(struct i2c_adapter *adapter)
-{
-
-
-
-
-
-
-
+
-                return 0;
-        }
-
-        if(bmcsensors_initialized >= 2) {
-limit of 1
+Additional IPMI adapter not supported
-                return 0;
-        }
@@ -687 +679 @@
-        bmc_client.adapter = adapter;
-        bmc_data.valid = 0;
-/*
-        init_MUTEX(bmc_data.update_lock);
-*/
-
-        if ((err = i2c_attach_client(&bmc_client))) {
@@ -697 +686 @@
-        bmcsensors_initialized = 2;
-
-        /* initialize some key data */
-        state = STATE_INIT;
-        sdrd_count = 0;
@@ -776 +764 @@
-                if(state != STATE_READING) {
-                        state = STATE_READING;
-                        printk(KERN_DEBUG "bmcsensors.o: Starting update\n");
-                        bmcsensors_get_reading(client, 0);
-                }
@@ -819 +806 @@
-        long r;
-
+/* fixme signed/unsigned */
+        r = value * sdrd[i].m;
+
-        k1 = sdrd[i].k & 0x0f;
-        k2 = sdrd[i].k >> 4;
-
-        r = value * sdrd[i].m;
-        if(k1 < 8)
-                r += sdrd[i].b * exps[k1];
@@ -867 +855 @@
-                        else
-                                results[0] = 0;
-
+
+
-                                results[1] = convert_value(sdrd[i].limits[sdrd[i].lim2], i);
-
+
+
+
-                                results[1] = 0;
-                        results[2] = convert_value(sdrd[i].reading, i);
-                        *nrels_mag = 3;
-                }

lm-sensors/trunk/prog/sensors/chips.c

@@ -3650 +3650 @@
-{
-  char *label = NULL;
-,fdiv
+
-  int alarms, valid, i;
-
@@ -3683 +3683 @@
-          if (!sensors_get_label_and_valid(*name,SENSORS_BMC_FAN1+i,&label,&valid) &&
-              !sensors_get_feature(*name,SENSORS_BMC_FAN1+i,&cur) &&
-/*
-              !sensors_get_feature(*name,SENSORS_BMC_FAN1_DIV+i,&fdiv) &&
-*/
-              !sensors_get_feature(*name,SENSORS_BMC_FAN1_MIN+i,&min)) {
-            if (valid) {
-              print_label(label,10);
-, div = %1.0f)
-fdiv, 
+)        
+
-            }
-          }