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

[S] Change in osmo-bts[master]: pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32264 ) Change subject: pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context ...................................................................... pcu_sock: Allocate pcu_sock_state using g_bts_sm talloc context Change-Id: I29eae7bcc66dc5e646b8a4703871682202259bed --- M src/common/pcu_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index e7bedd1..7d0c796 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1178,7 +1178,7 @@ struct osmo_fd *bfd; int rc; - state = talloc_zero(NULL, struct pcu_sock_state); + state = talloc_zero(g_bts_sm, struct pcu_sock_state); if (!state) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29eae7bcc66dc5e646b8a4703871682202259bed Gerrit-Change-Number: 32264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

[S] Change in osmo-bts[master]: Move pcu_sock_state to gprs section of bts_sm
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32263 ) Change subject: Move pcu_sock_state to gprs section of bts_sm ...................................................................... Move pcu_sock_state to gprs section of bts_sm Change-Id: I7d739287fd11f81ce657bac362e55fa822fb0ef5 --- M include/osmo-bts/bts_sm.h M src/common/pcu_sock.c 2 files changed, 16 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/bts_sm.h b/include/osmo-bts/bts_sm.h index 3106115..e6610a5 100644 --- a/include/osmo-bts/bts_sm.h +++ b/include/osmo-bts/bts_sm.h @@ -37,8 +37,8 @@ struct llist_head bts_list; unsigned int num_bts; struct osmo_plmn_id plmn; - struct pcu_sock_state *pcu_state; struct { + struct pcu_sock_state *pcu_state; struct gsm_gprs_nse nse; } gprs; }; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index fe2dc17..e7bedd1 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -585,7 +585,7 @@ int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_pag_req *pag_req; @@ -955,7 +955,7 @@ int pcu_sock_send(struct msgb *msg) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct osmo_fd *conn_bfd; struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data; @@ -1209,7 +1209,7 @@ osmo_signal_register_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); - g_bts_sm->pcu_state = state; + g_bts_sm->gprs.pcu_state = state; LOGP(DPCU, LOGL_INFO, "Started listening on PCU socket: %s\n", path); @@ -1218,7 +1218,7 @@ void pcu_sock_exit(void) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct osmo_fd *bfd, *conn_bfd; if (!state) @@ -1232,11 +1232,11 @@ close(bfd->fd); osmo_fd_unregister(bfd); talloc_free(state); - g_bts_sm->pcu_state = NULL; + g_bts_sm->gprs.pcu_state = NULL; } bool pcu_connected(void) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; if (!state) return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7d739287fd11f81ce657bac362e55fa822fb0ef5 Gerrit-Change-Number: 32263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

[S] Change in osmo-bts[master]: Drop NM_EV_BBTRANSC_INSTALLED in favour of generic NM_EV_SW_ACT
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32241 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Drop NM_EV_BBTRANSC_INSTALLED in favour of generic NM_EV_SW_ACT ...................................................................... Drop NM_EV_BBTRANSC_INSTALLED in favour of generic NM_EV_SW_ACT All the other objects already use that one; there's no need to have a specific one for the NM Channel FSM. Change-Id: Ic5fd37367b500c75a0a53b1d868ba2aed3edef1b --- M include/osmo-bts/nm_common_fsm.h M src/common/nm_bb_transc_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_common_fsm.c 4 files changed, 15 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h index 85db0de..4d44402 100644 --- a/include/osmo-bts/nm_common_fsm.h +++ b/include/osmo-bts/nm_common_fsm.h @@ -41,7 +41,6 @@ NM_EV_PHYLINK_UP, /* RadioCarrier and BaseBand Transceiver only */ NM_EV_PHYLINK_DOWN, /* RadioCarrier and BaseBand Transceiver only */ NM_EV_DISABLE, /* RadioCarrier and BaseBand Transceiver only */ - NM_EV_BBTRANSC_INSTALLED, /* Radio Channel only */ NM_EV_BBTRANSC_ENABLED, /* Radio Channel only */ NM_EV_BBTRANSC_DISABLED, /* Radio Channel only */ NM_EV_RCARRIER_ENABLED, /* Radio Channel only */ diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index e51a151..6fdddbe 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -70,17 +70,12 @@ static void st_op_disabled_notinstalled(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 gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc); - int i; switch (event) { case NM_EV_SW_ACT: oml_mo_tx_sw_act_rep(&bb_transc->mo); nm_bb_transc_fsm_state_chg(fi, NM_BBTRANSC_ST_OP_DISABLED_OFFLINE); - for (i = 0; i < TRX_NR_TS; i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_BBTRANSC_INSTALLED, NULL); - } + ev_dispatch_children(bb_transc, event); return; case NM_EV_RSL_UP: return; diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 252df83..9e22fee 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -71,7 +71,7 @@ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; switch (event) { - case NM_EV_BBTRANSC_INSTALLED: + case NM_EV_SW_ACT: oml_mo_tx_sw_act_rep(&ts->mo); if (ts_can_be_enabled(ts)) nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); @@ -227,7 +227,7 @@ static struct osmo_fsm_state nm_chan_fsm_states[] = { [NM_CHAN_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = - X(NM_EV_BBTRANSC_INSTALLED), + X(NM_EV_SW_ACT), .out_state_mask = X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) | X(NM_CHAN_ST_OP_DISABLED_OFFLINE) | diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c index f742357..220ac76 100644 --- a/src/common/nm_common_fsm.c +++ b/src/common/nm_common_fsm.c @@ -36,7 +36,6 @@ { NM_EV_PHYLINK_UP, "PHYLINK_UP" }, { NM_EV_PHYLINK_DOWN, "PHYLINK_DOWN" }, { NM_EV_DISABLE, "DISABLE" }, - { NM_EV_BBTRANSC_INSTALLED, "BBTRANSC_INSTALLED" }, { NM_EV_BBTRANSC_ENABLED, "BBTRANSC_ENABLED" }, { NM_EV_BBTRANSC_DISABLED, "BBTRANSC_DISABLED" }, { NM_EV_RCARRIER_ENABLED, "RCARRIER_ENABLED" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic5fd37367b500c75a0a53b1d868ba2aed3edef1b Gerrit-Change-Number: 32241 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bts[master]: Move GPRS NSE under BTS SiteMgr
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32240 ) Change subject: Move GPRS NSE under BTS SiteMgr ...................................................................... Move GPRS NSE under BTS SiteMgr As per ipaccess expectancies and following TS 12.21. Change-Id: If44d8f256cab7b2660900cedfb0ed9fe67eb3420 --- M include/osmo-bts/bts.h M include/osmo-bts/bts_sm.h M src/common/bts.c M src/common/bts_sm.c M src/common/nm_bts_sm_fsm.c M src/common/nm_gprs_cell_fsm.c M src/common/nm_gprs_nse_fsm.c M src/common/nm_gprs_nsvc_fsm.c M src/common/oml.c M src/common/pcu_sock.c M src/common/vty.c 11 files changed, 88 insertions(+), 65 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index b792fe9..6b5fe6f 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -119,27 +119,6 @@ } pf; }; -/* GPRS NSVC; ip.access specific NM Object */ -struct gsm_gprs_nse; -struct gsm_gprs_nsvc { - struct gsm_abis_mo mo; - struct gsm_gprs_nse *nse; - /* data read via VTY config file, to configure the BTS - * via OML from BSC */ - int id; - uint16_t nsvci; - struct osmo_sockaddr local; /* on the BTS */ - struct osmo_sockaddr remote; /* on the SGSN */ -}; - -/* GPRS NSE; ip.access specific NM Object */ -struct gsm_gprs_nse { - struct gsm_abis_mo mo; - uint16_t nsei; - uint8_t timer[7]; - struct gsm_gprs_nsvc nsvc[2]; -}; - /* GPRS CELL; ip.access specific NM Object */ struct gsm_gprs_cell { struct gsm_abis_mo mo; @@ -236,7 +215,6 @@ /* Not entirely sure how ip.access specific this is */ struct { - struct gsm_gprs_nse nse; struct gsm_gprs_cell cell; uint8_t rac; } gprs; @@ -394,11 +372,6 @@ #define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) #define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) -static inline struct gsm_bts *gsm_gprs_nse_get_bts(struct gsm_gprs_nse *nse) -{ - return (struct gsm_bts *)container_of(nse, struct gsm_bts, gprs.nse); -} - static inline struct gsm_bts *gsm_gprs_cell_get_bts(struct gsm_gprs_cell *cell) { return (struct gsm_bts *)container_of(cell, struct gsm_bts, gprs.cell); diff --git a/include/osmo-bts/bts_sm.h b/include/osmo-bts/bts_sm.h index 60ee87c..3106115 100644 --- a/include/osmo-bts/bts_sm.h +++ b/include/osmo-bts/bts_sm.h @@ -1,12 +1,36 @@ #pragma once #include <osmocom/core/linuxlist.h> +#include <osmocom/core/socket.h> #include <osmocom/gsm/gsm23003.h> #include <osmo-bts/oml.h> struct pcu_sock_state; +/* GPRS NSVC; ip.access specific NM Object */ +struct gsm_gprs_nse; +struct gsm_gprs_nsvc { + struct gsm_abis_mo mo; + struct gsm_gprs_nse *nse; + /* data read via VTY config file, to configure the BTS + * via OML from BSC */ + int id; + uint16_t nsvci; + struct osmo_sockaddr local; /* on the BTS */ + struct osmo_sockaddr remote; /* on the SGSN */ +}; + +/* GPRS NSE; ip.access specific NM Object */ +struct gsm_gprs_nse { + struct gsm_abis_mo mo; + uint16_t nsei; + uint8_t timer[7]; + struct gsm_gprs_nsvc nsvc[2]; +}; + +struct gsm_bts *gsm_gprs_nse_get_bts(const struct gsm_gprs_nse *nse); + /* BTS Site Manager */ struct gsm_bts_sm { struct gsm_abis_mo mo; @@ -14,6 +38,9 @@ unsigned int num_bts; struct osmo_plmn_id plmn; struct pcu_sock_state *pcu_state; + struct { + struct gsm_gprs_nse nse; + } gprs; }; extern struct gsm_bts_sm *g_bts_sm; diff --git a/src/common/bts.c b/src/common/bts.c index a7178a2..0dd830a 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -145,7 +145,6 @@ {} }; -static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; static const uint8_t bts_cell_timer_default[] = { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; static const struct gprs_rlc_cfg rlc_cfg_default = { @@ -226,8 +225,6 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_bts_sm *bts_sm, uint8_t bts_num) { struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts); - struct gsm_gprs_nse *nse = &bts->gprs.nse; - int i; if (!bts) return NULL; @@ -256,13 +253,6 @@ osmo_fsm_inst_update_id_f(bts->mo.fi, "bts%d", bts->nr); gsm_mo_init(&bts->mo, bts, NM_OC_BTS, bts->nr, 0xff, 0xff); - /* NM GPRS NSE */ - nse->mo.fi = osmo_fsm_inst_alloc(&nm_gprs_nse_fsm, bts, nse, - LOGL_INFO, NULL); - osmo_fsm_inst_update_id_f(nse->mo.fi, "gprs_nse%d", bts->nr); - gsm_mo_init(&nse->mo, bts, NM_OC_GPRS_NSE, bts->nr, 0xff, 0xff); - memcpy(&nse->timer, bts_nse_timer_default, sizeof(nse->timer)); - /* NM GPRS CELL */ bts->gprs.cell.mo.fi = osmo_fsm_inst_alloc(&nm_gprs_cell_fsm, bts, &bts->gprs.cell, LOGL_INFO, NULL); @@ -271,18 +261,6 @@ memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, sizeof(bts->gprs.cell.rlc_cfg)); memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, sizeof(bts->gprs.cell.timer)); - /* NM GPRS NSVCs */ - for (i = 0; i < ARRAY_SIZE(nse->nsvc); i++) { - struct gsm_gprs_nsvc *nsvc = &nse->nsvc[i]; - nsvc->nse = nse; - nsvc->id = i; - nsvc->mo.fi = osmo_fsm_inst_alloc(&nm_gprs_nsvc_fsm, bts, nsvc, - LOGL_INFO, NULL); - osmo_fsm_inst_update_id_f(nsvc->mo.fi, "gprs_nsvc%d-%d", - nse->mo.obj_inst.bts_nr, i); - gsm_mo_init(&nsvc->mo, bts, NM_OC_GPRS_NSVC, nse->mo.obj_inst.bts_nr, i, 0xff); - } - /* create our primary TRX. It will be initialized during bts_init() */ bts->c0 = gsm_bts_trx_alloc(bts); if (!bts->c0) { @@ -371,12 +349,7 @@ /* Start with the BTS */ oml_mo_state_init(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); - oml_mo_state_init(&bts->gprs.nse.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); oml_mo_state_init(&bts->gprs.cell.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); - for (i = 0; i < ARRAY_SIZE(bts->gprs.nse.nsvc); i++) { - struct gsm_gprs_nsvc *nsvc = &bts->gprs.nse.nsvc[i]; - oml_mo_state_init(&nsvc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); - } /* allocate a talloc pool for ORTP to ensure it doesn't have to go back * to the libc malloc all the time */ diff --git a/src/common/bts_sm.c b/src/common/bts_sm.c index a5ddd3a..63200ef 100644 --- a/src/common/bts_sm.c +++ b/src/common/bts_sm.c @@ -29,6 +29,13 @@ struct gsm_bts_sm *g_bts_sm; +static const uint8_t nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; + +struct gsm_bts *gsm_gprs_nse_get_bts(const struct gsm_gprs_nse *nse) +{ + return gsm_bts_num(g_bts_sm, nse->mo.obj_inst.bts_nr); +} + static int gsm_bts_sm_talloc_destructor(struct gsm_bts_sm *bts_sm) { struct gsm_bts *bts; @@ -47,6 +54,8 @@ struct gsm_bts_sm *gsm_bts_sm_alloc(void *talloc_ctx) { struct gsm_bts_sm *bts_sm = talloc_zero(talloc_ctx, struct gsm_bts_sm); + struct gsm_gprs_nse *nse = &bts_sm->gprs.nse; + unsigned int i; if (!bts_sm) return NULL; @@ -60,8 +69,27 @@ LOGL_INFO, "bts_sm"); gsm_mo_init(&bts_sm->mo, NULL, NM_OC_SITE_MANAGER, 0xff, 0xff, 0xff); - oml_mo_state_init(&bts_sm->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + /* NM GPRS NSE */ + nse->mo.fi = osmo_fsm_inst_alloc(&nm_gprs_nse_fsm, bts_sm, nse, + LOGL_INFO, "gprs_nse0"); + gsm_mo_init(&nse->mo, NULL, NM_OC_GPRS_NSE, 0, 0xff, 0xff); + oml_mo_state_init(&nse->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + memcpy(&nse->timer, nse_timer_default, sizeof(nse->timer)); + + /* NM GPRS NSVCs */ + for (i = 0; i < ARRAY_SIZE(nse->nsvc); i++) { + struct gsm_gprs_nsvc *nsvc = &nse->nsvc[i]; + nsvc->nse = nse; + nsvc->id = i; + nsvc->mo.fi = osmo_fsm_inst_alloc(&nm_gprs_nsvc_fsm, bts_sm, nsvc, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(nsvc->mo.fi, "gprs_nsvc%d-%d", + nse->mo.obj_inst.bts_nr, i); + gsm_mo_init(&nsvc->mo, NULL, NM_OC_GPRS_NSVC, nse->mo.obj_inst.bts_nr, i, 0xff); + oml_mo_state_init(&nsvc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + } + return bts_sm; } diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c index 586cfb1..01f5f99 100644 --- a/src/common/nm_bts_sm_fsm.c +++ b/src/common/nm_bts_sm_fsm.c @@ -46,8 +46,8 @@ static void ev_dispatch_children(struct gsm_bts_sm *site_mgr, uint32_t event) { struct gsm_bts *bts; + osmo_fsm_inst_dispatch(site_mgr->gprs.nse.mo.fi, event, NULL); llist_for_each_entry(bts, &site_mgr->bts_list, list) { - osmo_fsm_inst_dispatch(bts->gprs.nse.mo.fi, event, NULL); osmo_fsm_inst_dispatch(bts->mo.fi, event, NULL); } } diff --git a/src/common/nm_gprs_cell_fsm.c b/src/common/nm_gprs_cell_fsm.c index 036df3e..aaebe59 100644 --- a/src/common/nm_gprs_cell_fsm.c +++ b/src/common/nm_gprs_cell_fsm.c @@ -32,6 +32,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/rsl.h> #include <osmo-bts/nm_common_fsm.h> @@ -44,7 +45,7 @@ static bool gprs_cell_can_be_enabled(struct gsm_gprs_cell *cell) { struct gsm_bts *bts = gsm_gprs_cell_get_bts(cell); - return bts->gprs.nse.mo.nm_state.operational == NM_OPSTATE_ENABLED; + return bts->site_mgr->gprs.nse.mo.nm_state.operational == NM_OPSTATE_ENABLED; } diff --git a/src/common/nm_gprs_nse_fsm.c b/src/common/nm_gprs_nse_fsm.c index 4f02078..fa9c651 100644 --- a/src/common/nm_gprs_nse_fsm.c +++ b/src/common/nm_gprs_nse_fsm.c @@ -32,6 +32,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/rsl.h> #include <osmo-bts/nm_common_fsm.h> #include <osmo-bts/phy_link.h> diff --git a/src/common/nm_gprs_nsvc_fsm.c b/src/common/nm_gprs_nsvc_fsm.c index 5a7967d..05d7ff1 100644 --- a/src/common/nm_gprs_nsvc_fsm.c +++ b/src/common/nm_gprs_nsvc_fsm.c @@ -32,6 +32,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/rsl.h> #include <osmo-bts/nm_common_fsm.h> diff --git a/src/common/oml.c b/src/common/oml.c index 4190727..2d6694a 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1760,15 +1760,19 @@ mo = &g_bts_sm->mo; break; case NM_OC_GPRS_NSE: - mo = &bts->gprs.nse.mo; + if (obj_inst->bts_nr > 0) + return NULL; + mo = &g_bts_sm->gprs.nse.mo; break; case NM_OC_GPRS_CELL: mo = &bts->gprs.cell.mo; break; case NM_OC_GPRS_NSVC: - if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nse.nsvc)) + if (obj_inst->bts_nr > 0) return NULL; - mo = &bts->gprs.nse.nsvc[obj_inst->trx_nr].mo; + if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) + return NULL; + mo = &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr].mo; break; } return mo; @@ -1827,15 +1831,19 @@ obj = g_bts_sm; break; case NM_OC_GPRS_NSE: - obj = &bts->gprs.nse; + if (obj_inst->bts_nr > 0) + return NULL; + obj = &g_bts_sm->gprs.nse; break; case NM_OC_GPRS_CELL: obj = &bts->gprs.cell; break; case NM_OC_GPRS_NSVC: - if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nse.nsvc)) + if (obj_inst->bts_nr > 0) return NULL; - obj = &bts->gprs.nse.nsvc[obj_inst->trx_nr]; + if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) + return NULL; + obj = &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr]; break; } return obj; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index bccef97..fe2dc17 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -242,9 +242,9 @@ LOGP(DPCU, LOGL_INFO, "Sending info\n"); + nse = &g_bts_sm->gprs.nse; /* FIXME: allow multiple BTS */ bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); - nse = &bts->gprs.nse; rlcc = &bts->gprs.cell.rlc_cfg; msg = pcu_msgb_alloc(PCU_IF_MSG_INFO_IND, bts->nr); diff --git a/src/common/vty.c b/src/common/vty.c index 051ad92..fd28828 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1352,7 +1352,7 @@ static void gprs_dump_vty(struct vty *vty, const struct gsm_bts *bts) { unsigned int i; - const struct gsm_gprs_nse *nse = &bts->gprs.nse; + const struct gsm_gprs_nse *nse = &bts->site_mgr->gprs.nse; /* GPRS parameters received from the BSC */ vty_out(vty, "BTS %u, RAC %u, NSEI %u, BVCI %u%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If44d8f256cab7b2660900cedfb0ed9fe67eb3420 Gerrit-Change-Number: 32240 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in osmo-bts[master]: Merge gsm_network into gsm_bts_sm and place gsm_bts under it
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32236 ) Change subject: Merge gsm_network into gsm_bts_sm and place gsm_bts under it ...................................................................... Merge gsm_network into gsm_bts_sm and place gsm_bts under it This way the data model in TS 12.21 (Figure 1) is followed, where there's a BTS Site Manager containing one or more BTS. In our case we only support 1 BTS (cell) so far. Change-Id: Ideb0d458ec631008223f861cf8b46d09524a1a21 Related: OS#5994 --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts.h A include/osmo-bts/bts_sm.h M include/osmo-bts/gsm_data.h M include/osmo-bts/pcu_if.h M include/osmo-bts/vty.h M src/common/Makefile.am M src/common/abis_osmo.c M src/common/bts.c M src/common/bts_shutdown_fsm.c A src/common/bts_sm.c M src/common/main.c M src/common/nm_bts_sm_fsm.c M src/common/oml.c M src/common/pcu_sock.c M src/common/vty.c M src/osmo-bts-oc2g/oc2gbts_vty.c M src/osmo-bts-omldummy/main.c M tests/agch/agch_test.c M tests/cipher/cipher_test.c M tests/handover/handover_test.c M tests/meas/meas_test.c M tests/misc/misc_test.c M tests/paging/paging_test.c M tests/tx_power/tx_power_test.c 25 files changed, 272 insertions(+), 161 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index 91ff852..f24da53 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -4,6 +4,7 @@ bts.h \ bts_model.h \ bts_shutdown_fsm.h \ + bts_sm.h \ bts_trx.h \ gsm_data.h \ logging.h \ diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 6a4d23e..b792fe9 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -119,11 +119,6 @@ } pf; }; -/* BTS Site Manager */ -struct gsm_bts_sm { - struct gsm_abis_mo mo; -}; - /* GPRS NSVC; ip.access specific NM Object */ struct gsm_gprs_nse; struct gsm_gprs_nsvc { @@ -161,7 +156,7 @@ /* One BTS */ struct gsm_bts { - /* list header in net->bts_list */ + /* list header in g_bts_sm->bts_list */ struct llist_head list; /* number of the BTS in network */ @@ -211,7 +206,7 @@ /* CCCH is on C0 */ struct gsm_bts_trx *c0; - struct gsm_bts_sm site_mgr; + struct gsm_bts_sm *site_mgr; /* bitmask of all SI that are present/valid in si_buf */ uint32_t si_valid; @@ -399,10 +394,6 @@ #define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) #define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) -static inline struct gsm_bts *gsm_bts_sm_get_bts(struct gsm_bts_sm *site_mgr) { - return (struct gsm_bts *)container_of(site_mgr, struct gsm_bts, site_mgr); -} - static inline struct gsm_bts *gsm_gprs_nse_get_bts(struct gsm_gprs_nse *nse) { return (struct gsm_bts *)container_of(nse, struct gsm_bts, gprs.nse); @@ -413,8 +404,8 @@ return (struct gsm_bts *)container_of(cell, struct gsm_bts, gprs.cell); } -struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num); -struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num); +struct gsm_bts *gsm_bts_alloc(struct gsm_bts_sm *bts_sm, uint8_t bts_num); +struct gsm_bts *gsm_bts_num(const struct gsm_bts_sm *bts_sm, int num); int bts_init(struct gsm_bts *bts); void bts_shutdown(struct gsm_bts *bts, const char *reason); diff --git a/include/osmo-bts/bts_sm.h b/include/osmo-bts/bts_sm.h new file mode 100644 index 0000000..60ee87c --- /dev/null +++ b/include/osmo-bts/bts_sm.h @@ -0,0 +1,21 @@ +#pragma once + +#include <osmocom/core/linuxlist.h> +#include <osmocom/gsm/gsm23003.h> + +#include <osmo-bts/oml.h> + +struct pcu_sock_state; + +/* BTS Site Manager */ +struct gsm_bts_sm { + struct gsm_abis_mo mo; + struct llist_head bts_list; + unsigned int num_bts; + struct osmo_plmn_id plmn; + struct pcu_sock_state *pcu_state; +}; + +extern struct gsm_bts_sm *g_bts_sm; + +struct gsm_bts_sm *gsm_bts_sm_alloc(void *talloc_ctx); diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 5bf6f02..b20f3ea 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -41,12 +41,6 @@ #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41 #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91 -struct gsm_network { - struct llist_head bts_list; - unsigned int num_bts; - struct osmo_plmn_id plmn; - struct pcu_sock_state *pcu_state; -}; /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1: 4-bit index is used (2#1111 = 10#15) */ diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 6cdc682..8e3b3ba 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -3,6 +3,8 @@ #include <osmo-bts/pcuif_proto.h> +struct gsm_bts_sm; + extern int pcu_direct; #define PCUIF_HDR_SIZE (sizeof(struct gsm_pcu_if) - sizeof(((struct gsm_pcu_if *)0)->u)) @@ -23,7 +25,7 @@ int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); -int pcu_sock_send(struct gsm_network *net, struct msgb *msg); +int pcu_sock_send(struct msgb *msg); int pcu_sock_init(const char *path); void pcu_sock_exit(void); diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index 7835156..4716f7c 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -25,8 +25,6 @@ int bts_vty_init(void *ctx); -struct gsm_network *gsmnet_from_vty(struct vty *v); - extern struct vty_app_info bts_vty_info; extern struct gsm_bts *g_bts; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index f082543..830f940 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -33,6 +33,7 @@ oml.c \ osmux.c \ bts.c \ + bts_sm.c \ bts_trx.c \ rsl.c \ vty.c \ diff --git a/src/common/abis_osmo.c b/src/common/abis_osmo.c index 46dc5fa..a20dd6d 100644 --- a/src/common/abis_osmo.c +++ b/src/common/abis_osmo.c @@ -30,8 +30,7 @@ #include <osmo-bts/logging.h> #include <osmo-bts/pcu_if.h> #include <osmo-bts/pcuif_proto.h> - -extern struct gsm_network bts_gsmnet; +#include <osmo-bts/bts_sm.h> #define OM_HEADROOM_SIZE 128 @@ -106,7 +105,7 @@ /* Trim Abis lower layers: */ msgb_pull_to_l2(msg); /* we simply forward it to PCUIF: */ - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } /* incoming IPA/OSMO extension Abis message from BSC */ diff --git a/src/common/bts.c b/src/common/bts.c index 37a3023..a7178a2 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -44,6 +44,7 @@ #include <osmo-bts/abis.h> #include <osmo-bts/bts.h> #include <osmo-bts/bts_model.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/dtx_dl_amr_fsm.h> #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/rsl.h> @@ -61,11 +62,6 @@ static void bts_update_agch_max_queue_length(struct gsm_bts *bts); -struct gsm_network bts_gsmnet = { - .bts_list = { &bts_gsmnet.bts_list, &bts_gsmnet.bts_list }, - .num_bts = 0, -}; - void *tall_bts_ctx; /* Table 3.1 TS 04.08: Values of parameter S */ @@ -212,10 +208,6 @@ static int gsm_bts_talloc_destructor(struct gsm_bts *bts) { - if (bts->site_mgr.mo.fi) { - osmo_fsm_inst_free(bts->site_mgr.mo.fi); - bts->site_mgr.mo.fi = NULL; - } if (bts->mo.fi) { osmo_fsm_inst_free(bts->mo.fi); bts->mo.fi = NULL; @@ -231,9 +223,9 @@ return 0; } -struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) +struct gsm_bts *gsm_bts_alloc(struct gsm_bts_sm *bts_sm, uint8_t bts_num) { - struct gsm_bts *bts = talloc_zero(ctx, struct gsm_bts); + struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts); struct gsm_gprs_nse *nse = &bts->gprs.nse; int i; @@ -243,8 +235,9 @@ talloc_set_destructor(bts, gsm_bts_talloc_destructor); /* add to list of BTSs */ - llist_add_tail(&bts->list, &bts_gsmnet.bts_list); + llist_add_tail(&bts->list, &bts_sm->bts_list); + bts->site_mgr = bts_sm; bts->nr = bts_num; bts->num_trx = 0; INIT_LLIST_HEAD(&bts->trx_list); @@ -257,12 +250,6 @@ LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(bts->shutdown_fi, "bts%d", bts->nr); - /* NM SITE_MGR */ - bts->site_mgr.mo.fi = osmo_fsm_inst_alloc(&nm_bts_sm_fsm, bts, &bts->site_mgr, - LOGL_INFO, "bts_sm"); - gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, - 0xff, 0xff, 0xff); - /* NM BTS */ bts->mo.fi = osmo_fsm_inst_alloc(&nm_bts_fsm, bts, bts, LOGL_INFO, NULL); @@ -310,14 +297,14 @@ return bts; } -struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num) +struct gsm_bts *gsm_bts_num(const struct gsm_bts_sm *bts_sm, int num) { struct gsm_bts *bts; - if (num >= net->num_bts) + if (num >= bts_sm->num_bts) return NULL; - llist_for_each_entry(bts, &net->bts_list, list) { + llist_for_each_entry(bts, &bts_sm->bts_list, list) { if (bts->nr == num) return bts; } @@ -382,8 +369,7 @@ bts->radio_link_timeout.oml = 32; bts->radio_link_timeout.current = bts->radio_link_timeout.oml; - /* Start with the site manager */ - oml_mo_state_init(&bts->site_mgr.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + /* Start with the BTS */ oml_mo_state_init(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); oml_mo_state_init(&bts->gprs.nse.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); oml_mo_state_init(&bts->gprs.cell.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); @@ -417,7 +403,7 @@ /* TRX0 was allocated early during gsm_bts_alloc, not later through VTY */ bts_model_trx_init(bts->c0); - bts_gsmnet.num_bts++; + g_bts_sm->num_bts++; if (!initialized) { osmo_signal_register_handler(SS_GLOBAL, bts_signal_cbfn, NULL); @@ -456,7 +442,7 @@ LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status.\n"); /* BTS SITE MGR becomes Offline (tx SW ACT Report), BTS, NSE, etc. is DEPENDENCY */ - osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SW_ACT, NULL); + osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT, NULL); /* All other objects start off-line until the BTS Model code says otherwise */ for (i = 0; i < bts->num_trx; i++) { diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index 55e0b19..eb432a9 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -29,6 +29,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/nm_common_fsm.h> #define X(s) (1 << (s)) @@ -60,7 +61,7 @@ switch(event) { case BTS_SHUTDOWN_EV_START: /* Firt announce to NM objects that we are starting a shutdown procedure: */ - osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SHUTDOWN_START, NULL); + osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SHUTDOWN_START, NULL); count = count_trx_operational(bts); if (count) { @@ -164,7 +165,7 @@ { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; - osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SHUTDOWN_FINISH, NULL); + osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SHUTDOWN_FINISH, NULL); if (bts->shutdown_fi_exit_proc) { LOGPFSML(fi, LOGL_NOTICE, "Shutdown process completed successfully, exiting process\n"); diff --git a/src/common/bts_sm.c b/src/common/bts_sm.c new file mode 100644 index 0000000..a5ddd3a --- /dev/null +++ b/src/common/bts_sm.c @@ -0,0 +1,67 @@ +/* BTS support code common to all supported BTS models */ + +/* (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/talloc.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/fsm.h> + +#include <osmo-bts/bts_sm.h> +#include <osmo-bts/bts.h> +#include <osmo-bts/nm_common_fsm.h> + +struct gsm_bts_sm *g_bts_sm; + +static int gsm_bts_sm_talloc_destructor(struct gsm_bts_sm *bts_sm) +{ + struct gsm_bts *bts; + + while ((bts = llist_first_entry_or_null(&bts_sm->bts_list, struct gsm_bts, list))) + talloc_free(bts); + + if (bts_sm->mo.fi) { + osmo_fsm_inst_free(bts_sm->mo.fi); + bts_sm->mo.fi = NULL; + } + + return 0; +} + +struct gsm_bts_sm *gsm_bts_sm_alloc(void *talloc_ctx) +{ + struct gsm_bts_sm *bts_sm = talloc_zero(talloc_ctx, struct gsm_bts_sm); + + if (!bts_sm) + return NULL; + + talloc_set_destructor(bts_sm, gsm_bts_sm_talloc_destructor); + + INIT_LLIST_HEAD(&bts_sm->bts_list); + + /* NM SITE_MGR */ + bts_sm->mo.fi = osmo_fsm_inst_alloc(&nm_bts_sm_fsm, bts_sm, bts_sm, + LOGL_INFO, "bts_sm"); + gsm_mo_init(&bts_sm->mo, NULL, NM_OC_SITE_MANAGER, + 0xff, 0xff, 0xff); + + oml_mo_state_init(&bts_sm->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + + return bts_sm; +} diff --git a/src/common/main.c b/src/common/main.c index 074ab22..ed11956 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -49,6 +49,7 @@ #include <osmo-bts/logging.h> #include <osmo-bts/abis.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/vty.h> #include <osmo-bts/l1sap.h> #include <osmo-bts/bts_model.h> @@ -292,7 +293,13 @@ if (vty_test_mode) fprintf(stderr, "--- VTY test mode: not connecting to BSC, not exiting ---\n"); - g_bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + if (!g_bts_sm) { + fprintf(stderr, "Failed to create BTS Site Manager structure\n"); + exit(1); + } + + g_bts = gsm_bts_alloc(g_bts_sm, 0); if (!g_bts) { fprintf(stderr, "Failed to create BTS structure\n"); exit(1); diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c index 8752a90..586cfb1 100644 --- a/src/common/nm_bts_sm_fsm.c +++ b/src/common/nm_bts_sm_fsm.c @@ -32,6 +32,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/rsl.h> #include <osmo-bts/nm_common_fsm.h> #include <osmo-bts/phy_link.h> @@ -44,9 +45,11 @@ static void ev_dispatch_children(struct gsm_bts_sm *site_mgr, uint32_t event) { - struct gsm_bts *bts = gsm_bts_sm_get_bts(site_mgr); - osmo_fsm_inst_dispatch(bts->gprs.nse.mo.fi, event, NULL); - osmo_fsm_inst_dispatch(bts->mo.fi, event, NULL); + struct gsm_bts *bts; + llist_for_each_entry(bts, &site_mgr->bts_list, list) { + osmo_fsm_inst_dispatch(bts->gprs.nse.mo.fi, event, NULL); + osmo_fsm_inst_dispatch(bts->mo.fi, event, NULL); + } } ////////////////////////// diff --git a/src/common/oml.c b/src/common/oml.c index 7a237f1..4190727 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -34,6 +34,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> #include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmocom/gsm/abis_nm.h> #include <osmocom/gsm/tlv.h> @@ -46,6 +47,7 @@ #include <osmo-bts/oml.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/signal.h> #include <osmo-bts/phy_link.h> #include <osmo-bts/nm_common_fsm.h> @@ -132,6 +134,7 @@ int oml_mo_send_msg(const struct gsm_abis_mo *mo, struct msgb *msg, uint8_t msg_type) { struct abis_om_fom_hdr *foh; + struct gsm_bts *bts; msg->l3h = msgb_push(msg, sizeof(*foh)); foh = (struct abis_om_fom_hdr *) msg->l3h; @@ -139,8 +142,22 @@ foh->obj_class = mo->obj_class; memcpy(&foh->obj_inst, &mo->obj_inst, sizeof(foh->obj_inst)); - /* FIXME: This assumption may not always be correct */ - msg->trx = mo->bts->c0; + /* Find and set OML TRX on msg: */ + switch (mo->obj_class) { + case NM_OC_SITE_MANAGER: + /* Pick the first BTS: */ + bts = gsm_bts_num(g_bts_sm, 0); + break; + default: + /* Other objects should have a valid BTS available: */ + bts = gsm_bts_num(g_bts_sm, mo->obj_inst.bts_nr); + } + if (OSMO_UNLIKELY(!bts)) { + LOGPFOH(DOML, LOGL_NOTICE, foh, + "Sending FOM failed (no related BTS object found)\n"); + return -EINVAL; + } + msg->trx = bts->c0; DEBUGPFOH(DOML, foh, "Tx %s\n", get_value_string(abis_nm_msgtype_names, foh->msg_type)); @@ -1740,7 +1757,7 @@ mo = &trx->ts[obj_inst->ts_nr].mo; break; case NM_OC_SITE_MANAGER: - mo = &bts->site_mgr.mo; + mo = &g_bts_sm->mo; break; case NM_OC_GPRS_NSE: mo = &bts->gprs.nse.mo; @@ -1807,7 +1824,7 @@ obj = &trx->ts[obj_inst->ts_nr]; break; case NM_OC_SITE_MANAGER: - obj = &bts->site_mgr; + obj = g_bts_sm; break; case NM_OC_GPRS_NSE: obj = &bts->gprs.nse; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index bce067a..bccef97 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -38,6 +38,7 @@ #include <osmo-bts/pcu_if.h> #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/rsl.h> #include <osmo-bts/signal.h> #include <osmo-bts/l1sap.h> @@ -46,7 +47,6 @@ uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx); -extern struct gsm_network bts_gsmnet; int pcu_direct = 0; static int avail_lai = 0, avail_nse = 0, avail_cell = 0, avail_nsvc[2] = {0, 0}; @@ -231,7 +231,6 @@ int pcu_tx_info_ind(void) { - struct gsm_network *net = &bts_gsmnet; struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_info_ind *info_ind; @@ -244,7 +243,7 @@ LOGP(DPCU, LOGL_INFO, "Sending info\n"); /* FIXME: allow multiple BTS */ - bts = llist_entry(net->bts_list.next, struct gsm_bts, list); + bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); nse = &bts->gprs.nse; rlcc = &bts->gprs.cell.rlc_cfg; @@ -266,9 +265,9 @@ info_ind->bsic = bts->bsic; /* RAI */ - info_ind->mcc = net->plmn.mcc; - info_ind->mnc = net->plmn.mnc; - info_ind->mnc_3_digits = net->plmn.mnc_3_digits; + info_ind->mcc = g_bts_sm->plmn.mcc; + info_ind->mnc = g_bts_sm->plmn.mnc; + info_ind->mnc_3_digits = g_bts_sm->plmn.mnc_3_digits; info_ind->lac = bts->location_area_code; info_ind->rac = bts->gprs.rac; @@ -358,13 +357,12 @@ info_ind_fill_trx(&info_ind->trx[trx->nr], trx); } - return pcu_sock_send(net, msg); + return pcu_sock_send(msg); } static int pcu_if_signal_cb(unsigned int subsys, unsigned int signal, void *hdlr_data, void *signal_data) { - struct gsm_network *net = &bts_gsmnet; struct gsm_gprs_nsvc *nsvc; struct gsm_bts *bts; struct gsm48_system_information_type_3 *si3; @@ -380,7 +378,7 @@ break; si3 = (struct gsm48_system_information_type_3 *) bts->si_buf[SYSINFO_TYPE_3]; - osmo_plmn_from_bcd(si3->lai.digits, &net->plmn); + osmo_plmn_from_bcd(si3->lai.digits, &g_bts_sm->plmn); bts->location_area_code = ntohs(si3->lai.lac); bts->cell_identity = ntohs(si3->cell_identity); avail_lai = 1; @@ -436,7 +434,7 @@ ai_req->len = len; memcpy(ai_req->data, app_data, ai_req->len); - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } int pcu_tx_rts_req(struct gsm_bts_trx_ts *ts, uint8_t is_ptcch, uint32_t fn, @@ -463,7 +461,7 @@ rts_req->ts_nr = ts->nr; rts_req->block_nr = block_nr; - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } int pcu_tx_data_ind(struct gsm_bts_trx_ts *ts, uint8_t sapi, uint32_t fn, @@ -498,7 +496,7 @@ memcpy(data_ind->data, data, len); data_ind->len = len; - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } int pcu_tx_rach_ind(uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, @@ -527,7 +525,7 @@ rach_ind->trx_nr = trx_nr; rach_ind->ts_nr = ts_nr; - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } int pcu_tx_time_ind(uint32_t fn) @@ -549,7 +547,7 @@ time_ind->fn = fn; - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn) @@ -582,12 +580,12 @@ interf_ind->interf[tn] = -1 * lchan->meas.interf_meas_avg_dbm; } - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed) { - struct pcu_sock_state *state = bts_gsmnet.pcu_state; + struct pcu_sock_state *state = g_bts_sm->pcu_state; struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_pag_req *pag_req; @@ -615,19 +613,18 @@ pag_req->chan_needed = chan_needed; memcpy(pag_req->identity_lv, identity_lv, identity_lv[0] + 1); - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len) { - struct gsm_network *net = &bts_gsmnet; struct gsm_bts *bts; struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_data *data_cnf; /* FIXME: allow multiple BTS */ - bts = llist_entry(net->bts_list.next, struct gsm_bts, list); + bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); LOGP(DPCU, LOGL_DEBUG, "Sending PCH confirm\n"); @@ -642,7 +639,7 @@ memcpy(data_cnf->data, data, len); data_cnf->len = len; - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } /* forward data from a RR GPRS SUSPEND REQ towards PCU */ @@ -659,7 +656,7 @@ memcpy(pcu_prim->u.susp_req.ra_id, ra_id, sizeof(pcu_prim->u.susp_req.ra_id)); pcu_prim->u.susp_req.cause = cause; - return pcu_sock_send(&bts_gsmnet, msg); + return pcu_sock_send(msg); } static int pcu_rx_data_req(struct gsm_bts *bts, uint8_t msg_type, @@ -897,14 +894,13 @@ return -EINVAL; \ } \ } while (0) -static int pcu_rx(struct gsm_network *net, uint8_t msg_type, - struct gsm_pcu_if *pcu_prim, size_t prim_len) +static int pcu_rx(uint8_t msg_type, struct gsm_pcu_if *pcu_prim, size_t prim_len) { int rc = 0; struct gsm_bts *bts; size_t exp_len; - if ((bts = gsm_bts_num(net, pcu_prim->bts_nr)) == NULL) { + if ((bts = gsm_bts_num(g_bts_sm, pcu_prim->bts_nr)) == NULL) { LOGP(DPCU, LOGL_ERROR, "Received PCU Prim for non-existent BTS %u\n", pcu_prim->bts_nr); return -EINVAL; } @@ -951,15 +947,15 @@ */ struct pcu_sock_state { - struct gsm_network *net; + struct gsm_bts_sm *bts_sm; struct osmo_fd listen_bfd; /* fd for listen socket */ struct osmo_fd conn_bfd; /* fd for connection to lcr */ struct llist_head upqueue; /* queue for sending messages */ }; -int pcu_sock_send(struct gsm_network *net, struct msgb *msg) +int pcu_sock_send(struct msgb *msg) { - struct pcu_sock_state *state = net->pcu_state; + struct pcu_sock_state *state = g_bts_sm->pcu_state; struct osmo_fd *conn_bfd; struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data; @@ -994,7 +990,7 @@ unsigned int tn; /* FIXME: allow multiple BTS */ - bts = llist_entry(state->net->bts_list.next, struct gsm_bts, list); + bts = llist_entry(state->bts_sm->bts_list.next, struct gsm_bts, list); LOGP(DPCU, LOGL_NOTICE, "PCU socket has LOST connection\n"); oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_MAJOR, OSMO_EVT_PCU_VERS, @@ -1073,7 +1069,7 @@ return 0; } - rc = pcu_rx(state->net, pcu_prim->msg_type, pcu_prim, rc); + rc = pcu_rx(pcu_prim->msg_type, pcu_prim, rc); /* as we always synchronously process the message in pcu_rx() and * its callbacks, we can free the message here. */ @@ -1187,7 +1183,7 @@ return -ENOMEM; INIT_LLIST_HEAD(&state->upqueue); - state->net = &bts_gsmnet; + state->bts_sm = g_bts_sm; state->conn_bfd.fd = -1; bfd = &state->listen_bfd; @@ -1213,7 +1209,7 @@ osmo_signal_register_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); - bts_gsmnet.pcu_state = state; + g_bts_sm->pcu_state = state; LOGP(DPCU, LOGL_INFO, "Started listening on PCU socket: %s\n", path); @@ -1222,7 +1218,7 @@ void pcu_sock_exit(void) { - struct pcu_sock_state *state = bts_gsmnet.pcu_state; + struct pcu_sock_state *state = g_bts_sm->pcu_state; struct osmo_fd *bfd, *conn_bfd; if (!state) @@ -1236,12 +1232,11 @@ close(bfd->fd); osmo_fd_unregister(bfd); talloc_free(state); - bts_gsmnet.pcu_state = NULL; + g_bts_sm->pcu_state = NULL; } bool pcu_connected(void) { - struct gsm_network *net = &bts_gsmnet; - struct pcu_sock_state *state = net->pcu_state; + struct pcu_sock_state *state = g_bts_sm->pcu_state; if (!state) return false; diff --git a/src/common/vty.c b/src/common/vty.c index bc2afb6..051ad92 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -50,6 +50,7 @@ #include <osmo-bts/phy_link.h> #include <osmo-bts/abis.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/rsl.h> #include <osmo-bts/oml.h> #include <osmo-bts/signal.h> @@ -174,13 +175,6 @@ }, }; -extern struct gsm_network bts_gsmnet; - -struct gsm_network *gsmnet_from_vty(struct vty *v) -{ - return &bts_gsmnet; -} - static struct cmd_node bts_node = { BTS_NODE, "%s(bts)# ", @@ -506,10 +500,9 @@ static int config_write_bts(struct vty *vty) { - struct gsm_network *net = gsmnet_from_vty(vty); const struct gsm_bts *bts; - llist_for_each_entry(bts, &net->bts_list, list) + llist_for_each_entry(bts, &g_bts_sm->bts_list, list) config_write_bts_single(vty, bts); osmo_tdef_vty_groups_write(vty, ""); @@ -568,16 +561,15 @@ "BTS Number\n", CMD_ATTR_IMMEDIATE) { - struct gsm_network *gsmnet = gsmnet_from_vty(vty); int bts_nr = atoi(argv[0]); struct gsm_bts *bts; - if (bts_nr >= gsmnet->num_bts) { + if (bts_nr >= g_bts_sm->num_bts) { vty_out(vty, "%% Unknown BTS number %u (num %u)%s", - bts_nr, gsmnet->num_bts, VTY_NEWLINE); + bts_nr, g_bts_sm->num_bts, VTY_NEWLINE); return CMD_WARNING; } else - bts = gsm_bts_num(gsmnet, bts_nr); + bts = gsm_bts_num(g_bts_sm, bts_nr); vty->index = bts; vty->index_sub = &bts->description; @@ -1278,7 +1270,7 @@ vty_out(vty, " NM State: "); net_dump_nmstate(vty, &bts->mo.nm_state); vty_out(vty, " Site Mgr NM State: "); - net_dump_nmstate(vty, &bts->site_mgr.mo.nm_state); + net_dump_nmstate(vty, &g_bts_sm->mo.nm_state); if (strnlen(bts->pcu_version, MAX_VERSION_LENGTH)) vty_out(vty, " PCU version %s connected%s", bts->pcu_version, VTY_NEWLINE); @@ -1337,23 +1329,22 @@ SHOW_STR "Display information about a BTS\n" BTS_NR_STR) { - const struct gsm_network *net = gsmnet_from_vty(vty); int bts_nr; if (argc != 0) { /* use the BTS number that the user has specified */ bts_nr = atoi(argv[0]); - if (bts_nr >= net->num_bts) { + if (bts_nr >= g_bts_sm->num_bts) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } - bts_dump_vty(vty, gsm_bts_num(net, bts_nr)); + bts_dump_vty(vty, gsm_bts_num(g_bts_sm, bts_nr)); return CMD_SUCCESS; } /* print all BTS's */ - for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) - bts_dump_vty(vty, gsm_bts_num(net, bts_nr)); + for (bts_nr = 0; bts_nr < g_bts_sm->num_bts; bts_nr++) + bts_dump_vty(vty, gsm_bts_num(g_bts_sm, bts_nr)); return CMD_SUCCESS; } @@ -1411,10 +1402,9 @@ SHOW_STR "Display information about a BTS\n" BTS_NR_STR "GPRS/EGPRS configuration\n") { - const struct gsm_network *net = gsmnet_from_vty(vty); const struct gsm_bts *bts; - bts = gsm_bts_num(net, atoi(argv[0])); + bts = gsm_bts_num(g_bts_sm, atoi(argv[0])); if (bts == NULL) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); @@ -1430,16 +1420,15 @@ "Various testing commands\n" "Send a test OML failure event report to the BSC\n" BTS_NR_STR) { - const struct gsm_network *net = gsmnet_from_vty(vty); int bts_nr = atoi(argv[0]); const struct gsm_bts *bts; - if (bts_nr >= net->num_bts) { + if (bts_nr >= g_bts_sm->num_bts) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } - bts = gsm_bts_num(net, bts_nr); + bts = gsm_bts_num(g_bts_sm, bts_nr); oml_tx_failure_event_rep(&bts->mo, NM_SEVER_MINOR, OSMO_EVT_WARN_SW_WARN, "test message sent from VTY"); return CMD_SUCCESS; @@ -1451,9 +1440,8 @@ "Use infinite timeout (DANGEROUS: only use during testing!)\n" "Number of lost SACCH blocks\n") { - const struct gsm_network *net = gsmnet_from_vty(vty); int bts_nr = atoi(argv[0]); - struct gsm_bts *bts = gsm_bts_num(net, bts_nr); + struct gsm_bts *bts = gsm_bts_num(g_bts_sm, bts_nr); if (!bts) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); @@ -1482,12 +1470,11 @@ "BCCH carrier power reduction operation\n" "Power reduction value (in dB, even numbers only)\n") { - struct gsm_network *net = gsmnet_from_vty(vty); const int bts_nr = atoi(argv[0]); const int red = atoi(argv[1]); struct gsm_bts *bts; - bts = gsm_bts_num(net, atoi(argv[0])); + bts = gsm_bts_num(g_bts_sm, atoi(argv[0])); if (bts == NULL) { vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; @@ -1637,19 +1624,18 @@ SHOW_STR "Display information about a TRX\n" BTS_TRX_STR) { - const struct gsm_network *net = gsmnet_from_vty(vty); const struct gsm_bts *bts = NULL; int bts_nr, trx_nr; if (argc >= 1) { /* use the BTS number that the user has specified */ bts_nr = atoi(argv[0]); - if (bts_nr >= net->num_bts) { + if (bts_nr >= g_bts_sm->num_bts) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } - bts = gsm_bts_num(net, bts_nr); + bts = gsm_bts_num(g_bts_sm, bts_nr); } if (argc >= 2) { trx_nr = atoi(argv[1]); @@ -1667,8 +1653,8 @@ return CMD_SUCCESS; } - for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) - print_all_trx(vty, gsm_bts_num(net, bts_nr)); + for (bts_nr = 0; bts_nr < g_bts_sm->num_bts; bts_nr++) + print_all_trx(vty, gsm_bts_num(g_bts_sm, bts_nr)); return CMD_SUCCESS; } @@ -1693,7 +1679,6 @@ SHOW_STR "Display information about a TS\n" BTS_TRX_TS_STR) { - const struct gsm_network *net = gsmnet_from_vty(vty); const struct gsm_bts *bts = NULL; const struct gsm_bts_trx *trx = NULL; const struct gsm_bts_trx_ts *ts = NULL; @@ -1702,12 +1687,12 @@ if (argc >= 1) { /* use the BTS number that the user has specified */ bts_nr = atoi(argv[0]); - if (bts_nr >= net->num_bts) { + if (bts_nr >= g_bts_sm->num_bts) { vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } - bts = gsm_bts_num(net, bts_nr); + bts = gsm_bts_num(g_bts_sm, bts_nr); } if (argc >= 2) { trx_nr = atoi(argv[1]); @@ -1748,8 +1733,8 @@ } } else { /* Iterate over all BTS, TRX in each BTS, TS in each TRX */ - for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { - bts = gsm_bts_num(net, bts_nr); + for (bts_nr = 0; bts_nr < g_bts_sm->num_bts; bts_nr++) { + bts = gsm_bts_num(g_bts_sm, bts_nr); for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { trx = gsm_bts_trx_num(bts, trx_nr); for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { @@ -2112,7 +2097,6 @@ static int lchan_summary(struct vty *vty, int argc, const char **argv, void (*dump_cb)(struct vty *, const struct gsm_lchan *)) { - const struct gsm_network *net = gsmnet_from_vty(vty); const struct gsm_bts *bts = NULL; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */ const struct gsm_bts_trx *trx = NULL; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */ const struct gsm_bts_trx_ts *ts = NULL; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */ @@ -2122,12 +2106,12 @@ if (argc >= 1) { /* use the BTS number that the user has specified */ bts_nr = atoi(argv[0]); - if (bts_nr >= net->num_bts) { + if (bts_nr >= g_bts_sm->num_bts) { vty_out(vty, "%% can't find BTS %s%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } - bts = gsm_bts_num(net, bts_nr); + bts = gsm_bts_num(g_bts_sm, bts_nr); if (argc == 1) return dump_lchan_bts(bts, vty, dump_cb); @@ -2168,8 +2152,8 @@ return CMD_SUCCESS; } - for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { - bts = gsm_bts_num(net, bts_nr); + for (bts_nr = 0; bts_nr < g_bts_sm->num_bts; bts_nr++) { + bts = gsm_bts_num(g_bts_sm, bts_nr); dump_lchan_bts(bts, vty, dump_cb); } @@ -2195,8 +2179,7 @@ return lchan_summary(vty, argc, argv, lchan_dump_short_vty); } -static struct gsm_lchan *resolve_lchan(const struct gsm_network *net, - const char **argv, int idx) +static struct gsm_lchan *resolve_lchan(const char **argv, int idx) { int bts_nr = atoi(argv[idx+0]); int trx_nr = atoi(argv[idx+1]); @@ -2207,7 +2190,7 @@ struct gsm_bts_trx *trx; struct gsm_bts_trx_ts *ts; - bts = gsm_bts_num(net, bts_nr); + bts = gsm_bts_num(g_bts_sm, bts_nr); if (!bts) return NULL; @@ -2472,11 +2455,10 @@ BTS_T_T_L_STR "RTP settings\n" "Jitter buffer\n" "Size of jitter buffer in (ms)\n") { - struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_lchan *lchan; int jitbuf_ms = atoi(argv[4]), rc; - lchan = resolve_lchan(net, argv, 0); + lchan = resolve_lchan(argv, 0); if (!lchan) { vty_out(vty, "%% Could not resolve logical channel%s", VTY_NEWLINE); return CMD_WARNING; @@ -2505,10 +2487,9 @@ BTS_T_T_L_STR "Set loopback\n", CMD_ATTR_HIDDEN) { - struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_lchan *lchan; - lchan = resolve_lchan(net, argv, 0); + lchan = resolve_lchan(argv, 0); if (!lchan) { vty_out(vty, "%% Could not resolve logical channel%s", VTY_NEWLINE); return CMD_WARNING; @@ -2524,10 +2505,9 @@ NO_STR BTS_T_T_L_STR "Set loopback\n", CMD_ATTR_HIDDEN) { - struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_lchan *lchan; - lchan = resolve_lchan(net, argv, 0); + lchan = resolve_lchan(argv, 0); if (!lchan) { vty_out(vty, "%% Could not resolve logical channel%s", VTY_NEWLINE); return CMD_WARNING; @@ -2550,13 +2530,12 @@ "Enable the power control loop\n", CMD_ATTR_HIDDEN) { - struct gsm_network *net = gsmnet_from_vty(vty); const struct gsm_power_ctrl_params *params; struct lchan_power_ctrl_state *state; const char **args = argv + 4; struct gsm_lchan *lchan; - lchan = resolve_lchan(net, argv, 0); + lchan = resolve_lchan(argv, 0); if (!lchan) { vty_out(vty, "%% Could not resolve logical channel%s", VTY_NEWLINE); return CMD_WARNING; @@ -2587,12 +2566,11 @@ "BS power reduction (in dB) or MS power level\n", CMD_ATTR_HIDDEN) { - struct gsm_network *net = gsmnet_from_vty(vty); struct lchan_power_ctrl_state *state; const char **args = argv + 4; struct gsm_lchan *lchan; - lchan = resolve_lchan(net, argv, 0); + lchan = resolve_lchan(argv, 0); if (!lchan) { vty_out(vty, "%% Could not resolve logical channel%s", VTY_NEWLINE); return CMD_WARNING; diff --git a/src/osmo-bts-oc2g/oc2gbts_vty.c b/src/osmo-bts-oc2g/oc2gbts_vty.c index ae7cd12..051528a 100644 --- a/src/osmo-bts-oc2g/oc2gbts_vty.c +++ b/src/osmo-bts-oc2g/oc2gbts_vty.c @@ -47,6 +47,7 @@ #include <osmo-bts/signal.h> #include <osmo-bts/oml.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/gsm_data.h> #include <osmo-bts/phy_link.h> @@ -412,7 +413,6 @@ DEFUN(trigger_ho_cause, trigger_ho_cause_cmd, "HIDDEN", TRX_STR) { - struct gsm_network *net = gsmnet_from_vty(vty); struct gsm_bts *bts; struct gsm_bts_trx *trx; struct gsm_bts_trx_ts *ts; @@ -422,7 +422,7 @@ /* uint8_t old_ho_cause; */ /* get BTS pointer */ - bts = gsm_bts_num(net, 0); + bts = gsm_bts_num(g_bts_sm, 0); if (!bts) { vty_out(vty, "Can not get BTS node %s", VTY_NEWLINE); return CMD_WARNING; diff --git a/src/osmo-bts-omldummy/main.c b/src/osmo-bts-omldummy/main.c index c74af74..167d43a 100644 --- a/src/osmo-bts-omldummy/main.c +++ b/src/osmo-bts-omldummy/main.c @@ -10,6 +10,7 @@ #include <osmo-bts/logging.h> #include <osmo-bts/abis.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/oml.h> static void print_usage(const char *prog_name) @@ -117,9 +118,14 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); - bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + if (!g_bts_sm) + exit(1); + + bts = gsm_bts_alloc(g_bts_sm, 0); if (!bts) exit(1); + bts->ip_access.site_id = cmdline.site_id; bts->ip_access.bts_id = 0; diff --git a/tests/agch/agch_test.c b/tests/agch/agch_test.c index 30e7ef1..8ddc0f7 100644 --- a/tests/agch/agch_test.c +++ b/tests/agch/agch_test.c @@ -23,6 +23,7 @@ #include <osmocom/core/application.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> @@ -225,7 +226,8 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); - bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + bts = gsm_bts_alloc(g_bts_sm, 0); if (bts_init(bts) < 0) { fprintf(stderr, "unable to open bts\n"); exit(1); diff --git a/tests/cipher/cipher_test.c b/tests/cipher/cipher_test.c index 9303ed2..cf532a0 100644 --- a/tests/cipher/cipher_test.c +++ b/tests/cipher/cipher_test.c @@ -18,6 +18,7 @@ */ #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/logging.h> #include <osmo-bts/paging.h> #include <osmo-bts/gsm_data.h> @@ -71,7 +72,8 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); - bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + bts = gsm_bts_alloc(g_bts_sm, 0); if (bts_init(bts) < 0) { fprintf(stderr, "unable to open bts\n"); exit(1); diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 231be98..3c46971 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -28,6 +28,7 @@ #include <osmo-bts/logging.h> #include <osmo-bts/abis.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/vty.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/pcu_if.h> @@ -71,7 +72,12 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DHO].loglevel = LOGL_DEBUG; - bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + if (!g_bts_sm) { + fprintf(stderr, "Failed to create BTS Site Manager structure\n"); + exit(1); + } + bts = gsm_bts_alloc(g_bts_sm, 0); if (!bts) { fprintf(stderr, "Failed to create BTS structure\n"); exit(1); diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 4b8aff8..0e89429 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -8,6 +8,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/logging.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/measurement.h> #include <osmo-bts/rsl.h> @@ -457,7 +458,12 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DMEAS].loglevel = LOGL_DEBUG; - bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + if (!g_bts_sm) { + fprintf(stderr, "Failed to create BTS Site Manager structure\n"); + exit(1); + } + bts = gsm_bts_alloc(g_bts_sm, 0); if (!bts) { fprintf(stderr, "Failed to create BTS structure\n"); exit(1); diff --git a/tests/misc/misc_test.c b/tests/misc/misc_test.c index e65fcb4..b1b9820 100644 --- a/tests/misc/misc_test.c +++ b/tests/misc/misc_test.c @@ -21,6 +21,7 @@ */ #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/msg_utils.h> #include <osmo-bts/logging.h> @@ -165,7 +166,8 @@ struct rsl_ie_chan_mode cm; struct gsm_bts *bts; - bts = gsm_bts_alloc(ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(ctx); + bts = gsm_bts_alloc(g_bts_sm, 0); /* Signalling shall be supported regardless of the features */ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Bm, diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index af8accc..05013d0 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -22,6 +22,7 @@ #include <osmocom/core/application.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/logging.h> #include <osmo-bts/paging.h> #include <osmo-bts/gsm_data.h> @@ -184,7 +185,12 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); - bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + if (!g_bts_sm) { + fprintf(stderr, "Failed to create BTS Site Manager structure\n"); + exit(1); + } + bts = gsm_bts_alloc(g_bts_sm, 0); if (bts_init(bts) < 0) { fprintf(stderr, "unable to open bts\n"); exit(1); diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index 3724f56..937d7f8 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -28,6 +28,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts.h> +#include <osmo-bts/bts_sm.h> #include <osmo-bts/logging.h> #include <osmo-bts/tx_power.h> @@ -252,7 +253,12 @@ log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); - bts = gsm_bts_alloc(tall_bts_ctx, 0); + g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); + if (!g_bts_sm) { + fprintf(stderr, "Failed to create BTS Site Manager structure\n"); + exit(1); + } + bts = gsm_bts_alloc(g_bts_sm, 0); if (!bts) { fprintf(stderr, "Failed to create BTS structure\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ideb0d458ec631008223f861cf8b46d09524a1a21 Gerrit-Change-Number: 32236 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: nm: Document current state of SW_ACT in TRX related objects
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32242 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: nm: Document current state of SW_ACT in TRX related objects ...................................................................... nm: Document current state of SW_ACT in TRX related objects Change-Id: Ie24503b25b9c8042edae696d5b002933c73d00fb --- M src/common/bts.c M src/common/nm_bts_fsm.c 2 files changed, 23 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/bts.c b/src/common/bts.c index 0dd830a..1154c6a 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -414,10 +414,17 @@ LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status.\n"); - /* BTS SITE MGR becomes Offline (tx SW ACT Report), BTS, NSE, etc. is DEPENDENCY */ + /* BTS SITE MGR becomes Offline (tx SW ACT Report) and dispatches same + * event to its children objects (except TRX level and below, see comment + * below) + */ osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT, NULL); - /* All other objects start off-line until the BTS Model code says otherwise */ + /* TRX objects are SW_ACTed by the lower layers (bts_model) when they + * become available. Since that may happen before the OML link becomes + * established, we need to manually trigger tx of state reports to the BSC + * so it learns current state and can go on bringing them up. + */ for (i = 0; i < bts->num_trx; i++) { struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, i); diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 13a4727..451530f 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -93,6 +93,11 @@ } nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_OFFLINE); + + /* Avoid submitting NM_EV_SW_ACT to children NM objects + * (RCARRIER, BBTRANSC), the lower layers (bts_model) are in charge + * of submitting them once the TRX becomes available + */ return; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie24503b25b9c8042edae696d5b002933c73d00fb Gerrit-Change-Number: 32242 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bts[master]: Properly report all states through NM FSM upon OML link up
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32243 ) Change subject: Properly report all states through NM FSM upon OML link up ...................................................................... Properly report all states through NM FSM upon OML link up Change-Id: Ic3358629d17baab46f467a1ab82eea1837ad7390 --- M include/osmo-bts/nm_common_fsm.h M src/common/bts.c M src/common/bts_trx.c M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_bts_sm_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_common_fsm.c M src/common/nm_gprs_cell_fsm.c M src/common/nm_gprs_nse_fsm.c M src/common/nm_gprs_nsvc_fsm.c M src/common/nm_radio_carrier_fsm.c 12 files changed, 75 insertions(+), 45 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h index 4d44402..2735ede 100644 --- a/include/osmo-bts/nm_common_fsm.h +++ b/include/osmo-bts/nm_common_fsm.h @@ -36,6 +36,7 @@ NM_EV_OPSTART_NACK, NM_EV_SHUTDOWN_START, NM_EV_SHUTDOWN_FINISH, + NM_EV_OML_UP, NM_EV_RSL_UP, /* RadioCarrier and BaseBand Transceiver only */ NM_EV_RSL_DOWN, /* RadioCarrier and BaseBand Transceiver only */ NM_EV_PHYLINK_UP, /* RadioCarrier and BaseBand Transceiver only */ diff --git a/src/common/bts.c b/src/common/bts.c index 1154c6a..72c29f8 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -410,33 +410,13 @@ /* main link is established, send status report */ int bts_link_estab(struct gsm_bts *bts) { - int i, j; + LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status\n"); - LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status.\n"); - - /* BTS SITE MGR becomes Offline (tx SW ACT Report) and dispatches same - * event to its children objects (except TRX level and below, see comment - * below) + /* Signal OML UP to BTS SITE MGR. It will automatically SW_ACT repoort + * and become Disabled-Offline, then dispatch same event to its children + * objects. */ - osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT, NULL); - - /* TRX objects are SW_ACTed by the lower layers (bts_model) when they - * become available. Since that may happen before the OML link becomes - * established, we need to manually trigger tx of state reports to the BSC - * so it learns current state and can go on bringing them up. - */ - for (i = 0; i < bts->num_trx; i++) { - struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, i); - - oml_tx_state_changed(&trx->mo); - oml_tx_state_changed(&trx->bb_transc.mo); - - for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { - struct gsm_bts_trx_ts *ts = &trx->ts[j]; - - oml_tx_state_changed(&ts->mo); - } - } + osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OML_UP, NULL); return bts_model_oml_estab(bts); } diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 089f228..251b673 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -84,6 +84,7 @@ trx->bb_transc.mo.fi->id, ts->nr); gsm_mo_init(&ts->mo, trx->bts, NM_OC_CHANNEL, trx->bts->nr, trx->nr, ts->nr); + oml_mo_state_init(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); gsm_bts_trx_ts_init_lchan(ts); } @@ -156,14 +157,14 @@ trx->mo.fi = osmo_fsm_inst_alloc(&nm_rcarrier_fsm, trx, trx, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(trx->mo.fi, "bts%d-trx%d", bts->nr, trx->nr); - gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, - bts->nr, trx->nr, 0xff); + gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, bts->nr, trx->nr, 0xff); + oml_mo_state_init(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); trx->bb_transc.mo.fi = osmo_fsm_inst_alloc(&nm_bb_transc_fsm, trx, &trx->bb_transc, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(trx->bb_transc.mo.fi, "bts%d-trx%d", bts->nr, trx->nr); - gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, - bts->nr, trx->nr, 0xff); + gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, bts->nr, trx->nr, 0xff); + oml_mo_state_init(&trx->bb_transc.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); gsm_bts_trx_init_ts(trx); diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 6fdddbe..d42130a 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -77,6 +77,11 @@ nm_bb_transc_fsm_state_chg(fi, NM_BBTRANSC_ST_OP_DISABLED_OFFLINE); ev_dispatch_children(bb_transc, event); return; + case NM_EV_OML_UP: + /* Report current state: */ + oml_tx_state_changed(&bb_transc->mo); + ev_dispatch_children(bb_transc, event); + return; case NM_EV_RSL_UP: return; case NM_EV_RSL_DOWN: @@ -120,6 +125,11 @@ int rc; switch (event) { + case NM_EV_OML_UP: + /* Report current state: */ + oml_tx_state_changed(&bb_transc->mo); + ev_dispatch_children(bb_transc, event); + return; case NM_EV_RX_SETATTR: setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(trx->bts, setattr_data->msg, @@ -238,6 +248,7 @@ [NM_BBTRANSC_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = X(NM_EV_SW_ACT) | + X(NM_EV_OML_UP) | X(NM_EV_RSL_UP) | X(NM_EV_RSL_DOWN) | X(NM_EV_PHYLINK_UP) | @@ -252,6 +263,7 @@ }, [NM_BBTRANSC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_OML_UP) | X(NM_EV_RX_SETATTR) | X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 451530f..eeec8f8 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -76,7 +76,8 @@ struct gsm_bts_trx *trx; switch (event) { - case NM_EV_SW_ACT: + case NM_EV_OML_UP: + /* automatic SW_ACT upon OML link establishment: */ oml_mo_tx_sw_act_rep(&bts->mo); llist_for_each_entry(trx, &bts->trx_list, list) { @@ -93,11 +94,7 @@ } nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_OFFLINE); - - /* Avoid submitting NM_EV_SW_ACT to children NM objects - * (RCARRIER, BBTRANSC), the lower layers (bts_model) are in charge - * of submitting them once the TRX becomes available - */ + ev_dispatch_children(bts, event); return; default: OSMO_ASSERT(0); @@ -181,7 +178,7 @@ static struct osmo_fsm_state nm_bts_fsm_states[] = { [NM_BTS_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = - X(NM_EV_SW_ACT), + X(NM_EV_OML_UP), .out_state_mask = X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED) | X(NM_BTS_ST_OP_DISABLED_OFFLINE), diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c index 01f5f99..b6242fd 100644 --- a/src/common/nm_bts_sm_fsm.c +++ b/src/common/nm_bts_sm_fsm.c @@ -69,7 +69,8 @@ struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv; switch (event) { - case NM_EV_SW_ACT: + case NM_EV_OML_UP: + /* automatic SW_ACT upon OML link establishment: */ oml_mo_tx_sw_act_rep(&site_mgr->mo); nm_bts_sm_fsm_state_chg(fi, NM_BTS_SM_ST_OP_DISABLED_OFFLINE); ev_dispatch_children(site_mgr, event); @@ -160,7 +161,7 @@ static struct osmo_fsm_state nm_bts_sm_fsm_states[] = { [NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = - X(NM_EV_SW_ACT), + X(NM_EV_OML_UP), .out_state_mask = X(NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED) | X(NM_BTS_SM_ST_OP_DISABLED_OFFLINE), diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 9e22fee..7bc896a 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -71,6 +71,10 @@ struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; switch (event) { + case NM_EV_OML_UP: + /* Report current state: */ + oml_tx_state_changed(&ts->mo); + return; case NM_EV_SW_ACT: oml_mo_tx_sw_act_rep(&ts->mo); if (ts_can_be_enabled(ts)) @@ -97,6 +101,10 @@ int rc; switch (event) { + case NM_EV_OML_UP: + /* Report current state: */ + oml_tx_state_changed(&ts->mo); + return; case NM_EV_RX_SETATTR: setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, @@ -150,6 +158,10 @@ int rc; switch (event) { + case NM_EV_OML_UP: + /* Report current state: */ + oml_tx_state_changed(&ts->mo); + return; case NM_EV_RX_SETATTR: setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, @@ -227,7 +239,8 @@ static struct osmo_fsm_state nm_chan_fsm_states[] = { [NM_CHAN_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = - X(NM_EV_SW_ACT), + X(NM_EV_SW_ACT) | + X(NM_EV_OML_UP), .out_state_mask = X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) | X(NM_CHAN_ST_OP_DISABLED_OFFLINE) | @@ -238,6 +251,7 @@ }, [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_OML_UP) | X(NM_EV_RX_SETATTR) | X(NM_EV_RX_OPSTART) | /* backward compatibility, buggy BSC */ X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */ @@ -256,6 +270,7 @@ }, [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_OML_UP) | X(NM_EV_RX_SETATTR) | X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c index 220ac76..e7a2ffe 100644 --- a/src/common/nm_common_fsm.c +++ b/src/common/nm_common_fsm.c @@ -31,6 +31,7 @@ { NM_EV_OPSTART_NACK, "OPSTART_NACK" }, { NM_EV_SHUTDOWN_START, "SHUTDOWN_START" }, { NM_EV_SHUTDOWN_FINISH, "SHUTDOWN_FINISH" }, + { NM_EV_OML_UP, "OML_UP" }, { NM_EV_RSL_UP, "RSL_UP" }, { NM_EV_RSL_DOWN, "RSL_DOWN" }, { NM_EV_PHYLINK_UP, "PHYLINK_UP" }, diff --git a/src/common/nm_gprs_cell_fsm.c b/src/common/nm_gprs_cell_fsm.c index aaebe59..cc3ece6 100644 --- a/src/common/nm_gprs_cell_fsm.c +++ b/src/common/nm_gprs_cell_fsm.c @@ -68,7 +68,8 @@ struct gsm_gprs_cell *cell = (struct gsm_gprs_cell *)fi->priv; switch (event) { - case NM_EV_SW_ACT: + case NM_EV_OML_UP: + /* automatic SW_ACT upon OML link establishment: */ oml_mo_tx_sw_act_rep(&cell->mo); if (gprs_cell_can_be_enabled(cell)) nm_gprs_cell_fsm_state_chg(fi, NM_GPRS_CELL_ST_OP_DISABLED_OFFLINE); @@ -196,7 +197,7 @@ static struct osmo_fsm_state nm_gprs_cell_fsm_states[] = { [NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = - X(NM_EV_SW_ACT), + X(NM_EV_OML_UP), .out_state_mask = X(NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED) | X(NM_GPRS_CELL_ST_OP_DISABLED_DEPENDENCY) | diff --git a/src/common/nm_gprs_nse_fsm.c b/src/common/nm_gprs_nse_fsm.c index fa9c651..42f30d8 100644 --- a/src/common/nm_gprs_nse_fsm.c +++ b/src/common/nm_gprs_nse_fsm.c @@ -82,7 +82,8 @@ struct gsm_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; switch (event) { - case NM_EV_SW_ACT: + case NM_EV_OML_UP: + /* automatic SW_ACT upon OML link establishment: */ oml_mo_tx_sw_act_rep(&nse->mo); ev_dispatch_children(nse, event); if (nse_can_be_enabled(nse)) @@ -216,7 +217,7 @@ static struct osmo_fsm_state nm_gprs_nse_fsm_states[] = { [NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = - X(NM_EV_SW_ACT), + X(NM_EV_OML_UP), .out_state_mask = X(NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED) | X(NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY) | diff --git a/src/common/nm_gprs_nsvc_fsm.c b/src/common/nm_gprs_nsvc_fsm.c index 05d7ff1..2b45fc4 100644 --- a/src/common/nm_gprs_nsvc_fsm.c +++ b/src/common/nm_gprs_nsvc_fsm.c @@ -67,7 +67,8 @@ struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv; switch (event) { - case NM_EV_SW_ACT: + case NM_EV_OML_UP: + /* automatic SW_ACT upon OML link establishment: */ oml_mo_tx_sw_act_rep(&nsvc->mo); if (gprs_nsvc_can_be_enabled(nsvc)) nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE); @@ -195,7 +196,7 @@ static struct osmo_fsm_state nm_gprs_nsvc_fsm_states[] = { [NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = - X(NM_EV_SW_ACT), + X(NM_EV_OML_UP), .out_state_mask = X(NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED) | X(NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY) | diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index 0596a9c..d7590bc 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -65,6 +65,10 @@ oml_mo_tx_sw_act_rep(&trx->mo); nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE); return; + case NM_EV_OML_UP: + /* Report current state: */ + oml_tx_state_changed(&trx->mo); + return; case NM_EV_RSL_UP: return; case NM_EV_RSL_DOWN: @@ -106,6 +110,10 @@ int rc; switch (event) { + case NM_EV_OML_UP: + /* Report current state: */ + oml_tx_state_changed(&trx->mo); + return; case NM_EV_RX_SETATTR: setattr_data = (struct nm_fsm_ev_setattr_data *)data; rc = bts_model_apply_oml(trx->bts, setattr_data->msg, @@ -214,6 +222,7 @@ [NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED] = { .in_event_mask = X(NM_EV_SW_ACT) | + X(NM_EV_OML_UP) | X(NM_EV_RSL_UP) | X(NM_EV_RSL_DOWN) | X(NM_EV_PHYLINK_UP) | @@ -228,6 +237,7 @@ }, [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_OML_UP) | X(NM_EV_RX_SETATTR) | X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic3358629d17baab46f467a1ab82eea1837ad7390 Gerrit-Change-Number: 32243 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: Update g_bts_sm->num_bts when bts is added/removed from bts list
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32262 ) Change subject: Update g_bts_sm->num_bts when bts is added/removed from bts list ...................................................................... Update g_bts_sm->num_bts when bts is added/removed from bts list Change-Id: Ifa162d01d908eba8cadd8f01dd4d698491176fe8 --- M src/common/bts.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/bts.c b/src/common/bts.c index 72c29f8..a35c6d5 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -219,6 +219,7 @@ bts_osmux_release(bts); llist_del(&bts->list); + g_bts_sm->num_bts--; return 0; } @@ -233,6 +234,7 @@ /* add to list of BTSs */ llist_add_tail(&bts->list, &bts_sm->bts_list); + g_bts_sm->num_bts++; bts->site_mgr = bts_sm; bts->nr = bts_num; @@ -376,7 +378,6 @@ /* TRX0 was allocated early during gsm_bts_alloc, not later through VTY */ bts_model_trx_init(bts->c0); - g_bts_sm->num_bts++; if (!initialized) { osmo_signal_register_handler(SS_GLOBAL, bts_signal_cbfn, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifa162d01d908eba8cadd8f01dd4d698491176fe8 Gerrit-Change-Number: 32262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

[M] Change in osmo-bts[master]: Properly report all states through NM FSM upon OML link up
by pespin 11 Apr '23

11 Apr '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32243 ) Change subject: Properly report all states through NM FSM upon OML link up ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic3358629d17baab46f467a1ab82eea1837ad7390 Gerrit-Change-Number: 32243 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 10:10:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: Drop bts_sm pointer
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32265 ) Change subject: pcu_sock: Drop bts_sm pointer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f7c42dc9f38485dbcc8595a3a3dbf5a80a7961 Gerrit-Change-Number: 32265 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 09:48:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0