April 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 07:13:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by lynxis lazus

Attention is currently required from: osmith, pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > The saddr stands for socket address and not source address. what about peer_addr? I don't have a strong opinion here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 00:53:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by lynxis lazus

Attention is currently required from: osmith, pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: The saddr stands for socket address and not source address. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 00:51:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: trau_pcu_ericsson: do not set unused D bits to 1

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32543 ) Change subject: trau_pcu_ericsson: do not set unused D bits to 1 ...................................................................... trau_pcu_ericsson: do not set unused D bits to 1 The er_gprs_trau_frame_encode already pre set all non T0 bits in the TRAU frame to 1, there is no need to set unused bits explicitly. Related: OS#6015 Change-Id: I003632a08cc80bc195b306bef5f907351b6fe94e --- M src/trau/trau_pcu_ericsson.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/32543/1 diff --git a/src/trau/trau_pcu_ericsson.c b/src/trau/trau_pcu_ericsson.c index 8f2e2a2..5a12cdd 100644 --- a/src/trau/trau_pcu_ericsson.c +++ b/src/trau/trau_pcu_ericsson.c @@ -1067,9 +1067,6 @@ trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); - /* Set unused D-Bits to 1 */ - memset(trau_bits + 76, 1, 1280 - 76 - 16); - /* D-Bits */ rc = put_trau_uint32(trau_bits, 1280, T_bits_64, sizeof(T_bits_64), ind->pseq, 170, 22); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I003632a08cc80bc195b306bef5f907351b6fe94e Gerrit-Change-Number: 32543 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: trau_pcu_ericsson: set uplink frame error bit correctly

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32542 ) Change subject: trau_pcu_ericsson: set uplink frame error bit correctly ...................................................................... trau_pcu_ericsson: set uplink frame error bit correctly At the moment we set the uplink frame error bit to 1 if ul_frame_err is set to false. Unfortunately the er_gprs_trau_frame_encode pre set all non T0 bits to 1 before calling the encoder function. This means that with this logic the uplink frame error bit can never be set to 0. Related: OS#6015 Change-Id: I74f56bc40ed074eb1588b202849870e2786ded24 --- M src/trau/trau_pcu_ericsson.c 1 file changed, 25 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/42/32542/1 diff --git a/src/trau/trau_pcu_ericsson.c b/src/trau/trau_pcu_ericsson.c index 585e847..8f2e2a2 100644 --- a/src/trau/trau_pcu_ericsson.c +++ b/src/trau/trau_pcu_ericsson.c @@ -500,8 +500,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 17, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 22, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[24] = 1; + if (ind->ul_frame_err) + trau_bits[24] = 0; trau_bits[25] = calc_parity(trau_bits + 17, 8); /* D-Bits */ @@ -555,8 +555,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 17, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 22, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[24] = 1; + if (ind->ul_frame_err) + trau_bits[24] = 0; trau_bits[25] = calc_parity(trau_bits + 17, 8); /* Set coding scheme (E1-E2) */ @@ -1063,8 +1063,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 65, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 70, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[73] = 1; + if (ind->ul_frame_err) + trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); /* Set unused D-Bits to 1 */ @@ -1135,8 +1135,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 65, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 70, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[73] = 1; + if (ind->ul_frame_err) + trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); /* Set coding scheme (E1-E3) */ @@ -1321,8 +1321,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 65, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 70, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[73] = 1; + if (ind->ul_frame_err) + trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); /* Set demodulation in uplink (E1-E3) */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I74f56bc40ed074eb1588b202849870e2786ded24 Gerrit-Change-Number: 32542 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bts_is_online(): make the BTS pointer const, return bool

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32537 ) Change subject: bts_is_online(): make the BTS pointer const, return bool ...................................................................... bts_is_online(): make the BTS pointer const, return bool Change-Id: Idb4f9f8862041c5902df0e6e8d1ac2a60ada95df --- M src/osmo-bsc/bts.c 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/32537/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 108c355..527220f 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -888,14 +888,14 @@ return (base->depends_on[idx] & (1U << bit)) > 0; } -static int bts_is_online(struct gsm_bts *bts) +static bool bts_is_online(const struct gsm_bts *bts) { /* TODO: support E1 BTS too */ if (!is_ipaccess_bts(bts)) - return 1; + return true; if (!bts->oml_link) - return 0; + return false; return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb4f9f8862041c5902df0e6e8d1ac2a60ada95df Gerrit-Change-Number: 32537 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bootstrap_rsl(): cosmetic: cache trx->bts and use it directly

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32539 ) Change subject: bootstrap_rsl(): cosmetic: cache trx->bts and use it directly ...................................................................... bootstrap_rsl(): cosmetic: cache trx->bts and use it directly Change-Id: I736ebf185028976dad5ff6f61386b6d2eeab8fbd Related: SYS#6435 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/32539/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 50cc0e0..133e5c2 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -312,16 +312,16 @@ static void bootstrap_rsl(struct gsm_bts_trx *trx) { + struct gsm_bts *bts = trx->bts; unsigned int i; int rc; LOG_TRX(trx, DRSL, LOGL_NOTICE, "bootstrapping RSL " "on ARFCN %u using MCC-MNC %s LAC=%u CID=%u BSIC=%u\n", trx->arfcn, osmo_plmn_name(&bsc_gsmnet->plmn), - trx->bts->location_area_code, - trx->bts->cell_identity, trx->bts->bsic); + bts->location_area_code, bts->cell_identity, bts->bsic); - if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { + if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) { rsl_nokia_si_begin(trx); } @@ -338,14 +338,14 @@ return; } - if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { + if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) { /* channel unspecific, power reduction in 2 dB steps */ rsl_bs_power_control(trx, 0xFF, trx->max_power_red / 2); rsl_nokia_si_end(trx); } - if (trx->bts->model->power_ctrl_send_def_params != NULL) { - rc = trx->bts->model->power_ctrl_send_def_params(trx); + if (bts->model->power_ctrl_send_def_params != NULL) { + rc = bts->model->power_ctrl_send_def_params(trx); if (rc) { LOG_TRX(trx, DRSL, LOGL_ERROR, "Failed to send default " "MS/BS Power control parameters (rc=%d)\n", rc); @@ -360,7 +360,7 @@ } /* Drop all expired channel requests in the list */ - abis_rsl_chan_rqd_queue_flush(trx->bts); + abis_rsl_chan_rqd_queue_flush(bts); } struct osmo_timer_list update_connection_stats_timer; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I736ebf185028976dad5ff6f61386b6d2eeab8fbd Gerrit-Change-Number: 32539 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32538 ) Change subject: struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red ...................................................................... struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red Change-Id: I13d9e6ea2a2b7b11f92532d377e71f0e83974622 Related: SYS#6435 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_osmobts.c 3 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/32538/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 20ed089..9b2aaab 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -300,7 +300,7 @@ /* (Optional) function for sending default MS/BS Power Control paramaters */ int (*power_ctrl_send_def_params)(const struct gsm_bts_trx *trx); /* (Optional) function for toggling BCCH carrier power reduction operation */ - int (*power_ctrl_set_c0_power_red)(const struct gsm_bts *bts, const uint8_t red); + int (*power_ctrl_send_c0_power_red)(const struct gsm_bts *bts, const uint8_t red); void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 527220f..f5936c7 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -986,10 +986,10 @@ if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) return -ENOTSUP; - if (bts->model->power_ctrl_set_c0_power_red == NULL) + if (bts->model->power_ctrl_send_c0_power_red == NULL) return -ENOTSUP; - rc = bts->model->power_ctrl_set_c0_power_red(bts, red); + rc = bts->model->power_ctrl_send_c0_power_red(bts, red); if (rc != 0) return rc; diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 078cfe7..5f6f86f 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -159,8 +159,7 @@ *ie_len = msg->tail - (ie_len + 1); } -static int power_ctrl_set_c0_power_red(const struct gsm_bts *bts, - const uint8_t red) +static int power_ctrl_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg; @@ -198,7 +197,7 @@ model_osmobts.force_combined_si = false; /* Power control API */ - model_osmobts.power_ctrl_set_c0_power_red = &power_ctrl_set_c0_power_red; + model_osmobts.power_ctrl_send_c0_power_red = &power_ctrl_send_c0_power_red; model_osmobts.features.data = &model_osmobts._features_data[0]; model_osmobts.features.data_len = -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13d9e6ea2a2b7b11f92532d377e71f0e83974622 Gerrit-Change-Number: 32538 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[M] Change in osmo-bsc[master]: bts: st_op_enabled_on_enter(): resume C0 power reduction

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32540 ) Change subject: bts: st_op_enabled_on_enter(): resume C0 power reduction ...................................................................... bts: st_op_enabled_on_enter(): resume C0 power reduction If power saving is enabled for a BTS, it should remain enabled even if the BTS is restarted for whatever reason. This persistence can be achieved by re-sending the configured power reduction value whenever the BTS NM FSM enters the ENABLED state again (i.e. reconnects). Separate gsm_bts_send_c0_power_red() from gsm_bts_set_c0_power_red() and call the former from st_op_enabled_on_enter(). All we need to do is to send the value that was configured before, per-timeslot power reduction limits remain and need not to be updated. Take a chance to move logging from BTS specific to the generic code. Change-Id: Ic3f8a2ab0ffd049a8ed84361a3a588c1e1b23ac6 Related: SYS#6435 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_osmobts.c M src/osmo-bsc/nm_bts_fsm.c 4 files changed, 47 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/32540/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9b2aaab..78fc6a0 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -822,6 +822,7 @@ int gsm_bts_set_system_infos(struct gsm_bts *bts); +int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red); int gsm_bts_set_c0_power_red(struct gsm_bts *bts, const uint8_t red); void gsm_bts_stats_reset(struct gsm_bts *bts); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index f5936c7..a6fc4a4 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -978,21 +978,31 @@ return 0; } +/* Send the given C0 power reduction value to the BTS */ +int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) +{ + if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) + return -ENOTSUP; + if (bts->model->power_ctrl_send_c0_power_red == NULL) + return -ENOTSUP; + return bts->model->power_ctrl_send_c0_power_red(bts, red); +} + +/* Send the given C0 power reduction value to the BTS and update the internal state */ int gsm_bts_set_c0_power_red(struct gsm_bts *bts, const uint8_t red) { struct gsm_bts_trx *c0 = bts->c0; unsigned int tn; int rc; - if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) - return -ENOTSUP; - if (bts->model->power_ctrl_send_c0_power_red == NULL) - return -ENOTSUP; - - rc = bts->model->power_ctrl_send_c0_power_red(bts, red); + rc = gsm_bts_send_c0_power_red(bts, red); if (rc != 0) return rc; + LOGP(DRSL, LOGL_NOTICE, "%sabling BCCH carrier power reduction " + "operation mode for BTS%u (maximum %u dB)\n", + red ? "En" : "Dis", bts->nr, red); + /* Timeslot 0 is always transmitting BCCH/CCCH */ c0->ts[0].c0_max_power_red_db = 0; diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 5f6f86f..ea0405b 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -168,10 +168,6 @@ if (msg == NULL) return -ENOMEM; - LOGP(DRSL, LOGL_NOTICE, "%sabling BCCH carrier power reduction " - "operation mode for BTS%u (maximum %u dB)\n", - red ? "En" : "Dis", bts->nr, red); - /* Abuse the standard BS POWER CONTROL message by specifying 'Common Channel' * in the Protocol Discriminator field and 'BCCH' in the Channel Number IE. */ dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 92728dc..acd69a5 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -286,6 +286,14 @@ bts->mo.get_attr_rep_received = false; bts->mo.set_attr_sent = false; bts->mo.set_attr_ack_received = false; + + /* Resume power saving on the BCCH carrier, if was enabled */ + if (bts->c0_max_power_red_db > 0) { + LOGP(DRSL, LOGL_NOTICE, "Resuming BCCH carrier power reduction " + "operation mode for BTS%u (maximum %u dB)\n", + bts->nr, bts->c0_max_power_red_db); + gsm_bts_send_c0_power_red(bts, bts->c0_max_power_red_db); + } } static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic3f8a2ab0ffd049a8ed84361a3a588c1e1b23ac6 Gerrit-Change-Number: 32540 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: gsm_bts_send_c0_power_red(): check if BTS is online first

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32541 ) Change subject: gsm_bts_send_c0_power_red(): check if BTS is online first ...................................................................... gsm_bts_send_c0_power_red(): check if BTS is online first ... and print a proper error message instead of "not supported". We don't know for sure whether it's supported before the BTS is connected. Change-Id: I080aa7ef331b76918ae48d555eea6e4290c57120 Related: SYS#6435 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ctrl.c 3 files changed, 31 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/32541/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index f1bd7c4..34676a2 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1426,18 +1426,22 @@ } rc = gsm_bts_set_c0_power_red(bts, red); - if (rc == -ENOTSUP) { + switch (rc) { + case 0: /* success */ + return CMD_SUCCESS; + case -ENOTCONN: + vty_out(vty, "%% BTS%u is offline%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + case -ENOTSUP: vty_out(vty, "%% BCCH carrier power reduction operation mode " "is not supported for BTS%u%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; - } else if (rc != 0) { + default: vty_out(vty, "%% Failed to %sable BCCH carrier power reduction " "operation mode for BTS%u%s", red ? "en" : "dis", bts_nr, VTY_NEWLINE); return CMD_WARNING; } - - return CMD_SUCCESS; } /* this command is now hidden, as it's a low-level debug hack, and people should diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index a6fc4a4..4a27c55 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -981,6 +981,8 @@ /* Send the given C0 power reduction value to the BTS */ int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) { + if (!bts_is_online(bts)) + return -ENOTCONN; if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) return -ENOTSUP; if (bts->model->power_ctrl_send_c0_power_red == NULL) diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index a971fab..5ac1e0d 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -497,15 +497,19 @@ int rc; rc = gsm_bts_set_c0_power_red(bts, red); - if (rc == -ENOTSUP) { + switch (rc) { + case 0: /* success */ + return get_bts_c0_power_red(cmd, data); + case -ENOTCONN: + cmd->reply = "BTS is offline"; + return CTRL_CMD_ERROR; + case -ENOTSUP: cmd->reply = "BCCH carrier power reduction is not supported"; return CTRL_CMD_ERROR; - } else if (rc != 0) { + default: cmd->reply = "Failed to enable BCCH carrier power reduction"; return CTRL_CMD_ERROR; } - - return get_bts_c0_power_red(cmd, data); } CTRL_CMD_DEFINE(bts_c0_power_red, "c0-power-reduction"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I080aa7ef331b76918ae48d555eea6e4290c57120 Gerrit-Change-Number: 32541 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023