<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25747">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lib/bootmem: Add method to walk OS POV memory tables<br><br>Add method to walk memory tables from OS point of view.<br>The tables don't change when modifiying bootmem entries and doesn't contain<br>bootmem specific tags.<br><br>Change-Id: Iee332a9821d12a7d9a684063b77b0502febd8d7d<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/include/bootmem.h<br>M src/lib/bootmem.c<br>2 files changed, 40 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/25747/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/include/bootmem.h b/src/include/bootmem.h</span><br><span>index b95e383..4026c5c 100644</span><br><span>--- a/src/include/bootmem.h</span><br><span>+++ b/src/include/bootmem.h</span><br><span>@@ -71,6 +71,16 @@</span><br><span> typedef bool (*range_action_t)(const struct range_entry *r, void *arg);</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * Walk memory tables from OS point of view and call the provided function,</span><br><span style="color: hsl(120, 100%, 40%);">+ * for every region. The caller has to return false to break out of the loop any</span><br><span style="color: hsl(120, 100%, 40%);">+ * time, or return true to continue.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param action The function to call for each memory range.</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param Pointer passed to function @action. Set to NULL if unused.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void bootmem_walk_os_mem(range_action_t action, void *arg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span> * Walk memory tables and call the provided function, for every region.</span><br><span> * The caller has to return false to break out of the loop any time, or</span><br><span> * return true to continue.</span><br><span>diff --git a/src/lib/bootmem.c b/src/lib/bootmem.c</span><br><span>index daad9a8..efb8c82 100644</span><br><span>--- a/src/lib/bootmem.c</span><br><span>+++ b/src/lib/bootmem.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> static int initialized;</span><br><span> static int table_written;</span><br><span> static struct memranges bootmem;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct memranges bootmem_os;</span><br><span> </span><br><span> static int bootmem_is_initialized(void)</span><br><span> {</span><br><span>@@ -65,6 +66,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void bootmem_convert_ranges(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * Convert BM_MEM_RAMSTAGE and BM_MEM_PAYLOAD to BM_MEM_RAM and</span><br><span style="color: hsl(120, 100%, 40%);">+ * merge ranges. The payload doesn't care about memory used by firmware.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ memranges_clone(&bootmem_os, &bootmem);</span><br><span style="color: hsl(120, 100%, 40%);">+ memranges_update_tag(&bootmem_os, BM_MEM_RAMSTAGE, BM_MEM_RAM);</span><br><span style="color: hsl(120, 100%, 40%);">+ memranges_update_tag(&bootmem_os, BM_MEM_PAYLOAD, BM_MEM_RAM);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void bootmem_init(void)</span><br><span> {</span><br><span> const unsigned long cacheable = IORESOURCE_CACHEABLE;</span><br><span>@@ -90,6 +102,8 @@</span><br><span> </span><br><span> bootmem_arch_add_ranges();</span><br><span> bootmem_platform_add_ranges();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bootmem_convert_ranges();</span><br><span> }</span><br><span> </span><br><span> void bootmem_add_range(uint64_t start, uint64_t size,</span><br><span>@@ -118,22 +132,13 @@</span><br><span> {</span><br><span> const struct range_entry *r;</span><br><span> struct lb_memory_range *lb_r;</span><br><span style="color: hsl(0, 100%, 40%);">- struct memranges bm;</span><br><span> </span><br><span> lb_r = &mem->map[0];</span><br><span> </span><br><span> bootmem_init();</span><br><span> bootmem_dump_ranges();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Convert BM_MEM_RAMSTAGE and BM_MEM_PAYLOAD to BM_MEM_RAM and</span><br><span style="color: hsl(0, 100%, 40%);">- * merge ranges. The payload doesn't care about memory used by firmware.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- memranges_clone(&bm, &bootmem);</span><br><span style="color: hsl(0, 100%, 40%);">- memranges_update_tag(&bm, BM_MEM_RAMSTAGE, BM_MEM_RAM);</span><br><span style="color: hsl(0, 100%, 40%);">- memranges_update_tag(&bm, BM_MEM_PAYLOAD, BM_MEM_RAM);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memranges_each_entry(r, &bm) {</span><br><span style="color: hsl(120, 100%, 40%);">+ memranges_each_entry(r, &bootmem_os) {</span><br><span> lb_r->start = pack_lb64(range_entry_base(r));</span><br><span> lb_r->size = pack_lb64(range_entry_size(r));</span><br><span> lb_r->type = bootmem_to_lb_tag(range_entry_tag(r));</span><br><span>@@ -142,8 +147,6 @@</span><br><span> mem->size += sizeof(struct lb_memory_range);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memranges_teardown(&bm);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> table_written = 1;</span><br><span> }</span><br><span> </span><br><span>@@ -190,6 +193,21 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bootmem_walk_os_mem(range_action_t action, void *arg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct range_entry *r;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bootmem_is_initialized()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "%s: lib unitialized!\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memranges_each_entry(r, &bootmem_os) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!action(r, arg))</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void bootmem_walk(range_action_t action, void *arg)</span><br><span> {</span><br><span> const struct range_entry *r;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25747">change 25747</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/25747"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iee332a9821d12a7d9a684063b77b0502febd8d7d </div>
<div style="display:none"> Gerrit-Change-Number: 25747 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>