<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24440">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] osmo-bts-trx: schedule bursts on 'shadow' timeslots<br><br>Change-Id: I3e0bdf8c03273f66991aa1764029ab1dd3528d7e<br>Related: SYS#4895, OS#4941<br>---<br>M include/osmo-bts/scheduler.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>M src/osmo-bts-trx/trx_if.c<br>5 files changed, 91 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h</span><br><span>index 9093229..86bfdf9 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -71,6 +71,7 @@</span><br><span> enum trx_mod_type {</span><br><span> TRX_MOD_T_GMSK,</span><br><span> TRX_MOD_T_8PSK,</span><br><span style="color: hsl(120, 100%, 40%);">+ TRX_MOD_T_AQPSK,</span><br><span> };</span><br><span> </span><br><span> /* A set of measurements belonging to one Uplink burst */</span><br><span>@@ -231,6 +232,7 @@</span><br><span> #define TRX_BI_F_CI_CB (1 << 3)</span><br><span> #define TRX_BI_F_TRX_NUM (1 << 4)</span><br><span> #define TRX_BI_F_BATCH_IND (1 << 5)</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRX_BI_F_SHADOW_IND (1 << 6)</span><br><span> </span><br><span> /*! UL burst indication with the corresponding meta info */</span><br><span> struct trx_ul_burst_ind {</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index eb0aecd..3ab94a2 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -606,32 +606,49 @@</span><br><span> * init / exit</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void trx_sched_init_ts(struct gsm_bts_trx_ts *ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned int rate_ctr_idx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1sched_ts *l1ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts = talloc_zero(ts->trx, struct l1sched_ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(l1ts != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Link both structures */</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->priv = l1ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->ts = ts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->ctrs = rate_ctr_group_alloc(ts->trx,</span><br><span style="color: hsl(120, 100%, 40%);">+ &l1sched_ts_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&l1ts->dl_prims);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1sched_chan_state *chan_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state = &l1ts->chan_state[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->active = false;</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> void trx_sched_init(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int tn, i;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tn;</span><br><span> </span><br><span> OSMO_ASSERT(trx != NULL);</span><br><span> </span><br><span> LOGPTRX(trx, DL1C, LOGL_DEBUG, "Init scheduler structures\n");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate shadow timeslots */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_bts_trx_init_shadow_ts(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_ts *l1ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int rate_ctr_idx = trx->nr * 100 + tn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- l1ts = talloc_zero(trx, struct l1sched_ts);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(l1ts != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ts[tn].priv = l1ts;</span><br><span style="color: hsl(0, 100%, 40%);">- l1ts->ts = &trx->ts[tn];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- l1ts->mf_index = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- l1ts->ctrs = rate_ctr_group_alloc(trx, &l1sched_ts_ctrg_desc, (trx->nr + 1) * 10 + tn);</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&l1ts->dl_prims);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_chan_state *chan_state;</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state = &l1ts->chan_state[i];</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->active = false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Init primary and shadow timeslots */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_init_ts(ts, rate_ctr_idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_init_ts(ts->vamos.peer, rate_ctr_idx + 10);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -999,6 +1016,12 @@</span><br><span> l1ts->mf_index = i;</span><br><span> l1ts->mf_period = trx_sched_multiframes[i].period;</span><br><span> l1ts->mf_frames = trx_sched_multiframes[i].frames;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->vamos.peer != NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts = ts->vamos.peer->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->mf_index = i;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->mf_period = trx_sched_multiframes[i].period;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->mf_frames = trx_sched_multiframes[i].frames;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> LOGP(DL1C, LOGL_NOTICE, "%s Configured multiframe with '%s'\n",</span><br><span> gsm_ts_name(ts), trx_sched_multiframes[i].name);</span><br><span> return 0;</span><br><span>@@ -1423,6 +1446,10 @@</span><br><span> uint8_t offset, period;</span><br><span> trx_sched_ul_func *func;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* VAMOS: redirect to the shadow timeslot */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi->flags & TRX_BI_F_SHADOW_IND)</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts = l1ts->ts->vamos.peer->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!l1ts->mf_index)</span><br><span> return -EINVAL;</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 6ec8dfc..7134939 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -146,6 +146,7 @@</span><br><span> osmo_bts_set_feature(bts->features, BTS_FEAT_HOPPING);</span><br><span> osmo_bts_set_feature(bts->features, BTS_FEAT_ACCH_REP);</span><br><span> osmo_bts_set_feature(bts->features, BTS_FEAT_MULTI_TSC);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(bts->features, BTS_FEAT_VAMOS);</span><br><span> </span><br><span> bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index 4a23f11..1a4f03f 100644</span><br><span>--- a/src/osmo-bts-trx/scheduler_trx.c</span><br><span>+++ b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>@@ -149,6 +149,40 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* schedule one frame for a shadow timeslot, merge bursts */</span><br><span style="color: hsl(120, 100%, 40%);">+static void _sched_dl_shadow_burst(const struct gsm_bts_trx_ts *ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_dl_burst_req *br)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1sched_ts *l1ts = ts->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* For the shadow timeslots, physical channel type can be either</span><br><span style="color: hsl(120, 100%, 40%);">+ * GSM_PCHAN_TCH_{F,H} or GSM_PCHAN_NONE. Even if the primary</span><br><span style="color: hsl(120, 100%, 40%);">+ * timeslot is a dynamic timeslot, it's always a concrete value. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->pchan == GSM_PCHAN_NONE)</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%);">+ struct trx_dl_burst_req sbr = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .trx_num = br->trx_num,</span><br><span style="color: hsl(120, 100%, 40%);">+ .fn = br->fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tn = br->tn,</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%);">+ _sched_dl_burst(l1ts, &sbr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (br->burst_len != 0 && sbr.burst_len != 0) { /* Both present */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(br->burst + GSM_BURST_LEN, sbr.burst, GSM_BURST_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ br->burst_len = 2 * GSM_BURST_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ br->mod = TRX_MOD_T_AQPSK;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: SCPIR is hard-coded to 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (br->burst_len == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No primary burst, send shadow burst alone */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(br, &sbr, sizeof(sbr));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (sbr.burst_len == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No shadow burst, send primary burst alone */</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* schedule all frames of all TRX for given FN */</span><br><span> static void bts_sched_fn(struct gsm_bts *bts, const uint32_t fn)</span><br><span> {</span><br><span>@@ -193,8 +227,11 @@</span><br><span> br = &pinst->u.osmotrx.br[tn];</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* get burst for FN */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* get burst for the primary timeslot */</span><br><span> _sched_dl_burst(l1ts, br);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* get burst for the shadow timeslot */</span><br><span style="color: hsl(120, 100%, 40%);">+ _sched_dl_shadow_burst(ts->vamos.peer, br);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index afd630f..968c335 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -755,6 +755,7 @@</span><br><span> static const uint8_t trx_data_mod_val[] = {</span><br><span> [TRX_MOD_T_GMSK] = 0x00, /* .00xx... */</span><br><span> [TRX_MOD_T_8PSK] = 0x20, /* .010x... */</span><br><span style="color: hsl(120, 100%, 40%);">+ [TRX_MOD_T_AQPSK] = 0x60, /* .11xx... */</span><br><span> };</span><br><span> </span><br><span> /* Header dissector for TRXDv0 (and part of TRXDv1) */</span><br><span>@@ -863,9 +864,12 @@</span><br><span> /* TDMA timeslot number (other bits are RFU) */</span><br><span> bi->tn = buf[0] & 0x07;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TRX (RF channel) number and BATCH.ind */</span><br><span style="color: hsl(0, 100%, 40%);">- if (buf[1] & (1 << 7))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (buf[1] & (1 << 7)) /* BATCH.ind */</span><br><span> bi->flags |= TRX_BI_F_BATCH_IND;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (buf[1] & (1 << 6)) /* VAMOS.ind */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->flags |= TRX_BI_F_SHADOW_IND;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TRX (RF channel) number */</span><br><span> bi->trx_num = buf[1] & 0x3f;</span><br><span> bi->flags |= TRX_BI_F_TRX_NUM;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24440">change 24440</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-bts/+/24440"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3e0bdf8c03273f66991aa1764029ab1dd3528d7e </div>
<div style="display:none"> Gerrit-Change-Number: 24440 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>