laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27001 )

Change subject: simtrace2-cardem-pcsc: Detect card power-up without RESET ......................................................................

simtrace2-cardem-pcsc: Detect card power-up without RESET

In some readers (at least CardMan 3121), the simtrace2-cardem firmware claims there are power-up sequences where RESET is released before VCC becomes active. Let's detect such spec-incompliant power-up sequences and use them to trigger a cold reset of the card.

Change-Id: I682ac3d0c2b98749a6ed44f9a73e4b39354a4284 Closes: OS#5421 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 23 insertions(+), 5 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8a3b234..0eaf2c3 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -74,22 +74,40 @@

static uint32_t last_status_flags = 0;

+#define NO_RESET 0 +#define COLD_RESET 1 +#define WARM_RESET 2 + static void update_status_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) { struct osim_card_hdl *card = ci->chan->card; + int reset = NO_RESET;

+ /* check if card is _now_ operational: VCC+CLK present, RST absent */ if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) && !(flags & CEMU_STATUS_F_RESET_ACTIVE)) { if (last_status_flags & CEMU_STATUS_F_RESET_ACTIVE) { /* a reset has just ended, forward it to the real card */ - bool cold_reset = true; if (last_status_flags & CEMU_STATUS_F_VCC_PRESENT) - cold_reset = false; - LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", - cold_reset ? "Cold" : "Warm"); - osim_card_reset(card, cold_reset); + reset = WARM_RESET; + else + reset = COLD_RESET; + } else if (!(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) { + /* power-up has just happened, perform cold reset */ + reset = COLD_RESET; } + } else if (flags == CEMU_STATUS_F_VCC_PRESENT && + !(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) { + /* improper power-up: Only power enabled, but no reset active. */ + reset = COLD_RESET; } + + if (reset) { + LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", + reset == COLD_RESET ? "Cold" : "Warm"); + osim_card_reset(card, reset == COLD_RESET ? true : false); + } + last_status_flags = flags; }