Changeset 999

Timestamp:

01/20/01 04:43:50 (12 years ago)

Author:

mds

Message:

Allow force and force_via686a parameters. Driver will take the

address and program the base address in the 686a.
This is NOT a PCI force; the 3057 device must
be present in lspci.
Should work for Asus A7V/K7V boards which don't set the
base address (because they also have a as99127f on them!??).
Some rough edges remain, because
via686a_find() does not know there is a force; that only
is apparent to via686a_detect().
Notably, the driver will stay loaded even if the address is
uninitialized and there is no force; also, the driver complains
that a force is needed even when you give it one.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• doc/chips/via686a (modified) (1 diff)
• kernel/chips/via686a.c (modified) (10 diffs)

lm-sensors/trunk/CHANGES

@@ -21 +21 @@
   Module lm78: Recognize chipid=0x20
   Module sensors: Add xxx_init() calls for drivers added to mkpatch in 2.5.5.
+  Module via686a: Allow force=9191,address (for A7V/K7V boards)
   Program mkpatch.pl: Fix adm9240 typos
   Program sensors-detect: Recognize lm78 with chipid=0x20

lm-sensors/trunk/doc/chips/via686a

@@ -19 +19 @@
 -----------------
 
-none
+force=9191,address      Set the I/O base address. Useful for Asus A7V boards that
+                        don't set the address in the BIOS. Does not do a PCI
+                        force; the via686a must still be present in lspci.
+                        Don't use this unless the driver complains that the
+                        base address is not set. Otherwise the driver will
+                        recognize both the old and the forced address.
+
+force_via686a=9191,address      Same as force.
 
 

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

@@ -25 +25 @@
 */
 
+/*
+    Warning - only supports a single via686a device.
+*/
 #include <linux/version.h>
 #include <linux/module.h>
@@ -375 +378 @@
 #endif                          /* MODULE */
 
-/* This module may seem overly long and complicated. In fact, it is not so
-   bad. Quite a lot of bookkeeping is done. A real driver can often cut
-   some corners. */
-
-/* For each registered VIA686A, we need to keep some data in memory. That
+/* For the VIA686A, we need to keep some data in memory. That
    data is pointed to by via686a_list[NR]->data. The structure itself is
    dynamically allocated, at the same time when a new via686a client is
@@ -403 +402 @@
 };
 
+static struct pci_dev *s_bridge;        /* pointer to the (only) via686a */
 
 #ifdef MODULE
@@ -512 +512 @@
 int via686a_find(int *address)
 {
-        struct pci_dev *s_bridge;
         u16 val;
 
@@ -525 +524 @@
             pci_read_config_word(s_bridge, VIA686A_BASE_REG, &val))
                 return -ENODEV;
-        *address = (val & 0xff80);
+        *address = val & ~(VIA686A_EXTENT - 1);
         if (*address == 0) {
-                printk("via686a.o: sensors not enabled - upgrade BIOS?\n");
+                printk("via686a.o: base address not set - upgrade BIOS or use force=9191,addr\n");
+/*
+   If we do this then the module won't load and force won't work.
+   But unfortunately the above printk is printed even if we are doing a force.
                 return -ENODEV;
-        }
-
+*/
+        }
+/*
+   Moved below.
         if (PCIBIOS_SUCCESSFUL !=
             pci_read_config_word(s_bridge, VIA686A_ENABLE_REG, &val))
@@ -539 +543 @@
                                       val | 0x01);
         }
+*/
         return 0;
 }
@@ -550 +555 @@
         int err = 0;
         const char *type_name = "via686a";
+        u16 val;
 
         /* Make sure we are probing the ISA bus!!  */
@@ -558 +564 @@
         }
 
+        if(kind >= 0)           /* force or force_via686a */
+                address &= ~(VIA686A_EXTENT - 1);
         if (check_region(address, VIA686A_EXTENT)) {
                 printk("via686a.o: region 0x%x already in use!\n",
                        address);
-                err = -ENODEV;
-                goto ERROR0;
+                return -ENODEV;
+        }
+
+        if(kind >= 0) {         /* treat force and force_via686a equally */
+                printk("via686a.o: forcing ISA address 0x%04X\n", address);
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_write_config_word(s_bridge, VIA686A_BASE_REG, address))
+                        return -ENODEV;
+        }
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_word(s_bridge, VIA686A_ENABLE_REG, &val))
+                return -ENODEV;
+        if (!(val & 0x0001)) {
+                printk("via686a.o: enabling sensors\n");
+                if (PCIBIOS_SUCCESSFUL !=
+                    pci_write_config_word(s_bridge, VIA686A_ENABLE_REG,
+                                      val | 0x0001))
+                        return -ENODEV;
         }
 
@@ -581 +605 @@
 
         /* Reserve the ISA region */
-        request_region(address, VIA686A_EXTENT, type_name);
+        request_region(address, VIA686A_EXTENT, "via686a-sensors");
 
         /* Fill in the remaining client fields and put into the global list */
@@ -697 +721 @@
         via686a_write_value(client, VIA686A_REG_TEMP_MODE, 
                             via686a_read_value(client, VIA686A_REG_TEMP_MODE) &
-                            !VIA686A_TEMP_MODE_MASK | VIA686A_TEMP_MODE_CONTINUOUS);
+                            !(VIA686A_TEMP_MODE_MASK | VIA686A_TEMP_MODE_CONTINUOUS));
 }