Changeset 1504

Timestamp:

08/25/02 16:33:27 (11 years ago)

Author:

amalysh

Message:

(amalysh)
Fixed the typo in sis630_access
Changed sis630_transaction. Now it's 2x faster...

Files:

• lm-sensors/trunk/kernel/busses/i2c-sis630.c (modified) (13 diffs)

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

@@ -17 +17 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+   Changes:
+   24.08.2002
+        Fixed the typo in sis630_access (Thanks to Mark M. Hoffman)
+        Changed sis630_transaction. Now it's 2x faster (Thanks to Mark M. Hoffman)
 */
 
@@ -97 +104 @@
                           union i2c_smbus_data *data);
 static void sis630_do_pause(unsigned int amount);
-static int sis630_transaction(void);
+static int sis630_transaction(int size);
 static void sis630_inc(struct i2c_adapter *adapter);
 static void sis630_dec(struct i2c_adapter *adapter);
@@ -145 +152 @@
 }
 
-int sis630_transaction() {
+int sis630_transaction(int size) {
         int temp;
         int result = 0;
@@ -152 +159 @@
         /*
           Make sure the SMBus host is ready to start transmitting.
-          Datasheet say SMB_STS are sticky bits, but on my Laptop
-          (Clevo/Kapok 2202) SMBALT# (bit 7) cannot be cleared ???
         */
-        if ((temp = sis630_read(SMB_STS)) != 0x80) {
+        if ((temp = sis630_read(SMB_CNT) & 0x03) != 0x00) {
 #ifdef DEBUG
                 printk(KERN_DEBUG "i2c-sis630.o: SMBus busy (%02x). "
                         "Resetting...\n",temp);
 #endif
-                sis630_write(SMB_STS, temp & 0xff);
-                if ((temp = sis630_read(SMB_STS)) != 0x80) {
+                /* kill smbus transaction */
+                sis630_write(SMBHOST_CNT, 0x02);
+
+                if ((temp = sis630_read(SMB_CNT) & 0x03) != 0x00) {
 #ifdef DEBUG
                         printk(KERN_DEBUG "i2c-sis630.o: Failed! (%02x)\n",
@@ -174 +181 @@
         }
 
-        /* start the transaction by setting bit 4 */
-        sis630_write(SMBHOST_CNT, sis630_read(SMBHOST_CNT) | 0x10);
+        /* disable timeout interrupt and set clock to 56KHz */
+        sis630_write(SMB_CNT, 0x20);
+
+        /* clear all sticky bits */
+        temp = sis630_read(SMB_STS);
+        sis630_write(SMB_STS, temp & 0x1e);
+
+        /* start the transaction by setting bit 4 and size */
+        sis630_write(SMBHOST_CNT,0x10 | (size & 0x07));
 
         /* We will always wait for a fraction of a second! */
@@ -181 +195 @@
                 sis630_do_pause(1);
                 temp = sis630_read(SMB_STS);
-        } while (!(temp & 0x08) && (timeout++ < MAX_TIMEOUT));
+        } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT));
 
         /* If the SMBus is still busy, we give up */
@@ -203 +217 @@
                 printk(KERN_ERR "i2c-sis630.o: Bus collision! "
                         "SMBus may be locked until next hard reset (or not...)\n");
-
                 /* TBD: Datasheet say:
                    the software should clear this bit and restart SMBUS operation
@@ -209 +222 @@
         }
 
-        if ((temp = sis630_read(SMB_STS)) != 0x80) {
-                sis630_write(SMB_STS, temp & 0xff);
-        }
-
-        if ((temp = sis630_read(SMB_STS)) != 0x80) {
-#ifdef DEBUG
-                printk(KERN_DEBUG "i2c-sis630.o: Failed reset at end of "
-                        "transaction (%02x)\n",temp);
-#endif
-        }
+        /* clear all status "sticky" bits */
+        sis630_write(SMB_STS, temp);
 
         return result;
@@ -270 +275 @@
 
 
-        sis630_write(SMBHOST_CNT,(size & 0x07));
-
-        if (sis630_transaction())
+        if (sis630_transaction(size))
                 return -1;
 
@@ -281 +284 @@
 
         switch(size) {
-                case I2C_SMBUS_BYTE:
-                case I2C_SMBUS_BYTE_DATA:
+                case SIS630_BYTE:
+                case SIS630_BYTE_DATA:
                         data->byte = sis630_read(SMB_BYTE);
                         break;
-                case I2C_SMBUS_PROC_CALL:
-                case I2C_SMBUS_WORD_DATA:
+                case SIS630_PCALL:
+                case SIS630_WORD_DATA:
                         data->word = sis630_read(SMB_BYTE) + (sis630_read(SMB_BYTE + 1) << 8);
                         break;
@@ -312 +315 @@
 int sis630_setup(void) {
         unsigned char b;
-        int rc;
         struct pci_dev *sis630_dev = NULL;
 
@@ -337 +339 @@
            in acpi io space and read acpi base addr
         */
-        if ((rc = pci_read_config_byte(sis630_dev, SIS630_BIOS_CTL_REG, &b))) {
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_byte(sis630_dev, SIS630_BIOS_CTL_REG,&b)) {
                 printk(KERN_ERR "i2c-sis630.o: Error: Can't read bios ctl reg\n");
-                return rc;
-        }
+                return -ENODEV;
+        }
+        /* if ACPI already anbled , do nothing */
         if (!(b & 0x80) &&
-            (rc = pci_write_config_byte(sis630_dev, SIS630_BIOS_CTL_REG, b | 0x80))) {
+            PCIBIOS_SUCCESSFUL !=
+            pci_write_config_byte(sis630_dev,SIS630_BIOS_CTL_REG,b|0x80)) {
                 printk(KERN_ERR "i2c-sis630.o: Error: Can't enable ACPI\n");
-                return rc;
+                return -ENODEV;
         }
         /* Determine the ACPI base address */
-        if ((rc = pci_read_config_word(sis630_dev, SIS630_ACPI_BASE_REG,&acpi_base))) {
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_word(sis630_dev,SIS630_ACPI_BASE_REG,&acpi_base)) {
                 printk(KERN_ERR "i2c-sis630.o: Error: Can't determine ACPI base address\n");
-                return rc;
+                return -ENODEV;
         }
 
@@ -358 +364 @@
         /* Everything is happy, let's grab the memory and set things up. */
         if (!request_region(acpi_base + SMB_STS, SIS630_SMB_IOREGION, "sis630-smbus")){
-
                 printk(KERN_ERR "i2c-sis630.o: SMBus registers 0x%04x-0x%04x "
                         "already in use!\n",acpi_base + SMB_STS, acpi_base + SMB_SAA);