From fc1a123aa7392fe7900b466e6a6f089733fec1ee Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 12 May 2017 00:19:56 -0700 Subject: drivers/spi/spi_flash: Add page_size to struct spi_flash Add a new member page_size to spi_flash structure so that the various spi flash drivers can store this info in spi_flash along with the other sizes (sector size and total size) during flash probe. This removes the need to have {driver}_spi_flash structure in every spi flash driver. This is part of patch series to clean up the SPI flash and SPI driver interface. BUG=b:38330715 Change-Id: I0f83e52cb1041432b0b575a8ee3bd173cc038d1f Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/19704 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/drivers/spi/winbond.c | 54 ++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) (limited to 'src/drivers/spi/winbond.c') diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index 25a7b5bd32..3f167c0d06 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -36,18 +36,6 @@ struct winbond_spi_flash_params { const char *name; }; -/* spi_flash needs to be first so upper layers can free() it */ -struct winbond_spi_flash { - struct spi_flash flash; - const struct winbond_spi_flash_params *params; -}; - -static inline struct winbond_spi_flash * -to_winbond_spi_flash(const struct spi_flash *flash) -{ - return container_of(flash, struct winbond_spi_flash, flash); -} - static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { { .id = 0x3015, @@ -142,7 +130,6 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len, const void *buf) { - struct winbond_spi_flash *stm = to_winbond_spi_flash(flash); unsigned long byte_addr; unsigned long page_size; size_t chunk_len; @@ -150,7 +137,7 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len, int ret = 0; u8 cmd[4]; - page_size = 1 << stm->params->l2_page_size; + page_size = flash->page_size; for (actual = 0; actual < len; actual += chunk_len) { byte_addr = offset % page_size; @@ -197,12 +184,11 @@ out: return ret; } -static struct winbond_spi_flash stm; +static struct spi_flash flash; struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode) { const struct winbond_spi_flash_params *params; - unsigned page_size; unsigned int i; for (i = 0; i < ARRAY_SIZE(winbond_spi_flash_table); i++) { @@ -217,28 +203,24 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode) return NULL; } - stm.params = params; - memcpy(&stm.flash.spi, spi, sizeof(*spi)); - stm.flash.name = params->name; - + memcpy(&flash.spi, spi, sizeof(*spi)); + flash.name = params->name; /* Assuming power-of-two page size initially. */ - page_size = 1 << params->l2_page_size; - - stm.flash.internal_write = winbond_write; - stm.flash.internal_erase = spi_flash_cmd_erase; - stm.flash.internal_status = spi_flash_cmd_status; + flash.page_size = 1 << params->l2_page_size; + flash.sector_size = flash.page_size * params->pages_per_sector; + flash.size = flash.sector_size * params->sectors_per_block * + params->nr_blocks; + 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 - stm.flash.internal_read = spi_flash_cmd_read_slow; + flash.internal_read = spi_flash_cmd_read_slow; #else - stm.flash.internal_read = spi_flash_cmd_read_fast; + flash.internal_read = spi_flash_cmd_read_fast; #endif - stm.flash.sector_size = (1 << stm.params->l2_page_size) * - stm.params->pages_per_sector; - stm.flash.size = page_size * params->pages_per_sector - * params->sectors_per_block - * params->nr_blocks; - stm.flash.erase_cmd = CMD_W25_SE; - stm.flash.status_cmd = CMD_W25_RDSR; - - return &stm.flash; + + return &flash; } -- cgit v1.2.3