<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27815">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[WIP]drivers/spi/winbond: Improve structure packing<br><br>Use bitfields to pack the struct more tightly.<br><br>Change-Id: If1e7a5a3a9504327f987403ec0a7b79b2383792a<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/drivers/spi/winbond.c<br>1 file changed, 86 insertions(+), 84 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/27815/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c</span><br><span>index a191f14..bb778fa 100644</span><br><span>--- a/src/drivers/spi/winbond.c</span><br><span>+++ b/src/drivers/spi/winbond.c</span><br><span>@@ -27,111 +27,110 @@</span><br><span> #define CMD_W25_RES 0xab /* Release from DP, and Read Signature */</span><br><span> </span><br><span> struct winbond_spi_flash_params {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t id;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Log2 of page size in power-of-two mode */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t l2_page_size;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t pages_per_sector;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t sectors_per_block;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nr_blocks;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *name;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t l2_page_size_shift;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t pages_per_sector_shift : 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sectors_per_block_shift : 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t nr_blocks_shift;</span><br><span style="color: hsl(120, 100%, 40%);">+ char name[10];</span><br><span> };</span><br><span> </span><br><span> static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x3015,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 32,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25X16",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x3015,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 5,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25X16",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x3016,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 64,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25X32",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x3016,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25X32",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x3017,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 128,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25X64",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x3017,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 7,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25X64",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x4014,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q80",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x4014,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q80",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x4015,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 32,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q16",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x4015,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 5,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q16",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x4016,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 64,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q32",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x4016,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q32",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x6016,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 64,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q32DW",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x6016,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q32DW",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x4017,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 128,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q64",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x4017,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 7,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q64",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x6017,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 128,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q64DW",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x6017,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 7,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q64DW",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x4018,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 256,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q128",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x4018,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 8,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q128",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x6018,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 256,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q128FW",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x6018,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 8,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q128FW",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .id = 0x4019,</span><br><span style="color: hsl(0, 100%, 40%);">- .l2_page_size = 8,</span><br><span style="color: hsl(0, 100%, 40%);">- .pages_per_sector = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .sectors_per_block = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- .nr_blocks = 512,</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "W25Q256",</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 0x4019,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l2_page_size_shift = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .pages_per_sector_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .sectors_per_block_shift = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nr_blocks_shift = 9,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "W25Q256",</span><br><span> },</span><br><span> };</span><br><span> </span><br><span>@@ -223,11 +222,14 @@</span><br><span> </span><br><span> memcpy(&flash->spi, spi, sizeof(*spi));</span><br><span> flash->name = params->name;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Assuming power-of-two page size initially. */</span><br><span style="color: hsl(0, 100%, 40%);">- flash->page_size = 1 << params->l2_page_size;</span><br><span style="color: hsl(0, 100%, 40%);">- flash->sector_size = flash->page_size * params->pages_per_sector;</span><br><span style="color: hsl(0, 100%, 40%);">- flash->size = flash->sector_size * params->sectors_per_block *</span><br><span style="color: hsl(0, 100%, 40%);">- params->nr_blocks;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Params are in power-of-two. */</span><br><span style="color: hsl(120, 100%, 40%);">+ flash->page_size = 1 << params->l2_page_size_shift;</span><br><span style="color: hsl(120, 100%, 40%);">+ flash->sector_size = flash->page_size *</span><br><span style="color: hsl(120, 100%, 40%);">+ (1 << params->pages_per_sector_shift);</span><br><span style="color: hsl(120, 100%, 40%);">+ flash->size = flash->sector_size *</span><br><span style="color: hsl(120, 100%, 40%);">+ (1 << params->sectors_per_block_shift) *</span><br><span style="color: hsl(120, 100%, 40%);">+ (1 << params->nr_blocks_shift);</span><br><span> flash->erase_cmd = CMD_W25_SE;</span><br><span> flash->status_cmd = CMD_W25_RDSR;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27815">change 27815</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27815"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If1e7a5a3a9504327f987403ec0a7b79b2383792a </div>
<div style="display:none"> Gerrit-Change-Number: 27815 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>