<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16142">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
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
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control.c: Limit speed of announced MS Power Level value changes<br><br>It's not a good idea to request big changes in MS Power based on<br>sporadic bad signal received, let's instead change announced MS power<br>levels more smoothly to avoid possible big signal strength fluctations,<br>similar to what is already done in osmo-bts-trx specific loop (loops.c).<br><br>Related: OS#1851<br>Change-Id: Iecc4ec7e21471ec853ad2d5659af4052aba5444c<br>---<br>M src/common/power_control.c<br>M tests/power/power_test.c<br>M tests/power/power_test.ok<br>3 files changed, 82 insertions(+), 8 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 d08ed5e..d2a6c1d 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -30,6 +30,11 @@</span><br><span> #include <osmo-bts/measurement.h></span><br><span> #include <osmo-bts/bts_model.h></span><br><span> #include <osmo-bts/l1sap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/power_control.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* how many dB do we raise/lower as maximum (1 ms power level = 2 dB) */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MS_RAISE_MAX_DB 4</span><br><span style="color: hsl(120, 100%, 40%);">+#define MS_LOWER_MAX_DB 8</span><br><span> </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>@@ -51,10 +56,6 @@</span><br><span> if (lchan->ms_power_ctrl.fixed)</span><br><span> return 0;</span><br><span> </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 = bts->ul_power_target - rxLevel;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> current_dbm = ms_pwr_dbm(band, ms_power);</span><br><span> if (current_dbm < 0) {</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE,</span><br><span>@@ -70,6 +71,18 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </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%);">+ diff = bts->ul_power_target - rxLevel;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* don't ever change more than MS_{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 (diff > MS_RAISE_MAX_DB)</span><br><span style="color: hsl(120, 100%, 40%);">+ diff = MS_RAISE_MAX_DB;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (diff < -MS_LOWER_MAX_DB)</span><br><span style="color: hsl(120, 100%, 40%);">+ diff = -MS_LOWER_MAX_DB;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> new_dbm = current_dbm + diff;</span><br><span> </span><br><span> /* Make sure new_dbm is never negative. ms_pwr_ctl_lvl() can later on</span><br><span>diff --git a/tests/power/power_test.c b/tests/power/power_test.c</span><br><span>index 30fbb64..9b1a762 100644</span><br><span>--- a/tests/power/power_test.c</span><br><span>+++ b/tests/power/power_test.c</span><br><span>@@ -58,22 +58,64 @@</span><br><span> lchan->state = LCHAN_S_NONE;</span><br><span> lchan->ms_power_ctrl.current = ms_pwr_ctl_lvl(GSM_BAND_1800, 0);</span><br><span> OSMO_ASSERT(lchan->ms_power_ctrl.current == 15);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 26);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(lchan->ms_power_ctrl.max == 2);</span><br><span> </span><br><span> /* Simply clamping */</span><br><span> apply_power_test(lchan, -60, 0, 15);</span><br><span> </span><br><span> /*</span><br><span> * Now 15 dB too little and we should power it up. Could be a</span><br><span style="color: hsl(0, 100%, 40%);">- * power level of 7 or 8 for 15 dBm</span><br><span style="color: hsl(120, 100%, 40%);">+ * power level of 7 or 8 for 15 dBm. However, since we limit peace at</span><br><span style="color: hsl(120, 100%, 40%);">+ * which we change values, expect several steps of MS_RAISE_MAX_DB/2 levels:</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 13);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 11);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 9);</span><br><span> apply_power_test(lchan, -90, 1, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 5);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* It should be clamped to level 0 and 30 dBm */</span><br><span style="color: hsl(0, 100%, 40%);">- apply_power_test(lchan, -100, 1, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check good RSSI value keeps it at same power level: */</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, bts.ul_power_target, 0, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 2); /* .max is pwr lvl 2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 0, 2); /* .max is pwr lvl 2 */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 30);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(lchan->ms_power_ctrl.max == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 0); /* .max is pwr lvl 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 0, 0); /* .max is pwr lvl 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 36);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(lchan->ms_power_ctrl.max == 29);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 30);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 1, 29);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -90, 0, 29);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check good RSSI value keeps it at same power level: */</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, bts.ul_power_target, 0, 29);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now go down, steps are double size in this direction: */</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -45, 1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -45, 1, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -45, 1, 9);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Go down only one level down and up: */</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, bts.ul_power_target + 2, 1, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, bts.ul_power_target - 2, 1, 9);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if BSC requesting a low max power is applied after loop calculation: */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(lchan->ms_power_ctrl.max == 14);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, bts.ul_power_target + 2, 1, 14);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set back a more normal max: */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 30);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(lchan->ms_power_ctrl.max == 0);</span><br><span> </span><br><span> /* Fix it and jump down */</span><br><span> lchan->ms_power_ctrl.fixed = true;</span><br><span style="color: hsl(0, 100%, 40%);">- apply_power_test(lchan, -60, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, -60, 0, 14);</span><br><span> </span><br><span> /* And leave it again */</span><br><span> lchan->ms_power_ctrl.fixed = false;</span><br><span>diff --git a/tests/power/power_test.ok b/tests/power/power_test.ok</span><br><span>index cf0a38b..335a3d3 100644</span><br><span>--- a/tests/power/power_test.ok</span><br><span>+++ b/tests/power/power_test.ok</span><br><span>@@ -1,7 +1,26 @@</span><br><span> Testing power loop...</span><br><span> power control [0]: MS current power 15</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 13</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 11</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 9</span><br><span> power control [1]: MS current power 7</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 5</span><br><span style="color: hsl(120, 100%, 40%);">+power control [0]: MS current power 5</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 3</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 2</span><br><span style="color: hsl(120, 100%, 40%);">+power control [0]: MS current power 2</span><br><span> power control [1]: MS current power 0</span><br><span> power control [0]: MS current power 0</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 30</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 29</span><br><span style="color: hsl(120, 100%, 40%);">+power control [0]: MS current power 29</span><br><span style="color: hsl(120, 100%, 40%);">+power control [0]: MS current power 29</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 1</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 5</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 9</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 10</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 9</span><br><span style="color: hsl(120, 100%, 40%);">+power control [1]: MS current power 14</span><br><span style="color: hsl(120, 100%, 40%);">+power control [0]: MS current power 14</span><br><span> power control [1]: MS current power 15</span><br><span> Power loop test OK</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16142">change 16142</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/+/16142"/><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: Iecc4ec7e21471ec853ad2d5659af4052aba5444c </div>
<div style="display:none"> Gerrit-Change-Number: 16142 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: fixeria <axilirator@gmail.com> </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>