<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21715">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">icE1usb fw: Expose error conditions from E1 driver<br><br>This will allow the USB interface code to report the errors to the<br>host PC.<br><br>Change-Id: Iba3e00a2b28a2fef6dbd986bfc706c1619c3a3ed<br>---<br>M firmware/ice40-riscv/icE1usb/e1.c<br>M firmware/ice40-riscv/icE1usb/e1.h<br>2 files changed, 22 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/15/21715/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>index 5d4d3ee..83cbd92 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/e1.c</span><br><span>@@ -291,6 +291,7 @@</span><br><span> int in_flight;</span><br><span> enum e1_pipe_state state;</span><br><span> } tx;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t errors; /* E1_ERR_ bitmask */</span><br><span> } g_e1;</span><br><span> </span><br><span> </span><br><span>@@ -395,6 +396,15 @@</span><br><span> return e1f_valid_frames(&g_e1.rx.fifo);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* get cumulative error bit mask since last call of this function */</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t</span><br><span style="color: hsl(120, 100%, 40%);">+e1_get_and_clear_errors(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t err = g_e1.errors;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1.errors = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return err;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void</span><br><span> e1_poll(void)</span><br><span> {</span><br><span>@@ -421,8 +431,10 @@</span><br><span> while ( (bd = e1_regs->rx.bd) & E1_BD_VALID ) {</span><br><span> /* FIXME: CRC status ? */</span><br><span> e1f_multiframe_write_commit(&g_e1.rx.fifo);</span><br><span style="color: hsl(0, 100%, 40%);">- if ((bd & (E1_BD_CRC0 | E1_BD_CRC1)) != (E1_BD_CRC0 | E1_BD_CRC1))</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((bd & (E1_BD_CRC0 | E1_BD_CRC1)) != (E1_BD_CRC0 | E1_BD_CRC1)) {</span><br><span> printf("b: %03x\n", bd);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1.errors |= E1_ERR_CRC;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> g_e1.rx.in_flight--;</span><br><span> }</span><br><span> </span><br><span>@@ -441,6 +453,7 @@</span><br><span> if (!(e1_regs->rx.csr & E1_RX_SR_ALIGNED)) {</span><br><span> printf("[!] E1 rx misalign\n");</span><br><span> g_e1.rx.state = RECOVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1.errors |= E1_ERR_ALIGN;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -449,6 +462,7 @@</span><br><span> if (e1_regs->rx.csr & E1_RX_SR_OVFL) {</span><br><span> printf("[!] E1 overflow %d\n", g_e1.rx.in_flight);</span><br><span> g_e1.rx.state = RECOVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1.errors |= E1_ERR_OVFL;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -480,6 +494,7 @@</span><br><span> if (e1_regs->tx.csr & E1_TX_SR_UNFL) {</span><br><span> printf("[!] E1 underflow %d\n", g_e1.tx.in_flight);</span><br><span> g_e1.tx.state = RECOVER;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1.errors |= E1_ERR_UNFL;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>index e68514f..c56cf0c 100644</span><br><span>--- a/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>+++ b/firmware/ice40-riscv/icE1usb/e1.h</span><br><span>@@ -11,5 +11,11 @@</span><br><span> void e1_poll(void);</span><br><span> void e1_debug_print(bool data);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define E1_ERR_ALIGN 0x01 /* at least one alignment error */</span><br><span style="color: hsl(120, 100%, 40%);">+#define E1_ERR_CRC 0x02 /* at least one CRC error */</span><br><span style="color: hsl(120, 100%, 40%);">+#define E1_ERR_OVFL 0x04 /* at least one Rx overflow */</span><br><span style="color: hsl(120, 100%, 40%);">+#define E1_ERR_UNFL 0x08 /* at least one Tx underflow */</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t e1_get_and_clear_errors(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> volatile uint8_t *e1_data_ptr(int mf, int frame, int ts);</span><br><span> unsigned int e1_data_ofs(int mf, int frame, int ts);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21715">change 21715</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/osmo-e1-hardware/+/21715"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1-hardware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iba3e00a2b28a2fef6dbd986bfc706c1619c3a3ed </div>
<div style="display:none"> Gerrit-Change-Number: 21715 </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>