<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20162">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oml: Fix premature Opstart to Radio Carrier<br><br>During the A-bis/OML bootstrapping, osmo-bsc sends Opstart to the<br>Radio Carrier MO twice. The first Opstart is triggered by the<br>State Changed Event Report, originated by the Radio Carrier itself.<br>The second is triggered by Software Activated Report.<br><br>According to 3GPP TS 12.21, figure 2, we shall send it only once,<br>after the "Attribute setting" step. Therefore, the first Opstart<br>is premature, and we shall not send it.<br><br>Related: SYS#5063, OS#4755<br>Change-Id: If69393551117266ecb726d8961153560b2b3cc59<br>---<br>M include/osmocom/bsc/signal.h<br>M src/osmo-bsc/abis_nm.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>3 files changed, 30 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h</span><br><span>index 952e03c..c7d7fe1 100644</span><br><span>--- a/include/osmocom/bsc/signal.h</span><br><span>+++ b/include/osmocom/bsc/signal.h</span><br><span>@@ -73,6 +73,7 @@</span><br><span> S_NM_OM2K_CONF_RES, /* OM2K Configuration Result */</span><br><span> S_NM_OPSTART_ACK, /* Received OPSTART ACK, arg is struct msgb *oml_msg */</span><br><span> S_NM_GET_ATTR_REP, /* Received Get Attributes Response, arg is struct msgb *oml_msg */</span><br><span style="color: hsl(120, 100%, 40%);">+ S_NM_SET_RADIO_ATTR_ACK, /* Received Set Radio Carrier Attributes Ack, arg is struct msgb *oml_msg */</span><br><span> };</span><br><span> </span><br><span> /* SS_LCHAN signals */</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index 7e637df..ec52380 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -821,6 +821,14 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int abis_nm_rx_set_radio_attr_ack(struct msgb *mb)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_om_fom_hdr *foh = msgb_l3(mb);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPFOH(DNM, foh, "Set Radio Carrier Attributes ACK\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_signal_dispatch(SS_NM, S_NM_SET_RADIO_ATTR_ACK, mb);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bool all_trx_rsl_connected_unlocked(const struct gsm_bts *bts)</span><br><span> {</span><br><span> const struct gsm_bts_trx *trx;</span><br><span>@@ -941,6 +949,7 @@</span><br><span> break;</span><br><span> case NM_MT_SET_RADIO_ATTR_ACK:</span><br><span> DEBUGPFOH(DNM, foh, "Set Radio Carrier Attributes ACK\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_rx_set_radio_attr_ack(mb);</span><br><span> break;</span><br><span> case NM_MT_CONN_MDROP_LINK_ACK:</span><br><span> DEBUGPFOH(DNM, foh, "CONN MDROP LINK ACK\n");</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 49720e5..796d208 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>@@ -185,11 +185,7 @@</span><br><span> }</span><br><span> break;</span><br><span> case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(0, 100%, 40%);">- trx = obj;</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_state->operational == NM_OPSTATE_DISABLED &&</span><br><span style="color: hsl(0, 100%, 40%);">- new_state->availability == NM_AVSTATE_OK)</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_opstart(trx->bts, obj_class, trx->bts->bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, 0xff);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* OPSTART done after Set Radio Carrier Attributes ACK is received */</span><br><span> break;</span><br><span> case NM_OC_GPRS_NSE:</span><br><span> bts = container_of(obj, struct gsm_bts, gprs.nse);</span><br><span>@@ -285,16 +281,13 @@</span><br><span> * This code is here to make sure that on start</span><br><span> * a TRX remains locked.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- int rc_state = trx->mo.nm_state.administrative;</span><br><span> /* Patch ARFCN into radio attribute */</span><br><span> struct msgb *msgb = nanobts_attr_radio_get(trx->bts, trx);</span><br><span> abis_nm_set_radio_attr(trx, msgb->data, msgb->len);</span><br><span> msgb_free(msgb);</span><br><span> abis_nm_chg_adm_state(trx->bts, foh->obj_class,</span><br><span> trx->bts->bts_nr, trx->nr, 0xff,</span><br><span style="color: hsl(0, 100%, 40%);">- rc_state);</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_opstart(trx->bts, foh->obj_class, trx->bts->bts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, 0xff);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.nm_state.administrative);</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span>@@ -328,6 +321,21 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void nm_rx_set_radio_attr_ack(struct msgb *oml_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_sign_link *sign_link = oml_msg->dst;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = sign_link->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (foh->obj_class != NM_OC_RADIO_CARRIER) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRX(trx, DNM, LOGL_ERROR, "Set Radio Carrier Attr Ack received on non Radio Carrier object!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_opstart(trx->bts, foh->obj_class, trx->bts->bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->nr, 0xff);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Callback function to be called every time we receive a signal from NM */</span><br><span> static int bts_ipa_nm_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span> void *handler_data, void *signal_data)</span><br><span>@@ -344,6 +352,9 @@</span><br><span> case S_NM_OPSTART_ACK:</span><br><span> nm_rx_opstart_ack(signal_data);</span><br><span> return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ case S_NM_SET_RADIO_ATTR_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_rx_set_radio_attr_ack(signal_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20162">change 20162</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-bsc/+/20162"/><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-Change-Id: If69393551117266ecb726d8961153560b2b3cc59 </div>
<div style="display:none"> Gerrit-Change-Number: 20162 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>