<p>Simon Glass has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27466">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stoneyridge: Add support for Dediprog em100<br><br>This device claims to run at 75MHz with dual read, but it is not always<br>reliable. Add an option to change the SPI flash speed to 16MHz, to avoid<br>any problems.<br><br>BUG=b:111363976<br>TEST=manually try to get my em100 running (it doesn't yet)<br><br>Change-Id: I78d3d32c467aac82c72d31c773bfb0f69808aed4<br>Signed-off-by: Simon Glass <sjg@chromium.org><br>---<br>M src/mainboard/google/kahlee/bootblock/bootblock.c<br>M src/soc/amd/stoneyridge/Kconfig<br>2 files changed, 37 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/27466/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/bootblock/bootblock.c b/src/mainboard/google/kahlee/bootblock/bootblock.c</span><br><span>index 7e6524d..9d767d0 100644</span><br><span>--- a/src/mainboard/google/kahlee/bootblock/bootblock.c</span><br><span>+++ b/src/mainboard/google/kahlee/bootblock/bootblock.c</span><br><span>@@ -34,19 +34,36 @@</span><br><span> </span><br><span> void bootblock_mainboard_init(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * W25Q128FW Setup</span><br><span style="color: hsl(0, 100%, 40%);">- * Normal Read 40MHz</span><br><span style="color: hsl(0, 100%, 40%);">- * Fast Read 104MHz</span><br><span style="color: hsl(0, 100%, 40%);">- * Dual Read IO (1-2-2)</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- sb_read_mode(SPI_READ_MODE_DUAL122);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_EM100)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * We should be able to rely on defaults, but it seems safer</span><br><span style="color: hsl(120, 100%, 40%);">+ * to explicitly set up these registers.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Usage:</span><br><span style="color: hsl(120, 100%, 40%);">+ * sudo emerge em100</span><br><span style="color: hsl(120, 100%, 40%);">+ * sudo em100 -s -c W25Q128FW -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ * /build/grunt/firmware/image-grunt.serial.bin -r</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ sb_read_mode(SPI_READ_MODE_NOM);</span><br><span style="color: hsl(120, 100%, 40%);">+ sb_set_spi100(SPI_SPEED_16M, /* Normal */</span><br><span style="color: hsl(120, 100%, 40%);">+ SPI_SPEED_16M, /* Fast */</span><br><span style="color: hsl(120, 100%, 40%);">+ SPI_SPEED_16M, /* AltIO */</span><br><span style="color: hsl(120, 100%, 40%);">+ SPI_SPEED_66M); /* TPM */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * W25Q128FW Setup</span><br><span style="color: hsl(120, 100%, 40%);">+ * Normal Read 40MHz</span><br><span style="color: hsl(120, 100%, 40%);">+ * Fast Read 104MHz</span><br><span style="color: hsl(120, 100%, 40%);">+ * Dual Read IO (1-2-2)</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ sb_read_mode(SPI_READ_MODE_DUAL122);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Set SPI speeds before verstage. Needed for TPM */</span><br><span style="color: hsl(0, 100%, 40%);">- sb_set_spi100(SPI_SPEED_33M, /* Normal */</span><br><span style="color: hsl(0, 100%, 40%);">- SPI_SPEED_66M, /* Fast */</span><br><span style="color: hsl(0, 100%, 40%);">- SPI_SPEED_66M, /* AltIO */</span><br><span style="color: hsl(0, 100%, 40%);">- SPI_SPEED_66M); /* TPM */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set SPI speeds before verstage. Needed for TPM */</span><br><span style="color: hsl(120, 100%, 40%);">+ sb_set_spi100(SPI_SPEED_33M, /* Normal */</span><br><span style="color: hsl(120, 100%, 40%);">+ SPI_SPEED_66M, /* Fast */</span><br><span style="color: hsl(120, 100%, 40%);">+ SPI_SPEED_66M, /* AltIO */</span><br><span style="color: hsl(120, 100%, 40%);">+ SPI_SPEED_66M); /* TPM */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Setup TPM decode before verstage */</span><br><span> sb_tpm_decode_spi();</span><br><span>diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig</span><br><span>index 05c3043..08e51cd 100644</span><br><span>--- a/src/soc/amd/stoneyridge/Kconfig</span><br><span>+++ b/src/soc/amd/stoneyridge/Kconfig</span><br><span>@@ -394,4 +394,12 @@</span><br><span> vendorcode/amd/pi/00670F00/ will be compiled or only</span><br><span> selected procedures of source files (minimum required).</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config EM100</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Configure image for EM100 usage"</span><br><span style="color: hsl(120, 100%, 40%);">+ help</span><br><span style="color: hsl(120, 100%, 40%);">+ The Dediprog EM100 SPI emulator allows fast loading of new SPI images</span><br><span style="color: hsl(120, 100%, 40%);">+ over USB. However it only supports a maximum SPI clock of 20MHz and</span><br><span style="color: hsl(120, 100%, 40%);">+ single data output. Enable this option to use a 20MHz SPI clock and</span><br><span style="color: hsl(120, 100%, 40%);">+ disable "Dual Output Fast Read" Support</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif # SOC_AMD_STONEYRIDGE_FP4 || SOC_AMD_STONEYRIDGE_FT4</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27466">change 27466</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/27466"/><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: I78d3d32c467aac82c72d31c773bfb0f69808aed4 </div>
<div style="display:none"> Gerrit-Change-Number: 27466 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Simon Glass <sjg@chromium.org> </div>