diff mbox series

[PATCHv2,3/9] board: lx2160a: Don't program the GIC RD tables if failed to reserve memory

Message ID 20200324081209.48449-4-Zhiqiang.Hou@nxp.com
State Changes Requested
Delegated to: Priyanka Jain
Headers show
Series fsl: layerscape: Initialize the GIC redistributor | expand

Commit Message

Z.Q. Hou March 24, 2020, 8:12 a.m. UTC 
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Program the GIC redistributor tables only when succeeded to reserve memory
for them, otherwise kernel will lose the chance to program them using
allocated memory.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
V2:
 - The #4 of v1 patchset.

 board/freescale/lx2160a/lx2160a.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Wasim Khan April 21, 2020, 7:28 a.m. UTC | #1 
> -----Original Message-----
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Zhiqiang Hou
> Sent: Tuesday, March 24, 2020 1:42 PM
> To: u-boot@lists.denx.de; Priyanka Jain <priyanka.jain@nxp.com>; Biwen Li
> <biwen.li@nxp.com>
> Cc: Z.q. Hou <zhiqiang.hou@nxp.com>
> Subject: [PATCHv2 3/9] board: lx2160a: Don't program the GIC RD tables if failed
> to reserve memory
> 
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> Program the GIC redistributor tables only when succeeded to reserve memory
> for them, otherwise kernel will lose the chance to program them using allocated
> memory.
> 
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> ---
> V2:
>  - The #4 of v1 patchset.
> 
>  board/freescale/lx2160a/lx2160a.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/board/freescale/lx2160a/lx2160a.c
> b/board/freescale/lx2160a/lx2160a.c
> index 595c774b42..7f22110dc6 100644
> --- a/board/freescale/lx2160a/lx2160a.c
> +++ b/board/freescale/lx2160a/lx2160a.c
> @@ -657,6 +657,7 @@ int ft_board_setup(void *blob, bd_t *bd)
>  	u64 mc_memory_size = 0;
>  	u16 total_memory_banks;
>  	u64 gic_lpi_base;
> +	int ret;
> 
>  	ft_cpu_setup(blob, bd);
> 
> @@ -678,8 +679,9 @@ int ft_board_setup(void *blob, bd_t *bd)
> 
>  #ifdef CONFIG_GIC_V3_ITS
>  	gic_lpi_base = gd->arch.resv_ram - GIC_LPI_SIZE;
> -	gic_lpi_tables_init(gic_lpi_base, cpu_numcores());
> -	fdt_fixup_gic_lpi_memory(blob, gic_lpi_base);
> +	ret = fdt_fixup_gic_lpi_memory(blob, gic_lpi_base);
> +	if (!ret && gic_lpi_tables_init(gic_lpi_base, cpu_numcores()))
> +		debug("%s: failed to init gic-lpi-tables\n", __func__);

Currently till this point, fdt_fixup_gic_lpi_memory return type is void , you may first you need to change fdt_fixup_gic_lpi_memory() to return something and then you can check for the errors. 
OR, no need for this patch, as in your later patches you are already doing error checking . 

>  #endif
> 
>  #ifdef CONFIG_RESV_RAM
> --
> 2.17.1
Z.Q. Hou April 25, 2020, 8:38 a.m. UTC | #2 
Hi Wasim,

Thanks a lot for your comments!

> -----Original Message-----
> From: Wasim Khan <wasim.khan@nxp.com>
> Sent: 2020年4月21日 15:29
> To: Z.q. Hou <zhiqiang.hou@nxp.com>; u-boot@lists.denx.de; Priyanka Jain
> <priyanka.jain@nxp.com>; Biwen Li <biwen.li@nxp.com>
> Cc: Z.q. Hou <zhiqiang.hou@nxp.com>
> Subject: RE: [PATCHv2 3/9] board: lx2160a: Don't program the GIC RD tables
> if failed to reserve memory
> 
> 
> 
> > -----Original Message-----
> > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Zhiqiang Hou
> > Sent: Tuesday, March 24, 2020 1:42 PM
> > To: u-boot@lists.denx.de; Priyanka Jain <priyanka.jain@nxp.com>; Biwen
> > Li <biwen.li@nxp.com>
> > Cc: Z.q. Hou <zhiqiang.hou@nxp.com>
> > Subject: [PATCHv2 3/9] board: lx2160a: Don't program the GIC RD tables
> > if failed to reserve memory
> >
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > Program the GIC redistributor tables only when succeeded to reserve
> > memory for them, otherwise kernel will lose the chance to program them
> > using allocated memory.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> > ---
> > V2:
> >  - The #4 of v1 patchset.
> >
> >  board/freescale/lx2160a/lx2160a.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/board/freescale/lx2160a/lx2160a.c
> > b/board/freescale/lx2160a/lx2160a.c
> > index 595c774b42..7f22110dc6 100644
> > --- a/board/freescale/lx2160a/lx2160a.c
> > +++ b/board/freescale/lx2160a/lx2160a.c
> > @@ -657,6 +657,7 @@ int ft_board_setup(void *blob, bd_t *bd)
> >  	u64 mc_memory_size = 0;
> >  	u16 total_memory_banks;
> >  	u64 gic_lpi_base;
> > +	int ret;
> >
> >  	ft_cpu_setup(blob, bd);
> >
> > @@ -678,8 +679,9 @@ int ft_board_setup(void *blob, bd_t *bd)
> >
> >  #ifdef CONFIG_GIC_V3_ITS
> >  	gic_lpi_base = gd->arch.resv_ram - GIC_LPI_SIZE;
> > -	gic_lpi_tables_init(gic_lpi_base, cpu_numcores());
> > -	fdt_fixup_gic_lpi_memory(blob, gic_lpi_base);
> > +	ret = fdt_fixup_gic_lpi_memory(blob, gic_lpi_base);
> > +	if (!ret && gic_lpi_tables_init(gic_lpi_base, cpu_numcores()))
> > +		debug("%s: failed to init gic-lpi-tables\n", __func__);
> 
> Currently till this point, fdt_fixup_gic_lpi_memory return type is void , you
> may first you need to change fdt_fixup_gic_lpi_memory() to return
> something and then you can check for the errors.
> OR, no need for this patch, as in your later patches you are already doing
> error checking .

Good catch, I lost the change of the return type of fdt_fixup_gic_lpi_memory(),
will add in v3.

Thanks,
Zhiqiang

> 
> >  #endif
> >
> >  #ifdef CONFIG_RESV_RAM
> > --
> > 2.17.1
diff mbox series

Patch

diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 595c774b42..7f22110dc6 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -657,6 +657,7 @@  int ft_board_setup(void *blob, bd_t *bd)
 	u64 mc_memory_size = 0;
 	u16 total_memory_banks;
 	u64 gic_lpi_base;
+	int ret;
 
 	ft_cpu_setup(blob, bd);
 
@@ -678,8 +679,9 @@  int ft_board_setup(void *blob, bd_t *bd)
 
 #ifdef CONFIG_GIC_V3_ITS
 	gic_lpi_base = gd->arch.resv_ram - GIC_LPI_SIZE;
-	gic_lpi_tables_init(gic_lpi_base, cpu_numcores());
-	fdt_fixup_gic_lpi_memory(blob, gic_lpi_base);
+	ret = fdt_fixup_gic_lpi_memory(blob, gic_lpi_base);
+	if (!ret && gic_lpi_tables_init(gic_lpi_base, cpu_numcores()))
+		debug("%s: failed to init gic-lpi-tables\n", __func__);
 #endif
 
 #ifdef CONFIG_RESV_RAM