Changeset 1427

Timestamp:

07/07/02 17:45:14 (11 years ago)

Author:

mds

Message:

flush PCI posted writes on algo-bit PCI drivers.

Also check return code on ioremap_nocache().

Location:

lm-sensors/trunk/kernel/busses

Files:

• i2c-hydra.c (modified) (2 diffs)
• i2c-i810.c (modified) (6 diffs)
• i2c-savage4.c (modified) (4 diffs)
• i2c-voodoo3.c (modified) (6 diffs)

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

@@ -79 +79 @@
         }
         pdregw(val);
+        pdregr();       /* flush posted write */
 }
 
@@ -91 +92 @@
         }
         pdregw(val);
+        pdregr();       /* flush posted write */
 }
 

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

@@ -130 +130 @@
         outlong((val ? SCL_VAL_OUT : 0) | SCL_DIR | SCL_DIR_MASK | SCL_VAL_MASK,
              I810_GPIOB);
+        readlong(I810_GPIOB);   /* flush posted write */
 }
 
@@ -136 +137 @@
         outlong((val ? SDA_VAL_OUT : 0) | SDA_DIR | SDA_DIR_MASK | SDA_VAL_MASK,
              I810_GPIOB);
+        readlong(I810_GPIOB);   /* flush posted write */
 }
 
@@ -162 +164 @@
         outlong((val ? SCL_VAL_OUT : 0) | SCL_DIR | SCL_DIR_MASK | SCL_VAL_MASK,
              I810_GPIOA);
+        readlong(I810_GPIOA);   /* flush posted write */
 }
 
@@ -168 +171 @@
         outlong((val ? SDA_VAL_OUT : 0) | SDA_DIR | SDA_DIR_MASK | SDA_VAL_MASK,
              I810_GPIOA);
+        readlong(I810_GPIOA);   /* flush posted write */
 }
 
@@ -237 +241 @@
         cadr &= PCI_BASE_ADDRESS_MEM_MASK;
         mem = ioremap_nocache(cadr, 0x1000);
-        bit_i810i2c_setscl(NULL, 1);
-        bit_i810i2c_setsda(NULL, 1);
-        bit_i810ddc_setscl(NULL, 1);
-        bit_i810ddc_setsda(NULL, 1);
+        if(mem) {
+                bit_i810i2c_setscl(NULL, 1);
+                bit_i810i2c_setsda(NULL, 1);
+                bit_i810ddc_setscl(NULL, 1);
+                bit_i810ddc_setsda(NULL, 1);
+        }
 }
 
@@ -254 +260 @@
                                            *num++, dev))) {
                         config_i810(dev);
+                        if(!mem)
+                                return -ENOMEM;
                         printk("i2c-i810.o: i810/i815 found.\n");
                         return 0;

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

@@ -123 +123 @@
                 r &= ~I2C_SCL_OUT;
         outlong(r);
+        readlong();     /* flush posted write */
 }
 
@@ -134 +135 @@
                 r &= ~I2C_SDA_OUT;
         outlong(r);
+        readlong();     /* flush posted write */
 }
 
@@ -236 +238 @@
         cadr &= PCI_BASE_ADDRESS_MEM_MASK;
         mem = ioremap_nocache(cadr, 0x0080000);
-
-//      *((unsigned int *) (mem + REG2)) = 0x8160;
-        *((unsigned int *) (mem + REG)) = 0x00000020;
-        printk("i2c-savage4: Using Savage4 at 0x%p\n", mem);
+        if(mem) {
+//              *((unsigned int *) (mem + REG2)) = 0x8160;
+                *((unsigned int *) (mem + REG)) = 0x00000020;
+                printk("i2c-savage4: Using Savage4 at 0x%p\n", mem);
+        }
 }
 
@@ -273 +276 @@
 
         if (s4_num > 0) {
+                if(!mem)
+                        return -ENOMEM;
                 printk("i2c-savage4: %d Savage4 found.\n", s4_num);
                 if (s4_num > 1)

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

@@ -116 +116 @@
                 r &= ~I2C_SCL_OUT;
         outlong(r);
+        readlong();     /* flush posted write */
 }
 
@@ -127 +128 @@
                 r &= ~I2C_SDA_OUT;
         outlong(r);
+        readlong();     /* flush posted write */
 }
 
@@ -152 +154 @@
                 r &= ~DDC_SCL_OUT;
         outlong(r);
+        readlong();     /* flush posted write */
 }
 
@@ -163 +166 @@
                 r &= ~DDC_SDA_OUT;
         outlong(r);
+        readlong();     /* flush posted write */
 }
 
@@ -229 +233 @@
         cadr &= PCI_BASE_ADDRESS_MEM_MASK;
         mem = ioremap_nocache(cadr, 0x1000);
-
-        *((unsigned int *) (mem + REG2)) = 0x8160;
-        *((unsigned int *) (mem + REG)) = 0xcffc0020;
-        printk("i2c-voodoo3: Using Banshee/Voodoo3 at 0x%p\n", mem);
+        if(mem) {
+                *((unsigned int *) (mem + REG2)) = 0x8160;
+                *((unsigned int *) (mem + REG)) = 0xcffc0020;
+                printk("i2c-voodoo3: Using Banshee/Voodoo3 at 0x%p\n", mem);
+        }
 }
 
@@ -267 +272 @@
 
         if (v3_num > 0) {
+                if(!mem)
+                        return -ENOMEM;
                 printk("i2c-voodoo3: %d Banshee/Voodoo3 found.\n", v3_num);
                 if (v3_num > 1)