From 579f1e0b67a49282684a39f6c08bcf0813bd3c5c Mon Sep 17 00:00:00 2001 From: Nikolay Nikolaev Date: Fri, 28 Jun 2013 21:28:37 +0000 Subject: Introduce spi_block_erase_db() Used for page erase on some chips (e.g. Numonyx M45PE and Sanyo LF25FW series). Corresponding to flashrom svn r1682. Signed-off-by: Nikolay Nikolaev Reviewed-by: Steven Zakulec Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner --- spi25.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'spi25.c') diff --git a/spi25.c b/spi25.c index 4f1452eb6..26da13d8e 100644 --- a/spi25.c +++ b/spi25.c @@ -565,6 +565,47 @@ int spi_block_erase_d7(struct flashctx *flash, unsigned int addr, return 0; } +/* Page erase (usually 256B blocks) */ +int spi_block_erase_db(struct flashctx *flash, unsigned int addr, unsigned int blocklen) +{ + int result; + struct spi_command cmds[] = { + { + .writecnt = JEDEC_WREN_OUTSIZE, + .writearr = (const unsigned char[]){ JEDEC_WREN }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = JEDEC_PE_OUTSIZE, + .writearr = (const unsigned char[]){ + JEDEC_PE, + (addr >> 16) & 0xff, + (addr >> 8) & 0xff, + (addr & 0xff) + }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = 0, + .writearr = NULL, + .readcnt = 0, + .readarr = NULL, + } }; + + result = spi_send_multicommand(flash, cmds); + if (result) { + msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); + return result; + } + + /* Wait until the Write-In-Progress bit is cleared. + * This takes up to 20 ms usually (on worn out devices up to the 0.5s range), so wait in 1 ms steps. */ + while (spi_read_status_register(flash) & SPI_SR_WIP) + programmer_delay(1 * 1000); + /* FIXME: Check the status register for errors. */ + return 0; +} + /* Sector size is usually 4k, though Macronix eliteflash has 64k */ int spi_block_erase_20(struct flashctx *flash, unsigned int addr, unsigned int blocklen) @@ -745,6 +786,8 @@ erasefunc_t *spi_get_erasefn_from_opcode(uint8_t opcode) return &spi_block_erase_d7; case 0xd8: return &spi_block_erase_d8; + case 0xdb: + return &spi_block_erase_db; default: msg_cinfo("%s: unknown erase opcode (0x%02x). Please report " "this at flashrom@flashrom.org\n", __func__, opcode); -- cgit v1.2.3