<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/22888">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">l1sap: add logging and VTY introspection for ACCH repetition<br><br>At the moment osmo-bts is not looging much ACCH repetition related<br>information. This makes testing ACCH repetition difficult. Lets add some<br>debug output that informs the user when ACCH repetition is turned on or<br>off. Lets also add an ACCH repetition status display to the show lchan<br>VTY command.<br><br>Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e<br>Related: SYS#5114<br>---<br>M src/common/l1sap.c<br>M src/common/vty.c<br>2 files changed, 90 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 1d80a84..0600658 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -960,6 +960,7 @@</span><br><span> uint8_t upper;</span><br><span> uint8_t lower;</span><br><span> uint8_t rxqual;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool prev_repeated_dl_facch_active = lchan->repeated_dl_facch_active;</span><br><span> </span><br><span> /* This is an optimization so that we exit as quickly as possible if</span><br><span> * there are no FACCH repetition capabilities present. However If the</span><br><span>@@ -968,13 +969,13 @@</span><br><span> if (!lchan->repeated_acch_capability.dl_facch_cmd</span><br><span> && !lchan->repeated_acch_capability.dl_facch_all) {</span><br><span> lchan->repeated_dl_facch_active = false;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> }</span><br><span> </span><br><span> /* Threshold disabled (always on) */</span><br><span> if (lchan->repeated_acch_capability.rxqual == 0) {</span><br><span> lchan->repeated_dl_facch_active = true;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> }</span><br><span> </span><br><span> /* When the MS sets the SRR bit in the UL-SACCH L1 header</span><br><span>@@ -982,16 +983,16 @@</span><br><span> * FACCH repetition too. */</span><br><span> if (lchan->meas.l1_info.srr_sro) {</span><br><span> lchan->repeated_dl_facch_active = true;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> }</span><br><span> </span><br><span> /* Parse MS measurement results */</span><br><span> if (l3_len <= sizeof(struct gsm48_meas_res *) + 2)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> if (l3[0] != GSM48_PDISC_RR)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> if (l3[1] != GSM48_MT_RR_MEAS_REP)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> l3 += 2;</span><br><span> meas_res = (struct gsm48_meas_res *)l3;</span><br><span> </span><br><span>@@ -1015,6 +1016,13 @@</span><br><span> else if (rxqual <= lower)</span><br><span> lchan->repeated_dl_facch_active = false;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+out:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_dl_facch_active == prev_repeated_dl_facch_active)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_dl_facch_active)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: inactive => active\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n");</span><br><span> }</span><br><span> </span><br><span> /* Special dequeueing function with SACCH repetition (3GPP TS 44.006, section 11) */</span><br><span>@@ -1140,10 +1148,15 @@</span><br><span> le = &lchan->lapdm_ch.lapdm_acch;</span><br><span> if (lchan->repeated_acch_capability.dl_sacch) {</span><br><span> /* Check if MS requests SACCH repetition and update state accordingly */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->meas.l1_info.srr_sro)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->meas.l1_info.srr_sro) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_dl_sacch_active == false)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-SACCH repetition: inactive => active\n");</span><br><span> lchan->repeated_dl_sacch_active = true;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_dl_sacch_active == true)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-SACCH repetition: active => inactive\n");</span><br><span> lchan->repeated_dl_sacch_active = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le);</span><br><span> } else {</span><br><span> pp_msg = lapdm_phsap_dequeue_msg(le);</span><br><span>@@ -1413,6 +1426,7 @@</span><br><span> {</span><br><span> uint16_t upper = 0;</span><br><span> uint16_t lower = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool prev_repeated_ul_sacch_active = lchan->repeated_ul_sacch_active;</span><br><span> </span><br><span> /* This is an optimization so that we exit as quickly as possible if</span><br><span> * there are no uplink SACCH repetition capabilities present.</span><br><span>@@ -1420,13 +1434,13 @@</span><br><span> * reason, we must be sure that UL-SACCH repetition is disabled. */</span><br><span> if (!lchan->repeated_acch_capability.ul_sacch) {</span><br><span> lchan->repeated_ul_sacch_active = false;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> }</span><br><span> </span><br><span> /* Threshold disabled (repetition is always on) */</span><br><span> if (lchan->repeated_acch_capability.rxqual == 0) {</span><br><span> lchan->repeated_ul_sacch_active = true;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out;</span><br><span> }</span><br><span> </span><br><span> /* convert from RXQUAL value to ber10k value.</span><br><span>@@ -1447,6 +1461,14 @@</span><br><span> lchan->repeated_ul_sacch_active = true;</span><br><span> else if (ber10k <= lower)</span><br><span> lchan->repeated_ul_sacch_active = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+out:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_ul_sacch_active == prev_repeated_ul_sacch_active)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_ul_sacch_active)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "UL-SACCH repetition: inactive => active\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "UL-SACCH repetition: active => inactive\n");</span><br><span> }</span><br><span> </span><br><span> /* DATA received from bts model */</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index bbd33f8..45ee32c 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1564,6 +1564,63 @@</span><br><span> dump_dpc_params(vty, indent + 2, st->dpc_params);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void lchan_acch_rep_state_dump(struct vty *vty, unsigned int indent,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "ACCH repetition:%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ indent += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_acch_capability.rxqual)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "Enable RXQUAL threshold: %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->repeated_acch_capability.rxqual, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "Enable RXQUAL threshold: (none, alway on)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "DL-FACCH:%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ indent += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_acch_capability.dl_facch_all)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retramsit all LAPDM block types%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (lchan->repeated_acch_capability.dl_facch_cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retramsit only LAPDM command blocks%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_dl_facch_active)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retransmission currently inactive%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ indent -= 2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "DL-SACCH:%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ indent += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_acch_capability.ul_sacch)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_dl_sacch_active)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retransmission currently inactive%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ indent -= 2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "UL-SACCH:%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ indent += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_acch_capability.dl_sacch)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->repeated_ul_sacch_active)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(vty, "retransmission currently inactive%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ indent -= 2;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void lchan_dump_full_vty(struct vty *vty, const struct gsm_lchan *lchan)</span><br><span> {</span><br><span> struct in_addr ia;</span><br><span>@@ -1637,6 +1694,7 @@</span><br><span> /* BS/MS Power Control state and parameters */</span><br><span> lchan_bs_power_ctrl_state_dump(vty, 2, lchan);</span><br><span> lchan_ms_power_ctrl_state_dump(vty, 2, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_acch_rep_state_dump(vty, 2, lchan);</span><br><span> }</span><br><span> </span><br><span> static void lchan_dump_short_vty(struct vty *vty, const struct gsm_lchan *lchan)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/22888">change 22888</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/+/22888"/><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: I59d11fd03be3d29fb8a4279d9945b03006764c0e </div>
<div style="display:none"> Gerrit-Change-Number: 22888 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>