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

[XS] Change in osmocom-bb[master]: trxcon/fsm: handle_dch_est_req(): do not reset the scheduler
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41906?usp=email ) Change subject: trxcon/fsm: handle_dch_est_req(): do not reset the scheduler ...................................................................... trxcon/fsm: handle_dch_est_req(): do not reset the scheduler Calling l1sched_reset() results in resetting the UL SACCH cache, that may have been populated prior to sending L1CTL_DM_EST_REQ. Instead, do what the comment says - call l1sched_del_all_ts(). Change-Id: Iff03fa5b90ac1ec30b7937cea6bd09c6ececb5f6 Fixes: c6fe9c3f ("trxcon: trxcon_fsm: permit loop [P]DCH transitions") Related: 15877ba05 ("trxcon: allow populating global SACCH cache via L1CTL") Related: OS#6919 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/06/41906/1 diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 34ca21b..fa0584d 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -352,7 +352,7 @@ } /* Remove all active timeslots */ - l1sched_reset(trxcon->sched); + l1sched_del_all_ts(trxcon->sched); rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); if (rc) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41906?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: Iff03fa5b90ac1ec30b7937cea6bd09c6ececb5f6 Gerrit-Change-Number: 41906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: add and use l1sched_del_all_ts()
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41905?usp=email ) Change subject: trxcon/l1sched: add and use l1sched_del_all_ts() ...................................................................... trxcon/l1sched: add and use l1sched_del_all_ts() Change-Id: I35ce97459dcd0e2cac4ab8927f02fe0232aa6142 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c 2 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/41905/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index d145929..b2fc99d 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -343,6 +343,7 @@ /* Timeslot management functions */ struct l1sched_ts *l1sched_add_ts(struct l1sched_state *sched, int tn); void l1sched_del_ts(struct l1sched_state *sched, int tn); +void l1sched_del_all_ts(struct l1sched_state *sched); int l1sched_reset_ts(struct l1sched_state *sched, int tn); int l1sched_configure_ts(struct l1sched_state *sched, int tn, enum gsm_phys_chan_config config); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 7d5c70f..eafb645 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -165,33 +165,27 @@ void l1sched_free(struct l1sched_state *sched) { - unsigned int tn; - if (sched == NULL) return; LOGP_SCHEDC(sched, LOGL_NOTICE, "Shutdown scheduler\n"); /* Free all potentially allocated timeslots */ - for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) - l1sched_del_ts(sched, tn); + l1sched_del_all_ts(sched); talloc_free(sched); } void l1sched_reset(struct l1sched_state *sched) { - unsigned int tn; - if (sched == NULL) return; LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler\n"); /* Free all potentially allocated timeslots */ - for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) - l1sched_del_ts(sched, tn); - + l1sched_del_all_ts(sched); + /* Reset UL SACCH cache */ l1sched_sacch_cache_update(sched, meas_rep_dummy); sched->bsic = 0; @@ -253,6 +247,15 @@ l1sched_cfg_pchan_comb_ind(sched, tn, GSM_PCHAN_NONE); } +void l1sched_del_all_ts(struct l1sched_state *sched) +{ + for (unsigned int tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) { + if (sched->ts[tn] == NULL) + continue; + l1sched_del_ts(sched, tn); + } +} + static struct l1sched_lchan_state * l1sched_ts_add_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type type) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41905?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: I35ce97459dcd0e2cac4ab8927f02fe0232aa6142 Gerrit-Change-Number: 41905 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: trxcon/l1sched: l1sched_reset(): also reset bsic
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41904?usp=email ) Change subject: trxcon/l1sched: l1sched_reset(): also reset bsic ...................................................................... trxcon/l1sched: l1sched_reset(): also reset bsic Change-Id: I4dfe5663fac12548d33393fe3b1426e5d80f50e7 Related: 8428b1ea0 ("trxcon: abstract out the scheduler API from L1CTL/TRXD/TRXC") --- M src/host/trxcon/src/sched_trx.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/41904/1 diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 9a0b095..7d5c70f 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -193,6 +193,8 @@ l1sched_del_ts(sched, tn); l1sched_sacch_cache_update(sched, meas_rep_dummy); + + sched->bsic = 0; } void l1sched_sacch_cache_read(struct l1sched_state *sched, uint8_t *out) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41904?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: I4dfe5663fac12548d33393fe3b1426e5d80f50e7 Gerrit-Change-Number: 41904 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: l1sched_reset(): remove unused param
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41903?usp=email ) Change subject: trxcon/l1sched: l1sched_reset(): remove unused param ...................................................................... trxcon/l1sched: l1sched_reset(): remove unused param The l1sched no longer has its own clock source, so there's nothing to reset. This parameter is no-op and can be safely removed. Change-Id: I88dfa8770c9cd205006f569315b07f4d91cc08de --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/03/41903/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 283f388..d145929 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -334,7 +334,7 @@ /* Scheduler management functions */ struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, void *priv); -void l1sched_reset(struct l1sched_state *sched, bool reset_clock); +void l1sched_reset(struct l1sched_state *sched); void l1sched_free(struct l1sched_state *sched); void l1sched_sacch_cache_read(struct l1sched_state *sched, uint8_t *out); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 58d4c0a..9a0b095 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -179,15 +179,14 @@ talloc_free(sched); } -void l1sched_reset(struct l1sched_state *sched, bool reset_clock) +void l1sched_reset(struct l1sched_state *sched) { unsigned int tn; if (sched == NULL) return; - LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler %s\n", - reset_clock ? "and clock counter" : ""); + LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler\n"); /* Free all potentially allocated timeslots */ for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index ce3c0dd..34ca21b 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -59,7 +59,7 @@ TALLOC_FREE(trxcon->fi_data); if (fi->state != TRXCON_ST_RESET) osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); - l1sched_reset(trxcon->sched, true); + l1sched_reset(trxcon->sched); /* Reset the L1 parameters */ trxcon->l1p.band_arfcn = 0xffff; @@ -70,7 +70,7 @@ trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd); break; case TRXCON_EV_RESET_SCHED_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); break; case TRXCON_EV_SET_PHY_CONFIG_REQ: { @@ -352,7 +352,7 @@ } /* Remove all active timeslots */ - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); if (rc) @@ -435,7 +435,7 @@ handle_dch_est_req(fi, (const struct trxcon_param_dch_est_req *)data); break; case TRXCON_EV_DCH_REL_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; case TRXCON_EV_SET_TCH_MODE_REQ: @@ -664,7 +664,7 @@ handle_dch_est_req(fi, (const struct trxcon_param_dch_est_req *)data); break; case TRXCON_EV_DCH_REL_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41903?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: I88dfa8770c9cd205006f569315b07f4d91cc08de Gerrit-Change-Number: 41903 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: pre-populate MR cache during lchan allocation
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41902?usp=email ) Change subject: trxcon/l1sched: pre-populate MR cache during lchan allocation ...................................................................... trxcon/l1sched: pre-populate MR cache during lchan allocation Instead of checking if the MR cache is populated in prim_compose_mr() and populating it there, let's do this during lchan allocation. Take a chance to move lchan allocation logic into its own function. Change-Id: I079074a402f9c27fff7e25b49bfd1dd409c0f8c3 --- M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c 2 files changed, 28 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/02/41902/1 diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index fa46d91..95be35e 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -86,7 +86,6 @@ { struct l1sched_prim *prim; struct msgb *msg; - bool cached; /* Allocate a new primitive */ msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST); @@ -98,13 +97,6 @@ .link_id = L1SCHED_CH_LID_SACCH, }; - /* Check if the MR cache is populated (verify LAPDm header) */ - cached = (lchan->sacch.mr_cache[2] != 0x00 - && lchan->sacch.mr_cache[3] != 0x00 - && lchan->sacch.mr_cache[4] != 0x00); - if (!cached) /* populate from the global UL SACCH cache (if needed) */ - l1sched_sacch_cache_read(lchan->ts->sched, lchan->sacch.mr_cache); - /* Compose a new Measurement Report primitive */ memcpy(msgb_put(msg, GSM_MACBLOCK_LEN), &lchan->sacch.mr_cache[0], diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 851d403..58d4c0a 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -252,13 +252,39 @@ l1sched_cfg_pchan_comb_ind(sched, tn, GSM_PCHAN_NONE); } +static struct l1sched_lchan_state * +l1sched_ts_add_lchan(struct l1sched_ts *ts, + enum l1sched_lchan_type type) +{ + struct l1sched_lchan_state *lchan; + + lchan = talloc_zero(ts, struct l1sched_lchan_state); + if (!lchan) + return NULL; + + lchan->type = type; + lchan->ts = ts; + + /* Init the Tx queue */ + INIT_LLIST_HEAD(&lchan->tx_prims); + /* Pre-populate UL SACCH cache */ + l1sched_sacch_cache_read(ts->sched, lchan->sacch.mr_cache); + /* Add to the list of channel states */ + llist_add_tail(&lchan->list, &ts->lchans); + + /* Enable channel automatically if required */ + if (l1sched_lchan_desc[type].flags & L1SCHED_CH_FLAG_AUTO) + l1sched_activate_lchan(ts, type); + + return lchan; +} + #define LAYOUT_HAS_LCHAN(layout, lchan) \ (layout->lchan_mask & ((uint64_t) 0x01 << lchan)) int l1sched_configure_ts(struct l1sched_state *sched, int tn, enum gsm_phys_chan_config config) { - struct l1sched_lchan_state *lchan; enum l1sched_lchan_type type; struct l1sched_ts *ts; @@ -292,27 +318,7 @@ for (type = 0; type < _L1SCHED_CHAN_MAX; type++) { if (!LAYOUT_HAS_LCHAN(ts->mf_layout, type)) continue; - - /* Allocate a channel state */ - lchan = talloc_zero(ts, struct l1sched_lchan_state); - if (!lchan) - return -ENOMEM; - - /* set backpointer */ - lchan->ts = ts; - - /* Set channel type */ - lchan->type = type; - - /* Init the Tx queue */ - INIT_LLIST_HEAD(&lchan->tx_prims); - - /* Add to the list of channel states */ - llist_add_tail(&lchan->list, &ts->lchans); - - /* Enable channel automatically if required */ - if (l1sched_lchan_desc[type].flags & L1SCHED_CH_FLAG_AUTO) - l1sched_activate_lchan(ts, type); + l1sched_ts_add_lchan(ts, type); } /* Notify transceiver about TS activation */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41902?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: I079074a402f9c27fff7e25b49bfd1dd409c0f8c3 Gerrit-Change-Number: 41902 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: add API for reading/updating UL SACCH cache
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41901?usp=email ) Change subject: trxcon/l1sched: add API for reading/updating UL SACCH cache ...................................................................... trxcon/l1sched: add API for reading/updating UL SACCH cache Change-Id: Ica42dbc28cfdd7af2e1becdcc5d45337b70da8a7 Related: 15877ba05 ("trxcon: allow populating global SACCH cache via L1CTL") --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 4 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/41901/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 39400cf..283f388 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -337,6 +337,9 @@ void l1sched_reset(struct l1sched_state *sched, bool reset_clock); void l1sched_free(struct l1sched_state *sched); +void l1sched_sacch_cache_read(struct l1sched_state *sched, uint8_t *out); +void l1sched_sacch_cache_update(struct l1sched_state *sched, const uint8_t *in); + /* Timeslot management functions */ struct l1sched_ts *l1sched_add_ts(struct l1sched_state *sched, int tn); void l1sched_del_ts(struct l1sched_state *sched, int tn); diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 4974557..fa46d91 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -102,11 +102,8 @@ cached = (lchan->sacch.mr_cache[2] != 0x00 && lchan->sacch.mr_cache[3] != 0x00 && lchan->sacch.mr_cache[4] != 0x00); - if (!cached) { - memcpy(&lchan->sacch.mr_cache[0], - &lchan->ts->sched->sacch_cache[0], - sizeof(lchan->sacch.mr_cache)); - } + if (!cached) /* populate from the global UL SACCH cache (if needed) */ + l1sched_sacch_cache_read(lchan->ts->sched, lchan->sacch.mr_cache); /* Compose a new Measurement Report primitive */ memcpy(msgb_put(msg, GSM_MACBLOCK_LEN), diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index f412400..851d403 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -153,7 +153,7 @@ .priv = priv, }; - memcpy(&sched->sacch_cache[0], &meas_rep_dummy[0], sizeof(meas_rep_dummy)); + l1sched_sacch_cache_update(sched, meas_rep_dummy); if (cfg->log_prefix == NULL) sched->log_prefix = talloc_asprintf(sched, "l1sched[0x%p]: ", sched); @@ -193,7 +193,17 @@ for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) l1sched_del_ts(sched, tn); - memcpy(&sched->sacch_cache[0], &meas_rep_dummy[0], sizeof(meas_rep_dummy)); + l1sched_sacch_cache_update(sched, meas_rep_dummy); +} + +void l1sched_sacch_cache_read(struct l1sched_state *sched, uint8_t *out) +{ + memcpy(out, sched->sacch_cache, sizeof(sched->sacch_cache)); +} + +void l1sched_sacch_cache_update(struct l1sched_state *sched, const uint8_t *in) +{ + memcpy(sched->sacch_cache, in, sizeof(sched->sacch_cache)); } struct l1sched_ts *l1sched_add_ts(struct l1sched_state *sched, int tn) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 9545883..ce3c0dd 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -108,7 +108,7 @@ break; } - memcpy(&trxcon->sched->sacch_cache[0], req->data, req->data_len); + l1sched_sacch_cache_update(trxcon->sched, req->data); break; } default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41901?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: Ica42dbc28cfdd7af2e1becdcc5d45337b70da8a7 Gerrit-Change-Number: 41901 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1ctl: print an error for uhnandled DATA.req / TRAFFIC.req
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41900?usp=email ) Change subject: trxcon/l1ctl: print an error for uhnandled DATA.req / TRAFFIC.req ...................................................................... trxcon/l1ctl: print an error for uhnandled DATA.req / TRAFFIC.req Change-Id: I1d965c2882eb72dc845bea85a4ffaa26d37cee05 --- M src/host/trxcon/src/l1ctl.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/00/41900/1 diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 0f6bd1b..7ce8c3d 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -685,9 +685,16 @@ osmo_fsm_inst_dispatch(fi, TRXCON_EV_TX_DATA_REQ, &req); break; default: - if (!traffic && req.link_id == 0x40) /* only for SACCH */ + if (!traffic && req.link_id == 0x40) { /* only for SACCH */ osmo_fsm_inst_dispatch(fi, TRXCON_EV_UPDATE_SACCH_CACHE_REQ, &req); - /* TODO: log an error about uhnandled DATA.req / TRAFFIC.req */ + break; + } + + LOGPFSMSL(fi, g_logc_l1d, LOGL_ERROR, + "Unhandled %s Req (chan_nr=0x%02x, link_id=0x%02x, len=%zu): %s\n", + traffic ? "TRAFFIC" : "DATA", req.chan_nr, req.link_id, req.data_len, + msgb_hexdump_l2(msg)); + break; } msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41900?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: I1d965c2882eb72dc845bea85a4ffaa26d37cee05 Gerrit-Change-Number: 41900 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: TC_rsl_chan_initial_ta: fix sporadic failures
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41899?usp=email ) Change subject: bts: TC_rsl_chan_initial_ta: fix sporadic failures ...................................................................... bts: TC_rsl_chan_initial_ta: fix sporadic failures It may happen that an UL SACCH block is received by the BTS before a DL SACCH block is generated and delivered to the testcase. In this case, the Timing Advance control loop may update the initial TA value that was set during RSL CHANnel ACTIVation. By default, trxcon transmits UL SACCH blocks with TA=0, which is exactly what triggers the TA control loop in this situation. To avoid this, we explicitly signal the expected TA value to trxcon by pre-populating the UL SACCH cache. This is done by sending a DATA.req containing a measurement report in advance, before establishing DCCH, so that subsequent UL SACCH blocks carry the correct TA and do not activate the control loop. Additionally, take the opportunity to add missing f_L1CTL_PARAM(). This compensates for the artificial delay introduced by f_trxc_fake_toffs256(), further reducing the risk of triggering the TA control loop. Change-Id: Iebb043ccc710750dff937e2281c23d343b85bda1 Related: OS#6919 --- M bts/BTS_Tests.ttcn 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/41899/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index e574cd4..3403863 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3891,6 +3891,13 @@ /* tell fake_trx to use a given timing offset for all bursts */ f_trxc_fake_toffs256(ta_to_test*256); + /* tell trxcon to use a given TA for UL bursts */ + g_pars.l1_pars.ms_actual_ta := ta_to_test; + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, + g_pars.l1_pars.ms_power_level); + /* tell trxcon to use a given TA in UL SACCH blocks + * this is achieved by populating UL SACCH cache before doing f_l1ctl_est_dchan() */ + f_send_meas_rep(ts_MeasurementResults); f_est_dchan(more_ies :={valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE, RSL_IE_Body:{timing_adv := ta_to_test}))} ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iebb043ccc710750dff937e2281c23d343b85bda1 Gerrit-Change-Number: 41899 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: TC_rsl_chan_initial_ta: misc improvements
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41898?usp=email ) Change subject: bts: TC_rsl_chan_initial_ta: misc improvements ...................................................................... bts: TC_rsl_chan_initial_ta: misc improvements Change-Id: Ifc2c850104b3710679485042ab5b7a758d0ae000 Related: OS#6919 --- M bts/BTS_Tests.ttcn 1 file changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/41898/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 20c16a3..e574cd4 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3883,7 +3883,7 @@ /* establish DChan, verify that the BTS sets the TA in the first SACCH L1 header. TA for the IMM ASS messages is still controlled by g_pars.l1_pars.ms_actual_ta! */ private function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr { - var uint5_t ta_to_test := 16; + const uint5_t ta_to_test := 16; var SacchL1Header l1h; f_l1_tune(L1CTL); @@ -3894,18 +3894,16 @@ f_est_dchan(more_ies :={valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE, RSL_IE_Body:{timing_adv := ta_to_test}))} ); - + /* wait for a single DL SACCH block */ alt { - [] as_l1_sacch_l1h(l1h, do_apply := false) { - if (l1h.actual_ta != ta_to_test) { - setverdict(fail, "TA in L1 header does not match the signaled (RSL) TA."); - } - - } - + [] as_l1_sacch_l1h(l1h, do_apply := false); /* Ignore all other blocks */ [] L1CTL.receive { repeat; } + } + if (l1h.actual_ta != ta_to_test) { + setverdict(fail, "TA=", l1h.actual_ta, " in the DL SACCH does not match ", + "the signaled (RSL) TA=", ta_to_test); } f_rsl_chan_deact(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifc2c850104b3710679485042ab5b7a758d0ae000 Gerrit-Change-Number: 41898 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: use existing API in as_l1_sacch_loop()
by fixeria 21 Jan '26

21 Jan '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41897?usp=email ) Change subject: bts: use existing API in as_l1_sacch_loop() ...................................................................... bts: use existing API in as_l1_sacch_loop() Change-Id: I5ab2988152b948e457c3cfa4930df484c170d053 --- M bts/BTS_Tests.ttcn 1 file changed, 6 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/41897/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index b060cbd..20c16a3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -825,7 +825,8 @@ payload := { meas_rep := { meas_res := valueof(meas_res) } } }; - /* TITAN has weird (and often unusable) padding model, so we pad here manaully */ + /* According to 3GPP TS 44.018, section 10.5.2.20, we should pad with zeroes. + * TITAN has weird (and often unusable) padding model, so we pad here manaully. */ l2 := f_pad_oct(enc_LapdmFrameAB(valueof(ts_LAPDm_AB(0, meas_rep))), 21, '00'O); log(%definitionId, "(): Tx SACCH L1 header: ", l1h); @@ -2168,28 +2169,11 @@ } /* handle incoming downlink SACCH and respond with uplink SACCH (meas res) */ -private altstep as_l1_sacch_loop() runs on ConnHdlr { - var template (value) LapdmFrameAB lb; - var L1ctlMessage l1_dl; +private altstep as_l1_sacch_loop(boolean do_apply := true) runs on ConnHdlr { + var SacchL1Header l1h; - [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { - log("SACCH received: ", l1_dl.payload.data_ind.payload); - - lb := ts_LAPDm_AB(0, ts_MEAS_REP(g_pars.l1_pars.meas_valid, - g_pars.l1_pars.meas_ul.full.rxlev, - g_pars.l1_pars.meas_ul.sub.rxlev, - g_pars.l1_pars.meas_ul.full.rxqual, - g_pars.l1_pars.meas_ul.sub.rxqual)); - log("LAPDm: ", lb); - - var template (value) SacchL1Header l1h := ts_SacchL1Header( - g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); - - /* According to 3GPP TS 44.018, section 10.5.2.20, we should pad with zeroes */ - var octetstring l2 := f_pad_oct(enc_LapdmFrameAB(valueof(lb)), 21, '00'O); - - log("Sending Measurement Report: ", l1h, l2); - L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); + [] as_l1_sacch_l1h(l1h, do_apply) { + f_send_meas_rep(ts_MeasurementResults); repeat; } /* dequeue (ignore) L1CTL DATA.cnf for UL SACCH (SAPI=0) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ab2988152b948e457c3cfa4930df484c170d053 Gerrit-Change-Number: 41897 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026