[PATCH 1/5] arm: decompressor: set malloc pool size for the decompressor
flat view
STALE2206d
SUPERSEDED
From: Łukasz Stelmach <l.stelmach@samsung.com>
Date: 2020-06-01 14:28:20
Also in:
lkml
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Revision v1 of 3 in this series.
Revisions (3)
- v1 current
- v2 [diff vs current]
- v3 [diff vs current]
Possibly related (same subject, not in this thread)
- 2020-06-01 · Re: [PATCH 1/5] arm: decompressor: set malloc pool size for the decompressor · Lukasz Stelmach <l.stelmach@samsung.com>
- 2020-06-01 · Re: [PATCH 1/5] arm: decompressor: set malloc pool size for the decompressor · Russell King - ARM Linux admin <linux@armlinux.org.uk>
- 2020-06-01 · Re: [PATCH 1/5] arm: decompressor: set malloc pool size for the decompressor · Lukasz Stelmach <l.stelmach@samsung.com>
Move the definition of malloc pool size of the decompressor to a single place. This value will be exposed later for kexec_file loader. Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com> --- arch/arm/boot/compressed/Makefile | 2 ++ arch/arm/boot/compressed/head.S | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 9c11e7490292..b3594cd1588c 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile@@ -125,6 +125,8 @@ KBSS_SZ = $(shell echo $$(($$($(NM) $(obj)/../../../../vmlinux | \ sed -n -e 's/^\([^ ]*\) [AB] __bss_start$$/-0x\1/p' \ -e 's/^\([^ ]*\) [AB] __bss_stop$$/+0x\1/p') )) ) LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ) +# malloc pool size +LDFLAGS_vmlinux += --defsym _malloc_size=0x10000 # Supply ZRELADDR to the decompressor via a linker symbol. ifneq ($(CONFIG_AUTO_ZRELADDR),y) LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index e8e1c866e413..dcc1afa60fb9 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S@@ -309,7 +309,8 @@ restart: adr r0, LC0 #ifndef CONFIG_ZBOOT_ROM /* malloc space is above the relocated stack (64k max) */ add sp, sp, r0 - add r10, sp, #0x10000 + ldr r10, =_malloc_size + add r10, r10, sp #else /* * With ZBOOT_ROM the bss/stack is non relocatable,
@@ -623,7 +624,8 @@ not_relocated: mov r0, #0 */ mov r0, r4 mov r1, sp @ malloc space above stack - add r2, sp, #0x10000 @ 64k max + ldr r2, =_malloc_size @ 64k max + add r2, r2, sp mov r3, r7 bl decompress_kernel
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel