2022-09-19 03:18:01

by Peng Fan (OSS)

Subject: [PATCH V2] mailbox: imx: fix RST channel support

From: Peng Fan <[email protected]>

Because IMX_MU_xCR_MAX was increased to 5, some mu cfgs were not updated
to include the CR register. Add the missed CR register to xcr array.

Fixes: 82ab513baed5 ("mailbox: imx: support RST channel")
Reported-by: Liu Ying <[email protected]>
Signed-off-by: Peng Fan <[email protected]>
Tested-by: Liu Ying <[email protected]> # i.MX8qm/qxp MEK boards boot
---

V2:
Correct Fixes commit hash

drivers/mailbox/imx-mailbox.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index 02922073c9ef..20f2ec880ad6 100644
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -904,7 +904,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
.xTR = 0x20,
.xRR = 0x40,
.xSR = {0x60, 0x60, 0x60, 0x60},
- .xCR = {0x64, 0x64, 0x64, 0x64},
+ .xCR = {0x64, 0x64, 0x64, 0x64, 0x64},
};

static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp = {
@@ -927,7 +927,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp_s4 = {
.xTR = 0x200,
.xRR = 0x280,
.xSR = {0xC, 0x118, 0x124, 0x12C},
- .xCR = {0x110, 0x114, 0x120, 0x128},
+ .xCR = {0x8, 0x110, 0x114, 0x120, 0x128},
};

static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = {
@@ -938,7 +938,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = {
.xTR = 0x200,
.xRR = 0x280,
.xSR = {0xC, 0x118, 0x124, 0x12C},
- .xCR = {0x110, 0x114, 0x120, 0x128},
+ .xCR = {0x8, 0x110, 0x114, 0x120, 0x128},
};

static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = {
@@ -949,7 +949,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = {
.xTR = 0x0,
.xRR = 0x10,
.xSR = {0x20, 0x20, 0x20, 0x20},
- .xCR = {0x24, 0x24, 0x24, 0x24},
+ .xCR = {0x24, 0x24, 0x24, 0x24, 0x24},
};

static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = {
@@ -960,7 +960,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = {
.xTR = 0x0,
.xRR = 0x10,
.xSR = {0x20, 0x20, 0x20, 0x20},
- .xCR = {0x24, 0x24, 0x24, 0x24},
+ .xCR = {0x24, 0x24, 0x24, 0x24, 0x24},
};

static const struct of_device_id imx_mu_dt_ids[] = {
--
2.37.1

2022-10-06 11:13:38

by Peng Fan

Subject: RE: [PATCH V2] mailbox: imx: fix RST channel support

Hi Jassi,

> Subject: [PATCH V2] mailbox: imx: fix RST channel support

Would you pick this patch?

Thanks,
Peng.
>
> From: Peng Fan <[email protected]>
>
> Because IMX_MU_xCR_MAX was increased to 5, some mu cfgs were not
> updated to include the CR register. Add the missed CR register to xcr array.
>
> Fixes: 82ab513baed5 ("mailbox: imx: support RST channel")
> Reported-by: Liu Ying <[email protected]>
> Signed-off-by: Peng Fan <[email protected]>
> Tested-by: Liu Ying <[email protected]> # i.MX8qm/qxp MEK boards boot
> ---
>
> V2:
> Correct Fixes commit hash
>
> drivers/mailbox/imx-mailbox.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
> index 02922073c9ef..20f2ec880ad6 100644
> --- a/drivers/mailbox/imx-mailbox.c
> +++ b/drivers/mailbox/imx-mailbox.c
> @@ -904,7 +904,7 @@ static const struct imx_mu_dcfg
> imx_mu_cfg_imx7ulp = {
> .xTR = 0x20,
> .xRR = 0x40,
> .xSR = {0x60, 0x60, 0x60, 0x60},
> - .xCR = {0x64, 0x64, 0x64, 0x64},
> + .xCR = {0x64, 0x64, 0x64, 0x64, 0x64},
> };
>
> static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp = { @@ -927,7 +927,7
> @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp_s4 = {
> .xTR = 0x200,
> .xRR = 0x280,
> .xSR = {0xC, 0x118, 0x124, 0x12C},
> - .xCR = {0x110, 0x114, 0x120, 0x128},
> + .xCR = {0x8, 0x110, 0x114, 0x120, 0x128},
> };
>
> static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = { @@ -938,7
> +938,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = {
> .xTR = 0x200,
> .xRR = 0x280,
> .xSR = {0xC, 0x118, 0x124, 0x12C},
> - .xCR = {0x110, 0x114, 0x120, 0x128},
> + .xCR = {0x8, 0x110, 0x114, 0x120, 0x128},
> };
>
> static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = { @@ -949,7
> +949,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = {
> .xTR = 0x0,
> .xRR = 0x10,
> .xSR = {0x20, 0x20, 0x20, 0x20},
> - .xCR = {0x24, 0x24, 0x24, 0x24},
> + .xCR = {0x24, 0x24, 0x24, 0x24, 0x24},
> };
>
> static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = { @@ -960,7
> +960,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = {
> .xTR = 0x0,
> .xRR = 0x10,
> .xSR = {0x20, 0x20, 0x20, 0x20},
> - .xCR = {0x24, 0x24, 0x24, 0x24},
> + .xCR = {0x24, 0x24, 0x24, 0x24, 0x24},
> };
>
> static const struct of_device_id imx_mu_dt_ids[] = {
> --
> 2.37.1

2022-10-06 14:51:03

by Jassi Brar

Subject: Re: [PATCH V2] mailbox: imx: fix RST channel support

On Thu, Oct 6, 2022 at 5:44 AM Peng Fan <[email protected]> wrote:
>
> Hi Jassi,
>
> > Subject: [PATCH V2] mailbox: imx: fix RST channel support
>
> Would you pick this patch?
>
Already queued yesterday.

cheers.