<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21438">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: add commands for Downlink power control<br><br>Change-Id: I61efbe177aa06584cd7412640b888913de6e8f9d<br>Related: SYS#4918<br>---<br>M src/common/vty.c<br>1 file changed, 93 insertions(+), 47 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/21438/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index f32f6cd..0e78ad3 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -228,6 +228,27 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void config_write_power_ctrl_params(struct vty *vty, const char *prefix,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct bts_power_ctrl_params *pp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s-power-target %d", prefix, pp->target);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pp->hysteresis > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " hysteresis %d", pp->hysteresis);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Power filtering algorithm and parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pp->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%);">+ vty_out(vty, " %s-power-filtering algo ewma beta %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ prefix, 100 - pp->pf.ewma.alpha, VTY_NEWLINE);</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%);">+ vty_out(vty, " no %s-power-filtering%s", prefix, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+</span><br><span> static void config_write_bts_single(struct vty *vty, const struct gsm_bts *bts)</span><br><span> {</span><br><span> const struct gsm_bts_trx *trx;</span><br><span>@@ -255,22 +276,10 @@</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " paging lifetime %u%s", paging_get_lifetime(bts->paging_state),</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " uplink-power-target %d", bts->ul_power_ctrl.target);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->ul_power_ctrl.hysteresis > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " hysteresis %d", bts->ul_power_ctrl.hysteresis);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* MS Tx power filtering algorithm and parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (bts->ul_power_ctrl.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%);">- vty_out(vty, " uplink-power-filtering algo ewma beta %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- 100 - bts->ul_power_ctrl.pf.ewma.alpha, VTY_NEWLINE);</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%);">- vty_out(vty, " no uplink-power-filtering%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* UL/DL power control parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_power_ctrl_params(vty, "uplink", &bts->ul_power_ctrl);</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_power_ctrl_params(vty, "downlink", &bts->dl_power_ctrl);</span><br><span> </span><br><span> if (bts->agch_queue.thresh_level != GSM_BTS_AGCH_QUEUE_THRESH_LEVEL_DEFAULT</span><br><span> || bts->agch_queue.low_level != GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT</span><br><span>@@ -621,68 +630,105 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define UL_POWER_TARGET_CMD \</span><br><span style="color: hsl(0, 100%, 40%);">- "uplink-power-target <-110-0>"</span><br><span style="color: hsl(0, 100%, 40%);">-#define UL_POWER_TARGET_CMD_DESC \</span><br><span style="color: hsl(0, 100%, 40%);">- "Set the nominal target Rx Level for uplink power control loop\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- "Target uplink Rx level in dBm\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define POWER_TARGET_CMD \</span><br><span style="color: hsl(120, 100%, 40%);">+ "(uplink-power-target|downlink-power-target) <-110-0>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define POWER_TARGET_CMD_DESC \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the nominal target Rx Level for Uplink power control loop\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the nominal target Rx Level for Downlink power control loop\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Target Rx level in dBm\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_ul_power_target, cfg_bts_ul_power_target_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- UL_POWER_TARGET_CMD, UL_POWER_TARGET_CMD_DESC,</span><br><span style="color: hsl(120, 100%, 40%);">+#define POWER_HYST_CMD \</span><br><span style="color: hsl(120, 100%, 40%);">+ "hysteresis <1-25>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define POWER_HYST_CMD_DESC \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Target Rx Level hysteresis\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Tolerable deviation in dBm\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_power_target,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_power_target_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ POWER_TARGET_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ POWER_TARGET_CMD_DESC,</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_power_ctrl_params *params;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.target = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.hysteresis = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argv[0][0] == 'u')</span><br><span style="color: hsl(120, 100%, 40%);">+ params = &bts->ul_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ params = &bts->dl_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ params->target = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ params->hysteresis = 0;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> /* FIXME: libosmovty is unable to handle 'foo <-110-0> [bar <1-25>]' */</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_ul_power_target_hysteresis,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_bts_ul_power_target_hysteresis_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- UL_POWER_TARGET_CMD " hysteresis <1-25>",</span><br><span style="color: hsl(0, 100%, 40%);">- UL_POWER_TARGET_CMD_DESC</span><br><span style="color: hsl(0, 100%, 40%);">- "Target Rx Level hysteresis\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Tolerable deviation in dBm\n",</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_power_target_hysteresis,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_power_target_hysteresis_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ POWER_TARGET_CMD " " POWER_HYST_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ POWER_TARGET_CMD_DESC POWER_HYST_CMD_DESC,</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_power_ctrl_params *params;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.target = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.hysteresis = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argv[0][0] == 'u')</span><br><span style="color: hsl(120, 100%, 40%);">+ params = &bts->ul_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ params = &bts->dl_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ params->target = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ params->hysteresis = atoi(argv[2]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_no_bts_ul_power_filter,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_bts_no_ul_power_filter_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "no uplink-power-filtering",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR "Disable filtering for uplink power control loop\n",</span><br><span style="color: hsl(120, 100%, 40%);">+#define POWER_FILTER_CMD \</span><br><span style="color: hsl(120, 100%, 40%);">+ "(uplink-power-filtering|downlink-power-filtering)"</span><br><span style="color: hsl(120, 100%, 40%);">+#define UL_POWER_FILTER_CMD_DESC \</span><br><span style="color: hsl(120, 100%, 40%);">+ "filtering for Uplink power control loop\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define DL_POWER_FILTER_CMD_DESC \</span><br><span style="color: hsl(120, 100%, 40%);">+ "filtering for Downlink power control loop\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_no_bts_power_filter,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_no_power_filter_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no " POWER_FILTER_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable " UL_POWER_FILTER_CMD_DESC</span><br><span style="color: hsl(120, 100%, 40%);">+ "Disable " DL_POWER_FILTER_CMD_DESC,</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argv[0][0] == 'u')</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_power_ctrl.pf_algo = BTS_PF_ALGO_NONE;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_ul_power_filter_ewma,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_bts_ul_power_filter_ewma_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "uplink-power-filtering algo ewma beta <1-99>",</span><br><span style="color: hsl(0, 100%, 40%);">- "Configure filtering for uplink power control loop\n"</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_power_filter_ewma,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_power_filter_ewma_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ POWER_FILTER_CMD " algo ewma beta <1-99>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure " UL_POWER_FILTER_CMD_DESC</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure " DL_POWER_FILTER_CMD_DESC</span><br><span> "Select the filtering algorithm\n"</span><br><span> "Exponentially Weighted Moving Average (EWMA)\n"</span><br><span> "Smoothing factor (in %): beta = (100 - alpha)\n"</span><br><span> "1% - lowest smoothing, 99% - highest smoothing\n",</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_power_ctrl_params *params;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.pf.ewma.alpha = 100 - atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argv[0][0] == 'u')</span><br><span style="color: hsl(120, 100%, 40%);">+ params = &bts->ul_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ params = &bts->dl_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ params->pf_algo = BTS_PF_ALGO_EWMA;</span><br><span style="color: hsl(120, 100%, 40%);">+ params->pf.ewma.alpha = 100 - atoi(argv[1]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -1879,10 +1925,10 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_paging_lifetime_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_agch_queue_mgmt_default_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_agch_queue_mgmt_params_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(BTS_NODE, &cfg_bts_ul_power_target_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(BTS_NODE, &cfg_bts_ul_power_target_hysteresis_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(BTS_NODE, &cfg_bts_no_ul_power_filter_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(BTS_NODE, &cfg_bts_ul_power_filter_ewma_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_power_target_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_power_target_hysteresis_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_no_power_filter_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_power_filter_ewma_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_min_qual_rach_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_min_qual_norm_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_max_ber_rach_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21438">change 21438</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/+/21438"/><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: I61efbe177aa06584cd7412640b888913de6e8f9d </div>
<div style="display:none"> Gerrit-Change-Number: 21438 </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>