This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
fixeria gerrit-no-reply at lists.osmocom.orgfixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21812 )
Change subject: power_control: add VTY command to set static / maximum BS Power
......................................................................
power_control: add VTY command to set static / maximum BS Power
Change-Id: I11ca856aba46aaf84d94cbbdf4c39a01ee8289b9
Related: SYS#4918
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/lchan_fsm.c
M tests/power_ctrl.vty
5 files changed, 94 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/21812/1
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index f9d5736..233c3b6 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1328,6 +1328,10 @@
/* Power Control mode to be used by the BTS */
enum gsm_power_ctrl_mode mode;
+ /* BS Power reduction value / maximum (in dB) */
+ uint8_t bs_power_val_db; /* for static mode */
+ uint8_t bs_power_max_db; /* for dynamic mode */
+
/* Power change step size (dynamic mode only) */
uint8_t inc_step_size_db; /* increasing direction */
uint8_t red_step_size_db; /* reducing direction */
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index c12fd12..fe46d45 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -950,10 +950,14 @@
case GSM_PWR_CTRL_MODE_STATIC:
cfg_out("%s%s", node_name, VTY_NEWLINE);
cfg_out(" mode static%s", VTY_NEWLINE);
+ if (cp->dir == GSM_PWR_CTRL_DIR_DL && cp->bs_power_val_db != 0)
+ cfg_out(" bs-power static %u%s", cp->bs_power_val_db, VTY_NEWLINE);
break;
case GSM_PWR_CTRL_MODE_DYN_BTS:
cfg_out("%s%s", node_name, VTY_NEWLINE);
cfg_out(" mode dyn-bts%s", VTY_NEWLINE);
+ if (cp->dir == GSM_PWR_CTRL_DIR_DL)
+ cfg_out(" bs-power dyn-max %u%s", cp->bs_power_max_db, VTY_NEWLINE);
cfg_out(" step-size inc %u red %u%s",
cp->inc_step_size_db, cp->red_step_size_db,
@@ -4895,6 +4899,40 @@
return CMD_SUCCESS;
}
+DEFUN_USRATTR(cfg_power_ctrl_bs_power,
+ cfg_power_ctrl_bs_power_cmd,
+ X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |
+ X(BSC_VTY_ATTR_NEW_LCHAN),
+ "bs-power (static|dyn-max) <0-30>",
+ "BS Power IE value to be send to the BTS\n"
+ "Fixed BS Power reduction value (for static mode)\n"
+ "Maximum BS Power reduction value (for dynamic mode)\n"
+ "BS Power reduction value (in dB, even numbers only)\n")
+{
+ struct gsm_power_ctrl_params *params = vty->index;
+ bool dynamic = !strcmp(argv[0], "dyn-max");
+ int value = atoi(argv[1]);
+
+ if (params->dir != GSM_PWR_CTRL_DIR_DL) {
+ vty_out(vty, "%% This command is only valid for "
+ "'bs-power-control' node%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (value % 2 != 0) {
+ vty_out(vty, "%% Incorrect BS Power reduction value, "
+ "an even number is expected%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (dynamic) /* maximum value */
+ params->bs_power_max_db = value;
+ else /* static (fixed) value */
+ params->bs_power_val_db = value;
+
+ return CMD_SUCCESS;
+}
+
DEFUN_USRATTR(cfg_power_ctrl_step_size,
cfg_power_ctrl_step_size_cmd,
X(BSC_VTY_ATTR_VENDOR_SPECIFIC) |
@@ -7673,6 +7711,7 @@
install_element(BTS_NODE, &cfg_bts_no_power_ctrl_cmd);
install_node(&power_ctrl_node, dummy_config_write);
install_element(POWER_CTRL_NODE, &cfg_power_ctrl_mode_cmd);
+ install_element(POWER_CTRL_NODE, &cfg_power_ctrl_bs_power_cmd);
install_element(POWER_CTRL_NODE, &cfg_power_ctrl_step_size_cmd);
install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxlev_thresh_cmd);
install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxqual_thresh_cmd);
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 0b5650f..4c87fd8 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -972,6 +972,10 @@
/* Static Power Control is the safe default */
.mode = GSM_PWR_CTRL_MODE_STATIC,
+ /* BS Power reduction value / maximum (in dB) */
+ .bs_power_val_db = 0, /* no attenuation in static mode */
+ .bs_power_max_db = 12, /* up to 12 dB in dynamic mode */
+
/* Power increasing/reducing step size */
.inc_step_size_db = 4, /* 2, 4, or 6 dB */
.red_step_size_db = 2, /* 2 or 4 dB */
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 1903645..5a42527 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -379,6 +379,9 @@
*/
static void lchan_reset(struct gsm_lchan *lchan)
{
+ const struct gsm_bts_trx *trx = lchan->ts->trx;
+ const struct gsm_bts *bts = trx->bts;
+
LOG_LCHAN(lchan, LOGL_DEBUG, "Clearing lchan state\n");
if (lchan->conn)
@@ -408,6 +411,12 @@
.release.rr_cause = GSM48_RR_CAUSE_NORMAL,
};
+
+ /* Default BS Power reduction value (in 2 dB steps) */
+ if (bts->bs_power_ctrl.mode == GSM_PWR_CTRL_MODE_DYN_BTS)
+ lchan->bs_power = bts->bs_power_ctrl.bs_power_max_db / 2;
+ else
+ lchan->bs_power = bts->bs_power_ctrl.bs_power_val_db / 2;
}
static void lchan_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty
index abd2768..7884c01 100644
--- a/tests/power_ctrl.vty
+++ b/tests/power_ctrl.vty
@@ -23,6 +23,7 @@
OsmoBSC(config-power-ctrl)# list with-flags
...
. lv mode (static|dyn-bts) [reset]
+ . lv bs-power (static|dyn-max) <0-30>
. lv step-size inc <2-6> red <2-4>
. lv rxlev-thresh lower <0-63> upper <0-63>
. lv rxqual-thresh lower <0-7> upper <0-7>
@@ -33,12 +34,30 @@
. lv (rxlev-avg|rxqual-avg) algo (unweighted|weighted|mod-median)
. lv (rxlev-avg|rxqual-avg) algo osmo-ewma beta <1-99>
+OsmoBSC(config-power-ctrl)# bs-power ?
+ static Fixed BS Power reduction value (for static mode)
+ dyn-max Maximum BS Power reduction value (for dynamic mode)
+OsmoBSC(config-power-ctrl)# bs-power static ?
+ <0-30> BS Power reduction value (in dB, even numbers only)
+OsmoBSC(config-power-ctrl)# bs-power static 3
+% Incorrect BS Power reduction value, an even number is expected
+OsmoBSC(config-power-ctrl)# bs-power static 6
+OsmoBSC(config-power-ctrl)# show running-config
+...
+ bs-power-control
+ mode static
+ bs-power static 6
+ ms-power-control
+ mode static
+... !bs-power
+
OsmoBSC(config-power-ctrl)# ### Check default BS Power Parameters
OsmoBSC(config-power-ctrl)# mode dyn-bts
OsmoBSC(config-power-ctrl)# show running-config
...
bs-power-control
mode dyn-bts
+ bs-power dyn-max 12
step-size inc 4 red 2
rxlev-thresh lower 32 upper 38
rxlev-thresh-comp lower 10 12 upper 19 20
@@ -50,11 +69,23 @@
mode static
...
+OsmoBSC(config-power-ctrl)# bs-power dyn-max 30
+OsmoBSC(config-power-ctrl)# show running-config
+...
+ bs-power-control
+ mode dyn-bts
+ bs-power dyn-max 30
+... !bs-power
+ ms-power-control
+ mode static
+... !bs-power
+
OsmoBSC(config-power-ctrl)# exit
OsmoBSC(config-net-bts)# ms-power-control
OsmoBSC(config-power-ctrl)# list with-flags
...
. lv mode (static|dyn-bts) [reset]
+ . lv bs-power (static|dyn-max) <0-30>
. lv step-size inc <2-6> red <2-4>
. lv rxlev-thresh lower <0-63> upper <0-63>
. lv rxqual-thresh lower <0-7> upper <0-7>
@@ -71,6 +102,7 @@
...
bs-power-control
mode dyn-bts
+ bs-power dyn-max 30
step-size inc 4 red 2
rxlev-thresh lower 32 upper 38
rxlev-thresh-comp lower 10 12 upper 19 20
@@ -89,6 +121,11 @@
no rxqual-avg
...
+OsmoBSC(config-power-ctrl)# bs-power static 30
+% This command is only valid for 'bs-power-control' node
+OsmoBSC(config-power-ctrl)# bs-power dyn-max 30
+% This command is only valid for 'bs-power-control' node
+
OsmoBSC(config-power-ctrl)# step-size inc 5 red 4
% Power change step size must be an even number
OsmoBSC(config-power-ctrl)# step-size inc 2 red 3
@@ -98,6 +135,7 @@
...
bs-power-control
mode dyn-bts
+ bs-power dyn-max 30
step-size inc 4 red 2
...
ms-power-control
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21812
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I11ca856aba46aaf84d94cbbdf4c39a01ee8289b9
Gerrit-Change-Number: 21812
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201220/457b5dc1/attachment.htm>