mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
fsl-layerscape: Move GIC RD tables init to soc.c
Move GIC redistributor tables initialization to CPU setup function. This patch introduces a GIC redistributor tables init function, and moves the function of reserving memory for GIC redistributor tables to soc.c and adds a argument for the memory size to reserve, BTW rename the function so that it is more readable. Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Reviewed-by: Wasim Khan <wasim.khan@nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Hou Zhiqiang
Priyanka Jain
parent
0d5b0711e9
commit
f40b120e93
|
|
@ -471,6 +471,10 @@ void ft_cpu_setup(void *blob, bd_t *bd)
|
|||
do_fixup_by_path_u32(blob, "/sysclk", "clock-frequency",
|
||||
CONFIG_SYS_CLK_FREQ, 1);
|
||||
|
||||
#ifdef CONFIG_GIC_V3_ITS
|
||||
ls_gic_rd_tables_init(blob);
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PCIE_LAYERSCAPE) || defined(CONFIG_PCIE_LAYERSCAPE_GEN4)
|
||||
ft_pci_setup(blob, bd);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,10 +6,12 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <clock_legacy.h>
|
||||
#include <cpu_func.h>
|
||||
#include <env.h>
|
||||
#include <fsl_immap.h>
|
||||
#include <fsl_ifc.h>
|
||||
#include <init.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <asm/arch/fsl_serdes.h>
|
||||
#include <asm/arch/soc.h>
|
||||
#include <asm/io.h>
|
||||
|
|
@ -17,6 +19,7 @@
|
|||
#include <asm/arch-fsl-layerscape/config.h>
|
||||
#include <asm/arch-fsl-layerscape/ns_access.h>
|
||||
#include <asm/arch-fsl-layerscape/fsl_icid.h>
|
||||
#include <asm/gic-v3.h>
|
||||
#ifdef CONFIG_LAYERSCAPE_NS_ACCESS
|
||||
#include <fsl_csu.h>
|
||||
#endif
|
||||
|
|
@ -30,9 +33,50 @@
|
|||
#include <fsl_immap.h>
|
||||
#ifdef CONFIG_TFABOOT
|
||||
#include <env_internal.h>
|
||||
#endif
|
||||
#if defined(CONFIG_TFABOOT) || defined(CONFIG_GIC_V3_ITS)
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_GIC_V3_ITS
|
||||
#define PENDTABLE_MAX_SZ ALIGN(BIT(ITS_MAX_LPI_NRBITS), SZ_64K)
|
||||
#define PROPTABLE_MAX_SZ ALIGN(BIT(ITS_MAX_LPI_NRBITS) / 8, SZ_64K)
|
||||
#define GIC_LPI_SIZE ALIGN(cpu_numcores() * PENDTABLE_MAX_SZ + \
|
||||
PROPTABLE_MAX_SZ, SZ_1M)
|
||||
static int fdt_add_resv_mem_gic_rd_tables(void *blob, u64 base, size_t size)
|
||||
{
|
||||
u32 phandle;
|
||||
int err;
|
||||
struct fdt_memory gic_rd_tables;
|
||||
|
||||
gic_rd_tables.start = base;
|
||||
gic_rd_tables.end = base + size - 1;
|
||||
err = fdtdec_add_reserved_memory(blob, "gic-rd-tables", &gic_rd_tables,
|
||||
&phandle);
|
||||
if (err < 0)
|
||||
debug("%s: failed to add reserved memory: %d\n", __func__, err);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int ls_gic_rd_tables_init(void *blob)
|
||||
{
|
||||
u64 gic_lpi_base;
|
||||
int ret;
|
||||
|
||||
gic_lpi_base = ALIGN(gd->arch.resv_ram - GIC_LPI_SIZE, SZ_64K);
|
||||
ret = fdt_add_resv_mem_gic_rd_tables(blob, gic_lpi_base, GIC_LPI_SIZE);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = gic_lpi_tables_init(gic_lpi_base, cpu_numcores());
|
||||
if (ret)
|
||||
debug("%s: failed to init gic-lpi-tables\n", __func__);
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool soc_has_dp_ddr(void)
|
||||
{
|
||||
struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
|
||||
|
|
|
|||
|
|
@ -158,6 +158,10 @@ void erratum_a010315(void);
|
|||
|
||||
bool soc_has_dp_ddr(void);
|
||||
bool soc_has_aiop(void);
|
||||
|
||||
#ifdef CONFIG_GIC_V3_ITS
|
||||
int ls_gic_rd_tables_init(void *blob);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _ASM_ARMV8_FSL_LAYERSCAPE_SOC_H_ */
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <fdt_support.h>
|
||||
#include <linux/libfdt.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <fsl-mc/fsl_mc.h>
|
||||
#include <env_internal.h>
|
||||
#include <efi_loader.h>
|
||||
|
|
@ -30,14 +29,11 @@
|
|||
#include "../common/vid.h"
|
||||
#include <fsl_immap.h>
|
||||
#include <asm/arch-fsl-layerscape/fsl_icid.h>
|
||||
#include <asm/gic-v3.h>
|
||||
#include <cpu_func.h>
|
||||
|
||||
#ifdef CONFIG_EMC2305
|
||||
#include "../common/emc2305.h"
|
||||
#endif
|
||||
|
||||
#define GIC_LPI_SIZE 0x200000
|
||||
#ifdef CONFIG_TARGET_LX2160AQDS
|
||||
#define CFG_MUX_I2C_SDHC(reg, value) ((reg & 0x3f) | value)
|
||||
#define SET_CFG_MUX1_SDHC1_SDHC(reg) (reg & 0x3f)
|
||||
|
|
@ -645,23 +641,6 @@ void board_quiesce_devices(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_GIC_V3_ITS
|
||||
int fdt_fixup_gic_lpi_memory(void *blob, u64 gic_lpi_base)
|
||||
{
|
||||
u32 phandle;
|
||||
int err;
|
||||
struct fdt_memory gic_lpi;
|
||||
|
||||
gic_lpi.start = gic_lpi_base;
|
||||
gic_lpi.end = gic_lpi_base + GIC_LPI_SIZE - 1;
|
||||
err = fdtdec_add_reserved_memory(blob, "gic-lpi", &gic_lpi, &phandle);
|
||||
if (err < 0)
|
||||
debug("failed to add reserved memory: %d\n", err);
|
||||
|
||||
return err;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_OF_BOARD_SETUP
|
||||
int ft_board_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
|
|
@ -673,8 +652,6 @@ int ft_board_setup(void *blob, bd_t *bd)
|
|||
u64 mc_memory_base = 0;
|
||||
u64 mc_memory_size = 0;
|
||||
u16 total_memory_banks;
|
||||
u64 __maybe_unused gic_lpi_base;
|
||||
int ret;
|
||||
|
||||
ft_cpu_setup(blob, bd);
|
||||
|
||||
|
|
@ -694,13 +671,6 @@ int ft_board_setup(void *blob, bd_t *bd)
|
|||
size[i] = gd->bd->bi_dram[i].size;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_GIC_V3_ITS
|
||||
gic_lpi_base = ALIGN(gd->arch.resv_ram - GIC_LPI_SIZE, SZ_64K);
|
||||
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
|
||||
/* reduce size if reserved memory is within this bank */
|
||||
if (gd->arch.resv_ram >= base[0] &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user