<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/15989">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
dexter: Looks good to me, but someone else must approve; Verified
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: general handling of NOPE / IDLE indications<br><br>Each logical channel can now optionally have an additional handler,<br>that will be called when a NOPE / IDLE indication is received from<br>the transceiver. The aim of that handler is to keep the logical<br>channel state updated in case if one or more Uplink bursts are lost.<br><br>Change-Id: I71c552f44c25e56e9779d8b8ef5d4de9f8475637<br>Related: OS#3428<br>---<br>M include/osmo-bts/scheduler_backend.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/trx_if.c<br>3 files changed, 20 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h</span><br><span>index d713900..51c957c 100644</span><br><span>--- a/include/osmo-bts/scheduler_backend.h</span><br><span>+++ b/include/osmo-bts/scheduler_backend.h</span><br><span>@@ -31,6 +31,8 @@</span><br><span> trx_sched_dl_func *dl_fn;</span><br><span> /*! \brief function to call when burst received from PHY */</span><br><span> trx_sched_ul_func *ul_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! \brief function to call when NOPE.ind received from PHY */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_ul_func *nope_fn;</span><br><span> /*! \brief channel flags, see TRX_CHAN_FLAG_* */</span><br><span> uint8_t flags;</span><br><span> };</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 3adfc49..fe93c32 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -1349,6 +1349,13 @@</span><br><span> l1cs = &l1ts->chan_state[chan];</span><br><span> func = trx_chan_desc[chan].ul_fn;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: handle noise measurements */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chan == TRXC_IDLE && bi->flags & TRX_BI_F_NOPE_IND) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGL1S(DL1P, LOGL_DEBUG, l1t, bi->tn, chan, bi->fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Rx noise measurement (%d)\n", bi->rssi);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* check if channel is active */</span><br><span> if (!TRX_CHAN_IS_ACTIVE(l1cs, chan))</span><br><span> return -EINVAL;</span><br><span>@@ -1364,6 +1371,14 @@</span><br><span> l1cs->last_tdma_fn = bi->fn;</span><br><span> l1cs->proc_tdma_fs++;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* handle NOPE indications (if the handler is present) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi->flags & TRX_BI_F_NOPE_IND) {</span><br><span style="color: hsl(120, 100%, 40%);">+ func = trx_chan_desc[chan].nope_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!func)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return func(l1t, chan, bid, bi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* decrypt */</span><br><span> if (bi->burst_len && l1cs->ul_encr_algo) {</span><br><span> ubit_t ks[114];</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 920f441..dbf7805 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>@@ -1018,14 +1018,8 @@</span><br><span> if (hdr_len < 0)</span><br><span> return hdr_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: we can use NOPE indications to get noise levels on IDLE</span><br><span style="color: hsl(0, 100%, 40%);">- * TDMA frames, and properly drive scheduler if nothing has been</span><br><span style="color: hsl(0, 100%, 40%);">- * detected on non-IDLE channels. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bi.flags & TRX_BI_F_NOPE_IND) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "IDLE / NOPE indications are not (yet) supported\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOTSUP;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi.flags & TRX_BI_F_NOPE_IND)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto skip_burst;</span><br><span> </span><br><span> /* We're done with the header now */</span><br><span> buf_len -= hdr_len;</span><br><span>@@ -1047,6 +1041,7 @@</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+skip_burst:</span><br><span> /* Print header & burst info */</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, "Rx %s (hdr_ver=%u): %s\n",</span><br><span> (bi.flags & TRX_BI_F_NOPE_IND) ? "NOPE.ind" : "UL burst",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/15989">change 15989</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/+/15989"/><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: I71c552f44c25e56e9779d8b8ef5d4de9f8475637 </div>
<div style="display:none"> Gerrit-Change-Number: 15989 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>