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

15
src/southbridge/intel/common/spi.c
View File

@ -899,10 +899,9 @@ static int ich_hwseq_write(const struct spi_flash *flash, u32 addr, size_t len,
return 0;
}
struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force)
int spi_flash_programmer_probe(struct spi_slave *spi,
int force, struct spi_flash *flash)
{
struct spi_flash *flash = NULL;
uint32_t flcomp;
/*
@ -911,13 +910,7 @@ struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force)
* 2. Specialized probing is forced by SPI flash driver.
*/
if (!spi_is_multichip() && !force)
return NULL;
flash = malloc(sizeof(*flash));
if (!flash) {
printk(BIOS_WARNING, "SF: Failed to allocate memory\n");
return NULL;
}
return -1;
memcpy(&flash->spi, spi, sizeof(*spi));
flash->name = "Opaque HW-sequencing";
@ -951,5 +944,5 @@ struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force)
flash->size += 1 << (19 + ((flcomp >> 3) & 7));
printk (BIOS_DEBUG, "flash size 0x%x bytes\n", flash->size);
return flash;
return 0;
}