From 30221b45e02f0be8940debd8ad5690c77d6a97a6 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 15 May 2017 14:35:15 -0700 Subject: drivers/spi/spi_flash: Pass in flash structure to fill in probe Instead of making all SPI drivers allocate space for a spi_flash structure and fill it in, udpate the API to allow callers to pass in a spi_flash structure that can be filled by the flash drivers as required. This also cleans up the interface so that the callers can maintain and free the space for spi_flash structure as required. BUG=b:38330715 Change-Id: If6f1b403731466525c4690777d9b32ce778eb563 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/19705 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/drivers/spi/gigadevice.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'src/drivers/spi/gigadevice.c') diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index bd6d6edb28..0b7173d608 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -170,9 +170,8 @@ out: return ret; } -static struct spi_flash flash; - -struct spi_flash *spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode) +int spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode, + struct spi_flash *flash) { const struct gigadevice_spi_flash_params *params; unsigned int i; @@ -187,28 +186,28 @@ struct spi_flash *spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode) printk(BIOS_WARNING, "SF gigadevice.c: Unsupported ID %#02x%02x\n", idcode[1], idcode[2]); - return NULL; + return -1; } - memcpy(&flash.spi, spi, sizeof(*spi)); - flash.name = params->name; + memcpy(&flash->spi, spi, sizeof(*spi)); + flash->name = params->name; /* Assuming power-of-two page size initially. */ - 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 * + 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_GD25_SE; - flash.status_cmd = CMD_GD25_RDSR; + 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; + 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; + flash->internal_read = spi_flash_cmd_read_slow; #else - flash.internal_read = spi_flash_cmd_read_fast; + flash->internal_read = spi_flash_cmd_read_fast; #endif - return &flash; + return 0; } -- cgit v1.2.3