<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21812">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: add VTY command to set static / maximum BS Power<br><br>Change-Id: I11ca856aba46aaf84d94cbbdf4c39a01ee8289b9<br>Related: SYS#4918<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/lchan_fsm.c<br>M tests/power_ctrl.vty<br>5 files changed, 94 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/21812/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index f9d5736..233c3b6 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1328,6 +1328,10 @@</span><br><span> /* Power Control mode to be used by the BTS */</span><br><span> enum gsm_power_ctrl_mode mode;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* BS Power reduction value / maximum (in dB) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bs_power_val_db; /* for static mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bs_power_max_db; /* for dynamic mode */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Power change step size (dynamic mode only) */</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>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index c12fd12..fe46d45 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -950,10 +950,14 @@</span><br><span> case GSM_PWR_CTRL_MODE_STATIC:</span><br><span> cfg_out("%s%s", node_name, VTY_NEWLINE);</span><br><span> cfg_out(" mode static%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cp->dir == GSM_PWR_CTRL_DIR_DL && cp->bs_power_val_db != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(" bs-power static %u%s", cp->bs_power_val_db, VTY_NEWLINE);</span><br><span> break;</span><br><span> case GSM_PWR_CTRL_MODE_DYN_BTS:</span><br><span> cfg_out("%s%s", node_name, VTY_NEWLINE);</span><br><span> cfg_out(" mode dyn-bts%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cp->dir == GSM_PWR_CTRL_DIR_DL)</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_out(" bs-power dyn-max %u%s", cp->bs_power_max_db, VTY_NEWLINE);</span><br><span> </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>@@ -4895,6 +4899,40 @@</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_bs_power,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_power_ctrl_bs_power_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%);">+ "bs-power (static|dyn-max) <0-30>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "BS Power IE value to be send to the BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Fixed BS Power reduction value (for static mode)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Maximum BS Power reduction value (for dynamic mode)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "BS Power reduction value (in dB, even numbers only)\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%);">+ bool dynamic = !strcmp(argv[0], "dyn-max");</span><br><span style="color: hsl(120, 100%, 40%);">+ int value = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->dir != GSM_PWR_CTRL_DIR_DL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This command is only valid for "</span><br><span style="color: hsl(120, 100%, 40%);">+ "'bs-power-control' node%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ if (value % 2 != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Incorrect BS Power reduction value, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "an even number is expected%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ if (dynamic) /* maximum value */</span><br><span style="color: hsl(120, 100%, 40%);">+ params->bs_power_max_db = value;</span><br><span style="color: hsl(120, 100%, 40%);">+ else /* static (fixed) value */</span><br><span style="color: hsl(120, 100%, 40%);">+ params->bs_power_val_db = value;</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>@@ -7673,6 +7711,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_no_power_ctrl_cmd);</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 style="color: hsl(120, 100%, 40%);">+ install_element(POWER_CTRL_NODE, &cfg_power_ctrl_bs_power_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/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 0b5650f..4c87fd8 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -972,6 +972,10 @@</span><br><span> /* Static Power Control is the safe default */</span><br><span> .mode = GSM_PWR_CTRL_MODE_STATIC,</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* BS Power reduction value / maximum (in dB) */</span><br><span style="color: hsl(120, 100%, 40%);">+ .bs_power_val_db = 0, /* no attenuation in static mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ .bs_power_max_db = 12, /* up to 12 dB in dynamic mode */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Power increasing/reducing step size */</span><br><span> .inc_step_size_db = 4, /* 2, 4, or 6 dB */</span><br><span> .red_step_size_db = 2, /* 2 or 4 dB */</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 1903645..5a42527 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -379,6 +379,9 @@</span><br><span> */</span><br><span> static void lchan_reset(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts *bts = trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOG_LCHAN(lchan, LOGL_DEBUG, "Clearing lchan state\n");</span><br><span> </span><br><span> if (lchan->conn)</span><br><span>@@ -408,6 +411,12 @@</span><br><span> </span><br><span> .release.rr_cause = GSM48_RR_CAUSE_NORMAL,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Default BS Power reduction value (in 2 dB steps) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->bs_power_ctrl.mode == GSM_PWR_CTRL_MODE_DYN_BTS)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->bs_power = bts->bs_power_ctrl.bs_power_max_db / 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->bs_power = bts->bs_power_ctrl.bs_power_val_db / 2;</span><br><span> }</span><br><span> </span><br><span> static void lchan_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span>diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty</span><br><span>index abd2768..7884c01 100644</span><br><span>--- a/tests/power_ctrl.vty</span><br><span>+++ b/tests/power_ctrl.vty</span><br><span>@@ -23,6 +23,7 @@</span><br><span> OsmoBSC(config-power-ctrl)# list with-flags</span><br><span> ...</span><br><span> . lv mode (static|dyn-bts) [reset]</span><br><span style="color: hsl(120, 100%, 40%);">+ . lv bs-power (static|dyn-max) <0-30></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>@@ -33,12 +34,30 @@</span><br><span> . lv (rxlev-avg|rxqual-avg) algo (unweighted|weighted|mod-median)</span><br><span> . lv (rxlev-avg|rxqual-avg) algo osmo-ewma beta <1-99></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-power-ctrl)# bs-power ?</span><br><span style="color: hsl(120, 100%, 40%);">+ static Fixed BS Power reduction value (for static mode)</span><br><span style="color: hsl(120, 100%, 40%);">+ dyn-max Maximum BS Power reduction value (for dynamic mode)</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-power-ctrl)# bs-power static ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <0-30> BS Power reduction value (in dB, even numbers only)</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-power-ctrl)# bs-power static 3</span><br><span style="color: hsl(120, 100%, 40%);">+% Incorrect BS Power reduction value, an even number is expected</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-power-ctrl)# bs-power static 6</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-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 static</span><br><span style="color: hsl(120, 100%, 40%);">+ bs-power static 6</span><br><span style="color: hsl(120, 100%, 40%);">+ ms-power-control</span><br><span style="color: hsl(120, 100%, 40%);">+ mode static</span><br><span style="color: hsl(120, 100%, 40%);">+... !bs-power</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-power-ctrl)# ### Check default BS Power Parameters</span><br><span> OsmoBSC(config-power-ctrl)# mode dyn-bts</span><br><span> OsmoBSC(config-power-ctrl)# show running-config</span><br><span> ...</span><br><span> bs-power-control</span><br><span> mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+ bs-power dyn-max 12</span><br><span> step-size inc 4 red 2</span><br><span> rxlev-thresh lower 32 upper 38</span><br><span> rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span>@@ -50,11 +69,23 @@</span><br><span> mode static</span><br><span> ...</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-power-ctrl)# bs-power dyn-max 30</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-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%);">+ bs-power dyn-max 30</span><br><span style="color: hsl(120, 100%, 40%);">+... !bs-power</span><br><span style="color: hsl(120, 100%, 40%);">+ ms-power-control</span><br><span style="color: hsl(120, 100%, 40%);">+ mode static</span><br><span style="color: hsl(120, 100%, 40%);">+... !bs-power</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-power-ctrl)# exit</span><br><span> OsmoBSC(config-net-bts)# ms-power-control</span><br><span> OsmoBSC(config-power-ctrl)# list with-flags</span><br><span> ...</span><br><span> . lv mode (static|dyn-bts) [reset]</span><br><span style="color: hsl(120, 100%, 40%);">+ . lv bs-power (static|dyn-max) <0-30></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>@@ -71,6 +102,7 @@</span><br><span> ...</span><br><span> bs-power-control</span><br><span> mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+ bs-power dyn-max 30</span><br><span> step-size inc 4 red 2</span><br><span> rxlev-thresh lower 32 upper 38</span><br><span> rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span>@@ -89,6 +121,11 @@</span><br><span> no rxqual-avg</span><br><span> ...</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-power-ctrl)# bs-power static 30</span><br><span style="color: hsl(120, 100%, 40%);">+% This command is only valid for 'bs-power-control' node</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-power-ctrl)# bs-power dyn-max 30</span><br><span style="color: hsl(120, 100%, 40%);">+% This command is only valid for 'bs-power-control' node</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-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-power-ctrl)# step-size inc 2 red 3</span><br><span>@@ -98,6 +135,7 @@</span><br><span> ...</span><br><span> bs-power-control</span><br><span> mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+ bs-power dyn-max 30</span><br><span> step-size inc 4 red 2</span><br><span> ...</span><br><span> ms-power-control</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21812">change 21812</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/+/21812"/><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: I11ca856aba46aaf84d94cbbdf4c39a01ee8289b9 </div>
<div style="display:none"> Gerrit-Change-Number: 21812 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>