<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23268">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">direct_phy: Support submitting DATA.ind with len=0 to upper layers<br><br>Since recently (see Depends below), BTS side submits DATA.ind with len=0<br>to announce nothing was received on that UL block FN. This will allow<br>osmo-pcu track time more accurately, and use this information to quickly<br>find out if a UL block was expected as requested by RRBP or USF poll and<br>increment counters such as N3101 (finally being able to properly<br>implement timers such as T3619).<br><br>This patch does the same for direct phy feature, where the osmo-pcu<br>process receives the DATA.ind directly from the DSP.<br><br>Depends: osmo-bts.git Change-Id I343c7a721dab72411edbca816c8864926bc329fb<br><br>Related: OS#5033<br>Change-Id: I9a835e16ef0e5a68c003a93d1a33233aa43464ae<br>---<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>3 files changed, 43 insertions(+), 51 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/23268/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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 8f64863..c87edaf 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>@@ -195,6 +195,8 @@</span><br><span>        int rc = 0;</span><br><span>  struct gprs_rlcmac_bts *bts;</span><br><span>         struct pcu_l1_meas meas = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t *data;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t data_len;</span><br><span> </span><br><span>        DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n",</span><br><span>                get_value_string(lc15bts_l1sapi_names, data_ind->sapi),</span><br><span>@@ -202,14 +204,6 @@</span><br><span>            osmo_hexdump(data_ind->msgUnitParam.u8Buffer,</span><br><span>                          data_ind->msgUnitParam.u8Size));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /*</span><br><span style="color: hsl(0, 100%, 40%);">-       * TODO: Add proper bad frame handling here. This could be used</span><br><span style="color: hsl(0, 100%, 40%);">-  * to switch the used CS. Avoid a crash with the PCU right now</span><br><span style="color: hsl(0, 100%, 40%);">-   * feed "0 - 1" amount of data.</span><br><span style="color: hsl(0, 100%, 40%);">-        */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (data_ind->msgUnitParam.u8Size == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-              return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   bts = llist_first_entry_or_null(&the_pcu->bts_list, struct gprs_rlcmac_bts, list);</span><br><span> </span><br><span>        get_meas(&meas, &data_ind->measParam);</span><br><span>@@ -219,16 +213,19 @@</span><br><span>    switch (data_ind->sapi) {</span><br><span>         case GsmL1_Sapi_Pdtch:</span><br><span>       case GsmL1_Sapi_Pacch:</span><br><span style="color: hsl(0, 100%, 40%);">-          /* drop incomplete UL block */</span><br><span style="color: hsl(0, 100%, 40%);">-          if (data_ind->msgUnitParam.u8Buffer[0]</span><br><span style="color: hsl(0, 100%, 40%);">-                       != GsmL1_PdtchPlType_Full)</span><br><span style="color: hsl(0, 100%, 40%);">-                      break;</span><br><span>               /* PDTCH / PACCH frame handling */</span><br><span style="color: hsl(0, 100%, 40%);">-              rc = pcu_rx_data_ind_pdtch(bts, fl1h->trx_no, data_ind->u8Tn,</span><br><span style="color: hsl(0, 100%, 40%);">-                     data_ind->msgUnitParam.u8Buffer + 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                 data_ind->msgUnitParam.u8Size - 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                   data_ind->u32Fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                     &meas);</span><br><span style="color: hsl(120, 100%, 40%);">+           if (data_ind->msgUnitParam.u8Size != 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+              data_ind->msgUnitParam.u8Buffer[0] != GsmL1_PdtchPlType_Full) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        data = data_ind->msgUnitParam.u8Buffer + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                        data_len = data_ind->msgUnitParam.u8Size - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                      if (data_len == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                            data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+          } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+                  data_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span style="color: hsl(120, 100%, 40%);">+             pcu_rx_data_ind_pdtch(bts, fl1h->trx_no, data_ind->u8Tn, data,</span><br><span style="color: hsl(120, 100%, 40%);">+                                data_len, data_ind->u32Fn, &meas);</span><br><span>              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>diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c</span><br><span>index d81bc4f..5d2ce69 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>@@ -195,6 +195,8 @@</span><br><span>     int rc = 0;</span><br><span>  struct gprs_rlcmac_bts *bts;</span><br><span>         struct pcu_l1_meas meas = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t *data;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t data_len;</span><br><span> </span><br><span>        DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n",</span><br><span>                get_value_string(oc2gbts_l1sapi_names, data_ind->sapi),</span><br><span>@@ -202,14 +204,6 @@</span><br><span>            osmo_hexdump(data_ind->msgUnitParam.u8Buffer,</span><br><span>                          data_ind->msgUnitParam.u8Size));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /*</span><br><span style="color: hsl(0, 100%, 40%);">-       * TODO: Add proper bad frame handling here. This could be used</span><br><span style="color: hsl(0, 100%, 40%);">-  * to switch the used CS. Avoid a crash with the PCU right now</span><br><span style="color: hsl(0, 100%, 40%);">-   * feed "0 - 1" amount of data.</span><br><span style="color: hsl(0, 100%, 40%);">-        */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (data_ind->msgUnitParam.u8Size == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-              return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   bts = llist_first_entry_or_null(&the_pcu->bts_list, struct gprs_rlcmac_bts, list);</span><br><span> </span><br><span>        gsmtap_send(fl1h->gsmtap, data_ind->u16Arfcn | GSMTAP_ARFCN_F_UPLINK,</span><br><span>@@ -224,16 +218,19 @@</span><br><span>  switch (data_ind->sapi) {</span><br><span>         case GsmL1_Sapi_Pdtch:</span><br><span>       case GsmL1_Sapi_Pacch:</span><br><span style="color: hsl(0, 100%, 40%);">-          /* drop incomplete UL block */</span><br><span style="color: hsl(0, 100%, 40%);">-          if (data_ind->msgUnitParam.u8Buffer[0]</span><br><span style="color: hsl(0, 100%, 40%);">-                       != GsmL1_PdtchPlType_Full)</span><br><span style="color: hsl(0, 100%, 40%);">-                      break;</span><br><span>               /* PDTCH / PACCH frame handling */</span><br><span style="color: hsl(0, 100%, 40%);">-              pcu_rx_data_ind_pdtch(bts, fl1h->trx_no, data_ind->u8Tn,</span><br><span style="color: hsl(0, 100%, 40%);">-                  data_ind->msgUnitParam.u8Buffer + 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                 data_ind->msgUnitParam.u8Size - 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                   data_ind->u32Fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                     &meas);</span><br><span style="color: hsl(120, 100%, 40%);">+           if (data_ind->msgUnitParam.u8Size != 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+              data_ind->msgUnitParam.u8Buffer[0] != GsmL1_PdtchPlType_Full) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        data = data_ind->msgUnitParam.u8Buffer + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                        data_len = data_ind->msgUnitParam.u8Size - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                      if (data_len == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                            data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+          } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+                  data_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span style="color: hsl(120, 100%, 40%);">+             pcu_rx_data_ind_pdtch(bts, fl1h->trx_no, data_ind->u8Tn, data,</span><br><span style="color: hsl(120, 100%, 40%);">+                                data_len, data_ind->u32Fn, &meas);</span><br><span>              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>diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>index f9db0b8..4faccaa 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>@@ -177,6 +177,9 @@</span><br><span>     int rc = 0;</span><br><span>  struct gprs_rlcmac_bts *bts;</span><br><span>         struct pcu_l1_meas meas = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t *data;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t data_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span>      DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n",</span><br><span>                get_value_string(femtobts_l1sapi_names, data_ind->sapi),</span><br><span>@@ -187,14 +190,6 @@</span><br><span>   bts = llist_first_entry_or_null(&the_pcu->bts_list, struct gprs_rlcmac_bts, list);</span><br><span>    pcu_rx_block_time(bts, data_ind->u16Arfcn, data_ind->u32Fn, data_ind->u8Tn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       /*</span><br><span style="color: hsl(0, 100%, 40%);">-       * TODO: Add proper bad frame handling here. This could be used</span><br><span style="color: hsl(0, 100%, 40%);">-  * to switch the used CS. Avoid a crash with the PCU right now</span><br><span style="color: hsl(0, 100%, 40%);">-   * feed "0 - 1" amount of data.</span><br><span style="color: hsl(0, 100%, 40%);">-        */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (data_ind->msgUnitParam.u8Size == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-              return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   get_meas(&meas, &data_ind->measParam);</span><br><span>    bts_update_tbf_ta(bts, "PH-DATA", data_ind->u32Fn, fl1h->trx_no,</span><br><span>                       data_ind->u8Tn, sign_qta2ta(meas.bto), false);</span><br><span>@@ -202,16 +197,19 @@</span><br><span>  switch (data_ind->sapi) {</span><br><span>         case GsmL1_Sapi_Pdtch:</span><br><span>       case GsmL1_Sapi_Pacch:</span><br><span style="color: hsl(0, 100%, 40%);">-          /* drop incomplete UL block */</span><br><span style="color: hsl(0, 100%, 40%);">-          if (data_ind->msgUnitParam.u8Buffer[0]</span><br><span style="color: hsl(0, 100%, 40%);">-                       != GsmL1_PdtchPlType_Full)</span><br><span style="color: hsl(0, 100%, 40%);">-                      break;</span><br><span>               /* PDTCH / PACCH frame handling */</span><br><span style="color: hsl(0, 100%, 40%);">-              pcu_rx_data_ind_pdtch(bts, fl1h->trx_no, data_ind->u8Tn,</span><br><span style="color: hsl(0, 100%, 40%);">-                  data_ind->msgUnitParam.u8Buffer + 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                 data_ind->msgUnitParam.u8Size - 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                   data_ind->u32Fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                     &meas);</span><br><span style="color: hsl(120, 100%, 40%);">+           if (data_ind->msgUnitParam.u8Size != 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+              data_ind->msgUnitParam.u8Buffer[0] != GsmL1_PdtchPlType_Full) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        data = data_ind->msgUnitParam.u8Buffer + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                        data_len = data_ind->msgUnitParam.u8Size - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                      if (data_len == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                            data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+          } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+                  data_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span style="color: hsl(120, 100%, 40%);">+             pcu_rx_data_ind_pdtch(bts, fl1h->trx_no, data_ind->u8Tn, data,</span><br><span style="color: hsl(120, 100%, 40%);">+                                data_len, data_ind->u32Fn, &meas);</span><br><span>              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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23268">change 23268</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/+/23268"/><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: I9a835e16ef0e5a68c003a93d1a33233aa43464ae </div>
<div style="display:none"> Gerrit-Change-Number: 23268 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>