<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/27728">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Patrick Rudolph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/fsp_baytrail: Add VBOOT support<br><br>* Add vbnv_cmos_failed function to SoC.<br>* Add VBOOT starts in romstage select.<br><br>Change-Id: I90a051e2b8d303c918bef976d0bb07aae0b1f5b3<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>Reviewed-on: https://review.coreboot.org/27728<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M src/soc/intel/fsp_baytrail/Kconfig<br>M src/soc/intel/fsp_baytrail/Makefile.inc<br>M src/soc/intel/fsp_baytrail/pmutil.c<br>3 files changed, 27 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig</span><br><span>index 1d7e64a..68084bc 100644</span><br><span>--- a/src/soc/intel/fsp_baytrail/Kconfig</span><br><span>+++ b/src/soc/intel/fsp_baytrail/Kconfig</span><br><span>@@ -47,6 +47,9 @@</span><br><span> # Microcode header files are delivered in FSP package</span><br><span> select USES_MICROCODE_HEADER_FILES if HAVE_FSP_BIN</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config VBOOT</span><br><span style="color: hsl(120, 100%, 40%);">+ select VBOOT_STARTS_IN_ROMSTAGE</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOC_INTEL_FSP_BAYTRAIL_MD</span><br><span> bool</span><br><span> default n</span><br><span>diff --git a/src/soc/intel/fsp_baytrail/Makefile.inc b/src/soc/intel/fsp_baytrail/Makefile.inc</span><br><span>index e01a944..0cf99de 100644</span><br><span>--- a/src/soc/intel/fsp_baytrail/Makefile.inc</span><br><span>+++ b/src/soc/intel/fsp_baytrail/Makefile.inc</span><br><span>@@ -42,6 +42,7 @@</span><br><span> ramstage-y += ramstage.c</span><br><span> ramstage-y += gpio.c</span><br><span> romstage-y += gpio.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += pmutil.c</span><br><span> ramstage-y += pmutil.c</span><br><span> ramstage-y += southcluster.c</span><br><span> romstage-y += reset.c</span><br><span>diff --git a/src/soc/intel/fsp_baytrail/pmutil.c b/src/soc/intel/fsp_baytrail/pmutil.c</span><br><span>index 33ecc09..402842e 100644</span><br><span>--- a/src/soc/intel/fsp_baytrail/pmutil.c</span><br><span>+++ b/src/soc/intel/fsp_baytrail/pmutil.c</span><br><span>@@ -15,14 +15,16 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> #include <arch/io.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cbmem.h></span><br><span> #include <console/console.h></span><br><span> </span><br><span> #include <soc/iomap.h></span><br><span> #include <soc/lpc.h></span><br><span> #include <soc/pci_devs.h></span><br><span> #include <soc/pmc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <security/vboot/vbnv.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(__SMM__)</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__SIMPLE_DEVICE__)</span><br><span> </span><br><span> static const pci_devfn_t pcu_dev = PCI_DEV(0, PCU_DEV, 0);</span><br><span> </span><br><span>@@ -31,7 +33,7 @@</span><br><span> return pcu_dev;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#else /* !__SMM__ */</span><br><span style="color: hsl(120, 100%, 40%);">+#else /* !__SIMPLE_DEVICE__ */</span><br><span> #include <device/device.h></span><br><span> #include <device/pci.h></span><br><span> </span><br><span>@@ -358,3 +360,22 @@</span><br><span> write32((u32 *)(PMC_BASE_ADDRESS + GEN_PMCON1), gen_pmcon1 & ~RPS);</span><br><span> write32((u32 *)(PMC_BASE_ADDRESS + PRSTS), prsts);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int vbnv_cmos_failed(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t gen_pmcon1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rtc_fail;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ps != NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ gen_pmcon1 = ps->gen_pmcon1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ gen_pmcon1 = read32((u32 *)(PMC_BASE_ADDRESS + GEN_PMCON1));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rtc_fail = !!(gen_pmcon1 & RPS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rtc_fail)</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "RTC failure.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rtc_fail;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27728">change 27728</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/27728"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I90a051e2b8d303c918bef976d0bb07aae0b1f5b3 </div>
<div style="display:none"> Gerrit-Change-Number: 27728 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>