<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29991">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[WIP]drivers/smmstore: Allow using raw FMAP regions<br><br>Use a raw fmap region SMMSTORE for the SMMSTORE mechanism, while keeping the<br>initial option to use a cbfsfile.<br><br>I need a board with on which CONFIG_DEBUG_SMI is easy...<br><br>Change-Id: I8c2b9b3a0ed16b2d37e6a97e33c671fb54df8de0<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/drivers/smmstore/Kconfig<br>M src/drivers/smmstore/store.c<br>M src/southbridge/intel/common/Kconfig<br>3 files changed, 30 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/29991/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/smmstore/Kconfig b/src/drivers/smmstore/Kconfig</span><br><span>index 4bb48f7..b4e9909 100644</span><br><span>--- a/src/drivers/smmstore/Kconfig</span><br><span>+++ b/src/drivers/smmstore/Kconfig</span><br><span>@@ -20,13 +20,21 @@</span><br><span> select SPI_FLASH_SMM if BOOT_DEVICE_SPI_FLASH_RW_NOMMAP</span><br><span> </span><br><span> if SMMSTORE</span><br><span style="color: hsl(120, 100%, 40%);">+config SMMSTORE_IN_CBFS</span><br><span style="color: hsl(120, 100%, 40%);">+ bool</span><br><span style="color: hsl(120, 100%, 40%);">+ default n</span><br><span style="color: hsl(120, 100%, 40%);">+ help</span><br><span style="color: hsl(120, 100%, 40%);">+ Select this if you want to the SMMSTORE region in a</span><br><span style="color: hsl(120, 100%, 40%);">+ cbfsfile in a cbfs FMAP region</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SMMSTORE_REGION</span><br><span style="color: hsl(0, 100%, 40%);">- string "fmap region in which SMM store file is kept"</span><br><span style="color: hsl(120, 100%, 40%);">+ string "fmap region in which SMM store file is kept" if SMMSTORE_IN_CBFS</span><br><span> default "RW_LEGACY" if CHROMEOS</span><br><span> default "COREBOOT"</span><br><span style="color: hsl(120, 100%, 40%);">+ default "SMMSTORE"</span><br><span> </span><br><span> config SMMSTORE_FILENAME</span><br><span style="color: hsl(0, 100%, 40%);">- string "SMM store file name"</span><br><span style="color: hsl(120, 100%, 40%);">+ string "SMM store file name" if SMMSTORE_IN_CBFS</span><br><span> default "smm store"</span><br><span> </span><br><span> endif</span><br><span>diff --git a/src/drivers/smmstore/store.c b/src/drivers/smmstore/store.c</span><br><span>index 4463bad..409949a 100644</span><br><span>--- a/src/drivers/smmstore/store.c</span><br><span>+++ b/src/drivers/smmstore/store.c</span><br><span>@@ -15,6 +15,7 @@</span><br><span> </span><br><span> #include <boot_device.h></span><br><span> #include <cbfs.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <fmap.h></span><br><span> #include <commonlib/region.h></span><br><span> #include <console/console.h></span><br><span> #include <smmstore.h></span><br><span>@@ -57,15 +58,25 @@</span><br><span> static int lookup_store(struct region_device *rstore)</span><br><span> {</span><br><span> struct cbfsf file;</span><br><span style="color: hsl(0, 100%, 40%);">- if (cbfs_locate_file_in_region(&file,</span><br><span style="color: hsl(0, 100%, 40%);">- CONFIG_SMMSTORE_REGION, CONFIG_SMMSTORE_FILENAME, NULL) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_WARNING, "smm store: "</span><br><span style="color: hsl(0, 100%, 40%);">- "Unable to find SMM store file in region '%s'\n",</span><br><span style="color: hsl(0, 100%, 40%);">- CONFIG_SMMSTORE_REGION);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_SMMSTORE_IN_CBFS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cbfs_locate_file_in_region(&file,</span><br><span style="color: hsl(120, 100%, 40%);">+ CONFIG_SMMSTORE_REGION,</span><br><span style="color: hsl(120, 100%, 40%);">+ CONFIG_SMMSTORE_FILENAME, NULL) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_WARNING, "smm store: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unable to find SMM store file in region '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CONFIG_SMMSTORE_REGION);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cbfs_file_data(rstore, &file);</span><br><span style="color: hsl(120, 100%, 40%);">+ cbfs_file_data(rstore, &file);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fmap_locate_area_as_rdev_rw(CONFIG_SMMSTORE_REGION, rstore)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_WARNING,</span><br><span style="color: hsl(120, 100%, 40%);">+ "smm store: Unable to find SMM store FMAP region '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CONFIG_SMMSTORE_REGION);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/southbridge/intel/common/Kconfig b/src/southbridge/intel/common/Kconfig</span><br><span>index 957faa5..0f3121f 100644</span><br><span>--- a/src/southbridge/intel/common/Kconfig</span><br><span>+++ b/src/southbridge/intel/common/Kconfig</span><br><span>@@ -16,6 +16,7 @@</span><br><span> config SOUTHBRIDGE_INTEL_COMMON_SPI</span><br><span> def_bool n</span><br><span> select SPI_FLASH</span><br><span style="color: hsl(120, 100%, 40%);">+ select BOOT_DEVICE_SUPPORTS_WRITES</span><br><span> </span><br><span> config SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN</span><br><span> def_bool n</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29991">change 29991</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/+/29991"/><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: I8c2b9b3a0ed16b2d37e6a97e33c671fb54df8de0 </div>
<div style="display:none"> Gerrit-Change-Number: 29991 </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>