<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20990">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcuif: Improve BTS-supported CS/MCS handling<br><br>Take into account the MCS values supported by the BTS. In osmo-bts,<br>in general all MCS are enabled if "mode egprs" is selected in BSC,<br>and none otherwise.<br><br>Change-Id: Ie8f0215ba17da1e545e98bec9325c02f1e8efaea<br>---<br>M src/bts.h<br>M src/gprs_bssgp_pcu.cpp<br>M src/pcu_l1_if.cpp<br>M src/pcu_main.cpp<br>M tests/emu/pcu_emu.cpp<br>5 files changed, 47 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/20990/1</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 a3fa975..9bf80e1 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -110,10 +110,8 @@</span><br><span> uint32_t fc_bvc_leak_rate;</span><br><span> uint32_t fc_ms_bucket_size;</span><br><span> uint32_t fc_ms_leak_rate;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cs1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cs2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cs3;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cs4;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool cs_supported[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool mcs_supported[9];</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> uint8_t max_cs_dl, max_cs_ul;</span><br><span>diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp</span><br><span>index 9b6cbaa..d36d96d 100644</span><br><span>--- a/src/gprs_bssgp_pcu.cpp</span><br><span>+++ b/src/gprs_bssgp_pcu.cpp</span><br><span>@@ -736,13 +736,20 @@</span><br><span> static enum CodingScheme max_coding_scheme_dl(struct gprs_rlcmac_bts *bts)</span><br><span> {</span><br><span> int num;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span> </span><br><span> if (bts->egprs_enabled) {</span><br><span> if (!bts->cs_adj_enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->initial_mcs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->initial_mcs_dl) {</span><br><span> num = bts->initial_mcs_dl;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- num = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = sizeof(bts->mcs_supported) - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->mcs_supported[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ num = i + 1;</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 style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (bts->max_mcs_dl) {</span><br><span> num = bts->max_mcs_dl;</span><br><span> } else {</span><br><span>@@ -753,16 +760,16 @@</span><br><span> }</span><br><span> </span><br><span> if (!bts->cs_adj_enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->initial_cs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->initial_cs_dl) {</span><br><span> num = bts->initial_cs_dl;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts->cs4)</span><br><span style="color: hsl(0, 100%, 40%);">- num = 4;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts->cs3)</span><br><span style="color: hsl(0, 100%, 40%);">- num = 3;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts->cs2)</span><br><span style="color: hsl(0, 100%, 40%);">- num = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- num = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = sizeof(bts->cs_supported) - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->cs_supported[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ num = i + 1;</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 style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (bts->max_cs_dl) {</span><br><span> num = bts->max_cs_dl;</span><br><span> } else {</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 8a825a1..4e2f339 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -551,7 +551,8 @@</span><br><span> struct gprs_bssgp_pcu *pcu;</span><br><span> int rc = 0;</span><br><span> unsigned int trx_nr, ts_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool any_cs_supported;</span><br><span> </span><br><span> if (info_ind->version != PCU_IF_VERSION) {</span><br><span> fprintf(stderr, "PCU interface version number of BTS (%u) is "</span><br><span>@@ -613,16 +614,33 @@</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " dl_tbf_ext=%d\n", info_ind->dl_tbf_ext);</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " ul_tbf_ext=%d\n", info_ind->ul_tbf_ext);</span><br><span> bts->bsic = info_ind->bsic;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 4; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if ((info_ind->flags & (PCU_IF_FLAG_CS1 << i)))</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_DEBUG, " Use CS%d\n", i+1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (any_cs_supported = false, i = 0; i < sizeof(bts->cs_supported); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->cs_supported[i] = (info_ind->flags & (PCU_IF_FLAG_CS1 << i));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->cs_supported[0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ any_cs_supported = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " Use CS%d\n", i+1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 9; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if ((info_ind->flags & (PCU_IF_FLAG_MCS1 << i)))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!any_cs_supported) /* We need at least 1 CS, let's enable CS1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->cs_supported[0] = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < sizeof(bts->mcs_supported); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mcs_supported[i] = (info_ind->flags & (PCU_IF_FLAG_MCS1 << i));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->mcs_supported[i]) {</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " Use MCS%d\n", i+1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " initial_cs=%d\n", info_ind->initial_cs);</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " initial_mcs=%d\n", info_ind->initial_mcs);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->force_cs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (info_ind->initial_cs < 1 || info_ind->initial_cs > 4)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->initial_cs_dl = 1;</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%);">+ bts->initial_cs_ul = bts->initial_cs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> pcu = gprs_bssgp_init(</span><br><span> bts,</span><br><span>@@ -640,12 +658,6 @@</span><br><span> goto bssgp_failed;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs1 = !!(info_ind->flags & PCU_IF_FLAG_CS1);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs2 = !!(info_ind->flags & PCU_IF_FLAG_CS2);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs3 = !!(info_ind->flags & PCU_IF_FLAG_CS3);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs4 = !!(info_ind->flags & PCU_IF_FLAG_CS4);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->cs1 && !bts->cs2 && !bts->cs3 && !bts->cs4)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs1 = 1;</span><br><span> if (info_ind->t3142) { /* if timer values are set */</span><br><span> osmo_tdef_set(bts->T_defs_bts, 3142, info_ind->t3142, OSMO_TDEF_S);</span><br><span> osmo_tdef_set(bts->T_defs_bts, 3169, info_ind->t3169, OSMO_TDEF_S);</span><br><span>@@ -656,13 +668,6 @@</span><br><span> bts->n3103 = info_ind->n3103;</span><br><span> bts->n3105 = info_ind->n3105;</span><br><span> }</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(0, 100%, 40%);">- }</span><br><span> </span><br><span> for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts->trx); trx_nr++) {</span><br><span> bts->trx[trx_nr].arfcn = info_ind->trx[trx_nr].arfcn;</span><br><span>diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp</span><br><span>index cda10e7..2d65d54 100644</span><br><span>--- a/src/pcu_main.cpp</span><br><span>+++ b/src/pcu_main.cpp</span><br><span>@@ -231,7 +231,7 @@</span><br><span> bts->fc_interval = 1;</span><br><span> bts->initial_cs_dl = bts->initial_cs_ul = 1;</span><br><span> bts->initial_mcs_dl = bts->initial_mcs_ul = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs1 = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->cs_supported[0] = true;</span><br><span> bts->n3101 = 10;</span><br><span> bts->n3103 = 4;</span><br><span> bts->n3105 = 8;</span><br><span>diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp</span><br><span>index 41231a3..c275e3a 100644</span><br><span>--- a/tests/emu/pcu_emu.cpp</span><br><span>+++ b/tests/emu/pcu_emu.cpp</span><br><span>@@ -68,7 +68,7 @@</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> bts->fc_interval = 100;</span><br><span> bts->initial_cs_dl = bts->initial_cs_ul = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs1 = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->cs_supported[0] = true;</span><br><span> bts->n3101 = 10;</span><br><span> bts->n3103 = 4;</span><br><span> bts->n3105 = 8;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20990">change 20990</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/+/20990"/><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: Ie8f0215ba17da1e545e98bec9325c02f1e8efaea </div>
<div style="display:none"> Gerrit-Change-Number: 20990 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>