diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2023-01-12 13:51:24 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2023-02-15 06:28:41 +0000 |
| commit | 7c3fa6d5cd94dd90eeff2b55a510e26d18393674 (patch) | |
| tree | d0b995659e9b35257c4783fc4552aa0d74c948c1 /internal.c | |
| parent | 3a1a0684b999a68e265266651983cb0429faf288 (diff) | |
| download | flashrom-7c3fa6d5cd94dd90eeff2b55a510e26d18393674.tar.gz flashrom-7c3fa6d5cd94dd90eeff2b55a510e26d18393674.tar.bz2 flashrom-7c3fa6d5cd94dd90eeff2b55a510e26d18393674.zip | |
internal: Move parallel logic into internal_par implementation
The parallel internal programmer is its own implementation. Move
it and call into it from the top-level internal.c programmer
implementation.
Change-Id: Idabeceb59a36680f5fbb45d3ee4bd5dbf837373b
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/71834
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'internal.c')
| -rw-r--r-- | internal.c | 59 |
1 files changed, 2 insertions, 57 deletions
diff --git a/internal.c b/internal.c index 07126bf35..c75b472a9 100644 --- a/internal.c +++ b/internal.c @@ -18,9 +18,9 @@ #include <string.h> #include <stdbool.h> #include <stdlib.h> + #include "flash.h" #include "programmer.h" -#include "hwaccess_physmap.h" #include "platform/pci.h" #if defined(__i386__) || defined(__x86_64__) @@ -34,60 +34,6 @@ bool force_boardmismatch = false; enum chipbustype internal_buses_supported = BUS_NONE; -static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, - chipaddr addr) -{ - mmio_writeb(val, (void *) addr); -} - -static void internal_chip_writew(const struct flashctx *flash, uint16_t val, - chipaddr addr) -{ - mmio_writew(val, (void *) addr); -} - -static void internal_chip_writel(const struct flashctx *flash, uint32_t val, - chipaddr addr) -{ - mmio_writel(val, (void *) addr); -} - -static uint8_t internal_chip_readb(const struct flashctx *flash, - const chipaddr addr) -{ - return mmio_readb((void *) addr); -} - -static uint16_t internal_chip_readw(const struct flashctx *flash, - const chipaddr addr) -{ - return mmio_readw((void *) addr); -} - -static uint32_t internal_chip_readl(const struct flashctx *flash, - const chipaddr addr) -{ - return mmio_readl((void *) addr); -} - -static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf, - const chipaddr addr, size_t len) -{ - mmio_readn((void *)addr, buf, len); - return; -} - -static const struct par_master par_master_internal = { - .map_flash_region = physmap, - .unmap_flash_region = physunmap, - .chip_readb = internal_chip_readb, - .chip_readw = internal_chip_readw, - .chip_readl = internal_chip_readl, - .chip_readn = internal_chip_readn, - .chip_writeb = internal_chip_writeb, - .chip_writew = internal_chip_writew, - .chip_writel = internal_chip_writel, -}; static int get_params(const struct programmer_cfg *cfg, bool *boardenable, bool *boardmismatch, @@ -309,8 +255,7 @@ static int internal_init(const struct programmer_cfg *cfg) } #endif - if (internal_buses_supported & BUS_NONSPI) - register_par_master(&par_master_internal, internal_buses_supported, NULL); + internal_par_init(internal_buses_supported); /* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */ report_nonwl_laptop_detected(is_laptop, laptop_ok); |