<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23792">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/cavium/bootblock: Get rid of register X1<br><br>The register X1 isn't used. Document it and remove it.<br><br>Change-Id: I9324ea9de24ba4baaef9dde890c443dd0f921ad9<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/soc/cavium/cn81xx/bootblock_custom.S<br>M src/soc/cavium/common/bootblock.c<br>M src/soc/cavium/common/include/soc/bootblock.h<br>3 files changed, 7 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/23792/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/cavium/cn81xx/bootblock_custom.S b/src/soc/cavium/cn81xx/bootblock_custom.S</span><br><span>index 69985b7..2f503c8 100644</span><br><span>--- a/src/soc/cavium/cn81xx/bootblock_custom.S</span><br><span>+++ b/src/soc/cavium/cn81xx/bootblock_custom.S</span><br><span>@@ -29,7 +29,11 @@</span><br><span> */</span><br><span> ic ialluis</span><br><span> fmov d30, x0 /* Save X0 in FPR for use later */</span><br><span style="color: hsl(0, 100%, 40%);">- fmov d31, x1 /* Save X1 in FPR for use later */</span><br><span style="color: hsl(120, 100%, 40%);">+ /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * The BDK stores X1 for later use, but it turns out that we don't need</span><br><span style="color: hsl(120, 100%, 40%);">+ * this "feature". The idea is to hide the devicetree somewhere in</span><br><span style="color: hsl(120, 100%, 40%);">+ * flash, that only the ROM will find it and point to it using X1.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> adr x1, _start /* x1 = _start location based on PC */</span><br><span> fmov d29, x1 /* Save PC in FPR for use later */</span><br><span> </span><br><span>@@ -84,7 +88,7 @@</span><br><span> adr x0, _start</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Check if IROM has loaded the code to CONFIG_BOOTROM_OFFSET.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Check if IROM has loaded the code to BOOTROM_OFFSET.</span><br><span> * In case the offset is wrong, try to relocate.</span><br><span> * Ideally the following code is never executed.</span><br><span> * FIXME: Add region overlap check.</span><br><span>@@ -248,8 +252,7 @@</span><br><span> bl arm64_init_cpu</span><br><span> </span><br><span> fmov x0, d30 /* The original X0, info from previous image */</span><br><span style="color: hsl(0, 100%, 40%);">- fmov x1, d31 /* The original X1, info from previous image */</span><br><span style="color: hsl(0, 100%, 40%);">- fmov x2, d29 /* The original PC we were loaded at */</span><br><span style="color: hsl(120, 100%, 40%);">+ fmov x1, d29 /* The original PC we were loaded at */</span><br><span> </span><br><span> /* Call C entry */</span><br><span> bl bootblock_main</span><br><span>diff --git a/src/soc/cavium/common/bootblock.c b/src/soc/cavium/common/bootblock.c</span><br><span>index c61a8d7..7b9d524 100644</span><br><span>--- a/src/soc/cavium/common/bootblock.c</span><br><span>+++ b/src/soc/cavium/common/bootblock.c</span><br><span>@@ -32,7 +32,6 @@</span><br><span> </span><br><span> /* C code entry point for the boot block */</span><br><span> void bootblock_main(const uint64_t reg_x0,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint64_t reg_x1,</span><br><span> const uint64_t reg_pc)</span><br><span> {</span><br><span> uint64_t base_timestamp = 0;</span><br><span>@@ -57,8 +56,6 @@</span><br><span> printk(BIOS_ERR,</span><br><span> "BOOTBLOCK: RST Boot Failure Code %lld\n",</span><br><span> reg_x0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "BOOTBLOCK: FDT 0x%llX\n", reg_x1);</span><br><span> }</span><br><span> </span><br><span> bootblock_soc_init();</span><br><span>diff --git a/src/soc/cavium/common/include/soc/bootblock.h b/src/soc/cavium/common/include/soc/bootblock.h</span><br><span>index e347e86..bfb9745 100644</span><br><span>--- a/src/soc/cavium/common/include/soc/bootblock.h</span><br><span>+++ b/src/soc/cavium/common/include/soc/bootblock.h</span><br><span>@@ -14,7 +14,6 @@</span><br><span> void bootblock_mainboard_init(void);</span><br><span> </span><br><span> void bootblock_main(const uint64_t reg_x0,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint64_t reg_x1,</span><br><span> const uint64_t reg_pc);</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23792">change 23792</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/23792"/><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: I9324ea9de24ba4baaef9dde890c443dd0f921ad9 </div>
<div style="display:none"> Gerrit-Change-Number: 23792 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>