wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-28 12:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change base-address-setting parameter from force or force_via686a

Browse Source 
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.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1073 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Mark D. Studebaker committed 2001-04-21 19:49:15 +00:00
1 parent da40be7ab2
commit de2652db9e
4 files changed
+32 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

kernel/chips/via686a.c
+15 -20
View File
@@ -58,6 +58,13 @@
#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.
Note that we can't determine the ISA address until we have initialized
our module */
@@ -526,25 +533,13 @@ int via686a_find(int *address)
pci_read_config_word(s_bridge, VIA686A_BASE_REG, &val))
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;
}
@@ -565,15 +560,15 @@ int via686a_detect(struct i2c_adapter *adapter, int address,
return 0;
}
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",
address);
return -ENODEV;
}
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 !=
pci_write_config_word(s_bridge, VIA686A_BASE_REG, address))