summaryrefslogtreecommitdiff
path: root/src/drivers/spi/amic.c
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2020-01-12 15:12:18 -0700
committerAaron Durbin <adurbin@chromium.org>2020-01-17 05:49:09 +0000
commit5abeb06a73c6f3073f2796a726ea6dc7fb584371 (patch)
tree82c6a3b967edcf0ccf0aabcbd06894b8847009af /src/drivers/spi/amic.c
parenta6c73c898775bbc59b9d6e1fcb03e340db89ee67 (diff)
downloadcoreboot-5abeb06a73c6f3073f2796a726ea6dc7fb584371.tar.xz
drivers/spi/spi_flash: organize spi flash by sector topology
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>
Diffstat (limited to 'src/drivers/spi/amic.c')
-rw-r--r--src/drivers/spi/amic.c57
1 files changed, 8 insertions, 49 deletions
diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c
index fb5bdea27e..8e25cd933c 100644
--- a/src/drivers/spi/amic.c
+++ b/src/drivers/spi/amic.c
@@ -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;
-}