<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16246">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fsm completion event handling from main loop<br><br>Change-Id: If71a37dcaa5162c18d83e4b2a0cdae69574b92d9<br>---<br>M ccid_common/ccid_device.h<br>M ccid_common/ccid_slot_fsm.c<br>M ccid_common/iso7816_fsm.c<br>M sysmoOCTSIM/main.c<br>4 files changed, 68 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/46/16246/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/ccid_device.h b/ccid_common/ccid_device.h</span><br><span>index 38a71db..f364f72 100644</span><br><span>--- a/ccid_common/ccid_device.h</span><br><span>+++ b/ccid_common/ccid_device.h</span><br><span>@@ -57,6 +57,8 @@</span><br><span> struct ccid_pars_decoded proposed_pars;</span><br><span> /* default parameters; applied on ResetParameters */</span><br><span> const struct ccid_pars_decoded *default_pars;</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile uint32_t event;</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile void* event_data;</span><br><span> };</span><br><span> </span><br><span> /* CCID operations provided by USB transport layer */</span><br><span>@@ -86,6 +88,7 @@</span><br><span> const struct ccid_pars_decoded *pars_dec);</span><br><span> int (*set_rate_and_clock)(struct ccid_slot *cs, uint32_t freq_hz, uint32_t rate_bps);</span><br><span> void (*icc_set_insertion_status)(struct ccid_slot *cs, bool present);</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*handle_fsm_events)(struct ccid_slot *cs, bool enable);</span><br><span> };</span><br><span> </span><br><span> /* An instance of CCID (i.e. a card reader device) */</span><br><span>diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c</span><br><span>index d2aec26..9be31d6 100644</span><br><span>--- a/ccid_common/ccid_slot_fsm.c</span><br><span>+++ b/ccid_common/ccid_slot_fsm.c</span><br><span>@@ -110,34 +110,76 @@</span><br><span> {</span><br><span> struct iso_fsm_slot *ss = iso7816_fsm_get_user_priv(fi);</span><br><span> struct ccid_slot *cs = ss->cs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_ATR_DONE_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_ATR_ERR_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_TPDU_DONE_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_TPDU_FAILED_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_PPS_DONE_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_PPS_FAILED_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event_data = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ asm volatile("dmb st": : :"memory");</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event = event;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCS(cs, LOGL_NOTICE, "%s(event=%d, cause=%d, data=%p) unhandled\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ __func__, event, cause, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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 style="color: hsl(120, 100%, 40%);">+static int iso_handle_fsm_events(struct ccid_slot *cs, bool enable){</span><br><span style="color: hsl(120, 100%, 40%);">+ struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs);</span><br><span> struct msgb *tpdu, *resp;</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile uint32_t event = cs->event;</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile void * volatile data = cs->event_data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if(!event)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if(event && !data)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span> switch (event) {</span><br><span> case ISO7816_E_ATR_DONE_IND:</span><br><span> tpdu = data;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, cause=%d, data=%s)\n", __func__, event, cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event,</span><br><span> msgb_hexdump(tpdu));</span><br><span> resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0,</span><br><span> msgb_data(tpdu), msgb_length(tpdu));</span><br><span> ccid_slot_send_unbusy(cs, resp);</span><br><span> /* Don't free "TPDU" here, as the ATR should survive */</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_ATR_ERR_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ tpdu = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event,</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_hexdump(tpdu));</span><br><span style="color: hsl(120, 100%, 40%);">+ resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_FAILED, CCID_ERR_ICC_MUTE,</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_data(tpdu), msgb_length(tpdu));</span><br><span style="color: hsl(120, 100%, 40%);">+ ccid_slot_send_unbusy(cs, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Don't free "TPDU" here, as the ATR should survive */</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> break;</span><br><span> case ISO7816_E_TPDU_DONE_IND:</span><br><span> tpdu = data;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, cause=%d, data=%s)\n", __func__, event, cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event,</span><br><span> msgb_hexdump(tpdu));</span><br><span> resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0, msgb_l2(tpdu), msgb_l2len(tpdu));</span><br><span> ccid_slot_send_unbusy(cs, resp);</span><br><span> msgb_free(tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event = 0;</span><br><span> break;</span><br><span> case ISO7816_E_TPDU_FAILED_IND:</span><br><span> tpdu = data;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, cause=%d, data=%s)\n", __func__, event, cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event,</span><br><span> msgb_hexdump(tpdu));</span><br><span> /* FIXME: other error causes than card removal?*/</span><br><span> resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_FAILED, CCID_ERR_ICC_MUTE, msgb_l2(tpdu), 0);</span><br><span> ccid_slot_send_unbusy(cs, resp);</span><br><span> msgb_free(tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event = 0;</span><br><span> break;</span><br><span> case ISO7816_E_PPS_DONE_IND:</span><br><span> tpdu = data;</span><br><span>@@ -157,6 +199,7 @@</span><br><span> </span><br><span> /* this frees the pps req from the host, pps resp buffer stays with the pps fsm */</span><br><span> msgb_free(tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event = 0;</span><br><span> break;</span><br><span> case ISO7816_E_PPS_FAILED_IND:</span><br><span> tpdu = data;</span><br><span>@@ -165,10 +208,13 @@</span><br><span> ccid_slot_send_unbusy(cs, resp);</span><br><span> /* this frees the pps req from the host, pps resp buffer stays with the pps fsm */</span><br><span> msgb_free(tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ cs->event = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPCS(cs, LOGL_NOTICE, "%s(event=%d, cause=%d, data=%p) unhandled\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, event, cause, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCS(cs, LOGL_NOTICE, "%s(event=%d, data=%p) unhandled\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ __func__, event, data);</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span>@@ -177,7 +223,7 @@</span><br><span> const struct ccid_pc_to_rdr_xfr_block *xfb)</span><br><span> {</span><br><span> struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs);</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *tpdu;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> ss->seq = xfb->hdr.bSeq;</span><br><span> </span><br><span>@@ -185,17 +231,10 @@</span><br><span> OSMO_ASSERT(xfb->wLevelParameter == 0x0000);</span><br><span> OSMO_ASSERT(msgb_length(msg) > xfb->hdr.dwLength);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 'msg' contains the raw CCID message as received from USB. We could create</span><br><span style="color: hsl(0, 100%, 40%);">- * a new message buffer for the ISO7816 side here or we could 'strip the CCID</span><br><span style="color: hsl(0, 100%, 40%);">- * header off the start of the message. Let's KISS and do a copy here */</span><br><span style="color: hsl(0, 100%, 40%);">- tpdu = msgb_alloc(512, "TPDU");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(tpdu);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(msgb_data(tpdu), xfb->abData, xfb->hdr.dwLength);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put(tpdu, xfb->hdr.dwLength);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_pull(msg, 10);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPCS(cs, LOGL_DEBUG, "scheduling TPDU transfer: %s\n", msgb_hexdump(tpdu));</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_XCEIVE_TPDU_CMD, tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCS(cs, LOGL_DEBUG, "scheduling TPDU transfer: %s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_XCEIVE_TPDU_CMD, msg);</span><br><span> /* continues in iso_fsm_clot_user_cb once response/error/timeout is received */</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -329,4 +368,5 @@</span><br><span> .set_clock = iso_fsm_slot_set_clock,</span><br><span> .set_params = iso_fsm_slot_set_params,</span><br><span> .set_rate_and_clock = iso_fsm_slot_set_rate_and_clock,</span><br><span style="color: hsl(120, 100%, 40%);">+ .handle_fsm_events = iso_handle_fsm_events,</span><br><span> };</span><br><span>diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c</span><br><span>index 034a7ac..a659fe4 100644</span><br><span>--- a/ccid_common/iso7816_fsm.c</span><br><span>+++ b/ccid_common/iso7816_fsm.c</span><br><span>@@ -238,6 +238,8 @@</span><br><span> osmo_fsm_inst_state_chg_ms(fi, ISO7816_S_WAIT_ATR,</span><br><span> fi_cycles2ms(fi, 40000), T_WAIT_ATR);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_POWER_UP_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case ISO7816_E_PPS_FAILED_IND:</span><br><span> msg = data;</span><br><span> /* notify user about PPS result */</span><br><span>@@ -877,7 +879,7 @@</span><br><span> msgb_reset(atp->rx_cmd);</span><br><span> </span><br><span> /* notify in case card got pulled out */</span><br><span style="color: hsl(0, 100%, 40%);">- if (atp->tx_cmd){</span><br><span style="color: hsl(120, 100%, 40%);">+ if (atp->tx_cmd && old_state != PPS_S_DONE){</span><br><span> osmo_fsm_inst_dispatch(fi->proc.parent,</span><br><span> ISO7816_E_PPS_FAILED_IND, atp->tx_cmd);</span><br><span> atp->tx_cmd = 0;</span><br><span>@@ -1100,7 +1102,7 @@</span><br><span> struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi);</span><br><span> </span><br><span> /* notify in case card got pulled out */</span><br><span style="color: hsl(0, 100%, 40%);">- if (tfp->tpdu){</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tfp->tpdu && old_state != TPDU_S_DONE){</span><br><span> osmo_fsm_inst_dispatch(fi->proc.parent, ISO7816_E_TPDU_FAILED_IND, tfp->tpdu);</span><br><span> tfp->tpdu = 0;</span><br><span> }</span><br><span>diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c</span><br><span>index 189d764..7ff9302 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -317,7 +317,7 @@</span><br><span> {</span><br><span> uint8_t statusbytes[2] = {0};</span><br><span> //struct msgb *msg = ccid_msgb_alloc();</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(64, "IRQ");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc(300,"IRQ");</span><br><span> struct ccid_rdr_to_pc_notify_slot_change *nsc = msgb_put(msg, sizeof(*nsc) + sizeof(statusbytes));</span><br><span> nsc->bMessageType = RDR_to_PC_NotifySlotChange;</span><br><span> </span><br><span>@@ -1240,6 +1240,9 @@</span><br><span> command_try_recv();</span><br><span> // poll_card_detect();</span><br><span> submit_next_irq();</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i = 0; i < usb_fs_descs.ccid.class.bMaxSlotIndex; i++){</span><br><span style="color: hsl(120, 100%, 40%);">+ g_ci.slot_ops->handle_fsm_events(&g_ci.slot[i], true);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> feed_ccid();</span><br><span> osmo_timers_update();</span><br><span> int qs = llist_count_at(&g_ccid_s.free_q);</span><br><span>@@ -1250,13 +1253,12 @@</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> if(qs < NUM_OUT_BUF)</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i= 0; i < qs-NUM_OUT_BUF; i++){</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i= 0; i < NUM_OUT_BUF-qs; i++){</span><br><span> struct msgb *msg = msgb_alloc(300,"ccid");</span><br><span> OSMO_ASSERT(msg);</span><br><span> /* return the message back to the queue of free message buffers */</span><br><span> llist_add_tail_at(&msg->list, &g_ccid_s.free_q);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16246">change 16246</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-ccid-firmware/+/16246"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If71a37dcaa5162c18d83e4b2a0cdae69574b92d9 </div>
<div style="display:none"> Gerrit-Change-Number: 16246 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>