testing with VVDN RU. mixed-slot DDDSU ok single antenna 100 MHz

cmake_targets/ran_build/build/conf.json

+/home/eurecom/raymond/conf.json.DDDSU.6D4G4U
\ No newline at end of file

common/utils/system.c

@@ -258,7 +258,8 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
     ret=pthread_attr_setschedparam(&attr, &sparam);
     AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
   }
-  
+ 
+  LOG_I(UTIL,"threadCreate for %s, affinity %x, priority %d\n",name,affinity,priority); 
   ret=pthread_create(t, &attr, func, param);
   AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
   

executables/nr-gnb.c

@@ -132,7 +132,7 @@ void tx_func(void *param) {
     syncMsgRU.frame_tx = frame_tx;
     syncMsgRU.slot_tx = slot_tx;
     syncMsgRU.ru = gNB->RU_list[0];
-
+    syncMsgRU.timestamp_tx = info->timestamp_tx;
     LOG_D(PHY,"gNB: %d.%d : calling RU TX function\n",syncMsgRU.frame_tx,syncMsgRU.slot_tx);
     ru_tx_func((void*)&syncMsgRU);
   }

executables/nr-ru.c

@@ -1092,7 +1092,7 @@ void *ru_thread( void *param ) {
   ru_thread_status = 0;
   // set default return value
   sprintf(threadname,"ru_thread %u",ru->idx);
-  LOG_I(PHY,"Starting RU %d (%s,%s),\n",ru->idx,NB_functions[ru->function],NB_timing[ru->if_timing]);
+  LOG_I(PHY,"Starting RU %d (%s,%s) on cpu %d\n",ru->idx,NB_functions[ru->function],NB_timing[ru->if_timing],sched_getcpu());
   memcpy((void *)&ru->config,(void *)&RC.gNB[0]->gNB_config,sizeof(ru->config));
 
   if(emulate_rf) {

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h

@@ -292,8 +292,8 @@ typedef enum {
 } nfapi_nr_ssb_and_cset_mux_pattern_type_e;
 
 typedef enum {
-  NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED=0,
-  NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED=1
+  NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED=0,
+  NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED=1
 } nfapi_nr_cce_reg_mapping_type_e;
 
 typedef enum {

openair2/GNB_APP/RRC_nr_paramsvalues.h

@@ -189,7 +189,7 @@
 
 #define SCCPARAMS_DESC(scc) { \
 {GNB_CONFIG_STRING_PHYSCELLID,NULL,0,i64ptr:scc->physCellId,defint64val:0,TYPE_INT64,0/*0*/}, \
-{GNB_CONFIG_STRING_NTIMINGADVANCEOFFSET,NULL,0,i64ptr:scc->n_TimingAdvanceOffset,defint64val:NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n0,TYPE_INT64,0/*1*/},\
+{GNB_CONFIG_STRING_NTIMINGADVANCEOFFSET,NULL,0,i64ptr:scc->n_TimingAdvanceOffset,defint64val:NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n25600,TYPE_INT64,0/*1*/},\
 {GNB_CONFIG_STRING_SSBPERIODICITYSERVINGCELL,NULL,0,i64ptr:scc->ssb_periodicityServingCell,defint64val:NR_ServingCellConfigCommon__ssb_periodicityServingCell_ms20,TYPE_INT64,0/*2*/},\
 {GNB_CONFIG_STRING_DMRSTYPEAPOSITION,NULL,0,i64ptr:&scc->dmrs_TypeA_Position,defint64val:NR_ServingCellConfigCommon__dmrs_TypeA_Position_pos2,TYPE_INT64,0/*3*/},\
 {GNB_CONFIG_STRING_SUBCARRIERSPACING,NULL,0,i64ptr:scc->ssbSubcarrierSpacing,defint64val:NR_SubcarrierSpacing_kHz30,TYPE_INT64,0/*4*/},\

openair2/GNB_APP/gnb_config.c

@@ -120,7 +120,8 @@ void prepare_scc(NR_ServingCellConfigCommon_t *scc) {
   scc->ssbSubcarrierSpacing                      = CALLOC(1,sizeof(NR_SubcarrierSpacing_t));
   scc->tdd_UL_DL_ConfigurationCommon             = CALLOC(1,sizeof(struct NR_TDD_UL_DL_ConfigCommon));
   scc->tdd_UL_DL_ConfigurationCommon->pattern2   = CALLOC(1,sizeof(struct NR_TDD_UL_DL_Pattern));
-  
+ 
+  scc->n_TimingAdvanceOffset=CALLOC(1,sizeof(*scc->n_TimingAdvanceOffset)); 
   scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB     = CALLOC(1,sizeof(NR_ARFCN_ValueNR_t));
   
   dl_frequencyBandList              = CALLOC(1,sizeof(NR_FreqBandIndicatorNR_t));

targets/ARCH/ETHERNET/oran/5g/oran.cpp

@@ -946,10 +946,10 @@ extern "C"
 {
 #endif
 void check_xran_ptp_sync(){
-
-   if (xran_is_synchronized() != 0)
-        printf("Machine is not synchronized using PTP!\n");
-    else
+   int res;
+   if ((res=xran_is_synchronized()) != 0)
+        printf("Machine is not synchronized using PTP (%x)!\n",res);
+   else
         printf("Machine is synchronized using PTP!\n");
 
 }

targets/ARCH/ETHERNET/oran/5g/oran_isolate.c

@@ -237,14 +237,15 @@ void oran_fh_if4p5_south_in(RU_t *ru,
   proc->frame_rx     = f;
   proc->tti_tx       = (sl+sl_ahead)%20;
   proc->frame_tx     = (sl>(19-sl_ahead)) ? (f+1)&1023 : f;
-
   if (proc->first_rx == 0) {
     if (proc->tti_rx != *slot) {
       LOG_E(PHY,"Received Timestamp doesn't correspond to the time we think it is (proc->tti_rx %d, slot %d)\n",proc->tti_rx,*slot);
+      *slot = proc->tti_rx;
     }
 
     if (proc->frame_rx != *frame) {
       LOG_E(PHY,"Received Timestamp doesn't correspond to the time we think it is (proc->frame_rx %d frame %d proc->tti_rx %d tti %d)\n",proc->frame_rx,*frame,proc->tti_rx,*slot);
+      *frame=proc->frame_rx;
     }
   } else {
     proc->first_rx = 0;

targets/ARCH/ETHERNET/oran/5g/xran_lib_wrap.cpp

@@ -430,9 +430,7 @@ xranLibWraper::xranLibWraper()
 
         m_xranInit.io_cfg.core              = get_globalcfg<int>(XRAN_UT_KEY_GLOBALCFG_IO, "core");
         m_xranInit.io_cfg.system_core       = get_globalcfg<int>(XRAN_UT_KEY_GLOBALCFG_IO, "system_core");
-        uint8_t tmp_pkt_proc_core = get_globalcfg<int>(XRAN_UT_KEY_GLOBALCFG_IO, "pkt_proc_core");
-        m_xranInit.io_cfg.pkt_proc_core     = (uint64_t) 1 << tmp_pkt_proc_core;
-
+        m_xranInit.io_cfg.pkt_proc_core     = get_globalcfg<int>(XRAN_UT_KEY_GLOBALCFG_IO, "pkt_proc_core");
         m_xranInit.io_cfg.pkt_aux_core      = get_globalcfg<int>(XRAN_UT_KEY_GLOBALCFG_IO, "pkt_aux_core");
         m_xranInit.io_cfg.timing_core       = get_globalcfg<int>(XRAN_UT_KEY_GLOBALCFG_IO, "timing_core");