Change in osmo-bts[master]: bts-trx: Submit TRX SW_ACT when PHY becomes connected

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25528 )

Change subject: bts-trx: Submit TRX SW_ACT when PHY becomes connected
......................................................................

bts-trx: Submit TRX SW_ACT when PHY becomes connected

Once the TRXC link is available, we can signal SW_ACT which will
transit rcarrier and bbtransc NM FSMs to Disabled Offline and announce
availability to be configured to the BSC through transmission of
Software Activated Report.

Change-Id: I6e62ec2fdd4cae58b52d83fa851552f7ed51c821
---
M include/osmo-bts/phy_link.h
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-trx/trx_provision_fsm.c
3 files changed, 4 insertions(+), 9 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  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/phy_link.h b/include/osmo-bts/phy_link.h
index 4b8a863..78fe6b9 100644
--- a/include/osmo-bts/phy_link.h
+++ b/include/osmo-bts/phy_link.h
@@ -112,7 +112,6 @@
 		} sysmobts;
 		struct {
 			struct trx_l1h *hdl;
-			bool sw_act_reported;
 			struct trx_dl_burst_req br[TRX_NR_TS];
 		} osmotrx;
 		struct {
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index df2531e..f35c9ba 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -224,14 +224,6 @@
 		l1h = pinst->u.osmotrx.hdl;
 
 		osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_BSIC, (void*)(intptr_t)bsic);
-		/* signal availability */
-		if (!pinst->u.osmotrx.sw_act_reported) {
-			/* HACK, we should change state when we receive first clock from
-			 * transceiver */
-			osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);
-			osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);
-			pinst->u.osmotrx.sw_act_reported = true;
-		}
 	}
 
 	return 0;
diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c
index 660360d..6041073 100644
--- a/src/osmo-bts-trx/trx_provision_fsm.c
+++ b/src/osmo-bts-trx/trx_provision_fsm.c
@@ -33,6 +33,7 @@
 #include <osmo-bts/bts_model.h>
 #include <osmo-bts/bts.h>
 #include <osmo-bts/rsl.h>
+#include <osmo-bts/nm_common_fsm.h>
 
 #include "l1_if.h"
 #include "trx_provision_fsm.h"
@@ -332,6 +333,9 @@
 		trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED);
 	else
 		trx_if_cmd_rfmute(l1h, true);
+
+	osmo_fsm_inst_dispatch(pinst->trx->mo.fi, NM_EV_SW_ACT, NULL);
+	osmo_fsm_inst_dispatch(pinst->trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);
 }
 
 static void st_open_poweroff(struct osmo_fsm_inst *fi, uint32_t event, void *data)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25528
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6e62ec2fdd4cae58b52d83fa851552f7ed51c821
Gerrit-Change-Number: 25528
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210923/06eb05cb/attachment.htm>