Commit 571b1437 authored by Russell King's avatar Russell King

ARM: ignore memory below PHYS_OFFSET

If the kernel is loaded higher in physical memory than normal, and we
calculate PHYS_OFFSET higher than the start of RAM, this leads to
boot problems as we attempt to map part of this RAM into userspace.
Rather than struggle with this, just truncate the mapping.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 10968131
...@@ -660,6 +660,20 @@ int __init arm_add_memory(u64 start, u64 size) ...@@ -660,6 +660,20 @@ int __init arm_add_memory(u64 start, u64 size)
} }
#endif #endif
if (aligned_start < PHYS_OFFSET) {
if (aligned_start + size <= PHYS_OFFSET) {
pr_info("Ignoring memory below PHYS_OFFSET: 0x%08llx-0x%08llx\n",
aligned_start, aligned_start + size);
return -EINVAL;
}
pr_info("Ignoring memory below PHYS_OFFSET: 0x%08llx-0x%08llx\n",
aligned_start, (u64)PHYS_OFFSET);
size -= PHYS_OFFSET - aligned_start;
aligned_start = PHYS_OFFSET;
}
bank->start = aligned_start; bank->start = aligned_start;
bank->size = size & ~(phys_addr_t)(PAGE_SIZE - 1); bank->size = size & ~(phys_addr_t)(PAGE_SIZE - 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment