diff options
author | Aaron Durbin <adurbin@chromium.org> | 2019-12-27 15:16:17 -0700 |
---|---|---|
committer | Aaron Durbin <adurbin@chromium.org> | 2020-01-06 15:00:50 +0000 |
commit | d701ef7475fe6d015a61cd91410391c3e0902f53 (patch) | |
tree | a3b1aaaaa6490b62ef7c71e9a119a41bd32d825a /src/drivers/spi/gigadevice.c | |
parent | 9e877ec60d177565776b20e3d61f723a9552ee34 (diff) |
drives/spi_flash: add spi_flash_cmd_write_page_program()
The SPI flashes that support page programming mode had duplicated
the logic for writing in every driver. Add
spi_flash_cmd_write_page_program() and use the common implementation
to reduce code size that comes from duplication. The savings is
~2.5KiB per stage where the spi flash drivers are utilized.
Change-Id: Ie6db03fa8ad33789f1d07a718a769e4ca8bffe1d
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37963
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/drivers/spi/gigadevice.c')
-rw-r--r-- | src/drivers/spi/gigadevice.c | 67 |
1 files changed, 3 insertions, 64 deletions
diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index 65494fa240..1f478a867a 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -164,71 +164,8 @@ static const struct gigadevice_spi_flash_params gigadevice_spi_flash_table[] = { }, }; -static int gigadevice_write(const struct spi_flash *flash, u32 offset, - size_t len, const void *buf) -{ - unsigned long byte_addr; - unsigned long page_size; - size_t chunk_len; - size_t actual; - int ret = 0; - u8 cmd[4]; - - page_size = flash->page_size; - - for (actual = 0; actual < len; actual += chunk_len) { - byte_addr = offset % page_size; - chunk_len = MIN(len - actual, page_size - byte_addr); - chunk_len = spi_crop_chunk(&flash->spi, sizeof(cmd), chunk_len); - - ret = spi_flash_cmd(&flash->spi, CMD_GD25_WREN, NULL, 0); - if (ret < 0) { - printk(BIOS_WARNING, - "SF gigadevice.c: Enabling Write failed\n"); - goto out; - } - - cmd[0] = CMD_GD25_PP; - cmd[1] = (offset >> 16) & 0xff; - cmd[2] = (offset >> 8) & 0xff; - cmd[3] = offset & 0xff; -#if CONFIG(DEBUG_SPI_FLASH) - printk(BIOS_SPEW, - "PP gigadevice.c: %p => cmd = { 0x%02x 0x%02x%02x%02x }" - " chunk_len = %zu\n", buf + actual, - cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); -#endif - - ret = spi_flash_cmd_write(&flash->spi, cmd, sizeof(cmd), - buf + actual, chunk_len); - if (ret < 0) { - printk(BIOS_WARNING, - "SF gigadevice.c: Page Program failed\n"); - goto out; - } - - ret = spi_flash_cmd_wait_ready(flash, - SPI_FLASH_PROG_TIMEOUT_MS); - if (ret) - goto out; - - offset += chunk_len; - } - -#if CONFIG(DEBUG_SPI_FLASH) - printk(BIOS_SPEW, - "SF gigadevice.c: Successfully programmed %zu bytes @ %#x\n", - len, (unsigned int)(offset - len)); -#endif - - ret = 0; - -out: - return ret; -} - static const struct spi_flash_ops spi_flash_ops = { - .write = gigadevice_write, + .write = spi_flash_cmd_write_page_program, .erase = spi_flash_cmd_erase, .status = spi_flash_cmd_status, }; @@ -264,6 +201,8 @@ int spi_flash_probe_gigadevice(const struct spi_slave *spi, u8 *idcode, (1 << params->nr_blocks_shift); flash->erase_cmd = CMD_GD25_SE; flash->status_cmd = CMD_GD25_RDSR; + flash->pp_cmd = CMD_GD25_PP; + flash->wren_cmd = CMD_GD25_WREN; flash->ops = &spi_flash_ops; |