<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30055">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apl: Warn if CBFS is outside the memory mapped area<br><br>As part of the memory mapped BIOS region is covered by SRAM, check<br>that CBFS always fits the effectively mapped region of flash. This<br>is usually taken care of by reserving the SRAM range in the FMAP<br>(e.g. as BIOS_UNUSABLE), but can be missed.<br><br>Change-Id: If5a5b553ad4853723bf13349c809c4f6154aa5f2<br>Signed-off-by: Nico Huber <nico.huber@secunet.com><br>---<br>M src/soc/intel/apollolake/mmap_boot.c<br>1 file changed, 15 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/30055/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/apollolake/mmap_boot.c b/src/soc/intel/apollolake/mmap_boot.c</span><br><span>index db13cba..1c3077e 100644</span><br><span>--- a/src/soc/intel/apollolake/mmap_boot.c</span><br><span>+++ b/src/soc/intel/apollolake/mmap_boot.c</span><br><span>@@ -110,6 +110,8 @@</span><br><span> </span><br><span> static int iafw_boot_region_properties(struct cbfs_props *props)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct xlate_region_device *real_dev_ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct region *real_dev_reg;</span><br><span> struct region regn;</span><br><span> </span><br><span> /* use fmap to locate CBFS area */</span><br><span>@@ -119,7 +121,19 @@</span><br><span> props->offset = region_offset(®n);</span><br><span> props->size = region_sz(®n);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "CBFS @ %zx size %zx\n", props->offset, props->size);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check that we are within the memory mapped area. It's too</span><br><span style="color: hsl(120, 100%, 40%);">+ easy to forget the SRAM mapping when crafting an FMAP file. */</span><br><span style="color: hsl(120, 100%, 40%);">+ real_dev_ptr = car_get_var_ptr(&real_dev);</span><br><span style="color: hsl(120, 100%, 40%);">+ real_dev_reg = &real_dev_ptr->sub_region;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (region_is_subregion(real_dev_reg, ®n)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "CBFS @ %zx size %zx\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ props->offset, props->size);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_CRIT,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ERROR: CBFS @ %zx size %zx exceeds mem-mapped area @ %zx size %zx\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ props->offset, props->size,</span><br><span style="color: hsl(120, 100%, 40%);">+ region_offset(real_dev_reg), region_sz(real_dev_reg));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30055">change 30055</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/+/30055"/><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: If5a5b553ad4853723bf13349c809c4f6154aa5f2 </div>
<div style="display:none"> Gerrit-Change-Number: 30055 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>