- gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check
by fixeria 11 Apr '22

11 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27723 ) Change subject: osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check ...................................................................... osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check This check is redundant because it's guaranteed in rts_tchh_fn() that FACCH/H is always scheduled at the correct frame offset. Change-Id: I2f0c26f6007455aa1e3e8b27bc9d173f6b1f8c38 Related: SYS#5916, OS#5518 --- M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-virtual/scheduler_virtbts.c 2 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/27723/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 05e8e7e..c9811da 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -374,14 +374,6 @@ /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, - "Cannot transmit FACCH starting on even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* BURST BYPASS */ /* allocate burst memory, if not already, diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 9d2adfc..8557638 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -449,14 +449,6 @@ /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch, (((br->fn + 4) % 26) >> 2) & 1); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot transmit FACCH starting on " - "even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* no message at all */ if (!msg_tch && !msg_facch && !chan_state->dl_ongoing_facch) { LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "has not been served !! No prim\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2f0c26f6007455aa1e3e8b27bc9d173f6b1f8c38 Gerrit-Change-Number: 27723 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: scheduler: remove redundant OSMO_ASSERT() statements
by fixeria 11 Apr '22

11 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27720 ) Change subject: scheduler: remove redundant OSMO_ASSERT() statements ...................................................................... scheduler: remove redundant OSMO_ASSERT() statements It's guaranteed by the calling function bts_model_l1sap_down() that the prim's operation is PRIM_OP_REQUEST and that the msg is present. Change-Id: I6a01bba7b5eb337ae1552c442d74447565c52e25 --- M src/common/scheduler.c 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/20/27720/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e6a664f..99ab597 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -854,9 +854,6 @@ "PH-DATA.req: chan_nr=0x%02x link_id=0x%02x\n", l1sap->u.data.chan_nr, l1sap->u.data.link_id); - OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST); - OSMO_ASSERT(l1sap->oph.msg); - /* ignore empty frame */ if (!l1sap->oph.msg->l2h || msgb_l2len(l1sap->oph.msg) == 0) { msgb_free(l1sap->oph.msg); @@ -880,9 +877,6 @@ LOGL1S(DL1P, LOGL_DEBUG, l1ts, -1, l1sap->u.tch.fn, "TCH.req: chan_nr=0x%02x\n", l1sap->u.tch.chan_nr); - OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST); - OSMO_ASSERT(l1sap->oph.msg); - /* ignore empty frame */ if (!msgb_l2len(l1sap->oph.msg)) { msgb_free(l1sap->oph.msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6a01bba7b5eb337ae1552c442d74447565c52e25 Gerrit-Change-Number: 27720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-e1d[master]: vty: Print only applicable information during 'show line'
by laforge 11 Apr '22

11 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27719 ) Change subject: vty: Print only applicable information during 'show line' ...................................................................... vty: Print only applicable information during 'show line' If the line is in channelized mode, only print per-TS information. If the line is in superchannel mode, only print SC information. This avoids printing information that is not applicable to the line mode. Change-Id: I7b55ae8a5e1d352f90e14342d7f7e82e4848118a --- M src/vty.c 1 file changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/19/27719/1 diff --git a/src/vty.c b/src/vty.c index ba6b1ac..65eb334 100644 --- a/src/vty.c +++ b/src/vty.c @@ -170,15 +170,24 @@ line->ts0.cur_errmask & E1L_TS0_RX_CRC4_ERR ? " [REMOTE-CRC-ERROR]" : "", VTY_NEWLINE); - for (tn = 0; tn < ARRAY_SIZE(line->ts); tn++) { - const struct e1_ts *ts = &line->ts[tn]; - vty_out(vty, " TS%02u: Mode %s, FD %d, Peer PID %d%s", - ts->id, get_value_string(e1_ts_mode_names, ts->mode), - ts->fd, get_remote_pid(ts->fd), VTY_NEWLINE); + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + for (tn = 0; tn < ARRAY_SIZE(line->ts); tn++) { + const struct e1_ts *ts = &line->ts[tn]; + vty_out(vty, " TS%02u: Mode %s, FD %d, Peer PID %d%s", + ts->id, get_value_string(e1_ts_mode_names, ts->mode), + ts->fd, get_remote_pid(ts->fd), VTY_NEWLINE); + } + break; + case E1_LINE_MODE_SUPERCHANNEL: + vty_out(vty, " SC: Mode %s, FD %d, Peer PID %d%s", + get_value_string(e1_ts_mode_names, line->superchan.mode), + line->superchan.fd, get_remote_pid(line->superchan.fd), VTY_NEWLINE); + break; + case E1_LINE_MODE_E1OIP: + /* TODO: dump some information about E1oIP */ + break; } - vty_out(vty, " SC: Mode %s, FD %d, Peer PID %d%s", - get_value_string(e1_ts_mode_names, line->superchan.mode), - line->superchan.fd, get_remote_pid(line->superchan.fd), VTY_NEWLINE); vty_out_rate_ctr_group(vty, " ", line->ctrs); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7b55ae8a5e1d352f90e14342d7f7e82e4848118a Gerrit-Change-Number: 27719 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-e1d[master]: fix segfault on 'show octoi-server' if no server configured
by laforge 11 Apr '22

11 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27718 ) Change subject: fix segfault on 'show octoi-server' if no server configured ...................................................................... fix segfault on 'show octoi-server' if no server configured Change-Id: I23697f858337948555456b71539b9afe8c3730b9 --- M src/octoi/octoi_srv_vty.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/18/27718/1 diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c index e5b91c7..c9f63cb 100644 --- a/src/octoi/octoi_srv_vty.c +++ b/src/octoi/octoi_srv_vty.c @@ -359,9 +359,13 @@ SHOW_STR "Display information about the OCTOI Server\n") { struct octoi_server *srv = g_octoi->server; - struct octoi_sock *sock = srv->sock; - vty_show_octoi_sock(vty, sock); + if (!srv) { + vty_out(vty, "%% No OCTOI server present%s", VTY_NEWLINE); + return CMD_WARNING; + } + + vty_show_octoi_sock(vty, srv->sock); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I23697f858337948555456b71539b9afe8c3730b9 Gerrit-Change-Number: 27718 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: Show BTS Channel Load on Ericsson BTS
by laforge 10 Apr '22

10 Apr '22

Attention is currently required from: keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23575 ) Change subject: Show BTS Channel Load on Ericsson BTS ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: so in general, the om2k code is supposed to update the nm state to prevent this from happening. We have update_mo_state() and update_op_stat() in abis_om2000.c, which get the respective OM2000 mo + operational state, and which are tasked with updating the gsm_nm_state.operational and gsm_nm_state.availability of the respective object. So if everything worked as expected, the nm_state of the timeslot would be set in a way that nm_is_running() returns true. We should fix this mechanism, as it will affect every other part of the code that depends on the nm_state being set properly. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8bf6efc7f950246e0a836eceea834575a38a2d48 Gerrit-Change-Number: 23575 Gerrit-PatchSet: 4 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Sun, 10 Apr 2022 10:32:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: Show BTS Channel Load on Ericsson BTS
by keith 10 Apr '22

10 Apr '22

keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23575 ) Change subject: Show BTS Channel Load on Ericsson BTS ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8bf6efc7f950246e0a836eceea834575a38a2d48 Gerrit-Change-Number: 23575 Gerrit-PatchSet: 4 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 10 Apr 2022 09:28:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration
by neels 10 Apr '22

10 Apr '22

Attention is currently required from: iedemam. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: stats: new trackers for lchan life duration ...................................................................... Patch Set 19: (4 comments) Patchset: PS19: looks good, a minor tweak remains for me, in the comments. File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/83774c65_a30ea133 PS19, Line 576: VTY_NEWLINE); this will print nonsense values for lchan types other than SDCCH and TCH, unless we remove those conditions marked elsewhere File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/4aee7e57_da3225d4 PS19, Line 225: if (lchan->active_cc.cfg.rate_ctr) { let's remove this condition: always (re)start the activity time_cc, also for lchan types other than SDCCH and TCH. Hence the VTY can also show for those how long ago they have been activated. Doesn't matter whether a rate_ctr is set. https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/de467308_40a97016 PS19, Line 560: if (lchan->active_cc.cfg.rate_ctr) { remove this condition, always set the flag. Does not matter wheter a rate_ctr is set. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 19 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Sat, 09 Apr 2022 15:29:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up
by fixeria 10 Apr '22

10 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 ) Change subject: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up ...................................................................... Patch Set 2: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697/comment/8b6c753c_48a8… PS1, Line 3047: timer T1 := 9.0 * 1.92; > You may need to leave some extra offset to avoid timing race conditions? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9266f7284fcdb0afa3473f575640689e334e89a8 Gerrit-Change-Number: 27697 Gerrit-PatchSet: 2 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: Sat, 09 Apr 2022 14:26:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up
by fixeria 10 Apr '22

10 Apr '22

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 to look at the new patch set (#2). Change subject: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up ...................................................................... BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up Since recenly, osmo-bts is using P_CON_INTERVAL=2 by default. This means that the MS power loop gets triggered every 4th SACCH block (1.92s), so we need more time to reach the maximim Tx power. Change-Id: I9266f7284fcdb0afa3473f575640689e334e89a8 Related: osmo-bts.git I91c505447f68714239a4f033d4f06e91893df201 Related: OS#5517 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/27697/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9266f7284fcdb0afa3473f575640689e334e89a8 Gerrit-Change-Number: 27697 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
by fixeria 10 Apr '22

10 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27694 ) Change subject: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL ...................................................................... power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL For the sake of consistency and code readability, initialize the power loop control interval (P_Con_INTERVAL) for both Uplink and Downlink directions in the same function. Change-Id: Ie3d4b481cbfacf27004787616e22b6f8a863b47b --- M src/osmo-bsc/gsm_data.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 38d8a7c..5fba05f 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1142,8 +1142,6 @@ .inc_step_size_db = 4, /* 2, 4, or 6 dB */ .red_step_size_db = 2, /* 2 or 4 dB */ - .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008 sec 4.7.1 */ - /* RxLev measurement parameters */ .rxlev_meas = { .enabled = true, @@ -1338,9 +1336,12 @@ { *params = power_ctrl_params_def; params->dir = dir; + + /* Trigger loop every N-th SACCH block. See 3GPP TS 45.008 section 4.7.1. */ if (dir == GSM_PWR_CTRL_DIR_UL) - /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */ - params->ctrl_interval = 2; + params->ctrl_interval = 2; /* N=4 (1.92s) */ + else + params->ctrl_interval = 1; /* N=2 (0.960) */ } enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3d4b481cbfacf27004787616e22b6f8a863b47b Gerrit-Change-Number: 27694 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log