Change in osmo-bsc[master]: Introduce new signal S_NM_RUNNING_CHG and implement it for rcarrier,b...

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28046 ) Change subject: Introduce new signal S_NM_RUNNING_CHG and implement it for rcarrier,bbtransc ...................................................................... Introduce new signal S_NM_RUNNING_CHG and implement it for rcarrier,bbtransc This allows different parts of the code to hook to some signals which allow start/stopping processes based, for instance, on whether C0 is available or not. This can be later used by paging or CBSP code. Also ACC code can be ported to this new system (acc_ramp_nm_sig_cb()). Same signal can be used for other NM objects, but is left unimplemented until there's use for them. Change-Id: I206d4c7863a77fbab6a600126742a6a6b8fc3614 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c 3 files changed, 78 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/28046/1 diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 60ba868..26b2fd7 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -77,6 +77,7 @@ S_NM_SET_RADIO_ATTR_ACK, /* Received Set Radio Carrier Attributes Ack, arg is struct msgb *oml_msg */ S_NM_SET_CHAN_ATTR_ACK, /* Received Set Radio Channel Attributes Ack, arg is struct msgb *oml_msg */ S_NM_SET_BTS_ATTR_ACK, /* Received Set BTS Attributes Ack, arg is struct msgb *oml_msg */ + S_NM_RUNNING_CHG, /* Object moves from/to NM running state (op=Enabled admm=Unlocked avail=OK) */ }; /* SS_LCHAN signals */ @@ -140,6 +141,14 @@ struct abis_om2k_mo *om2k_mo; }; +/* data for <SS_NM, S_NM_RUNNING_CHG>: */ +struct nm_running_chg_signal_data { + struct gsm_bts *bts; + uint8_t obj_class; + void *obj; + bool running; +}; + struct nm_om2k_signal_data { struct gsm_bts *bts; void *obj; diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index a4cef9c..9244134 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -40,6 +40,31 @@ #define nm_bb_transc_fsm_state_chg(fi, NEXT_STATE) \ osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0) +static void nm_obj_becomes_enabled_disabled(struct gsm_bts_bb_trx *bb_transc, bool running) +{ + struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc); + struct nm_running_chg_signal_data nsd; + + memset(&nsd, 0, sizeof(nsd)); + + nsd.bts = trx->bts; + nsd.obj_class = NM_OC_BASEB_TRANSC; + nsd.obj = bb_transc; + nsd.running = running; + + osmo_signal_dispatch(SS_NM, S_NM_RUNNING_CHG, &nsd); +} + +static inline void nm_obj_becomes_enabled(struct gsm_bts_bb_trx *bb_transc) +{ + nm_obj_becomes_enabled_disabled(bb_transc, true); +} + +static inline void nm_obj_becomes_disabled(struct gsm_bts_bb_trx *bb_transc) +{ + nm_obj_becomes_enabled_disabled(bb_transc, false); +} + ////////////////////////// // FSM STATE ACTIONS ////////////////////////// @@ -243,13 +268,16 @@ bb_transc->mo.get_attr_rep_received = false; bb_transc->mo.opstart_sent = false; bb_transc->mo.adm_unlock_sent = false; + nm_obj_becomes_enabled(bb_transc); } static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; + switch (event) { case NM_EV_STATE_CHG_REP: nsd = (struct nm_statechg_signal_data *)data; @@ -259,13 +287,16 @@ switch (new_state->availability) { /* operational = DISABLED */ case NM_AVSTATE_NOT_INSTALLED: case NM_AVSTATE_POWER_OFF: + nm_obj_becomes_disabled(bb_transc); nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED); return; case NM_AVSTATE_DEPENDENCY: + nm_obj_becomes_disabled(bb_transc); nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY); return; case NM_AVSTATE_OFF_LINE: case NM_AVSTATE_OK: + nm_obj_becomes_disabled(bb_transc); nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE); return; default: @@ -287,8 +318,11 @@ bb_transc->mo.opstart_sent = false; break; case NM_EV_OML_DOWN: - if (fi->state != NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) + if (fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) { + if (fi->state == NM_RCARRIER_ST_OP_ENABLED) + nm_obj_becomes_disabled(bb_transc); nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED); + } break; default: OSMO_ASSERT(0); diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index f3c230d..b3dca81 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -40,6 +40,30 @@ #define nm_rcarrier_fsm_state_chg(fi, NEXT_STATE) \ osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0) +static void nm_obj_becomes_enabled_disabled(struct gsm_bts_trx *trx, bool running) +{ + struct nm_running_chg_signal_data nsd; + + memset(&nsd, 0, sizeof(nsd)); + + nsd.bts = trx->bts; + nsd.obj_class = NM_OC_RADIO_CARRIER; + nsd.obj = trx; + nsd.running = running; + + osmo_signal_dispatch(SS_NM, S_NM_RUNNING_CHG, &nsd); +} + +static inline void nm_obj_becomes_enabled(struct gsm_bts_trx *trx) +{ + nm_obj_becomes_enabled_disabled(trx, true); +} + +static inline void nm_obj_becomes_disabled(struct gsm_bts_trx *trx) +{ + nm_obj_becomes_enabled_disabled(trx, false); +} + ////////////////////////// // FSM STATE ACTIONS ////////////////////////// @@ -228,10 +252,13 @@ trx->mo.adm_unlock_sent = false; trx->mo.set_attr_ack_received = false; trx->mo.set_attr_sent = false; + + nm_obj_becomes_enabled(trx); } static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; @@ -244,13 +271,16 @@ switch (new_state->availability) { /* operational = DISABLED */ case NM_AVSTATE_NOT_INSTALLED: case NM_AVSTATE_POWER_OFF: + nm_obj_becomes_disabled(trx); nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED); return; case NM_AVSTATE_DEPENDENCY: + nm_obj_becomes_disabled(trx); nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY); return; case NM_AVSTATE_OFF_LINE: case NM_AVSTATE_OK: + nm_obj_becomes_disabled(trx); nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); return; default: @@ -278,8 +308,11 @@ trx->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED); break; case NM_EV_OML_DOWN: - if (fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) + if (fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED) { + if (fi->state == NM_RCARRIER_ST_OP_ENABLED) + nm_obj_becomes_disabled(trx); nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED); + } break; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I206d4c7863a77fbab6a600126742a6a6b8fc3614 Gerrit-Change-Number: 28046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: newchange