<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24366">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add secondary RSL link for VAMOS (shadow TEI)<br><br>Set up a secondary sign_link for BTS that have BTS_FEAT_VAMOS enabled.<br><br>There are no secondary lchans being set up yet, but this is all that is<br>needed to send RSL commands for VAMOS secondary lchans.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: Ic304924b017f4588f749268e99ed1326db4c9f47<br>---<br>M include/osmocom/bsc/abis_rsl.h<br>M include/osmocom/bsc/bts_trx.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/e1_config.c<br>7 files changed, 34 insertions(+), 0 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/66/24366/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h</span><br><span>index dcae348..44c7774 100644</span><br><span>--- a/include/osmocom/bsc/abis_rsl.h</span><br><span>+++ b/include/osmocom/bsc/abis_rsl.h</span><br><span>@@ -42,6 +42,8 @@</span><br><span> msgb_alloc_headroom(RSL_ALLOC_SIZE, RSL_ALLOC_HEADROOM, \</span><br><span> __FILE__ ":" OSMO_STRINGIFY_VAL(__LINE__))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define VAMOS_SHADOW_TEI(TEI) (0x80 + (TEI))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const char *ip_to_a(uint32_t ip);</span><br><span> </span><br><span> struct e1inp_sign_link *rsl_chan_link(const struct gsm_lchan *lchan);</span><br><span>diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h</span><br><span>index 4d705d0..94f4021 100644</span><br><span>--- a/include/osmocom/bsc/bts_trx.h</span><br><span>+++ b/include/osmocom/bsc/bts_trx.h</span><br><span>@@ -34,7 +34,9 @@</span><br><span> /* how do we talk RSL with this TRX? */</span><br><span> struct gsm_e1_subslot rsl_e1_link;</span><br><span> uint8_t rsl_tei_primary;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rsl_tei_vamos;</span><br><span> struct e1inp_sign_link *rsl_link_primary;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_sign_link *rsl_link_vamos;</span><br><span> </span><br><span> /* Timeout for initiating the RSL connection. */</span><br><span> struct osmo_timer_list rsl_connect_timeout;</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 348735e..ce439b1 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -730,6 +730,12 @@</span><br><span> * channel_mode_and_rate. */</span><br><span> struct channel_mode_and_rate current_ch_mode_rate;</span><br><span> struct gsm48_multi_rate_conf current_mr_conf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether this lchan represents a secondary "shadow" lchan to multiplex a second MS onto a primary</span><br><span style="color: hsl(120, 100%, 40%);">+ * "normal" lchan */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_secondary;</span><br><span style="color: hsl(120, 100%, 40%);">+ } vamos;</span><br><span> };</span><br><span> </span><br><span> /* One Timeslot in a TRX */</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index a617d32..b68ab62 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -2685,5 +2685,7 @@</span><br><span> </span><br><span> struct e1inp_sign_link *rsl_chan_link(const struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->vamos.is_secondary)</span><br><span style="color: hsl(120, 100%, 40%);">+ return lchan->ts->trx->rsl_link_vamos;</span><br><span> return lchan->ts->trx->rsl_link_primary;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index ee6a716..18b35ad 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1346,6 +1346,8 @@</span><br><span> net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state);</span><br><span> if (is_ipaccess_bts(trx->bts)) {</span><br><span> vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei_primary);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->rsl_link_vamos)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ip.access stream ID for VAMOS shadow lchans: 0x%02x ", trx->rsl_tei_vamos);</span><br><span> e1isl_dump_vty_tcp(vty, trx->rsl_link_primary);</span><br><span> } else {</span><br><span> vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE);</span><br><span>@@ -5450,6 +5452,7 @@</span><br><span> struct gsm_bts_trx *trx = vty->index;</span><br><span> </span><br><span> trx->rsl_tei_primary = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_tei_vamos = VAMOS_SHADOW_TEI(trx->rsl_tei_primary);</span><br><span> </span><br><span> return CMD_SUCCESS;</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 1e3e9c1..05c3634 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>@@ -531,6 +531,10 @@</span><br><span> LOG_TRX(trx, DLINP, LOGL_NOTICE, "Dropping RSL link: %s\n", reason);</span><br><span> e1inp_sign_link_destroy(trx->rsl_link_primary);</span><br><span> trx->rsl_link_primary = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->rsl_link_vamos) {</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_sign_link_destroy(trx->rsl_link_vamos);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_link_vamos = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> osmo_stat_item_dec(trx->bts->bts_statg->items[BTS_STAT_RSL_CONNECTED], 1);</span><br><span> </span><br><span> if (trx->bts->c0 == trx)</span><br><span>@@ -740,6 +744,19 @@</span><br><span> sign_link->trx->bts->ip_access.flags |=</span><br><span> (RSL_UP << sign_link->trx->nr);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_bts_has_feature(&bts->features, BTS_FEAT_VAMOS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_link = trx->rsl_link_vamos =</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_sign_link_create(ts, E1INP_SIGN_RSL,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx, trx->rsl_tei_vamos, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_link_vamos->ts->sign.delay = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(sign_link->trx->bts->ip_access.flags &</span><br><span style="color: hsl(120, 100%, 40%);">+ (RSL_UP << sign_link->trx->nr))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_event(sign_link->ts, S_L_INP_TEI_UP,</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_link->tei, sign_link->sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_link->trx->bts->ip_access.flags |=</span><br><span style="color: hsl(120, 100%, 40%);">+ (RSL_UP << sign_link->trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> osmo_stat_item_inc(bts->bts_statg->items[BTS_STAT_RSL_CONNECTED], 1);</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c</span><br><span>index db77234..600f3c4 100644</span><br><span>--- a/src/osmo-bsc/e1_config.c</span><br><span>+++ b/src/osmo-bsc/e1_config.c</span><br><span>@@ -107,6 +107,8 @@</span><br><span> }</span><br><span> if (trx->rsl_link_primary)</span><br><span> e1inp_sign_link_destroy(trx->rsl_link_primary);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->rsl_link_vamos)</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_sign_link_destroy(trx->rsl_link_vamos);</span><br><span> trx->rsl_link_primary = rsl_link;</span><br><span> </span><br><span> for (i = 0; i < TRX_NR_TS; i++)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24366">change 24366</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/+/24366"/><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: Ic304924b017f4588f749268e99ed1326db4c9f47 </div>
<div style="display:none"> Gerrit-Change-Number: 24366 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>