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

spi_flash: gigadevice: Adopt Winbond chip info structure 

This patch changes the Gigadevice SPI flash driver to adopt the same
structure packing improvements for the hardcoded parameters of
individual chips that was implemented for Winbond last year. This cuts
the size of the hardcoded info nearly in half and should save us a few
hundred bytes in every stage.

Change-Id: I9910dcb9b649f51b317f3f8fcba49e5e893f67d2
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33285
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Julius Werner 2019-06-06 22:09:42 -07:00
parent 8dcf24fcbf
commit 381c35c7f9
1 changed files with 100 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,117 +41,116 @@
struct gigadevice_spi_flash_params { struct gigadevice_spi_flash_params {
uint16_t id; uint16_t id;
/* Log2 of page size in power-of-two mode */ uint8_t l2_page_size_shift;
uint8_t l2_page_size; uint8_t pages_per_sector_shift : 4;
uint16_t pages_per_sector; uint8_t sectors_per_block_shift : 4;
uint16_t sectors_per_block; uint8_t nr_blocks_shift;
uint16_t nr_blocks; const char name[10];
const char *name;
}; };
static const struct gigadevice_spi_flash_params gigadevice_spi_flash_table[] = { static const struct gigadevice_spi_flash_params gigadevice_spi_flash_table[] = {
{ {
.id = 0x3114, .id = 0x3114,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 16, .nr_blocks_shift = 4,
.name = "GD25T80", .name = "GD25T80",
}, },
{ {
.id = 0x4014, .id = 0x4014,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 16, .nr_blocks_shift = 4,
.name = "GD25Q80(B)", .name = "GD25Q80",
}, }, /* also GD25Q80B */
{ {
.id = 0x4015, .id = 0x4015,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 32, .nr_blocks_shift = 5,
.name = "GD25Q16(B)", .name = "GD25Q16",
}, }, /* also GD25Q16B */
{ {
.id = 0x4016, .id = 0x4016,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 64, .nr_blocks_shift = 6,
.name = "GD25Q32(B)", .name = "GD25Q32B",
}, }, /* also GD25Q32B */
{ {
.id = 0x4017, .id = 0x4017,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 128, .nr_blocks_shift = 7,
.name = "GD25Q64(B)/GD25B64C", .name = "GD25Q64",
}, }, /* also GD25Q64B, GD25B64C */
{ {
.id = 0x4018, .id = 0x4018,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 256, .nr_blocks_shift = 8,
.name = "GD25Q128(B)", .name = "GD25Q128",
}, }, /* also GD25Q128B */
{ {
.id = 0x4214, .id = 0x4214,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 16, .nr_blocks_shift = 4,
.name = "GD25VQ80C", .name = "GD25VQ80C",
}, },
{ {
.id = 0x4215, .id = 0x4215,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 32, .nr_blocks_shift = 5,
.name = "GD25VQ16C", .name = "GD25VQ16C",
}, },
{ {
.id = 0x6014, .id = 0x6014,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 16, .nr_blocks_shift = 4,
.name = "GD25LQ80", .name = "GD25LQ80",
}, },
{ {
.id = 0x6015, .id = 0x6015,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 32, .nr_blocks_shift = 5,
.name = "GD25LQ16", .name = "GD25LQ16",
}, },
{ {
.id = 0x6016, .id = 0x6016,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 64, .nr_blocks_shift = 6,
.name = "GD25LQ32", .name = "GD25LQ32",
}, },
{ {
.id = 0x6017, .id = 0x6017,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 128, .nr_blocks_shift = 7,
.name = "GD25LQ64C/GD25LB64C", .name = "GD25LQ64C",
}, }, /* also GD25LB64C */
{ {
.id = 0x6018, .id = 0x6018,
.l2_page_size = 8, .l2_page_size_shift = 8,
.pages_per_sector = 16, .pages_per_sector_shift = 4,
.sectors_per_block = 16, .sectors_per_block_shift = 4,
.nr_blocks = 256, .nr_blocks_shift = 8,
.name = "GD25LQ128", .name = "GD25LQ128",
}, },
}; };
@ -252,10 +251,12 @@ int spi_flash_probe_gigadevice(const struct spi_slave *spi, u8 *idcode,
flash->name = params->name; flash->name = params->name;
/* Assuming power-of-two page size initially. */ /* Assuming power-of-two page size initially. */
flash->page_size = 1 << params->l2_page_size; flash->page_size = 1 << params->l2_page_size_shift;
flash->sector_size = flash->page_size * params->pages_per_sector; flash->sector_size = flash->page_size *
flash->size = flash->sector_size * params->sectors_per_block * (1 << params->pages_per_sector_shift);
params->nr_blocks; flash->size = flash->sector_size *
(1 << params->sectors_per_block_shift) *
(1 << params->nr_blocks_shift);
flash->erase_cmd = CMD_GD25_SE; flash->erase_cmd = CMD_GD25_SE;
flash->status_cmd = CMD_GD25_RDSR; flash->status_cmd = CMD_GD25_RDSR;