diff mbox series

[10/13] verdin-imx8mm: Remove unused SPL_BOARD_INIT

Message ID 20230216033659.3877684-10-trini@konsulko.com
State Deferred
Delegated to: Tom Rini
Headers show
Series [01/13] common/Kconfig: Reword text for BOARD_TYPES | expand

Commit Message

Tom Rini Feb. 16, 2023, 3:36 a.m. UTC
On this platform SPL_BOARD_INIT is used to call arch_misc_init which is
in turn empty, drop the call.

Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/toradex/verdin-imx8mm/spl.c | 5 -----
 configs/verdin-imx8mm_defconfig   | 1 -
 2 files changed, 6 deletions(-)

Comments

Marcel Ziswiler Feb. 16, 2023, 12:37 p.m. UTC | #1
On Wed, 2023-02-15 at 22:36 -0500, Tom Rini wrote:
> On this platform SPL_BOARD_INIT is used to call arch_misc_init which is
> in turn empty, drop the call.
> 
> Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

> ---
>  board/toradex/verdin-imx8mm/spl.c | 5 -----
>  configs/verdin-imx8mm_defconfig   | 1 -
>  2 files changed, 6 deletions(-)
> 
> diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
> index 9d54d60bb17d..3f33ff7d87a4 100644
> --- a/board/toradex/verdin-imx8mm/spl.c
> +++ b/board/toradex/verdin-imx8mm/spl.c
> @@ -51,11 +51,6 @@ void spl_dram_init(void)
>         ddr_init(&dram_timing);
>  }
>  
> -void spl_board_init(void)
> -{
> -       arch_misc_init();
> -}
> -
>  #ifdef CONFIG_SPL_LOAD_FIT
>  int board_fit_config_name_match(const char *name)
>  {
> diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
> index 5b5f7c051e54..0e7d67cf093d 100644
> --- a/configs/verdin-imx8mm_defconfig
> +++ b/configs/verdin-imx8mm_defconfig
> @@ -40,7 +40,6 @@ CONFIG_BOARD_LATE_INIT=y
>  CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>  CONFIG_SPL_BSS_START_ADDR=0x910000
>  CONFIG_SPL_BSS_MAX_SIZE=0x2000
> -CONFIG_SPL_BOARD_INIT=y
>  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>  CONFIG_SPL_STACK=0x920000
>  CONFIG_SYS_SPL_MALLOC=y
Marcel Ziswiler Feb. 17, 2023, 1:18 p.m. UTC | #2
Hi Tom

On Thu, 2023-02-16 at 13:37 +0100, Marcel Ziswiler wrote:
> On Wed, 2023-02-15 at 22:36 -0500, Tom Rini wrote:
> > On this platform SPL_BOARD_INIT is used to call arch_misc_init which is
> > in turn empty, drop the call.
> > 
> > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> 
> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Sorry, I have to take my ack back. Marek (and Francesco) are, of course, right and this is indeed needed for
CAAM. Please see also [1] where it got changed/introduced in/to the current form.

[1] https://lore.kernel.org/all/20220919194118.105820-1-marex@denx.de/

Cheers

Marcel

> > ---
> >  board/toradex/verdin-imx8mm/spl.c | 5 -----
> >  configs/verdin-imx8mm_defconfig   | 1 -
> >  2 files changed, 6 deletions(-)
> > 
> > diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
> > index 9d54d60bb17d..3f33ff7d87a4 100644
> > --- a/board/toradex/verdin-imx8mm/spl.c
> > +++ b/board/toradex/verdin-imx8mm/spl.c
> > @@ -51,11 +51,6 @@ void spl_dram_init(void)
> >         ddr_init(&dram_timing);
> >  }
> >  
> > -void spl_board_init(void)
> > -{
> > -       arch_misc_init();
> > -}
> > -
> >  #ifdef CONFIG_SPL_LOAD_FIT
> >  int board_fit_config_name_match(const char *name)
> >  {
> > diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
> > index 5b5f7c051e54..0e7d67cf093d 100644
> > --- a/configs/verdin-imx8mm_defconfig
> > +++ b/configs/verdin-imx8mm_defconfig
> > @@ -40,7 +40,6 @@ CONFIG_BOARD_LATE_INIT=y
> >  CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> >  CONFIG_SPL_BSS_START_ADDR=0x910000
> >  CONFIG_SPL_BSS_MAX_SIZE=0x2000
> > -CONFIG_SPL_BOARD_INIT=y
> >  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> >  CONFIG_SPL_STACK=0x920000
> >  CONFIG_SYS_SPL_MALLOC=y
Tom Rini Feb. 17, 2023, 2:03 p.m. UTC | #3
On Fri, Feb 17, 2023 at 01:18:34PM +0000, Marcel Ziswiler wrote:
> Hi Tom
> 
> On Thu, 2023-02-16 at 13:37 +0100, Marcel Ziswiler wrote:
> > On Wed, 2023-02-15 at 22:36 -0500, Tom Rini wrote:
> > > On this platform SPL_BOARD_INIT is used to call arch_misc_init which is
> > > in turn empty, drop the call.
> > > 
> > > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > > Signed-off-by: Tom Rini <trini@konsulko.com>
> > 
> > Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Sorry, I have to take my ack back. Marek (and Francesco) are, of course, right and this is indeed needed for
> CAAM. Please see also [1] where it got changed/introduced in/to the current form.
> 
> [1] https://lore.kernel.org/all/20220919194118.105820-1-marex@denx.de/

Alright, yeah. I've posted v2 which preserves the existing behavior, but
it could be improved further still by someone with the hardware to
confirm behavior on.
Francesco Dolcini Feb. 17, 2023, 4:14 p.m. UTC | #4
On Fri, Feb 17, 2023 at 09:03:07AM -0500, Tom Rini wrote:
> On Fri, Feb 17, 2023 at 01:18:34PM +0000, Marcel Ziswiler wrote:
> > Hi Tom
> > 
> > On Thu, 2023-02-16 at 13:37 +0100, Marcel Ziswiler wrote:
> > > On Wed, 2023-02-15 at 22:36 -0500, Tom Rini wrote:
> > > > On this platform SPL_BOARD_INIT is used to call arch_misc_init which is
> > > > in turn empty, drop the call.
> > > > 
> > > > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > > > Signed-off-by: Tom Rini <trini@konsulko.com>
> > > 
> > > Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > 
> > Sorry, I have to take my ack back. Marek (and Francesco) are, of course, right and this is indeed needed for
> > CAAM. Please see also [1] where it got changed/introduced in/to the current form.
> > 
> > [1] https://lore.kernel.org/all/20220919194118.105820-1-marex@denx.de/
> 
> Alright, yeah. I've posted v2 which preserves the existing behavior, but
> it could be improved further still by someone with the hardware to
> confirm behavior on.

[PATCHv2 12/13] global: Add a select for ARCH_MISC_INIT where used -- ?

I would say that even with that patch in, this specific one should be
dropped.

At least this is what I understand from your comment here:
> Yes, it's still on the board to call arch_misc_init() inside spl_board_init().

We can test your changes on the Verdin iMX8MM, even Marek should have
one to my understanding, in case we are somehow late.

Thanks,
Francesco
Tom Rini Feb. 17, 2023, 5:03 p.m. UTC | #5
On Fri, Feb 17, 2023 at 05:14:11PM +0100, Francesco Dolcini wrote:
> On Fri, Feb 17, 2023 at 09:03:07AM -0500, Tom Rini wrote:
> > On Fri, Feb 17, 2023 at 01:18:34PM +0000, Marcel Ziswiler wrote:
> > > Hi Tom
> > > 
> > > On Thu, 2023-02-16 at 13:37 +0100, Marcel Ziswiler wrote:
> > > > On Wed, 2023-02-15 at 22:36 -0500, Tom Rini wrote:
> > > > > On this platform SPL_BOARD_INIT is used to call arch_misc_init which is
> > > > > in turn empty, drop the call.
> > > > > 
> > > > > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > > > > Signed-off-by: Tom Rini <trini@konsulko.com>
> > > > 
> > > > Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > > 
> > > Sorry, I have to take my ack back. Marek (and Francesco) are, of course, right and this is indeed needed for
> > > CAAM. Please see also [1] where it got changed/introduced in/to the current form.
> > > 
> > > [1] https://lore.kernel.org/all/20220919194118.105820-1-marex@denx.de/
> > 
> > Alright, yeah. I've posted v2 which preserves the existing behavior, but
> > it could be improved further still by someone with the hardware to
> > confirm behavior on.
> 
> [PATCHv2 12/13] global: Add a select for ARCH_MISC_INIT where used -- ?
> 
> I would say that even with that patch in, this specific one should be
> dropped.

Yes, with v2 of 12/13, patches 10 and 11 from v1 of the series are
dropped, to be clear.

> At least this is what I understand from your comment here:
> > Yes, it's still on the board to call arch_misc_init() inside spl_board_init().
> 
> We can test your changes on the Verdin iMX8MM, even Marek should have
> one to my understanding, in case we are somehow late.

What I mean is that Marek has suggested a more specific fix to this
problem (it should not be per-board to get the CAAM working for HAB
here, it should be in the SoC code and hooks), and I would quite welcome
the general clean-up but can't test it, so won't write it, right now.
diff mbox series

Patch

diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 9d54d60bb17d..3f33ff7d87a4 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -51,11 +51,6 @@  void spl_dram_init(void)
 	ddr_init(&dram_timing);
 }
 
-void spl_board_init(void)
-{
-	arch_misc_init();
-}
-
 #ifdef CONFIG_SPL_LOAD_FIT
 int board_fit_config_name_match(const char *name)
 {
diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
index 5b5f7c051e54..0e7d67cf093d 100644
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -40,7 +40,6 @@  CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
 CONFIG_SPL_BSS_START_ADDR=0x910000
 CONFIG_SPL_BSS_MAX_SIZE=0x2000
-CONFIG_SPL_BOARD_INIT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x920000
 CONFIG_SYS_SPL_MALLOC=y