<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14275">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Vadim Yanitskiy: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon: Suppress POWERON to TRX if we're already powered on.<br><br>The existing logic unconditionally wants to send a POWERON command<br>on TRXC whenever L1CTL_FBSB_REQ is received. That may cause some<br>problems when sending subsequent L1CTL_FBSB_REQ, e.g. due to signal loss.<br><br>Sending POWEROFF when transceiver is not powered on is normal though.<br>This can happen if trxcon is restarted while fake_trx was running.<br><br>The existing FSM state could unfortunately not been used, as it's a<br>mixture between the TRX connection state and the command/response state.<br><br>The current solution is just a work around. We definitely need to<br>introduce separate state machines for transceiver and its TRXC<br>interface.<br><br>Change-Id: I834e8897b95a2490811319697fc7cab6076db480<br>---<br>M src/host/trxcon/l1ctl.c<br>M src/host/trxcon/trx_if.c<br>M src/host/trxcon/trx_if.h<br>3 files changed, 18 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c</span><br><span>index fff1c2b..30f43d0 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -362,7 +362,10 @@</span><br><span> trx_if_cmd_txtune(l1l->trx, band_arfcn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx_if_cmd_poweron(l1l->trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Transceiver might have been powered on before, e.g.</span><br><span style="color: hsl(120, 100%, 40%);">+ * in case of sending L1CTL_FBSB_REQ due to signal loss. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!l1l->trx->powered_up)</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_if_cmd_poweron(l1l->trx);</span><br><span> </span><br><span> /* Start FBSB expire timer */</span><br><span> l1l->fbsb_timer.data = l1l;</span><br><span>diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c</span><br><span>index 35ad3c0..ca78349 100644</span><br><span>--- a/src/host/trxcon/trx_if.c</span><br><span>+++ b/src/host/trxcon/trx_if.c</span><br><span>@@ -254,6 +254,11 @@</span><br><span> </span><br><span> int trx_if_cmd_poweron(struct trx_instance *trx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->powered_up) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: this should be handled by the FSM, not here! */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTRX, LOGL_ERROR, "Suppressing POWERON as we're already powered up\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EAGAIN;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return trx_ctrl_cmd(trx, 1, "POWERON", "");</span><br><span> }</span><br><span> </span><br><span>@@ -495,10 +500,14 @@</span><br><span> }</span><br><span> </span><br><span> /* Trigger state machine */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strncmp(tcm->cmd + 4, "POWERON", 7))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strncmp(tcm->cmd + 4, "POWERON", 7)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->powered_up = true;</span><br><span> osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_ACTIVE, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (!strncmp(tcm->cmd + 4, "POWEROFF", 8))</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strncmp(tcm->cmd + 4, "POWEROFF", 8)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->powered_up = false;</span><br><span> osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_IDLE, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> else if (!strncmp(tcm->cmd + 4, "MEASURE", 7))</span><br><span> trx_if_measure_rsp_cb(trx, buf + 14);</span><br><span> else if (!strncmp(tcm->cmd + 4, "ECHO", 4))</span><br><span>diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h</span><br><span>index 0b3f36f..a44600d 100644</span><br><span>--- a/src/host/trxcon/trx_if.h</span><br><span>+++ b/src/host/trxcon/trx_if.h</span><br><span>@@ -25,7 +25,10 @@</span><br><span> struct osmo_timer_list trx_ctrl_timer;</span><br><span> struct llist_head trx_ctrl_list;</span><br><span> struct osmo_fsm_inst *fsm;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* HACK: we need proper state machines */</span><br><span> uint32_t prev_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool powered_up;</span><br><span> </span><br><span> /* GSM L1 specific */</span><br><span> uint16_t pm_band_arfcn_start;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14275">change 14275</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/14275"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I834e8897b95a2490811319697fc7cab6076db480 </div>
<div style="display:none"> Gerrit-Change-Number: 14275 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>