From: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Use newly introduced handoff data to pass data from PBL to barebox proper. This will allow us later to pass more SoC and/or board specific data from PBL to barebox proper. Link: https://lore.barebox.org/20240430105310.3149242-4-s.hauer@xxxxxxxxxxxxxx Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx> --- v1 -> v2: - delete no longer used arm_mem_boarddata() - in PBL, add board data before computing size, so it's taken into account - in barebox proper, fix arm_mem_barebox_image() to take account of handoff data size - support NULL boarddata passed in by PBL entry point. This is possibly useful for boards that have board data in ROM that they want to pass in a custom manner --- arch/arm/cpu/start.c | 74 ++++++++---------------------- arch/arm/cpu/uncompress.c | 36 +++++++++++++-- arch/arm/include/asm/barebox-arm.h | 24 ++++++---- 3 files changed, 66 insertions(+), 68 deletions(-) diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index 8461184db467..2158edafa4a9 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -21,6 +21,7 @@ #include <asm/mmu.h> #include <linux/kasan.h> #include <memory.h> +#include <pbl/handoff-data.h> #include <uncompress.h> #include <compressed-dtb.h> #include <malloc.h> @@ -38,10 +39,9 @@ static unsigned long barebox_boarddata_size; const struct barebox_boarddata *barebox_get_boarddata(void) { - if (!barebox_boarddata || !blob_is_arm_boarddata(barebox_boarddata)) - return NULL; + size_t size; - return barebox_boarddata; + return handoff_data_get_entry(HANDOFF_DATA_BOARDDATA, &size); } u32 barebox_arm_machine(void) @@ -56,19 +56,24 @@ void *barebox_arm_boot_dtb(void) int ret = 0; struct barebox_boarddata_compressed_dtb *compressed_dtb; static void *boot_dtb; + void *blob; + size_t size; if (boot_dtb) return boot_dtb; - if (barebox_boarddata && blob_is_fdt(barebox_boarddata)) { - pr_debug("%s: using barebox_boarddata\n", __func__); - return barebox_boarddata; - } + blob = handoff_data_get_entry(HANDOFF_DATA_INTERNAL_DT, &size); + if (blob) + return blob; - if (!fdt_blob_can_be_decompressed(barebox_boarddata)) + blob = handoff_data_get_entry(HANDOFF_DATA_INTERNAL_DT_Z, &size); + if (!blob) return NULL; - compressed_dtb = barebox_boarddata; + if (!fdt_blob_can_be_decompressed(blob)) + return NULL; + + compressed_dtb = blob; pr_debug("%s: using compressed_dtb\n", __func__); @@ -94,18 +99,6 @@ void *barebox_arm_boot_dtb(void) return boot_dtb; } -static inline unsigned long arm_mem_boarddata(unsigned long membase, - unsigned long endmem, - unsigned long size) -{ - unsigned long mem; - - mem = arm_mem_barebox_image(membase, endmem, arm_barebox_size); - mem -= ALIGN(size, 64); - - return mem; -} - unsigned long arm_mem_ramoops_get(void) { return arm_mem_ramoops(arm_stack_top); @@ -143,10 +136,9 @@ __noreturn __prereloc void barebox_non_pbl_start(unsigned long membase, { unsigned long endmem = membase + memsize; unsigned long malloc_start, malloc_end; - unsigned long barebox_size = barebox_image_size + MAX_BSS_SIZE; - unsigned long barebox_base = arm_mem_barebox_image(membase, - endmem, - barebox_size); + unsigned long barebox_base = arm_mem_barebox_image(membase, endmem, + barebox_image_size, + boarddata); if (IS_ENABLED(CONFIG_CPU_V7)) armv7_hyp_install(); @@ -164,37 +156,9 @@ __noreturn __prereloc void barebox_non_pbl_start(unsigned long membase, arm_membase = membase; arm_endmem = endmem; arm_stack_top = arm_mem_stack_top(endmem); - arm_barebox_size = barebox_size; + arm_barebox_size = barebox_image_size + MAX_BSS_SIZE; malloc_end = barebox_base; - if (boarddata) { - uint32_t totalsize = 0; - const char *name; - - if (blob_is_fdt(boarddata)) { - totalsize = get_unaligned_be32(boarddata + 4); - name = "DTB"; - } else if (blob_is_compressed_fdt(boarddata)) { - struct barebox_boarddata_compressed_dtb *bd = boarddata; - totalsize = bd->datalen + sizeof(*bd); - name = "Compressed DTB"; - } else if (blob_is_arm_boarddata(boarddata)) { - totalsize = sizeof(struct barebox_arm_boarddata); - name = "machine type"; - } - - if (totalsize) { - unsigned long mem = arm_mem_boarddata(membase, endmem, - totalsize); - pr_debug("found %s in boarddata, copying to 0x%08lx\n", - name, mem); - barebox_boarddata = memcpy((void *)mem, boarddata, - totalsize); - barebox_boarddata_size = totalsize; - malloc_end = mem; - } - } - /* * Maximum malloc space is the Kconfig value if given * or 1GB. @@ -218,6 +182,8 @@ __noreturn __prereloc void barebox_non_pbl_start(unsigned long membase, mem_malloc_init((void *)malloc_start, (void *)malloc_end - 1); + handoff_data_set(boarddata); + if (IS_ENABLED(CONFIG_BOOTM_OPTEE)) of_add_reserve_entry(endmem - OPTEE_SIZE, endmem - 1); diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index 612a5b65ff4c..af702d510eb7 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -10,6 +10,7 @@ #include <init.h> #include <linux/sizes.h> #include <pbl.h> +#include <pbl/handoff-data.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <asm-generic/memory_layout.h> @@ -18,6 +19,7 @@ #include <asm/cache.h> #include <asm/mmu.h> #include <asm/unaligned.h> +#include <compressed-dtb.h> #include <debug_ll.h> @@ -29,6 +31,24 @@ unsigned long free_mem_end_ptr; extern unsigned char input_data[]; extern unsigned char input_data_end[]; +static void add_handoff_data(void *boarddata) +{ + if (!boarddata) + return; + if (blob_is_fdt(boarddata)) { + handoff_data_add(HANDOFF_DATA_INTERNAL_DT, boarddata, + get_unaligned_be32(boarddata + 4)); + } else if (blob_is_compressed_fdt(boarddata)) { + struct barebox_boarddata_compressed_dtb *bd = boarddata; + + handoff_data_add(HANDOFF_DATA_INTERNAL_DT_Z, boarddata, + bd->datalen + sizeof(*bd)); + } else if (blob_is_arm_boarddata(boarddata)) { + handoff_data_add(HANDOFF_DATA_BOARDDATA, boarddata, + sizeof(struct barebox_arm_boarddata)); + } +} + void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, void *boarddata) { @@ -38,6 +58,7 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, unsigned long barebox_base; void *pg_start, *pg_end; unsigned long pc = get_pc(); + void *handoff_data; /* piggy data is not relocated, so determine the bounds now */ pg_start = runtime_address(input_data); @@ -56,9 +77,6 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, pg_len = pg_end - pg_start; uncompressed_len = get_unaligned((const u32 *)(pg_start + pg_len - 4)); - barebox_base = arm_mem_barebox_image(membase, endmem, - uncompressed_len + MAX_BSS_SIZE); - setup_c(); pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize); @@ -66,6 +84,14 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, if (IS_ENABLED(CONFIG_MMU)) mmu_early_enable(membase, memsize); + /* Add handoff data now, so arm_mem_barebox_image takes it into account */ + add_handoff_data(boarddata); + + barebox_base = arm_mem_barebox_image(membase, endmem, + uncompressed_len, NULL); + + 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; @@ -74,6 +100,8 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, pbl_barebox_uncompress((void*)barebox_base, pg_start, pg_len); + handoff_data_move(handoff_data); + sync_caches_for_execution(); if (IS_ENABLED(CONFIG_THUMB2_BAREBOX)) @@ -86,5 +114,5 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize, if (IS_ENABLED(CONFIG_CPU_V7) && boot_cpu_mode() == HYP_MODE) armv7_switch_to_hyp(); - barebox(membase, memsize, boarddata); + barebox(membase, memsize, handoff_data); } diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 8447ef7ba7fa..e9afd8f4539c 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -18,6 +18,7 @@ #include <linux/pagemap.h> #include <linux/types.h> #include <linux/compiler.h> +#include <pbl/handoff-data.h> #include <asm/barebox-arm-head.h> #include <asm/common.h> #include <asm/sections.h> @@ -158,10 +159,22 @@ static inline unsigned long arm_mem_guard_page_get(void) return arm_mem_guard_page(arm_mem_endmem_get()); } +/* + * When using compressed images in conjunction with relocatable images + * the PBL code must pick a suitable place where to uncompress the barebox + * image. For doing this the PBL code must know the size of the final + * image including the BSS segment. The BSS size is unknown to the PBL + * code, so define a maximum BSS size here. + */ +#define MAX_BSS_SIZE SZ_1M + static inline unsigned long arm_mem_barebox_image(unsigned long membase, unsigned long endmem, - unsigned long size) + unsigned long uncompressed_len, + const struct handoff_data *handoff_data) { + unsigned long size = uncompressed_len + MAX_BSS_SIZE + __handoff_data_size(handoff_data); + endmem = arm_mem_ramoops(endmem); return ALIGN_DOWN(endmem - size, SZ_1M); @@ -237,15 +250,6 @@ void __barebox_arm64_head(ulong x0, ulong x1, ulong x2); __barebox_arm_head, arg0, arg1, arg2) #endif -/* - * When using compressed images in conjunction with relocatable images - * the PBL code must pick a suitable place where to uncompress the barebox - * image. For doing this the PBL code must know the size of the final - * image including the BSS segment. The BSS size is unknown to the PBL - * code, so define a maximum BSS size here. - */ -#define MAX_BSS_SIZE SZ_1M - #define barebox_image_size (__image_end - __image_start) #ifdef CONFIG_CPU_32 -- 2.39.2
