<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22779">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;">power_control: make P_CON_INTERVAL parameter configurable<br><br>Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f<br>Related: SYS#4918<br>---<br>M doc/manuals/chapters/power_control.adoc<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M tests/power_ctrl.vty<br>5 files changed, 73 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc</span><br><span>index dbe2d13..4c1a275 100644</span><br><span>--- a/doc/manuals/chapters/power_control.adoc</span><br><span>+++ b/doc/manuals/chapters/power_control.adoc</span><br><span>@@ -88,6 +88,7 @@</span><br><span> ...</span><br><span> . l. mode (static|dyn-bts) [reset]</span><br><span> . l. bs-power (static|dyn-max) <0-30></span><br><span style="color: hsl(120, 100%, 40%);">+ . lv ctrl-interval <0-31></span><br><span> . lv step-size inc <2-6> red <2-4></span><br><span> . lv rxlev-thresh lower <0-63> upper <0-63></span><br><span> . lv rxqual-thresh lower <0-7> upper <0-7></span><br><span>@@ -135,6 +136,27 @@</span><br><span> and a fixed power reduction value in `static` mode. In the later case, no</span><br><span> attenuation (0 dB) is applied by default (full power).</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+==== Power control interval</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Having requested a transmit power level, the MS/BS power control loop may optionally</span><br><span style="color: hsl(120, 100%, 40%);">+by suspended for a certain number of SACCH multiframes defined by VTY parameter</span><br><span style="color: hsl(120, 100%, 40%);">+`ctrl-interval`. Given that SACCH is relatively slow and transmission of a data block</span><br><span style="color: hsl(120, 100%, 40%);">+takes 480 ms, suspension allows an observation of the effect of one power control</span><br><span style="color: hsl(120, 100%, 40%);">+decision before initiating the next one.</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%);">+OsmoBSC(config-bs-power-ctrl)# ctrl-interval ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <0-31> P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds)</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%);">+By default, the suspension interval is set to 0 for both MS/BS power control loops,</span><br><span style="color: hsl(120, 100%, 40%);">+therefore the power control decision is taken every 480 ms (one SACCH block period).</span><br><span style="color: hsl(120, 100%, 40%);">+Setting `ctrl-interval` to 1 increases the interval to 960 ms, so basically every</span><br><span style="color: hsl(120, 100%, 40%);">+second Uplink SACCH block is skipped; value 2 corresponds to the interval of</span><br><span style="color: hsl(120, 100%, 40%);">+1920 ms, so 3/4 received SACCH blocks are skipped.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+3GPP TS 45.008 briefly mentiones this parameter in table A.1 (P_Con_INTERVAL).</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ==== Power change step size</span><br><span> </span><br><span> In order to slow down the reactivity of the power control loop and thus make it more</span><br><span>@@ -302,7 +324,6 @@</span><br><span> <4> Osmocom specific EWMA is applied to RxQual values with smoothing factor = 50% (beta=0.5).</span><br><span> <5> RxQual: Hreqave and Hreqt values: 2 out of 3 SACCH blocks produce an averaged measurement.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-// TODO: Document P_Con_INTERVAL (not implemented yet)</span><br><span> // TODO: Document other power control parameters:</span><br><span> // OsmoBSC(config-net-bts)# ms max power <0-40></span><br><span> // OsmoBSC(config-net-bts-trx)# max_power_red <0-100></span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index edfae26..af1c8e8 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1346,6 +1346,9 @@</span><br><span> uint8_t inc_step_size_db; /* increasing direction */</span><br><span> uint8_t red_step_size_db; /* reducing direction */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Minimum interval between power level changes */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Measurement averaging parameters for RxLev & RxQual */</span><br><span> struct gsm_power_ctrl_meas_params rxqual_meas;</span><br><span> struct gsm_power_ctrl_meas_params rxlev_meas;</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 567b168..26941e2 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -957,6 +957,8 @@</span><br><span> if (cp->dir == GSM_PWR_CTRL_DIR_DL)</span><br><span> cfg_out(" bs-power dyn-max %u%s", cp->bs_power_max_db, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (cp->ctrl_interval > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(" ctrl-interval %u%s", cp->ctrl_interval, VTY_NEWLINE);</span><br><span> cfg_out(" step-size inc %u red %u%s",</span><br><span> cp->inc_step_size_db, cp->red_step_size_db,</span><br><span> VTY_NEWLINE);</span><br><span>@@ -4938,6 +4940,21 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_power_ctrl_ctrl_interval,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_power_ctrl_ctrl_interval_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BSC_VTY_ATTR_NEW_LCHAN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "ctrl-interval <0-31>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set power control interval (for dynamic mode)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_power_ctrl_params *params = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ params->ctrl_interval = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN_USRATTR(cfg_power_ctrl_step_size,</span><br><span> cfg_power_ctrl_step_size_cmd,</span><br><span> X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |</span><br><span>@@ -7742,6 +7759,7 @@</span><br><span> install_node(&power_ctrl_node, dummy_config_write);</span><br><span> install_element(POWER_CTRL_NODE, &cfg_power_ctrl_mode_cmd);</span><br><span> install_element(POWER_CTRL_NODE, &cfg_power_ctrl_bs_power_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(POWER_CTRL_NODE, &cfg_power_ctrl_ctrl_interval_cmd);</span><br><span> install_element(POWER_CTRL_NODE, &cfg_power_ctrl_step_size_cmd);</span><br><span> install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxlev_thresh_cmd);</span><br><span> install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxqual_thresh_cmd);</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 7076908..16fa201 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -896,8 +896,8 @@</span><br><span> thresh_comp->p4 = cp->rxqual_meas.upper_cmp_p & 0x1f;</span><br><span> thresh_comp->n4 = cp->rxqual_meas.upper_cmp_n & 0x1f;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: TIMER_PWR_CON_INTERVAL (P_Con_INTERVAL) */</span><br><span style="color: hsl(0, 100%, 40%);">- thresh_comp->pc_interval = 0; /* 0 .. 30 seconds */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Minimum interval between power level changes (P_CON_INTERVAL) */</span><br><span style="color: hsl(120, 100%, 40%);">+ thresh_comp->pc_interval = cp->ctrl_interval;</span><br><span> </span><br><span> /* Change step limitations: POWER_{INC,RED}_STEP_SIZE */</span><br><span> thresh_comp->inc_step_size = cp->inc_step_size_db & 0x0f;</span><br><span>diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty</span><br><span>index 7e4382a..ff387ce 100644</span><br><span>--- a/tests/power_ctrl.vty</span><br><span>+++ b/tests/power_ctrl.vty</span><br><span>@@ -29,6 +29,7 @@</span><br><span> ...</span><br><span> . l. mode (static|dyn-bts) [reset]</span><br><span> . l. bs-power (static|dyn-max) <0-30></span><br><span style="color: hsl(120, 100%, 40%);">+ . lv ctrl-interval <0-31></span><br><span> . lv step-size inc <2-6> red <2-4></span><br><span> . lv rxlev-thresh lower <0-63> upper <0-63></span><br><span> . lv rxqual-thresh lower <0-7> upper <0-7></span><br><span>@@ -83,12 +84,23 @@</span><br><span> mode dyn-bts</span><br><span> ... !bs-power</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-bs-power-ctrl)# ctrl-interval 31</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-bs-power-ctrl)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ bs-power-control</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl-interval 31</span><br><span style="color: hsl(120, 100%, 40%);">+... !ctrl-interval</span><br><span style="color: hsl(120, 100%, 40%);">+ ms-power-control</span><br><span style="color: hsl(120, 100%, 40%);">+... !ctrl-interval</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-bs-power-ctrl)# exit</span><br><span> OsmoBSC(config-net-bts)# ms-power-control</span><br><span> OsmoBSC(config-ms-power-ctrl)# list with-flags</span><br><span> ...</span><br><span> . l. mode (static|dyn-bts) [reset]</span><br><span> . l. bs-power (static|dyn-max) <0-30></span><br><span style="color: hsl(120, 100%, 40%);">+ . lv ctrl-interval <0-31></span><br><span> . lv step-size inc <2-6> red <2-4></span><br><span> . lv rxlev-thresh lower <0-63> upper <0-63></span><br><span> . lv rxqual-thresh lower <0-7> upper <0-7></span><br><span>@@ -119,6 +131,20 @@</span><br><span> OsmoBSC(config-ms-power-ctrl)# bs-power dyn-max 30</span><br><span> % This command is only valid for 'bs-power-control' node</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-ms-power-ctrl)# ctrl-interval 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-ms-power-ctrl)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ bs-power-control</span><br><span style="color: hsl(120, 100%, 40%);">+ mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl-interval 31</span><br><span style="color: hsl(120, 100%, 40%);">+... !ctrl-interval</span><br><span style="color: hsl(120, 100%, 40%);">+ ms-power-control</span><br><span style="color: hsl(120, 100%, 40%);">+ mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl-interval 2</span><br><span style="color: hsl(120, 100%, 40%);">+... !ctrl-interval</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-ms-power-ctrl)# step-size inc 5 red 4</span><br><span> % Power change step size must be an even number</span><br><span> OsmoBSC(config-ms-power-ctrl)# step-size inc 2 red 3</span><br><span>@@ -131,11 +157,12 @@</span><br><span> ...</span><br><span> bs-power-control</span><br><span> mode dyn-bts</span><br><span style="color: hsl(0, 100%, 40%);">- bs-power dyn-max 30</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span> step-size inc 4 red 2</span><br><span> ...</span><br><span> ms-power-control</span><br><span> mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span> step-size inc 6 red 4</span><br><span> ...</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22779">change 22779</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/+/22779"/><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: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f </div>
<div style="display:none"> Gerrit-Change-Number: 22779 </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: 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>