openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

flashrom.c: Remove custom mappers from opaque_master

Browse Source 
No opaque masters have a custom mapper.  The returned chipaddr is not
fed back into the read/write/erase functions, so this would only be
useful for side effects.

Change-Id: I36f05154edda371b51f8ff416f019837ff1c243d
Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68092
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Jonathon Hall 2022-10-03 16:19:57 -04:00 committed by Angel Pons
parent a021cd0380
commit 7c40ba24fe
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flashrom.c
View File

@ -211,9 +211,7 @@ void *master_map_flash_region(const struct registered_master *mst,
* fallback if it does not specialize it * fallback if it does not specialize it
*/ */
void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len) = NULL; void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len) = NULL;
if (mst->buses_supported & BUS_PROG) if (mst->buses_supported & BUS_SPI)
map_flash_region = mst->opaque.map_flash_region;
else if (mst->buses_supported & BUS_SPI)
map_flash_region = mst->spi.map_flash_region; map_flash_region = mst->spi.map_flash_region;
else if (mst->buses_supported & BUS_NONSPI) else if (mst->buses_supported & BUS_NONSPI)
map_flash_region = mst->par.map_flash_region; map_flash_region = mst->par.map_flash_region;
@ -232,9 +230,7 @@ void master_unmap_flash_region(const struct registered_master *mst,
void *virt_addr, size_t len) void *virt_addr, size_t len)
{ {
void (*unmap_flash_region) (void *virt_addr, size_t len) = NULL; void (*unmap_flash_region) (void *virt_addr, size_t len) = NULL;
if (mst->buses_supported & BUS_PROG) if (mst->buses_supported & BUS_SPI)
unmap_flash_region = mst->opaque.unmap_flash_region;
else if (mst->buses_supported & BUS_SPI)
unmap_flash_region = mst->spi.unmap_flash_region; unmap_flash_region = mst->spi.unmap_flash_region;
else if (mst->buses_supported & BUS_NONSPI) else if (mst->buses_supported & BUS_NONSPI)
unmap_flash_region = mst->par.unmap_flash_region; unmap_flash_region = mst->par.unmap_flash_region;
@ -249,9 +245,7 @@ void master_unmap_flash_region(const struct registered_master *mst,
static bool master_uses_physmap(const struct registered_master *mst) static bool master_uses_physmap(const struct registered_master *mst)
{ {
#if CONFIG_INTERNAL == 1 #if CONFIG_INTERNAL == 1
if (mst->buses_supported & BUS_PROG) if (mst->buses_supported & BUS_SPI)
return mst->opaque.map_flash_region == physmap;
else if (mst->buses_supported & BUS_SPI)
return mst->spi.map_flash_region == physmap; return mst->spi.map_flash_region == physmap;
else if (mst->buses_supported & BUS_NONSPI) else if (mst->buses_supported & BUS_NONSPI)
return mst->par.map_flash_region == physmap; return mst->par.map_flash_region == physmap;

2
include/programmer.h
View File

@ -398,8 +398,6 @@ int wbsio_check_for_spi(void);
/* opaque.c */ /* opaque.c */
struct opaque_master { struct opaque_master {
void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len);
void (*unmap_flash_region) (void *virt_addr, size_t len);
int max_data_read; int max_data_read;
int max_data_write; int max_data_write;
/* Specific functions for this master */ /* Specific functions for this master */