GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPI: Add API for programmer-specific flashing. 

Change-Id: I7a2f5b9ae74458b5ed6271b1c27842c61546dcd2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/4712
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Vladimir Serbinenko 2014-01-18 17:45:32 +01:00
parent e33d6cac96
commit e23bd0e3c4
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drivers/spi/spi_flash.c
View File

@ -267,6 +267,13 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
goto err_claim_bus; goto err_claim_bus;
} }
if (spi->force_programmer_specific && spi->programmer_specific_probe) {
flash = spi->programmer_specific_probe (spi);
if (!flash)
goto err_read_id;
goto flash_detected;
}
/* Read the ID codes */ /* Read the ID codes */
ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode)); ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
if (ret) if (ret)
@ -295,11 +302,19 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
break; break;
} }
if (!flash && spi->programmer_specific_probe) {
#if CONFIG_SMM_TSEG && defined(__SMM__)
/* Need to relocate this function */
tseg_relocate((void **)&spi->programmer_specific_probe);
#endif
flash = spi->programmer_specific_probe (spi);
}
if (!flash) { if (!flash) {
printk(BIOS_WARNING, "SF: Unsupported manufacturer %02x\n", *idp); printk(BIOS_WARNING, "SF: Unsupported manufacturer %02x\n", *idp);
goto err_manufacturer_probe; goto err_manufacturer_probe;
} }
flash_detected:
#if CONFIG_SMM_TSEG && defined(__SMM__) #if CONFIG_SMM_TSEG && defined(__SMM__)
/* Ensure flash handlers are valid for TSEG */ /* Ensure flash handlers are valid for TSEG */
tseg_relocate((void **)&flash->read); tseg_relocate((void **)&flash->read);

2
src/include/spi-generic.h
View File

@ -64,6 +64,8 @@ struct spi_slave {
unsigned int bus; unsigned int bus;
unsigned int cs; unsigned int cs;
unsigned int rw; unsigned int rw;
int force_programmer_specific;
struct spi_flash * (*programmer_specific_probe) (struct spi_slave *spi);
}; };
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------