From a6c73c898775bbc59b9d6e1fcb03e340db89ee67 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Sat, 11 Jan 2020 23:18:51 -0700 Subject: drivers/spi/spi_flash: introduce common spi_flash_part_id object To further drive to a common approach for describing the spi flash parts in the drivers add spi_flash_part_id object. All the drivers are updated to utilize the new object. Additionally, the driver_private is also not needed in the spi_flash object. A Chrome OS build of Aleena provides 960 byte saving of text. A subsequent patch will save more memory. Change-Id: I9c0cc75f188ac004ab647805b9551bf06a0c646b Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/c/coreboot/+/38378 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/drivers/spi/macronix.c | 180 +++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 114 deletions(-) (limited to 'src/drivers/spi/macronix.c') diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index 334404dee9..c7a4ce06aa 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -36,167 +36,120 @@ #define MACRONIX_SR_WIP (1 << 0) /* Write-in-Progress */ -struct macronix_spi_flash_params { - u16 idcode; - u16 page_size; - u16 pages_per_sector; - u16 sectors_per_block; - u16 nr_blocks; - const char *name; -}; - -static const struct macronix_spi_flash_params macronix_spi_flash_table[] = { +static const struct spi_flash_part_id flash_table[] = { { - .idcode = 0x2014, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 16, + .id = 0x2014, .name = "MX25L8005", + .nr_sectors_shift = 8, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2015, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 32, + .id = 0x2015, .name = "MX25L1605D", + .nr_sectors_shift = 9, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2016, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 64, + .id = 0x2016, .name = "MX25L3205D", + .nr_sectors_shift = 10, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2017, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 128, + .id = 0x2017, .name = "MX25L6405D", + .nr_sectors_shift = 11, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2018, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 256, + .id = 0x2018, .name = "MX25L12805D", + .nr_sectors_shift = 12, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2019, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 512, + .id = 0x2019, .name = "MX25L25635F", + .nr_sectors_shift = 13, + .sector_size_kib_shift = 2, }, { - .idcode = 0x201a, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 1024, + .id = 0x201a, .name = "MX66L51235F", + .nr_sectors_shift = 14, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2415, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 32, + .id = 0x2415, .name = "MX25L1635D", + .nr_sectors_shift = 9, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2515, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 32, + .id = 0x2515, .name = "MX25L1635E", + .nr_sectors_shift = 9, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2534, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 16, + .id = 0x2534, .name = "MX25U8032E", + .nr_sectors_shift = 8, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2535, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 32, + .id = 0x2535, .name = "MX25U1635E", + .nr_sectors_shift = 9, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2536, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 64, + .id = 0x2536, .name = "MX25U3235E", + .nr_sectors_shift = 10, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2537, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 128, + .id = 0x2537, .name = "MX25U6435F", + .nr_sectors_shift = 11, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2538, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 256, + .id = 0x2538, .name = "MX25U12835F", + .nr_sectors_shift = 12, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2539, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 512, + .id = 0x2539, .name = "MX25U25635F", + .nr_sectors_shift = 13, + .sector_size_kib_shift = 2, }, { - .idcode = 0x253a, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 1024, + .id = 0x253a, .name = "MX25U51245G", + .nr_sectors_shift = 14, + .sector_size_kib_shift = 2, }, { - .idcode = 0x2618, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 256, + .id = 0x2618, .name = "MX25L12855E", + .nr_sectors_shift = 12, + .sector_size_kib_shift = 2, }, { - .idcode = 0x5e16, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 64, + .id = 0x5e16, .name = "MX25L3235D", /* MX25L3225D/MX25L3236D/MX25L3237D */ + .nr_sectors_shift = 10, + .sector_size_kib_shift = 2, }, { - .idcode = 0x9517, - .page_size = 256, - .pages_per_sector = 16, - .sectors_per_block = 16, - .nr_blocks = 128, + .id = 0x9517, .name = "MX25L6495F", + .nr_sectors_shift = 11, + .sector_size_kib_shift = 2, }, }; @@ -210,27 +163,26 @@ static const struct spi_flash_ops spi_flash_ops = { int spi_flash_probe_macronix(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { - const struct macronix_spi_flash_params *params; + const struct spi_flash_part_id *params; unsigned int i; u16 id = idcode[2] | idcode[1] << 8; - for (i = 0; i < ARRAY_SIZE(macronix_spi_flash_table); i++) { - params = ¯onix_spi_flash_table[i]; - if (params->idcode == id) + for (i = 0; i < ARRAY_SIZE(flash_table); i++) { + params = &flash_table[i]; + if (params->id == id) break; } - if (i == ARRAY_SIZE(macronix_spi_flash_table)) { + if (i == ARRAY_SIZE(flash_table)) { printk(BIOS_WARNING, "SF: Unsupported Macronix ID %04x\n", id); 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 * - params->nr_blocks; + flash->page_size = 256; + flash->sector_size = (1U << params->sector_size_kib_shift) * KiB; + flash->size = flash->sector_size * params->nr_sectors_shift; flash->erase_cmd = CMD_MX25XX_SE; flash->status_cmd = CMD_MX25XX_RDSR; flash->pp_cmd = CMD_MX25XX_PP; -- cgit v1.2.3