diff mbox series

[v2] imx8mn-ddr4-evk-u-boot: Fix broken boot

Message ID 20221003140203.386230-1-festevam@denx.de
State Accepted
Commit 0bd7811ca9b7321cbc9a5ecc234368975b3fe191
Headers show
Series [v2] imx8mn-ddr4-evk-u-boot: Fix broken boot | expand

Commit Message

Fabio Estevam Oct. 3, 2022, 2:02 p.m. UTC
When the imx8mn.dtsi file was pulled in from Linux, the UARTs
were moved into an spba sub-node which wasn't being included
in the SPL device tree.  This meant the references to the UART
weren't being handled properly and when booting the system would
constantly reboot.  Fix this by adding the spba node to the spl
device tree to restore normal booting.

Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot
board.

Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v1:
- Fix typo in commit log: imx8mm.dtsi--> imx8mn.dtsi

Hi Tom and Stefano,

I know today is release day. Could this one be applied directly?

It fixes a boot regression.

Thanks

 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Nazzareno Trimarchi Oct. 3, 2022, 2:12 p.m. UTC | #1
Hi Fabio

On Mon, Oct 3, 2022 at 4:02 PM Fabio Estevam <festevam@denx.de> wrote:
>
> When the imx8mn.dtsi file was pulled in from Linux, the UARTs
> were moved into an spba sub-node which wasn't being included
> in the SPL device tree.  This meant the references to the UART
> weren't being handled properly and when booting the system would
> constantly reboot.  Fix this by adding the spba node to the spl
> device tree to restore normal booting.
>
> Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot
> board.
>
> Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> Changes since v1:
> - Fix typo in commit log: imx8mm.dtsi--> imx8mn.dtsi
>
> Hi Tom and Stefano,
>
> I know today is release day. Could this one be applied directly?
>
> It fixes a boot regression.
>
> Thanks
>
>  arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> index 78773c198e..3a9ba8b8c9 100644
> --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> @@ -26,6 +26,10 @@
>         u-boot,dm-spl;
>  };
>
> +&spba1 {
> +       u-boot,dm-spl;
> +};
> +
>  &clk {
>         u-boot,dm-spl;
>         u-boot,dm-pre-reloc;

If this is valid for all the board could you just move in imx8mn-uboot.dtsi?

Michael

> --
> 2.25.1
>
Fabio Estevam Oct. 3, 2022, 2:19 p.m. UTC | #2
Hi Michael,

On 03/10/2022 11:12, Michael Nazzareno Trimarchi wrote:

> If this is valid for all the board could you just move in 
> imx8mn-uboot.dtsi?

I plan to do this, but imx8mn-u-boot.dtsi does not exist today.

To fix the regression, let's go with this patch for 2022.10, then
for 2023.01 the imx8mn-u-boot.dtsi can be introduced.

Regards,

Fabio Estevam
Michael Nazzareno Trimarchi Oct. 3, 2022, 2:34 p.m. UTC | #3
Hi

On Mon, Oct 3, 2022 at 4:19 PM Fabio Estevam <festevam@denx.de> wrote:
>
> Hi Michael,
>
> On 03/10/2022 11:12, Michael Nazzareno Trimarchi wrote:
>
> > If this is valid for all the board could you just move in
> > imx8mn-uboot.dtsi?
>
> I plan to do this, but imx8mn-u-boot.dtsi does not exist today.
>
> To fix the regression, let's go with this patch for 2022.10, then
> for 2023.01 the imx8mn-u-boot.dtsi can be introduced.
>

You can create only and populate with one. The inclusion should be automatic

Michael

> Regards,
>
> Fabio Estevam
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-60 Fax: (+49)-8142-66989-80 Email:
> festevam@denx.de
Michael Nazzareno Trimarchi Oct. 3, 2022, 2:51 p.m. UTC | #4
Hi

to be more clear

imx8mn-u-boot.dtsi

&{/soc@0} {
        u-boot,dm-pre-reloc;
        u-boot,dm-spl;
};

&spba1 {
       u-boot,dm-spl;
};

Michael

On Mon, Oct 3, 2022 at 4:34 PM Michael Nazzareno Trimarchi
<michael@amarulasolutions.com> wrote:
>
> Hi
>
> On Mon, Oct 3, 2022 at 4:19 PM Fabio Estevam <festevam@denx.de> wrote:
> >
> > Hi Michael,
> >
> > On 03/10/2022 11:12, Michael Nazzareno Trimarchi wrote:
> >
> > > If this is valid for all the board could you just move in
> > > imx8mn-uboot.dtsi?
> >
> > I plan to do this, but imx8mn-u-boot.dtsi does not exist today.
> >
> > To fix the regression, let's go with this patch for 2022.10, then
> > for 2023.01 the imx8mn-u-boot.dtsi can be introduced.
> >
>
> You can create only and populate with one. The inclusion should be automatic
>
> Michael
>
> > Regards,
> >
> > Fabio Estevam
> > --
> > DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> > Phone: (+49)-8142-66989-60 Fax: (+49)-8142-66989-80 Email:
> > festevam@denx.de
>
>
>
> --
> Michael Nazzareno Trimarchi
> Co-Founder & Chief Executive Officer
> M. +39 347 913 2170
> michael@amarulasolutions.com
> __________________________________
>
> Amarula Solutions BV
> Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
> T. +31 (0)85 111 9172
> info@amarulasolutions.com
> www.amarulasolutions.com
Fabio Estevam Oct. 3, 2022, 3:32 p.m. UTC | #5
Hi Michael,

On 03/10/2022 11:51, Michael Nazzareno Trimarchi wrote:
> Hi
> 
> to be more clear
> 
> imx8mn-u-boot.dtsi
> 
> &{/soc@0} {
>         u-boot,dm-pre-reloc;
>         u-boot,dm-spl;
> };
> 
> &spba1 {
>        u-boot,dm-spl;
> };

Just to be clear: it makes sense to introduce imx8mn-u-boot.dtsi.

However, we are in the release day for 2022.10.

My goal is to avoid the boot regressions with the minimum changes, so
that's why I have sent these patches.

After 2022.10 is out, then imx8mn-u-boot.dtsi can be properly 
introduced.

Regards,

Fabio Estevam
Michael Nazzareno Trimarchi Oct. 3, 2022, 3:34 p.m. UTC | #6
Hi Fabio

On Mon, Oct 3, 2022 at 5:32 PM Fabio Estevam <festevam@denx.de> wrote:
>
> Hi Michael,
>
> On 03/10/2022 11:51, Michael Nazzareno Trimarchi wrote:
> > Hi
> >
> > to be more clear
> >
> > imx8mn-u-boot.dtsi
> >
> > &{/soc@0} {
> >         u-boot,dm-pre-reloc;
> >         u-boot,dm-spl;
> > };
> >
> > &spba1 {
> >        u-boot,dm-spl;
> > };
>
> Just to be clear: it makes sense to introduce imx8mn-u-boot.dtsi.
>
> However, we are in the release day for 2022.10.
>
> My goal is to avoid the boot regressions with the minimum changes, so
> that's why I have sent these patches.
>
> After 2022.10 is out, then imx8mn-u-boot.dtsi can be properly
> introduced.

It's clear.

Michael

>
> Regards,
>
> Fabio Estevam
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-60 Fax: (+49)-8142-66989-80 Email:
> festevam@denx.de
Tom Rini Oct. 3, 2022, 6:54 p.m. UTC | #7
On Mon, Oct 03, 2022 at 11:02:03AM -0300, Fabio Estevam wrote:

> When the imx8mn.dtsi file was pulled in from Linux, the UARTs
> were moved into an spba sub-node which wasn't being included
> in the SPL device tree.  This meant the references to the UART
> weren't being handled properly and when booting the system would
> constantly reboot.  Fix this by adding the spba node to the spl
> device tree to restore normal booting.
> 
> Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot
> board.
> 
> Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
> Signed-off-by: Fabio Estevam <festevam@denx.de>

Applied to u-boot/master, thanks!
Adam Ford Oct. 4, 2022, 1:13 a.m. UTC | #8
On Mon, Oct 3, 2022 at 9:02 AM Fabio Estevam <festevam@denx.de> wrote:
>
> When the imx8mn.dtsi file was pulled in from Linux, the UARTs
> were moved into an spba sub-node which wasn't being included
> in the SPL device tree.  This meant the references to the UART
> weren't being handled properly and when booting the system would
> constantly reboot.  Fix this by adding the spba node to the spl
> device tree to restore normal booting.
>
> Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot
> board.
>
> Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> Changes since v1:
> - Fix typo in commit log: imx8mm.dtsi--> imx8mn.dtsi
>
> Hi Tom and Stefano,
>
> I know today is release day. Could this one be applied directly?

I have a series to push this fix into a common imx8mn-u-boot.dtsi file
[1].  Theoretically, pulling in that series should fix all the 8mn's.


[1] - https://patchwork.ozlabs.org/project/uboot/list/?series=312016

adam

>
> It fixes a boot regression.
>
> Thanks
>
>  arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> index 78773c198e..3a9ba8b8c9 100644
> --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> @@ -26,6 +26,10 @@
>         u-boot,dm-spl;
>  };
>
> +&spba1 {
> +       u-boot,dm-spl;
> +};
> +
>  &clk {
>         u-boot,dm-spl;
>         u-boot,dm-pre-reloc;
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
index 78773c198e..3a9ba8b8c9 100644
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -26,6 +26,10 @@ 
 	u-boot,dm-spl;
 };
 
+&spba1 {
+	u-boot,dm-spl;
+};
+
 &clk {
 	u-boot,dm-spl;
 	u-boot,dm-pre-reloc;