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

programmer: Smoothen register_opaque_master() API

Browse Source 
It was impossible to register a const struct opaque_master that would
point to dynamically allocated `data`. Fix that so that we won't
have to create more mutable globals.

BUG=b:185191942
TEST=builds

Change-Id: Id3adb4cf04ae04dbe87ddb96f30871cb5f7c8ff0
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54170
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Anastasia Klimchuk 2021-05-13 12:28:47 +10:00 committed by Edward O'Callaghan
parent 6a5db26e68
commit 9309bed290
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ichspi.c
View File

@ -2046,7 +2046,7 @@ int ich_init_spi(void *spibar, enum ich_chipset ich_gen)
} }
hwseq_data.size_comp1 = tmpi; hwseq_data.size_comp1 = tmpi;
register_opaque_master(&opaque_master_ich_hwseq); register_opaque_master(&opaque_master_ich_hwseq, NULL);
} else { } else {
register_spi_master(&spi_master_ich9, NULL); register_spi_master(&spi_master_ich9, NULL);
} }

2
linux_mtd.c
View File

@ -424,7 +424,7 @@ int linux_mtd_init(void)
goto linux_mtd_init_exit; goto linux_mtd_init_exit;
} }
register_opaque_master(&programmer_linux_mtd); register_opaque_master(&programmer_linux_mtd, NULL);
ret = 0; ret = 0;
linux_mtd_init_exit: linux_mtd_init_exit:

4
nicintel_eeprom.c
View File

@ -486,7 +486,7 @@ int nicintel_ee_init(void)
return 1; return 1;
} }
return register_opaque_master(&opaque_master_nicintel_ee_82580); return register_opaque_master(&opaque_master_nicintel_ee_82580, NULL);
} else { } else {
nicintel_eebar = rphysmap("Intel i210 NIC w/ emulated EEPROM", nicintel_eebar = rphysmap("Intel i210 NIC w/ emulated EEPROM",
io_base_addr + 0x12000, MEMMAP_SIZE); io_base_addr + 0x12000, MEMMAP_SIZE);
@ -496,7 +496,7 @@ int nicintel_ee_init(void)
if (register_shutdown(nicintel_ee_shutdown_i210, NULL)) if (register_shutdown(nicintel_ee_shutdown_i210, NULL))
return 1; return 1;
return register_opaque_master(&opaque_master_nicintel_ee_i210); return register_opaque_master(&opaque_master_nicintel_ee_i210, NULL);
} }
return 1; return 1;

4
opaque.c
View File

@ -46,7 +46,7 @@ int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int bl
return flash->mst->opaque.erase(flash, blockaddr, blocklen); return flash->mst->opaque.erase(flash, blockaddr, blocklen);
} }
int register_opaque_master(const struct opaque_master *mst) int register_opaque_master(const struct opaque_master *mst, void *data)
{ {
struct registered_master rmst = {0}; struct registered_master rmst = {0};
@ -58,5 +58,7 @@ int register_opaque_master(const struct opaque_master *mst)
} }
rmst.buses_supported = BUS_PROG; rmst.buses_supported = BUS_PROG;
rmst.opaque = *mst; rmst.opaque = *mst;
if (data)
rmst.opaque.data = data;
return register_master(&rmst); return register_master(&rmst);
} }

2
programmer.h
View File

@ -725,7 +725,7 @@ struct opaque_master {
int (*erase) (struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); int (*erase) (struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen);
void *data; void *data;
}; };
int register_opaque_master(const struct opaque_master *mst); int register_opaque_master(const struct opaque_master *mst, void *data);
/* programmer.c */ /* programmer.c */
void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len); void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len);