This is a note to let you know that I've just added the patch titled
mailbox: zynqmp: Fix counts of child nodes
to the 6.3-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:
mailbox-zynqmp-fix-counts-of-child-nodes.patch
and it can be found in the queue-6.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f72f805e72882c361e2a612c64a6e549f3da7152 Mon Sep 17 00:00:00 2001
From: Tanmay Shah <tanmay.shah@xxxxxxx>
Date: Fri, 10 Mar 2023 17:24:04 -0800
Subject: mailbox: zynqmp: Fix counts of child nodes
From: Tanmay Shah <tanmay.shah@xxxxxxx>
commit f72f805e72882c361e2a612c64a6e549f3da7152 upstream.
If child mailbox node status is disabled it causes
crash in interrupt handler. Fix this by assigning
only available child node during driver probe.
Fixes: 4981b82ba2ff ("mailbox: ZynqMP IPI mailbox controller")
Signed-off-by: Tanmay Shah <tanmay.shah@xxxxxxx>
Acked-by: Michal Simek <michal.simek@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20230311012407.1292118-2-tanmay.shah@xxxxxxx
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/mailbox/zynqmp-ipi-mailbox.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- a/drivers/mailbox/zynqmp-ipi-mailbox.c
+++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
@@ -634,7 +634,12 @@ static int zynqmp_ipi_probe(struct platf
struct zynqmp_ipi_mbox *mbox;
int num_mboxes, ret = -EINVAL;
- num_mboxes = of_get_child_count(np);
+ num_mboxes = of_get_available_child_count(np);
+ if (num_mboxes == 0) {
+ dev_err(dev, "mailbox nodes not available\n");
+ return -EINVAL;
+ }
+
pdata = devm_kzalloc(dev, struct_size(pdata, ipi_mboxes, num_mboxes),
GFP_KERNEL);
if (!pdata)
Patches currently in stable-queue which might be from tanmay.shah@xxxxxxx are
queue-6.3/mailbox-zynqmp-fix-typo-in-ipi-documentation.patch
queue-6.3/mailbox-zynqmp-fix-counts-of-child-nodes.patch
queue-6.3/drivers-remoteproc-xilinx-fix-carveout-names.patch
queue-6.3/mailbox-zynqmp-fix-ipi-isr-handling.patch
