<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25861">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lib/prog_loaders: Move argument selection into selfload<br><br>Set the payload argument in selfload, as other (non self) payloads, are<br>going to set a different argument.<br><br>Change-Id: I994f604fc4501e0e3b00165819f796b1b8275d8c<br>---<br>M src/arch/arm64/arm_tf.c<br>M src/include/program_loading.h<br>M src/lib/prog_loaders.c<br>M src/lib/selfboot.c<br>4 files changed, 13 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/25861/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c</span><br><span>index 69e83c1..2df9842 100644</span><br><span>--- a/src/arch/arm64/arm_tf.c</span><br><span>+++ b/src/arch/arm64/arm_tf.c</span><br><span>@@ -50,9 +50,9 @@</span><br><span> if (prog_locate(&bl31))</span><br><span> die("BL31 not found");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bl31_entry = selfload(&bl31, false);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bl31_entry)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!selfload(&bl31, false))</span><br><span> die("BL31 load failed");</span><br><span style="color: hsl(120, 100%, 40%);">+ bl31_entry = (void *)bl31.entry;</span><br><span> </span><br><span> SET_PARAM_HEAD(&bl31_params, PARAM_BL31, VERSION_1, 0);</span><br><span> </span><br><span>diff --git a/src/include/program_loading.h b/src/include/program_loading.h</span><br><span>index 416e2e9..9d1b637 100644</span><br><span>--- a/src/include/program_loading.h</span><br><span>+++ b/src/include/program_loading.h</span><br><span>@@ -193,10 +193,10 @@</span><br><span> /*</span><br><span> * Set check_regions to true to check that the payload targets usable memory.</span><br><span> * With this flag set, if it does not, the load will fail and this function</span><br><span style="color: hsl(0, 100%, 40%);">- * will return NULL.</span><br><span style="color: hsl(120, 100%, 40%);">+ * will return false. On successful payload loading this functions return true.</span><br><span> *</span><br><span> * Defined in src/lib/selfboot.c</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-void *selfload(struct prog *payload, bool check_regions);</span><br><span style="color: hsl(120, 100%, 40%);">+bool selfload(struct prog *payload, bool check_regions);</span><br><span> </span><br><span> #endif /* PROGRAM_LOADING_H */</span><br><span>diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c</span><br><span>index 128869b..82548bd 100644</span><br><span>--- a/src/lib/prog_loaders.c</span><br><span>+++ b/src/lib/prog_loaders.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <stage_cache.h></span><br><span> #include <symbols.h></span><br><span> #include <timestamp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cbfs.h></span><br><span> </span><br><span> /* Only can represent up to 1 byte less than size_t. */</span><br><span> const struct mem_region_device addrspace_32bit =</span><br><span>@@ -179,9 +180,7 @@</span><br><span> </span><br><span> mirror_payload(payload);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Pass cbtables to payload if architecture desires it. */</span><br><span style="color: hsl(0, 100%, 40%);">- prog_set_entry(payload, selfload(payload, true),</span><br><span style="color: hsl(0, 100%, 40%);">- cbmem_find(CBMEM_ID_CBTABLE));</span><br><span style="color: hsl(120, 100%, 40%);">+ selfload(payload, true);</span><br><span> </span><br><span> out:</span><br><span> if (prog_entry(payload) == NULL)</span><br><span>diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c</span><br><span>index 1cf32e5..534b33d 100644</span><br><span>--- a/src/lib/selfboot.c</span><br><span>+++ b/src/lib/selfboot.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <bootmem.h></span><br><span> #include <program_loading.h></span><br><span> #include <timestamp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cbmem.h></span><br><span> </span><br><span> static const unsigned long lb_start = (unsigned long)&_program;</span><br><span> static const unsigned long lb_end = (unsigned long)&_eprogram;</span><br><span>@@ -512,7 +513,7 @@</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *selfload(struct prog *payload, bool check_regions)</span><br><span style="color: hsl(120, 100%, 40%);">+bool selfload(struct prog *payload, bool check_regions)</span><br><span> {</span><br><span> uintptr_t entry = 0;</span><br><span> struct segment head;</span><br><span>@@ -521,7 +522,7 @@</span><br><span> data = rdev_mmap_full(prog_rdev(payload));</span><br><span> </span><br><span> if (data == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span> </span><br><span> /* Preprocess the self segments */</span><br><span> if (!build_self_segment_list(&head, data, &entry))</span><br><span>@@ -538,9 +539,11 @@</span><br><span> /* Update the payload's area with the bounce buffer information. */</span><br><span> prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return (void *)entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Pass cbtables to payload if architecture desires it. */</span><br><span style="color: hsl(120, 100%, 40%);">+ prog_set_entry(payload, (void *)entry, cbmem_find(CBMEM_ID_CBTABLE));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span> out:</span><br><span> rdev_munmap(prog_rdev(payload), data);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25861">change 25861</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/25861"/><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: I994f604fc4501e0e3b00165819f796b1b8275d8c </div>
<div style="display:none"> Gerrit-Change-Number: 25861 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>