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/lib/selfboot.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'src/lib/selfboot.c') 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); } -- cgit v1.2.3