<p>Jonathan Neuschäfer has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21687">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">arch/riscv: gettimer: Don't use the config string<br><br>Accessing the config string doesn't work anymore on current versions of<br>spike. Thus return dummy pointers until we have a better solution.<br><br>Change-Id: I684fc51dc0916f2235e57e36b913d363e1cb02b1<br>Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net><br>---<br>M src/arch/riscv/trap_handler.c<br>1 file changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/21687/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/arch/riscv/trap_handler.c b/src/arch/riscv/trap_handler.c<br>index ca4954f..54cd7e7 100644<br>--- a/src/arch/riscv/trap_handler.c<br>+++ b/src/arch/riscv/trap_handler.c<br>@@ -125,17 +125,19 @@<br> <br> static void gettimer(void)<br> {<br>- query_result res;<br>-    const char *config;<br>+  /*<br>+    * FIXME: This hard-coded value (currently) works on spike, but we<br>+    * should really read it from the device tree.<br>+        */<br>+  uintptr_t clint = 0x02000000;<br> <br>-     config = configstring();<br>-     query_rtc(config, (uintptr_t *)&time);<br>+   time    = (void *)(clint + 0xbff8);<br>+  timecmp = (void *)(clint + 0x4000);<br>+<br>        if (!time)<br>            die("Got timer interrupt but found no timer.");<br>-    res = query_config_string(config, "core{0{0{timecmp");<br>-     timecmp = (void *)get_uint(res);<br>      if (!timecmp)<br>-                die("Got a timer interrupt but found no timecmp.");<br>+                die("Got timer interrupt but found no timecmp.");<br> }<br> <br> static void interrupt_handler(trapframe *tf)<br></pre><p>To view, visit <a href="https://review.coreboot.org/21687">change 21687</a>. To unsubscribe, 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/21687"/><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: I684fc51dc0916f2235e57e36b913d363e1cb02b1 </div>
<div style="display:none"> Gerrit-Change-Number: 21687 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jonathan Neuschäfer <j.neuschaefer@gmx.net> </div>