Change in osmo-bts[master]: bts-trx: Ensure RFMUTE state is set properly at startup

[laforge]

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

Change subject: bts-trx: Ensure RFMUTE state is set properly at startup
......................................................................

bts-trx: Ensure RFMUTE state is set properly at startup

In general, it is always set to 1 (Locked) in
st_open_poweroff_on_enter() right after initial POWEROFF, and once the
BSC unlocks it (based on VTY cfg "rf_locked (0|1)") by sending an OML
message, the bts_model_chg_adm_state() call will update it sending
RFMUTE.

This basically fixes the case where osmo-bsc.cfg is configured with
"rf_locked 1" to start with a TRX locked until manually unlocked.

Related: SYS#4920
Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25
---
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-trx/trx_provision_fsm.c
2 files changed, 9 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index bc0df2b..9893f45 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -651,9 +651,13 @@
 		l1h = pinst->u.osmotrx.hdl;
 
 		/* Begin to ramp the power if TRX is already running. Otherwise
-		 * skip, power ramping will be started after TRX is running */
-		if (!pinst->phy_link->u.osmotrx.powered)
+		 * skip, power ramping will be started after TRX is running.
+		 * We still want to make sure to update RFMUTE status on the
+		 * other side. */
+		if (!pinst->phy_link->u.osmotrx.powered) {
+			trx_if_cmd_rfmute(l1h, adm_state != NM_STATE_UNLOCKED);
 			break;
+		}
 
 		if (mo->procedure_pending) {
 			LOGPTRX(trx, DL1C, LOGL_INFO,
diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c
index 2e3115a..33a37b3 100644
--- a/src/osmo-bts-trx/trx_provision_fsm.c
+++ b/src/osmo-bts-trx/trx_provision_fsm.c
@@ -277,6 +277,9 @@
 	struct phy_instance *pinst = l1h->phy_inst;
 
 	l1h->config.trxd_hdr_ver_req = pinst->phy_link->u.osmotrx.trxd_hdr_ver_max;
+
+	/* Apply initial RFMUTE state */
+	trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED);
 }
 
 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/+/19830
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I96b64cdc901d6f216df628d7be57a67af4a21e25
Gerrit-Change-Number: 19830
Gerrit-PatchSet: 2
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/20200907/e15e303a/attachment.htm>