All architectures using PBL define the same variables free_mem_ptr and free_mem_end_ptr and initialize them. create a helper for that in pbl/malloc.c and rename simple_*() to pbl_*().
Signed-off-by: Sascha Hauer <[email protected]> --- arch/arm/cpu/uncompress.c | 6 +--- arch/mips/boot/uncompress.c | 6 +--- arch/riscv/boot/uncompress.c | 6 +--- arch/riscv/include/asm/barebox-riscv.h | 6 ---- include/linux/decompress/mm.h | 44 ++++---------------------- include/mach/bcm283x/debug_ll.h | 10 ------ include/pbl.h | 7 ++-- pbl/Makefile | 1 + pbl/malloc.c | 43 +++++++++++++++++++++++++ 9 files changed, 57 insertions(+), 72 deletions(-) create mode 100644 pbl/malloc.c diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index 38f7dbc113..c7802226e6 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -27,9 +27,6 @@ #include "entry.h" -unsigned long free_mem_ptr; -unsigned long free_mem_end_ptr; - extern unsigned char input_data[]; extern unsigned char input_data_end[]; @@ -78,8 +75,7 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, handoff_data = (void *)barebox_base + uncompressed_len + MAX_BSS_SIZE; - free_mem_ptr = barebox_base - ARM_MEM_EARLY_MALLOC_SIZE; - free_mem_end_ptr = barebox_base; + pbl_malloc_init(barebox_base - ARM_MEM_EARLY_MALLOC_SIZE, ARM_MEM_EARLY_MALLOC_SIZE); #ifdef DEBUG print_pbl_mem_layout(membase, endmem, barebox_base); diff --git a/arch/mips/boot/uncompress.c b/arch/mips/boot/uncompress.c index 0630d03c6b..b58b23ea6b 100644 --- a/arch/mips/boot/uncompress.c +++ b/arch/mips/boot/uncompress.c @@ -16,9 +16,6 @@ extern void *input_data; extern void *input_data_end; -unsigned long free_mem_ptr; -unsigned long free_mem_end_ptr; - void barebox_pbl_start(void *fdt, void *fdt_end, unsigned long ram_size); void __section(.text_entry) barebox_pbl_start(void *fdt, void *fdt_end, @@ -34,8 +31,7 @@ void __section(.text_entry) barebox_pbl_start(void *fdt, void *fdt_end, memset(__bss_start, 0, __bss_stop - __bss_start); /* set 128 KiB at the end of the MALLOC_BASE for early malloc */ - free_mem_ptr = TEXT_BASE - SZ_128K; - free_mem_end_ptr = free_mem_ptr + SZ_128K; + pbl_malloc_init(barebox_base - TEXT_BASE - SZ_128K, SZ_128K); piggy_len = (unsigned long)&input_data_end - (unsigned long)&input_data; diff --git a/arch/riscv/boot/uncompress.c b/arch/riscv/boot/uncompress.c index e51f1b0121..df60b14ed8 100644 --- a/arch/riscv/boot/uncompress.c +++ b/arch/riscv/boot/uncompress.c @@ -23,9 +23,6 @@ #include "entry.h" -unsigned long free_mem_ptr; -unsigned long free_mem_end_ptr; - void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, void *fdt) { @@ -63,8 +60,7 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize); - free_mem_ptr = riscv_mem_early_malloc(membase, endmem); - free_mem_end_ptr = riscv_mem_early_malloc_end(membase, endmem); + pbl_malloc_init(riscv_mem_early_malloc(), SZ_128K); /* * Enable MMU early to enable caching for faster decompression. diff --git a/arch/riscv/include/asm/barebox-riscv.h b/arch/riscv/include/asm/barebox-riscv.h index 083889817b..9fef0c213a 100644 --- a/arch/riscv/include/asm/barebox-riscv.h +++ b/arch/riscv/include/asm/barebox-riscv.h @@ -57,12 +57,6 @@ static inline unsigned long riscv_mem_early_malloc(unsigned long membase, return riscv_mem_stack(membase, endmem) - SZ_128K; } -static inline unsigned long riscv_mem_early_malloc_end(unsigned long membase, - unsigned long endmem) -{ - return riscv_mem_stack(membase, endmem); -} - static inline unsigned long riscv_mem_ramoops(unsigned long membase, unsigned long endmem) { diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h index 1891a51368..27b13ec9c8 100644 --- a/include/linux/decompress/mm.h +++ b/include/linux/decompress/mm.h @@ -14,6 +14,8 @@ #ifdef STATIC +#include <pbl.h> + /* Code active when included from pre-boot environment: */ /* @@ -26,45 +28,11 @@ #define STATIC_RW_DATA static #endif -/* A trivial malloc implementation, adapted from - * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 - */ -STATIC_RW_DATA unsigned long malloc_ptr; -STATIC_RW_DATA int malloc_count; - -static __maybe_unused void *simple_malloc(int size) -{ - void *p; - - if (size < 0) - return NULL; - if (!malloc_ptr) - malloc_ptr = free_mem_ptr; - - malloc_ptr = (malloc_ptr + 3) & ~3; /* Align */ - - p = (void *)malloc_ptr; - malloc_ptr += size; - - if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr) - return NULL; - - malloc_count++; - return p; -} - -static __maybe_unused void simple_free(void *where) -{ - malloc_count--; - if (!malloc_count) - malloc_ptr = free_mem_ptr; -} - -#define large_malloc(a) simple_malloc(a) -#define large_free(a) simple_free(a) +#define large_malloc(a) pbl_malloc(a) +#define large_free(a) pbl_free(a) -#define MALLOC simple_malloc -#define FREE simple_free +#define MALLOC pbl_malloc +#define FREE pbl_free #else diff --git a/include/mach/bcm283x/debug_ll.h b/include/mach/bcm283x/debug_ll.h index 8bbff4fd9a..68542fd6a3 100644 --- a/include/mach/bcm283x/debug_ll.h +++ b/include/mach/bcm283x/debug_ll.h @@ -42,16 +42,6 @@ static inline void debug_ll_init(void) #elif defined CONFIG_DEBUG_RPI3_MINI_UART -static inline uint8_t debug_ll_read_reg(void __iomem *base, int reg) -{ - return readb(base + (reg << 2)); -} - -static inline void debug_ll_write_reg(void __iomem *base, int reg, uint8_t val) -{ - writeb(val, base + (reg << 2)); -} - #include <linux/bits.h> #define BCM2836_AUX_CLOCK_ENB 0x3f215004 /* BCM2835 AUX Clock enable register */ diff --git a/include/pbl.h b/include/pbl.h index 514f114370..e30db16088 100644 --- a/include/pbl.h +++ b/include/pbl.h @@ -11,9 +11,6 @@ #include <linux/types.h> #include <linux/compiler.h> -extern unsigned long free_mem_ptr; -extern unsigned long free_mem_end_ptr; - void pbl_barebox_uncompress(void *dest, void *compressed_start, unsigned int len); int pbl_dtbz_uncompress(void *dest, void *compressed_start, unsigned long len); @@ -33,6 +30,10 @@ int pbl_barebox_verify(const void *compressed_start, unsigned int len, const void *hash, unsigned int hash_len); int pbl_load_fdt(const void *fdt, void *dest, int destsize); +void *pbl_malloc(int size); +void pbl_free(void *where); +void pbl_malloc_init(unsigned long base, size_t size); + #endif void __noreturn barebox_pbl_entry(ulong, ulong, void *); diff --git a/pbl/Makefile b/pbl/Makefile index b78124cdcd..45cfbf5fba 100644 --- a/pbl/Makefile +++ b/pbl/Makefile @@ -5,6 +5,7 @@ # pbl-y += misc.o pbl-y += string.o +pbl-y += malloc.o pbl-$(CONFIG_HAVE_IMAGE_COMPRESSION) += decomp.o pbl-$(CONFIG_LIBFDT) += fdt.o pbl-$(CONFIG_PBL_CONSOLE) += console.o diff --git a/pbl/malloc.c b/pbl/malloc.c new file mode 100644 index 0000000000..d5ee8ac7ee --- /dev/null +++ b/pbl/malloc.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include <pbl.h> + +static unsigned long free_mem_ptr; +static unsigned long free_mem_end_ptr; +static unsigned long malloc_ptr; +static int malloc_count; + +void *pbl_malloc(int size) +{ + void *p; + + if (size < 0) + return NULL; + if (!malloc_ptr) + malloc_ptr = free_mem_ptr; + + malloc_ptr = (malloc_ptr + 3) & ~3; /* Align */ + + p = (void *)malloc_ptr; + malloc_ptr += size; + + if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr) + return NULL; + + malloc_count++; + return p; +} + +void pbl_free(void *where) +{ + malloc_count--; + if (!malloc_count) + malloc_ptr = free_mem_ptr; +} + +void pbl_malloc_init(unsigned long base, size_t size) +{ + free_mem_ptr = base; + malloc_ptr = base; + malloc_count = 0; + free_mem_end_ptr = base + size; +} \ No newline at end of file -- 2.47.3
