Changeset 1076

Timestamp:

04/21/01 22:54:47 (12 years ago)

Author:

mds

Message:

add force_addr param to sis5595. Tested, however on my

test system I can't write the enable bit. Don't know why.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• doc/chips/sis5595 (modified) (2 diffs)
• kernel/chips/sis5595.c (modified) (6 diffs)

lm-sensors/trunk/CHANGES

@@ -42 +42 @@
                  Save BIOS pin configuration of temps and fans
   Module sensors: Disabled, moved to i2c package as i2c-proc.c
-  Module sis5595: Fix temp, add in4 for chip revision 0xc0.
+  Module sis5595: Fix temp, add in4 for chip revision 0xc0;
+                  Allow force_addr=0xaddr
   Module via686a: Allow force_addr=0xaddr (for A7V/K7V boards)
   Module w83781d: Don't reinitialize as99127f chip; this may cause fan/temp

lm-sensors/trunk/doc/chips/sis5595

@@ -20 +20 @@
 Module Parameters
 -----------------
-None
+force_addr=0xaddr       Set the I/O base address. Useful for boards
+                        that don't set the address in the BIOS. Does not do a
+                        PCI force; the device must still be present in lspci.
+                        Don't use this unless the driver complains that the
+                        base address is not set.
+                        Example: 'modprobe sis5595 force_addr=0x290'
 
 
@@ -81 +86 @@
 will do no harm, but will return 'old' values.
 
+Problems
+--------
+Some chips refuse to be enabled. We don't know why.
+The driver will recognize this and print a message in dmesg.
 
 Chip Features

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

@@ -54 +54 @@
 #endif
 
+/* If force_addr is set to anything different from 0, we forcibly enable
+   the device at the given address. */
+static int force_addr = 0;
+MODULE_PARM(force_addr, "i");
+MODULE_PARM_DESC(force_addr,
+                 "Initialize the base address of the sensors");
+
 /* Addresses to scan.
    Note that we can't determine the ISA address until we have initialized
@@ -129 +136 @@
 #define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*(div)))
 
-#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-5)/10):\
-                                                 ((val)+5)/10),0,255))
-#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
+/* Version 1 datasheet temp=.83*reg + 52.12 */
+#define TEMP_FROM_REG(val) (((((val)>=0x80?(val)-0x100:(val))*83)+5212)/10)
+/* inverse 1.20*val - 62.77 */
+#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?\
+                                ((((val)*12)-6327)/100):\
+                                ((((val)*12)-6227)/100)),0,255))
 
 #define ALARMS_FROM_REG(val) (val)
@@ -302 +312 @@
 {
         u16 val;
-        char c;
 
         if (!pci_present())
@@ -317 +326 @@
                 return -ENODEV;
 
-        *address = (val & 0xfff8);
-        if(*address == 0) {
-                printk("sis5595.o: Sensor base address uninitialized - upgrade BIOS?\n");
+        *address = val & ~(SIS5595_EXTENT - 1);
+        if (*address == 0 && force_addr == 0) {
+                printk("sis5595.o: base address not set - upgrade BIOS or use force_addr=0xaddr\n");
                 return -ENODEV;
         }
-
-        if (PCIBIOS_SUCCESSFUL !=
-            pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &c))
-                return -ENODEV;
-        if((c & 0x80) == 0) {
-                printk("sis5595.o: Sensors not enabled - upgrade BIOS?\n");
-                return -ENODEV;
-        }
+        if (force_addr)
+                *address = force_addr;  /* so detect will get called */
+
         return 0;
 }
@@ -343 +347 @@
         const char *client_name = "SIS5595 chip";
         char val;
+        u16 a;
 
         /* Make sure we are probing the ISA bus!!  */
@@ -351 +356 @@
         }
 
+        if(force_addr)
+                address = force_addr & ~(SIS5595_EXTENT - 1);
         if (check_region(address, SIS5595_EXTENT)) {
                 printk("sis5595.o: region 0x%x already in use!\n", address);
                 return -ENODEV;
+        }
+        if(force_addr) {
+                printk("sis5595.o: forcing ISA address 0x%04X\n", address);
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_write_config_word(s_bridge, SIS5595_BASE_REG, address))
+                        return -ENODEV;
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_read_config_word(s_bridge, SIS5595_BASE_REG, &a))
+                        return -ENODEV;
+                if ((a & ~(SIS5595_EXTENT - 1)) != address) {
+                        /* doesn't work for some chips? */
+                        printk("sis5595.o: force address failed\n");
+                        return -ENODEV;
+                }
+        }
+
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val))
+                return -ENODEV;
+        if((val & 0x80) == 0) {
+                printk("sis5595.o: enabling sensors\n");
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_write_config_byte(s_bridge, SIS5595_ENABLE_REG,
+                                      val | 0x80))
+                        return -ENODEV;
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val))
+                        return -ENODEV;
+                if((val & 0x80) == 0) { /* doesn't work for some chips! */
+                        printk("sis5595.o: sensors enable failed - not supported?\n");
+                        return -ENODEV;
+                }
         }