From e2fc5e25f2d1cab86edac352d1a91f55c15c9f0a Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 17 May 2017 17:26:01 -0700 Subject: drivers/spi/spi_flash: Move flash ops to spi_flash_ops structure Define a new spi_flash_ops structure, move all spi flash operations to this structure and add a pointer to this structure in struct spi_flash. BUG=b:38330715 Change-Id: I550cc4556fc4b63ebc174a7e2fde42251fe56052 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/19757 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/drivers/spi/adesto.c | 18 +++++++++++------- src/drivers/spi/amic.c | 18 +++++++++++------- src/drivers/spi/atmel.c | 18 +++++++++++------- src/drivers/spi/eon.c | 12 ++++++++---- src/drivers/spi/gigadevice.c | 20 ++++++++++++-------- src/drivers/spi/macronix.c | 20 ++++++++++++-------- src/drivers/spi/spansion.c | 12 ++++++++---- src/drivers/spi/spi_flash.c | 11 +++++++---- src/drivers/spi/sst.c | 40 +++++++++++++++++++++++++--------------- src/drivers/spi/stmicro.c | 10 +++++++--- src/drivers/spi/winbond.c | 20 ++++++++++++-------- 11 files changed, 124 insertions(+), 75 deletions(-) (limited to 'src/drivers/spi') diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c index c22bec1879..3e857fcbf8 100644 --- a/src/drivers/spi/adesto.c +++ b/src/drivers/spi/adesto.c @@ -126,6 +126,16 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = adesto_write, + .erase = spi_flash_cmd_erase, +#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) + .read = spi_flash_cmd_read_slow, +#else + .read = spi_flash_cmd_read_fast, +#endif +}; + int spi_flash_probe_adesto(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -153,13 +163,7 @@ int spi_flash_probe_adesto(const struct spi_slave *spi, u8 *idcode, params->nr_blocks; flash->erase_cmd = CMD_AT25DF_SE; - flash->internal_write = adesto_write; - flash->internal_erase = spi_flash_cmd_erase; -#if CONFIG_SPI_FLASH_NO_FAST_READ - flash->internal_read = spi_flash_cmd_read_slow; -#else - flash->internal_read = spi_flash_cmd_read_fast; -#endif + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c index e97a3625c5..239681cdc5 100644 --- a/src/drivers/spi/amic.c +++ b/src/drivers/spi/amic.c @@ -109,6 +109,16 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = amic_write, + .erase = spi_flash_cmd_erase, +#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) + .read = spi_flash_cmd_read_slow, +#else + .read = spi_flash_cmd_read_fast, +#endif +}; + int spi_flash_probe_amic(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -137,13 +147,7 @@ int spi_flash_probe_amic(const struct spi_slave *spi, u8 *idcode, params->nr_blocks; flash->erase_cmd = CMD_A25_SE; - flash->internal_write = amic_write; - flash->internal_erase = spi_flash_cmd_erase; -#if CONFIG_SPI_FLASH_NO_FAST_READ - flash->internal_read = spi_flash_cmd_read_slow; -#else - flash->internal_read = spi_flash_cmd_read_fast; -#endif + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/atmel.c b/src/drivers/spi/atmel.c index b97f255223..07bbf1686b 100644 --- a/src/drivers/spi/atmel.c +++ b/src/drivers/spi/atmel.c @@ -154,6 +154,16 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = atmel_write, + .erase = spi_flash_cmd_erase, +#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) + .read = spi_flash_cmd_read_slow, +#else + .read = spi_flash_cmd_read_fast, +#endif +}; + int spi_flash_probe_atmel(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -182,13 +192,7 @@ int spi_flash_probe_atmel(const struct spi_slave *spi, u8 *idcode, params->nr_blocks; flash->erase_cmd = CMD_AT25_SE; - flash->internal_write = atmel_write; - flash->internal_erase = spi_flash_cmd_erase; -#if CONFIG_SPI_FLASH_NO_FAST_READ - flash->internal_read = spi_flash_cmd_read_slow; -#else - flash->internal_read = spi_flash_cmd_read_fast; -#endif + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c index ece9810e2d..a072e4e223 100644 --- a/src/drivers/spi/eon.c +++ b/src/drivers/spi/eon.c @@ -126,6 +126,13 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = eon_write, + .erase = spi_flash_cmd_erase, + .status = spi_flash_cmd_status, + .read = spi_flash_cmd_read_fast, +}; + int spi_flash_probe_eon(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -153,10 +160,7 @@ int spi_flash_probe_eon(const struct spi_slave *spi, u8 *idcode, flash->erase_cmd = CMD_EN25_SE; flash->status_cmd = CMD_EN25_RDSR; - flash->internal_write = eon_write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_status = spi_flash_cmd_status; - flash->internal_read = spi_flash_cmd_read_fast; + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index f68be8b017..becc215e76 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -170,6 +170,17 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = gigadevice_write, + .erase = spi_flash_cmd_erase, + .status = spi_flash_cmd_status, +#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) + .read = spi_flash_cmd_read_slow, +#else + .read = spi_flash_cmd_read_fast, +#endif +}; + int spi_flash_probe_gigadevice(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -200,14 +211,7 @@ int spi_flash_probe_gigadevice(const struct spi_slave *spi, u8 *idcode, flash->erase_cmd = CMD_GD25_SE; flash->status_cmd = CMD_GD25_RDSR; - flash->internal_write = gigadevice_write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_status = spi_flash_cmd_status; -#if CONFIG_SPI_FLASH_NO_FAST_READ - flash->internal_read = spi_flash_cmd_read_slow; -#else - flash->internal_read = spi_flash_cmd_read_fast; -#endif + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index 128d00fd0f..fd2d25b6e4 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -192,6 +192,17 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len, return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = macronix_write, + .erase = spi_flash_cmd_erase, + .status = spi_flash_cmd_status, +#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) + .read = spi_flash_cmd_read_slow, +#else + .read = spi_flash_cmd_read_fast, +#endif +}; + int spi_flash_probe_macronix(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -219,14 +230,7 @@ int spi_flash_probe_macronix(const struct spi_slave *spi, u8 *idcode, flash->erase_cmd = CMD_MX25XX_SE; flash->status_cmd = CMD_MX25XX_RDSR; - flash->internal_write = macronix_write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_status = spi_flash_cmd_status; -#if CONFIG_SPI_FLASH_NO_FAST_READ - flash->internal_read = spi_flash_cmd_read_slow; -#else - flash->internal_read = spi_flash_cmd_read_fast; -#endif + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c index de7ad55a34..cb528d3916 100644 --- a/src/drivers/spi/spansion.c +++ b/src/drivers/spi/spansion.c @@ -246,6 +246,13 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len, return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = spansion_write, + .erase = spi_flash_cmd_erase, + .read = spi_flash_cmd_read_slow, + .status = spi_flash_cmd_status, +}; + int spi_flash_probe_spansion(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -273,10 +280,7 @@ int spi_flash_probe_spansion(const struct spi_slave *spi, u8 *idcode, flash->erase_cmd = CMD_S25FLXX_SE; flash->status_cmd = CMD_S25FLXX_RDSR; - flash->internal_write = spansion_write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_read = spi_flash_cmd_read_slow; - flash->internal_status = spi_flash_cmd_status; + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c index 564d573a83..c145379e1a 100644 --- a/src/drivers/spi/spi_flash.c +++ b/src/drivers/spi/spi_flash.c @@ -350,7 +350,7 @@ int spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_flash *flash) int spi_flash_read(const struct spi_flash *flash, u32 offset, size_t len, void *buf) { - return flash->internal_read(flash, offset, len, buf); + return flash->ops->read(flash, offset, len, buf); } int spi_flash_write(const struct spi_flash *flash, u32 offset, size_t len, @@ -361,7 +361,7 @@ int spi_flash_write(const struct spi_flash *flash, u32 offset, size_t len, if (spi_flash_volatile_group_begin(flash)) return -1; - ret = flash->internal_write(flash, offset, len, buf); + ret = flash->ops->write(flash, offset, len, buf); if (spi_flash_volatile_group_end(flash)) return -1; @@ -376,7 +376,7 @@ int spi_flash_erase(const struct spi_flash *flash, u32 offset, size_t len) if (spi_flash_volatile_group_begin(flash)) return -1; - ret = flash->internal_erase(flash, offset, len); + ret = flash->ops->erase(flash, offset, len); if (spi_flash_volatile_group_end(flash)) return -1; @@ -386,7 +386,10 @@ int spi_flash_erase(const struct spi_flash *flash, u32 offset, size_t len) int spi_flash_status(const struct spi_flash *flash, u8 *reg) { - return flash->internal_status(flash, reg); + if (flash->ops->status) + return flash->ops->status(flash, reg); + + return -1; } static uint32_t volatile_group_count CAR_GLOBAL; diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c index 5325ef4e86..ce67e9b308 100644 --- a/src/drivers/spi/sst.c +++ b/src/drivers/spi/sst.c @@ -43,8 +43,7 @@ struct sst_spi_flash_params { u8 idcode1; u16 nr_sectors; const char *name; - int (*write)(const struct spi_flash *flash, u32 offset, - size_t len, const void *buf); + const struct spi_flash_ops *ops; }; static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len, @@ -52,53 +51,67 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len, static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len, const void *buf); +static const struct spi_flash_ops spi_flash_ops_write_ai = { + .write = sst_write_ai, + .erase = spi_flash_cmd_erase, + .status = spi_flash_cmd_status, + .read = spi_flash_cmd_read_fast, +}; + +static const struct spi_flash_ops spi_flash_ops_write_256 = { + .write = sst_write_256, + .erase = spi_flash_cmd_erase, + .status = spi_flash_cmd_status, + .read = spi_flash_cmd_read_fast, +}; + #define SST_SECTOR_SIZE (4 * 1024) static const struct sst_spi_flash_params sst_spi_flash_table[] = { { .idcode1 = 0x8d, .nr_sectors = 128, .name = "SST25VF040B", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, },{ .idcode1 = 0x8e, .nr_sectors = 256, .name = "SST25VF080B", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, },{ .idcode1 = 0x41, .nr_sectors = 512, .name = "SST25VF016B", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, },{ .idcode1 = 0x4a, .nr_sectors = 1024, .name = "SST25VF032B", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, },{ .idcode1 = 0x4b, .nr_sectors = 2048, .name = "SST25VF064C", - .write = sst_write_256, + .ops = &spi_flash_ops_write_256, },{ .idcode1 = 0x01, .nr_sectors = 16, .name = "SST25WF512", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, },{ .idcode1 = 0x02, .nr_sectors = 32, .name = "SST25WF010", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, },{ .idcode1 = 0x03, .nr_sectors = 64, .name = "SST25WF020", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, },{ .idcode1 = 0x04, .nr_sectors = 128, .name = "SST25WF040", - .write = sst_write_ai, + .ops = &spi_flash_ops_write_ai, }, }; @@ -338,10 +351,7 @@ int spi_flash_probe_sst(const struct spi_slave *spi, u8 *idcode, flash->erase_cmd = CMD_SST_SE; flash->status_cmd = CMD_SST_RDSR; - flash->internal_write = params->write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_status = spi_flash_cmd_status; - flash->internal_read = spi_flash_cmd_read_fast; + flash->ops = params->ops; /* Flash powers up read-only, so clear BP# bits */ sst_unlock(flash); diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index fe8c4663fa..68eb37b3e1 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -222,6 +222,12 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = stmicro_write, + .erase = spi_flash_cmd_erase, + .read = spi_flash_cmd_read_fast, +}; + int spi_flash_probe_stmicro(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -260,9 +266,7 @@ int spi_flash_probe_stmicro(const struct spi_slave *spi, u8 *idcode, flash->size = flash->sector_size * params->nr_sectors; flash->erase_cmd = params->op_erase; - flash->internal_write = stmicro_write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_read = spi_flash_cmd_read_fast; + flash->ops = &spi_flash_ops; return 0; } diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index 9694f8aee4..77064ea52c 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -184,6 +184,17 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = winbond_write, + .erase = spi_flash_cmd_erase, + .status = spi_flash_cmd_status, +#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) + .read = spi_flash_cmd_read_slow, +#else + .read = spi_flash_cmd_read_fast, +#endif +}; + int spi_flash_probe_winbond(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -212,14 +223,7 @@ int spi_flash_probe_winbond(const struct spi_slave *spi, u8 *idcode, flash->erase_cmd = CMD_W25_SE; flash->status_cmd = CMD_W25_RDSR; - flash->internal_write = winbond_write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_status = spi_flash_cmd_status; -#if CONFIG_SPI_FLASH_NO_FAST_READ - flash->internal_read = spi_flash_cmd_read_slow; -#else - flash->internal_read = spi_flash_cmd_read_fast; -#endif + flash->ops = &spi_flash_ops; return 0; } -- cgit v1.2.3