<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16583">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cardem: Move card_emu_io_statechg() calls out of interrupt context<br><br>So far, we called card_emu_io_statechg() from interrupt context, which<br>was safe with the current code. However, as we want to trigger a more<br>comprehensive reset of data structures, including the flushing of<br>message queues, it is best to shift this processing from interrupt<br>context to main loop context.<br><br>Change-Id: I3983078396538f32bdff55611c41d2163be4d796<br>Related: OS#4251<br>---<br>M firmware/libcommon/source/mode_cardemu.c<br>1 file changed, 51 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/83/16583/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c</span><br><span>index 704e6ba..7b13c4a 100644</span><br><span>--- a/firmware/libcommon/source/mode_cardemu.c</span><br><span>+++ b/firmware/libcommon/source/mode_cardemu.c</span><br><span>@@ -60,8 +60,13 @@</span><br><span> uint8_t ep_in;</span><br><span> uint8_t ep_int;</span><br><span> const Pin pin_insert;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef DETECT_VCC_BY_ADC</span><br><span> uint32_t vcc_uv;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t vcc_uv_last;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vcc_active;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vcc_active_last;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool rst_active;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool rst_active_last;</span><br><span> };</span><br><span> </span><br><span> struct cardem_inst cardem_inst[] = {</span><br><span>@@ -261,7 +266,7 @@</span><br><span> </span><br><span> #ifdef DETECT_VCC_BY_ADC</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int adc_triggered = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+static volatile int adc_triggered = 0;</span><br><span> static int adc_sam3s_reva_errata = 0;</span><br><span> </span><br><span> static int card_vcc_adc_init(void)</span><br><span>@@ -313,18 +318,10 @@</span><br><span> </span><br><span> static void process_vcc_adc(struct cardem_inst *ci)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ci->vcc_uv >= VCC_UV_THRESH_3V &&</span><br><span style="color: hsl(0, 100%, 40%);">- ci->vcc_uv_last < VCC_UV_THRESH_3V) {</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(ci->ch, CARD_IO_VCC, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME do this for real */</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(ci->ch, CARD_IO_CLK, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ci->vcc_uv < VCC_UV_THRESH_3V &&</span><br><span style="color: hsl(0, 100%, 40%);">- ci->vcc_uv_last >= VCC_UV_THRESH_3V) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME do this for real */</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(ci->ch, CARD_IO_CLK, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(ci->ch, CARD_IO_VCC, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- ci->vcc_uv_last = ci->vcc_uv;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ci->vcc_uv >= VCC_UV_THRESH_3V)</span><br><span style="color: hsl(120, 100%, 40%);">+ ci->vcc_active = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ ci->vcc_active = false;</span><br><span> }</span><br><span> </span><br><span> void ADC_IrqHandler(void)</span><br><span>@@ -347,44 +344,54 @@</span><br><span> cardem_inst[0].vcc_uv = adc2uv(val);</span><br><span> process_vcc_adc(&cardem_inst[0]);</span><br><span> ADC->ADC_CR |= ADC_CR_START;</span><br><span style="color: hsl(120, 100%, 40%);">+ adc_triggered = 1;</span><br><span> }</span><br><span> }</span><br><span> #endif /* DETECT_VCC_BY_ADC */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* called from main loop; dispatches card I/O state changes to card_emu from main loop */</span><br><span style="color: hsl(120, 100%, 40%);">+static void process_io_statechg(struct cardem_inst *ci)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ci->vcc_active != ci->vcc_active_last) {</span><br><span style="color: hsl(120, 100%, 40%);">+ card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME do this for real */</span><br><span style="color: hsl(120, 100%, 40%);">+ card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active);</span><br><span style="color: hsl(120, 100%, 40%);">+ ci->vcc_active_last = ci->vcc_active;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ci->rst_active != ci->rst_active_last) {</span><br><span style="color: hsl(120, 100%, 40%);">+ card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active);</span><br><span style="color: hsl(120, 100%, 40%);">+ ci->rst_active_last = ci->rst_active;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * Core USB / main loop integration</span><br><span> ***********************************************************************/</span><br><span> </span><br><span> static void usim1_rst_irqhandler(const Pin *pPin)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bool active = PIO_Get(&pin_usim1_rst) ? false : true;</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_RST, active);</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[0].rst_active = PIO_Get(&pin_usim1_rst) ? false : true;</span><br><span> }</span><br><span> </span><br><span> #ifndef DETECT_VCC_BY_ADC</span><br><span> static void usim1_vcc_irqhandler(const Pin *pPin)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bool active = PIO_Get(&pin_usim1_vcc) ? true : false;</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_VCC, active);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME do this for real */</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_CLK, active);</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[0].vcc_active = PIO_Get(&pin_usim1_vcc) ? true : false;</span><br><span> }</span><br><span> #endif /* !DETECT_VCC_BY_ADC */</span><br><span> </span><br><span> #ifdef CARDEMU_SECOND_UART</span><br><span> static void usim2_rst_irqhandler(const Pin *pPin)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bool active = PIO_Get(&pin_usim2_rst) ? false : true;</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_RST, active);</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[1].rst_active = PIO_Get(&pin_usim2_rst) ? false : true;</span><br><span> }</span><br><span> </span><br><span> #ifndef DETECT_VCC_BY_ADC</span><br><span> static void usim2_vcc_irqhandler(const Pin *pPin)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bool active = PIO_Get(&pin_usim2_vcc) ? true : false;</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_VCC, active);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME do this for real */</span><br><span style="color: hsl(0, 100%, 40%);">- card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_CLK, active);</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[1].vcc_active = PIO_Get(&pin_usim2_vcc) ? true : false;</span><br><span> }</span><br><span> #endif /* !DETECT_VCC_BY_ADC */</span><br><span> #endif /* CARDEMU_SECOND_UART */</span><br><span>@@ -416,11 +423,18 @@</span><br><span> NVIC_EnableIRQ(USART1_IRQn);</span><br><span> PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler);</span><br><span> PIO_EnableIt(&pin_usim1_rst);</span><br><span style="color: hsl(120, 100%, 40%);">+ usim1_rst_irqhandler(&pin_usim1_rst); /* obtain current RST state */</span><br><span> #ifndef DETECT_VCC_BY_ADC</span><br><span> PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler);</span><br><span> PIO_EnableIt(&pin_usim1_vcc);</span><br><span style="color: hsl(120, 100%, 40%);">+ usim1_vcc_irqhandler(&pin_usim1_vcc); /* obtain current VCC state */</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ do {} while (!adc_triggered); /* wait for first ADC reading */</span><br><span> #endif /* DETECT_VCC_BY_ADC */</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM1_INT, PIO_Get(&pin_usim1_vcc) ? true : false, PIO_Get(&pin_usim1_rst) ? false : true, PIO_Get(&pin_usim1_vcc) ? true : false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_CARDEM_USB_EP_USIM1_INT, cardem_inst[0].vcc_active,</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[0].rst_active, cardem_inst[0].vcc_active);</span><br><span> sim_switch_use_physical(0, 1);</span><br><span> </span><br><span> #ifdef CARDEMU_SECOND_UART</span><br><span>@@ -431,11 +445,18 @@</span><br><span> NVIC_EnableIRQ(USART0_IRQn);</span><br><span> PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler);</span><br><span> PIO_EnableIt(&pin_usim2_rst);</span><br><span style="color: hsl(120, 100%, 40%);">+ usim2_rst_irqhandler(&pin_usim2_rst); /* obtain current RST state */</span><br><span> #ifndef DETECT_VCC_BY_ADC</span><br><span> PIO_ConfigureIt(&pin_usim2_vcc, usim2_vcc_irqhandler);</span><br><span> PIO_EnableIt(&pin_usim2_vcc);</span><br><span style="color: hsl(120, 100%, 40%);">+ usim2_vcc_irqhandler(&pin_usim2_vcc); /* obtain current VCC state */</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ do {} while (!adc_triggered); /* wait for first ADC reading */</span><br><span> #endif /* DETECT_VCC_BY_ADC */</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM2_INT, PIO_Get(&pin_usim2_vcc) ? true : false, PIO_Get(&pin_usim2_rst) ? false : true, PIO_Get(&pin_usim2_vcc) ? true : false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_CARDEM_USB_EP_USIM2_INT, cardem_inst[1].vcc_active,</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_inst[1].rst_active, cardem_inst[1].vcc_active);</span><br><span> sim_switch_use_physical(1, 1);</span><br><span> #endif /* CARDEMU_SECOND_UART */</span><br><span> }</span><br><span>@@ -714,6 +735,8 @@</span><br><span> //TRACE_ERROR("%uRx%02x\r\n", i, byte);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ process_io_statechg(ci);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* first try to send any pending messages on IRQ */</span><br><span> usb_refill_to_host(ci->ep_int);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16583">change 16583</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/simtrace2/+/16583"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3983078396538f32bdff55611c41d2163be4d796 </div>
<div style="display:none"> Gerrit-Change-Number: 16583 </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>