From 965846fcd0657bead026056e9bdc3625a534552e Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 11 Jan 2021 16:07:02 -0800 Subject: cbfs: Remove prog_locate() for payloads (SELF and FIT) This patch removes the prog_locate() call for all instances of loading payload formats (SELF and FIT), as the previous patch did for stages. Signed-off-by: Julius Werner Change-Id: I582b37f36fe6f9f26975490a823e85b130ba49a2 Reviewed-on: https://review.coreboot.org/c/coreboot/+/49336 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/arm64/bl31.c | 3 -- src/arch/riscv/boot.c | 3 -- src/include/bootmem.h | 2 ++ src/include/fit_payload.h | 10 ------- src/include/program_loading.h | 11 +++++-- src/lib/fit_payload.c | 16 +--------- src/lib/prog_loaders.c | 15 ++++++---- src/lib/selfboot.c | 50 +++++++++++++++----------------- src/soc/qualcomm/sc7180/aop_load_reset.c | 3 -- 9 files changed, 46 insertions(+), 67 deletions(-) delete mode 100644 src/include/fit_payload.h diff --git a/src/arch/arm64/bl31.c b/src/arch/arm64/bl31.c index a3870275ac..06676bcab8 100644 --- a/src/arch/arm64/bl31.c +++ b/src/arch/arm64/bl31.c @@ -76,9 +76,6 @@ void run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr) struct prog bl31 = PROG_INIT(PROG_BL31, CONFIG_CBFS_PREFIX"/bl31"); void (*bl31_entry)(bl_params_t *params, void *plat_params) = NULL; - if (prog_locate(&bl31)) - die("BL31 not found"); - if (!selfload_check(&bl31, BM_MEM_BL31)) die("BL31 load failed"); bl31_entry = prog_entry(&bl31); diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c index 7cb0a3636f..119039d2e7 100644 --- a/src/arch/riscv/boot.c +++ b/src/arch/riscv/boot.c @@ -53,9 +53,6 @@ void arch_prog_run(struct prog *prog) if (ENV_RAMSTAGE && CONFIG(RISCV_OPENSBI)) { struct prog sbi = PROG_INIT(PROG_OPENSBI, CONFIG_CBFS_PREFIX"/opensbi"); - if (prog_locate(&sbi)) - die("OpenSBI not found"); - if (!selfload_check(&sbi, BM_MEM_OPENSBI)) die("OpenSBI load failed"); diff --git a/src/include/bootmem.h b/src/include/bootmem.h index 0625bbb3bc..6ccdd884aa 100644 --- a/src/include/bootmem.h +++ b/src/include/bootmem.h @@ -17,6 +17,8 @@ * Start at 0x10000 to make sure that the caller doesn't provide LB_MEM tags. */ enum bootmem_type { + BM_MEM_INVALID = 0, /* Invalid type (used in optional arguments). */ + BM_MEM_FIRST = 0x10000, /* First entry in this list */ BM_MEM_RAM, /* Memory anyone can use */ BM_MEM_RESERVED, /* Don't use this memory region */ diff --git a/src/include/fit_payload.h b/src/include/fit_payload.h deleted file mode 100644 index 4ebe3ce78e..0000000000 --- a/src/include/fit_payload.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef __FIT_PAYLOAD_H_ -#define __FIT_PAYLOAD_H_ - -#include - -void fit_payload(struct prog *payload); - -#endif /* __FIT_PAYLOAD_H_ */ diff --git a/src/include/program_loading.h b/src/include/program_loading.h index 7ceecc40f2..f936c618ad 100644 --- a/src/include/program_loading.h +++ b/src/include/program_loading.h @@ -3,6 +3,7 @@ #define PROGRAM_LOADING_H #include +#include #include #include #include @@ -45,7 +46,7 @@ struct prog { * payload. For architectures that use a bounce buffer * then it would represent the bounce buffer. */ enum prog_type type; - uint32_t cbfs_type; + enum cbfs_type cbfs_type; const char *name; struct region_device rdev; /* Entry to program with optional argument. It's up to the architecture @@ -70,7 +71,7 @@ static inline enum prog_type prog_type(const struct prog *prog) return prog->type; } -static inline uint32_t prog_cbfs_type(const struct prog *prog) +static inline enum cbfs_type prog_cbfs_type(const struct prog *prog) { return prog->cbfs_type; } @@ -197,5 +198,11 @@ void payload_run(void); */ bool selfload_check(struct prog *payload, enum bootmem_type dest_type); bool selfload(struct prog *payload); +/* Like selfload_check() but with the payload data already mapped to memory. */ +bool selfload_mapped(struct prog *payload, void *mapping, + enum bootmem_type dest_type); + +/* Load a FIT payload. The payload data must already be mapped to memory. */ +void fit_payload(struct prog *payload, void *data); #endif /* PROGRAM_LOADING_H */ diff --git a/src/lib/fit_payload.c b/src/lib/fit_payload.c index b3a03a1942..9613418b95 100644 --- a/src/lib/fit_payload.c +++ b/src/lib/fit_payload.c @@ -13,7 +13,6 @@ #include #include #include -#include #include /* Pack the device_tree and place it at given position. */ @@ -168,16 +167,10 @@ static void add_cb_fdt_data(struct device_tree *tree) /* * Parse the uImage FIT, choose a configuration and extract images. */ -void fit_payload(struct prog *payload) +void fit_payload(struct prog *payload, void *data) { struct device_tree *dt = NULL; struct region kernel = {0}, fdt = {0}, initrd = {0}; - void *data; - - data = rdev_mmap_full(prog_rdev(payload)); - - if (data == NULL) - return; printk(BIOS_INFO, "FIT: Examine payload %s\n", payload->name); @@ -185,14 +178,12 @@ void fit_payload(struct prog *payload) if (!config) { printk(BIOS_ERR, "ERROR: Could not load FIT\n"); - rdev_munmap(prog_rdev(payload), data); return; } dt = unpack_fdt(config->fdt); if (!dt) { printk(BIOS_ERR, "ERROR: Failed to unflatten the FDT.\n"); - rdev_munmap(prog_rdev(payload), data); return; } @@ -225,7 +216,6 @@ void fit_payload(struct prog *payload) if (!fit_payload_arch(payload, config, &kernel, &fdt, &initrd)) { printk(BIOS_ERR, "ERROR: Failed to find free memory region\n"); bootmem_dump_ranges(); - rdev_munmap(prog_rdev(payload), data); return; } @@ -240,7 +230,6 @@ void fit_payload(struct prog *payload) extract(&initrd, config->ramdisk)) { printk(BIOS_ERR, "ERROR: Failed to extract initrd\n"); prog_set_entry(payload, NULL, NULL); - rdev_munmap(prog_rdev(payload), data); return; } @@ -249,11 +238,8 @@ void fit_payload(struct prog *payload) if (extract(&kernel, config->kernel)) { printk(BIOS_ERR, "ERROR: Failed to extract kernel\n"); prog_set_entry(payload, NULL, NULL); - rdev_munmap(prog_rdev(payload), data); return; } timestamp_add_now(TS_START_KERNEL); - - rdev_munmap(prog_rdev(payload), data); } diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index b31d79341f..22abeb5dfd 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -14,7 +14,6 @@ #include #include #include -#include #include /* Only can represent up to 1 byte less than size_t. */ @@ -154,24 +153,30 @@ void payload_load(void) timestamp_add_now(TS_LOAD_PAYLOAD); - if (prog_locate(payload)) + if (prog_locate_hook(payload)) + goto out; + + payload->cbfs_type = CBFS_TYPE_QUERY; + void *mapping = cbfs_type_map(prog_name(payload), NULL, &payload->cbfs_type); + if (!mapping) goto out; switch (prog_cbfs_type(payload)) { case CBFS_TYPE_SELF: /* Simple ELF */ - selfload_check(payload, BM_MEM_RAM); + selfload_mapped(payload, mapping, BM_MEM_RAM); break; case CBFS_TYPE_FIT: /* Flattened image tree */ if (CONFIG(PAYLOAD_FIT_SUPPORT)) { - fit_payload(payload); + fit_payload(payload, mapping); break; } /* else fall-through */ default: die_with_post_code(POST_INVALID_ROM, - "Unsupported payload type.\n"); + "Unsupported payload type %d.\n", payload->cbfs_type); break; } + cbfs_unmap(mapping); out: if (prog_entry(payload) == NULL) die_with_post_code(POST_INVALID_ROM, "Payload not loaded.\n"); diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index a08dcaba8e..641631a03e 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -126,12 +126,15 @@ static int last_loadable_segment(struct cbfs_payload_segment *seg) } static int check_payload_segments(struct cbfs_payload_segment *cbfssegs, - void *args) + enum bootmem_type dest_type) { uint8_t *dest; size_t memsz; struct cbfs_payload_segment *seg, segment; - enum bootmem_type dest_type = *(enum bootmem_type *)args; + + /* dest_type == INVALID means we're not supposed to check anything. */ + if (dest_type == BM_MEM_INVALID) + return 0; for (seg = cbfssegs;; ++seg) { printk(BIOS_DEBUG, "Checking segment from ROM address %p\n", seg); @@ -224,50 +227,45 @@ __weak int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size) return 0; } -static void *selfprepare(struct prog *payload) -{ - void *data; - data = rdev_mmap_full(prog_rdev(payload)); - return data; -} - -static bool _selfload(struct prog *payload, checker_t f, void *args) +bool selfload_mapped(struct prog *payload, void *mapping, + enum bootmem_type dest_type) { uintptr_t entry = 0; struct cbfs_payload_segment *cbfssegs; - void *data; - - data = selfprepare(payload); - if (data == NULL) - return false; - cbfssegs = &((struct cbfs_payload *)data)->segments; + cbfssegs = &((struct cbfs_payload *)mapping)->segments; - if (f && f(cbfssegs, args)) - goto out; + if (check_payload_segments(cbfssegs, dest_type)) + return false; if (load_payload_segments(cbfssegs, &entry)) - goto out; + return false; printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Pass cbtables to payload if architecture desires it. */ prog_set_entry(payload, (void *)entry, cbmem_find(CBMEM_ID_CBTABLE)); return true; -out: - rdev_munmap(prog_rdev(payload), data); - return false; } bool selfload_check(struct prog *payload, enum bootmem_type dest_type) { - return _selfload(payload, check_payload_segments, &dest_type); + if (prog_locate_hook(payload)) + return false; + + payload->cbfs_type = CBFS_TYPE_SELF; + void *mapping = cbfs_type_map(prog_name(payload), NULL, &payload->cbfs_type); + if (!mapping) + return false; + + bool ret = selfload_mapped(payload, mapping, dest_type); + + cbfs_unmap(mapping); + return ret; } bool selfload(struct prog *payload) { - return _selfload(payload, NULL, 0); + return selfload_check(payload, BM_MEM_INVALID); } diff --git a/src/soc/qualcomm/sc7180/aop_load_reset.c b/src/soc/qualcomm/sc7180/aop_load_reset.c index 86ee993e76..d48a422991 100644 --- a/src/soc/qualcomm/sc7180/aop_load_reset.c +++ b/src/soc/qualcomm/sc7180/aop_load_reset.c @@ -13,9 +13,6 @@ void aop_fw_load_reset(void) struct prog aop_fw_prog = PROG_INIT(PROG_PAYLOAD, CONFIG_CBFS_PREFIX "/aop"); - if (prog_locate(&aop_fw_prog)) - die("SOC image: AOP_FW not found"); - aop_fw_entry = selfload(&aop_fw_prog); if (!aop_fw_entry) die("SOC image: AOP load failed"); -- cgit v1.2.3