<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25324">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: 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;">MS Power Control Loop: Support EWMA algorithm for C/I measurements<br><br>Change-Id: I52eb0558fd7a215a6ee0b2aced189ae4a37d8a22<br>Related: SYS#4917<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/common/power_control.c<br>2 files changed, 29 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index 979e6d9..256cf21 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -242,6 +242,7 @@</span><br><span> const struct gsm_power_ctrl_params *dpc_params;</span><br><span> /* Measurement pre-processing state (for dynamic mode) */</span><br><span> struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_power_ctrl_meas_proc_state ci_meas_proc;</span><br><span> /* Number of SACCH blocks to skip (for dynamic mode) */</span><br><span> int skip_block_num;</span><br><span> </span><br><span>diff --git a/src/common/power_control.c b/src/common/power_control.c</span><br><span>index 9d874c4..80157f2 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -92,29 +92,31 @@</span><br><span> #define CALC_TARGET(mp) \</span><br><span> ((mp).lower_thresh + (mp).upper_thresh) / 2</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Calculate a 'delta' value (for the given MS/BS power control state and parameters)</span><br><span style="color: hsl(0, 100%, 40%);">- * to be applied to the current Tx power level to approach the target level. */</span><br><span style="color: hsl(0, 100%, 40%);">-static int calc_delta(const struct gsm_power_ctrl_params *params,</span><br><span style="color: hsl(0, 100%, 40%);">- struct lchan_power_ctrl_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- const int rxlev_dbm)</span><br><span style="color: hsl(120, 100%, 40%);">+static int do_avg_algo(const struct gsm_power_ctrl_meas_params *mp,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_power_ctrl_meas_proc_state *mps,</span><br><span style="color: hsl(120, 100%, 40%);">+ const int val)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rxlev_dbm_avg;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rxlev_avg;</span><br><span style="color: hsl(0, 100%, 40%);">- int delta;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Filter RxLev value to reduce unnecessary Tx power oscillations */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (params->rxlev_meas.algo) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int val_avg;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mp->algo) {</span><br><span> case GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA:</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev_dbm_avg = do_pf_ewma(¶ms->rxlev_meas,</span><br><span style="color: hsl(0, 100%, 40%);">- &state->rxlev_meas_proc,</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev_dbm);</span><br><span style="color: hsl(120, 100%, 40%);">+ val_avg = do_pf_ewma(mp, mps, val);</span><br><span> break;</span><br><span> /* TODO: implement other pre-processing methods */</span><br><span> case GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE:</span><br><span> default:</span><br><span> /* No filtering (pass through) */</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev_dbm_avg = rxlev_dbm;</span><br><span style="color: hsl(120, 100%, 40%);">+ val_avg = val;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ return val_avg;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+/* Calculate a 'delta' value (for the given MS/BS power control state and parameters)</span><br><span style="color: hsl(120, 100%, 40%);">+ * to be applied to the current Tx power level to approach the target level. */</span><br><span style="color: hsl(120, 100%, 40%);">+static int calc_delta_rxlev(const struct gsm_power_ctrl_params *params,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct lchan_power_ctrl_state *state,</span><br><span style="color: hsl(120, 100%, 40%);">+ const int rxlev_dbm_avg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rxlev_avg;</span><br><span style="color: hsl(120, 100%, 40%);">+ int delta;</span><br><span> </span><br><span> /* FIXME: avoid this conversion, accept RxLev as-is */</span><br><span> rxlev_avg = dbm2rxlev(rxlev_dbm_avg);</span><br><span>@@ -181,6 +183,8 @@</span><br><span> enum gsm_band band = bts->band;</span><br><span> int8_t new_power_lvl; /* TS 05.05 power level */</span><br><span> int8_t ms_dbm, new_dbm, current_dbm, bsc_max_dbm;</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t ul_rssi_dbm_avg;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t ul_lqual_cb_avg;</span><br><span> const struct gsm_power_ctrl_meas_params *ci_meas;</span><br><span> </span><br><span> if (!trx_ms_pwr_ctrl_is_osmo(trx))</span><br><span>@@ -216,13 +220,15 @@</span><br><span> </span><br><span> /* If computed C/I is out of acceptable thresholds: */</span><br><span> ci_meas = lchan_get_ci_thresholds(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ul_lqual_cb < ci_meas->lower_thresh * 10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_lqual_cb_avg = do_avg_algo(ci_meas, &state->ci_meas_proc, ul_lqual_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_rssi_dbm_avg = do_avg_algo(¶ms->rxlev_meas, &state->rxlev_meas_proc, ul_rssi_dbm);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ul_lqual_cb_avg < ci_meas->lower_thresh * 10) {</span><br><span> new_dbm = ms_dbm + params->inc_step_size_db;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ul_lqual_cb > ci_meas->upper_thresh * 10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ul_lqual_cb_avg > ci_meas->upper_thresh * 10) {</span><br><span> new_dbm = ms_dbm - params->red_step_size_db;</span><br><span> } else {</span><br><span> /* Calculate the new Tx power value (in dBm) */</span><br><span style="color: hsl(0, 100%, 40%);">- new_dbm = ms_dbm + calc_delta(params, state, ul_rssi_dbm);</span><br><span style="color: hsl(120, 100%, 40%);">+ new_dbm = ms_dbm + calc_delta_rxlev(params, state, ul_rssi_dbm_avg);</span><br><span> }</span><br><span> </span><br><span> /* Make sure new_dbm is never negative. ms_pwr_ctl_lvl() can later on</span><br><span>@@ -281,6 +287,7 @@</span><br><span> uint8_t rxqual_full, rxqual_sub;</span><br><span> uint8_t rxlev_full, rxlev_sub;</span><br><span> uint8_t rxqual, rxlev;</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t dl_rssi_dbm_avg;</span><br><span> int delta, new;</span><br><span> </span><br><span> /* Check if dynamic BS Power Control is enabled */</span><br><span>@@ -334,6 +341,8 @@</span><br><span> rxlev = rxlev_full;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ dl_rssi_dbm_avg = do_avg_algo(¶ms->rxlev_meas, &state->rxlev_meas_proc, rxlev2dbm(rxlev));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* If RxQual > L_RXQUAL_XX_P, try to increase Tx power */</span><br><span> if (rxqual > params->rxqual_meas.lower_thresh) {</span><br><span> uint8_t old = state->current;</span><br><span>@@ -355,7 +364,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Calculate a 'delta' for the current attenuation level */</span><br><span style="color: hsl(0, 100%, 40%);">- delta = calc_delta(params, state, rxlev2dbm(rxlev));</span><br><span style="color: hsl(120, 100%, 40%);">+ delta = calc_delta_rxlev(params, state, dl_rssi_dbm_avg);</span><br><span> </span><br><span> /* Basic signal transmission / reception formula:</span><br><span> *</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25324">change 25324</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/+/25324"/><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: I52eb0558fd7a215a6ee0b2aced189ae4a37d8a22 </div>
<div style="display:none"> Gerrit-Change-Number: 25324 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: 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>