sim-card
/
osmo-ccid-firmware
mirror of https://gerrit.osmocom.org/osmo-ccid-firmware
10
0
Fork 0
Code Issues Releases Wiki Activity

ccid/7816 fsm: better pps error handling 

This requires a bit of inline explanation because it was not entirely straightforward,
 and there were some unused states that can now be removed to make it more concise.

Change-Id: Id138a600dbe2dd1b8d153b764f73d65e2fd444dd
This commit is contained in:
Eric Wild 2020-11-11 21:18:15 +01:00 committed by Hoernchen
parent 9a6e8ceea1
commit 6b1f1c4e95
3 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ccid_common/ccid_slot_fsm.c
View File

@ -265,19 +265,12 @@ static int iso_handle_fsm_events(struct ccid_slot *cs, bool enable){
cs->event = 0; cs->event = 0;
break; break;
case ISO7816_E_PPS_UNSUPPORTED_IND: case ISO7816_E_PPS_UNSUPPORTED_IND:
tpdu = data; /* unsupported means no response, failed means request/response mismatch
* yet both lead to a deactivation, and the host always gets a fi/di error
/* perform deactivation */ * 10 "FI - DI pair invalid or not supported" since that part of the
card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); * ccid setparameters is handled by the pps exchange
card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false); */
cs->icc_powered = false; /* fall-through */
/* failed comand */
resp = ccid_gen_parameters_t0(cs, ss->seq, CCID_CMD_STATUS_FAILED, 0);
ccid_slot_send_unbusy(cs, resp);
cs->event = 0;
break;
case ISO7816_E_PPS_FAILED_IND: case ISO7816_E_PPS_FAILED_IND:
tpdu = data; tpdu = data;
@ -389,7 +382,7 @@ static int iso_fsm_slot_set_params(struct ccid_slot *cs, uint8_t seq, enum ccid_
LOGPCS(cs, LOGL_DEBUG, "scheduling PPS transfer, PPS1: %2x\n", PPS1); LOGPCS(cs, LOGL_DEBUG, "scheduling PPS transfer, PPS1: %2x\n", PPS1);
/* pass PPS1 instead of msgb */ /* pass PPS1 instead of msgb */
osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_XCEIVE_PPS_CMD, PPS1); osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_XCEIVE_PPS_CMD, (void*)PPS1);
/* continues in iso_fsm_clot_user_cb once response/error/timeout is received */ /* continues in iso_fsm_clot_user_cb once response/error/timeout is received */
return 0; return 0;
} }

24
ccid_common/iso7816_fsm.c
View File

@ -311,17 +311,6 @@ static void iso7816_3_reset_action(struct osmo_fsm_inst *fi, uint32_t event, voi
break; break;
case ISO7816_E_POWER_UP_IND: case ISO7816_E_POWER_UP_IND:
break; break;
case ISO7816_E_PPS_UNSUPPORTED_IND:
case ISO7816_E_PPS_FAILED_IND:
msg = data;
/* notify user about PPS result */
ip->user_cb(fi, event, 0, msg);
break;
case ISO7816_E_TPDU_FAILED_IND:
msg = data;
/* hand finished TPDU to user */
ip->user_cb(fi, event, 0, msg);
break;
default: default:
OSMO_ASSERT(0); OSMO_ASSERT(0);
} }
@ -441,7 +430,7 @@ static void iso7816_3_allstate_action(struct osmo_fsm_inst *fi, uint32_t event,
ip->user_cb(fi, ISO7816_E_ATR_ERR_IND, 0, atp->atr); ip->user_cb(fi, ISO7816_E_ATR_ERR_IND, 0, atp->atr);
if(fi->state == ISO7816_S_WAIT_PPS_RSP || fi->state == ISO7816_S_IN_PPS_RSP) if(fi->state == ISO7816_S_WAIT_PPS_RSP || fi->state == ISO7816_S_IN_PPS_RSP)
ip->user_cb(fi, ISO7816_E_PPS_FAILED_IND, 0, ppp->tx_cmd); ip->user_cb(fi, ISO7816_E_PPS_UNSUPPORTED_IND, 0, ppp->tx_cmd);
if(fi->state == ISO7816_S_WAIT_TPDU || fi->state == ISO7816_S_IN_TPDU) if(fi->state == ISO7816_S_WAIT_TPDU || fi->state == ISO7816_S_IN_TPDU)
ip->user_cb(fi, ISO7816_E_TPDU_FAILED_IND, 0, tpdup->tpdu); ip->user_cb(fi, ISO7816_E_TPDU_FAILED_IND, 0, tpdup->tpdu);
@ -462,7 +451,7 @@ static void iso7816_3_allstate_action(struct osmo_fsm_inst *fi, uint32_t event,
break; break;
} }
if(fi->state == ISO7816_S_WAIT_PPS_RSP || fi->state == ISO7816_S_IN_PPS_RSP) if(fi->state == ISO7816_S_WAIT_PPS_RSP || fi->state == ISO7816_S_IN_PPS_RSP)
ip->user_cb(fi, ISO7816_E_PPS_FAILED_IND, 0, ppp->tx_cmd); ip->user_cb(fi, ISO7816_E_PPS_UNSUPPORTED_IND, 0, ppp->tx_cmd);
if(fi->state == ISO7816_S_WAIT_TPDU || fi->state == ISO7816_S_IN_TPDU) if(fi->state == ISO7816_S_WAIT_TPDU || fi->state == ISO7816_S_IN_TPDU)
ip->user_cb(fi, ISO7816_E_TPDU_FAILED_IND, 0, tpdup->tpdu); ip->user_cb(fi, ISO7816_E_TPDU_FAILED_IND, 0, tpdup->tpdu);
@ -516,7 +505,6 @@ static void iso7816_3_s_ins_pps_rsp_action(struct osmo_fsm_inst *fi, uint32_t ev
/* notify user about PPS result */ /* notify user about PPS result */
ip->user_cb(fi, event, 0, ppsrsp); ip->user_cb(fi, event, 0, ppsrsp);
break; break;
case ISO7816_E_PPS_UNSUPPORTED_IND:
case ISO7816_E_PPS_FAILED_IND: case ISO7816_E_PPS_FAILED_IND:
case ISO7816_E_RX_ERR_IND: case ISO7816_E_RX_ERR_IND:
/* error cases lead to slot reset */ /* error cases lead to slot reset */
@ -533,10 +521,7 @@ static const struct osmo_fsm_state iso7816_3_states[] = {
[ISO7816_S_RESET] = { [ISO7816_S_RESET] = {
.name = "RESET", .name = "RESET",
.in_event_mask = S(ISO7816_E_RESET_REL_IND) | .in_event_mask = S(ISO7816_E_RESET_REL_IND) |
S(ISO7816_E_POWER_UP_IND) | S(ISO7816_E_POWER_UP_IND),
S(ISO7816_E_PPS_FAILED_IND)|
S(ISO7816_E_PPS_UNSUPPORTED_IND)|
S(ISO7816_E_TPDU_FAILED_IND),
.out_state_mask = S(ISO7816_S_WAIT_ATR) | .out_state_mask = S(ISO7816_S_WAIT_ATR) |
S(ISO7816_S_RESET), S(ISO7816_S_RESET),
.action = iso7816_3_reset_action, .action = iso7816_3_reset_action,
@ -600,8 +585,7 @@ static const struct osmo_fsm_state iso7816_3_states[] = {
S(ISO7816_E_RX_COMPL) | S(ISO7816_E_RX_COMPL) |
S(ISO7816_E_RX_ERR_IND) | S(ISO7816_E_RX_ERR_IND) |
S(ISO7816_E_PPS_DONE_IND) | S(ISO7816_E_PPS_DONE_IND) |
S(ISO7816_E_PPS_FAILED_IND) | S(ISO7816_E_PPS_FAILED_IND),
S(ISO7816_E_PPS_UNSUPPORTED_IND),
.out_state_mask = S(ISO7816_S_RESET) | .out_state_mask = S(ISO7816_S_RESET) |
S(ISO7816_S_WAIT_TPDU) | S(ISO7816_S_WAIT_TPDU) |
S(ISO7816_S_IN_PPS_RSP), S(ISO7816_S_IN_PPS_RSP),

4
ccid_common/iso7816_fsm.h
View File

@ -41,8 +41,8 @@ enum iso7816_3_event {
/* TODO: PPS request */ /* TODO: PPS request */
ISO7816_E_XCEIVE_PPS_CMD, ISO7816_E_XCEIVE_PPS_CMD,
ISO7816_E_PPS_DONE_IND, ISO7816_E_PPS_DONE_IND,
ISO7816_E_PPS_FAILED_IND, ISO7816_E_PPS_FAILED_IND, /*!< card disagrees with parameters, but responds */
ISO7816_E_PPS_UNSUPPORTED_IND, ISO7816_E_PPS_UNSUPPORTED_IND, /*!< card does not respond to PPS */
/* TODO: Clock stop request */ /* TODO: Clock stop request */
/* TODO: Rx FIFO overrun */ /* TODO: Rx FIFO overrun */
/* TODO: Rx buffer overrun */ /* TODO: Rx buffer overrun */