<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27751">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/spi/spi_flash: Add support for flash protections<br><br>If the SPI controller doesn't have protected regions, try to directly<br>lock the flash. Requires vendor specific code (Winbond ATM).<br><br>Tested on Cavium EVB CN81xx using W25Q128.<br><br>Change-Id: I03eac2fc1c3ac6cd15125b1042e31c507ea94e65<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/drivers/spi/spi_flash.c<br>M src/include/spi_flash.h<br>2 files changed, 29 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/27751/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c</span><br><span>index a9bc23a..4656df6 100644</span><br><span>--- a/src/drivers/spi/spi_flash.c</span><br><span>+++ b/src/drivers/spi/spi_flash.c</span><br><span>@@ -543,6 +543,7 @@</span><br><span> const struct region *region)</span><br><span> {</span><br><span> const struct spi_ctrlr *ctrlr;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct spi_flash_ops *ops;</span><br><span> struct region flash_region = { 0 };</span><br><span> </span><br><span> if (!flash)</span><br><span>@@ -554,13 +555,20 @@</span><br><span> return -1;</span><br><span> </span><br><span> ctrlr = flash->spi.ctrlr;</span><br><span style="color: hsl(120, 100%, 40%);">+ ops = flash->ops;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!ctrlr)</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ctrlr->flash_protect)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Lock access in the controller using "Protected Regions" */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctrlr && ctrlr->flash_protect)</span><br><span> return ctrlr->flash_protect(flash, region);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Try to directly lock the region in flash */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ops && ops->get_write_protection)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ops->get_write_protection(flash, region))</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ops && ops->set_write_protection)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ops->set_write_protection(flash, region);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h</span><br><span>index 9ba0c82..e3aad9f 100644</span><br><span>--- a/src/include/spi_flash.h</span><br><span>+++ b/src/include/spi_flash.h</span><br><span>@@ -159,8 +159,23 @@</span><br><span> * if CONFIG_BOOT_DEVICE_SPI_FLASH is enabled. */</span><br><span> const struct spi_flash *boot_device_spi_flash(void);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Protect a region of spi flash using its controller, if available. Returns</span><br><span style="color: hsl(0, 100%, 40%);">- * < 0 on error, else 0 on success. */</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Protect a region of SPI flash.</span><br><span style="color: hsl(120, 100%, 40%);">+ * It first tries to use its controller, if available.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If the controller doesn't support flash protections, try to directly lock</span><br><span style="color: hsl(120, 100%, 40%);">+ * the region in the flash device (requires flash vendor specific support).</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param flash The flash device to operate on</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param region The region to lock</span><br><span style="color: hsl(120, 100%, 40%);">+ * @Return < 0 on error, else 0 on success.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Possible errors:</span><br><span style="color: hsl(120, 100%, 40%);">+ * * Invalid region specified</span><br><span style="color: hsl(120, 100%, 40%);">+ * * No more free "Protected Region" slots in the controller</span><br><span style="color: hsl(120, 100%, 40%);">+ * * SPI flash is already locked</span><br><span style="color: hsl(120, 100%, 40%);">+ * * Requested region layout can't be directly applied on flash</span><br><span style="color: hsl(120, 100%, 40%);">+ * * SPI bus error</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> int spi_flash_ctrlr_protect_region(const struct spi_flash *flash,</span><br><span> const struct region *region);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27751">change 27751</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/27751"/><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: I03eac2fc1c3ac6cd15125b1042e31c507ea94e65 </div>
<div style="display:none"> Gerrit-Change-Number: 27751 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>