<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15697">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">iso7816_fsm: Implement single-byte RX/TX<br><br>Change-Id: I31fb127e1cb2fda0856658a6511089c3d9e31c2a<br>---<br>M ccid_common/iso7816_fsm.c<br>1 file changed, 52 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c</span><br><span>index f20cbcd..e173030 100644</span><br><span>--- a/ccid_common/iso7816_fsm.c</span><br><span>+++ b/ccid_common/iso7816_fsm.c</span><br><span>@@ -779,8 +779,22 @@</span><br><span> * TPDU FSM</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* In this FSM weu use the msgb for the TPDU as follows:</span><br><span style="color: hsl(120, 100%, 40%);">+ * - 5-byte TPDU header is at msg->data</span><br><span style="color: hsl(120, 100%, 40%);">+ * - COMMAND TPDU:</span><br><span style="color: hsl(120, 100%, 40%);">+ * - command bytes are provided after the header at msg->l2h</span><br><span style="color: hsl(120, 100%, 40%);">+ * - in case of incremental transmission, l3h points to next to-be-transmitted byte</span><br><span style="color: hsl(120, 100%, 40%);">+ * - RESPONSE TPDU:</span><br><span style="color: hsl(120, 100%, 40%);">+ * - any response bytes are stored after the header at msg->l2h</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 inline struct osim_apdu_cmd_hdr *msgb_tpdu_hdr(struct msgb *msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return (struct osim_apdu_cmd_hdr *) msgb_data(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct tpdu_fsm_priv {</span><br><span> struct msgb *tpdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_command; /* is this a command TPDU (true) or a response (false) */</span><br><span> };</span><br><span> </span><br><span> /* type-safe method to obtain iso7816_3_priv from fi */</span><br><span>@@ -805,8 +819,14 @@</span><br><span> tfp->tpdu = (struct msgb *)data;</span><br><span> OSMO_ASSERT(msgb_length(tfp->tpdu) >= sizeof(*tpduh));</span><br><span> tfp->tpdu->l2h = msgb_data(tfp->tpdu) + sizeof(*tpduh);</span><br><span style="color: hsl(0, 100%, 40%);">- tpduh = msgb_data(tfp->tpdu);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_DEBUG, "Transmitting TPDU header %s via UART\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_l2len(tfp->tpdu)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tfp->is_command = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ tfp->tpdu->l3h = tfp->tpdu->l2h; /* next tx byte == first byte of body */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ tfp->is_command = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ tpduh = msgb_tpdu_hdr(tfp->tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_DEBUG, "Transmitting %s TPDU header %s via UART\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ tfp->is_command ? "COMMAND" : "RESPONSE",</span><br><span> osmo_hexdump_nospc((uint8_t *) tpduh, sizeof(*tpduh)));</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_TX_HDR, 0, 0);</span><br><span> card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh));</span><br><span>@@ -834,7 +854,7 @@</span><br><span> static void tpdu_s_procedure_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- struct osim_apdu_cmd_hdr *tpduh = msgb_data(tfp->tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osim_apdu_cmd_hdr *tpduh = msgb_tpdu_hdr(tfp->tpdu);</span><br><span> struct osmo_fsm_inst *parent_fi = fi->proc.parent;</span><br><span> struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi);</span><br><span> uint8_t byte;</span><br><span>@@ -853,7 +873,7 @@</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_SW2, 0, 0);</span><br><span> break;</span><br><span> } else if (byte == tpduh->ins) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (msgb_l2len(tfp->tpdu)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tfp->is_command) {</span><br><span> /* transmit all remaining bytes */</span><br><span> card_uart_tx(ip->uart, msgb_l2(tfp->tpdu), msgb_l2len(tfp->tpdu));</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_TX_REMAINING, 0, 0);</span><br><span>@@ -862,10 +882,15 @@</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_RX_REMAINING, 0, 0);</span><br><span> }</span><br><span> } else if (byte == (tpduh->ins ^ 0xFF)) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_panic("unsupported single-byte T=0 case");</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: transmit single byte then wait for proc */</span><br><span style="color: hsl(0, 100%, 40%);">- //osmo_fsm_inst_state_chg(fi, TPDU_S_xX_SINGLE, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- //osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* transmit/recieve single byte then wait for proc */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tfp->is_command) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* transmit *next*, not first byte */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msgb_l3len(tfp->tpdu) >= 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_tx(ip->uart, msgb_l3(tfp->tpdu), 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, TPDU_S_TX_SINGLE, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, TPDU_S_RX_SINGLE, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else</span><br><span> OSMO_ASSERT(0);</span><br><span> break;</span><br><span>@@ -893,10 +918,15 @@</span><br><span> /* UART is transmitting single byte of data; we wait for ISO7816_E_TX_COMPL */</span><br><span> static void tpdu_s_tx_single_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (event) {</span><br><span> case ISO7816_E_TX_COMPL:</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: increase pointer/counter? */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ tfp->tpdu->l3h += 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_l3len(tfp->tpdu))</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, TPDU_S_SW1, 0, 0);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>@@ -907,7 +937,7 @@</span><br><span> static void tpdu_s_rx_remaining_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- struct osim_apdu_cmd_hdr *tpduh = msgb_data(tfp->tpdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osim_apdu_cmd_hdr *tpduh = msgb_tpdu_hdr(tfp->tpdu);</span><br><span> struct osmo_fsm_inst *parent_fi = fi->proc.parent;</span><br><span> struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi);</span><br><span> int rc;</span><br><span>@@ -916,8 +946,12 @@</span><br><span> case ISO7816_E_RX_COMPL:</span><br><span> /* retrieve pending byte(s) */</span><br><span> rc = card_uart_rx(ip->uart, msgb_l2(tfp->tpdu), tpduh->p3);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != tpduh->p3)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_ERROR, "expected %u bytes; read %d\n", tpduh->p3, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put(tfp->tpdu, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_l2len(tfp->tpdu) != tpduh->p3) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "expected %u bytes; read %d\n", tpduh->p3,</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_l2len(tfp->tpdu));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> card_uart_set_rx_threshold(ip->uart, 1);</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_SW1, 0, 0);</span><br><span> break;</span><br><span>@@ -930,17 +964,18 @@</span><br><span> static void tpdu_s_rx_single_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osim_apdu_cmd_hdr *tpduh = msgb_tpdu_hdr(tfp->tpdu);</span><br><span> uint8_t byte;</span><br><span> </span><br><span> switch (event) {</span><br><span> case ISO7816_E_RX_SINGLE:</span><br><span> byte = get_rx_byte_evt(fi->proc.parent, data);</span><br><span> LOGPFSML(fi, LOGL_DEBUG, "Received 0x%02x from UART\n", byte);</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: record byte */</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: determine if number of expected bytes received */</span><br><span style="color: hsl(0, 100%, 40%);">- if (0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(tfp->tpdu, byte);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* determine if number of expected bytes received */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_l2len(tfp->tpdu) == tpduh->p3)</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_SW1, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0);</span><br><span> break;</span><br><span> default:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15697">change 15697</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/+/15697"/><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: I31fb127e1cb2fda0856658a6511089c3d9e31c2a </div>
<div style="display:none"> Gerrit-Change-Number: 15697 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>