Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-25 06:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(rcar): add mandatory fields in 'reserved-memory' node" into integration

Browse source
This commit is contained in:
Sandrine Bailleux 2023-07-10 17:15:23 +02:00 • committed by TrustedFirmware Code Review
commit 1eb5e90341
1 changed files with 51 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
plat/renesas/rcar/bl2_plat_setup.c
View file

@ -236,6 +236,56 @@ static void bl2_lossy_setting(uint32_t no, uint64_t start_addr,
mmio_read_32(AXI_DCMPAREACRA0 + 0x8 * no), mmio_read_32(AXI_DCMPAREACRA0 + 0x8 * no),
mmio_read_32(AXI_DCMPAREACRB0 + 0x8 * no)); mmio_read_32(AXI_DCMPAREACRB0 + 0x8 * no));
} }
static int bl2_create_reserved_memory(void)
{
int ret;
int fcnlnode = fdt_add_subnode(fdt, 0, "reserved-memory");
if (fcnlnode < 0) {
NOTICE("BL2: Cannot create reserved mem node (ret=%i)\n",
fcnlnode);
panic();
}
ret = fdt_setprop(fdt, fcnlnode, "ranges", NULL, 0);
if (ret < 0) {
NOTICE("BL2: Cannot add FCNL ranges prop (ret=%i)\n", ret);
panic();
}
ret = fdt_setprop_u32(fdt, fcnlnode, "#address-cells", 2);
if (ret < 0) {
NOTICE("BL2: Cannot add FCNL #address-cells prop (ret=%i)\n", ret);
panic();
}
ret = fdt_setprop_u32(fdt, fcnlnode, "#size-cells", 2);
if (ret < 0) {
NOTICE("BL2: Cannot add FCNL #size-cells prop (ret=%i)\n", ret);
panic();
}
return fcnlnode;
}
static void bl2_create_fcnl_reserved_memory(void)
{
int fcnlnode;
NOTICE("BL2: Lossy Decomp areas\n");
fcnlnode = bl2_create_reserved_memory();
bl2_lossy_setting(0, LOSSY_ST_ADDR0, LOSSY_END_ADDR0,
LOSSY_FMT0, LOSSY_ENA_DIS0, fcnlnode);
bl2_lossy_setting(1, LOSSY_ST_ADDR1, LOSSY_END_ADDR1,
LOSSY_FMT1, LOSSY_ENA_DIS1, fcnlnode);
bl2_lossy_setting(2, LOSSY_ST_ADDR2, LOSSY_END_ADDR2,
LOSSY_FMT2, LOSSY_ENA_DIS2, fcnlnode);
}
#else
static void bl2_create_fcnl_reserved_memory(void) {}
#endif #endif
void bl2_plat_flush_bl31_params(void) void bl2_plat_flush_bl31_params(void)
@ -820,9 +870,6 @@ void bl2_el3_early_platform_setup(u_register_t arg1, u_register_t arg2,
#else #else
const char *boot_hyper160 = "HyperFlash(160MHz)"; const char *boot_hyper160 = "HyperFlash(160MHz)";
#endif #endif
#if (RCAR_LOSSY_ENABLE == 1)
int fcnlnode;
#endif
bl2_init_generic_timer(); bl2_init_generic_timer();
@ -1099,23 +1146,8 @@ lcm_state:
reg &= ~((uint32_t) 1 << 12); reg &= ~((uint32_t) 1 << 12);
mmio_write_32(CPG_PLL0CR, reg); mmio_write_32(CPG_PLL0CR, reg);
} }
#if (RCAR_LOSSY_ENABLE == 1)
NOTICE("BL2: Lossy Decomp areas\n");
fcnlnode = fdt_add_subnode(fdt, 0, "reserved-memory"); bl2_create_fcnl_reserved_memory();
if (fcnlnode < 0) {
NOTICE("BL2: Cannot create reserved mem node (ret=%i)\n",
fcnlnode);
panic();
}
bl2_lossy_setting(0, LOSSY_ST_ADDR0, LOSSY_END_ADDR0,
LOSSY_FMT0, LOSSY_ENA_DIS0, fcnlnode);
bl2_lossy_setting(1, LOSSY_ST_ADDR1, LOSSY_END_ADDR1,
LOSSY_FMT1, LOSSY_ENA_DIS1, fcnlnode);
bl2_lossy_setting(2, LOSSY_ST_ADDR2, LOSSY_END_ADDR2,
LOSSY_FMT2, LOSSY_ENA_DIS2, fcnlnode);
#endif
fdt_pack(fdt); fdt_pack(fdt);
NOTICE("BL2: FDT at %p\n", fdt); NOTICE("BL2: FDT at %p\n", fdt);