<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28254">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/spi/spi_flash: don't allocate unbounded stack memory<br><br>This open-codes flash_cmd, but until the API is fixed for real, it uses<br>xfer's existing scatter-gather ability to write command and data in one<br>go.<br><br>BUG=chromium:446201<br>TEST=emerge-coral coreboot succeeds<br><br>Change-Id: Ic81b7c9f7e0f2647e59b81d61abd68d36051e578<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/drivers/spi/spi_flash.c<br>1 file changed, 15 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/28254/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 f271479..82333e9 100644</span><br><span>--- a/src/drivers/spi/spi_flash.c</span><br><span>+++ b/src/drivers/spi/spi_flash.c</span><br><span>@@ -82,24 +82,29 @@</span><br><span>     return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TODO: This code is quite possibly broken and overflowing stacks. Fix ASAP! */</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma GCC diagnostic push</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(__GNUC__) && !defined(__clang__)</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma GCC diagnostic ignored "-Wstack-usage="</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> int spi_flash_cmd_write(const struct spi_slave *spi, const u8 *cmd,</span><br><span>                    size_t cmd_len, const void *data, size_t data_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int ret;</span><br><span style="color: hsl(0, 100%, 40%);">-        u8 buff[cmd_len + data_len];</span><br><span style="color: hsl(0, 100%, 40%);">-    memcpy(buff, cmd, cmd_len);</span><br><span style="color: hsl(0, 100%, 40%);">-     memcpy(buff + cmd_len, data, data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+       int ret = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct spi_op vectors[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+           [0] = { .dout = cmd, .bytesout = cmd_len,</span><br><span style="color: hsl(120, 100%, 40%);">+                     .din = NULL, .bytesin = 0, },</span><br><span style="color: hsl(120, 100%, 40%);">+         [1] = { .dout = data, .bytesout = data_len,</span><br><span style="color: hsl(120, 100%, 40%);">+                   .din = NULL, .bytesin = 0, }</span><br><span style="color: hsl(120, 100%, 40%);">+  };</span><br><span style="color: hsl(120, 100%, 40%);">+    size_t count = ARRAY_SIZE(vectors);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ret = do_spi_flash_cmd(spi, buff, cmd_len + data_len, NULL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       if (spi_claim_bus(spi))</span><br><span style="color: hsl(120, 100%, 40%);">+               return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (spi_xfer_vector(spi, vectors, count) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                ret = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   if (ret) {</span><br><span>           printk(BIOS_WARNING, "SF: Failed to send write command (%zu bytes): %d\n",</span><br><span>                                 data_len, ret);</span><br><span>      }</span><br><span style="color: hsl(120, 100%, 40%);">+     spi_release_bus(spi);</span><br><span> </span><br><span>    return ret;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28254">change 28254</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/28254"/><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: Ic81b7c9f7e0f2647e59b81d61abd68d36051e578 </div>
<div style="display:none"> Gerrit-Change-Number: 28254 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>