<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25714">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: report PDCH interference levels to L1SAP<br><br>Starting from [1], interference levels on PDCH timeslots are also<br>reported over the A-bis/RSL. They may be useful for the BSC to<br>determine whether dynamic PDCH timeslots might be better used for<br>new circuit switched connections, or whether alternative PDCH slots<br>should be allocated for interference reasons.<br><br> * Handle GSM_LCHAN_PDTCH in lchan_report_interf_meas().<br> * Rework pcu_tx_interf_ind() to accept 'struct gsm_bts_trx'.<br> * Call pcu_tx_interf_ind() from l1sap_interf_meas_report().<br><br>Regarding pcu_tx_interf_ind(), it's better to call this function<br>from the upper layers once, rather than calling it from various<br>places in the model specific code.<br><br>[1] I5b4d1da0920e788ac8063cc765fe5b0223c76758<br><br>Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc<br>Related: SYS#5313<br>---<br>M include/osmo-bts/pcu_if.h<br>M src/common/l1sap.c<br>M src/common/pcu_sock.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>4 files changed, 65 insertions(+), 71 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/25714/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h</span><br><span>index 12a8abc..bc30f34 100644</span><br><span>--- a/include/osmo-bts/pcu_if.h</span><br><span>+++ b/include/osmo-bts/pcu_if.h</span><br><span>@@ -19,8 +19,7 @@</span><br><span> int16_t qta, uint16_t ra, uint32_t fn, uint8_t is_11bit,</span><br><span> enum ph_burst_type burst_type, uint8_t sapi);</span><br><span> int pcu_tx_time_ind(uint32_t fn);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *pdch_interf);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn);</span><br><span> int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed);</span><br><span> int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len);</span><br><span> int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause);</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 5c58aff..2b539d7 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -629,6 +629,8 @@</span><br><span> l1sap_interf_meas_calc_avg(trx);</span><br><span> /* Report to the BSC over the A-bis/RSL */</span><br><span> rsl_tx_rf_res(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Report to the PCU over the PCUIF */</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_interf_ind(trx, bts->gsm_time.fn);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 03f1a05..f8a0f55 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -559,23 +559,31 @@</span><br><span> return pcu_sock_send(&bts_gsmnet, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *pdch_interf)</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn)</span><br><span> {</span><br><span> struct gsm_pcu_if_interf_ind *interf_ind;</span><br><span> struct gsm_pcu_if *pcu_prim;</span><br><span> struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg = pcu_msgb_alloc(PCU_IF_MSG_INTERF_IND, bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = pcu_msgb_alloc(PCU_IF_MSG_INTERF_IND, trx->bts->nr);</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span> pcu_prim = (struct gsm_pcu_if *) msg->data;</span><br><span> interf_ind = &pcu_prim->u.interf_ind;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- interf_ind->trx_nr = trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ interf_ind->trx_nr = trx->nr;</span><br><span> interf_ind->fn = fn;</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&interf_ind->interf[0], &pdch_interf[0],</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(interf_ind->interf));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan = &ts->lchan[0];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts_pchan(ts) != GSM_PCHAN_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ interf_ind->interf[tn] = -1 * lchan->meas.interf_meas_avg_dbm;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return pcu_sock_send(&bts_gsmnet, msg);</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 0a907fb..6136b14 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>@@ -54,84 +54,69 @@</span><br><span> #define SCHED_FH_PARAMS_VALS(ts) \</span><br><span> (ts)->hopping.hsn, (ts)->hopping.maio, (ts)->hopping.arfcn_num</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ts_report_interf_meas(const struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lchan_report_interf_meas(const struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span> const struct l1sched_ts *l1ts = ts->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int ln;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum trx_chan_type dcch, acch;</span><br><span style="color: hsl(120, 100%, 40%);">+ int interf_avg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm_lchan *lchan = &ts->lchan[ln];</span><br><span style="color: hsl(0, 100%, 40%);">- enum trx_chan_type dcch, acch;</span><br><span style="color: hsl(0, 100%, 40%);">- int interf_avg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* We're not interested in active channels */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->state == LCHAN_S_ACTIVE)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span style="color: hsl(0, 100%, 40%);">- ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {</span><br><span style="color: hsl(0, 100%, 40%);">- dcch = TRXC_SDCCH4_0 + ln;</span><br><span style="color: hsl(0, 100%, 40%);">- acch = TRXC_SACCH4_0 + ln;</span><br><span style="color: hsl(0, 100%, 40%);">- } else { /* SDCCH/8 otherwise */</span><br><span style="color: hsl(0, 100%, 40%);">- dcch = TRXC_SDCCH8_0 + ln;</span><br><span style="color: hsl(0, 100%, 40%);">- acch = TRXC_SACCH8_0 + ln;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- dcch = TRXC_TCHF;</span><br><span style="color: hsl(0, 100%, 40%);">- acch = TRXC_SACCHTF;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- dcch = TRXC_TCHH_0 + ln;</span><br><span style="color: hsl(0, 100%, 40%);">- acch = TRXC_SACCHTH_0 + ln;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Skip other lchan types */</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(dcch < ARRAY_SIZE(l1ts->chan_state));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(acch < ARRAY_SIZE(l1ts->chan_state));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- interf_avg = (l1ts->chan_state[dcch].meas.interf_avg +</span><br><span style="color: hsl(0, 100%, 40%);">- l1ts->chan_state[acch].meas.interf_avg) / 2;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_interf_meas_push((struct gsm_lchan *) lchan, interf_avg);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We're not interested in active CS channels */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->state == LCHAN_S_ACTIVE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->type != GSM_LCHAN_PDTCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ dcch = TRXC_SDCCH4_0 + lchan->nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ acch = TRXC_SACCH4_0 + lchan->nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else { /* SDCCH/8 otherwise */</span><br><span style="color: hsl(120, 100%, 40%);">+ dcch = TRXC_SDCCH8_0 + lchan->nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ acch = TRXC_SACCH8_0 + lchan->nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ dcch = TRXC_TCHF;</span><br><span style="color: hsl(120, 100%, 40%);">+ acch = TRXC_SACCHTF;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ dcch = TRXC_TCHH_0 + lchan->nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ acch = TRXC_SACCHTH_0 + lchan->nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_PDTCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We use idle TDMA frames on PDCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ dcch = TRXC_IDLE;</span><br><span style="color: hsl(120, 100%, 40%);">+ acch = TRXC_IDLE;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Skip other lchan types */</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%);">+ OSMO_ASSERT(dcch < ARRAY_SIZE(l1ts->chan_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(acch < ARRAY_SIZE(l1ts->chan_state));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ interf_avg = (l1ts->chan_state[dcch].meas.interf_avg +</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->chan_state[acch].meas.interf_avg) / 2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_interf_meas_push((struct gsm_lchan *) lchan, interf_avg);</span><br><span> }</span><br><span> </span><br><span> static void bts_report_interf_meas(const struct gsm_bts *bts,</span><br><span> const uint32_t fn)</span><br><span> {</span><br><span> const struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tn, ln;</span><br><span> </span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t pdch_interf[8] = { 0 };</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int tn, pdch_num = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {</span><br><span> const struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(0, 100%, 40%);">- const struct l1sched_ts *l1ts = ts->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct l1sched_chan_state *l1cs;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* PS interference reports for the PCU */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts_pchan(ts) == GSM_PCHAN_PDCH) {</span><br><span style="color: hsl(0, 100%, 40%);">- l1cs = &l1ts->chan_state[TRXC_IDLE];</span><br><span style="color: hsl(0, 100%, 40%);">- /* Interference value is encoded as -x dBm */</span><br><span style="color: hsl(0, 100%, 40%);">- pdch_interf[tn] = -1 * l1cs->meas.interf_avg;</span><br><span style="color: hsl(0, 100%, 40%);">- pdch_num++;</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* CS interference reports for the BSC */</span><br><span style="color: hsl(0, 100%, 40%);">- ts_report_interf_meas(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_report_interf_meas(&ts->lchan[ln]);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Report interference levels on PDCH to the PCU */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdch_num > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_interf_ind(bts->nr, trx->nr, fn, pdch_interf);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25714">change 25714</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/+/25714"/><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: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc </div>
<div style="display:none"> Gerrit-Change-Number: 25714 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>