Commit d949b4fe authored by David Daney's avatar David Daney Committed by Ralf Baechle

MIPS: Octeon: Don't clobber bootloader data structures.

Commit abe77f90 (MIPS: Octeon: Add kexec and kdump support) added a
bootmem region for the kernel image itself.  The problem is that this
is rounded up to a 0x100000 boundary, which is memory that may not be
owned by the kernel.  Depending on the kernel's configuration based
size, this 'extra' memory may contain data passed from the bootloader
to the kernel itself, which if clobbered makes the kernel crash in
various ways.

The fix: Quit rounding the size up, so that we only use memory
assigned to the kernel.
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: <stable@vger.kernel.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5449/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4f675e8a
...@@ -997,7 +997,7 @@ void __init plat_mem_setup(void) ...@@ -997,7 +997,7 @@ void __init plat_mem_setup(void)
cvmx_bootmem_unlock(); cvmx_bootmem_unlock();
/* Add the memory region for the kernel. */ /* Add the memory region for the kernel. */
kernel_start = (unsigned long) _text; kernel_start = (unsigned long) _text;
kernel_size = ALIGN(_end - _text, 0x100000); kernel_size = _end - _text;
/* Adjust for physical offset. */ /* Adjust for physical offset. */
kernel_start &= ~0xffffffff80000000ULL; kernel_start &= ~0xffffffff80000000ULL;
......
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