<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30332">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/qemu-{i440fx,q35}: Use POSTCAR stage to load the ramstage<br><br>qemu does not have a real CAR but postcar stage is still useful<br>to avoid unneeded romstage globals migration.<br><br>Change-Id: Id73632afbef1c7f0845153bc01c6c21e87386710<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/mainboard/emulation/qemu-i440fx/Kconfig<br>M src/mainboard/emulation/qemu-i440fx/Makefile.inc<br>A src/mainboard/emulation/qemu-i440fx/exit_car.S<br>M src/mainboard/emulation/qemu-i440fx/romstage.c<br>M src/mainboard/emulation/qemu-q35/Kconfig<br>M src/mainboard/emulation/qemu-q35/Makefile.inc<br>M src/mainboard/emulation/qemu-q35/romstage.c<br>7 files changed, 50 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/30332/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig</span><br><span>index 7e991b6..668b0ef 100644</span><br><span>--- a/src/mainboard/emulation/qemu-i440fx/Kconfig</span><br><span>+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig</span><br><span>@@ -13,6 +13,8 @@</span><br><span> select MAINBOARD_HAS_NATIVE_VGA_INIT</span><br><span> select MAINBOARD_FORCE_NATIVE_VGA_INIT</span><br><span> select BOOTBLOCK_CONSOLE</span><br><span style="color: hsl(120, 100%, 40%);">+ select POSTCAR_STAGE</span><br><span style="color: hsl(120, 100%, 40%);">+ select POSTCAR_CONSOLE</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/emulation/qemu-i440fx/Makefile.inc b/src/mainboard/emulation/qemu-i440fx/Makefile.inc</span><br><span>index 9e2880a..de790e6 100644</span><br><span>--- a/src/mainboard/emulation/qemu-i440fx/Makefile.inc</span><br><span>+++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc</span><br><span>@@ -2,3 +2,5 @@</span><br><span> ramstage-y += fw_cfg.c</span><br><span> romstage-y += memory.c</span><br><span> ramstage-y += memory.c</span><br><span style="color: hsl(120, 100%, 40%);">+postcar-y += memory.c</span><br><span style="color: hsl(120, 100%, 40%);">+postcar-y += exit_car.S</span><br><span>diff --git a/src/mainboard/emulation/qemu-i440fx/exit_car.S b/src/mainboard/emulation/qemu-i440fx/exit_car.S</span><br><span>new file mode 100644</span><br><span>index 0000000..59a8c5c</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/emulation/qemu-i440fx/exit_car.S</span><br><span>@@ -0,0 +1,33 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2018 Intel Corp.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or</span><br><span style="color: hsl(120, 100%, 40%);">+ * modify it under the terms of the GNU General Public License as</span><br><span style="color: hsl(120, 100%, 40%);">+ * published by the Free Software Foundation; version 2 of</span><br><span style="color: hsl(120, 100%, 40%);">+ * the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+#include <cpu/x86/mtrr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cpu/x86/cr.h></span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This path for CAR teardown is taken when CONFIG_FSP_CAR is employed.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This version of chipset_teardown_car sets up the stack, then bypasses</span><br><span style="color: hsl(120, 100%, 40%);">+ * the rest of arch/x86/exit_car.S and calls main() itself instead of</span><br><span style="color: hsl(120, 100%, 40%);">+ * returning to _start. In main(), the TempRamExit FSP API is called</span><br><span style="color: hsl(120, 100%, 40%);">+ * to tear down the CAR and set up caching which can be overwritten</span><br><span style="color: hsl(120, 100%, 40%);">+ * after the API call. More info can be found in the FSP Integration</span><br><span style="color: hsl(120, 100%, 40%);">+ * Guide included with the FSP binary.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+.text</span><br><span style="color: hsl(120, 100%, 40%);">+.global chipset_teardown_car</span><br><span style="color: hsl(120, 100%, 40%);">+chipset_teardown_car:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set up new stack. */</span><br><span style="color: hsl(120, 100%, 40%);">+ mov post_car_stack_top, %esp</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Call C code */</span><br><span style="color: hsl(120, 100%, 40%);">+ call main</span><br><span>diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c</span><br><span>index e31394c..98929f7 100644</span><br><span>--- a/src/mainboard/emulation/qemu-i440fx/romstage.c</span><br><span>+++ b/src/mainboard/emulation/qemu-i440fx/romstage.c</span><br><span>@@ -23,11 +23,15 @@</span><br><span> </span><br><span> asmlinkage void car_stage_entry(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct postcar_frame pcf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> console_init();</span><br><span> </span><br><span> cbmem_recovery(0);</span><br><span> </span><br><span> timestamp_add_now(TS_START_ROMSTAGE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- run_ramstage();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (postcar_frame_init(&pcf, 1 * KiB))</span><br><span style="color: hsl(120, 100%, 40%);">+ die("Unable to initialize postcar frame.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ run_postcar_phase(&pcf);</span><br><span> }</span><br><span>diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig</span><br><span>index fdd8890..16d5cd2 100644</span><br><span>--- a/src/mainboard/emulation/qemu-q35/Kconfig</span><br><span>+++ b/src/mainboard/emulation/qemu-q35/Kconfig</span><br><span>@@ -12,6 +12,8 @@</span><br><span> select MAINBOARD_HAS_NATIVE_VGA_INIT</span><br><span> select MAINBOARD_FORCE_NATIVE_VGA_INIT</span><br><span> select BOOTBLOCK_CONSOLE</span><br><span style="color: hsl(120, 100%, 40%);">+ select POSTCAR_STAGE</span><br><span style="color: hsl(120, 100%, 40%);">+ select POSTCAR_CONSOLE</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc</span><br><span>index 1503220..1ff7c99 100644</span><br><span>--- a/src/mainboard/emulation/qemu-q35/Makefile.inc</span><br><span>+++ b/src/mainboard/emulation/qemu-q35/Makefile.inc</span><br><span>@@ -2,4 +2,6 @@</span><br><span> ramstage-y += ../qemu-i440fx/memory.c</span><br><span> ramstage-y += ../qemu-i440fx/fw_cfg.c</span><br><span> romstage-y += ../qemu-i440fx/memory.c</span><br><span style="color: hsl(120, 100%, 40%);">+postcar-y += ../qemu-i440fx/memory.c</span><br><span style="color: hsl(120, 100%, 40%);">+postcar-y += ../qemu-i440fx/exit_car.S</span><br><span> bootblock-y += bootblock.c</span><br><span>diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c</span><br><span>index 2b8d935..72ac403 100644</span><br><span>--- a/src/mainboard/emulation/qemu-q35/romstage.c</span><br><span>+++ b/src/mainboard/emulation/qemu-q35/romstage.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> </span><br><span> asmlinkage void car_stage_entry(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct postcar_frame pcf;</span><br><span> i82801ix_early_init();</span><br><span> console_init();</span><br><span> </span><br><span>@@ -31,5 +32,7 @@</span><br><span> </span><br><span> timestamp_add_now(TS_START_ROMSTAGE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- run_ramstage();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (postcar_frame_init(&pcf, 1 * KiB))</span><br><span style="color: hsl(120, 100%, 40%);">+ die("Unable to initialize postcar frame.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ run_postcar_phase(&pcf);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30332">change 30332</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/c/coreboot/+/30332"/><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-Change-Id: Id73632afbef1c7f0845153bc01c6c21e87386710 </div>
<div style="display:none"> Gerrit-Change-Number: 30332 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>