RA fixes and additions:

- RA resource selection and transmission
- MAC header structs for RA
- RA procedure msg1 fixes
- code cleanup

openair1/PHY/NR_UE_TRANSPORT/nr_prach.c

@@ -56,7 +56,7 @@ extern int64_t table_6_3_3_2_4_prachConfig_Index [256][10];
 extern uint16_t nr_du[838];
 extern int16_t nr_ru[2*839];
 
-int32_t generate_nr_prach( PHY_VARS_NR_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf )
+int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint8_t subframe)
 {
 
   //lte_frame_type_t frame_type         = ue->frame_parms.frame_type;
@@ -66,13 +66,13 @@ int32_t generate_nr_prach( PHY_VARS_NR_UE *ue, uint8_t eNB_id, uint8_t subframe,
   uint8_t prach_ConfigIndex  = fp->prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
   uint8_t Ncs_config         = fp->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig;
   uint8_t restricted_set     = fp->prach_config_common.prach_ConfigInfo.highSpeedFlag;
-  uint8_t preamble_index     = ue->prach_resources[eNB_id]->ra_PreambleIndex;
-  //uint8_t tdd_mapindex       = ue->prach_resources[eNB_id]->ra_TDD_map_index;
-  int16_t *prachF           = ue->prach_vars[eNB_id]->prachF;
+  uint8_t preamble_index     = ue->prach_resources[gNB_id]->ra_PreambleIndex;
+  //uint8_t tdd_mapindex       = ue->prach_resources[gNB_id]->ra_TDD_map_index;
+  int16_t *prachF           = ue->prach_vars[gNB_id]->prachF;
   int16_t prach_tmp[98304*2*4] __attribute__((aligned(32)));
   int16_t *prach            = prach_tmp;
   int16_t *prach2;
-  int16_t amp               = ue->prach_vars[eNB_id]->amp;
+  int16_t amp               = ue->prach_vars[gNB_id]->amp;
   int16_t Ncp;
   uint16_t NCS=0;
   uint16_t *prach_root_sequence_map;

openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h

@@ -1755,9 +1755,7 @@ uint32_t  nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
 			    uint8_t is_crnti,
 			    uint8_t llr8_flag);
 
-
-
-int32_t generate_nr_prach( PHY_VARS_NR_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf );
+int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint8_t subframe);
 
 void *dlsch_thread(void *arg);
 /**@}*/

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -514,8 +514,7 @@ int main(int argc, char **argv)
 
   /*tx_lev = generate_nr_prach(UE,
 			     0, //gNB_id,
-			     subframe,
-			     0); //Nf */ //commented for testing purpose
+			     subframe); */ //commented for testing purpose
 
   UE_nr_rxtx_proc_t proc={0};
   nr_ue_prach_procedures(UE,&proc,0,0);

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -96,12 +96,53 @@ typedef struct {
     uint8_t R:2;        // octet 1 [7:6]
 } __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
 
+// BSR MAC CEs
+// TS 38.321 ch. 6.1.3.1
+// Short BSR for a specific logical channel group ID
+typedef struct {
+  uint8_t Buffer_size:5;   // octet 1 LSB
+  uint8_t LcgID:3;         // octet 1 MSB
+} __attribute__ ((__packed__)) NR_BSR_SHORT;
+
+typedef NR_BSR_SHORT NR_BSR_SHORT_TRUNCATED;
+
+// Long BSR for all logical channel group ID
+typedef struct {
+  uint8_t Buffer_size7:8;
+  uint8_t Buffer_size6:8;
+  uint8_t Buffer_size5:8;
+  uint8_t Buffer_size4:8;
+  uint8_t Buffer_size3:8;
+  uint8_t Buffer_size2:8;
+  uint8_t Buffer_size1:8;
+  uint8_t Buffer_size0:8;
+  uint8_t LcgID0:1;
+  uint8_t LcgID1:1;
+  uint8_t LcgID2:1;
+  uint8_t LcgID3:1;
+  uint8_t LcgID4:1;
+  uint8_t LcgID5:1;
+  uint8_t LcgID6:1;
+  uint8_t LcgID7:1;
+} __attribute__ ((__packed__)) NR_BSR_LONG;
+
+typedef NR_BSR_LONG NR_BSR_LONG_TRUNCATED;
+
 // 38.321 ch. 6.1.3.4
 typedef struct {
     uint8_t TA_COMMAND:6;   // octet 1 [5:0]
     uint8_t TAGID:2;        // octet 1 [7:6]
 } __attribute__ ((__packed__)) NR_MAC_CE_TA;
 
+// single Entry PHR MAC CE
+// TS 38.321 ch. 6.1.3.8
+typedef struct {
+  uint8_t PH:6;
+  uint8_t R1:2;
+  uint8_t PCMAX:6;
+  uint8_t R2:6;
+} __attribute__ ((__packed__)) NR_SINGLE_ENTRY_PHR_MAC_CE;
+
 // /*! \brief CCCH payload */ // TBR
 // typedef struct {
 //     uint8_t payload[CCCH_PAYLOAD_SIZE_MAX];
@@ -154,6 +195,7 @@ typedef struct {
 #define UL_SCH_LCID_SRB1                           0x01
 #define UL_SCH_LCID_SRB2                           0x02
 #define UL_SCH_LCID_SRB3                           0x03
+#define UL_SCH_LCID_DTCH                           0x04
 #define UL_SCH_LCID_CCCH_MSG3                      0x21
 #define UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY      0x35
 #define UL_SCH_LCID_MULTI_ENTRY_PHR_4_OCT          0x36

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -100,10 +100,12 @@ typedef struct {
   SFN_C_TYPE type0_pdcch_ss_sfn_c;
   uint32_t type0_pdcch_ss_n_c;
   uint32_t type0_pdcch_consecutive_slots;
+  int rnti_type;
 
   /* PDUs */
   /// Outgoing CCCH pdu for PHY
   CCCH_PDU CCCH_pdu;
+  ULSCH_PDU ulsch_pdu;
 
   /* Random Access parameters */
   /// state of RA procedure

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -152,6 +152,19 @@ void nr_ue_process_mac_pdu(module_id_t module_idP,
                            uint8_t gNB_index,
                            NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);
 
+
+unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload,
+                                    uint8_t *pdu,
+                                    uint8_t num_sdus,
+                                    uint16_t *sdu_lengths,
+                                    uint8_t *sdu_lcids,
+                                    uint8_t power_headroom,
+                                    uint16_t crnti,
+                                    uint16_t truncated_bsr,
+                                    uint16_t short_bsr,
+                                    uint16_t long_bsr,
+                                    unsigned short post_padding);
+
 int8_t nr_ue_process_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_indication_t *dci_ind, void *pduP, uint32_t pdu_len);
 
 void ue_dci_configuration(NR_UE_MAC_INST_t *mac,fapi_nr_dl_config_request_t *dl_config,int frame,int slot);

openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c

@@ -35,7 +35,7 @@
 #include "mac_defs.h"
 #include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 
-/* 38.321 subclause 7.3 - return values are in dB */
+/* TS 38.321 subclause 7.3 - return DELTA_PREAMBLE values in dB */
 int8_t nr_get_DELTA_PREAMBLE(module_id_t mod_id, int CC_id){
 
     NR_UE_MAC_INST_t *nrUE_mac_inst = get_mac_inst(mod_id);
@@ -43,13 +43,15 @@ int8_t nr_get_DELTA_PREAMBLE(module_id_t mod_id, int CC_id){
 
     AssertFatal(CC_id == 0, "Transmission on secondary CCs is not supported yet\n");
 
-    NR_SubcarrierSpacing_t scs = nr_rach_ConfigCommon->msg1_SubcarrierSpacing;
     uint8_t preambleFormat, prachConfigIndex;
     lte_frame_type_t frame_type = TDD; // TODO TBR retrieve frame type. Currently hardcoded to TDD.
-                                       // was nr_UE_mac_inst[mod_id].tdd_Config 
     nr_frequency_range_e fr = nr_FR1;  // TODO TBR retrieve frame type. Currently hardcoded to FR1.
     int mu; 
 
+    // SCS configuration from msg1_SubcarrierSpacing and table 4.2-1 in TS 38.211
+
+    NR_SubcarrierSpacing_t scs = nr_rach_ConfigCommon->msg1_SubcarrierSpacing;
+
     switch (scs){
       case NR_SubcarrierSpacing_kHz15:
       mu = 0;
@@ -87,6 +89,8 @@ int8_t nr_get_DELTA_PREAMBLE(module_id_t mod_id, int CC_id){
       AssertFatal(1 == 0,"Unknown msg1_SubcarrierSpacing %d\n", scs);
     }
 
+    // Preamble formats given by prach_ConfigurationIndex and tables 6.3.3.2-2 and 6.3.3.2-2 in TS 38.211
+
     prachConfigIndex = nr_rach_ConfigCommon->rach_ConfigGeneric.prach_ConfigurationIndex;
     preambleFormat = get_nr_prach_fmt(prachConfigIndex,frame_type,fr);
 
@@ -128,28 +132,16 @@ int8_t nr_get_DELTA_PREAMBLE(module_id_t mod_id, int CC_id){
     return;
 }
 
+/* TS 38.321 subclause 5.1.3 - RA preamble transmission - ra_PREAMBLE_RECEIVED_TARGET_POWER configuration */
 int8_t nr_get_Po_NOMINAL_PUSCH(module_id_t mod_id, uint8_t CC_id){
   
   NR_UE_MAC_INST_t *nr_UE_mac_inst = get_mac_inst(mod_id);
   NR_RACH_ConfigCommon_t *nr_rach_ConfigCommon = nr_UE_mac_inst->nr_rach_ConfigCommon;
   NR_PRACH_RESOURCES_t *prach_resources = &nr_UE_mac_inst->RA_prach_resources;
 
-  //AssertFatal(CC_id == 0, "Transmission on secondary CCs is not supported yet\n");
   AssertFatal(nr_rach_ConfigCommon != NULL, "[UE %d] CCid %d FATAL nr_rach_ConfigCommon is NULL !!!\n", mod_id, CC_id);
 
   int8_t receivedTargerPower = nr_rach_ConfigCommon->rach_ConfigGeneric.preambleReceivedTargetPower + nr_get_DELTA_PREAMBLE(mod_id, CC_id) + (nr_UE_mac_inst->RA_PREAMBLE_POWER_RAMPING_COUNTER - 1) * prach_resources->RA_PREAMBLE_POWER_RAMPING_STEP;
 
   return receivedTargerPower;
-  //return (-120 + (nr_rach_ConfigCommon->rach_ConfigGeneric.preambleReceivedTargetPower << 1) + nr_get_DELTA_PREAMBLE(mod_id, CC_id) );
-}
+}
\ No newline at end of file
-
-/*int8_t get_deltaP_rampup(module_id_t module_idP, uint8_t CC_id){ // TBR
-
-    AssertFatal(CC_id == 0,
-		"Transmission on secondary CCs is not supported yet\n");
-
-    LOG_D(MAC, "[PUSCH]%d dB\n",
-	  nrUE_mac_inst->RA_PREAMBLE_TRANSMISSION_COUNTER << 1);
-    return ((int8_t)
-	    (nrUE_mac_inst->RA_PREAMBLE_TRANSMISSION_COUNTER << 1));
-}*/
\ No newline at end of file

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -114,7 +114,7 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac,fapi_nr_dl_config_request_t *dl_
     if (mac->ra_state == WAIT_RAR) {
       // check for RAR
       rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15; 
-      rel15->rnti = 2;//get_RA_RNTI(mac,frame,slot);
+      rel15->rnti = 2;//get_RA_RNTI(mac,frame,slot); // TBR
       dl_config->number_pdus = dl_config->number_pdus + 1;
     }
     else if (mac->ra_state == WAIT_CONTENTION_RESOLUTION) {

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2752,7 +2752,9 @@ void nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
       LOG_D(MAC,"tb_scaling %d  (2 bits)=> %d (0x%lx)\n",dci_pdu_rel15->tb_scaling,dci_size-pos,*dci_pdu);
 #endif
       break;
-  	
+
+    mac->rnti_type = rnti_type;
+
     case NR_RNTI_C:
 	
       // indicating a DL DCI format 1bit
@@ -3280,3 +3282,169 @@ void nr_ue_process_mac_pdu(module_id_t module_idP,
         AssertFatal(pdu_len >= 0, "[MAC] nr_ue_process_mac_pdu, residual mac pdu length < 0!\n");
     }
 }
+
+////////////////////////////////////////////////////////
+/////* ULSCH MAC PDU generation (6.1.2 TS 38.321) */////
+////////////////////////////////////////////////////////
+
+unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload,
+                                    uint8_t *pdu,
+                                    uint8_t num_sdus,
+                                    uint16_t *sdu_lengths,
+                                    uint8_t *sdu_lcids,
+                                    uint8_t power_headroom,
+                                    uint16_t crnti,
+                                    uint16_t truncated_bsr,
+                                    uint16_t short_bsr,
+                                    uint16_t long_bsr,
+                                    unsigned short post_padding) {
+
+  NR_MAC_SUBHEADER_FIXED *mac_pdu_ptr = (NR_MAC_SUBHEADER_FIXED *) pdu;
+  unsigned char first_element = 0, last_size = 0, i, mac_header_control_elements[16], *ce_ptr, bsr = 0;
+  int mac_ce_size, offset;
+
+  LOG_D(MAC, "[UE] Generating ULSCH PDU : num_sdus %d\n", num_sdus);
+
+  #ifdef DEBUG_HEADER_PARSING
+
+    for (i = 0; i < num_sdus; i++)
+      LOG_D(MAC, "[UE] MAC subPDU %d (lcid %d length %d bytes \n", i, sdu_lcids[i], sdu_lengths[i]);
+
+  #endif
+
+  // Generating UL MAC subPDUs including MAC SDU and subheader
+
+  for (i = 0; i < num_sdus; i++) {
+    LOG_D(MAC, "[UE] Generating UL MAC subPDUs for SDU with lenght %d ( num_sdus %d )\n", sdu_lengths[i], num_sdus);
+
+    if (sdu_lcids[i] != UL_SCH_LCID_CCCH){
+      if (sdu_lengths[i] < 128) {
+        ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->R = 0;
+        ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->F = 0;
+        ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->LCID = sdu_lcids[i];
+        ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->L = (unsigned char) sdu_lengths[i];
+        last_size = 2;
+      } else {
+        ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->R = 0;
+        ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->F = 1;
+        ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->LCID = sdu_lcids[i];
+        ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->L1 = ((unsigned short) sdu_lengths[i] >> 8) & 0x7f;
+        ((NR_MAC_SUBHEADER_LONG *) mac_pdu_ptr)->L2 = (unsigned short) sdu_lengths[i] & 0xff;
+        last_size = 3;
+      }
+    } else { // UL CCCH SDU
+      mac_pdu_ptr->R = 0;
+      mac_pdu_ptr->LCID = sdu_lcids[i];
+    }
+
+    mac_pdu_ptr += last_size;
+
+    // cycle through SDUs, compute each relevant and place ulsch_buffer in
+    memcpy((void *) mac_pdu_ptr, (void *) sdus_payload, sdu_lengths[i]);
+    sdus_payload += sdu_lengths[i]; 
+    mac_pdu_ptr  += sdu_lengths[i];
+  }
+
+  // Generating UL MAC subPDUs including MAC CEs (MAC CE and subheader)
+
+  ce_ptr = &mac_header_control_elements[0];
+
+  if (power_headroom) {
+    // MAC CE fixed subheader
+    mac_pdu_ptr->R = 0;
+    mac_pdu_ptr->LCID = UL_SCH_LCID_SINGLE_ENTRY_PHR;
+    mac_pdu_ptr++;
+
+    // PHR MAC CE (1 octet)
+    ((NR_SINGLE_ENTRY_PHR_MAC_CE *) ce_ptr)->PH = power_headroom;
+    ((NR_SINGLE_ENTRY_PHR_MAC_CE *) ce_ptr)->R1 = 0;
+    ((NR_SINGLE_ENTRY_PHR_MAC_CE *) ce_ptr)->PCMAX = 0; // todo
+    ((NR_SINGLE_ENTRY_PHR_MAC_CE *) ce_ptr)->R2 = 0;
+
+    mac_ce_size = sizeof(NR_SINGLE_ENTRY_PHR_MAC_CE);
+
+    // Copying bytes for PHR MAC CEs to the mac pdu pointer
+    memcpy((void *) mac_pdu_ptr, (void *) ce_ptr, mac_ce_size);
+    ce_ptr += mac_ce_size;
+    mac_pdu_ptr += (unsigned char) mac_ce_size;
+  }
+
+  if (crnti) {
+    // MAC CE fixed subheader
+    mac_pdu_ptr->R = 0;
+    mac_pdu_ptr->LCID = CRNTI;
+    mac_pdu_ptr++;
+
+    // C-RNTI MAC CE (2 octets)
+    * (uint16_t *) ce_ptr = crnti;
+    mac_ce_size = sizeof(uint16_t);
+
+    // Copying bytes for CRNTI MAC CE to the mac pdu pointer
+    memcpy((void *) mac_pdu_ptr, (void *) ce_ptr, mac_ce_size);
+    ce_ptr += mac_ce_size;
+    mac_pdu_ptr += (unsigned char) mac_ce_size;
+  }
+
+  if (truncated_bsr) {
+    // MAC CE fixed subheader
+    mac_pdu_ptr->R = 0;
+    mac_pdu_ptr->LCID = UL_SCH_LCID_S_TRUNCATED_BSR;
+    mac_pdu_ptr++;
+
+    // Short truncated BSR MAC CE (1 octet)
+    ((NR_BSR_SHORT_TRUNCATED *) ce_ptr)-> Buffer_size = truncated_bsr;
+    ((NR_BSR_SHORT_TRUNCATED *) ce_ptr)-> LcgID = 0; // todo
+    mac_ce_size = sizeof(NR_BSR_SHORT_TRUNCATED);
+
+    bsr = 1 ;
+  } else if (short_bsr) {
+    // MAC CE fixed subheader
+    mac_pdu_ptr->R = 0;
+    mac_pdu_ptr->LCID = UL_SCH_LCID_S_BSR;
+    mac_pdu_ptr++;
+
+    // Short truncated BSR MAC CE (1 octet)
+    ((NR_BSR_SHORT *) ce_ptr)->Buffer_size = short_bsr;
+    ((NR_BSR_SHORT *) ce_ptr)->LcgID = 0; // todo
+    mac_ce_size = sizeof(NR_BSR_SHORT);
+
+    bsr = 1 ;
+  } else if (long_bsr) {
+    // MAC CE variable subheader
+    // todo ch 6.1.3.1. TS 38.321
+    // ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->R = 0;
+    // ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->F = 0;
+    // ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->LCID = UL_SCH_LCID_L_BSR;
+    // ((NR_MAC_SUBHEADER_SHORT *) mac_pdu_ptr)->L = 0;
+    // last_size = 2;
+    // mac_pdu_ptr += last_size;
+
+    // Short truncated BSR MAC CE (1 octet)
+    // ((NR_BSR_LONG *) ce_ptr)->Buffer_size0 = short_bsr;
+    // ((NR_BSR_LONG *) ce_ptr)->LCGID0 = 0;
+    // mac_ce_size = sizeof(NR_BSR_LONG); // size is variable
+  }
+
+  if (bsr){
+    // Copying bytes for BSR MAC CE to the mac pdu pointer
+    memcpy((void *) mac_pdu_ptr, (void *) ce_ptr, mac_ce_size);
+    ce_ptr += mac_ce_size;
+    mac_pdu_ptr += (unsigned char) mac_ce_size;
+  }
+
+  // Compute final offset for padding
+  if (post_padding > 0) {
+    ((NR_MAC_SUBHEADER_FIXED *) mac_pdu_ptr)->R = 0;
+    ((NR_MAC_SUBHEADER_FIXED *) mac_pdu_ptr)->LCID = UL_SCH_LCID_PADDING;
+    mac_pdu_ptr++;
+  } else {            
+    // no MAC subPDU with padding
+  }
+
+  // compute final offset
+  offset = ((unsigned char *) mac_pdu_ptr - pdu);
+
+  //printf("Offset %d \n", ((unsigned char *) mac_pdu_ptr - mac_pdu));
+
+  return offset;
+}
\ No newline at end of file

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -56,4 +56,15 @@ nr_mac_rrc_data_ind_ue(
 
     return(0);
 
+}
+
+int8_t mac_rrc_nr_data_req_ue(const module_id_t Mod_idP,
+                              const int         CC_id,
+                              const frame_t     frameP,
+                              const rb_id_t     Srb_id,
+                              uint8_t *const    buffer_pP ){
+
+  // todo
+
+  return 0;
 }
\ No newline at end of file

openair2/RRC/NR_UE/rrc_proto.h

@@ -102,6 +102,18 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(const module_id_t module_id, const ui
    \param pdu_len    data length of pdu*/
 int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id, const int CC_id, const uint8_t gNB_index, const channel_t channel, const uint8_t* pduP, const sdu_size_t pdu_len);
 
+/**\brief
+   \param module_id  module id
+   \param CC_id      component carrier id
+   \param frame_t    frameP
+   \param rb_id_t    SRB id
+   \param buffer_pP  pointer to buffer*/
+int8_t mac_rrc_nr_data_req_ue(const module_id_t Mod_idP,
+                              const int         CC_id,
+                              const frame_t     frameP,
+                              const rb_id_t     Srb_id,
+                              uint8_t *const    buffer_pP);
+
 /** @}*/
 #endif