diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-10-30 15:53:18 +1100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-11-12 16:40:10 +0000 |
| commit | c0813e7eddc553c5f8348ed1e1e4c8b00db93857 (patch) | |
| tree | 21b0719fef191c664a504bf7b837093d886dc5c0 /flashrom.c | |
| parent | 801e7c16742a29656ca5f7690a2486d5de49ab73 (diff) | |
| download | flashrom-c0813e7eddc553c5f8348ed1e1e4c8b00db93857.tar.gz flashrom-c0813e7eddc553c5f8348ed1e1e4c8b00db93857.tar.bz2 flashrom-c0813e7eddc553c5f8348ed1e1e4c8b00db93857.zip | |
programmer: Drop dead fallback_map() boilerplate
The fallback_{un}map() boilerplate code doesn't do anything,
merely distracts away from otherwise linear control flow. Just
drop it as anything in the future that could need such a thing
is free to implement it when required.
Change-Id: Ibb7760f807fae040416cef2797a7dbf6572f7df9
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68963
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'flashrom.c')
| -rw-r--r-- | flashrom.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/flashrom.c b/flashrom.c index 815f489b2..5483af374 100644 --- a/flashrom.c +++ b/flashrom.c @@ -215,11 +215,15 @@ void *master_map_flash_region(const struct registered_master *mst, else if (mst->buses_supported & BUS_NONSPI) map_flash_region = mst->par.map_flash_region; - void *ret; + /* A result of NULL causes mapped addresses to be chip physical + * addresses, assuming only a single region is mapped (the entire flash + * space). Chips with a second region (like a register map) require a + * real memory mapping to distinguish the different ranges. Those chips + * are FWH/LPC, so the bus master provides a real mapping. + */ + void *ret = NULL; if (map_flash_region) ret = map_flash_region(descr, phys_addr, len); - else - ret = fallback_map(descr, phys_addr, len); msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n", __func__, descr, PRIxPTR_WIDTH, phys_addr, PRIxPTR_WIDTH, (uintptr_t) ret); return ret; @@ -236,8 +240,6 @@ void master_unmap_flash_region(const struct registered_master *mst, if (unmap_flash_region) unmap_flash_region(virt_addr, len); - else - fallback_unmap(virt_addr, len); msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); } |