Changeset 1133

Timestamp:

06/17/01 23:11:59 (12 years ago)

Author:

mds

Message:

add force_addr to i2c-ali15x3

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-ali15x3.c (modified) (8 diffs)

lm-sensors/trunk/CHANGES

@@ -17 +17 @@
 
 -----------------------------------------------------------------------------
+
+2.6.1 (2001????)
+  Module i2c-ali15x3: Allow force_addr=0xaddr; enable if not enabled.
 
 2.6.0 (20010612)

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

@@ -125 +125 @@
 #define ALI15X3_STS_ERR         0xE0    /* all the bad error bits */
 
+
+/* 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
@@ -181 +188 @@
 int ali15x3_setup(void)
 {
-        int error_return = 0;
+        u16 a;
         unsigned char temp;
 
@@ -189 +196 @@
         if (pci_present() == 0) {
                 printk("i2c-ali15x3.o: Error: No PCI-bus found!\n");
-                error_return = -ENODEV;
-                goto END;
+                return -ENODEV;
         }
 
@@ -199 +205 @@
         if (ALI15X3_dev == NULL) {
                 printk("i2c-ali15x3.o: Error: Can't detect ali15x3!\n");
-                error_return = -ENODEV;
-                goto END;
+                return -ENODEV;
         }
 
@@ -223 +228 @@
         pci_read_config_word(ALI15X3_dev, SMBBA, &ali15x3_smba);
         ali15x3_smba &= (0xffff & ~(ALI15X3_SMB_IOSIZE - 1));
-        if (ali15x3_smba == 0) {
-                printk
-                    ("i2c-ali15x3.o: ALI15X3_smb region uninitialized - upgrade BIOS?\n");
-                error_return = -ENODEV;
-        }
-
-        if (error_return == -ENODEV)
-                goto END;
+        if (ali15x3_smba == 0 && force_addr == 0) {
+                printk
+                    ("i2c-ali15x3.o: ALI15X3_smb region uninitialized - upgrade BIOS or use force_addr=0xaddr\n");
+                return -ENODEV;
+        }
+
+        if(force_addr)
+                ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1);
 
         if (check_region(ali15x3_smba, ALI15X3_SMB_IOSIZE)) {
@@ -236 +241 @@
                     ("i2c-ali15x3.o: ALI15X3_smb region 0x%x already in use!\n",
                      ali15x3_smba);
-                error_return = -ENODEV;
-        }
-
-        if (error_return == -ENODEV)
-                goto END;
-
+                return -ENODEV;
+        }
+
+        if(force_addr) {
+                printk("i2c-ali15x3.o: forcing ISA address 0x%04X\n", ali15x3_smba);
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba))
+                        return -ENODEV;
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_read_config_word(ALI15X3_dev, SMBBA, &a))
+                        return -ENODEV;
+                if ((a & ~(ALI15X3_SMB_IOSIZE - 1)) != ali15x3_smba) {
+                        /* make sure it works */
+                        printk("i2c-ali15x3.o: force address failed - not supported?\n");
+                        return -ENODEV;
+                }
+        }
 /* check if whole device is enabled */
         pci_read_config_byte(ALI15X3_dev, SMBCOM, &temp);
         if ((temp & 1) == 0) {
-                printk
-                    ("SMBUS: Error: SMB device not enabled - upgrade BIOS?\n");
-                error_return = -ENODEV;
-                goto END;
+                printk("i2c-ali15x3: enabling SMBus device\n");
+                pci_write_config_byte(ALI15X3_dev, SMBCOM, temp | 0x01);
         }
 
@@ -254 +268 @@
         pci_read_config_byte(ALI15X3_dev, SMBHSTCFG, &temp);
         if ((temp & 1) == 0) {
-                printk
-                    ("SMBUS: Error: Host SMBus controller not enabled - upgrade BIOS?\n");
-                error_return = -ENODEV;
-                goto END;
+                printk("i2c-ali15x3: enabling SMBus controller\n");
+                pci_write_config_byte(ALI15X3_dev, SMBHSTCFG, temp | 0x01);
         }
 
@@ -279 +291 @@
 #endif                          /* DEBUG */
 
-      END:
-        return error_return;
+        return 0;
 }