This is a note to let you know that I've just added the patch titled
i2c: hisi: Only handle the interrupt of the driver's transfer
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
i2c-hisi-only-handle-the-interrupt-of-the-driver-s-transfer.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fff67c1b17ee093947bdcbac6f64d072e644159a Mon Sep 17 00:00:00 2001
From: Yicong Yang <yangyicong@xxxxxxxxxxxxx>
Date: Tue, 1 Aug 2023 20:46:25 +0800
Subject: i2c: hisi: Only handle the interrupt of the driver's transfer
From: Yicong Yang <yangyicong@xxxxxxxxxxxxx>
commit fff67c1b17ee093947bdcbac6f64d072e644159a upstream.
The controller may be shared with other port, for example the firmware.
Handle the interrupt from other sources will cause crash since some
data are not initialized. So only handle the interrupt of the driver's
transfer and discard others.
Fixes: d62fbdb99a85 ("i2c: add support for HiSilicon I2C controller")
Signed-off-by: Yicong Yang <yangyicong@xxxxxxxxxxxxx>
Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230801124625.63587-1-yangyicong@xxxxxxxxxx
Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/i2c/busses/i2c-hisi.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/drivers/i2c/busses/i2c-hisi.c
+++ b/drivers/i2c/busses/i2c-hisi.c
@@ -328,6 +328,14 @@ static irqreturn_t hisi_i2c_irq(int irq,
struct hisi_i2c_controller *ctlr = context;
u32 int_stat;
+ /*
+ * Don't handle the interrupt if cltr->completion is NULL. We may
+ * reach here because the interrupt is spurious or the transfer is
+ * started by another port (e.g. firmware) rather than us.
+ */
+ if (!ctlr->completion)
+ return IRQ_NONE;
+
int_stat = readl(ctlr->iobase + HISI_I2C_INT_MSTAT);
hisi_i2c_clear_int(ctlr, int_stat);
if (!(int_stat & HISI_I2C_INT_ALL))
Patches currently in stable-queue which might be from yangyicong@xxxxxxxxxxxxx are
queue-6.1/i2c-hisi-only-handle-the-interrupt-of-the-driver-s-transfer.patch
