]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: hisi-sfc-v3xx: Return IRQ_NONE if no interrupts were detected
authorDevyn Liu <liudingyuan@huawei.com>
Tue, 23 Jan 2024 07:11:49 +0000 (15:11 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Mar 2024 12:16:44 +0000 (13:16 +0100)
[ Upstream commit de8b6e1c231a95abf95ad097b993d34b31458ec9 ]

Return IRQ_NONE from the interrupt handler when no interrupt was
detected. Because an empty interrupt will cause a null pointer error:

    Unable to handle kernel NULL pointer dereference at virtual
  address 0000000000000008
    Call trace:
        complete+0x54/0x100
        hisi_sfc_v3xx_isr+0x2c/0x40 [spi_hisi_sfc_v3xx]
        __handle_irq_event_percpu+0x64/0x1e0
        handle_irq_event+0x7c/0x1cc

Signed-off-by: Devyn Liu <liudingyuan@huawei.com>
Link: https://msgid.link/r/20240123071149.917678-1-liudingyuan@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/spi/spi-hisi-sfc-v3xx.c

index 4650b483a33d32c34f0c21d671af44ebab1d94dc..e0c3ad73c576d5081645667dbf125c5854bdcf66 100644 (file)
@@ -365,6 +365,11 @@ static const struct spi_controller_mem_ops hisi_sfc_v3xx_mem_ops = {
 static irqreturn_t hisi_sfc_v3xx_isr(int irq, void *data)
 {
        struct hisi_sfc_v3xx_host *host = data;
+       u32 reg;
+
+       reg = readl(host->regbase + HISI_SFC_V3XX_INT_STAT);
+       if (!reg)
+               return IRQ_NONE;
 
        hisi_sfc_v3xx_disable_int(host);