<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16080">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcuif_proto.h: extend RACH.ind with TRX and timeslot number fields<br><br>Since there can be multiple PDCH channels configured on different<br>timeslots, different TRXes, and BTSes, the PTCCH/U handling code<br>in OsmoPCU needs to know the exact origin of a given RACH.ind.<br><br>Otherwise, it is not known which subscriber originated a given<br>PTCCH/U indication, and hence it is impossible to send PTCCH/D<br>Timing Advance notification properly.<br><br>Fortunately, we can extend the RACH.ind message without even<br>bumping the protocol version, because every single PDU has a<br>fixed size defined by the largest message - INFO.ind. In case<br>if the actual message payload is smaller, the rest is filled<br>with a constant padding byte (0x00).<br><br>Older versions of OsmoPCU will consider the new fields as padding,<br>while the messages from older OsmoBTS versions will always have<br>both fields set to 0x00. Since C0/TS0 cannot be configured to<br>PDCH, this can be easily detected on the other end.<br><br>Change-Id: Iff38934a108b6b1cd298669834263a7d5296c3f6<br>Related: OS#4102, OS#1545<br>---<br>M include/osmo-bts/pcu_if.h<br>M include/osmo-bts/pcuif_proto.h<br>M src/common/l1sap.c<br>M src/common/pcu_sock.c<br>4 files changed, 15 insertions(+), 7 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 f34e0cd..1475a94 100644</span><br><span>--- a/include/osmo-bts/pcu_if.h</span><br><span>+++ b/include/osmo-bts/pcu_if.h</span><br><span>@@ -11,8 +11,9 @@</span><br><span> int pcu_tx_data_ind(struct gsm_bts_trx_ts *ts, uint8_t is_ptcch, uint32_t fn,</span><br><span> uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len,</span><br><span> int8_t rssi, uint16_t ber10k, int16_t bto, int16_t lqual);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_tx_rach_ind(struct gsm_bts *bts, int16_t qta, uint16_t ra, uint32_t fn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t is_11bit, enum ph_burst_type burst_type, uint8_t sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_rach_ind(uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t qta, uint16_t ra, uint32_t fn, uint8_t is_11bit,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum ph_burst_type burst_type, uint8_t sapi);</span><br><span> int pcu_tx_time_ind(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>diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h</span><br><span>index 2d24c43..e977914 100644</span><br><span>--- a/include/osmo-bts/pcuif_proto.h</span><br><span>+++ b/include/osmo-bts/pcuif_proto.h</span><br><span>@@ -108,6 +108,8 @@</span><br><span> uint16_t arfcn;</span><br><span> uint8_t is_11bit;</span><br><span> uint8_t burst_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ts_nr;</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> struct gsm_pcu_if_info_trx {</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 7bf0b09..e640ce9 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1403,7 +1403,8 @@</span><br><span> rach_ind->acc_delay_256bits);</span><br><span> </span><br><span> /* QTA: Timing Advance in units of 1/4 of a symbol */</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_rach_ind(trx->bts, rach_ind->acc_delay_256bits >> 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_rach_ind(trx->bts->nr, trx->nr, rach_ind->chan_nr & 0x07,</span><br><span style="color: hsl(120, 100%, 40%);">+ rach_ind->acc_delay_256bits >> 6,</span><br><span> rach_ind->ra, rach_ind->fn, rach_ind->is_11bit,</span><br><span> rach_ind->burst_type, PCU_IF_SAPI_PTCCH);</span><br><span> return 0;</span><br><span>@@ -1466,7 +1467,8 @@</span><br><span> rach_ind->acc_delay, rach_ind->ra);</span><br><span> </span><br><span> /* QTA: Timing Advance in units of 1/4 of a symbol */</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_rach_ind(bts, rach_ind->acc_delay_256bits >> 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_rach_ind(bts->nr, trx->nr, rach_ind->chan_nr & 0x07,</span><br><span style="color: hsl(120, 100%, 40%);">+ rach_ind->acc_delay_256bits >> 6,</span><br><span> rach_ind->ra, rach_ind->fn, rach_ind->is_11bit,</span><br><span> rach_ind->burst_type, PCU_IF_SAPI_RACH);</span><br><span> return 0;</span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 9fc1d4d..579f8cc 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -379,8 +379,9 @@</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_rach_ind(struct gsm_bts *bts, int16_t qta, uint16_t ra, uint32_t fn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t is_11bit, enum ph_burst_type burst_type, uint8_t sapi)</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_rach_ind(uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t qta, uint16_t ra, uint32_t fn, uint8_t is_11bit,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum ph_burst_type burst_type, uint8_t sapi)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct gsm_pcu_if *pcu_prim;</span><br><span>@@ -389,7 +390,7 @@</span><br><span> LOGP(DPCU, LOGL_INFO, "Sending RACH indication: qta=%d, ra=%d, "</span><br><span> "fn=%d\n", qta, ra, fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg = pcu_msgb_alloc(PCU_IF_MSG_RACH_IND, bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = pcu_msgb_alloc(PCU_IF_MSG_RACH_IND, 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>@@ -401,6 +402,8 @@</span><br><span> rach_ind->fn = fn;</span><br><span> rach_ind->is_11bit = is_11bit;</span><br><span> rach_ind->burst_type = burst_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ rach_ind->trx_nr = trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ rach_ind->ts_nr = ts_nr;</span><br><span> </span><br><span> return pcu_sock_send(&bts_gsmnet, msg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16080">change 16080</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/+/16080"/><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: Iff38934a108b6b1cd298669834263a7d5296c3f6 </div>
<div style="display:none"> Gerrit-Change-Number: 16080 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>