From patchwork Tue Mar 24 08:12:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiqiang Hou X-Patchwork-Id: 244201 List-Id: U-Boot discussion From: Zhiqiang.Hou at nxp.com (Zhiqiang Hou) Date: Tue, 24 Mar 2020 16:12:03 +0800 Subject: [PATCHv2 3/9] board: lx2160a: Don't program the GIC RD tables if failed to reserve memory In-Reply-To: <20200324081209.48449-1-Zhiqiang.Hou@nxp.com> References: <20200324081209.48449-1-Zhiqiang.Hou@nxp.com> Message-ID: <20200324081209.48449-4-Zhiqiang.Hou@nxp.com> From: Hou Zhiqiang 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 --- 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__); #endif #ifdef CONFIG_RESV_RAM