aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNikolai Artemiev <nartemiev@google.com>2022-12-05 12:49:14 +1100
committerEdward O'Callaghan <quasisec@chromium.org>2023-01-19 12:41:58 +0000
commit673cb357d411e6d95be7cbf31513b46615355e12 (patch)
tree20deb2eb0aef676695d49ca8fd52dff1a80a9ebc /include
parent7cab790a46f8459789e258a106e743275e306a2d (diff)
downloadflashrom-673cb357d411e6d95be7cbf31513b46615355e12.tar.gz
flashrom-673cb357d411e6d95be7cbf31513b46615355e12.tar.bz2
flashrom-673cb357d411e6d95be7cbf31513b46615355e12.zip
tree/: Change chip restore data type from uint8_t to void ptr
Chip restore callbacks currently are used by - spi25_statusreg.c unlock functions to restore status register 1. - s25f.c to restore config register 3. Both of these cases only need to save a single uint8_t value to restore the original chip state, however storing a void pointer will allow more flexible chip restore behaviour. In particular, it will allow flashrom_wp_cfg objects to be saved and restored, enabling writeprotect-based unlocking. BUG=b:237485865,b:247421511 BRANCH=none TEST=Tested on grunt DUT (prog: sb600spi, flash: W25Q128.W): `flashrom --wp-range 0x0,0x1000000 \ flashrom --wp-status # Result: range=0x0,0x1000000 \ flashrom -w random.bin # Result: success \ flashrom -v random.bin # Result: success \ flashrom --wp-status # Result: range=0x0,0x1000000` Change-Id: I311b468a4b0349f4da9584c12b36af6ec2394527 Signed-off-by: Nikolai Artemiev <nartemiev@google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/70349 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com> Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/flash.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/flash.h b/include/flash.h
index fcefc422..3db38d25 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -509,7 +509,7 @@ struct flashchip {
enum decode_range_func decode_range;
};
-typedef int (*chip_restore_fn_cb_t)(struct flashctx *flash, uint8_t status);
+typedef int (*chip_restore_fn_cb_t)(struct flashctx *flash, void *data);
struct flashrom_flashctx {
struct flashchip *chip;
@@ -544,7 +544,7 @@ struct flashrom_flashctx {
int chip_restore_fn_count;
struct chip_restore_func_data {
chip_restore_fn_cb_t func;
- uint8_t status;
+ void *data;
} chip_restore_fn[MAX_CHIP_RESTORE_FUNCTIONS];
/* Progress reporting */
flashrom_progress_callback *progress_callback;
@@ -618,7 +618,7 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filen
int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename);
int prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it);
void finalize_flash_access(struct flashctx *);
-int register_chip_restore(chip_restore_fn_cb_t func, struct flashctx *flash, uint8_t status);
+int register_chip_restore(chip_restore_fn_cb_t func, struct flashctx *flash, void *data);
int check_block_eraser(const struct flashctx *flash, int k, int log);
unsigned int count_usable_erasers(const struct flashctx *flash);
int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran, const uint8_t erased_value);