<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20885">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tpu: Fix TPU_DEBUG: keep local cache of imnstructions<br><br>TPU_DEBUG used to read from TPU RAM, which unfortunatly seems rather<br>slow, so copying it over from there broke overall timing leading to<br>infamous "DSP Error 24" when TPU_DEBUG is enabled.<br><br>Change-Id: Idde061df8c129aa51b2e4540c8ef2e4116468c9c<br>---<br>M src/target/firmware/calypso/tpu.c<br>1 file changed, 34 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/20885/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/calypso/tpu.c b/src/target/firmware/calypso/tpu.c</span><br><span>index f778bfd..cbeef84 100644</span><br><span>--- a/src/target/firmware/calypso/tpu.c</span><br><span>+++ b/src/target/firmware/calypso/tpu.c</span><br><span>@@ -75,44 +75,43 @@</span><br><span> #ifdef TPU_DEBUG</span><br><span> #include <comm/sercomm.h></span><br><span> #include <layer1/sync.h></span><br><span style="color: hsl(0, 100%, 40%);">-static void tpu_ram_read_en(int enable)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t reg;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct msgb *tpu_debug_msg = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- reg = readw(TPU_REG(TPU_CTRL));</span><br><span style="color: hsl(0, 100%, 40%);">- if (enable)</span><br><span style="color: hsl(0, 100%, 40%);">- reg |= TPU_CTRL_MCU_RAM_ACC;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- reg &= ~TPU_CTRL_MCU_RAM_ACC;</span><br><span style="color: hsl(0, 100%, 40%);">- writew(reg, TPU_REG(TPU_CTRL));</span><br><span style="color: hsl(120, 100%, 40%);">+static void tpu_debug_alloc(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ tpu_debug_msg = sercomm_alloc_msgb(sizeof(uint32_t) + 64*2);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tpu_debug_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("UNABLE TO ALLOC TPU DBG\n");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void tpu_debug(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static void tpu_debug_flush(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t *tpu_base = (uint16_t *)BASE_ADDR_TPU_RAM;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int tpu_size = tpu_ptr - tpu_base;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = sercomm_alloc_msgb(sizeof(uint32_t) + tpu_size*2);</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t *data;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *fn;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t reg;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tpu_debug_msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sercomm_sendmsg(SC_DLCI_DEBUG, tpu_debug_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ tpu_debug_msg = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ tpu_debug_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+static void tpu_debug_enqueue(uint16_t instr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t *u16_out;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* prepend tpu memory dump with frame number */</span><br><span style="color: hsl(0, 100%, 40%);">- fn = (uint32_t *) msgb_put(msg, sizeof(fn));</span><br><span style="color: hsl(0, 100%, 40%);">- *fn = l1s.current_time.fn;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tpu_ram_read_en(1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- data = (uint16_t *) msgb_put(msg, tpu_size*2);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < tpu_size; i ++)</span><br><span style="color: hsl(0, 100%, 40%);">- data[i] = tpu_base[i];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tpu_ram_read_en(0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- sercomm_sendmsg(SC_DLCI_DEBUG, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tpu_debug_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tpu_ptr == (uint16_t *) BASE_ADDR_TPU_RAM) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* prepend tpu memory dump with frame number */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t *fn = (uint32_t *) msgb_put(tpu_debug_msg, sizeof(fn));</span><br><span style="color: hsl(120, 100%, 40%);">+ *fn = l1s.current_time.fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_tailroom(tpu_debug_msg) >= sizeof(instr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* cannot use msgb_put_u16 as host program expects little endian */</span><br><span style="color: hsl(120, 100%, 40%);">+ u16_out = (uint16_t *) msgb_put(tpu_debug_msg, sizeof(instr));</span><br><span style="color: hsl(120, 100%, 40%);">+ *u16_out = instr;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">-static void tpu_debug(void) { }</span><br><span style="color: hsl(120, 100%, 40%);">+static void tpu_debug_alloc(void) { }</span><br><span style="color: hsl(120, 100%, 40%);">+static void tpu_debug_flush(void) { }</span><br><span style="color: hsl(120, 100%, 40%);">+static void tpu_debug_enqueue(uint16_t instr) { }</span><br><span> #endif</span><br><span> </span><br><span> #define BIT_SET 1</span><br><span>@@ -167,14 +166,14 @@</span><br><span> </span><br><span> printd("tpu_enable(%u)\n", active);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tpu_debug();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (active)</span><br><span> reg |= TPU_CTRL_EN;</span><br><span> else</span><br><span> reg &= ~TPU_CTRL_EN;</span><br><span> writew(reg, TPU_REG(TPU_CTRL));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ tpu_debug_flush();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* After the new scenario is loaded, TPU switches the MCU-visible memory</span><br><span> * page, i.e. we can write without any danger */</span><br><span> tpu_rewind();</span><br><span>@@ -241,6 +240,7 @@</span><br><span> void tpu_enqueue(uint16_t instr)</span><br><span> {</span><br><span> printd("tpu_enqueue(tpu_ptr=%p, instr=0x%04x)\n", tpu_ptr, instr);</span><br><span style="color: hsl(120, 100%, 40%);">+ tpu_debug_enqueue(instr);</span><br><span> *tpu_ptr++ = instr;</span><br><span> if (tpu_ptr > (uint16_t *) TPU_RAM_END)</span><br><span> puts("TPU enqueue beyond end of TPU memory\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20885">change 20885</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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://gerrit.osmocom.org/c/osmocom-bb/+/20885"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idde061df8c129aa51b2e4540c8ef2e4116468c9c </div>
<div style="display:none"> Gerrit-Change-Number: 20885 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>