<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/22541">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu_sock: send SI1, SI3 and SI13 via PCUIF<br><br>This patch PCUIF extends the SAPI 4 that is used<br>to transfer SI13 only, so that it can transfer SI1 and SI3 as well.<br><br>The system information SI1, SI3 and SI13 is needed by the NACC RIM<br>application which runs inside osmo-pcu.<br><br>Depends: osmo-pcu I5138ab183793e7eee4dc494318d984e9f1f56932<br>Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a<br>Related: SYS#5103<br>---<br>M include/osmo-bts/pcu_if.h<br>M src/common/pcu_sock.c<br>M src/common/rsl.c<br>3 files changed, 77 insertions(+), 16 deletions(-)<br><br></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 1475a94..add37f8 100644</span><br><span>--- a/include/osmo-bts/pcu_if.h</span><br><span>+++ b/include/osmo-bts/pcu_if.h</span><br><span>@@ -4,7 +4,7 @@</span><br><span> extern int pcu_direct;</span><br><span> </span><br><span> int pcu_tx_info_ind(void);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_tx_si13(const struct gsm_bts *bts, bool enable);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_si(const struct gsm_bts *bts, enum osmo_sysinfo_type si_type, bool enable);</span><br><span> int pcu_tx_app_info_req(struct gsm_bts *bts, uint8_t app_type, uint8_t len, const uint8_t *app_data);</span><br><span> int pcu_tx_rts_req(struct gsm_bts_trx_ts *ts, uint8_t is_ptcch, uint32_t fn,</span><br><span> uint16_t arfcn, uint8_t block_nr);</span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 0466698..ffa8e77 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -725,17 +725,64 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_tx_si13(const struct gsm_bts *bts, bool enable)</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_si(const struct gsm_bts *bts, enum osmo_sysinfo_type si_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enable)</span><br><span> {</span><br><span> /* the SI is per-BTS so it doesn't matter which TRX we use */</span><br><span> struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* The low-level data like FN, ARFCN etc will be ignored but we have to set lqual high enough to bypass</span><br><span style="color: hsl(0, 100%, 40%);">- the check at lower levels */</span><br><span style="color: hsl(0, 100%, 40%);">- int rc = pcu_tx_data_ind(&trx->ts[0], PCU_IF_SAPI_BCCH, 0, 0, 0, GSM_BTS_SI(bts, SYSINFO_TYPE_13),</span><br><span style="color: hsl(0, 100%, 40%);">- enable ? GSM_MACBLOCK_LEN : 0, 0, 0, 0, INT16_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t si_buf[GSM_MACBLOCK_LEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (enable) {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(si_buf, GSM_BTS_SI(bts, si_type), GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ len = GSM_MACBLOCK_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_DEBUG, "Updating SI%s to PCU: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_sitype_strs, si_type),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_nospc(si_buf, GSM_MACBLOCK_LEN));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ si_buf[0] = si_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Note: SI13 is the only system information type that is revked</span><br><span style="color: hsl(120, 100%, 40%);">+ * by just sending a completely empty message. This is due to</span><br><span style="color: hsl(120, 100%, 40%);">+ * historical reasons */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (si_type != SYSINFO_TYPE_13)</span><br><span style="color: hsl(120, 100%, 40%);">+ len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_DEBUG, "Revoking SI%s from PCU\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_sitype_strs, si_buf[0]));</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%);">+ /* The low-level data like FN, ARFCN etc will be ignored but we have to</span><br><span style="color: hsl(120, 100%, 40%);">+ * set lqual high enough to bypass the check at lower levels */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcu_tx_data_ind(&trx->ts[0], PCU_IF_SAPI_BCCH, 0, 0, 0, si_buf, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, 0, 0, INT16_MAX);</span><br><span> if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DPCU, LOGL_NOTICE, "Failed to send SI13 to PCU: %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_NOTICE, "Failed to send SI%s to PCU: rc=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_sitype_strs, si_type), rc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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%);">+static int pcu_tx_si_all(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_sysinfo_type si_types[3] =</span><br><span style="color: hsl(120, 100%, 40%);">+ { SYSINFO_TYPE_1, SYSINFO_TYPE_3, SYSINFO_TYPE_13 };</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(si_types); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (GSM_BTS_HAS_SI(bts, si_types[i])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcu_tx_si(bts, si_types[i], true);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "SI%s is not available on PCU connection\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_sitype_strs, si_types[i]));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>@@ -743,6 +790,8 @@</span><br><span> static int pcu_rx_txt_ind(struct gsm_bts *bts,</span><br><span> struct gsm_pcu_if_txt_ind *txt)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (txt->type) {</span><br><span> case PCU_VERSION:</span><br><span> LOGP(DPCU, LOGL_INFO, "OsmoPCU version %s connected\n",</span><br><span>@@ -754,10 +803,10 @@</span><br><span> regenerate_si3_restoctets(bts);</span><br><span> regenerate_si4_restoctets(bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_13))</span><br><span style="color: hsl(0, 100%, 40%);">- return pcu_tx_si13(bts, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcu_tx_si_all(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DPCU, LOGL_INFO, "SI13 is not available on PCU connection\n");</span><br><span> break;</span><br><span> case PCU_OML_ALERT:</span><br><span> oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_INDETERMINATE, OSMO_EVT_EXT_ALARM,</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 01a0ab4..bde53a1 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -379,6 +379,7 @@</span><br><span> /* patch out GPRS indicator from binary if PCU is not connected; will be enabled</span><br><span> * after PCU connects */</span><br><span> regenerate_si3_restoctets(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_si(trx->bts, SYSINFO_TYPE_3, true);</span><br><span> } else if (SYSINFO_TYPE_4 == osmo_si) {</span><br><span> /* decode original SI4 Rest Octets as sent by BSC */</span><br><span> const uint8_t *si4 = (uint8_t *) GSM_BTS_SI(bts, osmo_si);</span><br><span>@@ -391,11 +392,12 @@</span><br><span> * enabled after PCU connects */</span><br><span> regenerate_si4_restoctets(bts);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (SYSINFO_TYPE_13 == osmo_si) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_si(trx->bts, SYSINFO_TYPE_13, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (SYSINFO_TYPE_1 == osmo_si) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_si(trx->bts, SYSINFO_TYPE_1, true);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (SYSINFO_TYPE_13 == osmo_si)</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_si13(trx->bts, true);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> } else if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) {</span><br><span> uint16_t len = TLVP_LEN(&tp, RSL_IE_L3_INFO);</span><br><span> if (len > sizeof(sysinfo_buf_t))</span><br><span>@@ -410,10 +412,20 @@</span><br><span> bts->si_valid &= ~(1 << osmo_si);</span><br><span> LOGP(DRSL, LOGL_INFO, " RX RSL Disabling BCCH INFO (SI%s)\n",</span><br><span> get_value_string(osmo_sitype_strs, osmo_si));</span><br><span style="color: hsl(0, 100%, 40%);">- if (SYSINFO_TYPE_13 == osmo_si)</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_si13(trx->bts, false);</span><br><span style="color: hsl(0, 100%, 40%);">- if (SYSINFO_TYPE_3 == osmo_si)</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (osmo_si) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_13:</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_si(trx->bts, SYSINFO_TYPE_13, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_3:</span><br><span> memset(&bts->si3_ro_decoded, 0, sizeof(bts->si3_ro_decoded));</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_si(trx->bts, SYSINFO_TYPE_3, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_si(trx->bts, SYSINFO_TYPE_1, false);</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%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> osmo_signal_dispatch(SS_GLOBAL, S_NEW_SYSINFO, bts);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/22541">change 22541</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/+/22541"/><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: Ib7aeb41e634ad6fcab3766a4667b0267c749436a </div>
<div style="display:none"> Gerrit-Change-Number: 22541 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@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>