Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11768 )

Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx
......................................................................

bts-trx: Allow re-try without exit if POWERON fails in osmo-trx

If POWERON fails, announce to BSC that the TRX is not available, and
announce it as available as soon as POWERON success is received.

Related: OS#3692
Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 44 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Neels Hofmeyr: Looks good to me, approved



diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index b409d51..b048170 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -173,7 +173,7 @@
 	OSMO_ASSERT(!llist_empty(&l1h->trx_ctrl_list));
 	tcm = llist_entry(l1h->trx_ctrl_list.next, struct trx_ctrl_msg, list);
 
-	LOGP(DTRX, LOGL_NOTICE, "No response from transceiver for %s (CMD %s%s%s)\n",
+	LOGP(DTRX, LOGL_NOTICE, "No satisfactory response from transceiver for %s (CMD %s%s%s)\n",
 		phy_instance_name(l1h->phy_inst),
 		tcm->cmd, tcm->params_len ? " ":"", tcm->params);
 
@@ -437,6 +437,40 @@
 	return true;
 }
 
+/* -EINVAL: unrecoverable error, exit BTS
+ * N > 0: try sending originating command again after N seconds
+ * 0: Done with response, get originating command out from send queue
+ */
+static int trx_ctrl_rx_rsp(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp, bool critical)
+{
+	struct phy_instance *pinst = l1h->phy_inst;
+
+	/* If TRX fails, try again after 1 sec */
+	if (strcmp(rsp->cmd, "POWERON") == 0) {
+		if (rsp->status == 0) {
+			if (pinst->phy_link->state != PHY_LINK_CONNECTED)
+				phy_link_state_set(pinst->phy_link, PHY_LINK_CONNECTED);
+		} else {
+			LOGP(DTRX, LOGL_NOTICE,
+			     "transceiver (%s) rejected POWERON command (%d), re-trying in a few seconds\n",
+			     phy_instance_name(pinst), rsp->status);
+			if (pinst->phy_link->state != PHY_LINK_SHUTDOWN)
+				phy_link_state_set(pinst->phy_link, PHY_LINK_SHUTDOWN);
+			return 5;
+		}
+	}
+
+	if (rsp->status) {
+		LOGP(DTRX, critical ? LOGL_FATAL : LOGL_NOTICE,
+		     "transceiver (%s) rejected TRX command with response: '%s%s%s %d'\n",
+		     phy_instance_name(pinst), rsp->cmd, rsp->params[0] != '\0' ? " ":"",
+		     rsp->params, rsp->status);
+		if (critical)
+			return -EINVAL;
+	}
+	return 0;
+}
+
 /*! Get + parse response from TRX ctrl socket */
 static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what)
 {
@@ -444,7 +478,7 @@
 	struct phy_instance *pinst = l1h->phy_inst;
 	char buf[1500];
 	struct trx_ctrl_rsp rsp;
-	int len;
+	int len, rc;
 	struct trx_ctrl_msg *tcm;
 
 	len = recv(ofd->fd, buf, sizeof(buf) - 1, 0);
@@ -492,13 +526,14 @@
 	}
 
 	/* check for response code */
-	if (rsp.status) {
-		LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_NOTICE,
-			"transceiver (%s) rejected TRX command "
-			"with response: '%s'\n",
-			phy_instance_name(pinst), buf);
-		if (tcm->critical)
-			goto rsp_error;
+	rc = trx_ctrl_rx_rsp(l1h, &rsp, tcm->critical);
+	if (rc == -EINVAL)
+		goto rsp_error;
+
+	/* re-schedule last cmd in rc seconds time */
+	if (rc > 0) {
+		osmo_timer_schedule(&l1h->trx_ctrl_timer, rc, 0);
+		return 0;
 	}
 
 	/* remove command from list, save it to last_acked and removed previous last_acked */
@@ -781,7 +816,6 @@
 	}
 	/* FIXME: is there better way to check/report TRX availability? */
 	transceiver_available = 1;
-	phy_link_state_set(plink, PHY_LINK_CONNECTED);
 	return 0;
 
 cleanup:

-- 
To view, visit https://gerrit.osmocom.org/11768
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65
Gerrit-Change-Number: 11768
Gerrit-PatchSet: 4
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181120/79be7c8e/attachment.htm>