Changeset 1073

Timestamp:

04/21/01 21:49:15 (12 years ago)

Author:

mds

Message:

Change base-address-setting parameter from force or force_via686a

to force_addr. It is now consistent with the bus PCI adapters
that support base address setting (piix4, i801, viapro).
Other benefit is that via686a_find can now return -ENODEV,
and module will fail to load when base address is not set and
parameter is not used.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (2 diffs)
• doc/chips/MODPARMS (modified) (3 diffs)
• doc/chips/via686a (modified) (2 diffs)
• kernel/chips/via686a.c (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -22 +22 @@
         If your make fails because it can't find <linux/i2c-proc.h>, you
         forgot this step!!!
-        Also, mkpatch is probably broken right now.
   File doc/FAQ: Many updates and additions
   File doc/chips/via686a: Claim support for 686b.
@@ -44 +43 @@
   Module sensors: Disabled, moved to i2c package as i2c-proc.c
   Module sis5595: Fix temp, add in4 for chip revision 0xc0.
-  Module via686a: Allow force=9191,address (for A7V/K7V boards)
+  Module via686a: Allow force_addr=0xaddr (for A7V/K7V boards)
   Module w83781d: Don't reinitialize as99127f chip; this may cause fan/temp
                   reading changes

lm-sensors/trunk/doc/chips/MODPARMS

@@ -1 @@
-All chip drivers have a few insmod module parameters in common. These
+Paramters for modprobe and insmod
+=================================
+
+All chip drivers have a few modprobe module parameters in common.
+(Insmod can also be used, but we recommend modprobe so that
+other required modules are automatically loaded.) These
 parameters can be used when a module is inserted, to give some additional
 information about how it should function. In this case, they tell where
@@ -13 +18 @@
 
 Each adapter has a number of addresses on I2C/SMBus adapters and/or the
-ISA bus that are always scanned if no insmod parameters are given. The
+ISA bus that are always scanned if no modprobe parameters are given. The
 parameters below override those addresses that are scanned by default.
 
-All insmod parameters described below take lists of positive integers
+All modprobe parameters described below take lists of positive integers
 (unsigned, in the range of 0 to 65535) as their arguments.  Integers
 are separated by comma's, and may be given as ordinary decimal numbers,
 as octal numbers (by starting them with a `0') or as hexadecimal numbers
 (by starting them with a `0x'). More information can be found by
-entering `man insmod'.
+entering `man modprobe' or `man insmod'.
 
 `force', `force_*', `ignore' and `probe' parameters take pairs of numbers.
@@ -58 +63 @@
 
 An example:
-  insmod lm78 force_lm79=9191,0x390 ignore=0,0x2d,1,0x20 probe_range=-1,0,0x7f
+  modprobe lm78 force_lm79=9191,0x390 ignore=0,0x2d,1,0x20 probe_range=-1,0,0x7f
   # ISA address 0x390 contains a LM79
   # Scan all I2C addresses (from 0 to 0x7f) for all I2C adapters
   # But skip address 0x2d on adapter 0, and address 0x20 on adapter 1
+
+`force_addr' is a parameter used for PCI sensor adapters.
+It is used to program the base address of the sensor registers.
+This is required if the BIOS does not initialize the base address.

lm-sensors/trunk/doc/chips/via686a

@@ -19 +19 @@
 -----------------
 
-force=9191,address      Set the I/O base address. Useful for Asus A7V boards
+force_addr=0xaddr       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.
@@ -25 +25 @@
                         base address is not set. Otherwise the driver will
                         recognize both the old and the forced address.
-
-force_via686a=9191,address      Same as force.
+                        Example: 'modprobe via686a force_addr=0x290'
 
 

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

@@ -58 +58 @@
 #define THIS_MODULE NULL
 #endif
+
+/* If force_addr is set to anything different from 0, we forcibly enable
+   the PIIX4 at the given address. VERY DANGEROUS! */
+static int force_addr = 0;
+MODULE_PARM(force_addr, "i");
+MODULE_PARM_DESC(force_addr,
+                 "Initialize the Via686a at the given address");
 
 /* Addresses to scan.
@@ -527 +534 @@
                 return -ENODEV;
         *address = val & ~(VIA686A_EXTENT - 1);
-        if (*address == 0) {
-                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.
+        if (*address == 0 && force_addr == 0) {
+                printk("via686a.o: base address not set - upgrade BIOS or use force_addr=0xaddr\n");
                 return -ENODEV;
-*/
-        }
-/*
-   Moved below.
-        if (PCIBIOS_SUCCESSFUL !=
-            pci_read_config_word(s_bridge, VIA686A_ENABLE_REG, &val))
-                return -ENODEV;
-        if (!(val & 0x01)) {
-                printk("via686a.o: enabling sensors\n");
-                pci_write_config_word(s_bridge, VIA686A_ENABLE_REG,
-                                      val | 0x01);
-        }
-*/
+        }
+        if (force_addr)
+                *address = force_addr;  /* so detect will get called */
+
         return 0;
 }
@@ -566 +561 @@
         }
 
-        if(kind >= 0)           /* force or force_via686a */
-                address &= ~(VIA686A_EXTENT - 1);
+        if(force_addr)
+                address = force_addr & ~(VIA686A_EXTENT - 1);
         if (check_region(address, VIA686A_EXTENT)) {
                 printk("via686a.o: region 0x%x already in use!\n",
@@ -574 +569 @@
         }
 
-        if(kind >= 0) {         /* treat force and force_via686a equally */
+        if(force_addr) {
                 printk("via686a.o: forcing ISA address 0x%04X\n", address);
                 if (PCIBIOS_SUCCESSFUL !=