Skip to content

Commit

Permalink
drivers/spi/spi_flash: organize spi flash by sector topology
Browse files Browse the repository at this point in the history 
By grouping the spi flash parts by their {vendor, sector topology}
tuple one can use a common probe function for looking up the part
instead of having per-vendor probe functions. Additionally, by
grouping by the command set one can save more space as well. SST
is the exception that requires after_probe() function to unlock the
parts.

2KiB of savings in each of verstage, romstage, and ramstage
on Aleena Chrome OS Build.

Change-Id: I9cc20ca0f3d0a1b97154b000c95ff2e7e87f3375
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38379
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
  • Loading branch information
Aaron Durbin committed Jan 17, 2020
1 parent a6c73c8 commit 5abeb06
Show file tree
Hide file tree
Showing 13 changed files with 346 additions and 700 deletions.
59 changes: 8 additions & 51 deletions src/drivers/spi/adesto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,113 +44,70 @@ static const struct spi_flash_part_id flash_table[] = {
.id = 0x4218,
.name = "AT25SL128A",
.nr_sectors_shift = 12,
.sector_size_kib_shift = 2,
},
{
.id = 0x4501,
.name = "AT25DF081A", /* Yes, 81A id < 81 */
.nr_sectors_shift = 8,
.sector_size_kib_shift = 2,
},
{
.id = 0x4502,
.name = "AT25DF081",
.nr_sectors_shift = 8,
.sector_size_kib_shift = 2,
},
{
.id = 0x4602,
.name = "AT25DF161",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x4603,
.name = "AT25DL161",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x4700,
.name = "AT25DF321",
.nr_sectors_shift = 10,
.sector_size_kib_shift = 2,
},
{
.id = 0x4701,
.name = "AT25DF321A",
.nr_sectors_shift = 10,
.sector_size_kib_shift = 2,
},
{
.id = 0x4800,
.name = "AT25DF641",
.nr_sectors_shift = 11,
.sector_size_kib_shift = 2,
},
{
.id = 0x8501,
.name = "AT25SF081",
.nr_sectors_shift = 8,
.sector_size_kib_shift = 2,
},
{
.id = 0x8600,
.name = "AT25DQ161",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x8601,
.name = "AT25SF161",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x8700,
.name = "AT25DQ321",
.nr_sectors_shift = 10,
.sector_size_kib_shift = 2,
},
};

static const struct spi_flash_ops spi_flash_ops = {
.read = spi_flash_cmd_read,
.write = spi_flash_cmd_write_page_program,
.erase = spi_flash_cmd_erase,
.status = spi_flash_cmd_status,
const struct spi_flash_vendor_info spi_flash_adesto_vi = {
.id = VENDOR_ID_ADESTO,
.page_size_shift = 8,
.sector_size_kib_shift = 2,
.match_id_mask = 0xffff,
.ids = flash_table,
.nr_part_ids = ARRAY_SIZE(flash_table),
.desc = &spi_flash_pp_0x20_sector_desc,
};

int spi_flash_probe_adesto(const struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct spi_flash_part_id *params;
unsigned int i;

for (i = 0; i < ARRAY_SIZE(flash_table); i++) {
params = &flash_table[i];
if (params->id == ((idcode[1] << 8) | idcode[2]))
break;
}

if (i == ARRAY_SIZE(flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported adesto ID %02x%02x\n",
idcode[1], idcode[2]);
return -1;
}

memcpy(&flash->spi, spi, sizeof(*spi));
flash->name = params->name;
/* Assuming power-of-two page size initially. */
flash->page_size = 256;
flash->sector_size = (1U << params->sector_size_kib_shift) * KiB;
flash->size = flash->sector_size * (1U << params->nr_sectors_shift);
flash->erase_cmd = CMD_AT25DF_SE;
flash->status_cmd = CMD_AT25DF_RDSR;
flash->pp_cmd = CMD_AT25DF_PP;
flash->wren_cmd = CMD_AT25DF_WREN;

flash->ops = &spi_flash_ops;

return 0;
}
57 changes: 8 additions & 49 deletions src/drivers/spi/amic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,96 +39,55 @@ static const struct spi_flash_part_id flash_table[] = {
.id = 0x2015,
.name = "A25L16PU",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x2025,
.name = "A25L16PT",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x3014,
.name = "A25L080",
.nr_sectors_shift = 8,
.sector_size_kib_shift = 2,
},
{
.id = 0x3015,
.name = "A25L016",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x3016,
.name = "A25L032",
.nr_sectors_shift = 10,
.sector_size_kib_shift = 2,
},
{
.id = 0x4014,
.name = "A25LQ080",
.nr_sectors_shift = 8,
.sector_size_kib_shift = 2,
},
{
.id = 0x4015,
.name = "A25LQ16",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x4016,
.name = "A25LQ032",
.nr_sectors_shift = 10,
.sector_size_kib_shift = 2,
},
{
.id = 0x4017,
.name = "A25LQ64",
.nr_sectors_shift = 11,
.sector_size_kib_shift = 2,
},
};

static const struct spi_flash_ops spi_flash_ops = {
.read = spi_flash_cmd_read,
.write = spi_flash_cmd_write_page_program,
.erase = spi_flash_cmd_erase,
.status = spi_flash_cmd_status,
const struct spi_flash_vendor_info spi_flash_amic_vi = {
.id = VENDOR_ID_AMIC,
.page_size_shift = 8,
.sector_size_kib_shift = 2,
.match_id_mask = 0xffff,
.ids = flash_table,
.nr_part_ids = ARRAY_SIZE(flash_table),
.desc = &spi_flash_pp_0x20_sector_desc,
};

int spi_flash_probe_amic(const struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct spi_flash_part_id *params;
unsigned int i;

for (i = 0; i < ARRAY_SIZE(flash_table); i++) {
params = &flash_table[i];
if (params->id == ((idcode[1] << 8) | idcode[2]))
break;
}

if (i == ARRAY_SIZE(flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported AMIC ID %02x%02x\n",
idcode[1], idcode[2]);
return -1;
}

memcpy(&flash->spi, spi, sizeof(*spi));
flash->name = params->name;

/* Assuming power-of-two page size initially. */
flash->page_size = 256;
flash->sector_size = (1U << params->sector_size_kib_shift) * KiB;
flash->size = flash->sector_size * (1U << params->nr_sectors_shift);
flash->erase_cmd = CMD_A25_SE;
flash->status_cmd = CMD_A25_RDSR;
flash->pp_cmd = CMD_A25_PP;
flash->wren_cmd = CMD_A25_WREN;

flash->ops = &spi_flash_ops;

return 0;
}
55 changes: 8 additions & 47 deletions src/drivers/spi/atmel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,84 +39,45 @@ static const struct spi_flash_part_id flash_table[] = {
.id = 0x3015,
.name = "AT25X16",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x47,
.name = "AT25DF32",
.nr_sectors_shift = 10,
.sector_size_kib_shift = 2,
},
{
.id = 0x3017,
.name = "AT25X64",
.nr_sectors_shift = 11,
.sector_size_kib_shift = 2,
},
{
.id = 0x4015,
.name = "AT25Q16",
.nr_sectors_shift = 9,
.sector_size_kib_shift = 2,
},
{
.id = 0x4016,
.name = "AT25Q32",
.nr_sectors_shift = 10,
.sector_size_kib_shift = 2,
},
{
.id = 0x4017,
.name = "AT25Q64",
.nr_sectors_shift = 11,
.sector_size_kib_shift = 2,
},
{
.id = 0x4018,
.name = "AT25Q128",
.nr_sectors_shift = 12,
.sector_size_kib_shift = 2,
},
};

static const struct spi_flash_ops spi_flash_ops = {
.read = spi_flash_cmd_read,
.write = spi_flash_cmd_write_page_program,
.erase = spi_flash_cmd_erase,
.status = spi_flash_cmd_status,
const struct spi_flash_vendor_info spi_flash_atmel_vi = {
.id = VENDOR_ID_ATMEL,
.page_size_shift = 8,
.sector_size_kib_shift = 2,
.match_id_mask = 0xffff,
.ids = flash_table,
.nr_part_ids = ARRAY_SIZE(flash_table),
.desc = &spi_flash_pp_0x20_sector_desc,
};

int spi_flash_probe_atmel(const struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
const struct spi_flash_part_id *params;
unsigned int i;

for (i = 0; i < ARRAY_SIZE(flash_table); i++) {
params = &flash_table[i];
if (params->id == ((idcode[1] << 8) | idcode[2]))
break;
}

if (i == ARRAY_SIZE(flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported Atmel ID %02x%02x\n",
idcode[1], idcode[2]);
return -1;
}

memcpy(&flash->spi, spi, sizeof(*spi));
flash->name = params->name;

/* Assuming power-of-two page size initially. */
flash->page_size = 256;
flash->sector_size = (1U << params->sector_size_kib_shift) * KiB;
flash->size = flash->sector_size * (1U << params->nr_sectors_shift);
flash->erase_cmd = CMD_AT25_SE;
flash->status_cmd = CMD_AT25_RDSR;
flash->pp_cmd = CMD_AT25_PP;
flash->wren_cmd = CMD_AT25_WREN;

flash->ops = &spi_flash_ops;

return 0;
}
Loading

0 comments on commit 5abeb06

Please sign in to comment.