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

Change NM Channel availability Dependency->Offline when RadioCarrier becomes enabled 

This fix allows osmo-bts to play fine with newer osmo-bsc NM OML FSMs,
which expectes for non-nanoBTS types to follow TS 12.21 guidelines.
Until now, BSC simply waited to received State Event Change Dependency
for each TS and then sent all required commands (Set Chan Attr, Adm
Unlock and Opstart). In newer osmo-bsc FSMs, Opstart is only sent when
in Offline state, so we need to transit to that state. For the above
mentioned reason, since we pass through the Dependency state anyway
after this patch, older osmo-bscs will work correctly too.

Change-Id: Id9e61f8d773e6e6170c68b5b836d276c747d8d69
This commit is contained in:
Pau Espin 2020-10-01 17:21:15 +02:00 committed by laforge
parent cf7a7fcebf
commit 6d117891c9
7 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osmo-bts-litecell15/oml.c
View File

@ -268,6 +268,8 @@ static int opstart_compl(struct gsm_abis_mo *mo, struct msgb *l1_msg)
{
GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg);
GsmL1_Status_t status = prim_status(l1p);
struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr);
uint8_t tn;
if (status != GsmL1_Status_Success) {
LOGP(DL1C, LOGL_ERROR, "Rx %s, status: %s\n",
@ -282,6 +284,16 @@ static int opstart_compl(struct gsm_abis_mo *mo, struct msgb *l1_msg)
/* Set to Operational State: Enabled */
oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
if (mo->obj_class == NM_OC_RADIO_CARRIER) {
/* Mark Dependency TS as Offline (ready to be Opstarted) */
for (tn = 0; tn < TRX_NR_TS; tn++) {
if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&
trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {
oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
}
}
}
/* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */
if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&
mo->obj_inst.ts_nr == 0) {

12
src/osmo-bts-oc2g/oml.c
View File

@ -268,6 +268,8 @@ static int opstart_compl(struct gsm_abis_mo *mo, struct msgb *l1_msg)
{
GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg);
GsmL1_Status_t status = prim_status(l1p);
struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr);
uint8_t tn;
if (status != GsmL1_Status_Success) {
LOGP(DL1C, LOGL_ERROR, "Rx %s, status: %s\n",
@ -282,6 +284,16 @@ static int opstart_compl(struct gsm_abis_mo *mo, struct msgb *l1_msg)
/* Set to Operational State: Enabled */
oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
if (mo->obj_class == NM_OC_RADIO_CARRIER) {
/* Mark Dependency TS as Offline (ready to be Opstarted) */
for (tn = 0; tn < TRX_NR_TS; tn++) {
if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&
trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {
oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
}
}
}
/* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */
if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&
mo->obj_inst.ts_nr == 0) {

12
src/osmo-bts-octphy/l1_oml.c
View File

@ -185,11 +185,23 @@ extern uint8_t rach_detected_Other_g;
static int opstart_compl(struct gsm_abis_mo *mo)
{
struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr);
uint8_t tn;
/* TODO: Send NACK in case of error! */
/* Set to Operational State: Enabled */
oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
if (mo->obj_class == NM_OC_RADIO_CARRIER) {
/* Mark Dependency TS as Offline (ready to be Opstarted) */
for (tn = 0; tn < TRX_NR_TS; tn++) {
if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&
trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {
oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
}
}
}
/* hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */
if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&
mo->obj_inst.ts_nr == 7) {

13
src/osmo-bts-omldummy/bts_model.c
View File

@ -122,9 +122,22 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj)
{
int rc;
struct gsm_bts_trx* trx;
uint8_t tn;
switch (mo->obj_class) {
case NM_OC_RADIO_CARRIER:
trx = (struct gsm_bts_trx*) obj;
/* Mark Dependency TS as Offline (ready to be Opstarted) */
for (tn = 0; tn < TRX_NR_TS; tn++) {
if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&
trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {
oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
}
}
oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
rc = oml_mo_opstart_ack(mo);
break;
case NM_OC_CHANNEL:
case NM_OC_SITE_MANAGER:
case NM_OC_BASEB_TRANSC:

12
src/osmo-bts-sysmo/oml.c
View File

@ -267,6 +267,8 @@ static int opstart_compl(struct gsm_abis_mo *mo, struct msgb *l1_msg)
{
GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg);
GsmL1_Status_t status = prim_status(l1p);
struct gsm_bts_trx *trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr);
uint8_t tn;
if (status != GsmL1_Status_Success) {
LOGP(DL1C, LOGL_ERROR, "Rx %s, status: %s\n",
@ -281,6 +283,16 @@ static int opstart_compl(struct gsm_abis_mo *mo, struct msgb *l1_msg)
/* Set to Operational State: Enabled */
oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
if (mo->obj_class == NM_OC_RADIO_CARRIER) {
/* Mark Dependency TS as Offline (ready to be Opstarted) */
for (tn = 0; tn < TRX_NR_TS; tn++) {
if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&
trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {
oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
}
}
}
/* ugly hack to auto-activate all SAPIs for the BCCH/CCCH on TS0 */
if (mo->obj_class == NM_OC_CHANNEL && mo->obj_inst.trx_nr == 0 &&
mo->obj_inst.ts_nr == 0) {

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

@ -199,6 +199,7 @@ static int trx_init(struct gsm_bts_trx *trx)
struct phy_instance *pinst = trx_phy_instance(trx);
struct trx_l1h *l1h = pinst->u.osmotrx.hdl;
int rc;
uint8_t tn;
rc = osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true);
if (rc != 0)
@ -207,6 +208,14 @@ static int trx_init(struct gsm_bts_trx *trx)
if (trx == trx->bts->c0)
lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]);
/* Mark Dependency TS as Offline (ready to be Opstarted) */
for (tn = 0; tn < TRX_NR_TS; tn++) {
if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&
trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {
oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
}
}
/* Send OPSTART ack */
return oml_mo_opstart_ack(&trx->mo);
}

13
src/osmo-bts-virtual/bts_model.c
View File

@ -139,9 +139,22 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj)
{
int rc;
struct gsm_bts_trx* trx;
uint8_t tn;
switch (mo->obj_class) {
case NM_OC_RADIO_CARRIER:
trx = (struct gsm_bts_trx*) obj;
/* Mark Dependency TS as Offline (ready to be Opstarted) */
for (tn = 0; tn < TRX_NR_TS; tn++) {
if (trx->ts[tn].mo.nm_state.operational == NM_OPSTATE_DISABLED &&
trx->ts[tn].mo.nm_state.availability == NM_AVSTATE_DEPENDENCY) {
oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);
}
}
oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
rc = oml_mo_opstart_ack(mo);
break;
case NM_OC_CHANNEL:
case NM_OC_SITE_MANAGER:
case NM_OC_BASEB_TRANSC: