From f745d0e6ab85f84b482aeac2ac4975e26db57389 Mon Sep 17 00:00:00 2001 From: Nikolai Artemiev Date: Thu, 5 Nov 2020 13:54:27 +1100 Subject: flashrom.c: implement chip restore callback registration Allows drivers to register a callback function to reset the chip state once programming has finished. This is used by the s25f driver added in a later patch, which needs to change the chip's sector layout to be able to write to the entire flash. Adapted from cros flashrom at `9c4c9a56b6a0370b383df9c75d71b3bd469e672d`. BUG=b:153800073 BRANCH=none TEST=builds Change-Id: I2a522dc1fd3952793fbcad70afc6dd43850fbbc5 Signed-off-by: Nikolai Artemiev Reviewed-on: https://review.coreboot.org/c/flashrom/+/47276 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- flashrom.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 7f5f2a84f..c89abad60 100644 --- a/flashrom.c +++ b/flashrom.c @@ -580,6 +580,34 @@ int register_shutdown(int (*function) (void *data), void *data) return 0; } +int register_chip_restore(chip_restore_fn_cb_t func, + struct flashctx *flash, uint8_t status) +{ + if (flash->chip_restore_fn_count >= MAX_CHIP_RESTORE_FUNCTIONS) { + msg_perr("Tried to register more than %i chip restore" + " functions.\n", MAX_CHIP_RESTORE_FUNCTIONS); + return 1; + } + flash->chip_restore_fn[flash->chip_restore_fn_count].func = func; + flash->chip_restore_fn[flash->chip_restore_fn_count].status = status; + flash->chip_restore_fn_count++; + + return 0; +} + +static int deregister_chip_restore(struct flashctx *flash) +{ + int rc = 0; + + while (flash->chip_restore_fn_count > 0) { + int i = --flash->chip_restore_fn_count; + rc |= flash->chip_restore_fn[i].func( + flash, flash->chip_restore_fn[i].status); + } + + return rc; +} + int programmer_init(enum programmer prog, const char *param) { int ret; @@ -2256,6 +2284,7 @@ int prepare_flash_access(struct flashctx *const flash, flash->address_high_byte = -1; flash->in_4ba_mode = false; + flash->chip_restore_fn_count = 0; /* Be careful about 4BA chips and broken masters */ if (flash->chip->total_size > 16 * 1024 && spi_master_no_4ba_modes(flash)) { @@ -2285,6 +2314,7 @@ int prepare_flash_access(struct flashctx *const flash, void finalize_flash_access(struct flashctx *const flash) { + deregister_chip_restore(flash); unmap_flash(flash); } -- cgit v1.2.3