Fixed race in phy config

executables/nr-ue.c

@@ -774,6 +774,7 @@ void *UE_thread(void *arg) {
   bool syncRunning=false;
   const int nb_slot_frame = UE->frame_parms.slots_per_frame;
   int absolute_slot=0, decoded_frame_rx=INT_MAX, trashed_frames=0;
+  initNotifiedFIFO(&UE->phy_config_ind);
 
   while (!oai_exit) {
     if (UE->lost_sync) {
@@ -796,6 +797,11 @@ void *UE_thread(void *arg) {
           decoded_frame_rx=(((mac->mib->systemFrameNumber.buf[0] >> mac->mib->systemFrameNumber.bits_unused)<<4) | tmp->proc.decoded_frame_rx);
           // shift the frame index with all the frames we trashed meanwhile we perform the synch search
           decoded_frame_rx=(decoded_frame_rx + UE->init_sync_frame + trashed_frames) % MAX_FRAME_NUMBER;
+          // wait for RRC to configure PHY parameters from SIB
+          if (get_softmodem_params()->sa) {
+            notifiedFIFO_elt_t *phy_config_res = pullNotifiedFIFO(&UE->phy_config_ind);
+            delNotifiedFIFO_elt(phy_config_res);
+          }
         }
         delNotifiedFIFO_elt(res);
         start_rx_stream=0;

openair1/PHY/defs_nr_UE.h

@@ -656,6 +656,7 @@ typedef struct {
   void *phy_sim_pdsch_dl_ch_estimates;
   void *phy_sim_pdsch_dl_ch_estimates_ext;
   pthread_mutex_t mac_IF_mutex;
+  notifiedFIFO_t phy_config_ind;
 } PHY_VARS_NR_UE;
 
 typedef struct nr_phy_data_tx_s {

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -548,9 +548,10 @@ int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config){
 
   fapi_nr_config_request_t *nrUE_config = &PHY_vars_UE_g[phy_config->Mod_id][phy_config->CC_id]->nrUE_config;
 
-  if(phy_config != NULL)
+  if(phy_config != NULL) {
     memcpy(nrUE_config,&phy_config->config_req,sizeof(fapi_nr_config_request_t));
-
+    pushNotifiedFIFO(&PHY_vars_UE_g[phy_config->Mod_id][phy_config->CC_id]->phy_config_ind, newNotifiedFIFO_elt(1,0,NULL,NULL));
+  }
   return 0;
 }