<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25682">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MS Power Control Loop: Use P_CON_INTERVAL=2 by default<br><br>Have a more stable loop with less temporary oscillations at the expense<br>of increased reaction time.<br><br>4 SACCH blocks (P_CON_INTERVAL=2) is the minimum interval to get stable<br>measurements for the last requested MS Power level. With P_CON_INTERVAL=1,<br>are also made during a period with stable power being use to transmit,<br>but the MS Power level used (and announced in MR) is not the last one<br>requested by the BTS, but the one requested in the previous loop<br>iteration. This can make the MS and BTS bounce 2 values forth and back,<br>and create some temporary oscillation.<br><br>See osmo-bsc User manual section "Power Control" for more information.<br><br>Related: SYS#5371<br>Change-Id: I91c505447f68714239a4f033d4f06e91893df201<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/common/bts.c<br>M src/common/gsm_data.c<br>M src/common/rsl.c<br>4 files changed, 15 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index b73df5f..8ae36ca 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -223,6 +223,7 @@</span><br><span> </span><br><span> /* Default MS/BS Power Control parameters */</span><br><span> extern const struct gsm_power_ctrl_params power_ctrl_params_def;</span><br><span style="color: hsl(120, 100%, 40%);">+void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr);</span><br><span> </span><br><span> /* Measurement pre-processing state */</span><br><span> struct gsm_power_ctrl_meas_proc_state {</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 191c331..b226df2 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -340,8 +340,8 @@</span><br><span> bts->rtp_priority = -1;</span><br><span> </span><br><span> /* Default (fall-back) MS/BS Power control parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->bs_dpc_params = power_ctrl_params_def;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->ms_dpc_params = power_ctrl_params_def;</span><br><span style="color: hsl(120, 100%, 40%);">+ power_ctrl_params_def_reset(&bts->bs_dpc_params, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ power_ctrl_params_def_reset(&bts->ms_dpc_params, false);</span><br><span> </span><br><span> /* configurable via OML */</span><br><span> bts->load.ccch.load_ind_period = 112;</span><br><span>diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c</span><br><span>index 1525328..89a740d 100644</span><br><span>--- a/src/common/gsm_data.c</span><br><span>+++ b/src/common/gsm_data.c</span><br><span>@@ -680,3 +680,11 @@</span><br><span> .h_reqt = 6, /* TODO: investigate a reasonable default value */</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *params = power_ctrl_params_def;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!is_bs_pwr)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */</span><br><span style="color: hsl(120, 100%, 40%);">+ params->ctrl_interval = 2;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index c73b093..89c3b96 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1111,7 +1111,8 @@</span><br><span> /* TLV (O) BS Power Parameters IE */</span><br><span> if ((ie = TLVP_GET(&tp, RSL_IE_BS_POWER_PARAM)) != NULL) {</span><br><span> /* Allocate a new chunk and initialize with default values */</span><br><span style="color: hsl(0, 100%, 40%);">- params = talloc_memdup(trx, &power_ctrl_params_def, sizeof(*params));</span><br><span style="color: hsl(120, 100%, 40%);">+ params = talloc(trx, struct gsm_power_ctrl_params);</span><br><span style="color: hsl(120, 100%, 40%);">+ power_ctrl_params_def_reset(params, true);</span><br><span> </span><br><span> if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) == 0) {</span><br><span> /* Initially it points to the global defaults */</span><br><span>@@ -1128,7 +1129,8 @@</span><br><span> /* TLV (O) MS Power Parameters IE */</span><br><span> if ((ie = TLVP_GET(&tp, RSL_IE_MS_POWER_PARAM)) != NULL) {</span><br><span> /* Allocate a new chunk and initialize with default values */</span><br><span style="color: hsl(0, 100%, 40%);">- params = talloc_memdup(trx, &power_ctrl_params_def, sizeof(*params));</span><br><span style="color: hsl(120, 100%, 40%);">+ params = talloc(trx, struct gsm_power_ctrl_params);</span><br><span style="color: hsl(120, 100%, 40%);">+ power_ctrl_params_def_reset(params, false);</span><br><span> </span><br><span> if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) == 0) {</span><br><span> /* Initially it points to the global defaults */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25682">change 25682</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/+/25682"/><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: I91c505447f68714239a4f033d4f06e91893df201 </div>
<div style="display:none"> Gerrit-Change-Number: 25682 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>