Changeset 1077

Timestamp:

04/21/01 23:57:40 (12 years ago)

Author:

mds

Message:

add support for force_addr to i2c-sis5595.

Also automatically enable ACPI if it was disabled.
Forcing address doesn't work on my test system, but hey,
at least I tried to test it...

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-sis5595.c (modified) (7 diffs)

lm-sensors/trunk/CHANGES

@@ -37 +37 @@
   Module i2c-i801: Chip detection cleanup
   Module i2c-i810: Fixed i2c_i810_init() not found in patched kernel
+  Module i2c-sis5595: Allow force_addr=0xaddr; enable if not enabled.
   Module lm78: Recognize chipid=0x20
   Module lm87: Fix in0, in1 (2.5V and Vccp1) calculations

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

@@ -40 +40 @@
 #include <linux/init.h>
 
+/* Length of ISA address segment */
+#define SIS5595_EXTENT 8
 /* SIS5595 SMBus registers */
 #define SMB_STS_LO 0x00
@@ -58 +60 @@
 #define SMB_INDEX  0x38
 #define SMB_DAT    0x39
+#define SIS5595_ENABLE_REG 0x40
 #define ACPI_BASE  0x90
 
@@ -72 +75 @@
 
 /* insmod parameters */
+
+/* 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 i2c controller");
 
 #ifdef MODULE
@@ -140 +150 @@
 int sis5595_setup(void)
 {
-        int error_return = 0;
-
+        u16 a;
+        u8 val;
         struct pci_dev *SIS5595_dev;
 
@@ -147 +157 @@
         if (pci_present() == 0) {
                 printk("i2c-sis5595.o: Error: No PCI-bus found!\n");
-                error_return = -ENODEV;
-                goto END;
+                return -ENODEV;
         }
 
@@ -157 +166 @@
                                             SIS5595_dev))) {
                 printk("i2c-sis5595.o: Error: Can't detect SIS5595!\n");
-                error_return = -ENODEV;
-                goto END;
+                return -ENODEV;
         }
 
 /* Determine the address of the SMBus areas */
         pci_read_config_word(SIS5595_dev, ACPI_BASE, &sis5595_base);
-        if(sis5595_base == 0) {
-                printk("i2c-sis5595.o: ACPI base address uninitialized - upgrade BIOS?\n");
-                error_return = -ENODEV;
-                goto END;
-        }
-
+        if(sis5595_base == 0 && force_addr == 0) {
+                printk("i2c-sis5595.o: ACPI base address uninitialized - upgrade BIOS or use force_addr=0xaddr\n");
+                return -ENODEV;
+        }
+
+        if(force_addr)
+                sis5595_base = force_addr & ~(SIS5595_EXTENT - 1);
 #ifdef DEBUG
         printk("ACPI Base address: %04x\n", sis5595_base);
@@ -179 +188 @@
                      sis5595_base + SMB_INDEX,
                      sis5595_base + SMB_INDEX + 1);
-                error_return = -ENODEV;
-                goto END;
+                return -ENODEV;
+        }
+
+        if(force_addr) {
+                printk("i2c-sis5595.o: forcing ISA address 0x%04X\n", sis5595_base);
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_write_config_word(SIS5595_dev, ACPI_BASE, sis5595_base))
+                        return -ENODEV;
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_read_config_word(SIS5595_dev, ACPI_BASE, &a))
+                        return -ENODEV;
+                if ((a & ~(SIS5595_EXTENT - 1)) != sis5595_base) {
+                        /* doesn't work for some chips! */
+                        printk("i2c-sis5595.o: force address failed - not supported?\n");
+                        return -ENODEV;
+                }
+        }
+
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val))
+                return -ENODEV;
+        if((val & 0x80) == 0) {
+                printk("sis5595.o: enabling ACPI\n");
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_write_config_byte(SIS5595_dev, SIS5595_ENABLE_REG,
+                                      val | 0x80))
+                        return -ENODEV;
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val))
+                        return -ENODEV;
+                if((val & 0x80) == 0) { /* doesn't work for some chips? */
+                        printk("sis5595.o: ACPI enable failed - not supported?\n");
+                        return -ENODEV;
+                }
         }
 
         /* Everything is happy, let's grab the memory and set things up. */
         request_region(sis5595_base + SMB_INDEX, 2, "sis5595-smbus");
-
-      END:
-        return error_return;
+        return(0);
 }