[PATCH/RFC v7] ARM: boot: Obtain start of physical memory from DTB
Geert Uytterhoeven
geert+renesas at glider.be
Mon Jul 6 11:02:05 EDT 2020
Currently, the start address of physical memory is obtained by masking
the program counter with a fixed mask of 0xf8000000. This mask value
was chosen as a balance between the requirements of different platforms.
However, this does require that the start address of physical memory is
a multiple of 128 MiB, precluding booting Linux on platforms where this
requirement is not fulfilled.
Fix this limitation by obtaining the start address from the DTB instead,
if available (either explicitly passed, or appended to the kernel).
Fall back to the traditional method when needed.
This allows to boot Linux on r7s9210/rza2mevb using the 64 MiB of SDRAM
on the RZA2MEVB sub board, which is located at 0x0C000000 (CS3 space),
i.e. not at a multiple of 128 MiB.
Suggested-by: Nicolas Pitre <nico at fluxnic.net>
Signed-off-by: Geert Uytterhoeven <geert+renesas at glider.be>
Reviewed-by: Nicolas Pitre <nico at fluxnic.net>
Reviewed-by: Ard Biesheuvel <ardb at kernel.org>
Tested-by: Marek Szyprowski <m.szyprowski at samsung.com>
Tested-by: Dmitry Osipenko <digetx at gmail.com>
Cc: Lukasz Stelmach <l.stelmach at samsung.com>
---
Marked as RFC, because:
1. This is known to break crashkernel support, as the memory used by
the crashkernel is not marked reserved in DT (yet),
2. Russell won't apply this for v5.9 anyway,
v7:
- Rebase on top of commits 161e04a5bae58a65 ("ARM: decompressor: split
off _edata and stack base into separate object") and
c7c06b8843c0aa65 ("kbuild: remove cc-option test of
-fno-stack-protector") in next-20200706.
v6:
- Rebase on top of commit 7ae4a78daacf240a ("ARM: 8969/1:
decompressor: simplify libfdt builds"),
- Include <linux/libfdt.h> instead of <libfdt.h>,
v5:
- Add Tested-by, Reviewed-by,
- Round up start of memory to satisfy 16 MiB alignment rule,
v4:
- Fix stack location after commit 184bf653a7a452c1 ("ARM:
decompressor: factor out routine to obtain the inflated image
size"),
v3:
- Add Reviewed-by,
- Fix ATAGs with appended DTB,
- Add Tested-by,
v2:
- Use "cmp r0, #-1", instead of "cmn r0, #1",
- Add missing stack setup,
- Support appended DTB.
---
arch/arm/boot/compressed/Makefile | 5 +-
arch/arm/boot/compressed/fdt_get_mem_start.c | 56 ++++++++++++++++++++
arch/arm/boot/compressed/head.S | 52 +++++++++++++++++-
3 files changed, 111 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boot/compressed/fdt_get_mem_start.c
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index b1147b7f2c8d372e..b1c09faf276e9193 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -81,10 +81,13 @@ libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o
ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
OBJS += $(libfdt_objs) atags_to_fdt.o
endif
+ifeq ($(CONFIG_USE_OF),y)
+OBJS += $(libfdt_objs) fdt_get_mem_start.o
+endif
# -fstack-protector-strong triggers protection checks in this code,
# but it is being used too early to link to meaningful stack_chk logic.
-$(foreach o, $(libfdt_objs) atags_to_fdt.o, \
+$(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_get_mem_start.o, \
$(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector))
# These were previously generated C files. When you are building the kernel
diff --git a/arch/arm/boot/compressed/fdt_get_mem_start.c b/arch/arm/boot/compressed/fdt_get_mem_start.c
new file mode 100644
index 0000000000000000..ae71fde731b869d7
--- /dev/null
+++ b/arch/arm/boot/compressed/fdt_get_mem_start.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <linux/kernel.h>
+#include <linux/libfdt.h>
+#include <linux/sizes.h>
+
+static const void *getprop(const void *fdt, const char *node_path,
+ const char *property)
+{
+ int offset = fdt_path_offset(fdt, node_path);
+
+ if (offset == -FDT_ERR_NOTFOUND)
+ return NULL;
+
+ return fdt_getprop(fdt, offset, property, NULL);
+}
+
+static uint32_t get_addr_size(const void *fdt)
+{
+ const __be32 *addr_len = getprop(fdt, "/", "#address-cells");
+
+ if (!addr_len) {
+ /* default */
+ return 1;
+ }
+
+ return fdt32_to_cpu(*addr_len);
+}
+
+/*
+ * Get the start of physical memory
+ */
+
+unsigned long fdt_get_mem_start(const void *fdt)
+{
+ uint32_t addr_size, mem_start;
+ const __be32 *memory;
+
+ if (!fdt)
+ return -1;
+
+ if (*(__be32 *)fdt != cpu_to_fdt32(FDT_MAGIC))
+ return -1;
+
+ /* Find the first memory node */
+ memory = getprop(fdt, "/memory", "reg");
+ if (!memory)
+ return -1;
+
+ /* There may be multiple cells on LPAE platforms */
+ addr_size = get_addr_size(fdt);
+
+ mem_start = fdt32_to_cpu(memory[addr_size - 1]);
+ /* Must be a multiple of 16 MiB for phys/virt patching */
+ return round_up(mem_start, SZ_16M);
+}
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 434a16982e344fe4..802621756ac0480b 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -254,8 +254,56 @@ not_angel:
.text
#ifdef CONFIG_AUTO_ZRELADDR
+#ifdef CONFIG_USE_OF
/*
- * Find the start of physical memory. As we are executing
+ * Find the start of physical memory.
+ * Try the DTB first, if available.
+ */
+ adr r0, LC1
+ ldr sp, [r0] @ get stack location
+ add sp, sp, r0 @ apply relocation
+
+#ifdef CONFIG_ARM_APPENDED_DTB
+ /*
+ * Look for an appended DTB. If found, use it and
+ * move stack away from it.
+ */
+ ldr r6, [r0, #4] @ get &_edata
+ add r6, r6, r0 @ relocate it
+ ldmia r6, {r0, r5} @ get DTB signature and size
+#ifndef __ARMEB__
+ ldr r1, =0xedfe0dd0 @ sig is 0xd00dfeed big endian
+ /* convert DTB size to little endian */
+ eor r2, r5, r5, ror #16
+ bic r2, r2, #0x00ff0000
+ mov r5, r5, ror #8
+ eor r5, r5, r2, lsr #8
+#else
+ ldr r1, =0xd00dfeed
+#endif
+ cmp r0, r1 @ do we have a DTB there?
+ bne 1f
+
+ /* preserve 64-bit alignment */
+ add r5, r5, #7
+ bic r5, r5, #7
+ add sp, sp, r5 @ if so, move stack above DTB
+ mov r0, r6 @ and extract memory start from DTB
+ b 2f
+
+1:
+#endif /* CONFIG_ARM_APPENDED_DTB */
+
+ mov r0, r8
+2:
+ bl fdt_get_mem_start
+ mov r4, r0
+ cmp r0, #-1
+ bne 1f
+#endif /* CONFIG_USE_OF */
+
+ /*
+ * Fall back to the traditional method. As we are executing
* without the MMU on, we are in the physical address space.
* We just need to get rid of any offset by aligning the
* address.
@@ -273,6 +321,8 @@ not_angel:
*/
mov r4, pc
and r4, r4, #0xf8000000
+
+1:
/* Determine final kernel image address. */
add r4, r4, #TEXT_OFFSET
#else
--
2.17.1
More information about the linux-arm-kernel
mailing list