<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28731">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/spi/winbond: Fix read protection bits<br><br>Don't care about SRPx and print correct protected range.<br><br>Change-Id: I051f1459c585a7ed6a4878dc217d11df5ef00d74<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/drivers/spi/winbond.c<br>1 file changed, 5 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/31/28731/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 a0e3884..ac7c2be 100644</span><br><span>--- a/src/drivers/spi/winbond.c</span><br><span>+++ b/src/drivers/spi/winbond.c</span><br><span>@@ -297,8 +297,6 @@</span><br><span> </span><br><span>            ret = spi_flash_cmd(&flash->spi, flash->status_cmd, &reg1_bp3.u,</span><br><span>                                   sizeof(reg1_bp3.u));</span><br><span style="color: hsl(0, 100%, 40%);">-                if (ret)</span><br><span style="color: hsl(0, 100%, 40%);">-                        return ret;</span><br><span> </span><br><span>              if (reg1_bp3.sec) {</span><br><span>                  // FIXME: not supported</span><br><span>@@ -312,8 +310,6 @@</span><br><span> </span><br><span>            ret = spi_flash_cmd(&flash->spi, flash->status_cmd, &reg1_bp4.u,</span><br><span>                                   sizeof(reg1_bp4.u));</span><br><span style="color: hsl(0, 100%, 40%);">-                if (ret)</span><br><span style="color: hsl(0, 100%, 40%);">-                        return ret;</span><br><span> </span><br><span>              bp = reg1_bp4.bp;</span><br><span>            tb = reg1_bp4.tb;</span><br><span>@@ -321,6 +317,8 @@</span><br><span>              // FIXME: not supported</span><br><span>              return -1;</span><br><span>   }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (ret)</span><br><span style="color: hsl(120, 100%, 40%);">+              return ret;</span><br><span> </span><br><span>      ret = spi_flash_cmd(&flash->spi, CMD_W25_RDSR2, &reg2.u,</span><br><span>                      sizeof(reg2.u));</span><br><span>@@ -330,14 +328,15 @@</span><br><span>         winbond_bpbits_to_region(granularity, bp, tb, reg2.cmp, flash->size,</span><br><span>                               &wp_region);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (!reg2.srp1 || !wp_region.size) {</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!region_sz(&wp_region)) {</span><br><span>            printk(BIOS_DEBUG, "WINBOND: flash isn't protected\n");</span><br><span> </span><br><span>            return 0;</span><br><span>    }</span><br><span> </span><br><span>        printk(BIOS_DEBUG, "WINBOND: flash protected range 0x%08zx-0x%08zx\n",</span><br><span style="color: hsl(0, 100%, 40%);">-               wp_region.offset, wp_region.size);</span><br><span style="color: hsl(120, 100%, 40%);">+            region_offset(&wp_region),</span><br><span style="color: hsl(120, 100%, 40%);">+        region_offset(&wp_region) + region_sz(&wp_region));</span><br><span> </span><br><span>       return region_is_subregion(&wp_region, region);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28731">change 28731</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/28731"/><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: I051f1459c585a7ed6a4878dc217d11df5ef00d74 </div>
<div style="display:none"> Gerrit-Change-Number: 28731 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>