<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21446">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: derive calc_delta() from lchan_ms_pwr_ctrl()<br><br>This function will also be used by the BS Power Control logic.<br><br>Change-Id: I2525eb2c3f1fdb3d0847a8ad50b30a44d7741a55<br>Related: SYS#4918<br>---<br>M src/common/power_control.c<br>1 file changed, 43 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/power_control.c b/src/common/power_control.c</span><br><span>index 5eb1687..3441439 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -34,8 +34,8 @@</span><br><span> #include <osmo-bts/power_control.h></span><br><span> </span><br><span> /* how many dB do we raise/lower as maximum (1 ms power level = 2 dB) */</span><br><span style="color: hsl(0, 100%, 40%);">-#define MS_RAISE_MAX_DB 4</span><br><span style="color: hsl(0, 100%, 40%);">-#define MS_LOWER_MAX_DB 8</span><br><span style="color: hsl(120, 100%, 40%);">+#define PWR_RAISE_MAX_DB 4</span><br><span style="color: hsl(120, 100%, 40%);">+#define PWR_LOWER_MAX_DB 8</span><br><span> </span><br><span> /* We don't want to deal with floating point, so we scale up */</span><br><span> #define EWMA_SCALE_FACTOR 100</span><br><span>@@ -91,6 +91,45 @@</span><br><span> return *Avg100 / EWMA_SCALE_FACTOR;</span><br><span> }</span><br><span> </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(const struct bts_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)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rxlev_dbm_avg;</span><br><span style="color: hsl(120, 100%, 40%);">+ int delta;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Filter input value(s) to reduce unnecessary Tx power oscillations */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (params->pf_algo) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case BTS_PF_ALGO_EWMA:</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev_dbm_avg = do_pf_ewma(params, state, rxlev_dbm);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BTS_PF_ALGO_NONE:</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No filtering (pass through) */</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev_dbm_avg = rxlev_dbm;</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%);">+ /* How many dBs measured power should be increased (+) or decreased (-)</span><br><span style="color: hsl(120, 100%, 40%);">+ * to reach expected power. */</span><br><span style="color: hsl(120, 100%, 40%);">+ delta = params->target - rxlev_dbm_avg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Tolerate small deviations from 'rx-target' */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (abs(delta) <= params->hysteresis)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Don't ever change more than PWR_{LOWER,RAISE}_MAX_DBM during one loop</span><br><span style="color: hsl(120, 100%, 40%);">+ * iteration, i.e. reduce the speed at which the MS transmit power can</span><br><span style="color: hsl(120, 100%, 40%);">+ * change. A higher value means a lower level (and vice versa) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (delta > PWR_RAISE_MAX_DB)</span><br><span style="color: hsl(120, 100%, 40%);">+ delta = PWR_RAISE_MAX_DB;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (delta < -PWR_LOWER_MAX_DB)</span><br><span style="color: hsl(120, 100%, 40%);">+ delta = -PWR_LOWER_MAX_DB;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return delta;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan.</span><br><span> * \param lchan logical channel for which to compute (and in which to store) new power value.</span><br><span> * \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH Header in SACCH block.</span><br><span>@@ -100,13 +139,11 @@</span><br><span> const uint8_t ms_power_lvl,</span><br><span> const int8_t ul_rssi_dbm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int diff;</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span> struct gsm_bts *bts = trx->bts;</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(0, 100%, 40%);">- int8_t avg_ul_rssi_dbm;</span><br><span> </span><br><span> const struct bts_power_ctrl_params *params = &bts->ul_power_ctrl;</span><br><span> struct lchan_power_ctrl_state *state = &lchan->ms_power_ctrl;</span><br><span>@@ -131,35 +168,8 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Filter UL RSSI to reduce unnecessary Tx power oscillations */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (params->pf_algo) {</span><br><span style="color: hsl(0, 100%, 40%);">- case BTS_PF_ALGO_EWMA:</span><br><span style="color: hsl(0, 100%, 40%);">- avg_ul_rssi_dbm = do_pf_ewma(params, state, ul_rssi_dbm);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case BTS_PF_ALGO_NONE:</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* No filtering (pass through) */</span><br><span style="color: hsl(0, 100%, 40%);">- avg_ul_rssi_dbm = ul_rssi_dbm;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* How many dBs measured power should be increased (+) or decreased (-)</span><br><span style="color: hsl(0, 100%, 40%);">- to reach expected power. */</span><br><span style="color: hsl(0, 100%, 40%);">- diff = params->target - avg_ul_rssi_dbm;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Tolerate small deviations from 'rx-target' */</span><br><span style="color: hsl(0, 100%, 40%);">- if (abs(diff) <= params->hysteresis)</span><br><span style="color: hsl(0, 100%, 40%);">- diff = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* don't ever change more than MS_{LOWER,RAISE}_MAX_DBM during one loop</span><br><span style="color: hsl(0, 100%, 40%);">- iteration, i.e. reduce the speed at which the MS transmit power can</span><br><span style="color: hsl(0, 100%, 40%);">- change. A higher value means a lower level (and vice versa) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (diff > MS_RAISE_MAX_DB)</span><br><span style="color: hsl(0, 100%, 40%);">- diff = MS_RAISE_MAX_DB;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (diff < -MS_LOWER_MAX_DB)</span><br><span style="color: hsl(0, 100%, 40%);">- diff = -MS_LOWER_MAX_DB;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- new_dbm = ms_dbm + diff;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Calculate the new Tx power value (in dBm) */</span><br><span style="color: hsl(120, 100%, 40%);">+ new_dbm = ms_dbm + calc_delta(params, state, ul_rssi_dbm);</span><br><span> </span><br><span> /* Make sure new_dbm is never negative. ms_pwr_ctl_lvl() can later on</span><br><span> cope with any unsigned dbm value, regardless of band minimal value. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21446">change 21446</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/+/21446"/><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: I2525eb2c3f1fdb3d0847a8ad50b30a44d7741a55 </div>
<div style="display:none"> Gerrit-Change-Number: 21446 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>