| Message ID | 20220516222145.959359-1-marcel@ziswiler.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [v1] ARM: imx8mm: verdin-imx8mm: fix board hang in spl | expand |
On Tue, 2022-05-17 at 00:21 +0200, Marcel Ziswiler wrote: > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Move the preloader_console_init() call after spl_early_init() to avoid > board hang in SPL. > > While at it remove explicit in-code console/debug UART pinmuxing (uart1 > and its pinmuxing are already marked as u-boot,dm-spl via device tree). > > Fixes: 4551e1898769 ("configs: verdin-imx8mm: verdin-imx8mp: enable dm serial") > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > --- > I only very recently this weekend learned that verdin-imx8mm has such > hang early in SPL issue due to it missing to move the > preloader_console_init() call similar as to what Peng did in [1]. Any comments? Could somebody please pull this one in ASAP as it is currently really broken. Thanks! > Unfortunately, this likely breaks Peng's [V2,00/14] imx8m: convert to > DM_SERIAL series of late [2] and would need applying before ASAP. > > Sorry about that. > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20220415043538.27868-3-peng.fan@oss.nxp.com/ > [2] https://patchwork.ozlabs.org/project/uboot/cover/20220505074341.24086-1-peng.fan@oss.nxp.com/ > > board/toradex/verdin-imx8mm/spl.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c > index 1f3f38351ef..f0361f93ea9 100644 > --- a/board/toradex/verdin-imx8mm/spl.c > +++ b/board/toradex/verdin-imx8mm/spl.c > @@ -74,15 +74,8 @@ int board_fit_config_name_match(const char *name) > } > #endif > > -#define UART_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_PE | PAD_CTL_DSE4) > #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) > > -/* Verdin UART_3, Console/Debug UART */ > -static iomux_v3_cfg_t const uart_pads[] = { > - IMX8MM_PAD_SAI2_RXFS_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), > - IMX8MM_PAD_SAI2_RXC_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), > -}; > - > static iomux_v3_cfg_t const wdog_pads[] = { > IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), > }; > @@ -96,8 +89,6 @@ __weak void board_early_init(void) > imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); > > set_wdog_reset(wdog); > - > - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); > } > > int power_init_board(void) > @@ -143,8 +134,6 @@ void board_init_f(ulong dummy) > > timer_init(); > > - preloader_console_init(); > - > /* Clear the BSS. */ > memset(__bss_start, 0, __bss_end - __bss_start); > > @@ -162,6 +151,8 @@ void board_init_f(ulong dummy) > hang(); > } > > + preloader_console_init(); > + > enable_tzc380(); > > power_init_board();
Hi Marcel, On 19.05.22 10:03, Marcel Ziswiler wrote: > On Tue, 2022-05-17 at 00:21 +0200, Marcel Ziswiler wrote: >> From: Marcel Ziswiler <marcel.ziswiler@toradex.com> >> >> Move the preloader_console_init() call after spl_early_init() to avoid >> board hang in SPL. >> >> While at it remove explicit in-code console/debug UART pinmuxing (uart1 >> and its pinmuxing are already marked as u-boot,dm-spl via device tree). >> >> Fixes: 4551e1898769 ("configs: verdin-imx8mm: verdin-imx8mp: enable dm serial") >> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> >> >> --- >> I only very recently this weekend learned that verdin-imx8mm has such >> hang early in SPL issue due to it missing to move the >> preloader_console_init() call similar as to what Peng did in [1]. > > Any comments? > > Could somebody please pull this one in ASAP as it is currently really broken. Thanks! > My next big merge will take place for the end of the week, I have written down to not forget this. Stefano >> Unfortunately, this likely breaks Peng's [V2,00/14] imx8m: convert to >> DM_SERIAL series of late [2] and would need applying before ASAP. >> >> Sorry about that. >> >> [1] https://patchwork.ozlabs.org/project/uboot/patch/20220415043538.27868-3-peng.fan@oss.nxp.com/ >> [2] https://patchwork.ozlabs.org/project/uboot/cover/20220505074341.24086-1-peng.fan@oss.nxp.com/ >> >> board/toradex/verdin-imx8mm/spl.c | 13 ++----------- >> 1 file changed, 2 insertions(+), 11 deletions(-) >> >> diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c >> index 1f3f38351ef..f0361f93ea9 100644 >> --- a/board/toradex/verdin-imx8mm/spl.c >> +++ b/board/toradex/verdin-imx8mm/spl.c >> @@ -74,15 +74,8 @@ int board_fit_config_name_match(const char *name) >> } >> #endif >> >> -#define UART_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_PE | PAD_CTL_DSE4) >> #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) >> >> -/* Verdin UART_3, Console/Debug UART */ >> -static iomux_v3_cfg_t const uart_pads[] = { >> - IMX8MM_PAD_SAI2_RXFS_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), >> - IMX8MM_PAD_SAI2_RXC_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), >> -}; >> - >> static iomux_v3_cfg_t const wdog_pads[] = { >> IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), >> }; >> @@ -96,8 +89,6 @@ __weak void board_early_init(void) >> imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); >> >> set_wdog_reset(wdog); >> - >> - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); >> } >> >> int power_init_board(void) >> @@ -143,8 +134,6 @@ void board_init_f(ulong dummy) >> >> timer_init(); >> >> - preloader_console_init(); >> - >> /* Clear the BSS. */ >> memset(__bss_start, 0, __bss_end - __bss_start); >> >> @@ -162,6 +151,8 @@ void board_init_f(ulong dummy) >> hang(); >> } >> >> + preloader_console_init(); >> + >> enable_tzc380(); >> >> power_init_board();
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Move the preloader_console_init() call after spl_early_init() to avoid > board hang in SPL. > While at it remove explicit in-code console/debug UART pinmuxing (uart1 > and its pinmuxing are already marked as u-boot,dm-spl via device tree). > Fixes: 4551e1898769 ("configs: verdin-imx8mm: verdin-imx8mp: enable dm serial") > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c index 1f3f38351ef..f0361f93ea9 100644 --- a/board/toradex/verdin-imx8mm/spl.c +++ b/board/toradex/verdin-imx8mm/spl.c @@ -74,15 +74,8 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_PE | PAD_CTL_DSE4) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -/* Verdin UART_3, Console/Debug UART */ -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_SAI2_RXFS_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_SAI2_RXC_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -96,8 +89,6 @@ __weak void board_early_init(void) imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); set_wdog_reset(wdog); - - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); } int power_init_board(void) @@ -143,8 +134,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -162,6 +151,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); power_init_board();