Merge remote-tracking branch 'origin/NR_UE_timers_and_constants_functions'...

Merge remote-tracking branch 'origin/NR_UE_timers_and_constants_functions' into integration_2023_w23

CMakeLists.txt

@@ -1457,7 +1457,7 @@ set(NR_L2_SRC_UE
   ${NR_RRC_DIR}/nr_rrc_config.c
   ${NR_UE_RRC_DIR}/rrc_UE.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
-  ${NR_RRC_DIR}/nr_rrc_config.c
+  ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
   )
 
 set (MAC_SRC

executables/nr-ue.c

@@ -938,6 +938,8 @@ void *UE_thread(void *arg) {
       timing_advance = UE->timing_advance;
     }
 
+    nr_ue_rrc_timer_trigger(UE->Mod_id, curMsg.proc.frame_tx, curMsg.proc.nr_slot_tx);
+
     // Start TX slot processing here. It runs in parallel with RX slot processing
     notifiedFIFO_elt_t *newElt = newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), curMsg.proc.nr_slot_tx, &txFifo, processSlotTX);
     nr_rxtx_thread_data_t *curMsgTx = (nr_rxtx_thread_data_t *) NotifiedFifoData(newElt);

executables/nr-uesoftmodem.c

@@ -214,10 +214,6 @@ int create_tasks_nrue(uint32_t ue_nb) {
 
   itti_wait_ready(0);
 
-  // Thread to update the RRC timers (in msec) at UE
-  pthread_t timers_update;
-  threadCreate(&timers_update, nr_rrc_timers_update, NULL, "nr_rrc_timer_update", -1, OAI_PRIORITY_RT_LOW);
-
   return 0;
 }
 

openair1/SIMULATION/NR_PHY/nr_dummy_functions.c

@@ -38,7 +38,7 @@ int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
                               const int CC_id,
                               const uint8_t gNB_index,
                               const frame_t frame,
-                              const sub_frame_t sub_frame,
+                              const int slot,
                               const rnti_t rnti,
                               const channel_t channel,
                               const uint8_t* pduP,

openair2/COMMON/mac_messages_types.h

@@ -91,7 +91,7 @@ typedef struct RrcMacBcchDataInd_s {
 
 typedef struct NRRrcMacBcchDataInd_s {
   uint32_t  frame;
-  uint8_t   sub_frame;
+  uint8_t   slot;
   uint32_t  sdu_size;
   uint8_t   sdu[BCCH_SDU_SIZE];
   uint8_t   gnb_index;
@@ -140,7 +140,7 @@ typedef struct RrcMacCcchDataInd_s {
 
 typedef struct NRRrcMacCcchDataInd_s {
   uint32_t  frame;
-  uint8_t   sub_frame;
+  uint8_t   slot;
   uint16_t  rnti;
   uint32_t  sdu_size;
   uint8_t   sdu[CCCH_SDU_SIZE];

openair2/COMMON/rrc_messages_def.h

@@ -79,6 +79,7 @@ MESSAGE_DEF(NAS_DOWNLINK_DATA_IND,      MESSAGE_PRIORITY_MED,       NasDlDataInd
 
 // eNB: realtime -> RRC messages
 MESSAGE_DEF(RRC_SUBFRAME_PROCESS,       MESSAGE_PRIORITY_MED,       RrcSubframeProcess,         rrc_subframe_process)
+MESSAGE_DEF(NRRRC_SLOT_PROCESS,         MESSAGE_PRIORITY_MED,       NRRrcSlotProcess,           nr_rrc_slot_process)
 
 // eNB: RLC -> RRC messages
 MESSAGE_DEF(RLC_SDU_INDICATION,         MESSAGE_PRIORITY_MED,       RlcSduIndication,           rlc_sdu_indication)

openair2/COMMON/rrc_messages_types.h

@@ -88,6 +88,7 @@
 #define NAS_DOWNLINK_DATA_IND(mSGpTR)   (mSGpTR)->ittiMsg.nas_dl_data_ind
 
 #define RRC_SUBFRAME_PROCESS(mSGpTR)    (mSGpTR)->ittiMsg.rrc_subframe_process
+#define NRRRC_SLOT_PROCESS(mSGpTR)      (mSGpTR)->ittiMsg.nr_rrc_slot_process
 
 #define RLC_SDU_INDICATION(mSGpTR)      (mSGpTR)->ittiMsg.rlc_sdu_indication
 #define NRDuDlReq(mSGpTR)      (mSGpTR)->ittiMsg.nr_du_dl_req
@@ -460,9 +461,14 @@ typedef dl_info_transfer_ind_t  NasDlDataInd;
 // eNB: realtime -> RRC messages
 typedef struct rrc_subframe_process_s {
   protocol_ctxt_t ctxt;
-  int             CC_id;
+  int CC_id;
 } RrcSubframeProcess;
 
+typedef struct nrrrc_slot_process_s {
+  int frame;
+  int slot;
+} NRRrcSlotProcess;
+
 // eNB: RLC -> RRC messages
 typedef struct rlc_sdu_indication_s {
   int rnti;

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -115,12 +115,12 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t             instance,
     ccch_sdu_len = rrccont->value.choice.RRCContainer.size;
     memcpy(RRC_MAC_CCCH_DATA_IND (message_p).sdu, rrccont->value.choice.RRCContainer.buf,
            ccch_sdu_len);
-    NR_RRC_MAC_CCCH_DATA_IND (message_p).frame     = 0;
-    NR_RRC_MAC_CCCH_DATA_IND (message_p).sub_frame = 0;
+    NR_RRC_MAC_CCCH_DATA_IND (message_p).frame = 0;
+    NR_RRC_MAC_CCCH_DATA_IND (message_p).slot = 0;
     NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu_size  = ccch_sdu_len;
     NR_RRC_MAC_CCCH_DATA_IND (message_p).nr_cellid = nr_cellid; // CU instance
-    NR_RRC_MAC_CCCH_DATA_IND (message_p).rnti      = rnti;
-    NR_RRC_MAC_CCCH_DATA_IND (message_p).CC_id     = CC_id;
+    NR_RRC_MAC_CCCH_DATA_IND (message_p).rnti = rnti;
+    NR_RRC_MAC_CCCH_DATA_IND (message_p).CC_id = CC_id;
     if (du2cu) {
       NR_RRC_MAC_CCCH_DATA_IND (message_p).du_to_cu_rrc_container = malloc(sizeof(OCTET_STRING_t));
       NR_RRC_MAC_CCCH_DATA_IND (message_p).du_to_cu_rrc_container->size = du2cu->value.choice.DUtoCURRCContainer.size;

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -206,8 +206,6 @@ typedef int (nr_ue_dl_indication_f)(nr_downlink_indication_t *dl_info);
  */
 typedef int (nr_ue_ul_indication_f)(nr_uplink_indication_t *ul_info);
 
-typedef int (nr_ue_dcireq_f)(nr_dcireq_t *ul_info);
-
 //  TODO check this stuff can be reuse of need modification
 typedef struct nr_ue_if_module_s {
   nr_ue_scheduled_response_f *scheduled_response;
@@ -215,7 +213,6 @@ typedef struct nr_ue_if_module_s {
   nr_ue_synch_request_f      *synch_request;
   nr_ue_dl_indication_f      *dl_indication;
   nr_ue_ul_indication_f      *ul_indication;
-  //nr_ue_dcireq_f             *dcireq;
   uint32_t cc_mask;
   uint32_t current_frame;
   uint32_t current_slot;

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -39,91 +39,90 @@
 
 typedef uint32_t channel_t;
 
-int8_t
-nr_mac_rrc_data_ind_ue(
-    const module_id_t     module_id,
-    const int             CC_id,
-    const uint8_t         gNB_index,
-    const frame_t         frame,
-    const sub_frame_t     sub_frame,
-    const rnti_t          rnti,
-    const channel_t       channel,
-    const uint8_t*        pduP,
-    const sdu_size_t      pdu_len){
-    sdu_size_t      sdu_size = 0;
-
-    switch(channel){
-      case NR_BCCH_BCH:
-        AssertFatal( nr_rrc_ue_decode_NR_BCCH_BCH_Message(module_id, gNB_index, (uint8_t*)pduP, pdu_len) == 0, "UE decode BCCH-BCH error!\n");
-        break;
-
-      case NR_BCCH_DL_SCH:
-        if (pdu_len>0) {
-          LOG_T(NR_RRC, "[UE %d] Received SDU for NR-BCCH-DL-SCH on SRB %u from gNB %d\n", module_id, channel & RAB_OFFSET,
-                gNB_index);
-
-          MessageDef *message_p;
-          int msg_sdu_size = BCCH_SDU_SIZE;
-
-          if (pdu_len > msg_sdu_size) {
-            LOG_E(NR_RRC, "SDU larger than NR-BCCH-DL-SCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
-            sdu_size = msg_sdu_size;
-          } else {
-            sdu_size = pdu_len;
-          }
-
-          message_p = itti_alloc_new_message(TASK_MAC_UE, 0, NR_RRC_MAC_BCCH_DATA_IND);
-          memset(NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu, 0, BCCH_SDU_SIZE);
-          memcpy(NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
-          NR_RRC_MAC_BCCH_DATA_IND (message_p).frame = frame; //frameP
-          NR_RRC_MAC_BCCH_DATA_IND (message_p).sub_frame = sub_frame; //sub_frameP
-          NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu_size = sdu_size;
-          NR_RRC_MAC_BCCH_DATA_IND (message_p).gnb_index = gNB_index;
-          itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(module_id), message_p);
+int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
+                              const int CC_id,
+                              const uint8_t gNB_index,
+                              const frame_t frame,
+                              const int slot,
+                              const rnti_t rnti,
+                              const channel_t channel,
+                              const uint8_t* pduP,
+                              const sdu_size_t pdu_len)
+{
+  sdu_size_t sdu_size = 0;
+
+  switch(channel){
+    case NR_BCCH_BCH:
+      AssertFatal(nr_rrc_ue_decode_NR_BCCH_BCH_Message(module_id, gNB_index, (uint8_t*)pduP, pdu_len) == 0, "UE decode BCCH-BCH error!\n");
+      break;
+
+    case NR_BCCH_DL_SCH:
+      if (pdu_len>0) {
+        LOG_T(NR_RRC, "[UE %d] Received SDU for NR-BCCH-DL-SCH on SRB %u from gNB %d\n", module_id, channel & RAB_OFFSET,
+              gNB_index);
+
+        MessageDef *message_p;
+        int msg_sdu_size = BCCH_SDU_SIZE;
+
+        if (pdu_len > msg_sdu_size) {
+          LOG_E(NR_RRC, "SDU larger than NR-BCCH-DL-SCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
+          sdu_size = msg_sdu_size;
+        } else {
+          sdu_size = pdu_len;
         }
-        break;
-
-      case CCCH:
-        if (pdu_len>0) {
-          LOG_T(NR_RRC,"[UE %d] Received SDU for CCCH on SRB %u from gNB %d\n",module_id,channel & RAB_OFFSET,gNB_index);
-
-          MessageDef *message_p;
-          int msg_sdu_size = CCCH_SDU_SIZE;
-
-          if (pdu_len > msg_sdu_size) {
-            LOG_E(NR_RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
-            sdu_size = msg_sdu_size;
-          } else {
-            sdu_size =  pdu_len;
-          }
-
-          message_p = itti_alloc_new_message (TASK_MAC_UE, 0, NR_RRC_MAC_CCCH_DATA_IND);
-          memset (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
-          memcpy (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
-          NR_RRC_MAC_CCCH_DATA_IND (message_p).frame     = frame; //frameP
-          NR_RRC_MAC_CCCH_DATA_IND (message_p).sub_frame = sub_frame; //sub_frameP
-          NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu_size  = sdu_size;
-          NR_RRC_MAC_CCCH_DATA_IND (message_p).gnb_index = gNB_index;
-          NR_RRC_MAC_CCCH_DATA_IND (message_p).rnti      = rnti;  //rntiP
-          itti_send_msg_to_task (TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE( module_id ), message_p);
+
+        message_p = itti_alloc_new_message(TASK_MAC_UE, 0, NR_RRC_MAC_BCCH_DATA_IND);
+        memset(NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu, 0, BCCH_SDU_SIZE);
+        memcpy(NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
+        NR_RRC_MAC_BCCH_DATA_IND (message_p).frame = frame; //frameP
+        NR_RRC_MAC_BCCH_DATA_IND (message_p).slot = slot;
+        NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu_size = sdu_size;
+        NR_RRC_MAC_BCCH_DATA_IND (message_p).gnb_index = gNB_index;
+        itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(module_id), message_p);
+      }
+      break;
+
+    case CCCH:
+      if (pdu_len>0) {
+        LOG_T(NR_RRC,"[UE %d] Received SDU for CCCH on SRB %u from gNB %d\n",module_id,channel & RAB_OFFSET,gNB_index);
+
+        MessageDef *message_p;
+        int msg_sdu_size = CCCH_SDU_SIZE;
+
+        if (pdu_len > msg_sdu_size) {
+          LOG_E(NR_RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
+          sdu_size = msg_sdu_size;
+        } else {
+          sdu_size =  pdu_len;
         }
-        break;
 
-      default:
-        break;
-    }
+        message_p = itti_alloc_new_message (TASK_MAC_UE, 0, NR_RRC_MAC_CCCH_DATA_IND);
+        memset (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
+        memcpy (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
+        NR_RRC_MAC_CCCH_DATA_IND (message_p).frame     = frame; //frameP
+        NR_RRC_MAC_CCCH_DATA_IND (message_p).slot = slot;
+        NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu_size  = sdu_size;
+        NR_RRC_MAC_CCCH_DATA_IND (message_p).gnb_index = gNB_index;
+        NR_RRC_MAC_CCCH_DATA_IND (message_p).rnti      = rnti;  //rntiP
+        itti_send_msg_to_task (TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE( module_id ), message_p);
+      }
+      break;
+
+    default:
+      break;
+  }
 
-    return(0);
+  return(0);
 }
 
 int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
-                              const int         CC_id,
-                              const uint8_t     gNB_id,
-                              const frame_t     frameP,
-                              const rb_id_t     Srb_id,
-                              uint8_t           *buffer_pP){
-
-  switch(Srb_id){
+                              const int CC_id,
+                              const uint8_t gNB_id,
+                              const frame_t frameP,
+                              const rb_id_t Srb_id,
+                              uint8_t *buffer_pP)
+{
+  switch(Srb_id) {
 
     case CCCH:
 
@@ -148,9 +147,9 @@ int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
 
 int8_t nr_rrc_RA_succeeded(const module_id_t mod_id, const uint8_t gNB_index)
 {
-  if (NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active == 1) {
+  if (NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active == true) {
     LOG_W(NR_RRC, "T304 was stoped with value %i\n", NR_UE_rrc_inst[mod_id].timers_and_constants.T304_cnt);
-    NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active = 0;
+    NR_UE_rrc_inst[mod_id].timers_and_constants.T304_active = false;
     NR_UE_rrc_inst[mod_id].timers_and_constants.T304_cnt = 0;
   }
   return 0;

openair2/RRC/NR_UE/rrc_defs.h

@@ -224,6 +224,10 @@ typedef struct NR_UE_RRC_INST_s {
 
     NR_MIB_t *mib;
 
+    // active BWPs
+    NR_BWP_DownlinkDedicated_t *bwpd;
+    NR_BWP_UplinkDedicated_t *ubwpd;
+
     /* KeNB as computed from parameters within USIM card */
     uint8_t kgnb[32];
     /* Used integrity/ciphering algorithms */

openair2/RRC/NR_UE/rrc_proto.h

@@ -107,7 +107,7 @@ int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
                               const int CC_id,
                               const uint8_t gNB_index,
                               const frame_t frame,
-                              const sub_frame_t sub_frame,
+                              const int slot,
                               const rnti_t rnti,
                               const channel_t channel,
                               const uint8_t* pduP,
@@ -155,6 +155,16 @@ void process_lte_nsa_msg(nsa_msg_t *msg, int msg_len);
 
 int get_from_lte_ue_fd();
 
+void nr_ue_rrc_timer_trigger(int module_id, int frame, int slot);
+
+void configure_spcell(NR_UE_RRC_INST_t *rrc, NR_SpCellConfig_t *spcell_config);
+void reset_rlf_timers_and_constants(NR_UE_Timers_Constants_t *tac);
+void set_default_timers_and_constants(NR_UE_Timers_Constants_t *tac);
+void nr_rrc_set_sib1_timers_and_constants(NR_UE_Timers_Constants_t *tac, NR_SIB1_t *sib1);
+void nr_rrc_set_T304(NR_UE_Timers_Constants_t *tac, NR_ReconfigurationWithSync_t *reconfigurationWithSync);
+void nr_rrc_handle_SetupRelease_RLF_TimersAndConstants(NR_UE_RRC_INST_t *rrc,
+                                                       struct NR_SetupRelease_RLF_TimersAndConstants *rlf_TimersAndConstants);
+
 /** @}*/
 #endif