p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i2c: i801: store and restore the SLVCMD register at load and unload 

Also do not override any other configuration in this register.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Benjamin Tissoires 2016-10-13 14:10:35 +02:00 committed by Wolfram Sang
parent 6bec23bff9
commit 22e94bd677
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/i2c/busses/i2c-i801.c
View File

@ -243,6 +243,7 @@ struct i801_priv {
struct i2c_adapter adapter; struct i2c_adapter adapter;
unsigned long smba; unsigned long smba;
unsigned char original_hstcfg; unsigned char original_hstcfg;
unsigned char original_slvcmd;
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
unsigned int features; unsigned int features;
@ -962,13 +963,26 @@ static int i801_enable_host_notify(struct i2c_adapter *adapter)
if (!priv->host_notify) if (!priv->host_notify)
return -ENOMEM; return -ENOMEM;
outb_p(SMBSLVCMD_HST_NTFY_INTREN, SMBSLVCMD(priv)); priv->original_slvcmd = inb_p(SMBSLVCMD(priv));
if (!(SMBSLVCMD_HST_NTFY_INTREN & priv->original_slvcmd))
outb_p(SMBSLVCMD_HST_NTFY_INTREN | priv->original_slvcmd,
SMBSLVCMD(priv));
/* clear Host Notify bit to allow a new notification */ /* clear Host Notify bit to allow a new notification */
outb_p(SMBSLVSTS_HST_NTFY_STS, SMBSLVSTS(priv)); outb_p(SMBSLVSTS_HST_NTFY_STS, SMBSLVSTS(priv));
return 0; return 0;
} }
static void i801_disable_host_notify(struct i801_priv *priv)
{
if (!(priv->features & FEATURE_HOST_NOTIFY))
return;
outb_p(priv->original_slvcmd, SMBSLVCMD(priv));
}
static const struct i2c_algorithm smbus_algorithm = { static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = i801_access, .smbus_xfer = i801_access,
.functionality = i801_func, .functionality = i801_func,
@ -1663,6 +1677,7 @@ static void i801_remove(struct pci_dev *dev)
pm_runtime_forbid(&dev->dev); pm_runtime_forbid(&dev->dev);
pm_runtime_get_noresume(&dev->dev); pm_runtime_get_noresume(&dev->dev);
i801_disable_host_notify(priv);
i801_del_mux(priv); i801_del_mux(priv);
i2c_del_adapter(&priv->adapter); i2c_del_adapter(&priv->adapter);
i801_acpi_remove(priv); i801_acpi_remove(priv);