June 2026 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ccid-firmware[master]: 7816fsm: reset stale cuart state on FSM RESET entry
by laforge 12 Jun '26

12 Jun '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42779?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: 7816fsm: reset stale cuart state on FSM RESET entry ...................................................................... 7816fsm: reset stale cuart state on FSM RESET entry Reset paths reached without power-cycling (WTIME_EXP, HW_ERR, CARD_REMOVAL during a warm reset) leave the cuart with stale tx_busy, rx_threshold and wtime_etu from the prior transaction. The next ATR then hits card_uart_tx tx_busy assertion, or the ATR receive stalls because the 33-byte ATR can never reach a multi-byte rx_threshold left from a TPDU. The new card_uart_tx_abort() clears tx_busy + rx_after_tx_compl + WT, without driving a synthetic TX_COMPLETE through the FSM. iso7816_3_reset_onenter is the right place to do this alongside rx_threshold=1 and wtime_etu=default, this mirrors what card_uart_ctrl(POWER_*=0) already does, but for the warm-reset paths that don't touch power. Change-Id: Iac8bd7f4f0eecccc9acce149277a4f5016fec7c1 --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c 4 files changed, 40 insertions(+), 0 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 22d3f70..fae2c3b 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -54,6 +54,8 @@ static struct iso_fsm_slot_instance g_si; +static void iso_fsm_slot_abort(struct ccid_slot *cs); + static struct iso_fsm_slot *ccid_slot2iso_fsm_slot(struct ccid_slot *cs) { OSMO_ASSERT(cs->slot_nr < ARRAY_SIZE(g_si.slot)); diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 737a392..bb47da4 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -167,6 +167,24 @@ return rc; } +/*! Abort any in-flight TX on the cuart side. + * + * Clears tx_busy and rx_after_tx_compl without driving CUART_E_TX_COMPLETE + * through the FSM. Use this when the layer above (the ISO 7816-3 FSM) has + * given up on the current transaction (e.g. WTIME / HW_ERR / CARD_REMOVAL) + * and is moving to reset state. Any in-flight hardware TX is no longer of + * interest to the FSM; if the driver-level DMA happens to complete later, + * the resulting TX_COMPLETE notification will see tx_busy already false + * and rx_after_tx_compl already false, so it won't spuriously re-enable + * the receiver. */ +void card_uart_tx_abort(struct card_uart *cuart) +{ + OSMO_ASSERT(cuart); + card_uart_wtime_stop(cuart); + cuart->tx_busy = false; + cuart->rx_after_tx_compl = false; +} + int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len, bool rx_after_complete) { OSMO_ASSERT(cuart); diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h index a9afc1d..a53dc18 100644 --- a/ccid_common/cuart.h +++ b/ccid_common/cuart.h @@ -153,6 +153,12 @@ /*! Schedule (asynchronous) transmit data via UART; optionally enable Rx after completion */ int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len, bool rx_after_complete); +/*! Abort any in-flight TX. Clears tx_busy + stops WT timer. Used by the + * ISO7816-3 FSM when transitioning to RESET, so subsequent transactions + * don't trip card_uart_tx's "TX already in flight" assertion on the stale + * tx_busy left behind by an aborted transfer. */ +void card_uart_tx_abort(struct card_uart *cuart); + /*! Schedule (asynchronous) receive data via UART (after CUART_E_RX_COMPLETE) */ int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len); diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index bad827a..2b3b41e 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -31,6 +31,7 @@ #include "logging.h" #include "cuart.h" +#include "iso7816_3.h" #include "iso7816_fsm.h" /* unionize to ensure at least properly aligned msgb struct */ @@ -312,7 +313,20 @@ struct iso7816_3_priv *ip = get_iso7816_3_priv(fi); OSMO_ASSERT(fi->fsm == &iso7816_3_fsm); + /* Bring the cuart back to its default per-transaction state, matching + * what card_uart_ctrl(CUART_CTL_POWER_*, 0) does, but without + * power-cycling (warm reset, HW_ERR, WTIME paths reach S_RESET without + * touching power). Any reset path could land here mid-transaction with + * stale state: tx_busy still set from an aborted TX, rx_threshold left + * at e.g. 256 from a multi-byte RX setup, wtime_etu still at a + * PPS-negotiated value rather than the ATR default. Leaving those + * stale breaks the next ATR (next card_uart_tx asserts; or ATR bytes + * pile up in the ringbuffer waiting for a threshold that ATR's max 33 + * bytes can never reach). */ card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, 0); + card_uart_tx_abort(ip->uart); + card_uart_set_rx_threshold(ip->uart, 1); + card_uart_ctrl(ip->uart, CUART_CTL_WTIME, ISO7816_3_DEFAULT_WT); /* go back to initial state in child FSMs */ osmo_fsm_inst_state_chg(ip->atr_fi, ATR_S_WAIT_TS, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Iac8bd7f4f0eecccc9acce149277a4f5016fec7c1 Gerrit-Change-Number: 42779 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ccid-firmware[master]: cuart: Fix waiting time to be per-byte instead of total timeout
by laforge 12 Jun '26

12 Jun '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42777?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cuart: Fix waiting time to be per-byte instead of total timeout ...................................................................... cuart: Fix waiting time to be per-byte instead of total timeout The previous code multiplied WT by the number of expected bytes, creating a total timeout proportional to the transfer size. This works fine for (currently unsupported) high baud rates, but it makes it look like the reader "freezes" at default rates due to the very long delay. Just reset it upon rx and do not multiply it so it behaves as expected. Closes:OS#7012 Change-Id: Ic00040b88e1b204db3f4f3edad09878aa28d35a1 --- M ccid_common/cuart.c M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index bb17c4b..737a392 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -63,8 +63,9 @@ int etu_in_us = get_etu_in_us(cuart) + 1; cuart->wtime_etu = cuart->wtime_etu ? cuart->wtime_etu : 1; - /* timeout is wtime * ETU * expected number of bytes */ - uint32_t usecs = etu_in_us * cuart->wtime_etu * cuart->current_wtime_byte; + /* ISO 7816-3 Section 10.2: WT is the max delay between consecutive + * characters, not a total transfer timeout. Restart on each byte. */ + uint32_t usecs = etu_in_us * cuart->wtime_etu; /* limit lower wait time to reasonable value */ if (usecs < 300000) diff --git a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c index 42c2110..8330523 100644 --- a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c +++ b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c @@ -32,6 +32,8 @@ int rc; OSMO_ASSERT(cuart); + card_uart_wtime_restart(cuart); + if (cuart->rx_threshold == 1) { /* bypass ringbuffer and report byte directly */ uint8_t rx[1]; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic00040b88e1b204db3f4f3edad09878aa28d35a1 Gerrit-Change-Number: 42777 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-ccid-firmware[master]: libosmo_emb: type-safe tearfree_u64_t wrapper for LDRD/STRD access
by Jenkins Builder 12 Jun '26

12 Jun '26

Attention is currently required from: Hoernchen, jolly, lynxis lazus. Jenkins Builder has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784?usp=email ) Change subject: libosmo_emb: type-safe tearfree_u64_t wrapper for LDRD/STRD access ...................................................................... Patch Set 2: (2 comments) File ccid_host/libosmo_emb.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784/comment/cd4a9b04_38… : PS2, Line 9: typedef struct { do not add new typedefs File sysmoOCTSIM/libosmo_emb.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784/comment/a1035e38_d4… : PS2, Line 19: typedef struct { do not add new typedefs -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I458bfaf53e27c51882c7a8c1326e51d12943b0bb Gerrit-Change-Number: 42784 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 12 Jun 2026 13:55:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-ccid-firmware[master]: libosmo_emb: type-safe tearfree_u64_t wrapper for LDRD/STRD access
by Jenkins Builder 12 Jun '26

12 Jun '26

Attention is currently required from: Hoernchen, jolly, lynxis lazus. Jenkins Builder has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784?usp=email ) Change subject: libosmo_emb: type-safe tearfree_u64_t wrapper for LDRD/STRD access ...................................................................... Patch Set 2: (2 comments) File ccid_host/libosmo_emb.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784/comment/6a9015ba_39… : PS2, Line 9: typedef struct { do not add new typedefs File sysmoOCTSIM/libosmo_emb.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784/comment/9203297a_89… : PS2, Line 19: typedef struct { do not add new typedefs -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42784?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I458bfaf53e27c51882c7a8c1326e51d12943b0bb Gerrit-Change-Number: 42784 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 12 Jun 2026 12:59:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: tcap-loadshare: add TC_tcap_loadshare_m3ua_to_ipa_udts
by laforge 12 Jun '26

12 Jun '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42824?usp=email ) Change subject: stp: tcap-loadshare: add TC_tcap_loadshare_m3ua_to_ipa_udts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I181b25aedfd70d156c08197d361560b6d055e65a Gerrit-Change-Number: 42824 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 12 Jun 2026 06:53:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: for TCAP loadshare: use NI == national
by laforge 12 Jun '26

12 Jun '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42825?usp=email ) Change subject: stp: for TCAP loadshare: use NI == national ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I51ef302ad72ff3c434fddb39006ce50106a5918f Gerrit-Change-Number: 42825 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 12 Jun 2026 06:53:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: for TCAP loadshare: use NI == national
by pespin 11 Jun '26

11 Jun '26

Attention is currently required from: laforge, lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42825?usp=email ) Change subject: stp: for TCAP loadshare: use NI == national ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > because International is encoded as 0 and we had this bug here which wasn't covered by tests: […] Ideally we should be using international and add a specific test to validate national, but since this only touched TCAP config file then I'm fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I51ef302ad72ff3c434fddb39006ce50106a5918f Gerrit-Change-Number: 42825 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 11 Jun 2026 20:20:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: CCID: Check response of reader with empty SIM carrier
by laforge 11 Jun '26

11 Jun '26

Attention is currently required from: jolly. laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42805?usp=email ) Change subject: CCID: Check response of reader with empty SIM carrier ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42805?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifebdcce8f9dd9a51de5a5cb6cf223041d5c38622 Gerrit-Change-Number: 42805 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 11 Jun 2026 13:10:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: CCID: Check if reader sends request TPDU with maximum size
by laforge 11 Jun '26

11 Jun '26

Attention is currently required from: jolly. laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42804?usp=email ) Change subject: CCID: Check if reader sends request TPDU with maximum size ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7c1cb52b578c19d6c0ec1493e45f6ed9c43735b4 Gerrit-Change-Number: 42804 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 11 Jun 2026 13:10:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SIMTRACE: Increase USB receive buffer size
by laforge 11 Jun '26

11 Jun '26

Attention is currently required from: jolly. laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42803?usp=email ) Change subject: SIMTRACE: Increase USB receive buffer size ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42803?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I05261b4a754b4892955d0b4e426bd32be261efa7 Gerrit-Change-Number: 42803 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 11 Jun 2026 13:10:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log June 2026