cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

bts-trx: Fix handling ADM state change while previous one WIP 

Fix power ramping if administrative state changes while previous
opposite change was already ACKED but power ramping was still ongoing.

With previous code, osmo-bts-trx would have sent a NACK and BSc would
drop the BTs link as a result.

Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca
This commit is contained in:
Pau Espin 2020-07-27 12:36:58 +02:00
parent 912ff0d759
commit be15a12c87
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/osmo-bts-trx/l1_if.c
View File

@ -662,11 +662,29 @@ int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,
break;
if (mo->procedure_pending) {
LOGPTRX(trx, DL1C, LOGL_ERROR, "Discarding adm change command: "
"pending procedure on RC %d\n",
((struct gsm_bts_trx *)obj)->nr);
rc = -1;
break;
LOGPTRX(trx, DL1C, LOGL_INFO,
"ADM change received while previous one still WIP\n");
if (mo->nm_state.administrative == NM_STATE_LOCKED &&
adm_state == NM_STATE_UNLOCKED) {
/* Previous change was UNLOCKED->LOCKED, so we
* were ramping down and we didn't deactivate
* yet, so now simply skip old ramp down compl
* cb, skip TS activation and go for ramp up
* directly. */
goto ramp_up;
} else if (mo->nm_state.administrative == NM_STATE_UNLOCKED &&
adm_state == NM_STATE_LOCKED) {
/* Previous change was LOCKED->UNLOCKED, which
* means TS were also enabled during start of
* ramping up. So we simply need to skip
* ramping up and start ramping down instead,
* disabling TS at the end as usual. Fall
* through usual procedure below.
*/
} else if (mo->nm_state.administrative == adm_state) {
OSMO_ASSERT(0);
}
}
switch (adm_state) {
case NM_STATE_LOCKED:
@ -687,6 +705,7 @@ int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,
}
trx_set_ts(ts);
}
ramp_up:
rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb);
if (rc == 0) {
mo->nm_state.administrative = adm_state;