<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24374">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">implement Channel Mode Modify to VAMOS mode<br><br>Put a (primary) lchan in VAMOS speech mode.<br>This is not yet about activating shadow lchans, this merely puts any<br>lchan in a VAMOS capable channel- and speech mode.<br><br>Protocol:<br><br>In RR Channel Mode Modify, send a spec conforming VAMOS channel mode as<br>well as an Extended TSC Set, wich adds the TSC Set to the training<br>sequence code value.<br><br>In RSL MODE MODIFY, send Osmocom specific extensions to indicate the TSC<br>Set and TSC, as well as the VAMOS channel mode; only to OsmoBTS type<br>cells.<br>- Set the Channel Mode's Channel Rate to Osmocom specific<br> RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm / RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm<br>- Add the Osmocom specific Training Sequence IE containing both TSC Set<br> and TSC.<br>(These are documented in the Abis manual.)<br><br>Implementation:<br><br>The internal API to request a Mode Modify is lchan_modify(info). Add to<br>this info the 'vamos' bool, set to true when the modification should put<br>the lchan in VAMOS channel mode or not.<br><br>When info.vamos == true, make sure the channel mode value is a VAMOS<br>one: in the copy of info->ch_mode_rate at lchan->modify.ch_mode_rate,<br>convert to the right VAMOS/non-VAMOS equivalent channel mode.<br><br>When the modification is through, set lchan->vamos.enabled<br>appropriately.<br><br>This patch also builds on Ic665125255d7354f5499d10dda1dd866ab243d24<br>'allow explixit TSC Set and TSC on chan activ / modif / assignment'<br>placing tsc_set and tsc values in the TSC related IEs.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: Ibf53f4797d7491b17a33946fd7d920f038362b4c<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/lchan_fsm.c<br>4 files changed, 53 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 2515d7e..7e90579 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -626,6 +626,8 @@</span><br><span> /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span> * TS 45.002. */</span><br><span> int tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vamos;</span><br><span> };</span><br><span> </span><br><span> struct gsm_lchan {</span><br><span>@@ -741,6 +743,11 @@</span><br><span> int tsc_set;</span><br><span> /* Training Sequence Code in use. The valid range is 0-7 as described in the spec 3GPP TS 45.002. */</span><br><span> uint8_t tsc;</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 is activated/modified into a mode that allows VAMOS multiplexing at this moment */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enabled;</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 69052ee..001b1da 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -353,7 +353,8 @@</span><br><span> </span><br><span> static int channel_mode_from_lchan(struct rsl_ie_chan_mode *cm,</span><br><span> struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct channel_mode_and_rate *ch_mode_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct channel_mode_and_rate *ch_mode_rate,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vamos)</span><br><span> {</span><br><span> int rc;</span><br><span> memset(cm, 0, sizeof(*cm));</span><br><span>@@ -378,10 +379,10 @@</span><br><span> cm->chan_rt = RSL_CMOD_CRT_SDCCH;</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- cm->chan_rt = RSL_CMOD_CRT_TCH_Bm;</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->chan_rt = vamos ? RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm : RSL_CMOD_CRT_TCH_Bm;</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- cm->chan_rt = RSL_CMOD_CRT_TCH_Lm;</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->chan_rt = vamos ? RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm : RSL_CMOD_CRT_TCH_Lm;</span><br><span> break;</span><br><span> case GSM_LCHAN_NONE:</span><br><span> case GSM_LCHAN_UNKNOWN:</span><br><span>@@ -502,6 +503,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Write RSL_IE_OSMO_TRAINING_SEQUENCE to msgb. The tsc_set argument's range is 1-4, tsc argument range is 0-7. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void put_osmo_training_sequence_ie(struct msgb *msg, uint8_t tsc_set, uint8_t tsc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *len = msgb_tl_put(msg, RSL_IE_OSMO_TRAINING_SEQUENCE);</span><br><span style="color: hsl(120, 100%, 40%);">+ *len = 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Convert from spec conforming "human readable" TSC Set 1-4 to 0-3 on the wire */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, tsc_set - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TSC is 0-7 both on the wire and in spec descriptions */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Chapter 8.4.1 */</span><br><span> int rsl_tx_chan_activ(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref)</span><br><span> {</span><br><span>@@ -522,7 +534,7 @@</span><br><span> /* PDCH activation is a job for rsl_tx_dyn_ts_pdch_act_deact(); */</span><br><span> OSMO_ASSERT(act_type != RSL_ACT_OSMO_PDCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.info.ch_mode_rate);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.info.ch_mode_rate, false);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DRSL, LOGL_ERROR,</span><br><span> "%s Cannot find channel mode from lchan type\n",</span><br><span>@@ -637,7 +649,7 @@</span><br><span> struct rsl_ie_chan_mode cm;</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.ch_mode_rate);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.ch_mode_rate, lchan->modify.info.vamos);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span>@@ -668,6 +680,11 @@</span><br><span> </span><br><span> rep_acch_cap_for_bts(lchan, msg);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Selecting a specific TSC Set is only applicable to VAMOS mode. Send this Osmocom specific IE only to OsmoBTS</span><br><span style="color: hsl(120, 100%, 40%);">+ * types. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->modify.info.vamos && lchan->modify.tsc_set >= 1 && bts->model->type == GSM_BTS_TYPE_OSMOBTS)</span><br><span style="color: hsl(120, 100%, 40%);">+ put_osmo_training_sequence_ie(msg, lchan->modify.tsc_set, lchan->modify.tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index 5948e94..518afea 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -702,6 +702,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->modify.info.vamos && lchan->modify.tsc_set > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Add the Extended TSC Set IE. So far we only need a TSC Set sent for VAMOS.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Convert from spec conforming "human readable" TSC Set 1-4 to 0-3 on the wire */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM48_IE_EXTENDED_TSC_SET, (lchan->modify.tsc_set - 1) & 0x3);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return gsm48_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index ded4129..0613fcb 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -382,6 +382,16 @@</span><br><span> {</span><br><span> OSMO_ASSERT(lchan && info);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (info->vamos && !osmo_bts_has_feature(&lchan->ts->trx->bts->features, BTS_FEAT_VAMOS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->last_error = talloc_strdup(lchan->ts->trx, "VAMOS related Channel Mode Modify requested,"</span><br><span style="color: hsl(120, 100%, 40%);">+ " but BTS does not support VAMOS");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "VAMOS related Channel Mode Modify requested, but BTS %u does not support VAMOS\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->trx->bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_on_mode_modify_failure(lchan, info->modify_for, lchan->conn);</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%);">+</span><br><span> /* To make sure that the lchan is actually allowed to initiate Mode Modify, feed through an FSM event. */</span><br><span> if (osmo_fsm_inst_dispatch(lchan->fi, LCHAN_EV_REQUEST_MODE_MODIFY, info)) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>@@ -973,6 +983,7 @@</span><br><span> lchan->current_mr_conf = lchan->modify.mr_conf_filtered;</span><br><span> lchan->tsc_set = lchan->modify.tsc_set;</span><br><span> lchan->tsc = lchan->modify.tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->vamos.enabled = lchan->modify.info.vamos;</span><br><span> </span><br><span> if (lchan->modify.info.requires_voice_stream</span><br><span> && !lchan->fi_rtp) {</span><br><span>@@ -1118,7 +1129,13 @@</span><br><span> use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span> </span><br><span> lchan->modify.ch_mode_rate = lchan->modify.info.ch_mode_rate;</span><br><span style="color: hsl(0, 100%, 40%);">- /* future: automatically adjust chan_mode in lchan->modify.ch_mode_rate */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.ch_mode_rate.chan_mode = (lchan->modify.info.vamos</span><br><span style="color: hsl(120, 100%, 40%);">+ ? gsm48_chan_mode_to_vamos(lchan->modify.info.ch_mode_rate.chan_mode)</span><br><span style="color: hsl(120, 100%, 40%);">+ : gsm48_chan_mode_to_non_vamos(lchan->modify.info.ch_mode_rate.chan_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->modify.ch_mode_rate.chan_mode < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Invalid chan_mode: %s", gsm48_chan_mode_name(lchan->modify.info.ch_mode_rate.chan_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (gsm48_chan_mode_to_non_vamos(modif_info->ch_mode_rate.chan_mode) == GSM48_CMODE_SPEECH_AMR) {</span><br><span> if (lchan_mr_config(&lchan->modify.mr_conf_filtered, lchan, modif_info->ch_mode_rate.s15_s0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24374">change 24374</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/+/24374"/><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: Ibf53f4797d7491b17a33946fd7d920f038362b4c </div>
<div style="display:none"> Gerrit-Change-Number: 24374 </div>
<div style="display:none"> Gerrit-PatchSet: 21 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </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>