From patchwork Thu Mar 19 05:38:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiqiang Hou X-Patchwork-Id: 243897 List-Id: U-Boot discussion From: Zhiqiang.Hou at nxp.com (Zhiqiang Hou) Date: Thu, 19 Mar 2020 13:38:38 +0800 Subject: [PATCH 04/12] board: lx2160a: Don't program the GIC RD tables if failed to reserve memory In-Reply-To: <20200319053846.2304-1-Zhiqiang.Hou@nxp.com> References: <20200319053846.2304-1-Zhiqiang.Hou@nxp.com> Message-ID: <20200319053846.2304-5-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 --- board/freescale/lx2160a/lx2160a.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 290d80db90..30b18a75c5 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -642,6 +642,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); @@ -663,8 +664,11 @@ 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_add_resv_mem_gic_rd_tables(blob, gic_lpi_base, GIC_LPI_SIZE); + ret = fdt_add_resv_mem_gic_rd_tables(blob, gic_lpi_base, GIC_LPI_SIZE); + if (!ret) { + if (gic_lpi_tables_init(gic_lpi_base, cpu_numcores())) + debug("%s: failed to init gic-lpi-tables\n", __func__); + } #endif #ifdef CONFIG_RESV_RAM