<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21865">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;">power_control: fix swapped lower/upper RxQual threshold values<br><br>According to 3GPP TS 45.008, section A.3.2.1:<br><br> c) Comparison of RXQUAL_XX with L_RXQUAL_XX_P (XX = DL or UL):<br><br> Increase XX_TXPWR if at least P3 averaged values out of N3<br> averaged values are greater (worse quality) than L_RXQUAL_XX_P.<br><br> d) Comparison of RXQUAL_XX with U_RXQUAL_XX_P (XX = DL or UL):<br><br> Decrease XX_TXPWR if at least P4 averaged values out of N4<br> averaged values are lower (better quality) than U_RXQUAL_XX_P.<br><br>Given that RxQual is a value in range 0 .. 7, where 0 is the best<br>and 7 is the worst: L_RXQUAL_XX_P must define the worst quality,<br>while U_RXQUAL_XX_P must define the best quality value.<br><br>Change-Id: I0f37b23ed360782f3c1f4275234c4e18a17aa89b<br>Related: SYS#4918<br>---<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/gsm_data.c<br>M tests/power_ctrl.vty<br>3 files changed, 18 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 7774147..3cb479d 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -5004,18 +5004,19 @@</span><br><span> X(BSC_VTY_ATTR_NEW_LCHAN),</span><br><span> "rxqual-thresh lower <0-7> upper <0-7>",</span><br><span> "Set target RxQual thresholds (for dynamic mode)\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Lower RxQual value (default is 0, i.e. BER < 0.2%)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Lower RxQual value (default is 3, i.e. 0.8% <= BER < 1.6%)\n"</span><br><span> "Lower " POWER_CONTROL_MEAS_RXQUAL_DESC</span><br><span style="color: hsl(0, 100%, 40%);">- "Upper RxQual value (default is 3, i.e. 0.8% <= BER < 1.6%)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Upper RxQual value (default is 0, i.e. BER < 0.2%)\n"</span><br><span> "Upper " POWER_CONTROL_MEAS_RXQUAL_DESC)</span><br><span> {</span><br><span> struct gsm_power_ctrl_params *params = vty->index;</span><br><span> int lower = atoi(argv[0]);</span><br><span> int upper = atoi(argv[1]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lower > upper) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Lower 'rxqual-rxqual' (%d) must be less than upper (%d)%s",</span><br><span style="color: hsl(0, 100%, 40%);">- lower, upper, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RxQual: 0 is best, 7 is worst, so upper must be less */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (upper > lower) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Upper 'rxqual-rxqual' (%d) must be less than lower (%d)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ upper, lower, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 4c87fd8..38392fc 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1007,8 +1007,8 @@</span><br><span> /* RxQual measurement parameters */</span><br><span> .rxqual_meas = {</span><br><span> /* Thresholds for RxQual (see 3GPP TS 45.008, A.3.2.1) */</span><br><span style="color: hsl(0, 100%, 40%);">- .lower_thresh = 0, /* L_RXQUAL_XX_P (BER < 0.2%) */</span><br><span style="color: hsl(0, 100%, 40%);">- .upper_thresh = 3, /* U_RXQUAL_XX_P (0.8% <= BER < 1.6%) */</span><br><span style="color: hsl(120, 100%, 40%);">+ .lower_thresh = 3, /* L_RXQUAL_XX_P (0.8% <= BER < 1.6%) */</span><br><span style="color: hsl(120, 100%, 40%);">+ .upper_thresh = 0, /* U_RXQUAL_XX_P (BER < 0.2%) */</span><br><span> </span><br><span> /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages</span><br><span> * out of LOWER_CMP_N averages are lower than L_RXLEV_XX_P */</span><br><span>diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty</span><br><span>index 2bc427b..d58c075 100644</span><br><span>--- a/tests/power_ctrl.vty</span><br><span>+++ b/tests/power_ctrl.vty</span><br><span>@@ -62,7 +62,7 @@</span><br><span> rxlev-thresh lower 32 upper 38</span><br><span> rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span> no rxlev-avg</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual-thresh lower 0 upper 3</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh lower 3 upper 0</span><br><span> rxqual-thresh-comp lower 5 7 upper 15 18</span><br><span> no rxqual-avg</span><br><span> ms-power-control</span><br><span>@@ -107,7 +107,7 @@</span><br><span> rxlev-thresh lower 32 upper 38</span><br><span> rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span> no rxlev-avg</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual-thresh lower 0 upper 3</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh lower 3 upper 0</span><br><span> rxqual-thresh-comp lower 5 7 upper 15 18</span><br><span> no rxqual-avg</span><br><span> ms-power-control</span><br><span>@@ -116,7 +116,7 @@</span><br><span> rxlev-thresh lower 32 upper 38</span><br><span> rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span> no rxlev-avg</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual-thresh lower 0 upper 3</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh lower 3 upper 0</span><br><span> rxqual-thresh-comp lower 5 7 upper 15 18</span><br><span> no rxqual-avg</span><br><span> ...</span><br><span>@@ -164,23 +164,23 @@</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower?</span><br><span style="color: hsl(0, 100%, 40%);">- lower Lower RxQual value (default is 0, i.e. BER < 0.2%)</span><br><span style="color: hsl(120, 100%, 40%);">+ lower Lower RxQual value (default is 3, i.e. 0.8% <= BER < 1.6%)</span><br><span> OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower ?</span><br><span> <0-7> Lower RxQual value (signal quality, 0 is best, 7 is worst)</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower 0 upper?</span><br><span style="color: hsl(0, 100%, 40%);">- upper Upper RxQual value (default is 3, i.e. 0.8% <= BER < 1.6%)</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower 0 upper ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower 7 upper?</span><br><span style="color: hsl(120, 100%, 40%);">+ upper Upper RxQual value (default is 0, i.e. BER < 0.2%)</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower 7 upper ?</span><br><span> <0-7> Upper RxQual value (signal quality, 0 is best, 7 is worst)</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower 0 upper 7</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-ms-power-ctrl)# rxqual-thresh lower 7 upper 4</span><br><span> OsmoBSC(config-ms-power-ctrl)# show running-config</span><br><span> ...</span><br><span> bs-power-control</span><br><span> ... !rxqual-thresh</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual-thresh lower 0 upper 3</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh lower 3 upper 0</span><br><span> ...</span><br><span> ms-power-control</span><br><span> ... !rxqual-thresh</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual-thresh lower 0 upper 7</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh lower 7 upper 4</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-ms-power-ctrl)# rxlev-avg algo osmo-ewma beta 50</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21865">change 21865</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-bsc/+/21865"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0f37b23ed360782f3c1f4275234c4e18a17aa89b </div>
<div style="display:none"> Gerrit-Change-Number: 21865 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>