- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: global_platform/scp: refactor _wrap_cmd_apdu
by fixeria 12 Nov '24

12 Nov '24

Attention is currently required from: dexter. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38635?usp=email ) Change subject: global_platform/scp: refactor _wrap_cmd_apdu ...................................................................... Patch Set 1: (2 comments) File pySim/global_platform/scp.py: https://gerrit.osmocom.org/c/pysim/+/38635/comment/7d232cc8_2bd6f256?usp=em… : PS1, Line 279: if self.do_cmac: Adding another indention level does not make functions more readable either... Maybe do an early return? ``` if not self.do_cmac: return apdu ``` https://gerrit.osmocom.org/c/pysim/+/38635/comment/f6535e88_3a633a76?usp=em… : PS1, Line 482: if self.do_cmac: Likewise, maybe do an early return? ``` if not self.do_cmac: return apdu ``` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38635?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4c5650337779a4bd1f98673650c6c3cb526d518b Gerrit-Change-Number: 38635 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 19:02:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()
by fixeria 12 Nov '24

12 Nov '24

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmocom-bb/+/38740/comment/da1daa83_fbfba213?u… : PS1, Line 86: /* TDMA frame number of burst 'f' is used as the table index. */ > Done >> Maybe add "(last)" here and "(first)" below? > > Ack, it does not hurt to clarify things a bit. In a separate patch though. See https://gerrit.osmocom.org/c/osmocom-bb/+/38744. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 18:54:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git
by fixeria 12 Nov '24

12 Nov '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38743?usp=email ) Change subject: trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git ...................................................................... trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git This explains burst processing on full-/half-rate traffic channels. Change-Id: I3582d6f6e489a345ba8fc6580f6bb29da630fc8e --- A src/host/trxcon/doc/l1sched_tch.txt 1 file changed, 98 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/43/38743/1 diff --git a/src/host/trxcon/doc/l1sched_tch.txt b/src/host/trxcon/doc/l1sched_tch.txt new file mode 100644 index 0000000..f8c79ff --- /dev/null +++ b/src/host/trxcon/doc/l1sched_tch.txt @@ -0,0 +1,98 @@ +== rx_tchf_fn(): TCH/FS, TCH/EFS, TCH/AFS, TCH/F2.4, and FACCH/F + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | | | | | a | b | c | d | Rx bid={0,1,2,3}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | Rx bid={0,1,2,3}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 + | + |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchf_fn(): TCH/F14.4, TCH/F9.6, TCH/F4.8 + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | | | | | a | b | c | d | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | w | x | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| +|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A +| |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B +@ decoding from here + + +== rx_tchh_fn(): TCH/HS, TCH/AHS + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 + | + |<~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchh_fn(): FACCH/H + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1} ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 + | + |<~~~~~~~~~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchh_fn(): TCH/H4.8, TCH/H2.4 + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| +|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A +| |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B +@ decoding from here -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38743?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3582d6f6e489a345ba8fc6580f6bb29da630fc8e Gerrit-Change-Number: 38743 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: clarify TDMA Fn (mod 26) maps
by fixeria 12 Nov '24

12 Nov '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email ) Change subject: trxcon/l1sched: clarify TDMA Fn (mod 26) maps ...................................................................... trxcon/l1sched: clarify TDMA Fn (mod 26) maps * Clarify comments, fix 3GPP spec. references * Remove burst tables, refer to doc/l1sched_tch.txt * Rename mappings: include burst letter Change-Id: Ib664ba643073e7673aa86aa860a1649225c19aa1 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 45 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/44/38744/1 diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 985bea4..598203a 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -47,22 +47,19 @@ #define BUFPOS(buf, n) &buf[(n) * BPLEN] #define BUFTAIL8(buf) BUFPOS(buf, (BUFMAX - 8)) -/* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Downlink TCH/F. - * - * +---+---+---+---+---+---+---+---+ - * | a | b | c | d | e | f | g | h | Burst 'a' received first - * +---+---+---+---+---+---+---+---+ - * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Speech/FACCH frame (bursts 'a' .. 'h') - * - * TDMA frame number of burst 'h' is always used as the table index. */ -static const uint8_t sched_tchf_dl_amr_cmi_map[26] = { +/* ------------------------------------------------------------------ + * 3GPP TS 45.009, table 3.2.1.3-1 + * "TDMA frames for Codec Mode Indication for TCH/AFS, TCH/WFS and O-TCH/WFS" */ + +/* TDMA frame number (mod 26) of burst 'h' (last) is the table index. */ +static const uint8_t sched_tchf_dl_amr_cmi_h_map[26] = { [11] = 1, /* TCH/F: a=4 / h=11 */ [20] = 1, /* TCH/F: a=13 / h=20 */ [3] = 1, /* TCH/F: a=21 / h=3 (21+7=28, 25 is idle -> 29. 29%26=3) */ }; -/* TDMA frame number of burst 'a' should be used as the table index. */ -static const uint8_t sched_tchf_ul_amr_cmi_map[26] = { +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchf_ul_amr_cmi_a_map[26] = { [0] = 1, /* TCH/F: a=0 */ [8] = 1, /* TCH/F: a=8 */ [17] = 1, /* TCH/F: a=17 */ @@ -166,7 +163,7 @@ * know this before we actually decode the frame) */ amr = 2; rc = gsm0503_tch_afs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), - !sched_tchf_dl_amr_cmi_map[bi->fn % 26], + !sched_tchf_dl_amr_cmi_h_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, &lchan->amr.dl_ft, @@ -304,7 +301,7 @@ break; case GSM48_CMODE_SPEECH_AMR: { - bool amr_fn_is_cmr = !sched_tchf_ul_amr_cmi_map[br->fn % 26]; + bool amr_fn_is_cmr = !sched_tchf_ul_amr_cmi_a_map[br->fn % 26]; unsigned int offset = 0; if (msg != NULL && msg != msg_facch) { /* TCH/AFS: speech */ diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index a158bef..359ab37 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -50,16 +50,16 @@ #define BUFPOS(buf, n) &buf[(n) * BPLEN] #define BUFTAIL8(buf) BUFPOS(buf, (BUFMAX - 8)) -/* 3GPP TS 45.009, table 3.2.1.3-{2,4}: AMR on Downlink TCH/H. - * - * +---+---+---+---+---+---+ - * | a | b | c | d | e | f | Burst 'a' received first - * +---+---+---+---+---+---+ - * ^^^^^^^^^^^^^^^^^^^^^^^ FACCH frame (bursts 'a' .. 'f') - * ^^^^^^^^^^^^^^^ Speech frame (bursts 'a' .. 'd') - * - * TDMA frame number of burst 'f' is always used as the table index. */ -static const uint8_t sched_tchh_dl_amr_cmi_map[26] = { +/* ------------------------------------------------------------------ + * 3GPP TS 45.009, table 3.2.1.3-2 + * "TDMA frames for Codec Mode Indication for TCH/AHS, O-TCH/AHS and O-TCH/WHS" + * These mappings are valid for both TCH/H(0) and TCH/H(1). */ + +/* TDMA frame number (mod 26) of burst 'f' (see below) is the table index. + * Even though a TCH/AHS block is interleaved over 4 bursts ('a' .. 'd'), + * we need to "think" 2 TDMA slots ahead because of the way we put bursts + * to the DL buffer (see doc/l1sched_tch.txt). */ +static const uint8_t sched_tchh_dl_amr_cmi_f_map[26] = { [15] = 1, /* TCH/H(0): a=4 / d=10 / f=15 */ [23] = 1, /* TCH/H(0): a=13 / d=19 / f=23 */ [6] = 1, /* TCH/H(0): a=21 / d=2 / f=6 */ @@ -69,8 +69,8 @@ [7] = 1, /* TCH/H(1): a=22 / d=3 / f=7 */ }; -/* TDMA frame number of burst 'a' is always used as the table index. */ -static const uint8_t sched_tchh_ul_amr_cmi_map[26] = { +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchh_ul_amr_cmi_a_map[26] = { [0] = 1, /* TCH/H(0): a=0 */ [8] = 1, /* TCH/H(0): a=8 */ [17] = 1, /* TCH/H(0): a=17 */ @@ -80,10 +80,11 @@ [18] = 1, /* TCH/H(1): a=18 */ }; -/* FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). +/* ------------------------------------------------------------------ + * FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). * These mappings are valid for both FACCH/H(0) and FACCH/H(1). */ -/* TDMA frame number of burst 'f' is used as the table index. */ +/* TDMA frame number (mod 26) of burst 'f' (last) is the table index. */ static const uint8_t sched_tchh_dl_facch_f_map[26] = { [15] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [16] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ @@ -93,7 +94,7 @@ [7] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ }; -/* TDMA frame number of burst 'a' is used as the table index. */ +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ static const uint8_t sched_tchh_dl_facch_a_map[26] = { [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ @@ -103,8 +104,8 @@ [22] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ }; -/* TDMA frame number of burst 'a' is used as the table index. */ -static const uint8_t sched_tchh_ul_facch_map[26] = { +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchh_ul_facch_a_map[26] = { [0] = 1, /* FACCH/H(0): B0(0,2,4,6,8,10) */ [1] = 1, /* FACCH/H(1): B0(1,3,5,7,9,11) */ [8] = 1, /* FACCH/H(0): B1(8,10,13,15,17,19) */ @@ -113,22 +114,12 @@ [18] = 1, /* FACCH/H(1): B2(18,20,22,24,1,3) */ }; -/* 3GPP TS 45.002, table 2 in clause 7: Mapping tables for TCH/H2.4 and TCH/H4.8. - * - * +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ - * | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | - * +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ - * - * TCH/H(0): B0(0,2,4,6,8,10,13,15,17,19,21,23,0,2,4,6,8,10,13,15,17,19) - * TCH/H(1): B0(1,3,5,7,9,11,14,16,18,20,22,24,1,3,5,7,9,11,14,16,18,20) - * TCH/H(0): B1(8,10,13,15,17,19,21,23,0,2,4,6,8,10,13,15,17,19,21,23,0,2) - * TCH/H(1): B1(9,11,14,16,18,20,22,24,1,3,5,7,9,11,14,16,18,20,22,24,1,3) - * TCH/H(0): B2(17,19,21,23,0,2,4,6,8,10,13,15,17,19,21,23,0,2,4,6,8,10) - * TCH/H(1): B2(18,20,22,24,1,3,5,7,9,11,14,16,18,20,22,24,1,3,5,7,9,11) - * - * TDMA frame number of burst 'a' % 26 is the table index. - * This mapping is valid for both TCH/H(0) and TCH/H(1). */ -static const uint8_t sched_tchh_ul_csd_map[26] = { +/* ------------------------------------------------------------------ + * 3GPP TS 45.002, table 2 in clause 7: Mapping tables for TCH/H2.4 and TCH/H4.8. + * These mappings are valid for both TCH/H(0) and TCH/H(1). */ + +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchh_ul_csd_a_map[26] = { [0] = 1, /* TCH/H(0): B0(0 ... 19) */ [1] = 1, /* TCH/H(1): B0(1 ... 20) */ [8] = 1, /* TCH/H(0): B1(8 ... 2) */ @@ -137,9 +128,8 @@ [18] = 1, /* TCH/H(1): B2(18 ... 11) */ }; -/* TDMA frame number of burst 'v' % 26 is the table index. - * This mapping is valid for both TCH/H(0) and TCH/H(1). */ -static const uint8_t sched_tchh_dl_csd_map[26] = { +/* TDMA frame number (mod 26) of burst 'v' (last) is the table index. */ +static const uint8_t sched_tchh_dl_csd_v_map[26] = { [19] = 1, /* TCH/H(0): B0(0 ... 19) */ [20] = 1, /* TCH/H(1): B0(1 ... 20) */ [2] = 1, /* TCH/H(0): B1(8 ... 2) */ @@ -265,7 +255,7 @@ amr = 2; rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), !sched_tchh_dl_facch_f_map[bi->fn % 26], - !sched_tchh_dl_amr_cmi_map[bi->fn % 26], + !sched_tchh_dl_amr_cmi_f_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, &lchan->amr.dl_ft, @@ -294,7 +284,7 @@ /* FACCH/H does not steal TCH/H4.8 frames, but only disturbs some bits */ if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); - if (!sched_tchh_dl_csd_map[bi->fn % 26]) + if (!sched_tchh_dl_csd_v_map[bi->fn % 26]) return 0; rc = gsm0503_tch_hr48_decode(&tch_data[0], BUFPOS(bursts_p, 0), &n_errors, &n_bits_total); @@ -304,7 +294,7 @@ /* FACCH/H does not steal TCH/H2.4 frames, but only disturbs some bits */ if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); - if (!sched_tchh_dl_csd_map[bi->fn % 26]) + if (!sched_tchh_dl_csd_v_map[bi->fn % 26]) return 0; rc = gsm0503_tch_hr24_decode(&tch_data[0], BUFPOS(bursts_p, 0), &n_errors, &n_bits_total); @@ -373,12 +363,12 @@ /* Align transmission of the first frame */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - if (!sched_tchh_ul_facch_map[br->fn % 26]) + if (!sched_tchh_ul_facch_a_map[br->fn % 26]) return 0; break; case GSM48_CMODE_DATA_6k0: case GSM48_CMODE_DATA_3k6: - if (!sched_tchh_ul_csd_map[br->fn % 26]) + if (!sched_tchh_ul_csd_a_map[br->fn % 26]) return 0; break; } @@ -400,14 +390,14 @@ case GSM48_CMODE_DATA_6k0: case GSM48_CMODE_DATA_3k6: /* CSD: skip dequeueing/encoding, send 2 more bursts */ - if (!sched_tchh_ul_csd_map[br->fn % 26]) + if (!sched_tchh_ul_csd_a_map[br->fn % 26]) goto send_burst; break; } /* dequeue a pair of TCH and FACCH frames */ msg_tch = l1sched_lchan_prim_dequeue_tch(lchan, false); - if (sched_tchh_ul_facch_map[br->fn % 26]) + if (sched_tchh_ul_facch_a_map[br->fn % 26]) msg_facch = l1sched_lchan_prim_dequeue_tch(lchan, true); else msg_facch = NULL; @@ -417,7 +407,7 @@ /* populate the buffer with bursts */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - if (!sched_tchh_ul_facch_map[br->fn % 26]) + if (!sched_tchh_ul_facch_a_map[br->fn % 26]) goto send_burst; /* XXX: should not happen */ if (msg == NULL) msg = l1sched_lchan_prim_dummy_lapdm(lchan); @@ -439,7 +429,7 @@ break; case GSM48_CMODE_SPEECH_AMR: { - bool amr_fn_is_cmr = !sched_tchh_ul_amr_cmi_map[br->fn % 26]; + bool amr_fn_is_cmr = !sched_tchh_ul_amr_cmi_a_map[br->fn % 26]; unsigned int offset = 0; if (msg != NULL && msg != msg_facch) { /* TCH/AHS: speech */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib664ba643073e7673aa86aa860a1649225c19aa1 Gerrit-Change-Number: 38744 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in upf-benchmark[master]: testsuites: eupf: run with GIN_MODE=release
by pespin 12 Nov '24

12 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38742?usp=email ) Change subject: testsuites: eupf: run with GIN_MODE=release ...................................................................... testsuites: eupf: run with GIN_MODE=release The output of eupf said it was using debug mode and that release mode should be used in production. Change-Id: Ic5afa6865c708960210e5251f20e9328947cd5b7 --- M testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh M testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/42/38742/1 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh index a4951e9..9dda226 100755 --- a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh +++ b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh @@ -2,7 +2,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -sudo osmo-upf -c "$SCRIPT_DIR/osmo-upf.cfg" +sudo GIN_MODE=release osmo-upf -c "$SCRIPT_DIR/osmo-upf.cfg" # TODO: Route needs to be set up manually on the tun iface once it becomes created, since osmo-upf is not yet doing it (OS#6585). # For now, run this manually after starting osmo-upf with the current run.sh script: diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh index 1532b76..26a1931 100755 --- a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh +++ b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/run.sh @@ -2,4 +2,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -sudo eupf --config "$SCRIPT_DIR/eupf.yaml" +sudo GIN_MODE=release eupf --config "$SCRIPT_DIR/eupf.yaml" -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ic5afa6865c708960210e5251f20e9328947cd5b7 Gerrit-Change-Number: 38742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in upf-benchmark[master]: testsuites: eupf: Use xdp_attach_mode native
by pespin 12 Nov '24

12 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38741?usp=email ) Change subject: testsuites: eupf: Use xdp_attach_mode native ...................................................................... testsuites: eupf: Use xdp_attach_mode native This is preferred over the generic mode, since the mlx5 driver supports it and should provide better performance. Change-Id: Iaa048cdfed459942973314d626103689f22a4239 --- M testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml M testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/41/38741/1 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml index 5f1efac..924328c 100644 --- a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml +++ b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/eupf.yaml @@ -1,5 +1,5 @@ interface_name: [enp2s0f0np0, enp2s0f1np1] -xdp_attach_mode: generic +xdp_attach_mode: native api_address: :8080 pfcp_address: 172.16.31.2:8805 pfcp_node_id: 172.16.31.2 diff --git a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml index 5f1efac..924328c 100644 --- a/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml +++ b/testsuites/gtplab-sysmo2017/tunmap/upf/eupf/eupf.yaml @@ -1,5 +1,5 @@ interface_name: [enp2s0f0np0, enp2s0f1np1] -xdp_attach_mode: generic +xdp_attach_mode: native api_address: :8080 pfcp_address: 172.16.31.2:8805 pfcp_node_id: 172.16.31.2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Iaa048cdfed459942973314d626103689f22a4239 Gerrit-Change-Number: 38741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()
by pespin 12 Nov '24

12 Nov '24

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/host/trxcon/src/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmocom-bb/+/38740/comment/4b70f3fb_a7264e99?u… : PS1, Line 86: /* TDMA frame number of burst 'f' is used as the table index. */ > > so you are numbering the bursts a,b,c,d,e,f? […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 18:35:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()
by fixeria 12 Nov '24

12 Nov '24

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmocom-bb/+/38740/comment/92040570_bba94c13?u… : PS1, Line 86: /* TDMA frame number of burst 'f' is used as the table index. */ > so you are numbering the bursts a,b,c,d,e,f? Yes, see the comment above illustrating burst placement in the buffer. > Is that specified like that somewhere? Not that I am aware of. > Maybe add "(last)" here and "(first)" below? Ack, it does not hurt to clarify things a bit. In a separate patch though. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 18:34:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()
by pespin 12 Nov '24

12 Nov '24

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmocom-bb/+/38740/comment/16a42d33_9df35e02?u… : PS1, Line 86: /* TDMA frame number of burst 'f' is used as the table index. */ so you are numbering the bursts a,b,c,d,e,f? Is that specified like that somewhere? otherwise I find it confusing tbh. Maybe add "(last)" here and "(first)" below? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 18:01:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()
by fixeria 12 Nov '24

12 Nov '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() In c15084a5 overlooked that in order to ensure alignment to the first FACCH/H block in rx_tchh_fn() we actually need to check if DL FACCH/H can start (not end!) at the current TDMA Fn. This means we cannot use the same mapping as we do below in that function; we need another one. This patch fixes multiple FACCH/H regressions in ttcn3-bts-test. Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Fixes: c15084a5 ("trxcon/l1sched: replace old API with sched_tchh_ul_facch_map[]") --- M src/host/trxcon/src/sched_lchan_tchh.c 1 file changed, 19 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/38740/1 diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index eff36fd..a158bef 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -81,9 +81,10 @@ }; /* FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). - * These mappings are valid for both FACCH/H(0) and FACCH/H(1). - * TDMA frame number of burst 'f' is used as the table index. */ -static const uint8_t sched_tchh_dl_facch_map[26] = { + * These mappings are valid for both FACCH/H(0) and FACCH/H(1). */ + +/* TDMA frame number of burst 'f' is used as the table index. */ +static const uint8_t sched_tchh_dl_facch_f_map[26] = { [15] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [16] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ [23] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ @@ -93,6 +94,16 @@ }; /* TDMA frame number of burst 'a' is used as the table index. */ +static const uint8_t sched_tchh_dl_facch_a_map[26] = { + [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ + [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ + [13] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ + [14] = 1, /* FACCH/H(1): B1(14,16,18,20,22,24) */ + [21] = 1, /* FACCH/H(0): B2(21,23,0,2,4,6) */ + [22] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ +}; + +/* TDMA frame number of burst 'a' is used as the table index. */ static const uint8_t sched_tchh_ul_facch_map[26] = { [0] = 1, /* FACCH/H(0): B0(0,2,4,6,8,10) */ [1] = 1, /* FACCH/H(1): B0(1,3,5,7,9,11) */ @@ -189,7 +200,7 @@ /* Align reception of the first FACCH/H frame */ if (lchan->tch_mode == GSM48_CMODE_SIGN) { - if (!sched_tchh_dl_facch_map[bi->fn % 26]) + if (!sched_tchh_dl_facch_a_map[bi->fn % 26]) return 0; } } @@ -246,14 +257,14 @@ case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* HR */ rc = gsm0503_tch_hr_decode(&tch_data[0], BUFTAIL8(bursts_p), - !sched_tchh_dl_facch_map[bi->fn % 26], + !sched_tchh_dl_facch_f_map[bi->fn % 26], &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ /* See comment in function rx_tchf_fn() */ amr = 2; rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), - !sched_tchh_dl_facch_map[bi->fn % 26], + !sched_tchh_dl_facch_f_map[bi->fn % 26], !sched_tchh_dl_amr_cmi_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, @@ -281,7 +292,7 @@ /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: /* FACCH/H does not steal TCH/H4.8 frames, but only disturbs some bits */ - if (sched_tchh_dl_facch_map[bi->fn % 26]) + if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); if (!sched_tchh_dl_csd_map[bi->fn % 26]) return 0; @@ -291,7 +302,7 @@ /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: /* FACCH/H does not steal TCH/H2.4 frames, but only disturbs some bits */ - if (sched_tchh_dl_facch_map[bi->fn % 26]) + if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); if (!sched_tchh_dl_csd_map[bi->fn % 26]) return 0; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log