[overpower] By default, permit only for speech channels using AMR

Change-Id: I087025f9db59348f2f70d4a291f8d887644d6b17
Related: SYS#5319

4 files changed, 25 insertions, 15 deletions

diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc
index 7200b0ee6..f5f94f6a4 100644
--- a/doc/manuals/chapters/power_control.adoc
+++ b/doc/manuals/chapters/power_control.adoc
@@ -604,14 +604,17 @@ network
  bts 0
   overpower dl-acch 2 <1>
   overpower rxqual 4 <2>
-  overpower chan-mode any <3>
+  overpower chan-mode speech-amr <3>
 ----
 <1> Overpower of maximum 2 dB for both SACCH and FACCH.
 <2> Enable TOP only if RxQual is worse than 4 (BER >= 1.6%).
-<3> Permit TOP for any kinds of dedicated channels.
+<3> Permit TOP only for speech channels using AMR codec.
 
-It's also possible to enable TOP only for FACCH or SACCH selectively, or
-or keep it enabled permanently regardless of the reported RxQual:
+For advanced use cases, OsmoBSC can be configured to:
+
+* enable TOP only for FACCH or SACCH selectively, and/or
+* keep TOP enabled permanently regardless of the reported RxQual, and/or
+* permit TOP for any kind of dedicated channels.
 
 ----
 OsmoBSC(config-net-bts)# overpower ?
@@ -621,6 +624,10 @@ OsmoBSC(config-net-bts)# overpower ?
 
 OsmoBSC(config-net-bts)# overpower rxqual 0?
   0  BER >= 0% (always on)
+
+OsmoBSC(config-net-bts)# overpower chan-mode ?
+  speech-amr  Speech channels using AMR codec (default)
+  any         Any kind of channel mode
 ----
 
 These parameters are indicated to the BTS during a logical channel activation
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index 0fdb636da..8af125488 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -401,6 +401,9 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm
 	bts->rep_acch_cap.rxqual = 4;
 	bts->top_acch_cap.rxqual = 4;
 
+	/* Permit ACCH overpower only for speech channels using AMR */
+	bts->top_acch_chan_mode = TOP_ACCH_CHAN_MODE_SPEECH_V3;
+
 	/* MS Power Control parameters (defaults) */
 	power_ctrl_params_def_reset(&bts->ms_power_ctrl, GSM_PWR_CTRL_DIR_UL);
 
diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index 2da789a39..0c7259b7d 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -830,8 +830,8 @@ DEFUN_USRATTR(cfg_bts_top_dl_acch_chan_mode,
 	      "overpower chan-mode (speech-amr|any)",
 	      TOP_ACCH_STR
 	      "Allow temporary overpower for specific Channel mode(s)\n"
-	      "Speech channels using AMR codec\n"
-	      "Any kind of channel mode (default)\n")
+	      "Speech channels using AMR codec (default)\n"
+	      "Any kind of channel mode\n")
 {
 	struct gsm_bts *bts = vty->index;
 
diff --git a/tests/acch_overpower.vty b/tests/acch_overpower.vty
index d2b87efb6..70090a438 100644
--- a/tests/acch_overpower.vty
+++ b/tests/acch_overpower.vty
@@ -31,21 +31,21 @@ OsmoBSC(config-net-bts)# show running-config
 ...
   overpower dl-acch 2
   overpower rxqual 4
-  overpower chan-mode any
+  overpower chan-mode speech-amr
 ...
 OsmoBSC(config-net-bts)# overpower dl-sacch 3
 OsmoBSC(config-net-bts)# show running-config
 ...
   overpower dl-sacch 3
   overpower rxqual 4
-  overpower chan-mode any
+  overpower chan-mode speech-amr
 ...
 OsmoBSC(config-net-bts)# overpower dl-facch 4
 OsmoBSC(config-net-bts)# show running-config
 ...
   overpower dl-facch 4
   overpower rxqual 4
-  overpower chan-mode any
+  overpower chan-mode speech-amr
 ...
 
 OsmoBSC(config-net-bts)# overpower rxqual ?
@@ -62,25 +62,25 @@ OsmoBSC(config-net-bts)# show running-config
 ...
   overpower dl-facch 4
   overpower rxqual 0
-  overpower chan-mode any
+  overpower chan-mode speech-amr
 ...
 OsmoBSC(config-net-bts)# overpower rxqual 7
 OsmoBSC(config-net-bts)# show running-config
 ...
   overpower dl-facch 4
   overpower rxqual 7
-  overpower chan-mode any
+  overpower chan-mode speech-amr
 ...
 
 OsmoBSC(config-net-bts)# overpower chan-mode ?
-  speech-amr  Speech channels using AMR codec
-  any         Any kind of channel mode (default)
-OsmoBSC(config-net-bts)# overpower chan-mode speech-amr
+  speech-amr  Speech channels using AMR codec (default)
+  any         Any kind of channel mode
+OsmoBSC(config-net-bts)# overpower chan-mode any
 OsmoBSC(config-net-bts)# show running-config
 ...
   overpower dl-facch 4
   overpower rxqual 7
-  overpower chan-mode speech-amr
+  overpower chan-mode any
 ...
 
 OsmoBSC(config-net-bts)# no overpower dl-acch