November 2022 - gerrit-log - lists.osmocom.org

Change in simtrace2[master]: firmware/sniffer: Fix programming error in PPS

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30181 ) Change subject: firmware/sniffer: Fix programming error in PPS ...................................................................... firmware/sniffer: Fix programming error in PPS process_byte_pps() would never enter the error path in which the first byte would be != 0xff. However, the caller already verified this before calling process_byte_pps() so the error path should never be hit anyway. Change-Id: Ia74b6338219a6965e6bd35a6efcf369890e02d81 --- M firmware/libcommon/source/sniffer.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index cbfa7c9..da5d743 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -595,7 +595,7 @@ switch (pps_state) { /* see ISO/IEC 7816-3:2006 section 9.2 */ case PPS_S_WAIT_PPSS: /*!< initial byte */ flags = 0; - if (0xff) { + if (byte == 0xff) { pps_cur[0] = byte; pps_state = PPS_S_WAIT_PPS0; /* go to next state */ } else { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia74b6338219a6965e6bd35a6efcf369890e02d81 Gerrit-Change-Number: 30181 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: refactor setting TPDU state

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30178 ) Change subject: firmware/sniffer: refactor setting TPDU state ...................................................................... firmware/sniffer: refactor setting TPDU state In low-level debugging it might be useful to trace the TPDU state changes, so let's factor-out the state-setting as a function that can be amended with printf() or GPIO toggles or the like. No logical change is introduced here, just assignments replaced with calling a function that does the assignment. compiler should inline that. Change-Id: Ie61321404f3686234c61c68a07d6cb9f5830ddc1 --- M firmware/libcommon/source/sniffer.c 1 file changed, 21 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 13ef506..1647e17 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -255,6 +255,15 @@ usb_buf_submit(usb_msg); } +/*! Update the TPDU state + * @param[in] tpdu_state_new new TPDU state to update to + */ +static void change_tpdu_state(enum tpdu_sniff_state tpdu_state_new) +{ + //TRACE_ERROR("TPDU state %u->%u\n\r", tpdu_state, tpdu_state_new); + tpdu_state = tpdu_state_new; +} + /*! Update the ISO 7816-3 state * @param[in] iso_state_new new ISO 7816-3 state to update to */ @@ -286,7 +295,7 @@ pps_state = PPS_S_WAIT_PPSS; break; case ISO7816_S_WAIT_TPDU: - tpdu_state = TPDU_S_CLA; + change_tpdu_state(TPDU_S_CLA); tpdu_packet_i = 0; break; default: @@ -714,7 +723,7 @@ } tpdu_packet_i = 0; tpdu_packet[tpdu_packet_i++] = byte; - tpdu_state = TPDU_S_INS; + change_tpdu_state(TPDU_S_INS); break; case TPDU_S_INS: if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { @@ -726,37 +735,37 @@ } tpdu_packet_i = 1; tpdu_packet[tpdu_packet_i++] = byte; - tpdu_state = TPDU_S_P1; + change_tpdu_state(TPDU_S_P1); break; case TPDU_S_P1: tpdu_packet_i = 2; tpdu_packet[tpdu_packet_i++] = byte; - tpdu_state = TPDU_S_P2; + change_tpdu_state(TPDU_S_P2); break; case TPDU_S_P2: tpdu_packet_i = 3; tpdu_packet[tpdu_packet_i++] = byte; - tpdu_state = TPDU_S_P3; + change_tpdu_state(TPDU_S_P3); break; case TPDU_S_P3: tpdu_packet_i = 4; tpdu_packet[tpdu_packet_i++] = byte; - tpdu_state = TPDU_S_PROCEDURE; + change_tpdu_state(TPDU_S_PROCEDURE); break; case TPDU_S_PROCEDURE: if (0x60 == byte) { /* wait for next procedure byte */ break; } else if (tpdu_packet[1] == byte) { /* get all remaining data bytes */ - tpdu_state = TPDU_S_DATA_REMAINING; + change_tpdu_state(TPDU_S_DATA_REMAINING); break; } else if ((~tpdu_packet[1]) == byte) { /* get single data byte */ - tpdu_state = TPDU_S_DATA_SINGLE; + change_tpdu_state(TPDU_S_DATA_SINGLE); break; } case TPDU_S_SW1: if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { /* this procedure byte is SW1 */ tpdu_packet[tpdu_packet_i++] = byte; - tpdu_state = TPDU_S_SW2; + change_tpdu_state(TPDU_S_SW2); } else { TRACE_WARNING("invalid SW1 0x%02x\n\r", byte); led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ @@ -775,15 +784,15 @@ tpdu_packet[tpdu_packet_i++] = byte; if (0 == tpdu_packet[4]) { if (5+256 <= tpdu_packet_i) { - tpdu_state = TPDU_S_PROCEDURE; + change_tpdu_state(TPDU_S_PROCEDURE); } } else { if (5+tpdu_packet[4] <= tpdu_packet_i) { - tpdu_state = TPDU_S_PROCEDURE; + change_tpdu_state(TPDU_S_PROCEDURE); } } if (TPDU_S_DATA_SINGLE == tpdu_state) { - tpdu_state = TPDU_S_PROCEDURE; + change_tpdu_state(TPDU_S_PROCEDURE); } break; default: -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie61321404f3686234c61c68a07d6cb9f5830ddc1 Gerrit-Change-Number: 30178 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Log old and new state in ISO7816-3 state changes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30179 ) Change subject: firmware/sniffer: Log old and new state in ISO7816-3 state changes ...................................................................... firmware/sniffer: Log old and new state in ISO7816-3 state changes Change-Id: Iddb460cc2ad02c11a74de10dab127bb14cee9605 --- M firmware/libcommon/source/sniffer.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 1647e17..e3b7fbb 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -302,9 +302,10 @@ break; } + TRACE_INFO("ISO 7816-3 state %u->%u\n\r", iso_state, iso_state_new); + /* save new state */ iso_state = iso_state_new; - TRACE_INFO("Changed to ISO 7816-3 state %u\n\r", iso_state); } const struct value_string data_flags[] = { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iddb460cc2ad02c11a74de10dab127bb14cee9605 Gerrit-Change-Number: 30179 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Log parity errors, just like overruns and framing e...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30176 ) Change subject: firmware/sniffer: Log parity errors, just like overruns and framing errors ...................................................................... firmware/sniffer: Log parity errors, just like overruns and framing errors Reading of code + datasheet showed that we did enable parity checking but never actually checked if the USART has the PARE bit in CSR set. Let's change that. Plus also avoid possible race conditions due to multiple status resets via US_CR_RSTSTA. Let's only reset that once per interrupt handler. TODO: actually do something useful at that point. We currently don't report those to the host, nor do we attempt to recover in any way. The data sheet also doesn't tell us what it actually does in such situations; it appears the character is *not* returned from the USART, so we're missing one byte in the stream at that point. Change-Id: I5f012d86c61a2377d355396e7b95d078952bee7c Related: OS#5464 --- M firmware/libcommon/source/sniffer.c 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 86dfd3a..13ef506 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -800,14 +800,14 @@ /* Read channel status register */ uint32_t csr = sniff_usart.base->US_CSR; /* Verify if there was an error */ - if (csr & US_CSR_OVRE) { - TRACE_WARNING("USART overrun error\n\r"); + if (csr & US_CSR_OVRE) + TRACE_ERROR("USART overrun error\n\r"); + if (csr & US_CSR_FRAME) + TRACE_ERROR("USART framing error\n\r"); + if (csr & US_CSR_PARE) + TRACE_ERROR("USART parity error\n\r"); + if (csr & (US_CSR_OVRE|US_CSR_FRAME|US_CSR_PARE)) sniff_usart.base->US_CR |= US_CR_RSTSTA; - } - if (csr & US_CSR_FRAME) { - TRACE_WARNING("USART framing error\n\r"); - sniff_usart.base->US_CR |= US_CR_RSTSTA; - } /* Verify if character has been received */ if (csr & US_CSR_RXRDY) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5f012d86c61a2377d355396e7b95d078952bee7c Gerrit-Change-Number: 30176 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Enable interrupts for overrun/parity/frame errors

by laforge

Attention is currently required from: tsaitgaist. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30200 ) Change subject: firmware/sniffer: Enable interrupts for overrun/parity/frame errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia27f537706b9a6252dd18175545c6f27a7d17d0e Gerrit-Change-Number: 30200 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Attention: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Nov 2022 09:02:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: introduce #define for interrupt enable flags

by laforge

Attention is currently required from: tsaitgaist. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30199 ) Change subject: firmware/sniffer: introduce #define for interrupt enable flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id4bc720a1db31b4433ff7b10d7a57d0ddb7d7180 Gerrit-Change-Number: 30199 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Attention: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Nov 2022 09:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Handle WT timeouts via ring-buffer

by laforge

Attention is currently required from: tsaitgaist. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30198 ) Change subject: firmware/sniffer: Handle WT timeouts via ring-buffer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4434c6fcd59d1a425e9ded734bbc8b0411a0a0d8 Gerrit-Change-Number: 30198 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Attention: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Nov 2022 09:02:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Pass PARITY/OVERRUN/FRAMING error via ringbuffer

by laforge

Attention is currently required from: tsaitgaist. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30193 ) Change subject: firmware/sniffer: Pass PARITY/OVERRUN/FRAMING error via ringbuffer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iebd9bbc97c2a5a0c402e7a2711520299a1ade568 Gerrit-Change-Number: 30193 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Attention: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Nov 2022 09:02:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Add + use 16bit ringbuffer

by laforge

Attention is currently required from: tsaitgaist. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30192 ) Change subject: firmware/sniffer: Add + use 16bit ringbuffer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ifde054fbfe7f753b61e7d3409c56eca6e0faeb4b Gerrit-Change-Number: 30192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Attention: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Nov 2022 09:02:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: firmware/sniffer: Disable TIMEOUT interrupts in USART IER on exit

by laforge

Attention is currently required from: tsaitgaist. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30189 ) Change subject: firmware/sniffer: Disable TIMEOUT interrupts in USART IER on exit ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I92e16a160d60fcab33c81e0cf074088b9f20b9ae Gerrit-Change-Number: 30189 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Attention: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Nov 2022 09:02:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022