Skip to content

L
linux
Commit 0cd96eb0 authored by David Woodhouse's avatar David Woodhouse Committed by Jean Delvare
Browse files
Options

i2c-i801: Handle multiple instances instead of keeping global state 

It's poor form to keep driver state in global variables rather than
per-instance. It never really mattered in practice when there was only
one controller on the chipset, but the latest chipsets do have more
than one controller, so now we care.
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent e30d9859
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 144 deletions
drivers/i2c/busses/i2c-i801.c
View file @ 0cd96eb0
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker
<mdsxyz123@yahoo.com> <mdsxyz123@yahoo.com>
Copyright (C) 2007, 2008 Jean Delvare <khali@linux-fr.org> Copyright (C) 2007, 2008 Jean Delvare <khali@linux-fr.org>
Copyright (C) 2010 Intel Corporation,
David Woodhouse <dwmw2@infradead.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -55,8 +57,6 @@ ...@@ -55,8 +57,6 @@
See the file Documentation/i2c/busses/i2c-i801 for details. See the file Documentation/i2c/busses/i2c-i801 for details.
*/ */
/* Note: we assume there can only be one I801, with one SMBus interface */
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -70,16 +70,16 @@ ...@@ -70,16 +70,16 @@
#include <linux/dmi.h> #include <linux/dmi.h>
/* I801 SMBus address offsets */ /* I801 SMBus address offsets */
#define SMBHSTSTS (0 + i801_smba) #define SMBHSTSTS(p) (0 + (p)->smba)
#define SMBHSTCNT (2 + i801_smba) #define SMBHSTCNT(p) (2 + (p)->smba)
#define SMBHSTCMD (3 + i801_smba) #define SMBHSTCMD(p) (3 + (p)->smba)
#define SMBHSTADD (4 + i801_smba) #define SMBHSTADD(p) (4 + (p)->smba)
#define SMBHSTDAT0 (5 + i801_smba) #define SMBHSTDAT0(p) (5 + (p)->smba)
#define SMBHSTDAT1 (6 + i801_smba) #define SMBHSTDAT1(p) (6 + (p)->smba)
#define SMBBLKDAT (7 + i801_smba) #define SMBBLKDAT(p) (7 + (p)->smba)
#define SMBPEC (8 + i801_smba) /* ICH3 and later */ #define SMBPEC(p) (8 + (p)->smba) /* ICH3 and later */
#define SMBAUXSTS (12 + i801_smba) /* ICH4 and later */ #define SMBAUXSTS(p) (12 + (p)->smba) /* ICH4 and later */
#define SMBAUXCTL (13 + i801_smba) /* ICH4 and later */ #define SMBAUXCTL(p) (13 + (p)->smba) /* ICH4 and later */
/* PCI Address Constants */ /* PCI Address Constants */
#define SMBBAR 4 #define SMBBAR 4
...@@ -128,16 +128,20 @@ ...@@ -128,16 +128,20 @@
SMBHSTSTS_BUS_ERR | SMBHSTSTS_DEV_ERR | \ SMBHSTSTS_BUS_ERR | SMBHSTSTS_DEV_ERR | \
SMBHSTSTS_INTR) SMBHSTSTS_INTR)
static unsigned long i801_smba; struct i801_priv {
static unsigned char i801_original_hstcfg; struct i2c_adapter adapter;
unsigned long smba;
unsigned char original_hstcfg;
struct pci_dev *pci_dev;
unsigned int features;
};
static struct pci_driver i801_driver; static struct pci_driver i801_driver;
static struct pci_dev *I801_dev;
#define FEATURE_SMBUS_PEC (1 << 0) #define FEATURE_SMBUS_PEC (1 << 0)
#define FEATURE_BLOCK_BUFFER (1 << 1) #define FEATURE_BLOCK_BUFFER (1 << 1)
#define FEATURE_BLOCK_PROC (1 << 2) #define FEATURE_BLOCK_PROC (1 << 2)
#define FEATURE_I2C_BLOCK_READ (1 << 3) #define FEATURE_I2C_BLOCK_READ (1 << 3)
static unsigned int i801_features;
static const char *i801_feature_names[] = { static const char *i801_feature_names[] = {
"SMBus PEC", "SMBus PEC",
...@@ -152,24 +156,24 @@ MODULE_PARM_DESC(disable_features, "Disable selected driver features"); ...@@ -152,24 +156,24 @@ MODULE_PARM_DESC(disable_features, "Disable selected driver features");
/* Make sure the SMBus host is ready to start transmitting. /* Make sure the SMBus host is ready to start transmitting.
Return 0 if it is, -EBUSY if it is not. */ Return 0 if it is, -EBUSY if it is not. */
static int i801_check_pre(void) static int i801_check_pre(struct i801_priv *priv)
{ {
int status; int status;
status = inb_p(SMBHSTSTS); status = inb_p(SMBHSTSTS(priv));
if (status & SMBHSTSTS_HOST_BUSY) { if (status & SMBHSTSTS_HOST_BUSY) {
dev_err(&I801_dev->dev, "SMBus is busy, can't use it!\n"); dev_err(&priv->pci_dev->dev, "SMBus is busy, can't use it!\n");
return -EBUSY; return -EBUSY;
} }
status &= STATUS_FLAGS; status &= STATUS_FLAGS;
if (status) { if (status) {
dev_dbg(&I801_dev->dev, "Clearing status flags (%02x)\n", dev_dbg(&priv->pci_dev->dev, "Clearing status flags (%02x)\n",
status); status);
outb_p(status, SMBHSTSTS); outb_p(status, SMBHSTSTS(priv));
status = inb_p(SMBHSTSTS) & STATUS_FLAGS; status = inb_p(SMBHSTSTS(priv)) & STATUS_FLAGS;
if (status) { if (status) {
dev_err(&I801_dev->dev, dev_err(&priv->pci_dev->dev,
"Failed clearing status flags (%02x)\n", "Failed clearing status flags (%02x)\n",
status); status);
return -EBUSY; return -EBUSY;
...@@ -180,48 +184,50 @@ static int i801_check_pre(void) ...@@ -180,48 +184,50 @@ static int i801_check_pre(void)
} }
/* Convert the status register to an error code, and clear it. */ /* Convert the status register to an error code, and clear it. */
static int i801_check_post(int status, int timeout) static int i801_check_post(struct i801_priv *priv, int status, int timeout)
{ {
int result = 0; int result = 0;
/* If the SMBus is still busy, we give up */ /* If the SMBus is still busy, we give up */
if (timeout) { if (timeout) {
dev_err(&I801_dev->dev, "Transaction timeout\n"); dev_err(&priv->pci_dev->dev, "Transaction timeout\n");
/* try to stop the current command */ /* try to stop the current command */
dev_dbg(&I801_dev->dev, "Terminating the current operation\n"); dev_dbg(&priv->pci_dev->dev, "Terminating the current operation\n");
outb_p(inb_p(SMBHSTCNT) | SMBHSTCNT_KILL, SMBHSTCNT); outb_p(inb_p(SMBHSTCNT(priv)) | SMBHSTCNT_KILL,
SMBHSTCNT(priv));
msleep(1); msleep(1);
outb_p(inb_p(SMBHSTCNT) & (~SMBHSTCNT_KILL), SMBHSTCNT); outb_p(inb_p(SMBHSTCNT(priv)) & (~SMBHSTCNT_KILL),
SMBHSTCNT(priv));
/* Check if it worked */ /* Check if it worked */
status = inb_p(SMBHSTSTS); status = inb_p(SMBHSTSTS(priv));
if ((status & SMBHSTSTS_HOST_BUSY) || if ((status & SMBHSTSTS_HOST_BUSY) ||
!(status & SMBHSTSTS_FAILED)) !(status & SMBHSTSTS_FAILED))
dev_err(&I801_dev->dev, dev_err(&priv->pci_dev->dev,
"Failed terminating the transaction\n"); "Failed terminating the transaction\n");
outb_p(STATUS_FLAGS, SMBHSTSTS); outb_p(STATUS_FLAGS, SMBHSTSTS(priv));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
if (status & SMBHSTSTS_FAILED) { if (status & SMBHSTSTS_FAILED) {
result = -EIO; result = -EIO;
dev_err(&I801_dev->dev, "Transaction failed\n"); dev_err(&priv->pci_dev->dev, "Transaction failed\n");
} }
if (status & SMBHSTSTS_DEV_ERR) { if (status & SMBHSTSTS_DEV_ERR) {
result = -ENXIO; result = -ENXIO;
dev_dbg(&I801_dev->dev, "No response\n"); dev_dbg(&priv->pci_dev->dev, "No response\n");
} }
if (status & SMBHSTSTS_BUS_ERR) { if (status & SMBHSTSTS_BUS_ERR) {
result = -EAGAIN; result = -EAGAIN;
dev_dbg(&I801_dev->dev, "Lost arbitration\n"); dev_dbg(&priv->pci_dev->dev, "Lost arbitration\n");
} }
if (result) { if (result) {
/* Clear error flags */ /* Clear error flags */
outb_p(status & STATUS_FLAGS, SMBHSTSTS); outb_p(status & STATUS_FLAGS, SMBHSTSTS(priv));
status = inb_p(SMBHSTSTS) & STATUS_FLAGS; status = inb_p(SMBHSTSTS(priv)) & STATUS_FLAGS;
if (status) { if (status) {
dev_warn(&I801_dev->dev, "Failed clearing status " dev_warn(&priv->pci_dev->dev, "Failed clearing status "
"flags at end of transaction (%02x)\n", "flags at end of transaction (%02x)\n",
status); status);
} }
...@@ -230,86 +236,88 @@ static int i801_check_post(int status, int timeout) ...@@ -230,86 +236,88 @@ static int i801_check_post(int status, int timeout)
return result; return result;
} }
static int i801_transaction(int xact) static int i801_transaction(struct i801_priv *priv, int xact)
{ {
int status; int status;
int result; int result;
int timeout = 0; int timeout = 0;
result = i801_check_pre(); result = i801_check_pre(priv);
if (result < 0) if (result < 0)
return result; return result;
/* the current contents of SMBHSTCNT can be overwritten, since PEC, /* the current contents of SMBHSTCNT can be overwritten, since PEC,
* INTREN, SMBSCMD are passed in xact */ * INTREN, SMBSCMD are passed in xact */
outb_p(xact | I801_START, SMBHSTCNT); outb_p(xact | I801_START, SMBHSTCNT(priv));
/* We will always wait for a fraction of a second! */ /* We will always wait for a fraction of a second! */
do { do {
msleep(1); msleep(1);
status = inb_p(SMBHSTSTS); status = inb_p(SMBHSTSTS(priv));
} while ((status & SMBHSTSTS_HOST_BUSY) && (timeout++ < MAX_TIMEOUT)); } while ((status & SMBHSTSTS_HOST_BUSY) && (timeout++ < MAX_TIMEOUT));
result = i801_check_post(status, timeout > MAX_TIMEOUT); result = i801_check_post(priv, status, timeout > MAX_TIMEOUT);
if (result < 0) if (result < 0)
return result; return result;
outb_p(SMBHSTSTS_INTR, SMBHSTSTS); outb_p(SMBHSTSTS_INTR, SMBHSTSTS(priv));
return 0; return 0;
} }
/* wait for INTR bit as advised by Intel */ /* wait for INTR bit as advised by Intel */
static void i801_wait_hwpec(void) static void i801_wait_hwpec(struct i801_priv *priv)
{ {
int timeout = 0; int timeout = 0;
int status; int status;
do { do {
msleep(1); msleep(1);
status = inb_p(SMBHSTSTS); status = inb_p(SMBHSTSTS(priv));
} while ((!(status & SMBHSTSTS_INTR)) } while ((!(status & SMBHSTSTS_INTR))
&& (timeout++ < MAX_TIMEOUT)); && (timeout++ < MAX_TIMEOUT));
if (timeout > MAX_TIMEOUT) if (timeout > MAX_TIMEOUT)
dev_dbg(&I801_dev->dev, "PEC Timeout!\n"); dev_dbg(&priv->pci_dev->dev, "PEC Timeout!\n");
outb_p(status, SMBHSTSTS); outb_p(status, SMBHSTSTS(priv));
} }
static int i801_block_transaction_by_block(union i2c_smbus_data *data, static int i801_block_transaction_by_block(struct i801_priv *priv,
union i2c_smbus_data *data,
char read_write, int hwpec) char read_write, int hwpec)
{ {
int i, len; int i, len;
int status; int status;
inb_p(SMBHSTCNT); /* reset the data buffer index */ inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */
/* Use 32-byte buffer to process this transaction */ /* Use 32-byte buffer to process this transaction */
if (read_write == I2C_SMBUS_WRITE) { if (read_write == I2C_SMBUS_WRITE) {
len = data->block[0]; len = data->block[0];
outb_p(len, SMBHSTDAT0); outb_p(len, SMBHSTDAT0(priv));
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
outb_p(data->block[i+1], SMBBLKDAT); outb_p(data->block[i+1], SMBBLKDAT(priv));
} }
status = i801_transaction(I801_BLOCK_DATA | ENABLE_INT9 | status = i801_transaction(priv, I801_BLOCK_DATA | ENABLE_INT9 |
I801_PEC_EN * hwpec); I801_PEC_EN * hwpec);
if (status) if (status)
return status; return status;
if (read_write == I2C_SMBUS_READ) { if (read_write == I2C_SMBUS_READ) {
len = inb_p(SMBHSTDAT0); len = inb_p(SMBHSTDAT0(priv));
if (len < 1 || len > I2C_SMBUS_BLOCK_MAX) if (len < 1 || len > I2C_SMBUS_BLOCK_MAX)
return -EPROTO; return -EPROTO;
data->block[0] = len; data->block[0] = len;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
data->block[i + 1] = inb_p(SMBBLKDAT); data->block[i + 1] = inb_p(SMBBLKDAT(priv));
} }
return 0; return 0;
} }
static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, static int i801_block_transaction_byte_by_byte(struct i801_priv *priv,
union i2c_smbus_data *data,
char read_write, int command, char read_write, int command,
int hwpec) int hwpec)
{ {
...@@ -319,15 +327,15 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, ...@@ -319,15 +327,15 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
int result; int result;
int timeout; int timeout;
result = i801_check_pre(); result = i801_check_pre(priv);
if (result < 0) if (result < 0)
return result; return result;
len = data->block[0]; len = data->block[0];
if (read_write == I2C_SMBUS_WRITE) { if (read_write == I2C_SMBUS_WRITE) {
outb_p(len, SMBHSTDAT0); outb_p(len, SMBHSTDAT0(priv));
outb_p(data->block[1], SMBBLKDAT); outb_p(data->block[1], SMBBLKDAT(priv));
} }
for (i = 1; i <= len; i++) { for (i = 1; i <= len; i++) {
...@@ -343,34 +351,37 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, ...@@ -343,34 +351,37 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
else else
smbcmd = I801_BLOCK_DATA; smbcmd = I801_BLOCK_DATA;
} }
outb_p(smbcmd | ENABLE_INT9, SMBHSTCNT); outb_p(smbcmd | ENABLE_INT9, SMBHSTCNT(priv));
if (i == 1) if (i == 1)
outb_p(inb(SMBHSTCNT) | I801_START, SMBHSTCNT); outb_p(inb(SMBHSTCNT(priv)) | I801_START,
SMBHSTCNT(priv));
/* We will always wait for a fraction of a second! */ /* We will always wait for a fraction of a second! */
timeout = 0; timeout = 0;
do { do {
msleep(1); msleep(1);
status = inb_p(SMBHSTSTS); status = inb_p(SMBHSTSTS(priv));
} while ((!(status & SMBHSTSTS_BYTE_DONE)) } while ((!(status & SMBHSTSTS_BYTE_DONE))
&& (timeout++ < MAX_TIMEOUT)); && (timeout++ < MAX_TIMEOUT));
result = i801_check_post(status, timeout > MAX_TIMEOUT); result = i801_check_post(priv, status, timeout > MAX_TIMEOUT);
if (result < 0) if (result < 0)
return result; return result;
if (i == 1 && read_write == I2C_SMBUS_READ if (i == 1 && read_write == I2C_SMBUS_READ
&& command != I2C_SMBUS_I2C_BLOCK_DATA) { && command != I2C_SMBUS_I2C_BLOCK_DATA) {
len = inb_p(SMBHSTDAT0); len = inb_p(SMBHSTDAT0(priv));
if (len < 1 || len > I2C_SMBUS_BLOCK_MAX) { if (len < 1 || len > I2C_SMBUS_BLOCK_MAX) {
dev_err(&I801_dev->dev, dev_err(&priv->pci_dev->dev,
"Illegal SMBus block read size %d\n", "Illegal SMBus block read size %d\n",
len); len);
/* Recover */ /* Recover */
while (inb_p(SMBHSTSTS) & SMBHSTSTS_HOST_BUSY) while (inb_p(SMBHSTSTS(priv)) &
outb_p(SMBHSTSTS_BYTE_DONE, SMBHSTSTS); SMBHSTSTS_HOST_BUSY)
outb_p(SMBHSTSTS_INTR, SMBHSTSTS); outb_p(SMBHSTSTS_BYTE_DONE,
SMBHSTSTS(priv));
outb_p(SMBHSTSTS_INTR, SMBHSTSTS(priv));
return -EPROTO; return -EPROTO;
} }
data->block[0] = len; data->block[0] = len;
...@@ -378,27 +389,28 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, ...@@ -378,27 +389,28 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
/* Retrieve/store value in SMBBLKDAT */ /* Retrieve/store value in SMBBLKDAT */
if (read_write == I2C_SMBUS_READ) if (read_write == I2C_SMBUS_READ)
data->block[i] = inb_p(SMBBLKDAT); data->block[i] = inb_p(SMBBLKDAT(priv));
if (read_write == I2C_SMBUS_WRITE && i+1 <= len) if (read_write == I2C_SMBUS_WRITE && i+1 <= len)
outb_p(data->block[i+1], SMBBLKDAT); outb_p(data->block[i+1], SMBBLKDAT(priv));
/* signals SMBBLKDAT ready */ /* signals SMBBLKDAT ready */
outb_p(SMBHSTSTS_BYTE_DONE | SMBHSTSTS_INTR, SMBHSTSTS); outb_p(SMBHSTSTS_BYTE_DONE | SMBHSTSTS_INTR, SMBHSTSTS(priv));
} }
return 0; return 0;
} }
static int i801_set_block_buffer_mode(void) static int i801_set_block_buffer_mode(struct i801_priv *priv)
{ {
outb_p(inb_p(SMBAUXCTL) | SMBAUXCTL_E32B, SMBAUXCTL); outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_E32B, SMBAUXCTL(priv));
if ((inb_p(SMBAUXCTL) & SMBAUXCTL_E32B) == 0) if ((inb_p(SMBAUXCTL(priv)) & SMBAUXCTL_E32B) == 0)
return -EIO; return -EIO;
return 0; return 0;
} }
/* Block transaction function */ /* Block transaction function */
static int i801_block_transaction(union i2c_smbus_data *data, char read_write, static int i801_block_transaction(struct i801_priv *priv,
union i2c_smbus_data *data, char read_write,
int command, int hwpec) int command, int hwpec)
{ {
int result = 0; int result = 0;
...@@ -407,11 +419,11 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write, ...@@ -407,11 +419,11 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
if (command == I2C_SMBUS_I2C_BLOCK_DATA) { if (command == I2C_SMBUS_I2C_BLOCK_DATA) {
if (read_write == I2C_SMBUS_WRITE) { if (read_write == I2C_SMBUS_WRITE) {
/* set I2C_EN bit in configuration register */ /* set I2C_EN bit in configuration register */
pci_read_config_byte(I801_dev, SMBHSTCFG, &hostc); pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &hostc);
pci_write_config_byte(I801_dev, SMBHSTCFG, pci_write_config_byte(priv->pci_dev, SMBHSTCFG,
hostc | SMBHSTCFG_I2C_EN); hostc | SMBHSTCFG_I2C_EN);
} else if (!(i801_features & FEATURE_I2C_BLOCK_READ)) { } else if (!(priv->features & FEATURE_I2C_BLOCK_READ)) {
dev_err(&I801_dev->dev, dev_err(&priv->pci_dev->dev,
"I2C block read is unsupported!\n"); "I2C block read is unsupported!\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
...@@ -430,22 +442,23 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write, ...@@ -430,22 +442,23 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
/* Experience has shown that the block buffer can only be used for /* Experience has shown that the block buffer can only be used for
SMBus (not I2C) block transactions, even though the datasheet SMBus (not I2C) block transactions, even though the datasheet
doesn't mention this limitation. */ doesn't mention this limitation. */
if ((i801_features & FEATURE_BLOCK_BUFFER) if ((priv->features & FEATURE_BLOCK_BUFFER)
&& command != I2C_SMBUS_I2C_BLOCK_DATA && command != I2C_SMBUS_I2C_BLOCK_DATA
&& i801_set_block_buffer_mode() == 0) && i801_set_block_buffer_mode(priv) == 0)
result = i801_block_transaction_by_block(data, read_write, result = i801_block_transaction_by_block(priv, data,
hwpec); read_write, hwpec);
else else
result = i801_block_transaction_byte_by_byte(data, read_write, result = i801_block_transaction_byte_by_byte(priv, data,
read_write,
command, hwpec); command, hwpec);
if (result == 0 && hwpec) if (result == 0 && hwpec)
i801_wait_hwpec(); i801_wait_hwpec(priv);
if (command == I2C_SMBUS_I2C_BLOCK_DATA if (command == I2C_SMBUS_I2C_BLOCK_DATA
&& read_write == I2C_SMBUS_WRITE) { && read_write == I2C_SMBUS_WRITE) {
/* restore saved configuration register value */ /* restore saved configuration register value */
pci_write_config_byte(I801_dev, SMBHSTCFG, hostc); pci_write_config_byte(priv->pci_dev, SMBHSTCFG, hostc);
} }
return result; return result;
} }
...@@ -458,81 +471,85 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, ...@@ -458,81 +471,85 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
int hwpec; int hwpec;
int block = 0; int block = 0;
int ret, xact = 0; int ret, xact = 0;
struct i801_priv *priv = i2c_get_adapdata(adap);
hwpec = (i801_features & FEATURE_SMBUS_PEC) && (flags & I2C_CLIENT_PEC) hwpec = (priv->features & FEATURE_SMBUS_PEC) && (flags & I2C_CLIENT_PEC)
&& size != I2C_SMBUS_QUICK && size != I2C_SMBUS_QUICK
&& size != I2C_SMBUS_I2C_BLOCK_DATA; && size != I2C_SMBUS_I2C_BLOCK_DATA;
switch (size) { switch (size) {
case I2C_SMBUS_QUICK: case I2C_SMBUS_QUICK:
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
SMBHSTADD); SMBHSTADD(priv));
xact = I801_QUICK; xact = I801_QUICK;
break; break;
case I2C_SMBUS_BYTE: case I2C_SMBUS_BYTE:
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
SMBHSTADD); SMBHSTADD(priv));
if (read_write == I2C_SMBUS_WRITE) if (read_write == I2C_SMBUS_WRITE)
outb_p(command, SMBHSTCMD); outb_p(command, SMBHSTCMD(priv));
xact = I801_BYTE; xact = I801_BYTE;
break; break;
case I2C_SMBUS_BYTE_DATA: case I2C_SMBUS_BYTE_DATA:
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
SMBHSTADD); SMBHSTADD(priv));
outb_p(command, SMBHSTCMD); outb_p(command, SMBHSTCMD(priv));
if (read_write == I2C_SMBUS_WRITE) if (read_write == I2C_SMBUS_WRITE)
outb_p(data->byte, SMBHSTDAT0); outb_p(data->byte, SMBHSTDAT0(priv));
xact = I801_BYTE_DATA; xact = I801_BYTE_DATA;
break; break;
case I2C_SMBUS_WORD_DATA: case I2C_SMBUS_WORD_DATA:
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
SMBHSTADD); SMBHSTADD(priv));
outb_p(command, SMBHSTCMD); outb_p(command, SMBHSTCMD(priv));
if (read_write == I2C_SMBUS_WRITE) { if (read_write == I2C_SMBUS_WRITE) {
outb_p(data->word & 0xff, SMBHSTDAT0); outb_p(data->word & 0xff, SMBHSTDAT0(priv));
outb_p((data->word & 0xff00) >> 8, SMBHSTDAT1); outb_p((data->word & 0xff00) >> 8, SMBHSTDAT1(priv));
} }
xact = I801_WORD_DATA; xact = I801_WORD_DATA;
break; break;
case I2C_SMBUS_BLOCK_DATA: case I2C_SMBUS_BLOCK_DATA:
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
SMBHSTADD); SMBHSTADD(priv));
outb_p(command, SMBHSTCMD); outb_p(command, SMBHSTCMD(priv));
block = 1; block = 1;
break; break;
case I2C_SMBUS_I2C_BLOCK_DATA: case I2C_SMBUS_I2C_BLOCK_DATA:
/* NB: page 240 of ICH5 datasheet shows that the R/#W /* NB: page 240 of ICH5 datasheet shows that the R/#W
* bit should be cleared here, even when reading */ * bit should be cleared here, even when reading */
outb_p((addr & 0x7f) << 1, SMBHSTADD); outb_p((addr & 0x7f) << 1, SMBHSTADD(priv));
if (read_write == I2C_SMBUS_READ) { if (read_write == I2C_SMBUS_READ) {
/* NB: page 240 of ICH5 datasheet also shows /* NB: page 240 of ICH5 datasheet also shows
* that DATA1 is the cmd field when reading */ * that DATA1 is the cmd field when reading */
outb_p(command, SMBHSTDAT1); outb_p(command, SMBHSTDAT1(priv));
} else } else
outb_p(command, SMBHSTCMD); outb_p(command, SMBHSTCMD(priv));
block = 1; block = 1;
break; break;
default: default:
dev_err(&I801_dev->dev, "Unsupported transaction %d\n", size); dev_err(&priv->pci_dev->dev, "Unsupported transaction %d\n",
size);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (hwpec) /* enable/disable hardware PEC */ if (hwpec) /* enable/disable hardware PEC */
outb_p(inb_p(SMBAUXCTL) | SMBAUXCTL_CRC, SMBAUXCTL); outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_CRC, SMBAUXCTL(priv));
else else
outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL); outb_p(inb_p(SMBAUXCTL(priv)) & (~SMBAUXCTL_CRC),
SMBAUXCTL(priv));
if (block) if (block)
ret = i801_block_transaction(data, read_write, size, hwpec); ret = i801_block_transaction(priv, data, read_write, size,
hwpec);
else else
ret = i801_transaction(xact | ENABLE_INT9); ret = i801_transaction(priv, xact | ENABLE_INT9);
/* Some BIOSes don't like it when PEC is enabled at reboot or resume /* Some BIOSes don't like it when PEC is enabled at reboot or resume
time, so we forcibly disable it after every transaction. Turn off time, so we forcibly disable it after every transaction. Turn off
E32B for the same reason. */ E32B for the same reason. */
if (hwpec || block) if (hwpec || block)
outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), outb_p(inb_p(SMBAUXCTL(priv)) &
SMBAUXCTL); ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));
if (block) if (block)
return ret; return ret;
...@@ -544,10 +561,11 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, ...@@ -544,10 +561,11 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
switch (xact & 0x7f) { switch (xact & 0x7f) {
case I801_BYTE: /* Result put in SMBHSTDAT0 */ case I801_BYTE: /* Result put in SMBHSTDAT0 */
case I801_BYTE_DATA: case I801_BYTE_DATA:
data->byte = inb_p(SMBHSTDAT0); data->byte = inb_p(SMBHSTDAT0(priv));
break; break;
case I801_WORD_DATA: case I801_WORD_DATA:
data->word = inb_p(SMBHSTDAT0) + (inb_p(SMBHSTDAT1) << 8); data->word = inb_p(SMBHSTDAT0(priv)) +
(inb_p(SMBHSTDAT1(priv)) << 8);
break; break;
} }
return 0; return 0;
...@@ -556,11 +574,13 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, ...@@ -556,11 +574,13 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
static u32 i801_func(struct i2c_adapter *adapter) static u32 i801_func(struct i2c_adapter *adapter)
{ {
struct i801_priv *priv = i2c_get_adapdata(adapter);
return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE | return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK | I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK |
((i801_features & FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) | ((priv->features & FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) |
((i801_features & FEATURE_I2C_BLOCK_READ) ? ((priv->features & FEATURE_I2C_BLOCK_READ) ?
I2C_FUNC_SMBUS_READ_I2C_BLOCK : 0); I2C_FUNC_SMBUS_READ_I2C_BLOCK : 0);
} }
...@@ -569,12 +589,6 @@ static const struct i2c_algorithm smbus_algorithm = { ...@@ -569,12 +589,6 @@ static const struct i2c_algorithm smbus_algorithm = {
.functionality = i801_func, .functionality = i801_func,
}; };
static struct i2c_adapter i801_adapter = {
.owner = THIS_MODULE,
.class = I2C_CLASS_HWMON | I2C_CLASS_SPD,
.algo = &smbus_algorithm,
};
static const struct pci_device_id i801_ids[] = { static const struct pci_device_id i801_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) },
...@@ -706,16 +720,25 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -706,16 +720,25 @@ static int __devinit i801_probe(struct pci_dev *dev,
{ {
unsigned char temp; unsigned char temp;
int err, i; int err, i;
struct i801_priv *priv;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
i2c_set_adapdata(&priv->adapter, priv);
priv->adapter.owner = THIS_MODULE;
priv->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
priv->adapter.algo = &smbus_algorithm;
I801_dev = dev; priv->pci_dev = dev;
i801_features = 0;
switch (dev->device) { switch (dev->device) {
default: default:
i801_features |= FEATURE_I2C_BLOCK_READ; priv->features |= FEATURE_I2C_BLOCK_READ;
/* fall through */ /* fall through */
case PCI_DEVICE_ID_INTEL_82801DB_3: case PCI_DEVICE_ID_INTEL_82801DB_3:
i801_features |= FEATURE_SMBUS_PEC; priv->features |= FEATURE_SMBUS_PEC;
i801_features |= FEATURE_BLOCK_BUFFER; priv->features |= FEATURE_BLOCK_BUFFER;
/* fall through */ /* fall through */
case PCI_DEVICE_ID_INTEL_82801CA_3: case PCI_DEVICE_ID_INTEL_82801CA_3:
case PCI_DEVICE_ID_INTEL_82801BA_2: case PCI_DEVICE_ID_INTEL_82801BA_2:
...@@ -726,11 +749,11 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -726,11 +749,11 @@ static int __devinit i801_probe(struct pci_dev *dev,
/* Disable features on user request */ /* Disable features on user request */
for (i = 0; i < ARRAY_SIZE(i801_feature_names); i++) { for (i = 0; i < ARRAY_SIZE(i801_feature_names); i++) {
if (i801_features & disable_features & (1 << i)) if (priv->features & disable_features & (1 << i))
dev_notice(&dev->dev, "%s disabled by user\n", dev_notice(&dev->dev, "%s disabled by user\n",
i801_feature_names[i]); i801_feature_names[i]);
} }
i801_features &= ~disable_features; priv->features &= ~disable_features;
err = pci_enable_device(dev); err = pci_enable_device(dev);
if (err) { if (err) {
...@@ -740,8 +763,8 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -740,8 +763,8 @@ static int __devinit i801_probe(struct pci_dev *dev,
} }
/* Determine the address of the SMBus area */ /* Determine the address of the SMBus area */
i801_smba = pci_resource_start(dev, SMBBAR); priv->smba = pci_resource_start(dev, SMBBAR);
if (!i801_smba) { if (!priv->smba) {
dev_err(&dev->dev, "SMBus base address uninitialized, " dev_err(&dev->dev, "SMBus base address uninitialized, "
"upgrade BIOS\n"); "upgrade BIOS\n");
err = -ENODEV; err = -ENODEV;
...@@ -757,19 +780,19 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -757,19 +780,19 @@ static int __devinit i801_probe(struct pci_dev *dev,
err = pci_request_region(dev, SMBBAR, i801_driver.name); err = pci_request_region(dev, SMBBAR, i801_driver.name);
if (err) { if (err) {
dev_err(&dev->dev, "Failed to request SMBus region " dev_err(&dev->dev, "Failed to request SMBus region "
"0x%lx-0x%Lx\n", i801_smba, "0x%lx-0x%Lx\n", priv->smba,
(unsigned long long)pci_resource_end(dev, SMBBAR)); (unsigned long long)pci_resource_end(dev, SMBBAR));
goto exit; goto exit;
} }
pci_read_config_byte(I801_dev, SMBHSTCFG, &temp); pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &temp);
i801_original_hstcfg = temp; priv->original_hstcfg = temp;
temp &= ~SMBHSTCFG_I2C_EN; /* SMBus timing */ temp &= ~SMBHSTCFG_I2C_EN; /* SMBus timing */
if (!(temp & SMBHSTCFG_HST_EN)) { if (!(temp & SMBHSTCFG_HST_EN)) {
dev_info(&dev->dev, "Enabling SMBus device\n"); dev_info(&dev->dev, "Enabling SMBus device\n");
temp |= SMBHSTCFG_HST_EN; temp |= SMBHSTCFG_HST_EN;
} }
pci_write_config_byte(I801_dev, SMBHSTCFG, temp); pci_write_config_byte(priv->pci_dev, SMBHSTCFG, temp);
if (temp & SMBHSTCFG_SMB_SMI_EN) if (temp & SMBHSTCFG_SMB_SMI_EN)
dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n"); dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n");
...@@ -777,19 +800,19 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -777,19 +800,19 @@ static int __devinit i801_probe(struct pci_dev *dev,
dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n"); dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n");
/* Clear special mode bits */ /* Clear special mode bits */
if (i801_features & (FEATURE_SMBUS_PEC | FEATURE_BLOCK_BUFFER)) if (priv->features & (FEATURE_SMBUS_PEC | FEATURE_BLOCK_BUFFER))
outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), outb_p(inb_p(SMBAUXCTL(priv)) &
SMBAUXCTL); ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));
/* set up the sysfs linkage to our parent device */ /* set up the sysfs linkage to our parent device */
i801_adapter.dev.parent = &dev->dev; priv->adapter.dev.parent = &dev->dev;
/* Retry up to 3 times on lost arbitration */ /* Retry up to 3 times on lost arbitration */
i801_adapter.retries = 3; priv->adapter.retries = 3;
snprintf(i801_adapter.name, sizeof(i801_adapter.name), snprintf(priv->adapter.name, sizeof(priv->adapter.name),
"SMBus I801 adapter at %04lx", i801_smba); "SMBus I801 adapter at %04lx", priv->smba);
err = i2c_add_adapter(&i801_adapter); err = i2c_add_adapter(&priv->adapter);
if (err) { if (err) {
dev_err(&dev->dev, "Failed to add SMBus adapter\n"); dev_err(&dev->dev, "Failed to add SMBus adapter\n");
goto exit_release; goto exit_release;
...@@ -803,27 +826,33 @@ static int __devinit i801_probe(struct pci_dev *dev, ...@@ -803,27 +826,33 @@ static int __devinit i801_probe(struct pci_dev *dev,
memset(&info, 0, sizeof(struct i2c_board_info)); memset(&info, 0, sizeof(struct i2c_board_info));
info.addr = apanel_addr; info.addr = apanel_addr;
strlcpy(info.type, "fujitsu_apanel", I2C_NAME_SIZE); strlcpy(info.type, "fujitsu_apanel", I2C_NAME_SIZE);
i2c_new_device(&i801_adapter, &info); i2c_new_device(&priv->adapter, &info);
} }
#endif #endif
#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE #if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
if (dmi_name_in_vendors("FUJITSU")) if (dmi_name_in_vendors("FUJITSU"))
dmi_walk(dmi_check_onboard_devices, &i801_adapter); dmi_walk(dmi_check_onboard_devices, &priv->adapter);
#endif #endif
pci_set_drvdata(dev, priv);
return 0; return 0;
exit_release: exit_release:
pci_release_region(dev, SMBBAR); pci_release_region(dev, SMBBAR);
exit: exit:
kfree(priv);
return err; return err;
} }
static void __devexit i801_remove(struct pci_dev *dev) static void __devexit i801_remove(struct pci_dev *dev)
{ {
i2c_del_adapter(&i801_adapter); struct i801_priv *priv = pci_get_drvdata(dev);
pci_write_config_byte(I801_dev, SMBHSTCFG, i801_original_hstcfg);
i2c_del_adapter(&priv->adapter);
pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
pci_release_region(dev, SMBBAR); pci_release_region(dev, SMBBAR);
pci_set_drvdata(dev, NULL);
kfree(priv);
/* /*
* do not call pci_disable_device(dev) since it can cause hard hangs on * do not call pci_disable_device(dev) since it can cause hard hangs on
* some systems during power-off (eg. Fujitsu-Siemens Lifebook E8010) * some systems during power-off (eg. Fujitsu-Siemens Lifebook E8010)
...@@ -833,8 +862,10 @@ static void __devexit i801_remove(struct pci_dev *dev) ...@@ -833,8 +862,10 @@ static void __devexit i801_remove(struct pci_dev *dev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int i801_suspend(struct pci_dev *dev, pm_message_t mesg) static int i801_suspend(struct pci_dev *dev, pm_message_t mesg)
{ {
struct i801_priv *priv = pci_get_drvdata(dev);
pci_save_state(dev); pci_save_state(dev);
pci_write_config_byte(dev, SMBHSTCFG, i801_original_hstcfg); pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
pci_set_power_state(dev, pci_choose_state(dev, mesg)); pci_set_power_state(dev, pci_choose_state(dev, mesg));
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7