<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25899">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[overpower] Turn it on and off depending on DL RxQual<br><br>Change-Id: Iaa812d4661ee17c4cd4a8c4ae4bd3e94c1a2e6cc<br>Depends: Ia28293a12de0af71f55e701fb65c46e905dae217<br>Related: SYS#5319<br>---<br>M include/osmo-bts/lchan.h<br>M src/common/measurement.c<br>M src/common/rsl.c<br>M src/common/scheduler.c<br>4 files changed, 57 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h</span><br><span>index 754dc7c..3aaa75a 100644</span><br><span>--- a/include/osmo-bts/lchan.h</span><br><span>+++ b/include/osmo-bts/lchan.h</span><br><span>@@ -293,8 +293,9 @@</span><br><span> struct gsm_power_ctrl_params ms_dpc_params;</span><br><span> struct gsm_power_ctrl_params bs_dpc_params;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Temporary ACCH overpower capabilities */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Temporary ACCH overpower capabilities and state */</span><br><span> struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool top_acch_active;</span><br><span> </span><br><span> struct msgb *pending_rel_ind_msg;</span><br><span> </span><br><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 8f33eaa..4341be7 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -861,6 +861,43 @@</span><br><span> LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void acch_overpower_active_decision(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm48_meas_res *meas_res)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const bool old = lchan->top_acch_active;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t upper, lower, rxqual;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ACCH overpower is not allowed => nothing to do */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->top_acch_cap.overpower_db == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RxQual threshold is disabled => overpower is always on */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->top_acch_cap.rxqual == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If DTx is active on Downlink, use the '-SUB' */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (meas_res->dtx_used)</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual = meas_res->rxqual_sub;</span><br><span style="color: hsl(120, 100%, 40%);">+ else /* ... otherwise use the '-FULL' */</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual = meas_res->rxqual_full;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ upper = lchan->top_acch_cap.rxqual;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (upper > 2)</span><br><span style="color: hsl(120, 100%, 40%);">+ lower = upper - 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ lower = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rxqual >= upper)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->top_acch_active = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (rxqual <= lower)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->top_acch_active = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->top_acch_active != old) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "Temporary ACCH overpower: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->top_acch_active ? "inactive => active"</span><br><span style="color: hsl(120, 100%, 40%);">+ : "active => inactive");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static bool data_is_rr_meas_rep(const uint8_t *data)</span><br><span> {</span><br><span> const struct gsm48_hdr *gh = (void *)(data + 5);</span><br><span>@@ -954,8 +991,10 @@</span><br><span> }</span><br><span> lchan_ms_ta_ctrl(lchan, ms_ta, lchan->meas.ms_toa256);</span><br><span> lchan_ms_pwr_ctrl(lchan, ms_pwr, ul_rssi, ul_ci_cb);</span><br><span style="color: hsl(0, 100%, 40%);">- if (mr && mr->meas_valid == 0) /* 0 = valid */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mr && mr->meas_valid == 0) { /* 0 = valid */</span><br><span> lchan_bs_pwr_ctrl(lchan, mr);</span><br><span style="color: hsl(120, 100%, 40%);">+ acch_overpower_active_decision(lchan, mr);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> repeated_dl_facch_active_decision(lchan, mr);</span><br><span> </span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 5d069c2..4c84f21 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1928,6 +1928,13 @@</span><br><span> if (rc < 0)</span><br><span> return rsl_tx_chan_act_acknack(lchan, -rc);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Take the first ACCH overpower decision (if allowed): it can be</span><br><span style="color: hsl(120, 100%, 40%);">+ * enabled immediately if the RxQual threshold is disabled (0). */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->top_acch_cap.overpower_db > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->top_acch_active = !lchan->top_acch_cap.rxqual;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->top_acch_active = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* actually activate the channel in the BTS */</span><br><span> rc = l1sap_chan_act(lchan->ts->trx, dch->chan_nr, &tp);</span><br><span> if (rc < 0)</span><br><span>@@ -2198,6 +2205,13 @@</span><br><span> if (rc < 0)</span><br><span> return rsl_tx_mode_modif_nack(lchan, -rc);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Immediately disable ACCH overpower if the value is 0 dB,</span><br><span style="color: hsl(120, 100%, 40%);">+ * or enable if the RxQual threshold becomes disabled (0). */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->top_acch_cap.overpower_db == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->top_acch_active = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (lchan->top_acch_cap.rxqual == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->top_acch_active = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> l1sap_chan_modify(lchan->ts->trx, dch->chan_nr);</span><br><span> </span><br><span> /* FIXME: delay this until L1 says OK? */</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index ba5c18a..d8048b5 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -1310,7 +1310,7 @@</span><br><span> br->att = lchan->bs_power_ctrl.current;</span><br><span> </span><br><span> /* Temporary Overpower for SACCH/FACCH bursts */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->top_acch_cap.overpower_db == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lchan->top_acch_active)</span><br><span> return;</span><br><span> if ((lchan->top_acch_cap.sacch_enable && desc->link_id == LID_SACCH) ||</span><br><span> (lchan->top_acch_cap.facch_enable && br->flags & TRX_BR_F_FACCH)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25899">change 25899</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/+/25899"/><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: Iaa812d4661ee17c4cd4a8c4ae4bd3e94c1a2e6cc </div>
<div style="display:none"> Gerrit-Change-Number: 25899 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>