<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27863">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy: Add variant callback for romstage GPIO configuration<br><br>This change adds variant callback to get GPIO configuration table in<br>romstage and configures these GPIOs before memory training is<br>performed.<br><br>BUG=b:111860510<br>BRANCH=poppy<br><br>Change-Id: I1eb51356fb3f4c0f4ff29b22dbcde6dbece303ad<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/poppy/romstage.c<br>M src/mainboard/google/poppy/variants/baseboard/Makefile.inc<br>M src/mainboard/google/poppy/variants/baseboard/gpio.c<br>M src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h<br>4 files changed, 21 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/27863/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/romstage.c b/src/mainboard/google/poppy/romstage.c</span><br><span>index f49fbf4..af4f70b 100644</span><br><span>--- a/src/mainboard/google/poppy/romstage.c</span><br><span>+++ b/src/mainboard/google/poppy/romstage.c</span><br><span>@@ -17,8 +17,10 @@</span><br><span> #include <baseboard/variants.h></span><br><span> #include <cbfs.h></span><br><span> #include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/gpio.h></span><br><span> #include <soc/romstage.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <variant/gpio.h></span><br><span> </span><br><span> #include <fsp/soc_binding.h></span><br><span> </span><br><span>@@ -147,6 +149,12 @@</span><br><span> FSP_M_CONFIG *mem_cfg = &mupd->FspmConfig;</span><br><span> struct memory_params p;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ const struct pad_config *pads;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t num;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ pads = variant_romstage_gpio_table(&num);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_configure_pads(pads, num);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> memset(&p, 0, sizeof(p));</span><br><span> variant_memory_params(&p);</span><br><span> </span><br><span>diff --git a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc</span><br><span>index 1d25510..41669f2 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc</span><br><span>+++ b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc</span><br><span>@@ -1,6 +1,7 @@</span><br><span> bootblock-y += gpio.c</span><br><span> </span><br><span> romstage-y += memory.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += gpio.c</span><br><span> </span><br><span> ramstage-y += gpio.c</span><br><span> ramstage-y += nhlt.c</span><br><span>diff --git a/src/mainboard/google/poppy/variants/baseboard/gpio.c b/src/mainboard/google/poppy/variants/baseboard/gpio.c</span><br><span>index 25202e6..c1b8e4c 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/baseboard/gpio.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/baseboard/gpio.c</span><br><span>@@ -403,3 +403,9 @@</span><br><span> *num = ARRAY_SIZE(cros_gpios);</span><br><span> return cros_gpios;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config * __weak variant_romstage_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>index 7e850b6..391f809 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -27,6 +27,12 @@</span><br><span> const struct pad_config *variant_gpio_table(size_t *num);</span><br><span> const struct pad_config *variant_early_gpio_table(size_t *num);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Callback to get GPIOs to configure in romstage before memory training is</span><br><span style="color: hsl(120, 100%, 40%);">+ * performed.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_romstage_gpio_table(size_t *num);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const struct cros_gpio *variant_cros_gpios(size_t *num);</span><br><span> /* Config gpio by different sku id */</span><br><span> const struct pad_config *variant_sku_gpio_table(size_t *num);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27863">change 27863</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/27863"/><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: I1eb51356fb3f4c0f4ff29b22dbcde6dbece303ad </div>
<div style="display:none"> Gerrit-Change-Number: 27863 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>