<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26242">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[overpower] Allow configuring specific channel mode(s)<br><br>Change-Id: I34d29d7d0f66c629367f3d6e8a660e199ecbe080<br>Related: SYS#5319<br>---<br>M doc/manuals/chapters/power_control.adoc<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bts_vty.c<br>M tests/acch_overpower.vty<br>5 files changed, 79 insertions(+), 7 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/42/26242/1</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 dee0470..7200b0e 100644</span><br><span>--- a/doc/manuals/chapters/power_control.adoc</span><br><span>+++ b/doc/manuals/chapters/power_control.adoc</span><br><span>@@ -604,9 +604,11 @@</span><br><span> bts 0</span><br><span> overpower dl-acch 2 <1></span><br><span> overpower rxqual 4 <2></span><br><span style="color: hsl(120, 100%, 40%);">+ overpower chan-mode any <3></span><br><span> ----</span><br><span> <1> Overpower of maximum 2 dB for both SACCH and FACCH.</span><br><span> <2> Enable TOP only if RxQual is worse than 4 (BER >= 1.6%).</span><br><span style="color: hsl(120, 100%, 40%);">+<3> Permit TOP for any kinds of dedicated channels.</span><br><span> </span><br><span> It's also possible to enable TOP only for FACCH or SACCH selectively, or</span><br><span> or keep it enabled permanently regardless of the reported RxQual:</span><br><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index f582232..8861c32 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -595,6 +595,11 @@</span><br><span> </span><br><span> /* ACCH Temporary overpower capabilities */</span><br><span> struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Channel mode(s) for which to allow TOP */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ TOP_ACCH_CHAN_MODE_ANY = 0, /* Any kind of channel mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ TOP_ACCH_CHAN_MODE_SPEECH_V3, /* Speech channels using AMR codec */</span><br><span style="color: hsl(120, 100%, 40%);">+ } top_acch_chan_mode;</span><br><span> </span><br><span> /* MS/BS Power Control parameters */</span><br><span> struct gsm_power_ctrl_params ms_power_ctrl;</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index c86234b..c9d1369 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -554,7 +554,9 @@</span><br><span> }</span><br><span> </span><br><span> /* indicate Temporary overpower of SACCH and FACCH channels */</span><br><span style="color: hsl(0, 100%, 40%);">-static void put_top_acch_cap_ie(const struct gsm_lchan *lchan, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static void put_top_acch_cap_ie(const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct rsl_ie_chan_mode *cm,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg)</span><br><span> {</span><br><span> const struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> </span><br><span>@@ -562,6 +564,18 @@</span><br><span> if (!(bts->model->type == GSM_BTS_TYPE_OSMOBTS && osmo_bts_has_feature(&bts->features, BTS_FEAT_ACCH_TEMP_OVP)))</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if TOP is permitted for the given Channel Mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bts->top_acch_chan_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case TOP_ACCH_CHAN_MODE_SPEECH_V3:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cm->spd_ind != RSL_CMOD_SPD_SPEECH)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cm->chan_rate != RSL_CMOD_SP_GSM3)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case TOP_ACCH_CHAN_MODE_ANY:</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> msgb_tlv_put(msg, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP,</span><br><span> sizeof(bts->top_acch_cap),</span><br><span> (void *)&bts->top_acch_cap);</span><br><span>@@ -700,7 +714,7 @@</span><br><span> }</span><br><span> </span><br><span> put_rep_acch_cap_ie(lchan, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- put_top_acch_cap_ie(lchan, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ put_top_acch_cap_ie(lchan, &cm, msg);</span><br><span> </span><br><span> /* Selecting a specific TSC Set is only applicable to VAMOS mode */</span><br><span> if (lchan->activate.info.vamos && lchan->activate.tsc_set >= 1)</span><br><span>@@ -772,7 +786,7 @@</span><br><span> }</span><br><span> </span><br><span> put_rep_acch_cap_ie(lchan, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- put_top_acch_cap_ie(lchan, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ put_top_acch_cap_ie(lchan, &cm, msg);</span><br><span> </span><br><span> /* Selecting a specific TSC Set is only applicable to VAMOS mode. Send this Osmocom specific IE only to OsmoBTS</span><br><span> * types. */</span><br><span>diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c</span><br><span>index 8c49be9..f0125f3 100644</span><br><span>--- a/src/osmo-bsc/bts_vty.c</span><br><span>+++ b/src/osmo-bsc/bts_vty.c</span><br><span>@@ -818,6 +818,34 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string top_acch_chan_mode_name[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { TOP_ACCH_CHAN_MODE_ANY, "any" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TOP_ACCH_CHAN_MODE_SPEECH_V3, "speech-amr" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</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%);">+DEFUN_USRATTR(cfg_bts_top_dl_acch_chan_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_top_dl_acch_chan_mode_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BSC_VTY_ATTR_NEW_LCHAN),</span><br><span style="color: hsl(120, 100%, 40%);">+ "overpower chan-mode (speech-amr|any)",</span><br><span style="color: hsl(120, 100%, 40%);">+ TOP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Allow temporary overpower for specific Channel mode(s)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Speech channels using AMR codec\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Any kind of channel mode (default)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% ACCH overpower is not supported by BTS %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, 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%);">+ bts->top_acch_chan_mode = get_string_value(top_acch_chan_mode_name, 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> #define CD_STR "Channel Description\n"</span><br><span> </span><br><span> DEFUN_USRATTR(cfg_bts_chan_desc_att,</span><br><span>@@ -4311,6 +4339,10 @@</span><br><span> mode, top->overpower_db, VTY_NEWLINE);</span><br><span> vty_out(vty, " overpower rxqual %u%s",</span><br><span> top->rxqual, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " overpower chan-mode %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(top_acch_chan_mode_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->top_acch_chan_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> if (bts->rep_acch_cap.dl_facch_all)</span><br><span>@@ -4531,6 +4563,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_top_dl_acch_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_top_no_dl_acch_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_top_dl_acch_rxqual_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_top_dl_acch_chan_mode_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_avg_period_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd);</span><br><span>diff --git a/tests/acch_overpower.vty b/tests/acch_overpower.vty</span><br><span>index 0fc8a45..d2b87ef 100644</span><br><span>--- a/tests/acch_overpower.vty</span><br><span>+++ b/tests/acch_overpower.vty</span><br><span>@@ -12,15 +12,17 @@</span><br><span> . ..l overpower (dl-acch|dl-sacch|dl-facch) <1-4></span><br><span> . ..l no overpower dl-acch</span><br><span> . ..l overpower rxqual (0|1|2|3|4|5|6|7)</span><br><span style="color: hsl(120, 100%, 40%);">+ . ..l overpower chan-mode (speech-amr|any)</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# overpower?</span><br><span> overpower Temporary ACCH overpower</span><br><span> OsmoBSC(config-net-bts)# overpower ?</span><br><span style="color: hsl(0, 100%, 40%);">- dl-acch Enable overpower for both SACCH and FACCH</span><br><span style="color: hsl(0, 100%, 40%);">- dl-sacch Enable overpower for SACCH only</span><br><span style="color: hsl(0, 100%, 40%);">- dl-facch Enable overpower for FACCH only</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual Set RxQual (BER) threshold (default 4)</span><br><span style="color: hsl(120, 100%, 40%);">+ dl-acch Enable overpower for both SACCH and FACCH</span><br><span style="color: hsl(120, 100%, 40%);">+ dl-sacch Enable overpower for SACCH only</span><br><span style="color: hsl(120, 100%, 40%);">+ dl-facch Enable overpower for FACCH only</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual Set RxQual (BER) threshold (default 4)</span><br><span style="color: hsl(120, 100%, 40%);">+ chan-mode Allow temporary overpower for specific Channel mode(s)</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# overpower dl-acch ?</span><br><span> <1-4> Overpower value in dB</span><br><span>@@ -29,18 +31,21 @@</span><br><span> ...</span><br><span> overpower dl-acch 2</span><br><span> overpower rxqual 4</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower chan-mode any</span><br><span> ...</span><br><span> OsmoBSC(config-net-bts)# overpower dl-sacch 3</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ...</span><br><span> overpower dl-sacch 3</span><br><span> overpower rxqual 4</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower chan-mode any</span><br><span> ...</span><br><span> OsmoBSC(config-net-bts)# overpower dl-facch 4</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ...</span><br><span> overpower dl-facch 4</span><br><span> overpower rxqual 4</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower chan-mode any</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# overpower rxqual ?</span><br><span>@@ -57,12 +62,25 @@</span><br><span> ...</span><br><span> overpower dl-facch 4</span><br><span> overpower rxqual 0</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower chan-mode any</span><br><span> ...</span><br><span> OsmoBSC(config-net-bts)# overpower rxqual 7</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ...</span><br><span> overpower dl-facch 4</span><br><span> overpower rxqual 7</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower chan-mode any</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-net-bts)# overpower chan-mode ?</span><br><span style="color: hsl(120, 100%, 40%);">+ speech-amr Speech channels using AMR codec</span><br><span style="color: hsl(120, 100%, 40%);">+ any Any kind of channel mode (default)</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# overpower chan-mode speech-amr</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower dl-facch 4</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower rxqual 7</span><br><span style="color: hsl(120, 100%, 40%);">+ overpower chan-mode speech-amr</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no overpower dl-acch</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26242">change 26242</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/+/26242"/><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: I34d29d7d0f66c629367f3d6e8a660e199ecbe080 </div>
<div style="display:none"> Gerrit-Change-Number: 26242 </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>