Changeset 628

Timestamp:

11/14/99 03:41:27 (14 years ago)

Author:

mds

Message:

(mds) remove request_region for ACPI area. This would eventually

have conflicted with kernel ACPI support if it would access
ali15x3 registers directly.

Location:

lm-sensors/trunk

Files:

• doc/busses/i2c-ali15x3 (modified) (2 diffs)
• kernel/busses/i2c-ali15x3.c (modified) (13 diffs)

lm-sensors/trunk/doc/busses/i2c-ali15x3

@@ -86 +86 @@
 You can't just enable the SMB alone.
 The SMB and the ACPI have separate I/O spaces.
-So we have to make sure that both the SMB and the ACPI
-are mapped and enabled.
+We make sure that the SMB is enabled. We leave the ACPI alone.
 
 
@@ -99 +98 @@
 Issues
 ------
-This driver requests the I/O space both for the SMB and the ACPI
-registers, just to be safe. It doesn't actually use the ACPI region.
-It will therefore conflict with separate software
-that accesses the ACPI registers?
-To fix this, undefine MAP_ACPI.
+This driver requests the I/O space for only the SMB
+registers. It doesn't use the ACPI region.
 
 On the ASUS P5A motherboard, there are several reports that

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

@@ -51 +51 @@
     You can't just enable the SMB alone.
     The SMB and the ACPI have separate I/O spaces.
-    So we have to make sure that both the SMB and the ACPI
-    are mapped and enabled.
+    We make sure that the SMB is enabled. We leave the ACPI alone.
 
     This driver controls the SMB Host only.
     The SMB Slave controller on the M15X3 is not enabled.
-
-    This driver requests the I/O space both for the SMB and the ACPI
-    registers, just to be safe. It doesn't actually use the ACPI region.
-    It will therefore conflict with separate software
-    that accesses the ACPI registers?
-    To fix this, undefine MAP_ACPI.
 
     This driver does not use interrupts.
@@ -90 +83 @@
 #endif
 
-/* undefine this if separate ACPI software is accessing the
-   registers at the offset defined at 0x10.
-*/
-#define MAP_ACPI 1
 #undef FORCE_ALI15X3_ENABLE
 
@@ -108 +97 @@
 /* PCI Address Constants */
 #define SMBCOM    0x004 
-#define ACPIBA     0x010
 #define SMBBA     0x014
 #define SMBATPC   0x05B         /* used to unlock xxxBA registers */
@@ -118 +106 @@
 /* Other settings */
 #define MAX_TIMEOUT 500         /* times 1/100 sec */
-#define ALI15X3_ACPI_IOSIZE 64
 #define ALI15X3_SMB_IOSIZE 32
 
@@ -125 +112 @@
    tell user to upgrade BIOS and we fail.
 */
-#define ALI15X3_ACPI_DEFAULTBASE 0xEC00
 #define ALI15X3_SMB_DEFAULTBASE 0xE800
 
@@ -196 +182 @@
 
 static int __initdata ali15x3_initialized;
-#ifdef MAP_ACPI
-static unsigned short ali15x3_acpia = 0;
-#endif
 static unsigned short ali15x3_smba = 0;
 
@@ -244 +227 @@
 
 /* Check the following things:
-        - ACPI and SMB I/O addresses are initialized
+        - SMB I/O address is initialized
         - Device is enabled
         - We can use the addresses
@@ -263 +246 @@
   }
 
-/* Determine the address of the ACPI and SMBus areas */
-#ifdef MAP_ACPI
-  pci_read_config_word_united(ALI15X3_dev, ALI15X3_bus ,ALI15X3_devfn,
-                              ACPIBA,&ali15x3_acpia);
-  ali15x3_acpia &= (0xffff & ~ (ALI15X3_ACPI_IOSIZE - 1));
-  if(ali15x3_acpia == 0) {
-    printk("i2c-ali15x3.o: ALI15X3_acpi region uninitialized - upgrade BIOS?\n");
-    error_return=-ENODEV;
-  }
-#endif
-
+/* Determine the address of the SMBus area */
   pci_read_config_word_united(ALI15X3_dev, ALI15X3_bus ,ALI15X3_devfn,
                               SMBBA,&ali15x3_smba);
@@ -285 +258 @@
     goto END;
 
-#ifdef MAP_ACPI
-  if (check_region(ali15x3_acpia, ALI15X3_ACPI_IOSIZE)) {
-    printk("i2c-ali15x3.o: ALI15X3_acpi region 0x%x already in use!\n", ali15x3_acpia);
-    printk("i2c-ali15x3.o: If conflicting ACPI software is installed, undefine MAP_ACPI and recompile!\n");
-    error_return=-ENODEV;
-  }
-#endif
-
   if (check_region(ali15x3_smba, ALI15X3_SMB_IOSIZE)) {
     printk("i2c-ali15x3.o: ALI15X3_smb region 0x%x already in use!\n", ali15x3_smba);
@@ -305 +270 @@
                                 SMBCOM, &temp);
   if ((temp & 1) == 0) {
-    printk("SMBUS: Error: ACPI/SMB device not enabled - upgrade BIOS?\n");     
+    printk("SMBUS: Error: SMB device not enabled - upgrade BIOS?\n");     
     error_return=-ENODEV;
     goto END;
@@ -338 +303 @@
 
   /* Everything is happy, let's grab the memory and set things up. */
-#ifdef MAP_ACPI
-  request_region(ali15x3_acpia, ALI15X3_ACPI_IOSIZE, "ali15x3-acpi");       
-#endif
   request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, "ali15x3-smb");       
 
@@ -640 +602 @@
   }
   ali15x3_initialized ++;
-#ifdef MAP_ACPI
-  sprintf(ali15x3_adapter.name,"ACPI ALI15X3 at %04x",ali15x3_acpia);
-#endif
   sprintf(ali15x3_adapter.name,"SMBus ALI15X3 adapter at %04x",ali15x3_smba);
   if ((res = i2c_add_adapter(&ali15x3_adapter))) {
@@ -666 +625 @@
   }
   if (ali15x3_initialized >= 1) {
-#ifdef MAP_ACPI
-    release_region(ali15x3_acpia, ALI15X3_ACPI_IOSIZE);
-#endif
     release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE);
     ali15x3_initialized--;