- gerrit-log - lists.osmocom.org

[XS] Change in libosmocore[master]: vty: guard definition of _XOPEN_SOURCE
by pespin 23 Jan '26

23 Jan '26

Attention is currently required from: Timur Davydov, fixeria, laforge, osmith. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41924?usp=email ) Change subject: vty: guard definition of _XOPEN_SOURCE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41924?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4f53aff1afef02abce7cb70d1b29080ba900ff41 Gerrit-Change-Number: 41924 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Fri, 23 Jan 2026 09:12:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: core: fix printf format casts for struct timeval fields
by pespin 23 Jan '26

23 Jan '26

Attention is currently required from: Timur Davydov, fixeria, laforge, osmith. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41923?usp=email ) Change subject: core: fix printf format casts for struct timeval fields ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41923?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icac9e392c728948a7976970658e37f5e0da41709 Gerrit-Change-Number: 41923 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Fri, 23 Jan 2026 09:11:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: core: guard TCP stats on availability of linux/tcp.h and struct tcp_info
by pespin 23 Jan '26

23 Jan '26

Attention is currently required from: Timur Davydov. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41922?usp=email ) Change subject: core: guard TCP stats on availability of linux/tcp.h and struct tcp_info ...................................................................... Patch Set 1: (3 comments) Patchset: PS1: Since we are only talking about 2-3 public APIs, I think in this case it may make sense to wrap all of existing stats_tcp.c within a "if HAVE_LINUX_TCP_H", and then add a "else" section with stub functions for those public APIs, eg. _register() one returning -ENOTSUP. File src/core/stats_tcp.c: https://gerrit.osmocom.org/c/libosmocore/+/41922/comment/76b3162b_6c153b40?… : PS1, Line 315: osmo_timer_schedule(&stats_tcp_poll_timer, osmo_tcp_stats_config->interval, 0); I stats are not used, we should disable this too. https://gerrit.osmocom.org/c/libosmocore/+/41922/comment/f1a1f178_92b7975c?… : PS1, Line 328: osmo_timer_setup(&stats_tcp_poll_timer, stats_tcp_poll_timer_cb, NULL); I stats are not used, we can disable this function completelly afaiu. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41922?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcd00f15131b0291f0b10eca51401c518b77cc39 Gerrit-Change-Number: 41922 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Fri, 23 Jan 2026 09:09:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in libosmocore[master]: core: guard SCTP include in osmo_io_internal.h
by pespin 23 Jan '26

23 Jan '26

Attention is currently required from: Timur Davydov, laforge. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41921?usp=email ) Change subject: core: guard SCTP include in osmo_io_internal.h ...................................................................... Patch Set 1: (1 comment) File src/core/osmo_io_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/41921/comment/0841a1b6_2cd44790?… : PS1, Line 10: #include <netinet/sctp.h> AFAICT this include is not really used in this header, so you can change this patch to simply remove it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41921?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icd626d908192a954d55d76a46d7cc863ed332631 Gerrit-Change-Number: 41921 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Fri, 23 Jan 2026 09:02:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

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

23 Jan '26

fixeria has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve 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: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iff03fa5b90ac1ec30b7937cea6bd09c6ececb5f6 Gerrit-Change-Number: 41906 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

23 Jan '26

fixeria has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified 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: merged 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

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

23 Jan '26

fixeria has submitted this change. ( 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, 20 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 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..237daca 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -153,7 +153,8 @@ .priv = priv, }; - memcpy(&sched->sacch_cache[0], &meas_rep_dummy[0], sizeof(meas_rep_dummy)); + /* Populate UL SACCH cache */ + 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 +194,18 @@ 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)); + /* Reset UL SACCH cache */ + 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: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica42dbc28cfdd7af2e1becdcc5d45337b70da8a7 Gerrit-Change-Number: 41901 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

23 Jan '26

fixeria has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified 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 237daca..ced3d99 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -254,13 +254,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; @@ -294,27 +320,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: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I079074a402f9c27fff7e25b49bfd1dd409c0f8c3 Gerrit-Change-Number: 41902 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

23 Jan '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41903?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: 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(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified 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 ced3d99..a2ee464 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -180,15 +180,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: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I88dfa8770c9cd205006f569315b07f4d91cc08de Gerrit-Change-Number: 41903 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

23 Jan '26

fixeria has submitted this change. ( 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, 12 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve 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 e3b1674..f9bd0da 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -166,33 +166,26 @@ 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); @@ -255,6 +248,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: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I35ce97459dcd0e2cac4ab8927f02fe0232aa6142 Gerrit-Change-Number: 41905 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log