<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21032">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix configuration of initial_(m)cs<br><br>Properly clip initial_(m)cs values to be lower-equal than maximum<br>configured.<br><br>Regarding initial_mcs, use values provided by BTS, which were not used<br>before.<br><br>Change-Id: Ifc6bc7c2734d1ae404adc2497afec5366e4f9e50<br>---<br>M src/bts.h<br>M src/pcu_l1_if.cpp<br>M src/pcu_vty.c<br>3 files changed, 43 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 9f2f898..4d5d0df 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -115,10 +115,11 @@</span><br><span> uint8_t initial_cs_dl, initial_cs_ul;</span><br><span> uint8_t initial_mcs_dl, initial_mcs_ul;</span><br><span> struct { /* Config Values set by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool force_initial_cs; /* false=use from BTS true=use from VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool force_initial_mcs; /* false=use from BTS true=use from VTY */</span><br><span> uint8_t max_cs_dl, max_cs_ul;</span><br><span> uint8_t max_mcs_dl, max_mcs_ul;</span><br><span> } vty;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t force_cs; /* 0=use from BTS 1=use from VTY */</span><br><span> uint16_t force_llc_lifetime; /* overrides lifetime from SGSN */</span><br><span> uint32_t llc_discard_csec;</span><br><span> uint32_t llc_idle_ack_csec;</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 738d0f1..a984591 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -633,14 +633,38 @@</span><br><span> }</span><br><span> bts_set_max_mcs(bts, bts->vty.max_mcs_dl, bts->vty.max_mcs_ul); /* recalc max MCS values */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_DEBUG, " initial_cs=%d\n", info_ind->initial_cs);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_DEBUG, " initial_mcs=%d\n", info_ind->initial_mcs);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->force_cs) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (info_ind->initial_cs < 1 || info_ind->initial_cs > 4)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->initial_cs_dl = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- bts->initial_cs_dl = info_ind->initial_cs;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->initial_cs_ul = bts->initial_cs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " initial_cs=%u%s\n", info_ind->initial_cs,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.force_initial_cs ? " (VTY forced, ignoring)" : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->vty.force_initial_cs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (info_ind->initial_cs > bts->bts->max_cs_dl()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " downgrading initial_cs_dl to %d\n", bts->bts->max_cs_dl());</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_cs_dl = bts->bts->max_cs_dl();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_cs_dl = info_ind->initial_cs;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (info_ind->initial_cs > bts->bts->max_cs_ul()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " downgrading initial_cs_ul to %d\n", bts->bts->max_cs_ul());</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_cs_ul = bts->bts->max_cs_ul();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_cs_ul = info_ind->initial_cs;</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 style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " initial_mcs=%u%s\n", info_ind->initial_mcs,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.force_initial_mcs ? " (VTY forced, ignoring)" : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->vty.force_initial_mcs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (info_ind->initial_mcs > bts->bts->max_mcs_dl()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " downgrading initial_mcs_dl to %d\n", bts->bts->max_mcs_dl());</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_mcs_dl = bts->bts->max_mcs_dl();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_mcs_dl = info_ind->initial_mcs;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (info_ind->initial_mcs > bts->bts->max_mcs_ul()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " downgrading initial_mcs_ul to %d\n", bts->bts->max_mcs_ul());</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_mcs_ul = bts->bts->max_mcs_ul();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_mcs_ul = info_ind->initial_mcs;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> pcu = gprs_bssgp_init(</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 5e5dfbe..bf45686 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -122,7 +122,7 @@</span><br><span> if (bts->fc_ms_leak_rate)</span><br><span> vty_out(vty, " flow-control force-ms-leak-rate %d%s",</span><br><span> bts->fc_ms_leak_rate, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->force_cs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->vty.force_initial_cs) {</span><br><span> if (bts->initial_cs_ul == bts->initial_cs_dl)</span><br><span> vty_out(vty, " cs %d%s", bts->initial_cs_dl,</span><br><span> VTY_NEWLINE);</span><br><span>@@ -179,7 +179,7 @@</span><br><span> bts->mcs_lqual_ranges[8].low,</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->initial_mcs_dl != 1 && bts->initial_mcs_ul != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->vty.force_initial_mcs) {</span><br><span> if (bts->initial_mcs_ul == bts->initial_mcs_dl)</span><br><span> vty_out(vty, " mcs %d%s", bts->initial_mcs_dl,</span><br><span> VTY_NEWLINE);</span><br><span>@@ -449,7 +449,7 @@</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> uint8_t cs = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->force_cs = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.force_initial_cs = true;</span><br><span> bts->initial_cs_dl = cs;</span><br><span> if (argc > 1)</span><br><span> bts->initial_cs_ul = atoi(argv[1]);</span><br><span>@@ -467,7 +467,7 @@</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->force_cs = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.force_initial_cs = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -517,13 +517,14 @@</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cs = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mcs = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->initial_mcs_dl = cs;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.force_initial_mcs = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_mcs_dl = mcs;</span><br><span> if (argc > 1)</span><br><span> bts->initial_mcs_ul = atoi(argv[1]);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- bts->initial_mcs_ul = cs;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_mcs_ul = mcs;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -536,8 +537,7 @@</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->initial_mcs_dl = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->initial_mcs_ul = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.force_initial_mcs = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21032">change 21032</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-pcu/+/21032"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifc6bc7c2734d1ae404adc2497afec5366e4f9e50 </div>
<div style="display:none"> Gerrit-Change-Number: 21032 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>