<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11768">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Neels Hofmeyr: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Allow re-try without exit if POWERON fails in osmo-trx<br><br>If POWERON fails, announce to BSC that the TRX is not available, and<br>announce it as available as soon as POWERON success is received.<br><br>Related: OS#3692<br>Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65<br>---<br>M src/osmo-bts-trx/trx_if.c<br>1 file changed, 44 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index b409d51..b048170 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -173,7 +173,7 @@</span><br><span> OSMO_ASSERT(!llist_empty(&l1h->trx_ctrl_list));</span><br><span> tcm = llist_entry(l1h->trx_ctrl_list.next, struct trx_ctrl_msg, list);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, LOGL_NOTICE, "No response from transceiver for %s (CMD %s%s%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_NOTICE, "No satisfactory response from transceiver for %s (CMD %s%s%s)\n",</span><br><span> phy_instance_name(l1h->phy_inst),</span><br><span> tcm->cmd, tcm->params_len ? " ":"", tcm->params);</span><br><span> </span><br><span>@@ -437,6 +437,40 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* -EINVAL: unrecoverable error, exit BTS</span><br><span style="color: hsl(120, 100%, 40%);">+ * N > 0: try sending originating command again after N seconds</span><br><span style="color: hsl(120, 100%, 40%);">+ * 0: Done with response, get originating command out from send queue</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_ctrl_rx_rsp(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp, bool critical)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst = l1h->phy_inst;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If TRX fails, try again after 1 sec */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(rsp->cmd, "POWERON") == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsp->status == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pinst->phy_link->state != PHY_LINK_CONNECTED)</span><br><span style="color: hsl(120, 100%, 40%);">+ phy_link_state_set(pinst->phy_link, PHY_LINK_CONNECTED);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "transceiver (%s) rejected POWERON command (%d), re-trying in a few seconds\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ phy_instance_name(pinst), rsp->status);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pinst->phy_link->state != PHY_LINK_SHUTDOWN)</span><br><span style="color: hsl(120, 100%, 40%);">+ phy_link_state_set(pinst->phy_link, PHY_LINK_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 5;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsp->status) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, critical ? LOGL_FATAL : LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "transceiver (%s) rejected TRX command with response: '%s%s%s %d'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ phy_instance_name(pinst), rsp->cmd, rsp->params[0] != '\0' ? " ":"",</span><br><span style="color: hsl(120, 100%, 40%);">+ rsp->params, rsp->status);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (critical)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Get + parse response from TRX ctrl socket */</span><br><span> static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span>@@ -444,7 +478,7 @@</span><br><span> struct phy_instance *pinst = l1h->phy_inst;</span><br><span> char buf[1500];</span><br><span> struct trx_ctrl_rsp rsp;</span><br><span style="color: hsl(0, 100%, 40%);">- int len;</span><br><span style="color: hsl(120, 100%, 40%);">+ int len, rc;</span><br><span> struct trx_ctrl_msg *tcm;</span><br><span> </span><br><span> len = recv(ofd->fd, buf, sizeof(buf) - 1, 0);</span><br><span>@@ -492,13 +526,14 @@</span><br><span> }</span><br><span> </span><br><span> /* check for response code */</span><br><span style="color: hsl(0, 100%, 40%);">- if (rsp.status) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "transceiver (%s) rejected TRX command "</span><br><span style="color: hsl(0, 100%, 40%);">- "with response: '%s'\n",</span><br><span style="color: hsl(0, 100%, 40%);">- phy_instance_name(pinst), buf);</span><br><span style="color: hsl(0, 100%, 40%);">- if (tcm->critical)</span><br><span style="color: hsl(0, 100%, 40%);">- goto rsp_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_ctrl_rx_rsp(l1h, &rsp, tcm->critical);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == -EINVAL)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto rsp_error;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* re-schedule last cmd in rc seconds time */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&l1h->trx_ctrl_timer, rc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* remove command from list, save it to last_acked and removed previous last_acked */</span><br><span>@@ -781,7 +816,6 @@</span><br><span> }</span><br><span> /* FIXME: is there better way to check/report TRX availability? */</span><br><span> transceiver_available = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- phy_link_state_set(plink, PHY_LINK_CONNECTED);</span><br><span> return 0;</span><br><span> </span><br><span> cleanup:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11768">change 11768</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11768"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 </div>
<div style="display:none"> Gerrit-Change-Number: 11768 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>