The i2c-i801 driver (along with 12 others) was modified to include a check
for ACPI resource conflicts by the following commit prior to 2.6.27
release:
commit 54fb4a05af0a4b814e6716cfdf3fa97fc6be7a32
i2c: Check for ACPI resource conflicts
The resource conflict check prevents a non-ACPI driver from accessing the
same hardware as an ACPI driver. However, the check is unnecessary for the
i2c-801 driver due to a previously unused semaphore provided by the
underlying hardware.
The INUSE_STS bit in the HST_STA/HST_STS register implements a hardware
semaphore that allows multiple drivers (BIOS/EFI, Linux non-ACPI, Linux
ACPI, etc.) to safely attempt to access the SMBus interface
simultaneously.
This commit adds a check to aquire the INUSE_STS semaphore before any
SMBus registers are altered and adds calls to release the semaphore
before returning in i801_access. It also removes the
acpi_check_resource_conflict call.
If any of the multiple possible drivers fails to properly utilize the
hardware semaphore (the INUSE_STS bit is not intentionally read and never
reset), then that driver will prevent the remaining drivers from gaining
the semaphore and no conflicting accesses will occur.
This corrects behavior seen on some hardware where an ACPI resource
conflict is detected, but the ASL methods defined in ACPI are
incompatible with the i2c-scmi driver. This results in no driver being
bound to the hardware, when both could safely be bound.
Signed-off-by: Aaron Sierra <asierra@xxxxxxxxxxx>
---
drivers/i2c/busses/i2c-i801.c | 55 ++++++++++++++++++++++++++++++++++-------
1 file changed, 46 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 3779315..68f5605 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -220,6 +220,36 @@ static unsigned int disable_features;
module_param(disable_features, uint, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(disable_features, "Disable selected driver features");
+/*
+ * Make sure that we get the hardware-provided semaphore so that any other
+ * driver knows that other software is accessing the SMBus registers.
+ * Return 0 if we get it, -EBUSY if not.
+ */
+static int i801_sem_get(struct i801_priv *priv)
+{
+ int status;
+ int timeout = 0;
+
+ status = inb_p(SMBHSTSTS(priv));
+ while ((status & SMBHSTSTS_INUSE_STS) && (timeout < MAX_RETRIES)) {
+ usleep_range(1000, 3000);
+ status = inb_p(SMBHSTSTS(priv));
+ timeout++;
+ }
+
+ if (status & SMBHSTSTS_INUSE_STS) {
+ dev_err(&priv->pci_dev->dev, "SMBus is in use, can't use it!\n");
+ return -EBUSY;
+ }
+
+ return 0;
+}
+
+static void i801_sem_put(struct i801_priv *priv)
+{
+ outb_p(SMBHSTSTS_INUSE_STS, SMBHSTSTS(priv));
+}
+
/* Make sure the SMBus host is ready to start transmitting.
Return 0 if it is, -EBUSY if it is not. */
static int i801_check_pre(struct i801_priv *priv)
@@ -653,6 +683,10 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
int ret, xact = 0;
struct i801_priv *priv = i2c_get_adapdata(adap);
+ ret = i801_sem_get(priv);
+ if (ret < 0)
+ return ret;
+
hwpec = (priv->features & FEATURE_SMBUS_PEC) && (flags & I2C_CLIENT_PEC)
&& size != I2C_SMBUS_QUICK
&& size != I2C_SMBUS_I2C_BLOCK_DATA;
@@ -709,6 +743,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
default:
dev_err(&priv->pci_dev->dev, "Unsupported transaction %d\n",
size);
+ i801_sem_put(priv);
return -EOPNOTSUPP;
}
@@ -731,12 +766,18 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
outb_p(inb_p(SMBAUXCTL(priv)) &
~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));
- if (block)
+ if (block) {
+ i801_sem_put(priv);
return ret;
- if (ret)
+ }
+ if (ret) {
+ i801_sem_put(priv);
return ret;
- if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK))
+ }
+ if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK)) {
+ i801_sem_put(priv);
return 0;
+ }
switch (xact & 0x7f) {
case I801_BYTE: /* Result put in SMBHSTDAT0 */
@@ -748,6 +789,8 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
(inb_p(SMBHSTDAT1(priv)) << 8);
break;
}
+
+ i801_sem_put(priv);
return 0;
}
@@ -1151,12 +1194,6 @@ static int __devinit i801_probe(struct pci_dev *dev,
goto exit;
}
- err = acpi_check_resource_conflict(&dev->resource[SMBBAR]);
- if (err) {
- err = -ENODEV;
- goto exit;
- }
-
err = pci_request_region(dev, SMBBAR, i801_driver.name);
if (err) {
dev_err(&dev->dev, "Failed to request SMBus region "
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
