Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1466410
| From | Benjamin Tissoires <benjamin.tissoires@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 02/10] i2c: i801: store and restore the SLVCMD register at load and unload |
| Date | 2016-08-19 15:30 +0200 |
| Message-ID | <s7S1Y-68X-47@gated-at.bofh.it> (permalink) |
| References | <s7S1Y-68X-21@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Also do not override any other configuration in this register.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
new in v2
---
drivers/i2c/busses/i2c-i801.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 84eabb1..179e387 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -240,6 +240,7 @@ struct i801_priv {
struct i2c_adapter adapter;
unsigned long smba;
unsigned char original_hstcfg;
+ unsigned char original_slvcmd;
struct pci_dev *pci_dev;
unsigned int features;
@@ -952,7 +953,12 @@ static int i801_enable_host_notify(struct i2c_adapter *adapter)
if (!priv->host_notify)
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 */
outb_p(SMBSLVSTS_HST_NTFY_STS, SMBSLVSTS(priv));
@@ -961,12 +967,11 @@ static int i801_enable_host_notify(struct i2c_adapter *adapter)
static void i801_disable_host_notify(struct i801_priv *priv)
{
-
if (!(priv->features & FEATURE_HOST_NOTIFY))
return;
/* disable Host Notify... */
- outb_p(0, SMBSLVCMD(priv));
+ outb_p(priv->original_slvcmd, SMBSLVCMD(priv));
/* ...and process the already queued notifications */
i2c_cancel_smbus_host_notify(priv->host_notify);
}
--
2.5.5
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/10] i2c: Host Notify / i801 fixes Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:30 +0200 [PATCH v2 02/10] i2c: i801: store and restore the SLVCMD register at load and unload Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:30 +0200 [PATCH v2 04/10] i2c: i801: use BIT() macro for bits definition Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 10/10] i2c: i801: remove SMBNTFDDAT reads as they always seem to return 0 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 06/10] i2c: i801: do not report an error if FEATURE_HOST_NOTIFY is not set Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 01/10] i2c: i2c-smbus: prevent races on remove when Host Notify is used Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 07/10] i2c: i2c-smbus: remove double warning message Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 03/10] i2c: i801: minor formatting issues Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 08/10] i2c: i2c-smbus: fix return value of i2c_handle_smbus_host_notify() Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 05/10] i2c: i801: use the BIT() macro for FEATURES_* also Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 09/10] i2c: i801: warn on i2c_handle_smbus_host_notify() errors Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200
csiph-web