Introduce NM GPRS NSVC FSM

Related: OS#4870
Change-Id: I381472532c2622a8dba7c81ae00ea873c2e58ae1

7 files changed, 419 insertions, 41 deletions

diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index eadb30ebf..e282c6f50 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -62,6 +62,7 @@ ipaccess_config_LDADD = \
 	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
+	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
 	$(OSMO_LIBS) \
 	$(NULL)
@@ -86,6 +87,7 @@ ipaccess_proxy_LDADD = \
 	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
+	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
 	$(OSMO_LIBS) \
 	$(NULL)
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index 79fc16422..92ef7c34c 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -83,6 +83,7 @@ osmo_bsc_SOURCES = \
 	nm_bts_fsm.c \
 	nm_gprs_cell_fsm.c \
 	nm_gprs_nse_fsm.c \
+	nm_gprs_nsvc_fsm.c \
 	nm_channel_fsm.c \
 	nm_rcarrier_fsm.c \
 	gsm_08_08.c \
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index d837779a6..b64b4dc97 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -49,6 +49,7 @@
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/bsc/chan_alloc.h>
 #include <osmocom/bsc/bts.h>
+#include <osmocom/bsc/nm_common_fsm.h>
 #include <osmocom/gsm/bts_features.h>
 
 #define OM_ALLOC_SIZE		1024
diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c
index 91c76f10c..6d8f91fbf 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c
@@ -127,7 +127,6 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd)
 {
 	uint8_t obj_class = nsd->obj_class;
 	void *obj = nsd->obj;
-	struct gsm_nm_state *new_state = nsd->new_state;
 
 	struct gsm_bts_sm *bts_sm;
 	struct gsm_bts *bts;
@@ -138,24 +137,9 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd)
 	struct gsm_gprs_nse *nse;
 	struct gsm_gprs_cell *cell;
 
-	struct msgb *msgb;
-
 	if (!is_ipaccess_bts(nsd->bts))
 		return 0;
 
-	/* This event-driven BTS setup is currently only required on nanoBTS */
-
-	/* S_NM_STATECHG_ADM is called after we call chg_adm_state() and would create
-	 * endless loop */
-	if (obj_class != NM_OC_BTS &&
-	    obj_class != NM_OC_BASEB_TRANSC &&
-	    obj_class != NM_OC_RADIO_CARRIER &&
-	    obj_class != NM_OC_CHANNEL &&
-	    obj_class != NM_OC_GPRS_NSE &&
-	    obj_class != NM_OC_GPRS_CELL &&
-	    evt != S_NM_STATECHG_OPER)
-		return 0;
-
 	switch (obj_class) {
 	case NM_OC_SITE_MANAGER:
 		bts_sm = obj;
@@ -188,33 +172,11 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd)
 		break;
 	case NM_OC_GPRS_NSVC:
 		nsvc = obj;
-		bts = nsvc->bts;
-		if (bts->gprs.mode == BTS_GPRS_NONE)
-			break;
 		/* We skip NSVC1 since we only use NSVC0 */
 		if (nsvc->id == 1)
 			break;
-		if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_IPV6_NSVC) &&
-		    nsvc->remote.u.sa.sa_family == AF_INET6) {
-			LOGP(DLINP, LOGL_ERROR, "BTS %d does not support IPv6 but an IPv6 address was configured!\n", bts->nr);
-			break;
-		}
-
-		if ((new_state->availability == NM_AVSTATE_OFF_LINE) ||
-		    (new_state->availability == NM_AVSTATE_DEPENDENCY)) {
-			msgb = nanobts_attr_nscv_get(bts);
-			if (!msgb)
-				break;
-			abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr,
-						  nsvc->id, 0xff,
-						  msgb->data, msgb->len);
-			msgb_free(msgb);
-			abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr,
-					      nsvc->id, 0xff,
-					      NM_STATE_UNLOCKED);
-			abis_nm_opstart(bts, obj_class, bts->bts_nr,
-					nsvc->id, 0xff);
-		}
+		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_STATE_CHG_REP, nsd);
+		break;
 	default:
 		break;
 	}
@@ -228,6 +190,7 @@ static int sw_activ_rep(struct msgb *mb)
 	struct e1inp_sign_link *sign_link = mb->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
 	struct gsm_bts_trx *trx;
+	struct gsm_gprs_nsvc *nsvc;
 	struct gsm_bts_trx_ts *ts;
 
 	if (!is_ipaccess_bts(bts))
@@ -261,6 +224,11 @@ static int sw_activ_rep(struct msgb *mb)
 	case NM_OC_GPRS_CELL:
 		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_SW_ACT_REP, NULL);
 		break;
+	case NM_OC_GPRS_NSVC:
+		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
+			return -EINVAL;
+		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_SW_ACT_REP, NULL);
+		break;
 	}
 	return 0;
 }
@@ -286,6 +254,7 @@ static void nm_rx_opstart_ack(struct msgb *oml_msg)
 	struct e1inp_sign_link *sign_link = oml_msg->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
 	struct gsm_bts_trx *trx;
+	struct gsm_gprs_nsvc *nsvc;
 
 	switch (foh->obj_class) {
 	case NM_OC_SITE_MANAGER:
@@ -313,6 +282,11 @@ static void nm_rx_opstart_ack(struct msgb *oml_msg)
 	case NM_OC_GPRS_CELL:
 		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_ACK, NULL);
 		break;
+	case NM_OC_GPRS_NSVC:
+		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
+			return;
+		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_ACK, NULL);
+		break;
 	default:
 		break;
 	}
@@ -325,6 +299,7 @@ static void nm_rx_opstart_nack(struct msgb *oml_msg)
 	struct gsm_bts *bts = sign_link->trx->bts;
 	struct gsm_bts_trx *trx;
 	struct gsm_bts_trx_ts *ts;
+	struct gsm_gprs_nsvc *nsvc;
 
 	switch (foh->obj_class) {
 	case NM_OC_SITE_MANAGER:
@@ -354,6 +329,11 @@ static void nm_rx_opstart_nack(struct msgb *oml_msg)
 	case NM_OC_GPRS_CELL:
 		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_NACK, NULL);
 		break;
+	case NM_OC_GPRS_NSVC:
+		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
+			return;
+		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_NACK, NULL);
+		break;
 	default:
 		break;
 	}
@@ -409,6 +389,7 @@ static void nm_rx_ipacc_set_attr_ack(struct msgb *oml_msg)
 	void *obj;
 	struct gsm_gprs_nse *nse;
 	struct gsm_gprs_cell *cell;
+	struct gsm_gprs_nsvc *nsvc;
 
 	foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen);
 	obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst);
@@ -422,6 +403,11 @@ static void nm_rx_ipacc_set_attr_ack(struct msgb *oml_msg)
 		cell = obj;
 		osmo_fsm_inst_dispatch(cell->mo.fi, NM_EV_SET_ATTR_ACK, NULL);
 		break;
+	case NM_OC_GPRS_NSVC:
+		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
+			return;
+		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_SET_ATTR_ACK, NULL);
+		break;
 	default:
 		LOGPFOH(DNM, LOGL_ERROR, foh, "IPACC Set Attr Ack received on incorrect object class %d!\n", foh->obj_class);
 	}
@@ -524,6 +510,7 @@ void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason)
 	struct gsm_bts_trx *trx;
 	struct gsm_bts_trx_ts *ts ;
 	uint8_t tn;
+	uint8_t i;
 
 	/* First of all, remove deferred drop if enabled */
 	osmo_timer_del(&bts->oml_drop_link_timer);
@@ -550,6 +537,9 @@ void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason)
 
 	osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OML_DOWN, NULL);
 	osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OML_DOWN, NULL);
+	for (i = 0; i < ARRAY_SIZE(bts->site_mgr->gprs.nsvc); i++)
+		osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nsvc[i].mo.fi, NM_EV_OML_DOWN, NULL);
+
 	osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OML_DOWN, NULL);
 	osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OML_DOWN, NULL);
 	gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL);
diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c
index 296a21d76..ca572f146 100644
--- a/src/osmo-bsc/bts_sm.c
+++ b/src/osmo-bsc/bts_sm.c
@@ -30,6 +30,13 @@ static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 };
 
 static int gsm_bts_sm_talloc_destructor(struct gsm_bts_sm *bts_sm)
 {
+	int i;
+	for (i = 0; i < ARRAY_SIZE(bts_sm->gprs.nsvc); i++) {
+		if (bts_sm->gprs.nsvc[i].mo.fi) {
+			osmo_fsm_inst_free(bts_sm->gprs.nsvc[i].mo.fi);
+			bts_sm->gprs.nsvc[i].mo.fi = NULL;
+		}
+	}
 	if (bts_sm->gprs.nse.mo.fi) {
 		osmo_fsm_inst_free(bts_sm->gprs.nse.mo.fi);
 		bts_sm->gprs.nse.mo.fi = NULL;
@@ -75,8 +82,14 @@ struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num)
 	for (i = 0; i < ARRAY_SIZE(bts_sm->gprs.nsvc); i++) {
 		bts_sm->gprs.nsvc[i].bts = bts;
 		bts_sm->gprs.nsvc[i].id = i;
+		bts_sm->gprs.nsvc[i].mo.fi = osmo_fsm_inst_alloc(
+					&nm_gprs_nsvc_fsm, bts_sm,
+					&bts_sm->gprs.nsvc[i],
+					LOGL_INFO, NULL);
+		osmo_fsm_inst_update_id_f(bts_sm->gprs.nsvc[i].mo.fi,
+					  "nsvc%d", i);
 		gsm_mo_init(&bts_sm->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC,
-				bts->nr, i, 0xff);
+			    bts->nr, i, 0xff);
 	}
 	memcpy(&bts_sm->gprs.nse.timer, bts_nse_timer_default,
 		sizeof(bts_sm->gprs.nse.timer));
diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c
new file mode 100644
index 000000000..d28dfd364
--- /dev/null
+++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c
@@ -0,0 +1,369 @@
+/* NM GPRS NSVC FSM */
+
+/* (C) 2020 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
+ * Author: Alexander Couzens <lynxis@fe80.eu>
+ *
+ * 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 <errno.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include <osmocom/core/fsm.h>
+#include <osmocom/core/tdef.h>
+#include <osmocom/gsm/protocol/gsm_12_21.h>
+
+#include <osmocom/bsc/bts_sm.h>
+#include <osmocom/bsc/bts.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/abis_nm.h>
+#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h>
+#include <osmocom/bsc/nm_common_fsm.h>
+#include <osmocom/bsc/debug.h>
+
+#define X(s) (1 << (s))
+
+#define nm_gprs_nsvc_fsm_state_chg(fi, NEXT_STATE) \
+	osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0)
+
+//////////////////////////
+// FSM STATE ACTIONS
+//////////////////////////
+
+static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv;
+
+	nsvc->mo.set_attr_sent = false;
+	nsvc->mo.set_attr_sent = false;
+	nsvc->mo.set_attr_ack_received = false;
+	nsvc->mo.adm_unlock_sent = false;
+	nsvc->mo.opstart_sent = false;
+}
+
+static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct nm_statechg_signal_data *nsd;
+	struct gsm_nm_state *new_state;
+
+	switch (event) {
+	case NM_EV_SW_ACT_REP:
+		break;
+	case NM_EV_STATE_CHG_REP:
+		nsd = (struct nm_statechg_signal_data *)data;
+		new_state = nsd->new_state;
+		if (new_state->operational == NM_OPSTATE_ENABLED) {
+			/* should not happen... */
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_ENABLED);
+			return;
+		}
+		switch (new_state->availability) { /* operational = DISABLED */
+		case NM_AVSTATE_DEPENDENCY:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY);
+			return;
+		case NM_AVSTATE_OFF_LINE:
+		case NM_AVSTATE_OK:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE);
+			return;
+		default:
+			return;
+		}
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+static void configure_loop(struct gsm_gprs_nsvc *nsvc, struct gsm_nm_state *state, bool allow_opstart) {
+	struct msgb *msgb;
+
+	if (nsvc->bts->gprs.mode == BTS_GPRS_NONE)
+		return;
+
+	if (!nsvc->mo.set_attr_sent && !nsvc->mo.set_attr_ack_received) {
+		if (!osmo_bts_has_feature(&nsvc->bts->features, BTS_FEAT_IPV6_NSVC) &&
+		    nsvc->remote.u.sa.sa_family == AF_INET6) {
+			LOGPFSML(nsvc->mo.fi, LOGL_ERROR,
+				 "BTS%d does not support IPv6 NSVC but an IPv6 address was configured!\n",
+				 nsvc->bts->nr);
+			return;
+		}
+		nsvc->mo.set_attr_sent = true;
+		msgb = nanobts_attr_nscv_get(nsvc->bts);
+		OSMO_ASSERT(msgb);
+		abis_nm_ipaccess_set_attr(nsvc->bts, NM_OC_GPRS_NSVC, nsvc->bts->bts_nr,
+					  nsvc->id, 0xff, msgb->data, msgb->len);
+		msgb_free(msgb);
+	}
+
+	if (nsvc->mo.set_attr_ack_received && state->administrative != NM_STATE_UNLOCKED &&
+	    !nsvc->mo.adm_unlock_sent) {
+		nsvc->mo.adm_unlock_sent = true;
+		abis_nm_chg_adm_state(nsvc->bts, NM_OC_GPRS_NSVC,
+				      nsvc->bts->bts_nr, nsvc->id, 0xff,
+				      NM_STATE_UNLOCKED);
+	}
+
+	if (allow_opstart && state->administrative == NM_STATE_UNLOCKED &&
+	    nsvc->mo.set_attr_ack_received) {
+		if (!nsvc->mo.opstart_sent) {
+			nsvc->mo.opstart_sent = true;
+			abis_nm_opstart(nsvc->bts, NM_OC_GPRS_NSVC,
+					nsvc->bts->bts_nr, nsvc->id, 0xff);
+		}
+	}
+}
+
+static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv;
+
+	/* nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST be sent
+	   during Dependency, so we simply move to OFFLINE state here to avoid
+	   duplicating code */
+	if (nsvc->bts->site_mgr->peer_has_no_avstate_offline) {
+		nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE);
+		return;
+	}
+	configure_loop(nsvc, &nsvc->mo.nm_state, false);
+}
+
+static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv;
+	struct nm_statechg_signal_data *nsd;
+	struct gsm_nm_state *new_state;
+
+	switch (event) {
+	case NM_EV_SET_ATTR_ACK:
+		nsvc->mo.set_attr_ack_received = true;
+		nsvc->mo.set_attr_sent = false;
+		configure_loop(nsvc, &nsvc->mo.nm_state, false);
+		return;
+	case NM_EV_STATE_CHG_REP:
+		nsd = (struct nm_statechg_signal_data *)data;
+		new_state = nsd->new_state;
+		if (new_state->operational == NM_OPSTATE_ENABLED) {
+			/* should not happen... */
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_ENABLED);
+			return;
+		}
+		switch (new_state->availability) { /* operational = DISABLED */
+		case NM_AVSTATE_NOT_INSTALLED:
+		case NM_AVSTATE_POWER_OFF:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);
+			return;
+		case NM_AVSTATE_OFF_LINE:
+		case NM_AVSTATE_OK:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE);
+			return;
+		case NM_AVSTATE_DEPENDENCY:
+			configure_loop(nsvc, new_state, false);
+			return;
+		default:
+			return;
+		}
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+static void st_op_disabled_offline_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv;
+
+	/* Warning: In here we may be acessing an state older than new_state
+	   from prev (syncrhonous) FSM state */
+	configure_loop(nsvc, &nsvc->mo.nm_state, true);
+}
+
+static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv;
+	struct nm_statechg_signal_data *nsd;
+	struct gsm_nm_state *new_state;
+
+	switch (event) {
+	case NM_EV_SET_ATTR_ACK:
+		nsvc->mo.set_attr_ack_received = true;
+		nsvc->mo.set_attr_sent = false;
+		configure_loop(nsvc, &nsvc->mo.nm_state, true);
+		return;
+	case NM_EV_STATE_CHG_REP:
+		nsd = (struct nm_statechg_signal_data *)data;
+		new_state = nsd->new_state;
+		if (new_state->operational == NM_OPSTATE_ENABLED) {
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_ENABLED);
+			return;
+		}
+		switch (new_state->availability) { /* operational = DISABLED */
+		case NM_AVSTATE_NOT_INSTALLED:
+		case NM_AVSTATE_POWER_OFF:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);
+			return;
+		case NM_AVSTATE_DEPENDENCY:
+			/* There's no point in moving back to Dependency, since it's broken
+			   and it acts actually as if it was in Offline state */
+			if (!nsvc->bts->site_mgr->peer_has_no_avstate_offline) {
+				nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY);
+			} else {
+				/* Moreover, in nanoBTS we need to check here for tx
+				   Opstart since we may have gone Unlocked state
+				   in this event, which means Opstart may be txed here. */
+				configure_loop(nsvc, new_state, true);
+			}
+			return;
+		case NM_AVSTATE_OFF_LINE:
+		case NM_AVSTATE_OK:
+			configure_loop(nsvc, new_state, true);
+			return;
+		default:
+			return;
+		}
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+static void st_op_enabled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv;
+
+	/* Reset state, we don't need it in this state and it will need to be
+	  reused as soon as we move back to Disabled */
+	nsvc->mo.opstart_sent = false;
+	nsvc->mo.adm_unlock_sent = false;
+	nsvc->mo.set_attr_sent = false;
+	nsvc->mo.set_attr_ack_received = false;
+}
+
+static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct nm_statechg_signal_data *nsd;
+	struct gsm_nm_state *new_state;
+
+	switch (event) {
+	case NM_EV_STATE_CHG_REP:
+		nsd = (struct nm_statechg_signal_data *)data;
+		new_state = nsd->new_state;
+		if (new_state->operational == NM_OPSTATE_ENABLED)
+			return;
+		switch (new_state->availability) { /* operational = DISABLED */
+		case NM_AVSTATE_NOT_INSTALLED:
+		case NM_AVSTATE_POWER_OFF:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);
+			return;
+		case NM_AVSTATE_DEPENDENCY:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY);
+			return;
+		case NM_AVSTATE_OFF_LINE:
+		case NM_AVSTATE_OK:
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE);
+			return;
+		default:
+			return;
+		}
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+static void st_op_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+	struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv;
+
+	switch (event) {
+	case NM_EV_OPSTART_ACK:
+	case NM_EV_OPSTART_NACK:
+		/* TODO: if on state OFFLINE and rx NACK, try again? */
+		nsvc->mo.opstart_sent = false;
+		break;
+	case NM_EV_OML_DOWN:
+		nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+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_REP) |
+			X(NM_EV_STATE_CHG_REP),
+		.out_state_mask =
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY) |
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE) |
+			X(NM_GPRS_NSVC_ST_OP_ENABLED),
+		.name = "DISABLED_NOTINSTALLED",
+		.onenter = st_op_disabled_notinstalled_on_enter,
+		.action = st_op_disabled_notinstalled,
+	},
+	[NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY] = {
+		.in_event_mask =
+			X(NM_EV_STATE_CHG_REP) |
+			X(NM_EV_SET_ATTR_ACK),
+		.out_state_mask =
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED) |
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE) |
+			X(NM_GPRS_NSVC_ST_OP_ENABLED),
+		.name = "DISABLED_DEPENDENCY",
+		.onenter = st_op_disabled_dependency_on_enter,
+		.action = st_op_disabled_dependency,
+	},
+	[NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE] = {
+		.in_event_mask =
+			X(NM_EV_STATE_CHG_REP) |
+			X(NM_EV_SET_ATTR_ACK),
+		.out_state_mask =
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED) |
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY) |
+			X(NM_GPRS_NSVC_ST_OP_ENABLED),
+		.name = "DISABLED_OFFLINE",
+		.onenter = st_op_disabled_offline_on_enter,
+		.action = st_op_disabled_offline,
+	},
+	[NM_GPRS_NSVC_ST_OP_ENABLED] = {
+	.in_event_mask =
+		X(NM_EV_STATE_CHG_REP),
+	.out_state_mask =
+		X(NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED) |
+		X(NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY) |
+		X(NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE),
+	.name = "ENABLED",
+	.onenter = st_op_enabled_on_enter,
+	.action = st_op_enabled,
+	},
+};
+
+struct osmo_fsm nm_gprs_nsvc_fsm = {
+	.name = "NM_GPRS_NSVC_OP",
+	.states = nm_gprs_nsvc_fsm_states,
+	.num_states = ARRAY_SIZE(nm_gprs_nsvc_fsm_states),
+	.allstate_event_mask =
+		X(NM_EV_OPSTART_ACK) |
+		X(NM_EV_OPSTART_NACK) |
+		X(NM_EV_OML_DOWN),
+	.allstate_action = st_op_allstate,
+	.event_names = nm_fsm_event_names,
+	.log_subsys = DNM,
+};
+
+static __attribute__((constructor)) void nm_gprs_nsvc_fsm_init(void)
+{
+	OSMO_ASSERT(osmo_fsm_register(&nm_gprs_nsvc_fsm) == 0);
+}
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 03722ab8e..c180390fc 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -64,6 +64,7 @@ bs11_config_LDADD = \
 	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
+	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
@@ -144,6 +145,7 @@ meas_json_LDADD = \
 	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
+	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
 	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \