|
@@ -170,7 +170,19 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
|
|
|
|
|
|
void __init early_init_dt_add_memory_arch(u64 base, u64 size)
|
|
|
{
|
|
|
+ base &= PAGE_MASK;
|
|
|
size &= PAGE_MASK;
|
|
|
+ if (base + size < PHYS_OFFSET) {
|
|
|
+ pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
|
|
|
+ base, base + size);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (base < PHYS_OFFSET) {
|
|
|
+ pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
|
|
|
+ base, PHYS_OFFSET);
|
|
|
+ size -= PHYS_OFFSET - base;
|
|
|
+ base = PHYS_OFFSET;
|
|
|
+ }
|
|
|
memblock_add(base, size);
|
|
|
}
|
|
|
|