[PATCH v1] mailbox: mpfs: fix check for syscon presence in mpfs_mbox_inbox_isr()

[PATCH v1] mailbox: mpfs: fix check for syscon presence in mpfs_mbox_inbox_isr()

[Conor Dooley]

From: Conor Dooley <conor.dooley@microchip.com>

mpfs_mbox_inbox_isr() writes to the sysreg scb syscon, not the control
scb syscon, but checks for the presence of the latter. Ultimately this
makes little difference because if one syscon is present, both will be.

Fixes: a4123ffab9ece ("mailbox: mpfs: support new, syscon based, devicetree configuration")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
CC: Conor Dooley <conor.dooley@microchip.com>
CC: Daire McNamara <daire.mcnamara@microchip.com>
CC: Jassi Brar <jassisinghbrar@gmail.com>
CC: linux-riscv@lists.infradead.org
CC: linux-kernel@vger.kernel.org
CC: Valentina.FernandezAlanis@microchip.com
---
 drivers/mailbox/mailbox-mpfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c
index d5d9effece979..ef40fe2be30d6 100644
--- a/drivers/mailbox/mailbox-mpfs.c
+++ b/drivers/mailbox/mailbox-mpfs.c
@@ -201,7 +201,7 @@ static irqreturn_t mpfs_mbox_inbox_isr(int irq, void *data)
 	struct mbox_chan *chan = data;
 	struct mpfs_mbox *mbox = (struct mpfs_mbox *)chan->con_priv;
 
-	if (mbox->control_scb)
+	if (mbox->sysreg_scb)
 		regmap_write(mbox->sysreg_scb, MESSAGE_INT_OFFSET, 0);
 	else
 		writel_relaxed(0, mbox->int_reg);
-- 
2.53.0

Re: [PATCH v1] mailbox: mpfs: fix check for syscon presence in mpfs_mbox_inbox_isr()

[Jassi Brar]

On Thu, May 14, 2026 at 11:39 AM Conor Dooley <conor@kernel.org> wrote:
>
> From: Conor Dooley <conor.dooley@microchip.com>
>
> mpfs_mbox_inbox_isr() writes to the sysreg scb syscon, not the control
> scb syscon, but checks for the presence of the latter. Ultimately this
> makes little difference because if one syscon is present, both will be.
>
> Fixes: a4123ffab9ece ("mailbox: mpfs: support new, syscon based, devicetree configuration")
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> CC: Conor Dooley <conor.dooley@microchip.com>
> CC: Daire McNamara <daire.mcnamara@microchip.com>
> CC: Jassi Brar <jassisinghbrar@gmail.com>
> CC: linux-riscv@lists.infradead.org
> CC: linux-kernel@vger.kernel.org
> CC: Valentina.FernandezAlanis@microchip.com
> ---
>  drivers/mailbox/mailbox-mpfs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c
> index d5d9effece979..ef40fe2be30d6 100644
> --- a/drivers/mailbox/mailbox-mpfs.c
> +++ b/drivers/mailbox/mailbox-mpfs.c
> @@ -201,7 +201,7 @@ static irqreturn_t mpfs_mbox_inbox_isr(int irq, void *data)
>         struct mbox_chan *chan = data;
>         struct mpfs_mbox *mbox = (struct mpfs_mbox *)chan->con_priv;
>
> -       if (mbox->control_scb)
> +       if (mbox->sysreg_scb)
>                 regmap_write(mbox->sysreg_scb, MESSAGE_INT_OFFSET, 0);
>         else
>                 writel_relaxed(0, mbox->int_reg);
> --
> 2.53.0
>
Applied to mailbox/for-next
Thanks
Jassi