<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24718">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: report PDCH interference levels to the PCU<br><br>The PDCH multiframe contains 48 data slots, 2 PTCCH slots, and<br>2 IDLE slots. The later two can be used for the interference<br>measurements, since the UEs shall not transmit on them.<br><br>bts_report_interf_meas() is called every 104 TDMA frames, what<br>corresponds to 2 PDCH multiframe periods. Report interference<br>levels on PDCH timeslots from this function.<br><br>Change-Id: I56f83db5264c246ec1b4b8a973105a4fc09931fb<br>Related: SYS#5313, OS#1569<br>---<br>M include/osmo-bts/pcu_if.h<br>M include/osmo-bts/pcuif_proto.h<br>M src/common/pcu_sock.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>4 files changed, 65 insertions(+), 7 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/18/24718/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 add37f8..6ef8dc5 100644</span><br><span>--- a/include/osmo-bts/pcu_if.h</span><br><span>+++ b/include/osmo-bts/pcu_if.h</span><br><span>@@ -15,6 +15,8 @@</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(120, 100%, 40%);">+int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *pdch_interf);</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/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h</span><br><span>index 8f72602..38ca4b6 100644</span><br><span>--- a/include/osmo-bts/pcuif_proto.h</span><br><span>+++ b/include/osmo-bts/pcuif_proto.h</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */</span><br><span> #define PCU_IF_MSG_ACT_REQ 0x40 /* activate/deactivate PDCH */</span><br><span> #define PCU_IF_MSG_TIME_IND 0x52 /* GSM time indication */</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCU_IF_MSG_INTERF_IND 0x53 /* interference report */</span><br><span> #define PCU_IF_MSG_PAG_REQ 0x60 /* paging request */</span><br><span> #define PCU_IF_MSG_TXT_IND 0x70 /* Text indication for BTS */</span><br><span> </span><br><span>@@ -208,6 +209,14 @@</span><br><span> uint8_t cause;</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Interference measurements on PDCH timeslots */</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_pcu_if_interf_ind {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t spare[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t interf[8];</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gsm_pcu_if {</span><br><span> /* context based information */</span><br><span> uint8_t msg_type; /* message type */</span><br><span>@@ -228,6 +237,7 @@</span><br><span> struct gsm_pcu_if_time_ind time_ind;</span><br><span> struct gsm_pcu_if_pag_req pag_req;</span><br><span> struct gsm_pcu_if_app_info_req app_info_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_pcu_if_interf_ind interf_ind;</span><br><span> } u;</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 3a73570..5a04bf0 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -560,6 +560,27 @@</span><br><span> return pcu_sock_send(&bts_gsmnet, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *pdch_interf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_pcu_if_interf_ind *interf_ind;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_pcu_if *pcu_prim;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = pcu_msgb_alloc(PCU_IF_MSG_INTERF_IND, bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_prim = (struct gsm_pcu_if *) msg->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ interf_ind = &pcu_prim->u.interf_ind;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ interf_ind->trx_nr = trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ interf_ind->fn = fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&interf_ind->interf[0], &pdch_interf[0],</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(interf_ind->interf));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return pcu_sock_send(&bts_gsmnet, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed)</span><br><span> {</span><br><span> struct pcu_sock_state *state = bts_gsmnet.pcu_state;</span><br><span>@@ -914,7 +935,8 @@</span><br><span> struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data;</span><br><span> </span><br><span> if (!state) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND &&</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_prim->msg_type != PCU_IF_MSG_INTERF_IND)</span><br><span> LOGP(DPCU, LOGL_INFO, "PCU socket not created, "</span><br><span> "dropping message\n");</span><br><span> msgb_free(msg);</span><br><span>@@ -922,7 +944,8 @@</span><br><span> }</span><br><span> conn_bfd = &state->conn_bfd;</span><br><span> if (conn_bfd->fd <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND &&</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_prim->msg_type != PCU_IF_MSG_INTERF_IND)</span><br><span> LOGP(DPCU, LOGL_NOTICE, "PCU socket not connected, "</span><br><span> "dropping message\n");</span><br><span> msgb_free(msg);</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 97c5ff3..ef50e8d 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>@@ -45,6 +45,7 @@</span><br><span> #include <osmo-bts/l1sap.h></span><br><span> #include <osmo-bts/scheduler.h></span><br><span> #include <osmo-bts/scheduler_backend.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/pcu_if.h></span><br><span> </span><br><span> #include "l1_if.h"</span><br><span> #include "trx_if.h"</span><br><span>@@ -101,14 +102,36 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void bts_report_interf_meas(const struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bts_report_interf_meas(const struct gsm_bts *bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint32_t fn)</span><br><span> {</span><br><span> const struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int tn;</span><br><span> </span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++)</span><br><span style="color: hsl(0, 100%, 40%);">- ts_report_interf_meas(&trx->ts[tn]);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t pdch_interf[8] = { 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int tn, pdch_num = 0;</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 l1sched_ts *l1ts = ts->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct l1sched_chan_state *l1cs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* PS interference reports for the PCU */</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%);">+ l1cs = &l1ts->chan_state[TRXC_IDLE];</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Interference value is encoded as -x dBm */</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch_interf[tn] = -1 * l1cs->meas.interf_avg;</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch_num++;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* CS interference reports for the BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_report_interf_meas(ts);</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%);">+ /* Report interference levels on PDCH to the PCU */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdch_num > 0)</span><br><span style="color: hsl(120, 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>@@ -243,7 +266,7 @@</span><br><span> </span><br><span> /* Report interference measurements */</span><br><span> if (fn % 104 == 0) /* SACCH period */</span><br><span style="color: hsl(0, 100%, 40%);">- bts_report_interf_meas(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_report_interf_meas(bts, fn);</span><br><span> </span><br><span> /* send time indication */</span><br><span> l1if_mph_time_ind(bts, fn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24718">change 24718</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/+/24718"/><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: I56f83db5264c246ec1b4b8a973105a4fc09931fb </div>
<div style="display:none"> Gerrit-Change-Number: 24718 </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>