Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eafeb48 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

of/fdt: make memblock maximum physical address arch configurable 



When parsing the memory nodes to populate the memblock memory
table, we check against high and low limits and clip any memory
that exceeds either one of them.

However, for arm64, the high limit of (phys_addr_t)~0 is not very
meaningful, since phys_addr_t is 64 bits (i.e., no limit) but there
may be other constraints that limit the memory ranges that we can
support.

So rename MAX_PHYS_ADDR to MAX_MEMBLOCK_ADDR (for clarity) and only
define it if the arch does not supply a definition of its own.

Acked-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarStuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 5d3c2c35

drivers/of/fdt.c

+7 −5
Original line number Diff line number Diff line
@@ -967,7 +967,9 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, 
}



#ifdef CONFIG_HAVE_MEMBLOCK

#define MAX_PHYS_ADDR	((phys_addr_t)~0)

#ifndef MAX_MEMBLOCK_ADDR

#define MAX_MEMBLOCK_ADDR	((phys_addr_t)~0)

#endif



void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)

{
@@ -984,16 +986,16 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) 
	}

	size &= PAGE_MASK;



	if (base > MAX_PHYS_ADDR) {

	if (base > MAX_MEMBLOCK_ADDR) {

		pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",

				base, base + size);

		return;

	}



	if (base + size - 1 > MAX_PHYS_ADDR) {

	if (base + size - 1 > MAX_MEMBLOCK_ADDR) {

		pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",

				((u64)MAX_PHYS_ADDR) + 1, base + size);

		size = MAX_PHYS_ADDR - base + 1;

				((u64)MAX_MEMBLOCK_ADDR) + 1, base + size);

		size = MAX_MEMBLOCK_ADDR - base + 1;

	}



	if (base + size < phys_offset) {