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

14
src/drivers/spi/adesto.c
View File

@@ -126,10 +126,10 @@ out:
return ret;
}
struct spi_flash *spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct adesto_spi_flash_params *params;
struct spi_flash *flash;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(adesto_spi_flash_table); i++) {
@@ -141,13 +141,7 @@ struct spi_flash *spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode)
if (i == ARRAY_SIZE(adesto_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported adesto ID %02x%02x\n",
idcode[1], idcode[2]);
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));
@@ -167,5 +161,5 @@ struct spi_flash *spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode)
flash->internal_read = spi_flash_cmd_read_fast;
#endif
return flash;
return 0;
}

14
src/drivers/spi/amic.c
View File

@@ -109,11 +109,11 @@ out:
return ret;
}
struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct amic_spi_flash_params *params;
unsigned int i;
struct spi_flash *flash;
for (i = 0; i < ARRAY_SIZE(amic_spi_flash_table); i++) {
params = &amic_spi_flash_table[i];
@@ -124,13 +124,7 @@ struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode)
if (i == ARRAY_SIZE(amic_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported AMIC ID %02x%02x\n",
idcode[1], idcode[2]);
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));
@@ -151,5 +145,5 @@ struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode)
flash->internal_read = spi_flash_cmd_read_fast;
#endif
return flash;
return 0;
}

14
src/drivers/spi/atmel.c
View File

@@ -154,11 +154,11 @@ out:
return ret;
}
struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct atmel_spi_flash_params *params;
unsigned int i;
struct spi_flash *flash;
for (i = 0; i < ARRAY_SIZE(atmel_spi_flash_table); i++) {
params = &atmel_spi_flash_table[i];
@@ -169,13 +169,7 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
if (i == ARRAY_SIZE(atmel_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported Atmel ID %02x%02x\n",
idcode[1], idcode[2]);
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));
@@ -196,5 +190,5 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
flash->internal_read = spi_flash_cmd_read_fast;
#endif
return flash;
return 0;
}

23
src/drivers/spi/boot_device_rw_nommap.c
View File

@@ -17,13 +17,15 @@
#include <boot_device.h>
#include <spi_flash.h>
#include <spi-generic.h>
#include <stdint.h>
static struct spi_flash *sfg CAR_GLOBAL;
static struct spi_flash sfg CAR_GLOBAL;
static bool sfg_init_done CAR_GLOBAL;
static ssize_t spi_readat(const struct region_device *rd, void *b,
size_t offset, size_t size)
{
struct spi_flash *sf = car_get_var(sfg);
struct spi_flash *sf = car_get_var_ptr(&sfg);
if (sf == NULL)
return -1;
@@ -37,7 +39,7 @@ static ssize_t spi_readat(const struct region_device *rd, void *b,
static ssize_t spi_writeat(const struct region_device *rd, const void *b,
size_t offset, size_t size)
{
struct spi_flash *sf = car_get_var(sfg);
struct spi_flash *sf = car_get_var_ptr(&sfg);
if (sf == NULL)
return -1;
@@ -51,7 +53,7 @@ static ssize_t spi_writeat(const struct region_device *rd, const void *b,
static ssize_t spi_eraseat(const struct region_device *rd,
size_t offset, size_t size)
{
struct spi_flash *sf = car_get_var(sfg);
struct spi_flash *sf = car_get_var_ptr(&sfg);
if (sf == NULL)
return -1;
@@ -76,13 +78,14 @@ static void boot_device_rw_init(void)
const int bus = CONFIG_BOOT_DEVICE_SPI_FLASH_BUS;
const int cs = 0;
if (car_get_var(sfg) != NULL)
if (car_get_var(sfg_init_done) == true)
return;
/* Ensure any necessary setup is performed by the drivers. */
spi_init();
car_set_var(sfg, spi_flash_probe(bus, cs));
if (!spi_flash_probe(bus, cs, car_get_var_ptr(&sfg)))
car_set_var(sfg_init_done, true);
}
const struct region_device *boot_device_rw(void)
@@ -90,7 +93,7 @@ const struct region_device *boot_device_rw(void)
/* Probe for the SPI flash device if not already done. */
boot_device_rw_init();
if (car_get_var(sfg) == NULL)
if (car_get_var(sfg_init_done) != true)
return NULL;
return &spi_rw;
@@ -99,5 +102,9 @@ const struct region_device *boot_device_rw(void)
const struct spi_flash *boot_device_spi_flash(void)
{
boot_device_rw_init();
return car_get_var(sfg);
if (car_get_var(sfg_init_done) != true)
return NULL;
return car_get_var_ptr(&sfg);
}

25
src/drivers/spi/cbfs_spi.c
View File

@@ -24,9 +24,11 @@
#include <spi_flash.h>
#include <symbols.h>
#include <cbmem.h>
#include <stdint.h>
#include <timer.h>
static struct spi_flash *spi_flash_info;
static struct spi_flash spi_flash_info;
static bool spi_flash_init_done;
/*
* Set this to 1 to debug SPI speed, 0 to disable it
@@ -47,7 +49,7 @@ static ssize_t spi_readat(const struct region_device *rd, void *b,
if (show)
stopwatch_init(&sw);
if (spi_flash_read(spi_flash_info, offset, size, b))
if (spi_flash_read(&spi_flash_info, offset, size, b))
return -1;
if (show) {
long usecs;
@@ -68,7 +70,7 @@ static ssize_t spi_readat(const struct region_device *rd, void *b,
static ssize_t spi_writeat(const struct region_device *rd, const void *b,
size_t offset, size_t size)
{
if (spi_flash_write(spi_flash_info, offset, size, b))
if (spi_flash_write(&spi_flash_info, offset, size, b))
return -1;
return size;
}
@@ -76,7 +78,7 @@ static ssize_t spi_writeat(const struct region_device *rd, const void *b,
static ssize_t spi_eraseat(const struct region_device *rd,
size_t offset, size_t size)
{
if (spi_flash_erase(spi_flash_info, offset, size))
if (spi_flash_erase(&spi_flash_info, offset, size))
return -1;
return size;
}
@@ -112,10 +114,13 @@ void boot_device_init(void)
int bus = CONFIG_BOOT_DEVICE_SPI_FLASH_BUS;
int cs = 0;
if (spi_flash_info != NULL)
if (spi_flash_init_done == true)
return;
spi_flash_info = spi_flash_probe(bus, cs);
if (spi_flash_probe(bus, cs, &spi_flash_info))
return;
spi_flash_init_done = true;
mmap_helper_device_init(&mdev, _cbfs_cache, _cbfs_cache_size);
}
@@ -123,7 +128,7 @@ void boot_device_init(void)
/* Return the CBFS boot device. */
const struct region_device *boot_device_ro(void)
{
if (spi_flash_info == NULL)
if (spi_flash_init_done != true)
return NULL;
return &mdev.rdev;
@@ -138,5 +143,9 @@ const struct region_device *boot_device_rw(void)
const struct spi_flash *boot_device_spi_flash(void)
{
boot_device_init();
return spi_flash_info;
if (spi_flash_init_done != true)
return NULL;
return &spi_flash_info;
}

14
src/drivers/spi/eon.c
View File

@@ -126,10 +126,10 @@ out:
return ret;
}
struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct eon_spi_flash_params *params;
struct spi_flash *flash;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(eon_spi_flash_table); ++i) {
@@ -141,13 +141,7 @@ struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode)
if (i == ARRAY_SIZE(eon_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported EON ID %#02x%02x\n",
idcode[1], idcode[2]);
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));
@@ -164,5 +158,5 @@ struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode)
flash->internal_status = spi_flash_cmd_status;
flash->internal_read = spi_flash_cmd_read_fast;
return flash;
return 0;
}

33
src/drivers/spi/gigadevice.c
View File

@@ -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;
}

33
src/drivers/spi/macronix.c
View File

@@ -192,9 +192,8 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len,
return ret;
}
static struct spi_flash flash;
struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct macronix_spi_flash_params *params;
unsigned int i;
@@ -208,26 +207,26 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
if (i == ARRAY_SIZE(macronix_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported Macronix ID %04x\n", id);
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->sectors_per_block *
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->sectors_per_block *
params->nr_blocks;
flash.erase_cmd = CMD_MX25XX_SE;
flash.status_cmd = CMD_MX25XX_RDSR;
flash->erase_cmd = CMD_MX25XX_SE;
flash->status_cmd = CMD_MX25XX_RDSR;
flash.internal_write = macronix_write;
flash.internal_erase = spi_flash_cmd_erase;
flash.internal_status = spi_flash_cmd_status;
flash->internal_write = macronix_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;
}

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

@@ -246,9 +246,8 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len,
return ret;
}
static struct spi_flash flash;
struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct spansion_spi_flash_params *params;
unsigned int i;
@@ -263,21 +262,21 @@ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode)
printk(BIOS_WARNING,
"SF: Unsupported SPANSION ID %02x %02x %02x %02x %02x\n",
idcode[0], idcode[1], idcode[2], idcode[3], idcode[4]);
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 = CMD_S25FLXX_SE;
flash.status_cmd = CMD_S25FLXX_RDSR;
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 = CMD_S25FLXX_SE;
flash->status_cmd = CMD_S25FLXX_RDSR;
flash.internal_write = spansion_write;
flash.internal_erase = spi_flash_cmd_erase;
flash.internal_read = spi_flash_cmd_read_slow;
flash.internal_status = spi_flash_cmd_status;
flash->internal_write = spansion_write;
flash->internal_erase = spi_flash_cmd_erase;
flash->internal_read = spi_flash_cmd_read_slow;
flash->internal_status = spi_flash_cmd_status;
return &flash;
return 0;
}

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

@@ -240,7 +240,8 @@ int spi_flash_cmd_status(const struct spi_flash *flash, u8 *reg)
static struct {
const u8 shift;
const u8 idcode;
struct spi_flash *(*probe) (struct spi_slave *spi, u8 *idcode);
int (*probe) (struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
} flashes[] = {
/* Keep it sorted by define name */
#if CONFIG_SPI_FLASH_AMIC
@@ -280,24 +281,24 @@ static struct {
};
#define IDCODE_LEN (IDCODE_CONT_LEN + IDCODE_PART_LEN)
struct spi_flash *
int
__attribute__((weak)) spi_flash_programmer_probe(struct spi_slave *spi,
int force)
int force,
struct spi_flash *flash)
{
/* Default weak implementation. Do nothing. */
return NULL;
return -1;
}
static struct spi_flash *__spi_flash_probe(struct spi_slave *spi)
static int __spi_flash_probe(struct spi_slave *spi, struct spi_flash *flash)
{
int ret, i, shift;
u8 idcode[IDCODE_LEN], *idp;
struct spi_flash *flash = NULL;
/* Read the ID codes */
ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
if (ret)
return NULL;
return -1;
if (IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)) {
printk(BIOS_SPEW, "SF: Got idcode: ");
@@ -317,45 +318,44 @@ static struct spi_flash *__spi_flash_probe(struct spi_slave *spi)
for (i = 0; i < ARRAY_SIZE(flashes); ++i)
if (flashes[i].shift == shift && flashes[i].idcode == *idp) {
/* we have a match, call probe */
flash = flashes[i].probe(spi, idp);
if (flash)
break;
if (flashes[i].probe(spi, idp, flash) == 0)
return 0;
}
return flash;
/* No match, return error. */
return -1;
}
struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs)
int spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_flash *flash)
{
struct spi_slave spi;
struct spi_flash *flash;
if (spi_setup_slave(bus, cs, &spi)) {
printk(BIOS_WARNING, "SF: Failed to set up slave\n");
return NULL;
return -1;
}
/* Try special programmer probe if any (without force). */
flash = spi_flash_programmer_probe(&spi, 0);
if (spi_flash_programmer_probe(&spi, 0, flash) == 0)
goto flash_found;
/* If flash is not found, try generic spi flash probe. */
if (!flash)
flash = __spi_flash_probe(&spi);
if (__spi_flash_probe(&spi, flash) == 0)
goto flash_found;
/* If flash is not yet found, force special programmer probe if any. */
if (!flash)
flash = spi_flash_programmer_probe(&spi, 1);
if (spi_flash_programmer_probe(&spi, 1, flash) == 0)
goto flash_found;
/* Give up -- nothing more to try if flash is not found. */
if (!flash) {
printk(BIOS_WARNING, "SF: Unsupported manufacturer!\n");
return NULL;
}
printk(BIOS_WARNING, "SF: Unsupported manufacturer!\n");
return -1;
flash_found:
printk(BIOS_INFO, "SF: Detected %s with sector size 0x%x, total 0x%x\n",
flash->name, flash->sector_size, flash->size);
return flash;
return 0;
}
int spi_flash_read(const struct spi_flash *flash, u32 offset, size_t len,

34
src/drivers/spi/spi_flash_internal.h
View File

@@ -64,17 +64,27 @@ int spi_flash_cmd_erase(const struct spi_flash *flash, u32 offset, size_t len);
int spi_flash_cmd_status(const struct spi_flash *flash, u8 *reg);
/* Manufacturer-specific probe functions */
struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_flash_probe_gigadevice(struct spi_slave *spi,
u8 *idcode);
struct spi_flash *spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode);
struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode);
int spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
int spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash);
#endif /* SPI_FLASH_INTERNAL_H */

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

@@ -314,11 +314,10 @@ sst_unlock(const struct spi_flash *flash)
return ret;
}
struct spi_flash *
spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct sst_spi_flash_params *params;
struct spi_flash *flash;
size_t i;
for (i = 0; i < ARRAY_SIZE(sst_spi_flash_table); ++i) {
@@ -329,13 +328,7 @@ spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
if (i == ARRAY_SIZE(sst_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported SST ID %02x\n", idcode[1]);
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));
@@ -353,5 +346,5 @@ spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
/* Flash powers up read-only, so clear BP# bits */
sst_unlock(flash);
return flash;
return 0;
}

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;
}

33
src/drivers/spi/winbond.c
View File

@@ -184,9 +184,8 @@ out:
return ret;
}
static struct spi_flash flash;
struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
int spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct winbond_spi_flash_params *params;
unsigned int i;
@@ -200,27 +199,27 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
if (i == ARRAY_SIZE(winbond_spi_flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported Winbond 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_W25_SE;
flash.status_cmd = CMD_W25_RDSR;
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;
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
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;
}