<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/28528">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Philipp Deppenwiese: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fsp_broadwell_de: enable spi console<br><br>this enables spi console for wedge100s with broadwell_de. the console<br>size is 64kb. enabling spi console in `board.fmd` enables code which<br>calls into `timer_monotonic_get` (from `spi_flash_cmd_poll_bit`) and<br>`udelay` (from `ich_status_poll`). this patch selects `TSC_CONSTANT_RATE`<br>in fsp_broadwell_de's Kconfig to satisfy that.<br><br>Change-Id: Ib925c5aee88b65c46a81534405c364dd5649f8e8<br>Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com><br>Reviewed-on: https://review.coreboot.org/28528<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com><br>---<br>M src/mainboard/ocp/wedge100s/board.fmd<br>M src/soc/intel/fsp_broadwell_de/Kconfig<br>M src/soc/intel/fsp_broadwell_de/Makefile.inc<br>M src/soc/intel/fsp_broadwell_de/spi.c<br>4 files changed, 8 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/ocp/wedge100s/board.fmd b/src/mainboard/ocp/wedge100s/board.fmd</span><br><span>index da6e3e3..8e44081 100644</span><br><span>--- a/src/mainboard/ocp/wedge100s/board.fmd</span><br><span>+++ b/src/mainboard/ocp/wedge100s/board.fmd</span><br><span>@@ -21,6 +21,7 @@</span><br><span> RO_VPD@0x0 0x1000</span><br><span> }</span><br><span> RW_MRC_CACHE@0x10000 0x10000</span><br><span style="color: hsl(0, 100%, 40%);">- COREBOOT(CBFS)@0x20000 0x7e0000</span><br><span style="color: hsl(120, 100%, 40%);">+ CONSOLE@0x20000 0x10000</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT(CBFS)@0x30000 0x7d0000</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/Kconfig b/src/soc/intel/fsp_broadwell_de/Kconfig</span><br><span>index cc3e6e2..37876b5 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/Kconfig</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/Kconfig</span><br><span>@@ -26,6 +26,7 @@</span><br><span> select SMM_TSEG</span><br><span> select HAVE_SMI_HANDLER</span><br><span> select TSC_MONOTONIC_TIMER</span><br><span style="color: hsl(120, 100%, 40%);">+ select TSC_CONSTANT_RATE</span><br><span> </span><br><span> config CBFS_SIZE</span><br><span> hex</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/Makefile.inc b/src/soc/intel/fsp_broadwell_de/Makefile.inc</span><br><span>index 024035c..386adc1 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/Makefile.inc</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/Makefile.inc</span><br><span>@@ -12,6 +12,7 @@</span><br><span> subdirs-y += fsp</span><br><span> </span><br><span> romstage-y += gpio.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += spi.c</span><br><span> </span><br><span> ramstage-y += spi.c</span><br><span> ramstage-y += cpu.c</span><br><span>diff --git a/src/soc/intel/fsp_broadwell_de/spi.c b/src/soc/intel/fsp_broadwell_de/spi.c</span><br><span>index f602491..1b1589d 100644</span><br><span>--- a/src/soc/intel/fsp_broadwell_de/spi.c</span><br><span>+++ b/src/soc/intel/fsp_broadwell_de/spi.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <device/pci_ids.h></span><br><span> #include <spi_flash.h></span><br><span> #include <spi-generic.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/early_variables.h></span><br><span> </span><br><span> #ifdef __SMM__</span><br><span> #define pci_read_config_byte(dev, reg, targ)\</span><br><span>@@ -59,7 +60,7 @@</span><br><span> </span><br><span> typedef struct spi_slave ich_spi_slave;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int ichspi_lock = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+static int ichspi_lock CAR_GLOBAL = 0;</span><br><span> </span><br><span> typedef struct ich9_spi_regs {</span><br><span> uint32_t bfpr;</span><br><span>@@ -109,7 +110,7 @@</span><br><span> uint32_t *bbar;</span><br><span> } ich_spi_controller;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static ich_spi_controller cntlr;</span><br><span style="color: hsl(120, 100%, 40%);">+static ich_spi_controller cntlr CAR_GLOBAL;</span><br><span> </span><br><span> enum {</span><br><span> SPIS_SCIP = 0x0001,</span><br><span>@@ -268,7 +269,7 @@</span><br><span> uint8_t bios_cntl;</span><br><span> ich9_spi_regs *ich9_spi;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef __SMM__</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__SIMPLE_DEVICE__)</span><br><span> pci_devfn_t dev = PCI_DEV(0, 31, 0);</span><br><span> #else</span><br><span> struct device *dev;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28528">change 28528</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/28528"/><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: Ib925c5aee88b65c46a81534405c364dd5649f8e8 </div>
<div style="display:none"> Gerrit-Change-Number: 28528 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Okash Khawaja <okash.khawaja@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Okash Khawaja <okash.khawaja@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>