Merge "fix(rpi4): drop /memreserve/ region" into integration
This commit is contained in:
commit
19ebec9f66
|
@ -201,6 +201,44 @@ void bl31_plat_arch_setup(void)
|
||||||
enable_mmu_el3(0);
|
enable_mmu_el3(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Remove the FDT /memreserve/ entry that covers the region at the very
|
||||||
|
* beginning of memory (if that exists). This is where the secondaries
|
||||||
|
* originally spin, but we pull them out there.
|
||||||
|
* Having overlapping /reserved-memory and /memreserve/ regions confuses
|
||||||
|
* the Linux kernel, so we need to get rid of this one.
|
||||||
|
*/
|
||||||
|
static void remove_spintable_memreserve(void *dtb)
|
||||||
|
{
|
||||||
|
uint64_t addr, size;
|
||||||
|
int regions = fdt_num_mem_rsv(dtb);
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < regions; i++) {
|
||||||
|
if (fdt_get_mem_rsv(dtb, i, &addr, &size) != 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (size == 0U) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* We only look for the region at the beginning of DRAM. */
|
||||||
|
if (addr != 0U) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Currently the region in the existing DTs is exactly 4K
|
||||||
|
* in size. Should this value ever change, there is probably
|
||||||
|
* a reason for that, so inform the user about this.
|
||||||
|
*/
|
||||||
|
if (size == 4096U) {
|
||||||
|
fdt_del_mem_rsv(dtb, i);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
WARN("Keeping unknown /memreserve/ region at 0, size: %lld\n",
|
||||||
|
size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void rpi4_prepare_dtb(void)
|
static void rpi4_prepare_dtb(void)
|
||||||
{
|
{
|
||||||
void *dtb = (void *)rpi4_get_dtb_address();
|
void *dtb = (void *)rpi4_get_dtb_address();
|
||||||
|
@ -227,7 +265,11 @@ static void rpi4_prepare_dtb(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reserve memory used by Trusted Firmware. */
|
/*
|
||||||
|
* Remove the original reserved region (used for the spintable), and
|
||||||
|
* replace it with a region describing the whole of Trusted Firmware.
|
||||||
|
*/
|
||||||
|
remove_spintable_memreserve(dtb);
|
||||||
if (fdt_add_reserved_memory(dtb, "atf@0", 0, 0x80000))
|
if (fdt_add_reserved_memory(dtb, "atf@0", 0, 0x80000))
|
||||||
WARN("Failed to add reserved memory nodes to DT.\n");
|
WARN("Failed to add reserved memory nodes to DT.\n");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue