forked from Minki/linux
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers i2c-i801: Handle multiple instances instead of keeping global state i2c-i801: Add Intel Patsburg device ID i2c: Drop unused I2C_CLASS_TV flags
This commit is contained in:
Linus Torvalds
commit
50440c6dcc
@ -15,10 +15,14 @@ Supported adapters:
|
||||
* Intel 82801I (ICH9)
|
||||
* Intel EP80579 (Tolapai)
|
||||
* Intel 82801JI (ICH10)
|
||||
* Intel 3400/5 Series (PCH)
|
||||
* Intel 5/3400 Series (PCH)
|
||||
* Intel Cougar Point (PCH)
|
||||
* Intel Patsburg (PCH)
|
||||
Datasheets: Publicly available at the Intel website
|
||||
|
||||
On Intel Patsburg and later chipsets, both the normal host SMBus controller
|
||||
and the additional 'Integrated Device Function' controllers are supported.
|
||||
|
||||
Authors:
|
||||
Mark Studebaker <mdsxyz123@yahoo.com>
|
||||
Jean Delvare <khali@linux-fr.org>
|
||||
|
||||
@ -99,6 +99,7 @@ config I2C_I801
|
||||
ICH10
|
||||
5/3400 Series (PCH)
|
||||
Cougar Point (PCH)
|
||||
Patsburg (PCH)
|
||||
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called i2c-i801.
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker
|
||||
<mdsxyz123@yahoo.com>
|
||||
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
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -43,6 +45,10 @@
|
||||
ICH10 0x3a60 32 hard yes yes yes
|
||||
5/3400 Series (PCH) 0x3b30 32 hard yes yes yes
|
||||
Cougar Point (PCH) 0x1c22 32 hard yes yes yes
|
||||
Patsburg (PCH) 0x1d22 32 hard yes yes yes
|
||||
Patsburg (PCH) IDF 0x1d70 32 hard yes yes yes
|
||||
Patsburg (PCH) IDF 0x1d71 32 hard yes yes yes
|
||||
Patsburg (PCH) IDF 0x1d72 32 hard yes yes yes
|
||||
|
||||
Features supported by this driver:
|
||||
Software PEC no
|
||||
@ -50,12 +56,11 @@
|
||||
Block buffer yes
|
||||
Block process call transaction no
|
||||
I2C block read transaction yes (doesn't use the block buffer)
|
||||
Slave mode no
|
||||
|
||||
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/pci.h>
|
||||
#include <linux/kernel.h>
|
||||
@ -69,16 +74,16 @@
|
||||
#include <linux/dmi.h>
|
||||
|
||||
/* I801 SMBus address offsets */
|
||||
#define SMBHSTSTS (0 + i801_smba)
|
||||
#define SMBHSTCNT (2 + i801_smba)
|
||||
#define SMBHSTCMD (3 + i801_smba)
|
||||
#define SMBHSTADD (4 + i801_smba)
|
||||
#define SMBHSTDAT0 (5 + i801_smba)
|
||||
#define SMBHSTDAT1 (6 + i801_smba)
|
||||
#define SMBBLKDAT (7 + i801_smba)
|
||||
#define SMBPEC (8 + i801_smba) /* ICH3 and later */
|
||||
#define SMBAUXSTS (12 + i801_smba) /* ICH4 and later */
|
||||
#define SMBAUXCTL (13 + i801_smba) /* ICH4 and later */
|
||||
#define SMBHSTSTS(p) (0 + (p)->smba)
|
||||
#define SMBHSTCNT(p) (2 + (p)->smba)
|
||||
#define SMBHSTCMD(p) (3 + (p)->smba)
|
||||
#define SMBHSTADD(p) (4 + (p)->smba)
|
||||
#define SMBHSTDAT0(p) (5 + (p)->smba)
|
||||
#define SMBHSTDAT1(p) (6 + (p)->smba)
|
||||
#define SMBBLKDAT(p) (7 + (p)->smba)
|
||||
#define SMBPEC(p) (8 + (p)->smba) /* ICH3 and later */
|
||||
#define SMBAUXSTS(p) (12 + (p)->smba) /* ICH4 and later */
|
||||
#define SMBAUXCTL(p) (13 + (p)->smba) /* ICH4 and later */
|
||||
|
||||
/* PCI Address Constants */
|
||||
#define SMBBAR 4
|
||||
@ -127,16 +132,25 @@
|
||||
SMBHSTSTS_BUS_ERR | SMBHSTSTS_DEV_ERR | \
|
||||
SMBHSTSTS_INTR)
|
||||
|
||||
static unsigned long i801_smba;
|
||||
static unsigned char i801_original_hstcfg;
|
||||
/* Patsburg also has three 'Integrated Device Function' SMBus controllers */
|
||||
#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0 0x1d70
|
||||
#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1 0x1d71
|
||||
#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2 0x1d72
|
||||
|
||||
struct i801_priv {
|
||||
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_dev *I801_dev;
|
||||
|
||||
#define FEATURE_SMBUS_PEC (1 << 0)
|
||||
#define FEATURE_BLOCK_BUFFER (1 << 1)
|
||||
#define FEATURE_BLOCK_PROC (1 << 2)
|
||||
#define FEATURE_I2C_BLOCK_READ (1 << 3)
|
||||
static unsigned int i801_features;
|
||||
|
||||
static const char *i801_feature_names[] = {
|
||||
"SMBus PEC",
|
||||
@ -151,24 +165,24 @@ MODULE_PARM_DESC(disable_features, "Disable selected driver features");
|
||||
|
||||
/* 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(void)
|
||||
static int i801_check_pre(struct i801_priv *priv)
|
||||
{
|
||||
int status;
|
||||
|
||||
status = inb_p(SMBHSTSTS);
|
||||
status = inb_p(SMBHSTSTS(priv));
|
||||
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;
|
||||
}
|
||||
|
||||
status &= STATUS_FLAGS;
|
||||
if (status) {
|
||||
dev_dbg(&I801_dev->dev, "Clearing status flags (%02x)\n",
|
||||
dev_dbg(&priv->pci_dev->dev, "Clearing status flags (%02x)\n",
|
||||
status);
|
||||
outb_p(status, SMBHSTSTS);
|
||||
status = inb_p(SMBHSTSTS) & STATUS_FLAGS;
|
||||
outb_p(status, SMBHSTSTS(priv));
|
||||
status = inb_p(SMBHSTSTS(priv)) & STATUS_FLAGS;
|
||||
if (status) {
|
||||
dev_err(&I801_dev->dev,
|
||||
dev_err(&priv->pci_dev->dev,
|
||||
"Failed clearing status flags (%02x)\n",
|
||||
status);
|
||||
return -EBUSY;
|
||||
@ -179,48 +193,50 @@ static int i801_check_pre(void)
|
||||
}
|
||||
|
||||
/* 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;
|
||||
|
||||
/* If the SMBus is still busy, we give up */
|
||||
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 */
|
||||
dev_dbg(&I801_dev->dev, "Terminating the current operation\n");
|
||||
outb_p(inb_p(SMBHSTCNT) | SMBHSTCNT_KILL, SMBHSTCNT);
|
||||
dev_dbg(&priv->pci_dev->dev, "Terminating the current operation\n");
|
||||
outb_p(inb_p(SMBHSTCNT(priv)) | SMBHSTCNT_KILL,
|
||||
SMBHSTCNT(priv));
|
||||
msleep(1);
|
||||
outb_p(inb_p(SMBHSTCNT) & (~SMBHSTCNT_KILL), SMBHSTCNT);
|
||||
outb_p(inb_p(SMBHSTCNT(priv)) & (~SMBHSTCNT_KILL),
|
||||
SMBHSTCNT(priv));
|
||||
|
||||
/* Check if it worked */
|
||||
status = inb_p(SMBHSTSTS);
|
||||
status = inb_p(SMBHSTSTS(priv));
|
||||
if ((status & SMBHSTSTS_HOST_BUSY) ||
|
||||
!(status & SMBHSTSTS_FAILED))
|
||||
dev_err(&I801_dev->dev,
|
||||
dev_err(&priv->pci_dev->dev,
|
||||
"Failed terminating the transaction\n");
|
||||
outb_p(STATUS_FLAGS, SMBHSTSTS);
|
||||
outb_p(STATUS_FLAGS, SMBHSTSTS(priv));
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
if (status & SMBHSTSTS_FAILED) {
|
||||
result = -EIO;
|
||||
dev_err(&I801_dev->dev, "Transaction failed\n");
|
||||
dev_err(&priv->pci_dev->dev, "Transaction failed\n");
|
||||
}
|
||||
if (status & SMBHSTSTS_DEV_ERR) {
|
||||
result = -ENXIO;
|
||||
dev_dbg(&I801_dev->dev, "No response\n");
|
||||
dev_dbg(&priv->pci_dev->dev, "No response\n");
|
||||
}
|
||||
if (status & SMBHSTSTS_BUS_ERR) {
|
||||
result = -EAGAIN;
|
||||
dev_dbg(&I801_dev->dev, "Lost arbitration\n");
|
||||
dev_dbg(&priv->pci_dev->dev, "Lost arbitration\n");
|
||||
}
|
||||
|
||||
if (result) {
|
||||
/* Clear error flags */
|
||||
outb_p(status & STATUS_FLAGS, SMBHSTSTS);
|
||||
status = inb_p(SMBHSTSTS) & STATUS_FLAGS;
|
||||
outb_p(status & STATUS_FLAGS, SMBHSTSTS(priv));
|
||||
status = inb_p(SMBHSTSTS(priv)) & STATUS_FLAGS;
|
||||
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",
|
||||
status);
|
||||
}
|
||||
@ -229,86 +245,88 @@ static int i801_check_post(int status, int timeout)
|
||||
return result;
|
||||
}
|
||||
|
||||
static int i801_transaction(int xact)
|
||||
static int i801_transaction(struct i801_priv *priv, int xact)
|
||||
{
|
||||
int status;
|
||||
int result;
|
||||
int timeout = 0;
|
||||
|
||||
result = i801_check_pre();
|
||||
result = i801_check_pre(priv);
|
||||
if (result < 0)
|
||||
return result;
|
||||
|
||||
/* the current contents of SMBHSTCNT can be overwritten, since PEC,
|
||||
* 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! */
|
||||
do {
|
||||
msleep(1);
|
||||
status = inb_p(SMBHSTSTS);
|
||||
status = inb_p(SMBHSTSTS(priv));
|
||||
} 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)
|
||||
return result;
|
||||
|
||||
outb_p(SMBHSTSTS_INTR, SMBHSTSTS);
|
||||
outb_p(SMBHSTSTS_INTR, SMBHSTSTS(priv));
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 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 status;
|
||||
|
||||
do {
|
||||
msleep(1);
|
||||
status = inb_p(SMBHSTSTS);
|
||||
status = inb_p(SMBHSTSTS(priv));
|
||||
} while ((!(status & SMBHSTSTS_INTR))
|
||||
&& (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)
|
||||
{
|
||||
int i, len;
|
||||
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 */
|
||||
if (read_write == I2C_SMBUS_WRITE) {
|
||||
len = data->block[0];
|
||||
outb_p(len, SMBHSTDAT0);
|
||||
outb_p(len, SMBHSTDAT0(priv));
|
||||
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);
|
||||
if (status)
|
||||
return status;
|
||||
|
||||
if (read_write == I2C_SMBUS_READ) {
|
||||
len = inb_p(SMBHSTDAT0);
|
||||
len = inb_p(SMBHSTDAT0(priv));
|
||||
if (len < 1 || len > I2C_SMBUS_BLOCK_MAX)
|
||||
return -EPROTO;
|
||||
|
||||
data->block[0] = len;
|
||||
for (i = 0; i < len; i++)
|
||||
data->block[i + 1] = inb_p(SMBBLKDAT);
|
||||
data->block[i + 1] = inb_p(SMBBLKDAT(priv));
|
||||
}
|
||||
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,
|
||||
int hwpec)
|
||||
{
|
||||
@ -318,15 +336,15 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
|
||||
int result;
|
||||
int timeout;
|
||||
|
||||
result = i801_check_pre();
|
||||
result = i801_check_pre(priv);
|
||||
if (result < 0)
|
||||
return result;
|
||||
|
||||
len = data->block[0];
|
||||
|
||||
if (read_write == I2C_SMBUS_WRITE) {
|
||||
outb_p(len, SMBHSTDAT0);
|
||||
outb_p(data->block[1], SMBBLKDAT);
|
||||
outb_p(len, SMBHSTDAT0(priv));
|
||||
outb_p(data->block[1], SMBBLKDAT(priv));
|
||||
}
|
||||
|
||||
for (i = 1; i <= len; i++) {
|
||||
@ -342,34 +360,37 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
|
||||
else
|
||||
smbcmd = I801_BLOCK_DATA;
|
||||
}
|
||||
outb_p(smbcmd | ENABLE_INT9, SMBHSTCNT);
|
||||
outb_p(smbcmd | ENABLE_INT9, SMBHSTCNT(priv));
|
||||
|
||||
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! */
|
||||
timeout = 0;
|
||||
do {
|
||||
msleep(1);
|
||||
status = inb_p(SMBHSTSTS);
|
||||
status = inb_p(SMBHSTSTS(priv));
|
||||
} while ((!(status & SMBHSTSTS_BYTE_DONE))
|
||||
&& (timeout++ < MAX_TIMEOUT));
|
||||
|
||||
result = i801_check_post(status, timeout > MAX_TIMEOUT);
|
||||
result = i801_check_post(priv, status, timeout > MAX_TIMEOUT);
|
||||
if (result < 0)
|
||||
return result;
|
||||
|
||||
if (i == 1 && read_write == I2C_SMBUS_READ
|
||||
&& command != I2C_SMBUS_I2C_BLOCK_DATA) {
|
||||
len = inb_p(SMBHSTDAT0);
|
||||
len = inb_p(SMBHSTDAT0(priv));
|
||||
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",
|
||||
len);
|
||||
/* Recover */
|
||||
while (inb_p(SMBHSTSTS) & SMBHSTSTS_HOST_BUSY)
|
||||
outb_p(SMBHSTSTS_BYTE_DONE, SMBHSTSTS);
|
||||
outb_p(SMBHSTSTS_INTR, SMBHSTSTS);
|
||||
while (inb_p(SMBHSTSTS(priv)) &
|
||||
SMBHSTSTS_HOST_BUSY)
|
||||
outb_p(SMBHSTSTS_BYTE_DONE,
|
||||
SMBHSTSTS(priv));
|
||||
outb_p(SMBHSTSTS_INTR, SMBHSTSTS(priv));
|
||||
return -EPROTO;
|
||||
}
|
||||
data->block[0] = len;
|
||||
@ -377,27 +398,28 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
|
||||
|
||||
/* Retrieve/store value in SMBBLKDAT */
|
||||
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)
|
||||
outb_p(data->block[i+1], SMBBLKDAT);
|
||||
outb_p(data->block[i+1], SMBBLKDAT(priv));
|
||||
|
||||
/* signals SMBBLKDAT ready */
|
||||
outb_p(SMBHSTSTS_BYTE_DONE | SMBHSTSTS_INTR, SMBHSTSTS);
|
||||
outb_p(SMBHSTSTS_BYTE_DONE | SMBHSTSTS_INTR, SMBHSTSTS(priv));
|
||||
}
|
||||
|
||||
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);
|
||||
if ((inb_p(SMBAUXCTL) & SMBAUXCTL_E32B) == 0)
|
||||
outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_E32B, SMBAUXCTL(priv));
|
||||
if ((inb_p(SMBAUXCTL(priv)) & SMBAUXCTL_E32B) == 0)
|
||||
return -EIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 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 result = 0;
|
||||
@ -406,11 +428,11 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
|
||||
if (command == I2C_SMBUS_I2C_BLOCK_DATA) {
|
||||
if (read_write == I2C_SMBUS_WRITE) {
|
||||
/* set I2C_EN bit in configuration register */
|
||||
pci_read_config_byte(I801_dev, SMBHSTCFG, &hostc);
|
||||
pci_write_config_byte(I801_dev, SMBHSTCFG,
|
||||
pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &hostc);
|
||||
pci_write_config_byte(priv->pci_dev, SMBHSTCFG,
|
||||
hostc | SMBHSTCFG_I2C_EN);
|
||||
} else if (!(i801_features & FEATURE_I2C_BLOCK_READ)) {
|
||||
dev_err(&I801_dev->dev,
|
||||
} else if (!(priv->features & FEATURE_I2C_BLOCK_READ)) {
|
||||
dev_err(&priv->pci_dev->dev,
|
||||
"I2C block read is unsupported!\n");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
@ -429,22 +451,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
|
||||
SMBus (not I2C) block transactions, even though the datasheet
|
||||
doesn't mention this limitation. */
|
||||
if ((i801_features & FEATURE_BLOCK_BUFFER)
|
||||
if ((priv->features & FEATURE_BLOCK_BUFFER)
|
||||
&& command != I2C_SMBUS_I2C_BLOCK_DATA
|
||||
&& i801_set_block_buffer_mode() == 0)
|
||||
result = i801_block_transaction_by_block(data, read_write,
|
||||
hwpec);
|
||||
&& i801_set_block_buffer_mode(priv) == 0)
|
||||
result = i801_block_transaction_by_block(priv, data,
|
||||
read_write, hwpec);
|
||||
else
|
||||
result = i801_block_transaction_byte_by_byte(data, read_write,
|
||||
result = i801_block_transaction_byte_by_byte(priv, data,
|
||||
read_write,
|
||||
command, hwpec);
|
||||
|
||||
if (result == 0 && hwpec)
|
||||
i801_wait_hwpec();
|
||||
i801_wait_hwpec(priv);
|
||||
|
||||
if (command == I2C_SMBUS_I2C_BLOCK_DATA
|
||||
&& read_write == I2C_SMBUS_WRITE) {
|
||||
/* restore saved configuration register value */
|
||||
pci_write_config_byte(I801_dev, SMBHSTCFG, hostc);
|
||||
pci_write_config_byte(priv->pci_dev, SMBHSTCFG, hostc);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@ -457,81 +480,85 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
|
||||
int hwpec;
|
||||
int block = 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_I2C_BLOCK_DATA;
|
||||
|
||||
switch (size) {
|
||||
case I2C_SMBUS_QUICK:
|
||||
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
|
||||
SMBHSTADD);
|
||||
SMBHSTADD(priv));
|
||||
xact = I801_QUICK;
|
||||
break;
|
||||
case I2C_SMBUS_BYTE:
|
||||
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
|
||||
SMBHSTADD);
|
||||
SMBHSTADD(priv));
|
||||
if (read_write == I2C_SMBUS_WRITE)
|
||||
outb_p(command, SMBHSTCMD);
|
||||
outb_p(command, SMBHSTCMD(priv));
|
||||
xact = I801_BYTE;
|
||||
break;
|
||||
case I2C_SMBUS_BYTE_DATA:
|
||||
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
|
||||
SMBHSTADD);
|
||||
outb_p(command, SMBHSTCMD);
|
||||
SMBHSTADD(priv));
|
||||
outb_p(command, SMBHSTCMD(priv));
|
||||
if (read_write == I2C_SMBUS_WRITE)
|
||||
outb_p(data->byte, SMBHSTDAT0);
|
||||
outb_p(data->byte, SMBHSTDAT0(priv));
|
||||
xact = I801_BYTE_DATA;
|
||||
break;
|
||||
case I2C_SMBUS_WORD_DATA:
|
||||
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
|
||||
SMBHSTADD);
|
||||
outb_p(command, SMBHSTCMD);
|
||||
SMBHSTADD(priv));
|
||||
outb_p(command, SMBHSTCMD(priv));
|
||||
if (read_write == I2C_SMBUS_WRITE) {
|
||||
outb_p(data->word & 0xff, SMBHSTDAT0);
|
||||
outb_p((data->word & 0xff00) >> 8, SMBHSTDAT1);
|
||||
outb_p(data->word & 0xff, SMBHSTDAT0(priv));
|
||||
outb_p((data->word & 0xff00) >> 8, SMBHSTDAT1(priv));
|
||||
}
|
||||
xact = I801_WORD_DATA;
|
||||
break;
|
||||
case I2C_SMBUS_BLOCK_DATA:
|
||||
outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
|
||||
SMBHSTADD);
|
||||
outb_p(command, SMBHSTCMD);
|
||||
SMBHSTADD(priv));
|
||||
outb_p(command, SMBHSTCMD(priv));
|
||||
block = 1;
|
||||
break;
|
||||
case I2C_SMBUS_I2C_BLOCK_DATA:
|
||||
/* NB: page 240 of ICH5 datasheet shows that the R/#W
|
||||
* 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) {
|
||||
/* NB: page 240 of ICH5 datasheet also shows
|
||||
* that DATA1 is the cmd field when reading */
|
||||
outb_p(command, SMBHSTDAT1);
|
||||
outb_p(command, SMBHSTDAT1(priv));
|
||||
} else
|
||||
outb_p(command, SMBHSTCMD);
|
||||
outb_p(command, SMBHSTCMD(priv));
|
||||
block = 1;
|
||||
break;
|
||||
default:
|
||||
dev_err(&I801_dev->dev, "Unsupported transaction %d\n", size);
|
||||
dev_err(&priv->pci_dev->dev, "Unsupported transaction %d\n",
|
||||
size);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
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
|
||||
outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL);
|
||||
outb_p(inb_p(SMBAUXCTL(priv)) & (~SMBAUXCTL_CRC),
|
||||
SMBAUXCTL(priv));
|
||||
|
||||
if (block)
|
||||
ret = i801_block_transaction(data, read_write, size, hwpec);
|
||||
ret = i801_block_transaction(priv, data, read_write, size,
|
||||
hwpec);
|
||||
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
|
||||
time, so we forcibly disable it after every transaction. Turn off
|
||||
E32B for the same reason. */
|
||||
if (hwpec || block)
|
||||
outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B),
|
||||
SMBAUXCTL);
|
||||
outb_p(inb_p(SMBAUXCTL(priv)) &
|
||||
~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));
|
||||
|
||||
if (block)
|
||||
return ret;
|
||||
@ -543,10 +570,11 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
|
||||
switch (xact & 0x7f) {
|
||||
case I801_BYTE: /* Result put in SMBHSTDAT0 */
|
||||
case I801_BYTE_DATA:
|
||||
data->byte = inb_p(SMBHSTDAT0);
|
||||
data->byte = inb_p(SMBHSTDAT0(priv));
|
||||
break;
|
||||
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;
|
||||
}
|
||||
return 0;
|
||||
@ -555,11 +583,13 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
|
||||
|
||||
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 |
|
||||
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
|
||||
I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK |
|
||||
((i801_features & FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) |
|
||||
((i801_features & FEATURE_I2C_BLOCK_READ) ?
|
||||
((priv->features & FEATURE_SMBUS_PEC) ? I2C_FUNC_SMBUS_PEC : 0) |
|
||||
((priv->features & FEATURE_I2C_BLOCK_READ) ?
|
||||
I2C_FUNC_SMBUS_READ_I2C_BLOCK : 0);
|
||||
}
|
||||
|
||||
@ -568,12 +598,6 @@ static const struct i2c_algorithm smbus_algorithm = {
|
||||
.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[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) },
|
||||
@ -592,6 +616,10 @@ static const struct pci_device_id i801_ids[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2) },
|
||||
{ 0, }
|
||||
};
|
||||
|
||||
@ -704,16 +732,25 @@ static int __devinit i801_probe(struct pci_dev *dev,
|
||||
{
|
||||
unsigned char temp;
|
||||
int err, i;
|
||||
struct i801_priv *priv;
|
||||
|
||||
I801_dev = dev;
|
||||
i801_features = 0;
|
||||
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;
|
||||
|
||||
priv->pci_dev = dev;
|
||||
switch (dev->device) {
|
||||
default:
|
||||
i801_features |= FEATURE_I2C_BLOCK_READ;
|
||||
priv->features |= FEATURE_I2C_BLOCK_READ;
|
||||
/* fall through */
|
||||
case PCI_DEVICE_ID_INTEL_82801DB_3:
|
||||
i801_features |= FEATURE_SMBUS_PEC;
|
||||
i801_features |= FEATURE_BLOCK_BUFFER;
|
||||
priv->features |= FEATURE_SMBUS_PEC;
|
||||
priv->features |= FEATURE_BLOCK_BUFFER;
|
||||
/* fall through */
|
||||
case PCI_DEVICE_ID_INTEL_82801CA_3:
|
||||
case PCI_DEVICE_ID_INTEL_82801BA_2:
|
||||
@ -724,11 +761,11 @@ static int __devinit i801_probe(struct pci_dev *dev,
|
||||
|
||||
/* Disable features on user request */
|
||||
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",
|
||||
i801_feature_names[i]);
|
||||
}
|
||||
i801_features &= ~disable_features;
|
||||
priv->features &= ~disable_features;
|
||||
|
||||
err = pci_enable_device(dev);
|
||||
if (err) {
|
||||
@ -738,8 +775,8 @@ static int __devinit i801_probe(struct pci_dev *dev,
|
||||
}
|
||||
|
||||
/* Determine the address of the SMBus area */
|
||||
i801_smba = pci_resource_start(dev, SMBBAR);
|
||||
if (!i801_smba) {
|
||||
priv->smba = pci_resource_start(dev, SMBBAR);
|
||||
if (!priv->smba) {
|
||||
dev_err(&dev->dev, "SMBus base address uninitialized, "
|
||||
"upgrade BIOS\n");
|
||||
err = -ENODEV;
|
||||
@ -755,19 +792,19 @@ static int __devinit i801_probe(struct pci_dev *dev,
|
||||
err = pci_request_region(dev, SMBBAR, i801_driver.name);
|
||||
if (err) {
|
||||
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));
|
||||
goto exit;
|
||||
}
|
||||
|
||||
pci_read_config_byte(I801_dev, SMBHSTCFG, &temp);
|
||||
i801_original_hstcfg = temp;
|
||||
pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &temp);
|
||||
priv->original_hstcfg = temp;
|
||||
temp &= ~SMBHSTCFG_I2C_EN; /* SMBus timing */
|
||||
if (!(temp & SMBHSTCFG_HST_EN)) {
|
||||
dev_info(&dev->dev, "Enabling SMBus device\n");
|
||||
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)
|
||||
dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n");
|
||||
@ -775,19 +812,19 @@ static int __devinit i801_probe(struct pci_dev *dev,
|
||||
dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n");
|
||||
|
||||
/* Clear special mode bits */
|
||||
if (i801_features & (FEATURE_SMBUS_PEC | FEATURE_BLOCK_BUFFER))
|
||||
outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B),
|
||||
SMBAUXCTL);
|
||||
if (priv->features & (FEATURE_SMBUS_PEC | FEATURE_BLOCK_BUFFER))
|
||||
outb_p(inb_p(SMBAUXCTL(priv)) &
|
||||
~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));
|
||||
|
||||
/* 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 */
|
||||
i801_adapter.retries = 3;
|
||||
priv->adapter.retries = 3;
|
||||
|
||||
snprintf(i801_adapter.name, sizeof(i801_adapter.name),
|
||||
"SMBus I801 adapter at %04lx", i801_smba);
|
||||
err = i2c_add_adapter(&i801_adapter);
|
||||
snprintf(priv->adapter.name, sizeof(priv->adapter.name),
|
||||
"SMBus I801 adapter at %04lx", priv->smba);
|
||||
err = i2c_add_adapter(&priv->adapter);
|
||||
if (err) {
|
||||
dev_err(&dev->dev, "Failed to add SMBus adapter\n");
|
||||
goto exit_release;
|
||||
@ -801,27 +838,33 @@ static int __devinit i801_probe(struct pci_dev *dev,
|
||||
memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
info.addr = apanel_addr;
|
||||
strlcpy(info.type, "fujitsu_apanel", I2C_NAME_SIZE);
|
||||
i2c_new_device(&i801_adapter, &info);
|
||||
i2c_new_device(&priv->adapter, &info);
|
||||
}
|
||||
#endif
|
||||
#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
|
||||
if (dmi_name_in_vendors("FUJITSU"))
|
||||
dmi_walk(dmi_check_onboard_devices, &i801_adapter);
|
||||
dmi_walk(dmi_check_onboard_devices, &priv->adapter);
|
||||
#endif
|
||||
|
||||
pci_set_drvdata(dev, priv);
|
||||
return 0;
|
||||
|
||||
exit_release:
|
||||
pci_release_region(dev, SMBBAR);
|
||||
exit:
|
||||
kfree(priv);
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __devexit i801_remove(struct pci_dev *dev)
|
||||
{
|
||||
i2c_del_adapter(&i801_adapter);
|
||||
pci_write_config_byte(I801_dev, SMBHSTCFG, i801_original_hstcfg);
|
||||
struct i801_priv *priv = pci_get_drvdata(dev);
|
||||
|
||||
i2c_del_adapter(&priv->adapter);
|
||||
pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
|
||||
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
|
||||
* some systems during power-off (eg. Fujitsu-Siemens Lifebook E8010)
|
||||
@ -831,8 +874,10 @@ static void __devexit i801_remove(struct pci_dev *dev)
|
||||
#ifdef CONFIG_PM
|
||||
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_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));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -320,7 +320,6 @@ static struct i2c_algorithm tm6000_algo = {
|
||||
|
||||
static struct i2c_adapter tm6000_adap_template = {
|
||||
.owner = THIS_MODULE,
|
||||
.class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
|
||||
.name = "tm6000",
|
||||
.algo = &tm6000_algo,
|
||||
};
|
||||
|
||||
@ -407,8 +407,6 @@ void i2c_unlock_adapter(struct i2c_adapter *);
|
||||
|
||||
/* i2c adapter classes (bitmask) */
|
||||
#define I2C_CLASS_HWMON (1<<0) /* lm_sensors, ... */
|
||||
#define I2C_CLASS_TV_ANALOG (1<<1) /* bttv + friends */
|
||||
#define I2C_CLASS_TV_DIGITAL (1<<2) /* dvb cards */
|
||||
#define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */
|
||||
#define I2C_CLASS_SPD (1<<7) /* SPD EEPROMs and similar */
|
||||
|
||||
|
||||
@ -2465,6 +2465,7 @@
|
||||
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
|
||||
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN 0x1c41
|
||||
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
|
||||
#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
|
||||
#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC 0x1d40
|
||||
#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
|
||||
#define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
|
||||
|
||||
Loading…
Reference in New Issue
Block a user