<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23257">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Always submit rx PDTCH DATA.ind to l1sap<br><br>Similar to what we have been doing for TCH channels, we want to make<br>sure all MAC blocks get to the upper layers, even if containing invalid<br>data (flagging it with data_len=0) so that upper layers (osmo-pcu<br>through PCUIF in this case) can rely on FN clock without gaps due to<br>Rx errors.<br><br>Related: OS#5020<br>Change-Id: I343c7a721dab72411edbca816c8864926bc329fb<br>---<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/sched_lchan_pdtch.c<br>2 files changed, 18 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 3d780fd..c7c3e62 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -1411,7 +1411,6 @@</span><br><span> /* handle NOPE indications */</span><br><span> if (bi->flags & TRX_BI_F_NOPE_IND) {</span><br><span> switch (chan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case TRXC_PDTCH:</span><br><span> case TRXC_PTCCH:</span><br><span> case TRXC_RACH:</span><br><span> /* For some logical channel types NOPE.ind is valueless. */</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>index 28a45f5..665f643 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>@@ -53,6 +53,7 @@</span><br><span> int n_bits_total = 0;</span><br><span> uint16_t ber10k;</span><br><span> int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ph_pres_info_type presence_info;</span><br><span> </span><br><span> LOGL1S(DL1P, LOGL_DEBUG, l1t, bi->tn, chan, bi->fn,</span><br><span> "Received PDTCH bid=%u\n", bid);</span><br><span>@@ -79,16 +80,24 @@</span><br><span> trx_sched_meas_push(chan_state, bi);</span><br><span> </span><br><span> /* copy burst to buffer of 4 bursts */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bi->burst_len == EGPRS_BURST_LEN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bi->burst_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case EGPRS_BURST_LEN:</span><br><span> burst = *bursts_p + bid * 348;</span><br><span> memcpy(burst, bi->burst + 9, 174);</span><br><span> memcpy(burst + 174, bi->burst + 261, 174);</span><br><span> n_bursts_bits = GSM0503_EGPRS_BURSTS_NBITS;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BURST_LEN:</span><br><span> burst = *bursts_p + bid * 116;</span><br><span> memcpy(burst, bi->burst + 3, 58);</span><br><span> memcpy(burst + 58, bi->burst + 87, 58);</span><br><span> n_bursts_bits = GSM0503_GPRS_BURSTS_NBITS;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOPE.ind, assume GPRS? */</span><br><span style="color: hsl(120, 100%, 40%);">+ burst = *bursts_p + bid * 116;</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(burst, 0, 116);</span><br><span style="color: hsl(120, 100%, 40%);">+ n_bursts_bits = GSM0503_GPRS_BURSTS_NBITS;</span><br><span> }</span><br><span> </span><br><span> /* wait until complete set of bursts */</span><br><span>@@ -120,19 +129,23 @@</span><br><span> &n_errors, &n_bits_total);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (rc <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence_info = PRES_INFO_BOTH;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> LOGL1S(DL1P, LOGL_DEBUG, l1t, bi->tn, chan, bi->fn,</span><br><span> "Received bad PDTCH (%u/%u)\n",</span><br><span> bi->fn % l1ts->mf_period, l1ts->mf_period);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ presence_info = PRES_INFO_INVALID;</span><br><span> }</span><br><span> </span><br><span> ber10k = compute_ber10k(n_bits_total, n_errors);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return _sched_compose_ph_data_ind(l1t, bi->tn,</span><br><span> *first_fn, chan, l2, rc,</span><br><span> meas_avg.rssi, meas_avg.toa256,</span><br><span> meas_avg.ci_cb, ber10k,</span><br><span style="color: hsl(0, 100%, 40%);">- PRES_INFO_BOTH);</span><br><span style="color: hsl(120, 100%, 40%);">+ presence_info);</span><br><span> }</span><br><span> </span><br><span> /* obtain a to-be-transmitted PDTCH (packet data) burst */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23257">change 23257</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/+/23257"/><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: I343c7a721dab72411edbca816c8864926bc329fb </div>
<div style="display:none"> Gerrit-Change-Number: 23257 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>