<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19407">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH<br><br>If TRX is administratively locked during startup, for TS conigured as<br>TCH/F_PDCH the BSC will send a ACT PDCH message, but osmo-bts-trx won't<br>apply it by signalling it as available to the PCU, since the TRX is<br>locked.<br>That means the ts->flags contains the pending action to activate<br>it until it is unlocked. As a result, calling trx_set_ts() on it was<br>hitting the assert inside which expects not to apply the TS until it has<br>been confirmed by the PCU.<br>Let's still skip setting the TS and let pcu_tx_info_ind() trigger the<br>activation confirmation from PCU, since the TRX has just been unlocked.<br><br>Fixes following assert:<br>Assert failed (ts->flags & TS_F_PDCH_PENDING_MASK) == 0 /osmo-bts/src/osmo-bts-trx/l1_if.c:34<br><br>Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e<br>---<br>M src/osmo-bts-trx/l1_if.c<br>1 file changed, 7 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index 48305b5..a2b3415 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -702,6 +702,13 @@</span><br><span> * internally restore the old status here.</span><br><span> */</span><br><span> ts->dyn.pchan_is = ts->dyn.pchan_want;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ts->pchan == GSM_PCHAN_TCH_F_PDCH && ts->flags & TS_F_PDCH_PENDING_MASK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TS configuration already in progress,</span><br><span style="color: hsl(120, 100%, 40%);">+ * waiting for PCU response, let it be</span><br><span style="color: hsl(120, 100%, 40%);">+ * de/activated later by PCU ACT CNF as a</span><br><span style="color: hsl(120, 100%, 40%);">+ * response to pcu_tx_info_ind()</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> }</span><br><span> trx_set_ts(ts);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19407">change 19407</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/c/osmo-bts/+/19407"/><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-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e </div>
<div style="display:none"> Gerrit-Change-Number: 19407 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>