wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-03 13:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed forcibly enabled stuff to insmod parameters.

Browse Source 
There are now two new insmod parameters, and the #define has disappeared

force: if set to anything but zero, this enables the PIIX4 as the old
       #define did.
force_addr: This first sets a new I/O port address for the PIIX4, and
       afterwards enables it. Supercedes 'force'.

Note that using force_addr is very, very dangerous if you do not know
what you are doing. On the other hand, it was very easy to add, and can
be a big help if your BIOS doesn't set correct addresses.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@353 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Frodo Looijaard committed 1999-04-02 22:37:00 +00:00
1 parent 297c84c605
commit c0aac1c8da
1 file changed
+46 -23
Download Patch File Download Diff File Expand all files Collapse all files
kernel/busses/i2c-piix4.c
+46 -23
View File
@@ -70,6 +70,20 @@
#define PIIX4_WORD_DATA 0x0C
#define PIIX4_BLOCK_DATA 0x14
/* insmod parameters */
/* If force is set to anything different from 0, we forcibly enable the
PIIX4. DANGEROUS! */
static int force = 0;
MODULE_PARM(force,"i");
MODULE_PARM_DESC(force,"Forcibly enable the PIIX4. DANGEROUS!");
/* 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,"Forcibly enable the PIIX4 at the given address. "
"EXTREMELY DANGEROUS!");
static int piix4_init(void);
static int piix4_cleanup(void);
@@ -137,9 +151,15 @@ int piix4_setup(void)
}
/* Determine the address of the SMBus areas */
pci_read_config_word_united(PIIX4_dev, PIIX4_bus ,PIIX4_devfn,
SMBBA,&piix4_smba);
piix4_smba &= 0xfff0;
if (force_addr) {
piix4_smba = force_addr & 0xfff0;
force = 0;
} else {
pci_read_config_word_united(PIIX4_dev, PIIX4_bus ,PIIX4_devfn,
SMBBA,&piix4_smba);
piix4_smba &= 0xfff0;
}
if (check_region(piix4_smba, 8)) {
printk("i2c-piix4.o: PIIX4_smb region 0x%x already in use!\n", piix4_smba);
@@ -147,33 +167,36 @@ int piix4_setup(void)
goto END;
}
pci_read_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
pci_read_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
SMBHSTCFG, &temp);
#ifdef FORCE_PIIX4_ENABLE
/* If force_addr is set, we program the new address here. Just to make
sure, we disable the PIIX4 first. */
if (force_addr) {
pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
SMBHSTCFG, temp & 0xfe);
pci_write_config_word_united(PIIX4_dev, PIIX4_bus ,PIIX4_devfn,
SMBBA,piix4_smba);
pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
SMBHSTCFG, temp | 0x01);
printk("i2c-piix4.o: WARNING: PIIX4 SMBus interface set to new "
"address %04x!\n",piix4_smba);
} else if ((temp & 1) == 0) {
if (force) {
/* This should never need to be done, but has been noted that
many Dell machines have the SMBus interface on the PIIX4
disabled!? NOTE: This assumes I/O space and other allocations WERE
done by the Bios! Don't complain if your hardware does weird
things after enabling this. :') Check for Bios updates before
resorting to this. */
if ((temp & 1) == 0) {
pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
SMBHSTCFG, temp | 1);
printk("i2c-piix4.o: WARNING: PIIX4 SMBus interface has been FORCEFULLY "
"ENABLED!!\n");
/* Update configuration value */
pci_read_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
SMBHSTCFG, &temp);
/* Note: We test the bit again in the next 'if' just to be sure... */
}
#endif /* FORCE_PIIX4_ENABLE */
if ((temp & 1) == 0) {
printk("SMBUS: Error: Host SMBus controller not enabled!\n");
error_return=-ENODEV;
goto END;
pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
SMBHSTCFG, temp | 1);
printk("i2c-piix4.o: WARNING: PIIX4 SMBus interface has been FORCEFULLY "
"ENABLED!\n");
} else {
printk("SMBUS: Error: Host SMBus controller not enabled!\n");
error_return=-ENODEV;
goto END;
}
}
/* Everything is happy, let's grab the memory and set things up. */