openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-05-13 14:50:59 +02:00
Code Issues Releases Wiki Activity

flashrom.c: Update check_block_eraser function to use probe opcode

Browse Source 
Update the check_block_eraser function to use probe_opcode to see if the
given block_eraser is supported by the spi master. This will help to get
a real count of usable block_erasers.

Change-Id: I6591a84ae1fe5bc1648051cc30b9393450033852
Signed-off-by: Aarya Chaumal <aarya.chaumal@gmail.com>
This commit is contained in:
Aarya Chaumal 2022-08-14 23:16:44 +05:30 committed by Simon Buhrow
parent c8b23a0902
commit dcdf301010
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dummyflasher.c
View File

@ -122,7 +122,7 @@ static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsig
emu_data->spi_write_256_chunksize); emu_data->spi_write_256_chunksize);
} }
static bool dummy_spi_probe_opcode(struct flashctx *flash, uint8_t opcode) static bool dummy_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode)
{ {
size_t i; size_t i;
struct emu_data *emu_data = flash->mst->spi.data; struct emu_data *emu_data = flash->mst->spi.data;

10
flashrom.c
View File

@ -309,6 +309,16 @@ static int check_block_eraser(const struct flashctx *flash, int k, int log)
"eraseblock layout is not defined. "); "eraseblock layout is not defined. ");
return 1; return 1;
} }
if (flash->mst->buses_supported & BUS_SPI) {
uint8_t opcode = spi_get_opcode_from_erasefn(eraser.block_erase);
if (!flash->mst->spi.probe_opcode(flash, opcode)) {
if (log)
msg_cdbg("block erase function and layout found "
"but SPI master doesn't support the function. ");
return 1;
}
}
// TODO: Once erase functions are annotated with allowed buses, check that as well. // TODO: Once erase functions are annotated with allowed buses, check that as well.
return 0; return 0;
} }

2
ichspi.c
View File

@ -1684,7 +1684,7 @@ static int ich_spi_send_multicommand(const struct flashctx *flash,
return ret; return ret;
} }
static bool ich_spi_probe_opcode(struct flashctx *flash, uint8_t opcode) static bool ich_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode)
{ {
return find_opcode(curopcodes, opcode) >= 0; return find_opcode(curopcodes, opcode) >= 0;
} }

4
include/programmer.h
View File

@ -313,7 +313,7 @@ struct spi_master {
int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
int (*shutdown)(void *data); int (*shutdown)(void *data);
bool (*probe_opcode)(struct flashctx *flash, uint8_t opcode); bool (*probe_opcode)(const struct flashctx *flash, uint8_t opcode);
void *data; void *data;
}; };
@ -323,7 +323,7 @@ int default_spi_send_multicommand(const struct flashctx *flash, struct spi_comma
int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
bool default_spi_probe_opcode(struct flashctx *flash, uint8_t opcode); bool default_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode);
int register_spi_master(const struct spi_master *mst, void *data); int register_spi_master(const struct spi_master *mst, void *data);
/* The following enum is needed by ich_descriptor_tool and ich* code as well as in chipset_enable.c. */ /* The following enum is needed by ich_descriptor_tool and ich* code as well as in chipset_enable.c. */

2
spi.c
View File

@ -134,7 +134,7 @@ int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start
return flash->mst->spi.write_aai(flash, buf, start, len); return flash->mst->spi.write_aai(flash, buf, start, len);
} }
bool default_spi_probe_opcode(struct flashctx *flash, uint8_t opcode) bool default_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode)
{ {
return true; return true;
} }