sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/spi/spi_flash: Pass in flash structure to fill in probe

Browse Source 
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 <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19705
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh
2017-05-15 14:35:15 -07:00
committed by Furquan Shaikh
parent fc1a123aa7
commit 30221b45e0
25 changed files with 261 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/drivers/spi/stmicro.c
View File

@@ -222,9 +222,8 @@ out:
return ret;
}
static struct spi_flash flash;
struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
int spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct stmicro_spi_flash_params *params;
unsigned int i;
@@ -232,13 +231,13 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
if (idcode[0] == 0xff) {
i = spi_flash_cmd(spi, CMD_M25PXX_RES, idcode, 4);
if (i)
return NULL;
return -1;
if ((idcode[3] & 0xf0) == 0x10) {
idcode[0] = 0x20;
idcode[1] = 0x20;
idcode[2] = idcode[3] + 1;
} else
return NULL;
return -1;
}
for (i = 0; i < ARRAY_SIZE(stmicro_spi_flash_table); i++) {
@@ -251,19 +250,19 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
if (i == ARRAY_SIZE(stmicro_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported STMicro ID %02x%02x\n",
idcode[1], idcode[2]);
return NULL;
return -1;
}
memcpy(&flash.spi, spi, sizeof(*spi));
flash.name = params->name;
flash.page_size = params->page_size;
flash.sector_size = params->page_size * params->pages_per_sector;
flash.size = flash.sector_size * params->nr_sectors;
flash.erase_cmd = params->op_erase;
memcpy(&flash->spi, spi, sizeof(*spi));
flash->name = params->name;
flash->page_size = params->page_size;
flash->sector_size = params->page_size * params->pages_per_sector;
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->internal_write = stmicro_write;
flash->internal_erase = spi_flash_cmd_erase;
flash->internal_read = spi_flash_cmd_read_fast;
return &flash;
return 0;
}