Introduce NM FSM for GPRS NSVC object

Change-Id: I684482064136a461d01cace3cd37afc8b68458cc
Related: OS#5994

12 files changed, 294 insertions, 54 deletions

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index d904ab17..f082543f 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -63,6 +63,7 @@ libbts_a_SOURCES = \
 	nm_channel_fsm.c \
 	nm_gprs_cell_fsm.c \
 	nm_gprs_nse_fsm.c \
+	nm_gprs_nsvc_fsm.c \
 	nm_radio_carrier_fsm.c \
 	probes.d \
 	$(NULL)
diff --git a/src/common/bts.c b/src/common/bts.c
index af663115..9c48a1d0 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -284,10 +284,15 @@ struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num)
 	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);
 	}
 
@@ -382,10 +387,10 @@ int bts_init(struct gsm_bts *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);
-
-	/* set BTS attr to dependency */
-	oml_mo_state_init(&bts->gprs.nse.nsvc[0].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);
-	oml_mo_state_init(&bts->gprs.nse.nsvc[1].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY);
+	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 */
@@ -450,15 +455,11 @@ int bts_link_estab(struct gsm_bts *bts)
 
 	LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status.\n");
 
-	/* BTS SITE MGR becomes Offline (tx SW ACT Report), BTS, NSE is DEPENDENCY */
+	/* 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->mo.fi, NM_EV_SW_ACT, NULL);
 	osmo_fsm_inst_dispatch(bts->gprs.nse.mo.fi, NM_EV_SW_ACT, NULL);
 
-	/* those should all be in DEPENDENCY */
-	oml_tx_state_changed(&bts->gprs.nse.nsvc[0].mo);
-	oml_tx_state_changed(&bts->gprs.nse.nsvc[1].mo);
-
 	/* All other objects start off-line until the BTS Model code says otherwise */
 	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_gprs_nse_fsm.c b/src/common/nm_gprs_nse_fsm.c
index ba956fdd..4f020788 100644
--- a/src/common/nm_gprs_nse_fsm.c
+++ b/src/common/nm_gprs_nse_fsm.c
@@ -44,15 +44,14 @@
 
 static void ev_dispatch_children(struct gsm_gprs_nse *nse, uint32_t event)
 {
+	unsigned int i;
 	struct gsm_bts *bts = gsm_gprs_nse_get_bts(nse);
+
 	osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, event, NULL);
-	/* TODO: once we have FSMs for GPRS Cell and GPRS NSVC: */
-#if 0
-	if (bts->gprs.nsvc[0].fi)
-		osmo_fsm_inst_dispatch(bts->gprs.nsvc[0].fi, event, NULL);
-	if (bts->gprs.nsvc[1].fi)
-		osmo_fsm_inst_dispatch(bts->gprs.nsvc[1].fi, event, NULL);
-#endif
+	for (i = 0; i < ARRAY_SIZE(nse->nsvc); i++) {
+		struct gsm_gprs_nsvc *nsvc = &nse->nsvc[i];
+		osmo_fsm_inst_dispatch(nsvc->mo.fi, event, NULL);
+	}
 }
 
 /* Can the NSE be enabled (OPSTARTed)? aka should it stay in "Disabled Dependency" state? */
diff --git a/src/common/nm_gprs_nsvc_fsm.c b/src/common/nm_gprs_nsvc_fsm.c
new file mode 100644
index 00000000..5a7967d3
--- /dev/null
+++ b/src/common/nm_gprs_nsvc_fsm.c
@@ -0,0 +1,257 @@
+/* NM GPRS NSVC FSM */
+
+/* (C) 2023 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
+ * Author: Pau Espin Pedrol <pespin@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 Licensvc as published by
+ * the Free Software Foundation; either version 3 of the Licensvc, 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 Licensvc for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public Licensvc
+ * along with this program.  If not, see <http://www.gnu.org/licensvcs/>.
+ *
+ */
+
+#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 <osmo-bts/logging.h>
+#include <osmo-bts/gsm_data.h>
+#include <osmo-bts/bts_model.h>
+#include <osmo-bts/bts.h>
+#include <osmo-bts/rsl.h>
+#include <osmo-bts/nm_common_fsm.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)
+
+/* Can the GPRS Cell be enabled (OPSTARTed)? aka should it stay in "Disabled Dependency" state? */
+static bool gprs_nsvc_can_be_enabled(struct gsm_gprs_nsvc *nsvc)
+{
+	return nsvc->nse->mo.nm_state.operational == NM_OPSTATE_ENABLED;
+}
+
+
+//////////////////////////
+// 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;
+	/* Reset state here: */
+
+	nsvc->mo.setattr_success = false;
+	nsvc->mo.opstart_success = false;
+	oml_mo_state_chg(&nsvc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED);
+}
+
+static void st_op_disabled_notinstalled(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_SW_ACT:
+		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);
+		else
+			nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY);
+		return;
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+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;
+	nsvc->mo.setattr_success = false;
+	nsvc->mo.opstart_success = false;
+	oml_mo_state_chg(&nsvc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY, -1);
+}
+
+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 gsm_bts *bts = gsm_gprs_nse_get_bts(nsvc->nse);
+	struct nm_fsm_ev_setattr_data *setattr_data;
+	int rc;
+
+	switch (event) {
+	case NM_EV_RX_SETATTR:
+		setattr_data = (struct nm_fsm_ev_setattr_data *)data;
+		rc = bts_model_apply_oml(bts, setattr_data->msg,
+					 &nsvc->mo, nsvc);
+		nsvc->mo.setattr_success = rc == 0;
+		oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
+		break;
+	case NM_EV_RX_OPSTART:
+		if (!nsvc->mo.setattr_success) {
+			oml_mo_opstart_nack(&nsvc->mo, NM_NACK_CANT_PERFORM);
+			return;
+		}
+		bts_model_opstart(bts, &nsvc->mo, nsvc);
+		break;
+	case NM_EV_OPSTART_ACK:
+		nsvc->mo.opstart_success = true;
+		oml_mo_opstart_ack(&nsvc->mo);
+		nm_gprs_nsvc_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED);
+		return;
+	case NM_EV_OPSTART_NACK:
+		nsvc->mo.opstart_success = false;
+		oml_mo_opstart_nack(&nsvc->mo, (int)(intptr_t)data);
+		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;
+	nsvc->mo.opstart_success = false;
+	oml_mo_state_chg(&nsvc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);
+}
+
+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 gsm_bts *bts = gsm_gprs_nse_get_bts(nsvc->nse);
+	struct nm_fsm_ev_setattr_data *setattr_data;
+	int rc;
+
+	switch (event) {
+	case NM_EV_RX_SETATTR:
+		setattr_data = (struct nm_fsm_ev_setattr_data *)data;
+		rc = bts_model_apply_oml(bts, setattr_data->msg, &nsvc->mo, bts);
+		nsvc->mo.setattr_success = rc == 0;
+		oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
+		break;
+	case NM_EV_RX_OPSTART:
+		if (!nsvc->mo.setattr_success) {
+			oml_mo_opstart_nack(&nsvc->mo, NM_NACK_CANT_PERFORM);
+			return;
+		}
+		bts_model_opstart(bts, &nsvc->mo, bts);
+		break;
+	case NM_EV_OPSTART_ACK:
+		nsvc->mo.opstart_success = true;
+		oml_mo_opstart_ack(&nsvc->mo);
+		nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_ENABLED);
+		break; /* check statechg below */
+	case NM_EV_OPSTART_NACK:
+		nsvc->mo.opstart_success = false;
+		oml_mo_opstart_nack(&nsvc->mo, (int)(intptr_t)data);
+		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;
+	oml_mo_state_chg(&nsvc->mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1);
+}
+
+static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+}
+
+static void nm_gprs_nsvc_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_SHUTDOWN_START:
+		/* Announce we start shutting down */
+		oml_mo_state_chg(&nsvc->mo, -1, -1, NM_STATE_SHUTDOWN);
+		break;
+	case NM_EV_SHUTDOWN_FINISH:
+		nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);
+		break;
+	default:
+		OSMO_ASSERT(false);
+	}
+}
+
+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),
+		.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 = "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_RX_SETATTR) |
+			X(NM_EV_RX_OPSTART) | /* backward compatibility, buggy BSC */
+			X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */
+			X(NM_EV_OPSTART_NACK), /* backward compatibility, buggy BSC */
+		.out_state_mask =
+			X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) |
+			X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |
+			X(NM_CHAN_ST_OP_ENABLED), /* backward compatibility, buggy BSC */
+		.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_RX_SETATTR) |
+			X(NM_EV_RX_OPSTART) |
+			X(NM_EV_OPSTART_ACK) |
+			X(NM_EV_OPSTART_NACK),
+		.out_state_mask =
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED) |
+			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 = 0,
+		.out_state_mask =
+			X(NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED),
+		.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),
+	.event_names = nm_fsm_event_names,
+	.allstate_action = nm_gprs_nsvc_allstate,
+	.allstate_event_mask = X(NM_EV_SHUTDOWN_START) |
+			       X(NM_EV_SHUTDOWN_FINISH),
+	.log_subsys = DOML,
+};
+
+static __attribute__((constructor)) void nm_gprs_nsvc_fsm_init(void)
+{
+	OSMO_ASSERT(osmo_fsm_register(&nm_gprs_nsvc_fsm) == 0);
+}
diff --git a/src/common/oml.c b/src/common/oml.c
index fd8c22c2..7a237f11 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -1094,12 +1094,8 @@ static int oml_rx_opstart(struct gsm_bts *bts, struct msgb *msg)
 		return oml_mo_opstart_ack(mo);
 	}
 
-	if (!mo->fi) {
-		/* Some NM objets still don't have FSMs implemented, such as
-		 * NM_OC_GPRS_NSVC. For those, don't go through FSM:
-		 */
-		return bts_model_opstart(bts, mo, obj);
-	}
+	/* Make sure all NM objects already have an FSM implemented: */
+	OSMO_ASSERT(mo->fi);
 
 	rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_RX_OPSTART, NULL);
 	if (rc < 0)
@@ -1374,8 +1370,12 @@ static int oml_ipa_mo_set_attr_cell(void *obj,
 }
 
 static int oml_ipa_mo_set_attr_nsvc(struct gsm_gprs_nsvc *nsvc,
+				    const struct msgb *msg,
 				    const struct tlv_parsed *tp)
 {
+	struct nm_fsm_ev_setattr_data ev_data;
+	int rc;
+
 	if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_NSVCI, 2))
 		nsvc->nsvci = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_NSVCI));
 
@@ -1437,6 +1437,12 @@ static int oml_ipa_mo_set_attr_nsvc(struct gsm_gprs_nsvc *nsvc,
 		}
 	}
 
+	ev_data = (struct nm_fsm_ev_setattr_data){
+		.msg = msg,
+	};
+	rc = osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_RX_SETATTR, &ev_data);
+	if (rc < 0)
+		return NM_NACK_CANT_PERFORM;
 
 	osmo_signal_dispatch(SS_GLOBAL, S_NEW_NSVC_ATTR, nsvc);
 
@@ -1478,7 +1484,7 @@ static int oml_ipa_set_attr(struct gsm_bts *bts, struct msgb *msg)
 		rc = oml_ipa_mo_set_attr_cell(obj, msg, &tp);
 		break;
 	case NM_OC_GPRS_NSVC:
-		rc = oml_ipa_mo_set_attr_nsvc(obj, &tp);
+		rc = oml_ipa_mo_set_attr_nsvc(obj, msg, &tp);
 		break;
 	default:
 		rc = NM_NACK_OBJINST_UNKN;
@@ -1495,9 +1501,6 @@ static int oml_ipa_set_attr(struct gsm_bts *bts, struct msgb *msg)
 	talloc_free(mo->nm_attr);
 	mo->nm_attr = tp_merged;
 
-	/* These are not yet handled through NM FSM: */
-	if (mo->obj_class == NM_OC_GPRS_NSVC)
-		return oml_fom_ack_nack(msg, rc);
 	return rc;
 }
 
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index fb1dc2d1..f6abc1ba 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -1868,6 +1868,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 	case NM_OC_BASEB_TRANSC:
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
+	case NM_OC_GPRS_NSVC:
 		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 		break;
 	case NM_OC_RADIO_CARRIER:
@@ -1878,10 +1879,6 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 		ts = (struct gsm_bts_trx_ts*) obj;
 		rc = ts_opstart(ts);
 		break;
-	case NM_OC_GPRS_NSVC:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1);
-		rc = oml_mo_opstart_ack(mo);
-		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);
 	}
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index 66906810..efa41aa9 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -1873,6 +1873,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 	case NM_OC_BASEB_TRANSC:
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
+	case NM_OC_GPRS_NSVC:
 		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 		break;
 	case NM_OC_RADIO_CARRIER:
@@ -1883,10 +1884,6 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 		ts = (struct gsm_bts_trx_ts*) obj;
 		rc = ts_opstart(ts);
 		break;
-	case NM_OC_GPRS_NSVC:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1);
-		rc = oml_mo_opstart_ack(mo);
-		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);
 	}
diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index 73daa2bd..28fb60c0 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1772,6 +1772,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj)
 	case NM_OC_BASEB_TRANSC:
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
+	case NM_OC_GPRS_NSVC:
 		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 		break;
 	case NM_OC_RADIO_CARRIER:
@@ -1782,10 +1783,6 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj)
 		ts = (struct gsm_bts_trx_ts*) obj;
 		rc = ts_connect_as(ts, ts->pchan, pchan_act_compl_cb, NULL);
 		break;
-	case NM_OC_GPRS_NSVC:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, -1, -1);
-		rc = oml_mo_opstart_ack(mo);
-		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);
 	}
diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c
index d85d9cd3..eea771d5 100644
--- a/src/osmo-bts-omldummy/bts_model.c
+++ b/src/osmo-bts-omldummy/bts_model.c
@@ -130,11 +130,8 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj)
 	case NM_OC_CHANNEL:
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
-		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
-		break;
 	case NM_OC_GPRS_NSVC:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1);
-		rc = oml_mo_opstart_ack(mo);
+		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index bf65b49e..f938e064 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -1749,6 +1749,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 	case NM_OC_BASEB_TRANSC:
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
+	case NM_OC_GPRS_NSVC:
 		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 		break;
 	case NM_OC_RADIO_CARRIER:
@@ -1759,10 +1760,6 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 		ts = (struct gsm_bts_trx_ts*) obj;
 		rc = ts_opstart(ts);
 		break;
-	case NM_OC_GPRS_NSVC:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1);
-		rc = oml_mo_opstart_ack(mo);
-		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);
 	}
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index af7d0349..b39c51fd 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -586,6 +586,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 	case NM_OC_CHANNEL:
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
+	case NM_OC_GPRS_NSVC:
 		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 		break;
 	case NM_OC_RADIO_CARRIER:
@@ -593,10 +594,6 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 		trx = (struct gsm_bts_trx *) obj;
 		rc = trx_init(trx);
 		break;
-	case NM_OC_GPRS_NSVC:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1);
-		rc = oml_mo_opstart_ack(mo);
-		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);
 	}
diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c
index d758a82b..eb711385 100644
--- a/src/osmo-bts-virtual/bts_model.c
+++ b/src/osmo-bts-virtual/bts_model.c
@@ -165,11 +165,8 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj)
 	case NM_OC_CHANNEL:
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
-		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
-		break;
 	case NM_OC_GPRS_NSVC:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1);
-		rc = oml_mo_opstart_ack(mo);
+		rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);