From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>,
ck+kernelbugzilla@bl4ckb0x.de, stephane.poignant@protonmail.com,
Jean Delvare <jdelvare@suse.de>, Wolfram Sang <wsa@kernel.org>,
Sasha Levin <sashal@kernel.org>,
jdelvare@suse.com, linux-i2c@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 12/25] i2c: i801: Fix interrupt storm from SMB_ALERT signal
Date: Tue, 30 Nov 2021 09:51:42 -0500 [thread overview]
Message-ID: <20211130145156.946083-12-sashal@kernel.org> (raw)
In-Reply-To: <20211130145156.946083-1-sashal@kernel.org>
From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
[ Upstream commit 03a976c9afb5e3c4f8260c6c08a27d723b279c92 ]
Currently interrupt storm will occur from i2c-i801 after first
transaction if SMB_ALERT signal is enabled and ever asserted. It is
enough if the signal is asserted once even before the driver is loaded
and does not recover because that interrupt is not acknowledged.
This fix aims to fix it by two ways:
- Add acknowledging for the SMB_ALERT interrupt status
- Disable the SMB_ALERT interrupt on platforms where possible since the
driver currently does not make use for it
Acknowledging resets the SMB_ALERT interrupt status on all platforms and
also should help to avoid interrupt storm on older platforms where the
SMB_ALERT interrupt disabling is not available.
For simplicity this fix reuses the host notify feature for disabling and
restoring original register value.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=177311
Reported-by: ck+kernelbugzilla@bl4ckb0x.de
Reported-by: stephane.poignant@protonmail.com
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Tested-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/i2c/busses/i2c-i801.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index a959062ded4f8..9aecf5958e0ef 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -190,6 +190,7 @@
#define SMBSLVSTS_HST_NTFY_STS BIT(0)
/* Host Notify Command register bits */
+#define SMBSLVCMD_SMBALERT_DISABLE BIT(2)
#define SMBSLVCMD_HST_NTFY_INTREN BIT(0)
#define STATUS_ERROR_FLAGS (SMBHSTSTS_FAILED | SMBHSTSTS_BUS_ERR | \
@@ -652,12 +653,20 @@ static irqreturn_t i801_isr(int irq, void *dev_id)
i801_isr_byte_done(priv);
/*
- * Clear irq sources and report transaction result.
+ * Clear remaining IRQ sources: Completion of last command, errors
+ * and the SMB_ALERT signal. SMB_ALERT status is set after signal
+ * assertion independently of the interrupt generation being blocked
+ * or not so clear it always when the status is set.
+ */
+ status &= SMBHSTSTS_INTR | STATUS_ERROR_FLAGS | SMBHSTSTS_SMBALERT_STS;
+ if (status)
+ outb_p(status, SMBHSTSTS(priv));
+ status &= ~SMBHSTSTS_SMBALERT_STS; /* SMB_ALERT not reported */
+ /*
+ * Report transaction result.
* ->status must be cleared before the next transaction is started.
*/
- status &= SMBHSTSTS_INTR | STATUS_ERROR_FLAGS;
if (status) {
- outb_p(status, SMBHSTSTS(priv));
priv->status = status;
wake_up(&priv->waitq);
}
@@ -992,9 +1001,13 @@ static void i801_enable_host_notify(struct i2c_adapter *adapter)
if (!(priv->features & FEATURE_HOST_NOTIFY))
return;
- if (!(SMBSLVCMD_HST_NTFY_INTREN & priv->original_slvcmd))
- outb_p(SMBSLVCMD_HST_NTFY_INTREN | priv->original_slvcmd,
- SMBSLVCMD(priv));
+ /*
+ * Enable host notify interrupt and block the generation of interrupt
+ * from the SMB_ALERT signal because the driver does not support
+ * SMBus Alert.
+ */
+ outb_p(SMBSLVCMD_HST_NTFY_INTREN | SMBSLVCMD_SMBALERT_DISABLE |
+ priv->original_slvcmd, SMBSLVCMD(priv));
/* clear Host Notify bit to allow a new notification */
outb_p(SMBSLVSTS_HST_NTFY_STS, SMBSLVSTS(priv));
--
2.33.0
next prev parent reply other threads:[~2021-11-30 14:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 14:51 [PATCH AUTOSEL 5.4 01/25] ASoC: mediatek: mt8173-rt5650: Rename Speaker control to Ext Spk Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 02/25] ASoC: qdsp6: q6adm: improve error reporting Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 03/25] ASoC: qdsp6: q6routing: validate port id before setting up route Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 04/25] xen/privcmd: make option visible in Kconfig Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 05/25] NFSv4.1: handle NFS4ERR_NOSPC by CREATE_SESSION Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 06/25] HID: multitouch: Fix Iiyama ProLite T1931SAW (0eef:0001 again!) Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 07/25] parisc: Provide an extru_safe() macro to extract unsigned bits Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 08/25] parisc: Convert PTE lookup to use extru_safe() macro Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 09/25] selftests/tc-testings: Be compatible with newer tc output Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 10/25] scsi: scsi_debug: Sanity check block descriptor length in resp_mode_select() Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 11/25] locking/rwsem: Optimize down_read_trylock() under highly contended case Sasha Levin
2021-11-30 14:51 ` Sasha Levin [this message]
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 13/25] mmc: spi: Add device-tree SPI IDs Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 14/25] net: chelsio: cxgb4vf: Fix an error code in cxgb4vf_pci_probe() Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 15/25] smb2: clarify rc initialization in smb2_reconnect Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 16/25] nvmet-tcp: fix a race condition between release_queue and io_work Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 17/25] nvmet-tcp: add an helper to free the cmd buffers Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 18/25] nvmet-tcp: fix memory leak when performing a controller reset Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 19/25] nvme-tcp: fix memory leak when freeing a queue Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 20/25] nvme-pci: add NO APST quirk for Kioxia device Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 21/25] nvme: fix write zeroes pi Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 22/25] PM: hibernate: Fix snapshot partial write lengths Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 23/25] net: qed: fix the array may be out of bound Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 24/25] net: ptp: add a definition for the UDP port for IEEE 1588 general messages Sasha Levin
2021-11-30 14:51 ` [PATCH AUTOSEL 5.4 25/25] fs: ntfs: Limit NTFS_RW to page sizes smaller than 64k Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211130145156.946083-12-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=ck+kernelbugzilla@bl4ckb0x.de \
--cc=jarkko.nikula@linux.intel.com \
--cc=jdelvare@suse.com \
--cc=jdelvare@suse.de \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=stephane.poignant@protonmail.com \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox