]> git.itanic.dy.fi Git - linux-stable/commitdiff
mailbox: zynqmp: Fix IPI isr handling
authorTanmay Shah <tanmay.shah@amd.com>
Sat, 11 Mar 2023 01:24:05 +0000 (17:24 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:03:40 +0000 (23:03 +0900)
commit 74ad37a30ffee3643bc34f9ca7225b20a66abaaf upstream.

Multiple IPI channels are mapped to same interrupt handler.
Current isr implementation handles only one channel per isr.
Fix this behavior by checking isr status bit of all child
mailbox nodes.

Fixes: 4981b82ba2ff ("mailbox: ZynqMP IPI mailbox controller")
Signed-off-by: Tanmay Shah <tanmay.shah@amd.com>
Acked-by: Michal Simek <michal.simek@amd.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230311012407.1292118-3-tanmay.shah@amd.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mailbox/zynqmp-ipi-mailbox.c

index 12e004ff1a147e5f32b6e719b9eb7211c394ed6d..e02a4a18e8c298349e7905dca94bf3d333890922 100644 (file)
@@ -152,7 +152,7 @@ static irqreturn_t zynqmp_ipi_interrupt(int irq, void *data)
        struct zynqmp_ipi_message *msg;
        u64 arg0, arg3;
        struct arm_smccc_res res;
-       int ret, i;
+       int ret, i, status = IRQ_NONE;
 
        (void)irq;
        arg0 = SMC_IPI_MAILBOX_STATUS_ENQUIRY;
@@ -170,11 +170,11 @@ static irqreturn_t zynqmp_ipi_interrupt(int irq, void *data)
                                memcpy_fromio(msg->data, mchan->req_buf,
                                              msg->len);
                                mbox_chan_received_data(chan, (void *)msg);
-                               return IRQ_HANDLED;
+                               status = IRQ_HANDLED;
                        }
                }
        }
-       return IRQ_NONE;
+       return status;
 }
 
 /**