<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11834">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: Enable force-combined-si on nanoBTS by default<br><br>Some nanoBTS firmwares (if not all) are known to not work properly with<br>SI2ter. If BSC enables SI2ter through RSL, SI3 bit announcing SI2ter<br>available will be forwarded by nanoBTS to MS, but will still only send<br>SI2 message instead of expected SI2ter during TC=5 (see GSM 05.02 sec 6.3.4 "Mapping<br>of BCCH data"). As a result, some MS won't allow registering to the<br>network.<br><br>To avoid this kind of scenario, enable force-combined-si by default on<br>nanoBTS while still allowing to overwrite the feature through VTY. Other<br>BTS models are kept with force-combined-si disabled by default as<br>usually, since they seems to be working fine when SI2ter is enabled.<br><br>Related: OS#3063<br>Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d<br>---<br>M doc/examples/osmo-bsc/osmo-bsc.cfg<br>M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/bts_sysmobts.c<br>M src/osmo-bsc/system_information.c<br>7 files changed, 18 insertions(+), 6 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/34/11834/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg</span><br><span>index 750b089..eec154d 100644</span><br><span>--- a/doc/examples/osmo-bsc/osmo-bsc.cfg</span><br><span>+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg</span><br><span>@@ -40,7 +40,6 @@</span><br><span> oml ip.access stream_id 255 line 0</span><br><span> codec-support fr</span><br><span> gprs mode none</span><br><span style="color: hsl(0, 100%, 40%);">- no force-combined-si</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span> arfcn 871</span><br><span>diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg</span><br><span>index d1b3678..fd3a349 100644</span><br><span>--- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg</span><br><span>+++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg</span><br><span>@@ -39,7 +39,6 @@</span><br><span> oml ip.access stream_id 255 line 0</span><br><span> codec-support fr</span><br><span> gprs mode none</span><br><span style="color: hsl(0, 100%, 40%);">- no force-combined-si</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span> arfcn 871</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 4d8a4d0..ba52c99 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -756,6 +756,9 @@</span><br><span> void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx);</span><br><span> void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Should SI2bis and SI2ter be disabled by default on this BTS model? */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool force_combined_si;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct tlv_definition nm_att_tlvdef;</span><br><span> </span><br><span> /* features of a given BTS model set via gsm_bts_model_register() locally */</span><br><span>@@ -1046,6 +1049,7 @@</span><br><span> </span><br><span> /* SI related items */</span><br><span> int force_combined_si;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool force_combined_si_set;</span><br><span> int bcch_change_mark;</span><br><span> </span><br><span> /* Abis NM queue */</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 3ac592c..931db5b 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -985,8 +985,9 @@</span><br><span> if (bts->excl_from_rf_lock)</span><br><span> vty_out(vty, " rf-lock-exclude%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %sforce-combined-si%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->force_combined_si ? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->force_combined_si_set)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %sforce-combined-si%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->force_combined_si ? "" : "no ", VTY_NEWLINE);</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(bts->depends_on); ++i) {</span><br><span> int j;</span><br><span>@@ -3411,6 +3412,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> bts->force_combined_si = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->force_combined_si_set = true;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -3421,6 +3423,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> bts->force_combined_si = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->force_combined_si_set = true;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 1fffd89..f427e2d 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -63,7 +63,11 @@</span><br><span> .start = bts_model_nanobts_start,</span><br><span> .oml_rcvmsg = &abis_nm_rcvmsg,</span><br><span> .oml_status = &get_oml_status,</span><br><span style="color: hsl(0, 100%, 40%);">- .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops, </span><br><span style="color: hsl(120, 100%, 40%);">+ .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* some nanoBTS firmwares (if not all) don't support SI2ter and cause</span><br><span style="color: hsl(120, 100%, 40%);">+ problems on some MS if it is enabled, see OS#3063. Disable it by</span><br><span style="color: hsl(120, 100%, 40%);">+ default, can still be enabled through VTY cmd with same name. */</span><br><span style="color: hsl(120, 100%, 40%);">+ .force_combined_si = true,</span><br><span> .nm_att_tlvdef = {</span><br><span> .def = {</span><br><span> /* ip.access specifics */</span><br><span>diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c</span><br><span>index 91d1118..2f7a190 100644</span><br><span>--- a/src/osmo-bsc/bts_sysmobts.c</span><br><span>+++ b/src/osmo-bsc/bts_sysmobts.c</span><br><span>@@ -48,6 +48,9 @@</span><br><span> model_sysmobts.name = "sysmobts";</span><br><span> model_sysmobts.type = GSM_BTS_TYPE_OSMOBTS;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Unlinke nanoBTS, sysmoBTS supports SI2bis and SI2ter fine */</span><br><span style="color: hsl(120, 100%, 40%);">+ model_sysmobts.force_combined_si = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> model_sysmobts.features.data = &model_sysmobts._features_data[0];</span><br><span> model_sysmobts.features.data_len =</span><br><span> sizeof(model_sysmobts._features_data);</span><br><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index 2104e92..ddcbcec 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -327,7 +327,7 @@</span><br><span> static inline int use_arfcn(const struct gsm_bts *bts, const bool bis, const bool ter,</span><br><span> const bool pgsm, const int arfcn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->force_combined_si)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->force_combined_si_set ? bts->force_combined_si : bts->model->force_combined_si)</span><br><span> return !bis && !ter;</span><br><span> if (!bis && !ter && band_compatible(bts, arfcn))</span><br><span> return 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11834">change 11834</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/11834"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d </div>
<div style="display:none"> Gerrit-Change-Number: 11834 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>