Adding TA estimation at gNB PHY for TA updates

cmake_targets/CMakeLists.txt

@@ -1336,6 +1336,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/filt16a_32.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_adjust_sync_gNB.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
   #${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c

openair1/PHY/NR_ESTIMATION/nr_adjust_sync_gNB.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/NR_ESTIMATION/nr_adjust_sync_gNB.c
+* \brief TA estimation for TA updates
+* \author Ahmed Hussein
+* \date 2019
+* \version 0.1
+* \company Fraunhofer IIS
+* \email: ahmed.hussein@iis.fraunhofer.de
+* \note
+* \warning
+*/
+
+#include "PHY/types.h"
+#include "PHY/defs_gNB.h"
+#include "PHY/phy_extern.h"
+#include "nr_ul_estimation.h"
+
+int nr_est_timing_advance_pusch(PHY_VARS_gNB* gNB, int UE_id)
+{
+  int temp, i, aa, max_pos = 0, max_val = 0;
+  short Re, Im;
+  uint8_t cyclic_shift = 0;
+  
+  NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
+  NR_gNB_PUSCH *gNB_pusch_vars   = gNB->pusch_vars[UE_id];
+  int32_t **ul_ch_estimates_time = gNB_pusch_vars->ul_ch_estimates_time;
+  
+  int sync_pos = (frame_parms->ofdm_symbol_size - cyclic_shift*frame_parms->ofdm_symbol_size/12) % (frame_parms->ofdm_symbol_size);
+
+  for (i = 0; i < frame_parms->ofdm_symbol_size; i++) {
+    temp = 0;
+
+    for (aa = 0; aa < frame_parms->nb_antennas_rx; aa++) {
+      Re = ((int16_t*)ul_ch_estimates_time[aa])[(i<<1)];
+      Im = ((int16_t*)ul_ch_estimates_time[aa])[1+(i<<1)];
+      temp += (Re*Re/2) + (Im*Im/2);      
+    }
+
+    if (temp > max_val) {
+      max_pos = i;
+      max_val = temp;
+    }
+  }
+
+  if (max_pos > frame_parms->ofdm_symbol_size/2)
+    max_pos = max_pos - frame_parms->ofdm_symbol_size;
+
+
+  return max_pos - sync_pos;
+}
+

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -44,7 +44,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
   int16_t ch[2],*pil,*rxF,*ul_ch,*fl,*fm,*fr,*fml,*fmr,*fmm;
   int ch_offset,symbol_offset, length_dmrs, UE_id = 0;
   unsigned short n_idDMRS[2] = {0,1}; //to update from pusch config
-  int32_t temp_in_ifft_0[8192*2] __attribute__((aligned(32)));
+  int32_t temp_in_ifft_0[8192*2] __attribute__((aligned(16)));
   int32_t **ul_ch_estimates_time =  gNB->pusch_vars[UE_id]->ul_ch_estimates_time;
 
 #ifdef DEBUG_CH
@@ -257,10 +257,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
                                          8);
 
     // Convert to time domain
-      memset(temp_in_ifft_0,0,gNB->frame_parms.ofdm_symbol_size*sizeof(int32_t));
-
-    for(int ii = 0; ii < nb_rb_pusch*12; ii++)
-      ((int32_t*)temp_in_ifft_0)[ii] = ul_ch_estimates[aarx][symbol_offset+ii];
+    memset(temp_in_ifft_0, 0, gNB->frame_parms.ofdm_symbol_size*sizeof(int32_t));
+    memcpy(temp_in_ifft_0, &ul_ch_estimates[aarx][symbol_offset], nb_rb_pusch * NR_NB_SC_PER_RB * sizeof(int32_t));
 
     switch (gNB->frame_parms.ofdm_symbol_size) {
       case 128:

openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h

@@ -47,5 +47,6 @@
 				                     unsigned short bwp_start_subcarrier,
 				                     unsigned short nb_rb_pusch);
 
+int nr_est_timing_advance_pusch(PHY_VARS_gNB* phy_vars_gNB, int UE_id);
 
 #endif

openair1/SCHED_NR/fapi_nr_l1.h

@@ -36,10 +36,13 @@
 #include "nfapi_nr_interface.h"
 
 void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO);
+
 void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
                                 int frame, int subframe,
                                 nfapi_nr_dl_config_dci_dl_pdu *dcl_dl_pdu);
+
 void handle_nr_nfapi_dlsch_pdu(PHY_VARS_gNB *gNB,int frame,int slot,
                             nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu,
                             uint8_t *sdu);
 
+void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id, uint8_t harq_pid);

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -26,10 +26,13 @@
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
 #include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "PHY/NR_TRANSPORT/nr_ulsch.h"
+#include "PHY/NR_ESTIMATION/nr_ul_estimation.h"
 #include "SCHED/sched_eNB.h"
+#include "sched_nr.h"
 #include "SCHED/sched_common_extern.h"
-#include "nfapi_interface.h"
-#include "SCHED/fapi_l1.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
+#include "fapi_nr_l1.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "PHY/INIT/phy_init.h"
@@ -258,6 +261,73 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id
 }
 
 
+void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id, uint8_t harq_pid)
+{
+  // --------------------
+  // [hna] TO BE CLEANED
+  // --------------------
+
+  // nfapi_rx_indication_pdu_t *pdu;
+
+  int timing_advance_update;
+  int sync_pos;
+
+  // pthread_mutex_lock(&gNB->UL_INFO_mutex);
+
+  // gNB->UL_INFO.rx_ind.sfn_sf                    = frame<<4| slot_rx;
+  // gNB->UL_INFO.rx_ind.rx_indication_body.tl.tag = NFAPI_RX_INDICATION_BODY_TAG;
+
+  // pdu                                    = &gNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list[gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus];
+
+  // pdu->rx_ue_information.handle          = gNB->ulsch[UE_id+1][0]->handle;
+  // pdu->rx_ue_information.tl.tag          = NFAPI_RX_UE_INFORMATION_TAG;
+  // pdu->rx_ue_information.rnti            = gNB->ulsch[UE_id+1][0]->rnti;
+  // pdu->rx_indication_rel8.tl.tag         = NFAPI_RX_INDICATION_REL8_TAG;
+  // pdu->rx_indication_rel8.length         = gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->TBS>>3;
+  // pdu->rx_indication_rel8.offset         = 1;   // DJP - I dont understand - but broken unless 1 ????  0;  // filled in at the end of the UL_INFO formation
+  // pdu->data                              = gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->b;
+  // estimate timing advance for MAC
+  sync_pos                               = nr_est_timing_advance_pusch(gNB, UE_id);
+  timing_advance_update                  = sync_pos; // - gNB->frame_parms.nb_prefix_samples/4; //to check
+  // printf("\x1B[33m" "timing_advance_update = %d\n" "\x1B[0m", timing_advance_update);
+
+  switch (gNB->frame_parms.N_RB_DL) {
+    // case 6:   /* nothing to do */          break;
+    // case 15:  timing_advance_update /= 2;  break;
+    // case 25:  timing_advance_update /= 4;  break;
+    // case 50:  timing_advance_update /= 8;  break;
+    // case 75:  timing_advance_update /= 12; break;
+    case 106: timing_advance_update /= 16; break;
+    case 217: timing_advance_update /= 32; break;
+    default: abort();
+  }
+
+  // put timing advance command in 0..63 range
+  timing_advance_update += 31;
+
+  if (timing_advance_update < 0)  timing_advance_update = 0;
+  if (timing_advance_update > 63) timing_advance_update = 63;
+
+  // pdu->rx_indication_rel8.timing_advance = timing_advance_update;
+
+  // estimate UL_CQI for MAC (from antenna port 0 only)
+  // int SNRtimes10 = dB_fixed_times10(gNB->pusch_vars[UE_id]->ulsch_power[0]) - 300;//(10*gNB->measurements.n0_power_dB[0]);
+
+  // if      (SNRtimes10 < -640) pdu->rx_indication_rel8.ul_cqi=0;
+  // else if (SNRtimes10 >  635) pdu->rx_indication_rel8.ul_cqi=255;
+  // else                        pdu->rx_indication_rel8.ul_cqi=(640+SNRtimes10)/5;
+
+  // LOG_D(PHY,"[PUSCH %d] Frame %d Subframe %d Filling RX_indication with SNR %d (%d), timing_advance %d (update %d)\n",
+  // harq_pid,frame,slot_rx,SNRtimes10,pdu->rx_indication_rel8.ul_cqi,pdu->rx_indication_rel8.timing_advance,
+  // timing_advance_update);
+
+  // gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus++;
+  // gNB->UL_INFO.rx_ind.sfn_sf = frame<<4 | slot_rx;
+
+  // pthread_mutex_unlock(&gNB->UL_INFO_mutex);
+}
+
+
 void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
 
   uint8_t symbol;
@@ -287,15 +357,10 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx,
                         //       In NR, this should be signaled through uplink scheduling dci (i.e, DCI 0_0, 0_1) (Asynchronous HARQ)  
 
   for (UE_id = 0; UE_id < 1; UE_id++) { // temporary set to 1 untill list of connected UEs is implemented
-    
     for(symbol = symbol_start; symbol < symbol_end; symbol++) {
-
       nr_rx_pusch(gNB, UE_id, frame_rx, slot_rx, symbol, harq_pid);
-
     }
-      
     nr_ulsch_procedures(gNB, frame_rx, slot_rx, UE_id, harq_pid);
-        
+    nr_fill_rx_indication(gNB, frame_rx, slot_rx, UE_id, harq_pid);  // indicate SDU to MAC
   }
-
 }