<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16085">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PTCCH: properly handle RACH.ind for PCU_IF_SAPI_PTCCH<br><br>Change-Id: I482d60a46b9d253dfe0b16140eac9fea6420b30c<br>Related: OS#1545<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/osmo-bts-litecell15/lc15_l1_if.c<br>M src/osmo-bts-oc2g/oc2g_l1_if.c<br>M src/osmo-bts-sysmo/sysmo_l1_if.c<br>M src/pcu_l1_if.cpp<br>M src/pcu_l1_if.h<br>7 files changed, 104 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 24666af..c8b6375 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -842,6 +842,53 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* PTCCH/U sub-slot / frame-number mapping (see 3GPP TS 45.002, table 6) */</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t ptcch_slot_map[PTCCH_TAI_NUM] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 12, 38, 64, 90,</span><br><span style="color: hsl(120, 100%, 40%);">+ 116, 142, 168, 194,</span><br><span style="color: hsl(120, 100%, 40%);">+ 220, 246, 272, 298,</span><br><span style="color: hsl(120, 100%, 40%);">+ 324, 350, 376, 402,</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%);">+int BTS::rcv_ptcch_rach(uint8_t trx_nr, uint8_t ts_nr, uint32_t fn, int16_t qta)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_bts *bts = bts_data();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_pdch *pdch;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn416 = fn % 416;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ss;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Prevent buffer overflow */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_nr >= ARRAY_SIZE(bts->trx) || ts_nr >= 8) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_ERROR, "Malformed RACH.ind message "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(TRX=%u TS=%u FN=%u)\n", trx_nr, ts_nr, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</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%);">+ /* Make sure PDCH time-slot is enabled */</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch = &bts->trx[trx_nr].pdch[ts_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pdch->m_is_enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_NOTICE, "Rx PTCCH RACH.ind for inactive PDCH "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(TRX=%u TS=%u FN=%u)\n", trx_nr, ts_nr, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EAGAIN;</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%);">+ /* Convert TDMA frame-number to PTCCH/U sub-slot number */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ss = 0; ss < PTCCH_TAI_NUM; ss++)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ptcch_slot_map[ss] == fn416)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ss == PTCCH_TAI_NUM) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_ERROR, "Failed to map PTCCH/U sub-slot for fn=%u\n", fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENODEV;</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%);">+ /* Apply the new Timing Advance value */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_INFO, "Continuous Timing Advance update "</span><br><span style="color: hsl(120, 100%, 40%);">+ "for TAI %u, new TA is %u\n", ss, qta2ta(qta));</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch->update_ta(ss, qta2ta(qta));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi)</span><br><span> {</span><br><span> int plen;</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index c2cc316..54a29cb 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -301,6 +301,7 @@</span><br><span> uint32_t rfn_to_fn(int32_t rfn);</span><br><span> int rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, bool is_11bit,</span><br><span> enum ph_burst_type burst_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rcv_ptcch_rach(uint8_t trx_nr, uint8_t ts_nr, uint32_t fn, int16_t qta);</span><br><span> </span><br><span> void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c</span><br><span>index 670263f..24eb0fa 100644</span><br><span>--- a/src/osmo-bts-litecell15/lc15_l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/lc15_l1_if.c</span><br><span>@@ -223,10 +223,6 @@</span><br><span> data_ind->u32Fn,</span><br><span> &meas);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(0, 100%, 40%);">- // FIXME</span><br><span style="color: hsl(0, 100%, 40%);">- rc = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> default:</span><br><span> LOGP(DL1IF, LOGL_NOTICE, "Rx PH-DATA.ind for unknown L1 SAPI %s\n",</span><br><span> get_value_string(lc15bts_l1sapi_names, data_ind->sapi));</span><br><span>@@ -251,8 +247,21 @@</span><br><span> return 0;</span><br><span> </span><br><span> DEBUGP(DL1IF, "Rx PH-RA.ind");</span><br><span style="color: hsl(0, 100%, 40%);">- bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,</span><br><span style="color: hsl(0, 100%, 40%);">- qta2ta(ra_ind->measParam.i16BurstTiming), true);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ra_ind->sapi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GsmL1_Sapi_Pdtch:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ qta2ta(ra_ind->measParam.i16BurstTiming), true);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_rx_rach_ind_pdtch(fl1h->trx_no, ra_ind->u8Tn, ra_ind->u32Fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ ra_ind->measParam.i16BurstTiming);</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%);">+ LOGP(DL1IF, LOGL_NOTICE, "Rx PH-RA.ind for unknown L1 SAPI %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(lc15bts_l1sapi_names, ra_ind->sapi));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c</span><br><span>index a02e962..11fecba 100644</span><br><span>--- a/src/osmo-bts-oc2g/oc2g_l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/oc2g_l1_if.c</span><br><span>@@ -229,9 +229,6 @@</span><br><span> data_ind->u32Fn,</span><br><span> &meas);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(0, 100%, 40%);">- // FIXME</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> default:</span><br><span> LOGP(DL1IF, LOGL_NOTICE, "Rx PH-DATA.ind for unknown L1 SAPI %s\n",</span><br><span> get_value_string(oc2gbts_l1sapi_names, data_ind->sapi));</span><br><span>@@ -250,8 +247,20 @@</span><br><span> </span><br><span> LOGP(DL1IF, LOGL_DEBUG, "PH-RA-IND L1 qta=%d\n", ra_ind->measParam.i16BurstTiming);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,</span><br><span style="color: hsl(0, 100%, 40%);">- qta2ta(ra_ind->measParam.i16BurstTiming), true);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ra_ind->sapi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GsmL1_Sapi_Pdtch:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ qta2ta(ra_ind->measParam.i16BurstTiming), true);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_rx_rach_ind_pdtch(fl1h->trx_no, ra_ind->u8Tn, ra_ind->u32Fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ ra_ind->measParam.i16BurstTiming);</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%);">+ LOGP(DL1IF, LOGL_NOTICE, "Rx PH-RA.ind for unknown L1 SAPI %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(oc2gbts_l1sapi_names, ra_ind->sapi));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>index 9b310cc..751629c 100644</span><br><span>--- a/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>@@ -208,10 +208,6 @@</span><br><span> data_ind->u32Fn,</span><br><span> &meas);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(0, 100%, 40%);">- // FIXME</span><br><span style="color: hsl(0, 100%, 40%);">- rc = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> default:</span><br><span> LOGP(DL1IF, LOGL_NOTICE, "Rx PH-DATA.ind for unknown L1 SAPI %s\n",</span><br><span> get_value_string(femtobts_l1sapi_names, data_ind->sapi));</span><br><span>@@ -240,8 +236,21 @@</span><br><span> return 0;</span><br><span> </span><br><span> DEBUGP(DL1IF, "Rx PH-RA.ind");</span><br><span style="color: hsl(0, 100%, 40%);">- bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,</span><br><span style="color: hsl(0, 100%, 40%);">- qta2ta(ra_ind->measParam.i16BurstTiming), true);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ra_ind->sapi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GsmL1_Sapi_Pdtch:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ qta2ta(ra_ind->measParam.i16BurstTiming), true);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_rx_rach_ind_pdtch(fl1h->trx_no, ra_ind->u8Tn, ra_ind->u32Fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ ra_ind->measParam.i16BurstTiming);</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%);">+ LOGP(DL1IF, LOGL_NOTICE, "Rx PH-RA.ind for unknown L1 SAPI %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(femtobts_l1sapi_names, ra_ind->sapi));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 9c7724c..5e22c5c 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -405,6 +405,12 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* C -> C++ adapter for direct DSP access code (e.g. osmo-bts-sysmo) */</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C" int pcu_rx_rach_ind_pdtch(uint8_t trx_nr, uint8_t ts_nr, uint32_t fn, int16_t qta)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return BTS::main_bts()->rcv_ptcch_rach(trx_nr, ts_nr, fn, qta);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int pcu_rx_rach_ind(struct gsm_pcu_if_rach_ind *rach_ind)</span><br><span> {</span><br><span> int rc = 0;</span><br><span>@@ -421,6 +427,11 @@</span><br><span> rach_ind->qta, rach_ind->is_11bit,</span><br><span> (ph_burst_type)rach_ind->burst_type);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case PCU_IF_SAPI_PTCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = BTS::main_bts()->rcv_ptcch_rach(</span><br><span style="color: hsl(120, 100%, 40%);">+ rach_ind->trx_nr, rach_ind->ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ rach_ind->fn, rach_ind->qta);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> LOGP(DL1IF, LOGL_ERROR, "Received PCU rach request with "</span><br><span> "unsupported sapi %d\n", rach_ind->sapi);</span><br><span>diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h</span><br><span>index 888ad28..a77a6c8 100644</span><br><span>--- a/src/pcu_l1_if.h</span><br><span>+++ b/src/pcu_l1_if.h</span><br><span>@@ -178,6 +178,7 @@</span><br><span> int pcu_rx_rts_req_ptcch(uint8_t trx, uint8_t ts,</span><br><span> uint32_t fn, uint8_t block_nr);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_rx_rach_ind_pdtch(uint8_t trx_nr, uint8_t ts_nr, uint32_t fn, int16_t qta);</span><br><span> int pcu_rx_data_ind_pdtch(uint8_t trx, uint8_t ts, uint8_t *data,</span><br><span> uint8_t len, uint32_t fn, struct pcu_l1_meas *meas);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16085">change 16085</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-pcu/+/16085"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I482d60a46b9d253dfe0b16140eac9fea6420b30c </div>
<div style="display:none"> Gerrit-Change-Number: 16085 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </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>