Merge branch 'integration_2024_w06' into 'develop'

Integration: 2024.w06 Closes #733 and #732 See merge request oai/openairinterface5g!2564 * !2490 reworking configuration of LogicalChannelConfig at MAC UE * !2548 NR UE MSG3 buffer * !2556 Support RC SM aperiodic subscription for "UE RRC State Change" * !2557 fix duplicate call of RCconfig_NR_L1 * !2550 use pointer to structure instead of module_id inside MAC * address #733 * !2560 chore(ci): force rebuild of ran-base for integration branches * !2495 Sidelink configuration passed from RRC->MAC * !2220 L1 tx thread * !2559 FH 7.2 improvements * !2566 Provide right E1 instance when creating E2 agent in CU-UP * !2513 Update NR SA tutorials

Merge branch 'integration_2024_w06' into 'develop'
Integration: 2024.w06 Closes #733 and #732 See merge request oai/openairinterface5g!2564 * !2490 reworking configuration of LogicalChannelConfig at MAC UE * !2548 NR UE MSG3 buffer * !2556 Support RC SM aperiodic subscription for "UE RRC State Change" * !2557 fix duplicate call of RCconfig_NR_L1 * !2550 use pointer to structure instead of module_id inside MAC * address #733 * !2560 chore(ci): force rebuild of ran-base for integration branches * !2495 Sidelink configuration passed from RRC->MAC * !2220 L1 tx thread * !2559 FH 7.2 improvements * !2566 Provide right E1 instance when creating E2 agent in CU-UP * !2513 Update NR SA tutorials
3f3a9869 · Robert Schmidt · 2b796874 · 24c707c3 · 3f3a9869 · 3f3a9869
Commit 3f3a9869 authored Feb 14, 2024 by Robert Schmidt
90 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1384,9 +1384,11 @@ set (MAC_NR_SRC_UE
  ${NR_UE_PHY_INTERFACE_DIR}/NR_IF_Module.c
  ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
  ${NR_UE_MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/config_ue_sl.c
  ${NR_UE_MAC_DIR}/mac_vars.c
  ${NR_UE_MAC_DIR}/main_ue_nr.c
  ${NR_UE_MAC_DIR}/nr_ue_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
  ${NR_UE_MAC_DIR}/nr_ra_procedures.c

--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -274,6 +274,11 @@ class Cluster:
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
+			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
+			if not forceBaseImageBuild and result is not None:
+				forceBaseImageBuild = True
+				baseTag = 'ci-temp'
 		else:
 			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True

--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -419,6 +419,11 @@ class Containerize():
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
+			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
+			if not forceBaseImageBuild and result is not None:
+				forceBaseImageBuild = True
+				baseTag = 'ci-temp'
 		else:
 			forceBaseImageBuild = True


--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -437,13 +437,19 @@ class HTMLManagement():

 		for k in DataLog['Data']:
 			# TestRow 
+			avg = DataLog['Data'][k][0]
+			maxval = DataLog['Data'][k][1]
+			count = DataLog['Data'][k][2]
+			valnorm = float(DataLog['Data'][k][3])
+			dev = DataLog['DeviationThreshold'][k]
+			ref = DataLog['Ref'][k]
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td colspan="3" bgcolor = "lightcyan" >' + k  + ' </td>\n')				
-			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + DataLog['Data'][k][0] + '; ' + DataLog['Data'][k][1] + '; ' + DataLog['Data'][k][2] + ' </td>\n')
-			if float(DataLog['Data'][k][3])> DataLog['Threshold'][k]:
-				self.htmlFile.write('        <th bgcolor = "red" >' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
+			self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan" >{avg}; {maxval}; {count}</td>\n')
+			if valnorm > 1.0 + dev or valnorm < 1.0 - dev:
+				self.htmlFile.write(f'        <th bgcolor = "red" >{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</th>\n')
 			else:
-				self.htmlFile.write('        <th bgcolor = "green" ><font color="white">' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
+				self.htmlFile.write(f'        <th bgcolor = "green" ><font color="white">{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</font></th>\n')
 			self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()


--- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-5GNRBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+
+    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts = 2;
+    min_rxtxtime = 6;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                          = 621312;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 620040;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 273;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=41,L=24 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                                        = 31624;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                           = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                                      = 12;
+        initialDLBWPsearchSpaceZero                                             = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                                 = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 273;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                                        = 31624;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                           = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -118;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES : {
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = ({
+  num_cc = 1;
+  tr_s_preference = "local_L1";
+  tr_n_preference = "local_RRC";
+});
+
+L1s = ({
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+});
+
+RUs = ({
+  local_rf       = "yes"
+  nb_tx          = 2
+  nb_rx          = 2
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [7];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 50;
+  eNB_instances  = [0];
+  bf_weights = [0x00007fff, 0x0000];
+  sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
+});
+
+THREAD_STRUCT = ({
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+});
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config : {
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+};
--- a/ci-scripts/datalog_rt_stats.100.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.100.2x2.yaml
+#this is a configuration file
+#used to build real time processing statistics 
+#for 5G NR phy test (gNB terminate)
+Title : Processing Time (us) from datalog_rt_stats.100.2x2.yaml
+ColNames :
+  - Metric
+  - Average; Max; Count
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+Ref : 
+  feprx : 150.0
+  feptx_prec : 0.0
+  feptx_ofdm : 65.0
+  feptx_total : 177.0
+  L1 Tx processing : 700.0
+  DLSCH encoding : 179.0
+  L1 Rx processing : 526.0
+  PUSCH inner-receiver : 400.0
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 15.0
+  UL Indication : 3.0
+  Slot Indication : 17.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.25
+  UL Indication : 1.00
+  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
 #this is a configuration file
 #used to build real time processing statistics
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.1x1.60.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref :
  feprx : 46.0
  feptx_prec : 15.0
@@ -15,20 +15,20 @@ Ref :
  DLSCH encoding : 137.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 2200.0
-  Schedule Response : 48.0
-  DL & UL scheduling timing : 13.0
-  UL Indication : 60.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  Schedule Response : 1.25
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 8.0
+  UL Indication : 3.0
+  Slot Indication : 8.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.50
+  UL Indication : 1.00
+  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.2x2.yaml
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.2x2.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref : 
  feprx : 120.0
  feptx_prec : 30.0
@@ -15,18 +15,20 @@ Ref :
  DLSCH encoding : 230.0
  L1 Rx processing : 175.0
  PUSCH inner-receiver : 100.0
-  PUSCH decoding : 180.0 
-  DL & UL scheduling timing : 37.0
-  UL Indication : 38.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 11.0
+  UL Indication : 3.0
+  Slot Indication : 14.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.50
+  UL Indication : 1.00
+  Slot Indication : 0.25
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.60.2x2.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref : 
  feprx : 84.0
  feptx_prec : 14.0
@@ -15,20 +15,20 @@ Ref :
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 2200.0
-  Schedule Response : 111.0
-  DL & UL scheduling timing : 20.0
-  UL Indication : 127.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  Schedule Response : 48.0
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 13.0
+  UL Indication : 3.0
+  Slot Indication : 15.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.35
+  UL Indication : 1.00
+  Slot Indication : 0.35
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.default.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref : 
  feprx : 43.0
  feptx_prec : 13.0
@@ -15,20 +15,20 @@ Ref :
  DLSCH encoding : 118.0
  L1 Rx processing : 305.0
  PUSCH inner-receiver : 150.0
-  PUSCH decoding : 2200.0
-  Schedule Response : 30.0
-  DL & UL scheduling timing : 10.0
-  UL Indication : 40.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  Schedule Response : 1.25
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 6.0
+  UL Indication : 3.0
+  Slot Indication : 7.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.50
+  UL Indication : 1.00
+  Slot Indication : 0.50
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -1179,8 +1179,10 @@ class RANManagement():
 				self.datalog_rt_stats=datalog_rt_stats
 				#check if there is a fail => will render the test as failed
 				for k in datalog_rt_stats['Data']:
-					if float(datalog_rt_stats['Data'][k][3])> datalog_rt_stats['Threshold'][k]: #condition for fail : avg/ref is greater than the fixed threshold
-						logging.debug('\u001B[1;30;43m datalog_rt_stats metric ' + k + '=' + datalog_rt_stats['Data'][k][3] + ' > threshold ' + str(datalog_rt_stats['Threshold'][k]) + ' \u001B[0m')
+					valnorm = float(datalog_rt_stats['Data'][k][3])
+					dev = datalog_rt_stats['DeviationThreshold'][k]
+					if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail : avg/ref deviates by more than "deviation threshold"
+						logging.debug(f'\u001B[1;30;43m normalized datalog_rt_stats metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
 						RealTimeProcessingIssue = True
 			else:
 				statMsg = 'No real time stats found in the log file\n'

--- a/ci-scripts/stats_monitor_conf.yaml
+++ b/ci-scripts/stats_monitor_conf.yaml
@@ -24,9 +24,9 @@ gnb :
    DLSCH encoding:
    L1 Rx processing:
    PUSCH inner-receiver:
-    PUSCH decoding:
    DL & UL scheduling timing:
    UL Indication:
+    Slot Indication:
  graph : 
    page1:
      dlsch_err:
@@ -44,6 +44,6 @@ gnb :
      rt.L1 Rx processing:
    page4:
      rt.PUSCH inner-receiver:
-      rt.PUSCH decoding:
      rt.DL & UL scheduling timing:
      rt.UL Indication:
+      rt.Slot Indication:
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
+<!--
+
+ 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
+
+-->
+<testCaseList>
+  <htmlTabRef>gNB-PHY-Test-100-2x2</htmlTabRef>
+  <htmlTabName>Timing phytest 100 MHz 2x2</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <repeatCount>1</repeatCount>
+  <TestCaseRequestedList>
+100000 390101 000001 390109 200000
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+  <testCase id="100000">
+	  <class>Custom_Command</class>
+	  <desc>Disable Sleep States</desc>
+	  <node>caracal</node>
+	  <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="200000">
+	  <class>Custom_Command</class>
+	  <desc>Enable Sleep States</desc>
+	  <node>caracal</node>
+	  <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase id="390101">
+    <class>Initialize_eNB</class>
+    <desc>Initialize gNB USRP</desc>
+    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 273 -t 23 -D 130175 -m 23 -M 273 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+    <rt_stats_cfg>datalog_rt_stats.100.2x2.yaml</rt_stats_cfg>
+    <air_interface>NR</air_interface>
+    <USRP_IPAddress>192.168.20.2</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
+  </testCase>
+
+  <testCase id="000001">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+  </testCase>
+
+
+  <testCase id="390109">
+    <class>Terminate_eNB</class>
+    <desc>Terminate gNB</desc>
+    <air_interface>NR</air_interface>
+  </testCase>
+
+</testCaseList>
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -504,7 +504,7 @@ function main() {
    # Doxygen Support #
    ###################
    if [ "$BUILD_DOXYGEN" = "1" ] ; then
-	echo_info "Built Doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/$BUILD_DIR/build/html/index.html"
+	echo_info "Built Doxygen based documentation. The documentation file is located here: $DIR/$BUILD_DIR/build/doc/html/index.html"
    fi

    # TODO: once we got the CMakeLists.txt file done for the ORAN files, remove the following lines

--- a/cmake_targets/tools/MODULES/Findxran.cmake
+++ b/cmake_targets/tools/MODULES/Findxran.cmake
@@ -107,6 +107,8 @@ if (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.0")
  set(xran_VERSION 5.1.0)
 elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.1")
  set(xran_VERSION 5.1.1)
+elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.2")
+  set(xran_VERSION 5.1.2)
 endif()
 unset(xran_VERSION_LINE)
 unset(xran_VERSION_STRING)

--- a/cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch
+++ b/cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch
 diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
-index 7508117..a93c085 100644
+index 7508117..0dbe0bd 100644
 --- a/fhi_lib/app/src/common.h
 +++ b/fhi_lib/app/src/common.h
 @@ -28,7 +28,7 @@
@@ -7,12 +7,12 @@ index 7508117..a93c085 100644
 #include <rte_mbuf.h>
 
 -#define VERSIONX                "oran_e_maintenance_release_v1.0"
-+#define VERSIONX                "oran_e_maintenance_release_v1.1"
+#define VERSIONX                "oran_e_maintenance_release_v1.2"
 
 #define APP_O_DU  0
 #define APP_O_RU  1
 diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
-index de141bf..5bcde3d 100644
+index de141bf..c12b912 100644
 --- a/fhi_lib/lib/Makefile
 +++ b/fhi_lib/lib/Makefile
 @@ -23,11 +23,11 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -30,6 +30,15 @@ index de141bf..5bcde3d 100644
 OBJDUMP := objdump
 
 ifeq ($(SHELL),cmd.exe)
+@@ -57,7 +57,7 @@ endif
+ 
+ RTE_TARGET ?= x86_64-native-linux-icc
+ 
+-RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
+ API_DIR := $(PROJECT_DIR)/api
+ SRC_DIR := $(PROJECT_DIR)/src
+ ETH_DIR := $(PROJECT_DIR)/ethernet
 @@ -95,8 +95,7 @@ CPP_SRC = $(SRC_DIR)/xran_compression.cpp \
 	$(SRC_DIR)/xran_bfp_cplane32.cpp \
 	$(SRC_DIR)/xran_bfp_cplane64.cpp \
@@ -117,10 +126,18 @@ index 7d3afc5..3e00c5a 100644
     uint16_t *num_prbu,
     uint16_t *start_prbu,
 diff --git a/fhi_lib/lib/ethernet/ethdi.c b/fhi_lib/lib/ethernet/ethdi.c
-index b6ba257..74b3c26 100644
+index b6ba257..b53325f 100644
 --- a/fhi_lib/lib/ethernet/ethdi.c
 +++ b/fhi_lib/lib/ethernet/ethdi.c
-@@ -479,11 +479,13 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+@@ -335,6 +335,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+     uint16_t count;
+ 
+     char *argv[] = { name, core_mask, "-n2", iova_mode, socket_mem, socket_limit, "--proc-type=auto",
+        "--no-telemetry",
+         "--file-prefix", name, "-a0000:00:00.0", bbdev_wdev, bbdev_vdev};
+ 
+ 
+@@ -479,11 +480,13 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
                     ctx->tx_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
                     rte_lcore_to_socket_id(*lcore_id), RING_F_SC_DEQ);
                     PANIC_ON(ctx->tx_ring[i] == NULL, "failed to allocate rx ring");
@@ -134,7 +151,7 @@ index b6ba257..74b3c26 100644
                     }
                 }
             } else {
-@@ -553,7 +555,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+@@ -553,7 +556,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
         ctx->up_dl_pkt_gen_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING,
         rte_lcore_to_socket_id(*lcore_id), /*RING_F_SC_DEQ*/0);
         PANIC_ON(ctx->up_dl_pkt_gen_ring[i] == NULL, "failed to allocate dl gen ring");

--- a/doc/NR_SA_Tutorial_COTS_UE.md
+++ b/doc/NR_SA_Tutorial_COTS_UE.md
@@ -58,11 +58,12 @@ sudo ./program_uicc --adm 12345678 --imsi 001010000000001 --isdn 00000001 --acc

 ### Build UHD from source
 ```bash
-sudo apt install -y libboost-all-dev libusb-1.0-0-dev doxygen python3-docutils python3-mako python3-numpy python3-requests python3-ruamel.yaml python3-setuptools cmake build-essential
+# https://files.ettus.com/manual/page_build_guide.html
+sudo apt install -y autoconf automake build-essential ccache cmake cpufrequtils doxygen ethtool g++ git inetutils-tools libboost-all-dev libncurses5 libncurses5-dev libusb-1.0-0 libusb-1.0-0-dev libusb-dev python3-dev python3-mako python3-numpy python3-requests python3-scipy python3-setuptools python3-ruamel.yaml

 git clone https://github.com/EttusResearch/uhd.git ~/uhd
 cd ~/uhd
-git checkout v4.5.0.0
+git checkout v4.6.0.0
 cd host
 mkdir build
 cd build
@@ -87,9 +88,7 @@ cd ~/openairinterface5g/cmake_targets
 ./build_oai -I

 # Build OAI gNB
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets
+cd ~/openairinterface5g/cmake_targets
 ./build_oai -w USRP --ninja --gNB -C
 ```

@@ -106,24 +105,18 @@ docker compose up -d

 ### USRP B210
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --sa -E --continuous-tx
 ```
 ### USRP N300
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1
 ```

 ### USRP X300
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1 -E --continuous-tx
 ```


--- a/doc/NR_SA_Tutorial_OAI_CN5G.md
+++ b/doc/NR_SA_Tutorial_OAI_CN5G.md
@@ -58,16 +58,8 @@ rm -r ~/openairinterface5g-develop-doc-tutorial_resources-oai-cn5g ~/oai-cn5g.zi
 ## 2.3 Pull OAI CN5G docker images

 ```bash
-docker pull mysql:8.0
-docker pull oaisoftwarealliance/oai-amf:develop
-docker pull oaisoftwarealliance/oai-nrf:develop
-docker pull oaisoftwarealliance/oai-smf:develop
-docker pull oaisoftwarealliance/oai-udr:develop
-docker pull oaisoftwarealliance/oai-udm:develop
-docker pull oaisoftwarealliance/oai-ausf:develop
-docker pull oaisoftwarealliance/oai-spgwu-tiny:develop
-docker pull oaisoftwarealliance/trf-gen-cn5g:jammy
-docker pull oaisoftwarealliance/ims:latest
+cd ~/oai-cn5g
+docker compose pull
 ```

 # 3. Run OAI CN5G

--- a/doc/NR_SA_Tutorial_OAI_nrUE.md
+++ b/doc/NR_SA_Tutorial_OAI_nrUE.md
@@ -46,11 +46,12 @@ Please install and configure OAI CN5G as described here:

 ### Build UHD from source
 ```bash
-sudo apt install -y libboost-all-dev libusb-1.0-0-dev doxygen python3-docutils python3-mako python3-numpy python3-requests python3-ruamel.yaml python3-setuptools cmake build-essential
+# https://files.ettus.com/manual/page_build_guide.html
+sudo apt install -y autoconf automake build-essential ccache cmake cpufrequtils doxygen ethtool g++ git inetutils-tools libboost-all-dev libncurses5 libncurses5-dev libusb-1.0-0 libusb-1.0-0-dev libusb-dev python3-dev python3-mako python3-numpy python3-requests python3-scipy python3-setuptools python3-ruamel.yaml

 git clone https://github.com/EttusResearch/uhd.git ~/uhd
 cd ~/uhd
-git checkout v4.5.0.0
+git checkout v4.6.0.0
 cd host
 mkdir build
 cd build
@@ -78,9 +79,7 @@ cd ~/openairinterface5g/cmake_targets
 sudo apt install -y libforms-dev libforms-bin

 # Build OAI gNB
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets
+cd ~/openairinterface5g/cmake_targets
 ./build_oai -w USRP --ninja --nrUE --gNB --build-lib "nrscope" -C
 ```

@@ -97,82 +96,71 @@ docker compose up -d

 ### USRP B210
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --sa -E --continuous-tx
 ```
 ### USRP N300
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --gNBs.[0].min_rxtxtime 6 --sa --usrp-tx-thread-config 1
 ```

 ### USRP X300
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --gNBs.[0].min_rxtxtime 6 --sa --usrp-tx-thread-config 1 -E --continuous-tx
 ```

 ### RFsimulator
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --sa
 ```

-# 5. OAI UE
-
-## 5.1  SIM Card
-Edit openair3/UICC/usim_interface.c
+### RFsimulator in FR2
 ```bash
-#define UICC_PARAMS_DESC {\
-    {"imsi",             "USIM IMSI\n",          0,         strptr:&(uicc->imsiStr),              defstrval:"001010000000001",           TYPE_STRING,    0 },\
-    {"nmc_size"          "number of digits in NMC", 0,      iptr:&(uicc->nmc_size),               defintval:2,         TYPE_INT,       0 },\
-    {"key",              "USIM Ki\n",            0,         strptr:&(uicc->keyStr),               defstrval:"fec86ba6eb707ed08905757b1bb44b8f", TYPE_STRING,    0 },\
-    {"opc",              "USIM OPc\n",           0,         strptr:&(uicc->opcStr),               defstrval:"c42449363bbad02b66d16bc975d77cc1", TYPE_STRING,    0 },\
-    {"amf",              "USIM amf\n",           0,         strptr:&(uicc->amfStr),               defstrval:"8000",    TYPE_STRING,    0 },\
-    {"sqn",              "USIM sqn\n",           0,         strptr:&(uicc->sqnStr),               defstrval:"000000",  TYPE_STRING,    0 },\
-    {"dnn",              "UE dnn (apn)\n",       0,         strptr:&(uicc->dnnStr),               defstrval:"oai",     TYPE_STRING,    0 },\
-    {"nssai_sst",        "UE nssai\n",           0,         iptr:&(uicc->nssai_sst),              defintval:1,    TYPE_INT,    0 }, \
-    {"nssai_sd",         "UE nssai\n",           0,         iptr:&(uicc->nssai_sd),               defintval:0xffffff,    TYPE_INT,    0 }, \
-};
+cd ~/openairinterface5g/cmake_targets/ran_build/build
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.32prb.usrpx410.conf --rfsim
 ```

-## 5.2 Testing OAI nrUE with USRP B210
+# 5. OAI UE

+## 5.1 Run OAI nrUE
+### USRP B210
 Important notes:
 - This should be run in a second Ubuntu 22.04 host, other than gNB
 - It only applies when running OAI gNB with USRP B210

-Run OAI nrUE
+Run OAI nrUE with USRP B210
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
+cd ~/openairinterface5g/cmake_targets/ran_build/build
 sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --ue-fo-compensation --sa -E --uicc0.imsi 001010000000001
 ```

-## 5.2 Testing OAI nrUE with RFsimulator
+### RFsimulator
 Important notes:
 - This should be run on the same host as the OAI gNB
 - It only applies when running OAI gNB with RFsimulator

 Run OAI nrUE with RFsimulator
 ```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
-sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --sa --uicc0.imsi 001010000000001 --rfsimulator.serveraddr 127.0.0.1
+cd ~/openairinterface5g/cmake_targets/ran_build/build
+sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --sa --uicc0.imsi 001010000000001 --rfsim
+```
+
+### RFsimulator in FR2
+Important notes:
+- This should be run on the same host as the OAI gNB
+- It only applies when running OAI gNB with RFsimulator in FR2
+
+Run OAI nrUE with RFsimulator in FR2
+```bash
+cd ~/openairinterface5g/cmake_targets/ran_build/build
+sudo ./nr-uesoftmodem -r 32 --numerology 3 --band 257 -C 27533280000 --sa --uicc0.imsi 001010000000001 --ssb 72 --rfsim
 ```

-### 5.2.1 Ping test
- UE host
+## 5.2 End-to-end connectivity test
+- Ping test from the UE host to the CN5G
 ```bash
 ping 192.168.70.135 -I oaitun_ue1
 ```

--- a/doc/ORAN_FHI7.2_Tutorial.md
+++ b/doc/ORAN_FHI7.2_Tutorial.md
--- a/doc/tutorial_resources/oai-cn5g/conf/config.yaml
+++ b/doc/tutorial_resources/oai-cn5g/conf/config.yaml
@@ -59,6 +59,23 @@ nfs:
    n4:
      interface_name: eth0
      port: 8805
+  upf:
+    host: oai-upf
+    sbi:
+      port: 8080
+      api_version: v1
+      interface_name: eth0
+    n3:
+      interface_name: eth0
+      port: 2152
+    n4:
+      interface_name: eth0
+      port: 8805
+    n6:
+      interface_name: eth0
+    n9:
+      interface_name: eth0
+      port: 2152
  udm:
    host: oai-udm
    sbi:
@@ -94,6 +111,16 @@ database:
  generate_random: true
  connection_timeout: 300 # seconds

+## general single_nssai configuration
+## Defines YAML anchors, which are reused in the config file
+snssais:
+  - &embb_slice1
+    sst: 1
+  - &embb_slice2
+    sst: 1
+  - &embb_slice3
+    sst: 1
+
 ############## NF-specific configuration
 amf:
  pid_directory: "/var/run"
@@ -110,7 +137,7 @@ amf:
  served_guami_list:
    - mcc: 001
      mnc: 01
-      amf_region_id: 80
+      amf_region_id: 01
      amf_set_id: 001
      amf_pointer: 01
  plmn_support_list:
@@ -118,7 +145,9 @@ amf:
      mnc: 01
      tac: 0x0001
      nssai:
-        - sst: 1
+        - *embb_slice1
+        - *embb_slice2
+        - *embb_slice3
  supported_integrity_algorithms:
    - "NIA1"
    - "NIA2"
@@ -134,7 +163,7 @@ smf:
    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
  # we resolve from NRF, this is just to configure usage_reporting
  upfs:
-    - host: oai-spgwu
+    - host: oai-upf
      config:
        enable_usage_reporting: no
  ue_dns:
@@ -145,40 +174,68 @@ smf:
  ims:
    pcscf_ipv4: "192.168.70.139"
    pcscf_ipv6: "fe80::7915:f408:1787:db8b"
- # the DNN you configure here should be configured in "dnns"
+  # the DNN you configure here should be configured in "dnns"
+  # follows the SmfInfo datatype from 3GPP TS 29.510
+  smf_info:
+    sNssaiSmfInfoList:
+      - sNssai: *embb_slice1
+        dnnSmfInfoList:
+          - dnn: "oai"
+      - sNssai: *embb_slice2
+        dnnSmfInfoList:
+          - dnn: "openairinterface"
+      - sNssai: *embb_slice3
+        dnnSmfInfoList:
+          - dnn: "ims"
  local_subscription_infos:
-    - single_nssai:
-        sst: 1
+    - single_nssai: *embb_slice1
      dnn: "oai"
      qos_profile:
        5qi: 9
        session_ambr_ul: "10Gbps"
        session_ambr_dl: "10Gbps"
-    - single_nssai:
-        sst: 1
+    - single_nssai: *embb_slice2
      dnn: "openairinterface"
      qos_profile:
        5qi: 9
        session_ambr_ul: "10Gbps"
        session_ambr_dl: "10Gbps"
-    - single_nssai:
-        sst: 1
+    - single_nssai: *embb_slice3
      dnn: "ims"
      qos_profile:
        5qi: 9
        session_ambr_ul: "10Gbps"
        session_ambr_dl: "10Gbps"

+upf:
+  support_features:
+    enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
+    enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
+  remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
+  smfs:
+    - host: oai-smf            # To be used for PFCP association in case of no-NRF
+  upf_info:
+    sNssaiUpfInfoList:
+      - sNssai: *embb_slice1
+        dnnUpfInfoList:
+          - dnn: "oai"
+      - sNssai: *embb_slice2
+        dnnUpfInfoList:
+          - dnn: "openairinterface"
+      - sNssai: *embb_slice3
+        dnnUpfInfoList:
+          - dnn: "ims"
+
 ## DNN configuration
 dnns:
  - dnn: "oai"
    pdu_session_type: "IPV4"
-    ipv4_subnet: "12.1.1.2/24"
+    ipv4_subnet: "10.0.0.0/24"
  - dnn: "openairinterface"
    pdu_session_type: "IPV4V6"
-    ipv4_subnet: "12.1.2.2/24"
+    ipv4_subnet: "10.0.1.0/24"
    ipv6_prefix: "2001:1:2::/64"
  - dnn: "ims"
    pdu_session_type: "IPV4V6"
-    ipv4_subnet: "12.1.9.2/24"
+    ipv4_subnet: "10.0.9.0/24"
    ipv6_prefix: "2001:1:2::/64"
--- a/doc/tutorial_resources/oai-cn5g/docker-compose.yaml
+++ b/doc/tutorial_resources/oai-cn5g/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
                ipv4_address: 192.168.70.131
                
    ims:
-        container_name: "asterisk-ims"
+        container_name: "ims"
        image: oaisoftwarealliance/ims:latest
        volumes:
            - ./conf/sip.conf:/etc/asterisk/sip.conf
@@ -129,40 +129,16 @@ services:
        networks:
            public_net:
                ipv4_address: 192.168.70.133
-    oai-spgwu:
-        container_name: "oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:develop
+    oai-upf:
+        container_name: "oai-upf"
+        image: oaisoftwarealliance/oai-upf:develop
        expose:
            - 2152/udp
            - 8805/udp
-            - 8080/tcp
-        # TODO: oai-spgwu-tiny will not support the new common yaml config file feature
-        #       waiting for the new oai-upf NF
+        volumes:
+            - ./conf/config.yaml:/openair-upf/etc/config.yaml
        environment:
            - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.0.0/16
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.70.130
-            - NRF_FQDN=oai-nrf
-            # Mandatory to set the NRF PORT to 8080 (it is set to default to 80 otherwise)
-            - HTTP_VERSION=2
-            - NRF_PORT=8080
-            # Slice 0 (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - DNN_0=oai
-            # Slice 1 (1, 0xFFFFFF)
-            - NSSAI_SST_1=1
-            - DNN_1=openairinterface
-            # Slice 2 (1, 0xFFFFFF)
-            - NSSAI_SST_2=1
-            - DNN_2=ims
        depends_on:
            - oai-nrf
            - oai-smf
@@ -181,10 +157,10 @@ services:
        container_name: oai-ext-dn
        image: oaisoftwarealliance/trf-gen-cn5g:jammy
        entrypoint: /bin/bash -c \
-              "ip route add 12.1.0.0/16 via 192.168.70.134 dev eth0; ip route; sleep infinity"
+              "ip route add 10.0.0.0/16 via 192.168.70.134 dev eth0; ip route; sleep infinity"
        command: ["/bin/bash", "-c", "trap : SIGTERM SIGINT; sleep infinity & wait"]
        healthcheck:
-            test: /bin/bash -c "ip r | grep 12.1.0"
+            test: /bin/bash -c "ip r | grep 10.0.0"
            interval: 5s
            timeout: 2s
            retries: 10

--- a/executables/nr-cuup.c
+++ b/executables/nr-cuup.c
@@ -57,7 +57,8 @@ static void initialize_agent(ngran_node_t node_type, e2_agent_args_t oai_args)

  // Only 1 instances is supported in one executable
  // Advice: run multiple executables to have multiple instances
-  const e1ap_upcp_inst_t *e1inst = getCxtE1(CUuniqInstance);
+  const instance_t e1_inst = 0;
+  const e1ap_upcp_inst_t *e1inst = getCxtE1(e1_inst);

  const int nb_id = e1inst->gnb_id;
  const int cu_up_id = e1inst->cuup.setupReq.gNB_cu_up_id;
@@ -155,6 +156,10 @@ int main(int argc, char **argv)
    exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
  }
  logInit();
+#ifndef PACKAGE_VERSION
+#  define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
+#endif
+  LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
  set_softmodem_sighandler();
  itti_init(TASK_MAX, tasks_info);
  int rc;

--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -299,7 +299,6 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf

  RCconfig_verify(cfg, node_type);

-  RCconfig_NR_L1();
  RCconfig_nr_prs();

  if (RC.nb_nr_macrlc_inst > 0)
@@ -682,11 +681,13 @@ int main( int argc, char **argv ) {
 #endif
  LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);

-  if (RC.nb_nr_L1_inst > 0)
-    RCconfig_NR_L1();

  // don't create if node doesn't connect to RRC/S1/GTP
  const ngran_node_t node_type = get_node_type();
+
+  if (RC.nb_nr_L1_inst > 0)
+    RCconfig_NR_L1();
+
  if (NFAPI_MODE != NFAPI_MODE_PNF) {
    int ret = create_gNB_tasks(node_type, uniqCfg);
    AssertFatal(ret == 0, "cannot create ITTI tasks\n");

--- a/executables/nr-softmodem.h
+++ b/executables/nr-softmodem.h
@@ -47,7 +47,6 @@ extern char *uecap_file;
 // In nr-gnb.c
 extern void init_gNB(int single_thread_flag,int wait_for_sync);
 extern void stop_gNB(int);
-extern void kill_gNB_proc(int inst);

 // In nr-ru.c
 extern void init_NR_RU(configmodule_interface_t *cfg, char *);

--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -343,7 +343,7 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)

    if (is_nr_UL_slot(mac->tdd_UL_DL_ConfigurationCommon, ul_info.slot, mac->frame_type)) {
      LOG_D(NR_MAC, "Slot %d. calling nr_ue_ul_ind()\n", ul_info.slot);
-      nr_ue_ul_scheduler(&ul_info);
+      nr_ue_ul_scheduler(mac, &ul_info);
    }
    process_queued_nr_nfapi_msgs(mac, sfn_slot);
  }
@@ -987,6 +987,8 @@ void init_NR_UE(int nb_inst, char *uecap_file, char *reconfig_file, char *rbconf
      init_nsa_message(rrc_inst, reconfig_file, rbconfig_file);
      nr_rlc_activate_srb0(mac_inst->crnti, NULL, send_srb0_rrc);
    }
+    //TODO: Move this call to RRC
+    start_sidelink((&rrc_inst[i])->ue_id);
  }
 }


--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -44,7 +44,6 @@ extern "C"
  example: -1,3 launches two working threads one floating, the second set on core 3\n\
  default 8 floating threads\n\
  use N for no pool (runs in calling thread) recommended with rfsim.\n"
-#define CONFIG_HLP_REORDER       "Disable reorder thread\n"
 #define CONFIG_HLP_ULMAXE        "set the eNodeB max ULSCH erros\n"
 #define CONFIG_HLP_CALUER        "set UE RX calibration\n"
 #define CONFIG_HLP_CALUERM       ""
@@ -106,11 +105,9 @@ extern "C"
 #define CONFIG_L1_EMULATOR       "Run in L1 emulated mode (disable PHY layer)\n"
 #define CONFIG_HLP_CONTINUOUS_TX "perform continuous transmission, even in TDD mode (to work around USRP issues)\n"
 #define CONFIG_HLP_STATS_DISABLE "disable globally the stats generation and persistence"
-#define CONFIG_HLP_SYNC_REF      "Sync Reference in Sidelink\n"
-#define CONFIG_HLP_NID1          "Set NID1 value in Sidelink\n"
-#define CONFIG_HLP_NID2          "Set NID2 value in Sidelink\n"
 #define CONFIG_HLP_NOITTI        "Do not start itti threads, call queue processing in place, inside the caller thread"
 #define CONFIG_HLP_LDPC_OFFLOAD  "Enable LDPC offload to AMD Xilinx T2 telco card\n"
+#define CONFIG_HLP_SYNC_REF      "UE acts a Sync Reference in Sidelink. 0-none 1-GNB 2-GNSS 4-localtiming\n"

 /*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            command line parameters common to eNodeB and UE                                                          */
@@ -143,11 +140,8 @@ extern "C"
 #define EMULATE_L1          softmodem_params.emulate_l1
 #define CONTINUOUS_TX       softmodem_params.continuous_tx
 #define SYNC_REF            softmodem_params.sync_ref
-#define NID1                softmodem_params.nid1
-#define NID2                softmodem_params.nid2
 #define LDPC_OFFLOAD_FLAG   softmodem_params.ldpc_offload_flag

-#define REORDER_THREAD_DISABLE    softmodem_params.reorder_thread_disable
 #define DEFAULT_RFCONFIG_FILE    "/usr/local/etc/syriq/ue.band7.tm1.PRB100.NR40.dat";

 extern int usrp_tx_thread;
@@ -155,7 +149,6 @@ extern int usrp_tx_thread;
 #define CMDLINE_PARAMS_DESC {  \
  {"rf-config-file",        CONFIG_HLP_RFCFGF,        0,              .strptr=&RF_CONFIG_FILE,                .defstrval=NULL,          TYPE_STRING, 0},  \
  {"thread-pool",           CONFIG_HLP_TPOOL,         0,              .strptr=&TP_CONFIG,                     .defstrval="-1,-1,-1,-1,-1,-1,-1,-1",  TYPE_STRING, 0},     \
-  {"reorder-thread-disable",CONFIG_HLP_REORDER,     PARAMFLAG_BOOL,   .iptr=&REORDER_THREAD_DISABLE,          .defintval=0,                          TYPE_INT,    0},                     \
  {"phy-test",              CONFIG_HLP_PHYTST,        PARAMFLAG_BOOL, .iptr=&PHY_TEST,                        .defintval=0,             TYPE_INT,    0},  \
  {"do-ra",                 CONFIG_HLP_DORA,          PARAMFLAG_BOOL, .iptr=&DO_RA,                           .defintval=0,             TYPE_INT,    0},  \
  {"sa",                    CONFIG_HLP_SA,            PARAMFLAG_BOOL, .iptr=&SA,                              .defintval=0,             TYPE_INT,    0},  \
@@ -191,10 +184,9 @@ extern int usrp_tx_thread;
  {"emulate-l1",            CONFIG_L1_EMULATOR,       PARAMFLAG_BOOL, .iptr=&EMULATE_L1,                      .defintval=0,             TYPE_INT,    0},  \
  {"continuous-tx",         CONFIG_HLP_CONTINUOUS_TX, PARAMFLAG_BOOL, .iptr=&CONTINUOUS_TX,                   .defintval=0,             TYPE_INT,    0},  \
  {"disable-stats",         CONFIG_HLP_STATS_DISABLE, PARAMFLAG_BOOL, .iptr=&stats_disabled,                  .defintval=0,             TYPE_INT,    0},  \
-  {"nid1",                  CONFIG_HLP_NID1,          0,              .iptr=&NID1,                            .defintval=10,            TYPE_INT,    0},  \
-  {"nid2",                  CONFIG_HLP_NID2,          0,              .iptr=&NID2,                            .defintval=1,             TYPE_INT,    0},  \
  {"no-itti-threads",       CONFIG_HLP_NOITTI,        PARAMFLAG_BOOL, .iptr=&softmodem_params.no_itti,        .defintval=0,             TYPE_INT,    0},  \
  {"ldpc-offload-enable",   CONFIG_HLP_LDPC_OFFLOAD,  PARAMFLAG_BOOL, .iptr=&LDPC_OFFLOAD_FLAG,               .defstrval=0,             TYPE_INT,    0},  \
+  {"sync-ref",              CONFIG_HLP_SYNC_REF,      0,              .uptr=&SYNC_REF,                        .defintval=0,             TYPE_UINT,   0},  \
 }
 // clang-format on

@@ -232,7 +224,6 @@ extern int usrp_tx_thread;
    { .s5 = { NULL } },                     \
    { .s5 = { NULL } },                     \
    { .s5 = { NULL } },                     \
-    { .s5 = { NULL } },                     \
    { .s3a = { config_checkstr_assign_integer, \
               {"MONOLITHIC", "PNF", "VNF","UE_STUB_PNF","UE_STUB_OFFNET","STANDALONE_PNF"}, \
               {NFAPI_MONOLITHIC, NFAPI_MODE_PNF, NFAPI_MODE_VNF,NFAPI_UE_STUB_PNF,NFAPI_UE_STUB_OFFNET,NFAPI_MODE_STANDALONE_PNF}, \
@@ -326,8 +317,7 @@ typedef struct {
  uint64_t       optmask;
  //THREAD_STRUCT  thread_struct;
  char           *rf_config_file;
-  char           *threadPoolConfig;
-  int            reorder_thread_disable;
+  char *threadPoolConfig;
  int            phy_test;
  int            do_ra;
  int            sa;
@@ -353,9 +343,7 @@ typedef struct {
  int            non_stop;
  int            emulate_l1;
  int            continuous_tx;
-  int            sync_ref;
-  int            nid1;
-  int            nid2;
+  uint32_t       sync_ref;
  int no_itti;
  int ldpc_offload_flag;
 } softmodem_params_t;
@@ -375,7 +363,6 @@ extern uint16_t sl_ahead;
 extern uint16_t sf_ahead;
 extern int oai_exit;

-void tx_func(void *param);
 void rx_func(void *param);
 void ru_tx_func(void *param);
 extern uint8_t nfapi_mode;

--- a/nfapi/oai_integration/nfapi_vnf.c
+++ b/nfapi/oai_integration/nfapi_vnf.c
@@ -1244,7 +1244,6 @@ int phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind) {

 int phy_nr_srs_indication(nfapi_nr_srs_indication_t *ind) {
  struct PHY_VARS_gNB_s *gNB = RC.gNB[0];
-  pthread_mutex_lock(&gNB->UL_INFO_mutex);

  gNB->UL_INFO.srs_ind = *ind;

@@ -1260,8 +1259,6 @@ int phy_nr_srs_indication(nfapi_nr_srs_indication_t *ind) {
        );
  }

-  pthread_mutex_unlock(&gNB->UL_INFO_mutex);
-
  return 1;
 }
 //end NR phy indication

--- a/nfapi/open-nFAPI/nfapi/public_inc/sidelink_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/sidelink_nr_ue_interface.h
@@ -351,7 +351,7 @@ typedef struct
  uint16_t sl_bandwidth;
  //Absolute frequency of SL point A in KHz
  //n38 (2570-2620 Mhz), n47 (5855-5925 Mhz) are defined.
-  uint32_t sl_frequency;
+  uint64_t sl_frequency;

  //Only 1 SCS-SpecificCarrier allowed for NR-SL communication
  uint16_t sl_grid_size;// bandwidth for each numerology
@@ -363,7 +363,7 @@ typedef struct
  uint8_t  sl_frequency_shift_7p5khz;
  //Indicates presence of +/-5Khz shift wrt FREF for V2X reference frequencies.
  //Possible values: {-1,0,1}
-  uint8_t  sl_value_N;
+  int8_t  sl_value_N;

 } sl_nr_carrier_config_t;


--- a/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
+++ b/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
@@ -182,7 +182,6 @@ int nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t* config)
 		NFAPI_TRACE(NFAPI_TRACE_DEBUG, "This is the slot_ind queue size %ld in %s():%d\n",
 			    gnb_slot_ind_queue.num_items, __FUNCTION__, __LINE__);
 		if (slot_ind) {
-			pthread_mutex_lock(&gNB->UL_INFO_mutex);
 			gNB->UL_INFO.frame     = slot_ind->sfn;
 			gNB->UL_INFO.slot      = slot_ind->slot;

@@ -198,7 +197,6 @@ int nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t* config)
 				gNB->if_inst->NR_UL_indication(&gNB->UL_INFO);
 				prev_slot = gNB->UL_INFO.slot;
 			}
-			pthread_mutex_unlock(&gNB->UL_INFO_mutex);
 			free(slot_ind);
 			slot_ind = NULL;
 		}

--- a/openair1/PHY/NR_TRANSPORT/nr_prach.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_prach.c
@@ -76,11 +76,11 @@ void nr_fill_prach(PHY_VARS_gNB *gNB,
 		   nfapi_nr_prach_pdu_t *prach_pdu) {

  int prach_id = find_nr_prach(gNB,SFN,Slot,SEARCH_EXIST_OR_FREE);
-  AssertFatal( ((prach_id>=0) && (prach_id<NUMBER_OF_NR_PRACH_MAX)) || (prach_id < 0),
-              "illegal or no prach_id found!!! prach_id %d\n",prach_id);
+  AssertFatal(((prach_id >= 0) && (prach_id < NUMBER_OF_NR_PRACH_MAX)), "illegal or no prach_id found!!! prach_id %d\n", prach_id);

  gNB->prach_vars.list[prach_id].frame=SFN;
  gNB->prach_vars.list[prach_id].slot=Slot;
+  LOG_D(NR_PHY,"Copying prach pdu %d bytes to index %d\n",(int)sizeof(*prach_pdu),prach_id);
  memcpy((void*)&gNB->prach_vars.list[prach_id].pdu,(void*)prach_pdu,sizeof(*prach_pdu));

 }

--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch.c
@@ -74,8 +74,8 @@ void nr_fill_ulsch(PHY_VARS_gNB *gNB, int frame, int slot, nfapi_nr_pusch_pdu_t
  NR_UL_gNB_HARQ_t *harq = ulsch->harq_process;
  if (ulsch_pdu->pusch_data.new_data_indicator)
    harq->harq_to_be_cleared = true;
-  LOG_D(PHY,
-        "%d.%d RNTI %x HARQ PID %d new data indicator %d\n",
+  LOG_D(NR_PHY,
+        "NEW ULSCH %d.%d RNTI %x HARQ PID %d new data indicator %d\n",
        frame,
        slot,
        ulsch_pdu->rnti,
@@ -98,8 +98,17 @@ void reset_active_ulsch(PHY_VARS_gNB *gNB, int frame)
  // assuming UE disconnected or some other error occurred
  for (int i = 0; i < gNB->max_nb_pusch; i++) {
    NR_gNB_ULSCH_t *ulsch = &gNB->ulsch[i];
-    if (ulsch->active && (((frame - ulsch->frame + 1024) % 1024) > NUMBER_FRAMES_PHY_UE_INACTIVE))
+    int diff = (frame - ulsch->frame + 1024) & 1023;
+    if (ulsch->active && diff > NUMBER_FRAMES_PHY_UE_INACTIVE && diff < 100) {
      ulsch->active = false;
+      LOG_D(NR_PHY,
+            "Frame %d: resetting ulsch %d harq %d (programmed in %d.%d)\n",
+            frame,
+            i,
+            ulsch->harq_pid,
+            ulsch->frame,
+            ulsch->slot);
+    }
  }
 }


--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
@@ -1409,7 +1409,7 @@ static void nr_pusch_symbol_processing(void *arg)

    if (gNB->pusch_vars[ulsch_id].ul_valid_re_per_slot[symbol] == 0) 
      continue;
-    int soffset = (slot&3)*frame_parms->symbols_per_slot*frame_parms->ofdm_symbol_size;
+    int soffset = (slot % RU_RX_SLOT_DEPTH) * frame_parms->symbols_per_slot * frame_parms->ofdm_symbol_size;
    inner_rx(gNB,
             ulsch_id,
             slot,
@@ -1591,7 +1591,7 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,

  // extract the first dmrs for the channel level computation
  // extract the data in the OFDM frame, to the start of the array
-  int soffset = (slot&3)*frame_parms->symbols_per_slot*frame_parms->ofdm_symbol_size;
+  int soffset = (slot % RU_RX_SLOT_DEPTH) * frame_parms->symbols_per_slot * frame_parms->ofdm_symbol_size;

  nb_re_pusch = (nb_re_pusch + 15) & ~15;


--- a/openair1/PHY/NR_TRANSPORT/pucch_rx.c
+++ b/openair1/PHY/NR_TRANSPORT/pucch_rx.c
@@ -501,7 +501,7 @@ void nr_decode_pucch1(c16_t **rxdataF,
   * Implement TS 38.211 Subclause 6.3.2.4.1 Sequence modulation
   *
   */
-  const int soffset = (nr_tti_tx & 3) * frame_parms->symbols_per_slot * frame_parms->ofdm_symbol_size;
+  const int soffset = (nr_tti_tx % RU_RX_SLOT_DEPTH) * frame_parms->symbols_per_slot * frame_parms->ofdm_symbol_size;
  // lprime is the index of the OFDM symbol in the slot that corresponds to the first OFDM symbol of the PUCCH transmission in the slot given by [5, TS 38.213]
  const int lprime = startingSymbolIndex;
  // mcs = 0 except for PUCCH format 0
@@ -1021,14 +1021,10 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
  //extract pucch and dmrs first

  int l2 = pucch_pdu->start_symbol_index;
-
-  int soffset = (slot & 3) * frame_parms->symbols_per_slot * frame_parms->ofdm_symbol_size;
-
+  int soffset = (slot % RU_RX_SLOT_DEPTH) * frame_parms->symbols_per_slot * frame_parms->ofdm_symbol_size;
  int re_offset[2];
  re_offset[0] =
      (12 * (pucch_pdu->prb_start + pucch_pdu->bwp_start) + frame_parms->first_carrier_offset) % frame_parms->ofdm_symbol_size;
-  if (re_offset[0]>= frame_parms->ofdm_symbol_size)
-    re_offset[0]-=frame_parms->ofdm_symbol_size;
  if (pucch_pdu->freq_hop_flag == 0)
    re_offset[1] = re_offset[0];
  else {

--- a/openair1/PHY/NR_TRANSPORT/srs_rx.c
+++ b/openair1/PHY/NR_TRANSPORT/srs_rx.c
@@ -34,6 +34,7 @@
 #include "PHY/impl_defs_nr.h"
 #include "PHY/defs_nr_common.h"
 #include "PHY/defs_gNB.h"
+#include "PHY/defs_RU.h"
 #include "PHY/CODING/nrSmallBlock/nr_small_block_defs.h"
 #include "PHY/NR_UE_TRANSPORT/srs_modulation_nr.h"
 #include "common/utils/LOG/log.h"
@@ -75,7 +76,7 @@ int nr_get_srs_signal(PHY_VARS_gNB *gNB,
  c16_t **rxdataF = gNB->common_vars.rxdataF;
  const NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;

-  const uint16_t n_symbols = (slot&3)*frame_parms->symbols_per_slot;                    // number of symbols until this slot
+  const uint16_t n_symbols = (slot % RU_RX_SLOT_DEPTH) * frame_parms->symbols_per_slot; // number of symbols until this slot
  const uint8_t l0 = frame_parms->symbols_per_slot - 1 - srs_pdu->time_start_position;  // starting symbol in this slot
  const uint64_t symbol_offset = (n_symbols+l0)*frame_parms->ofdm_symbol_size;
  const uint64_t subcarrier_offset = frame_parms->first_carrier_offset + srs_pdu->bwp_start*NR_NB_SC_PER_RB;

--- a/openair1/PHY/defs_RU.h
+++ b/openair1/PHY/defs_RU.h
@@ -197,7 +197,7 @@ typedef struct {

 #define NUMBER_OF_NR_RU_PRACH_MAX 8
 #define NUMBER_OF_NR_RU_PRACH_OCCASIONS_MAX 12
-
+#define RU_RX_SLOT_DEPTH 4
 typedef struct RU_proc_t_s {
  /// Pointer to associated RU descriptor
  struct RU_t_s *ru;

--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -562,7 +562,6 @@ typedef struct PHY_VARS_gNB_s {
  PHY_MEASUREMENTS_gNB measurements;
  NR_IF_Module_t       *if_inst;
  NR_UL_IND_t          UL_INFO;
-  pthread_mutex_t      UL_INFO_mutex;

  /// NFAPI RX ULSCH information
  nfapi_nr_rx_data_pdu_t  rx_pdu_list[MAX_UL_PDUS_PER_SLOT];
@@ -640,8 +639,6 @@ typedef struct PHY_VARS_gNB_s {

  int ldpc_offload_flag;

-  int reorder_thread_disable;
-
  int max_ldpc_iterations;
  /// indicate the channel estimation technique in time domain
  int chest_time;
@@ -694,8 +691,8 @@ typedef struct PHY_VARS_gNB_s {
  time_stats_t rx_pusch_init_stats;
  time_stats_t rx_pusch_symbol_processing_stats;
  time_stats_t ul_indication_stats;
+  time_stats_t slot_indication_stats;
  time_stats_t schedule_response_stats;
-  time_stats_t ulsch_decoding_stats;
  time_stats_t ulsch_ldpc_decoding_stats;
  time_stats_t ulsch_deinterleaving_stats;
  time_stats_t ulsch_channel_estimation_stats;
@@ -719,6 +716,7 @@ typedef struct PHY_VARS_gNB_s {
  notifiedFIFO_t L1_tx_free;
  notifiedFIFO_t L1_tx_filled;
  notifiedFIFO_t L1_tx_out;
+  notifiedFIFO_t L1_rx_out;
  notifiedFIFO_t resp_RU_tx;
  tpool_t threadPool;
  int nbSymb;
@@ -796,9 +794,7 @@ union ldpcReqUnion {

 typedef struct processingData_L1 {
  int frame_rx;
-  int frame_tx;
  int slot_rx;
-  int slot_tx;
  openair0_timestamp timestamp_tx;
  PHY_VARS_gNB *gNB;
 } processingData_L1_t;
@@ -812,6 +808,8 @@ typedef enum {
 typedef struct processingData_L1tx {
  int frame;
  int slot;
+  int frame_rx;
+  int slot_rx;
  openair0_timestamp timestamp_tx;
  PHY_VARS_gNB *gNB;
  nfapi_nr_dl_tti_pdcch_pdu pdcch_pdu[NFAPI_NR_MAX_NB_CORESETS];
@@ -826,4 +824,9 @@ typedef struct processingData_L1tx {
  int sched_response_id;
 } processingData_L1tx_t;

+typedef struct processingData_L1rx {
+  int frame_rx;
+  int slot_rx;
+  PHY_VARS_gNB *gNB;
+} processingData_L1rx_t;
 #endif
--- a/openair1/SCHED_NR/fapi_nr_l1.c
+++ b/openair1/SCHED_NR/fapi_nr_l1.c
@@ -55,7 +55,7 @@ void handle_nr_nfapi_ssb_pdu(processingData_L1tx_t *msgTx,int frame,int slot,

  uint8_t i_ssb = dl_tti_pdu->ssb_pdu.ssb_pdu_rel15.SsbBlockIndex;

-  LOG_D(PHY,"%d.%d : ssb index %d pbch_pdu: %x\n",frame,slot,i_ssb,dl_tti_pdu->ssb_pdu.ssb_pdu_rel15.bchPayload);
+  LOG_D(NR_PHY,"%d.%d : ssb index %d pbch_pdu: %x\n",frame,slot,i_ssb,dl_tti_pdu->ssb_pdu.ssb_pdu_rel15.bchPayload);
  if (msgTx->ssb[i_ssb].active)
    AssertFatal(1==0,"SSB PDU with index %d already active\n",i_ssb);
  else {
@@ -109,7 +109,7 @@ void handle_nfapi_nr_csirs_pdu(processingData_L1tx_t *msgTx, int frame, int slot
  for (int id = 0; id < NR_SYMBOLS_PER_SLOT; id++) {
    NR_gNB_CSIRS_t *csirs = &msgTx->csirs_pdu[id];
    if (csirs->active == 0) {
-      LOG_D(PHY,"Frame %d Slot %d CSI_RS with ID %d is now active\n",frame,slot,id);
+      LOG_D(NR_PHY,"Frame %d Slot %d CSI_RS with ID %d is now active\n",frame,slot,id);
      csirs->active = 1;
      memcpy((void*)&csirs->csirs_pdu, (void*)csirs_pdu, sizeof(nfapi_nr_dl_tti_csi_rs_pdu));
      found = 1;
@@ -156,21 +156,9 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
  uint8_t number_tx_data_pdu        = (TX_req == NULL) ? 0 : TX_req->Number_of_PDUs;

  if (NFAPI_MODE == NFAPI_MONOLITHIC){
-
    if (slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT) {
-      notifiedFIFO_elt_t *res=NULL;
      processingData_L1tx_t *msgTx=NULL;
-      if (!gNB->reorder_thread_disable) {
-        res = pullNotifiedFIFO(&gNB->L1_tx_free);
-        if (res == NULL)
-          return; // Tpool has been stopped, nothing to process
-        msgTx = (processingData_L1tx_t *)NotifiedFifoData(res);
-      } else {
-        msgTx = gNB->msgDataTx; //newNotifiedFIFO_elt(sizeof(processingData_L1tx_t),0, &gNB->L1_tx_out,NULL);
-      }
-      /*const time_stats_t ts = exec_time_stats_NotifiedFIFO(res);
-      merge_meas(&gNB->phy_proc_tx, &ts);
-*/
+      msgTx = gNB->msgDataTx;
      msgTx->num_pdsch_slot = 0;
      msgTx->num_dl_pdcch = 0;
      msgTx->num_ul_pdcch = number_ul_dci_pdu;
@@ -181,7 +169,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)

      for (int i=0;i<number_dl_pdu;i++) {
        nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu = &DL_req->dl_tti_request_body.dl_tti_pdu_list[i];
-        LOG_D(PHY,"NFAPI: dl_pdu %d : type %d\n",i,dl_tti_pdu->PDUType);
+        LOG_D(NR_PHY,"NFAPI: dl_pdu %d : type %d\n",i,dl_tti_pdu->PDUType);
        switch (dl_tti_pdu->PDUType) {
          case NFAPI_NR_DL_TTI_SSB_PDU_TYPE:
            handle_nr_nfapi_ssb_pdu(msgTx,frame,slot,
@@ -189,18 +177,18 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
            break;

          case NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE:
-            LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
+            LOG_D(NR_PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
            msgTx->pdcch_pdu[msgTx->num_dl_pdcch] = dl_tti_pdu->pdcch_pdu;
            msgTx->num_dl_pdcch++;
            break;

          case NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE:
-            LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
+            LOG_D(NR_PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
            handle_nfapi_nr_csirs_pdu(msgTx,frame,slot,&dl_tti_pdu->csi_rs_pdu);
            break;

          case NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE:
-            LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
+            LOG_D(NR_PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
            nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdsch_pdu_rel15 = &dl_tti_pdu->pdsch_pdu.pdsch_pdu_rel15;
            uint16_t pduIndex = pdsch_pdu_rel15->pduIndex;
            AssertFatal(TX_req->pdu_list[pduIndex].num_TLV == 1, "TX_req->pdu_list[%d].num_TLV %d != 1\n",
@@ -222,29 +210,27 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
       * released only when both threads are done with it.
       */
      inc_ref_sched_response(Sched_INFO->sched_response_id);
-      if (!gNB->reorder_thread_disable)
-	pushNotifiedFIFO(&gNB->L1_tx_filled,res);
    }

    for (int i = 0; i < number_ul_tti_pdu; i++) {
      switch (UL_tti_req->pdus_list[i].pdu_type) {
        case NFAPI_NR_UL_CONFIG_PUSCH_PDU_TYPE:
-          LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_UL_TTI_PUSCH_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
+          LOG_D(NR_PHY,"frame %d, slot %d, Got NFAPI_NR_UL_TTI_PUSCH_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
          nr_fill_ulsch(gNB,UL_tti_req->SFN, UL_tti_req->Slot, &UL_tti_req->pdus_list[i].pusch_pdu);
          break;
        case NFAPI_NR_UL_CONFIG_PUCCH_PDU_TYPE:
-          LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_UL_TTI_PUCCH_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
+          LOG_D(NR_PHY,"frame %d, slot %d, Got NFAPI_NR_UL_TTI_PUCCH_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
          nr_fill_pucch(gNB,UL_tti_req->SFN, UL_tti_req->Slot, &UL_tti_req->pdus_list[i].pucch_pdu);
          break;
        case NFAPI_NR_UL_CONFIG_PRACH_PDU_TYPE:
-          LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_UL_TTI_PRACH_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
+          LOG_D(NR_PHY,"frame %d, slot %d, Got NFAPI_NR_UL_TTI_PRACH_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
          nfapi_nr_prach_pdu_t *prach_pdu = &UL_tti_req->pdus_list[i].prach_pdu;
          nr_fill_prach(gNB, UL_tti_req->SFN, UL_tti_req->Slot, prach_pdu);
          if (gNB->RU_list[0]->if_south == LOCAL_RF || 
              gNB->RU_list[0]->if_south == REMOTE_IF5) nr_fill_prach_ru(gNB->RU_list[0], UL_tti_req->SFN, UL_tti_req->Slot, prach_pdu);
          break;
        case NFAPI_NR_UL_CONFIG_SRS_PDU_TYPE:
-          LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_UL_CONFIG_SRS_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
+          LOG_D(NR_PHY,"frame %d, slot %d, Got NFAPI_NR_UL_CONFIG_SRS_PDU_TYPE for %d.%d\n", frame, slot, UL_tti_req->SFN, UL_tti_req->Slot);
          nr_fill_srs(gNB,UL_tti_req->SFN, UL_tti_req->Slot, &UL_tti_req->pdus_list[i].srs_pdu);
          break;
      }
@@ -267,7 +253,9 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
  }

  /* this thread is done with the sched_info, decrease the reference counter */
-  deref_sched_response(Sched_INFO->sched_response_id);
-
+  if (slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT) {
+    LOG_D(NR_PHY, "Calling dref_sched_response for id %d in %d.%d (sched_response)\n", Sched_INFO->sched_response_id, frame, slot);
+    deref_sched_response(Sched_INFO->sched_response_id);
+  }
  stop_meas(&gNB->schedule_response_stats);
 }
--- a/openair1/SCHED_NR/nr_prach_procedures.c
+++ b/openair1/SCHED_NR/nr_prach_procedures.c
@@ -120,6 +120,7 @@ void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot) {
  int prach_id=find_nr_prach(gNB,frame,slot,SEARCH_EXIST);

  if (prach_id>=0) {
+    LOG_D(NR_PHY,"%d.%d Got prach entry id %d\n",frame,slot,prach_id);
    nfapi_nr_prach_pdu_t *prach_pdu = &gNB->prach_vars.list[prach_id].pdu;
    uint8_t prachStartSymbol;
    uint8_t N_dur = get_nr_prach_duration(prach_pdu->prach_format);
@@ -140,9 +141,9 @@ void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot) {
 		  &max_preamble[0],
 		  &max_preamble_energy[0],
 		  &max_preamble_delay[0]);
-
+      LOG_D(NR_PHY,"Freeing PRACH entry %d\n",prach_id);
      free_nr_prach_entry(gNB,prach_id);
-      LOG_D(PHY,"[RAPROC] Frame %d, slot %d, occasion %d (prachStartSymbol %d) : Most likely preamble %d, energy %d.%d dB delay %d (prach_energy counter %d)\n",
+      LOG_D(NR_PHY,"[RAPROC] Frame %d, slot %d, occasion %d (prachStartSymbol %d) : Most likely preamble %d, energy %d.%d dB delay %d (prach_energy counter %d)\n",
 	    frame,slot,prach_oc,prachStartSymbol,
 	    max_preamble[0],
 	    max_preamble_energy[0]/10,

--- a/openair1/SCHED_NR/nr_ru_procedures.c
+++ b/openair1/SCHED_NR/nr_ru_procedures.c
@@ -242,7 +242,7 @@ void nr_fep_full(RU_t *ru, int slot) {

  // remove_7_5_kHz(ru,proc->tti_rx<<1);
  // remove_7_5_kHz(ru,1+(proc->tti_rx<<1));
-  int offset = (proc->tti_rx&3)*(fp->symbols_per_slot * fp->ofdm_symbol_size);
+  int offset = (proc->tti_rx % RU_RX_SLOT_DEPTH) * (fp->symbols_per_slot * fp->ofdm_symbol_size);
  for (l = 0; l < fp->symbols_per_slot; l++) {
    for (aa = 0; aa < fp->nb_antennas_rx; aa++) {
      nr_slot_fep_ul(fp,
@@ -378,7 +378,7 @@ void nr_fep(void* arg) {

  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX+aid, 1);

-  int offset = (tti_rx&3) * fp->symbols_per_slot * fp->ofdm_symbol_size;
+  int offset = (tti_rx % RU_RX_SLOT_DEPTH) * fp->symbols_per_slot * fp->ofdm_symbol_size;
  for (int l = startSymbol; l <= endSymbol; l++) 
      nr_slot_fep_ul(fp,
                     ru->common.rxdata[aid],

--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -272,10 +272,11 @@ static void nr_postDecode(PHY_VARS_gNB *gNB, notifiedFIFO_elt_t *req)
    }

    if (crc_valid && !check_abort(&ulsch_harq->abort_decode) && !gNB->pusch_vars[rdata->ulsch_id].DTX) {
-      LOG_D(PHY,
-            "[gNB %d] ULSCH: Setting ACK for SFN/SF %d.%d (rnti %x, pid %d, ndi %d, status %d, round %d, TBS %d, Max interation "
+      LOG_D(NR_PHY,
+            "[gNB %d] ULSCH %d: Setting ACK for SFN/SF %d.%d (rnti %x, pid %d, ndi %d, status %d, round %d, TBS %d, Max interation "
            "(all seg) %d)\n",
            gNB->Mod_id,
+            rdata->ulsch_id,
            ulsch->frame,
            ulsch->slot,
            ulsch->rnti,
@@ -316,7 +317,7 @@ static void nr_postDecode(PHY_VARS_gNB *gNB, notifiedFIFO_elt_t *req)
        if (ulsch_harq->ulsch_pdu.mcs_index == 0 && dumpsig==1) {
          int off = ((ulsch_harq->ulsch_pdu.rb_size&1) == 1)? 4:0;

-          LOG_M("rxsigF0.m","rxsF0",&gNB->common_vars.rxdataF[0][(ulsch_harq->slot&3)*gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot],gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot,1,1);
+          LOG_M("rxsigF0.m","rxsF0",&gNB->common_vars.rxdataF[0][(ulsch_harq->slot%RU_RX_SLOT_DEPTH)*gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot],gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot,1,1);
          LOG_M("rxsigF0_ext.m","rxsF0_ext",
                 &gNB->pusch_vars[0].rxdataF_ext[0][ulsch_harq->ulsch_pdu.start_symbol_index*NR_NB_SC_PER_RB *
       ulsch_harq->ulsch_pdu.rb_size],ulsch_harq->ulsch_pdu.nr_of_symbols*(off+(NR_NB_SC_PER_RB *
@@ -400,7 +401,6 @@ static int nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int
  //--------------------- ULSCH decoding ---------------------
  //----------------------------------------------------------

-  start_meas(&gNB->ulsch_decoding_stats);
  int nbDecode =
      nr_ulsch_decoding(gNB, ULSCH_id, gNB->pusch_vars[ULSCH_id].llr, frame_parms, pusch_pdu, frame_rx, slot_rx, harq_pid, G);

@@ -410,9 +410,6 @@ static int nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int

 void nr_fill_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_id, uint8_t harq_pid, uint8_t crc_flag, int dtx_flag)
 {
-  if (!get_softmodem_params()->reorder_thread_disable) 
-    pthread_mutex_lock(&gNB->UL_INFO_mutex);
-
  NR_gNB_ULSCH_t *ulsch = &gNB->ulsch[ULSCH_id];
  NR_UL_gNB_HARQ_t *harq_process = ulsch->harq_process;
  NR_gNB_PHY_STATS_t *stats = get_phy_stats(gNB, ulsch->rnti);
@@ -467,7 +464,13 @@ void nr_fill_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_id,
      __attribute__((unused))
      int off = ((pusch_pdu->rb_size&1) == 1)? 4:0;

-      LOG_M("rxsigF0.m","rxsF0",&gNB->common_vars.rxdataF[0][(slot_rx&3)*gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot],gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot,1,1);
+      LOG_M("rxsigF0.m",
+            "rxsF0",
+            &gNB->common_vars
+                 .rxdataF[0][(slot_rx % RU_RX_SLOT_DEPTH) * gNB->frame_parms.ofdm_symbol_size * gNB->frame_parms.symbols_per_slot],
+            gNB->frame_parms.ofdm_symbol_size * gNB->frame_parms.symbols_per_slot,
+            1,
+            1);
      LOG_M("chestF0.m",
            "chF0",
            &gNB->pusch_vars[0].ul_ch_estimates[0][pusch_pdu->start_symbol_index * gNB->frame_parms.ofdm_symbol_size],
@@ -494,7 +497,14 @@ void nr_fill_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_id,
            1,
            0);
      if (gNB->frame_parms.nb_antennas_rx > 1) {
-        LOG_M("rxsigF1.m","rxsF1",&gNB->common_vars.rxdataF[1][(slot_rx&3)*gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot],gNB->frame_parms.ofdm_symbol_size*gNB->frame_parms.symbols_per_slot,1,1);
+        LOG_M(
+            "rxsigF1.m",
+            "rxsF1",
+            &gNB->common_vars
+                 .rxdataF[1][(slot_rx % RU_RX_SLOT_DEPTH) * gNB->frame_parms.ofdm_symbol_size * gNB->frame_parms.symbols_per_slot],
+            gNB->frame_parms.ofdm_symbol_size * gNB->frame_parms.symbols_per_slot,
+            1,
+            1);
        LOG_M("chestF1.m",
              "chF1",
              &gNB->pusch_vars[0].ul_ch_estimates[1][pusch_pdu->start_symbol_index * gNB->frame_parms.ofdm_symbol_size],
@@ -557,9 +567,6 @@ void nr_fill_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_id,
  }

  gNB->UL_INFO.rx_ind.number_of_pdus++;
-
-  if (!get_softmodem_params()->reorder_thread_disable) 
-    pthread_mutex_unlock(&gNB->UL_INFO_mutex);
 }

 // Function to fill UL RB mask to be used for N0 measurements
@@ -834,9 +841,9 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
    NR_gNB_ULSCH_t *ulsch = &gNB->ulsch[ULSCH_id];
    NR_UL_gNB_HARQ_t *ulsch_harq = ulsch->harq_process;
    AssertFatal(ulsch_harq != NULL, "harq_pid %d is not allocated\n", ulsch->harq_pid);
-
    if ((ulsch->active == true) && (ulsch->frame == frame_rx) && (ulsch->slot == slot_rx) && (ulsch->handled == 0)) {
      LOG_D(PHY, "PUSCH ID %d with RNTI %x detection started in frame %d slot %d\n", ULSCH_id, ulsch->rnti, frame_rx, slot_rx);
+  
      int num_dmrs = 0;
      for (int s = 0; s < NR_NUMBER_OF_SYMBOLS_PER_SLOT; s++)
        num_dmrs += (ulsch_harq->ulsch_pdu.ul_dmrs_symb_pos >> s) & 1;
@@ -941,7 +948,6 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
      delNotifiedFIFO_elt(req);
      totalDecode--;
    }
-  stop_meas(&gNB->ulsch_decoding_stats);
  for (int i = 0; i < gNB->max_nb_srs; i++) {
    NR_gNB_SRS_t *srs = &gNB->srs[i];
    if (srs) {

--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -895,6 +895,7 @@ int main(int argc, char **argv)
  msgDataTx->slot = slot;
  msgDataTx->frame = frame;
  memset(msgDataTx->ssb, 0, 64*sizeof(NR_gNB_SSB_t));
+  gNB->msgDataTx = msgDataTx;

  // Buffers to store internal memory of slot process
  int rx_size = (((14 * frame_parms->N_RB_DL * 12 * sizeof(int32_t)) + 15) >> 4) << 4;

--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -563,6 +563,7 @@ int main(int argc, char *argv[])
  notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t), 0, &gNB->L1_tx_free, NULL);
  processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
  msgDataTx->slot = -1;
+  gNB->msgDataTx = msgDataTx;
  //gNB_config = &gNB->gNB_config;

  //memset((void *)&gNB->UL_INFO,0,sizeof(gNB->UL_INFO));
@@ -921,7 +922,6 @@ int main(int argc, char *argv[])
    reset_meas(&gNB->rx_pusch_stats);
    reset_meas(&gNB->rx_pusch_init_stats);
    reset_meas(&gNB->rx_pusch_symbol_processing_stats);
-    reset_meas(&gNB->ulsch_decoding_stats);
    reset_meas(&gNB->ulsch_channel_estimation_stats);
    reset_meas(&UE->ulsch_ldpc_encoding_stats);
    reset_meas(&UE->ulsch_rate_matching_stats);
@@ -1546,7 +1546,6 @@ int main(int argc, char *argv[])
      printStatIndent2(&gNB->ulsch_channel_estimation_stats, "ULSCH channel estimation time");
      printStatIndent2(&gNB->rx_pusch_init_stats, "RX PUSCH Initialization time");
      printStatIndent2(&gNB->rx_pusch_symbol_processing_stats, "RX PUSCH Symbol Processing time");
-      printStatIndent(&gNB->ulsch_decoding_stats,"ULSCH total decoding time");

      printf("\nUE TX\n");
      printStatIndent(&UE->ulsch_encoding_stats,"ULSCH total encoding time");

--- a/openair2/COMMON/mac_messages_def.h
+++ b/openair2/COMMON/mac_messages_def.h
@@ -57,4 +57,5 @@ MESSAGE_DEF(RRC_MAC_DRX_CONFIG_REQ, MESSAGE_PRIORITY_MED, rrc_mac_drx_config_req
 // gNB
 MESSAGE_DEF(NR_RRC_MAC_CCCH_DATA_IND,    MESSAGE_PRIORITY_MED_PLUS, NRRrcMacCcchDataInd,           nr_rrc_mac_ccch_data_ind)
 MESSAGE_DEF(NR_RRC_MAC_BCCH_DATA_IND,    MESSAGE_PRIORITY_MED_PLUS, NRRrcMacBcchDataInd,           nr_rrc_mac_bcch_data_ind)
+MESSAGE_DEF(NR_RRC_MAC_SBCCH_DATA_IND,    MESSAGE_PRIORITY_MED_PLUS, NRRrcMacSBcchDataInd,         nr_rrc_mac_sbcch_data_ind)

--- a/openair2/COMMON/mac_messages_types.h
+++ b/openair2/COMMON/mac_messages_types.h
@@ -41,6 +41,7 @@
 #define RRC_MAC_BCCH_DATA_REQ(mSGpTR)           (mSGpTR)->ittiMsg.rrc_mac_bcch_data_req
 #define RRC_MAC_BCCH_DATA_IND(mSGpTR)           (mSGpTR)->ittiMsg.rrc_mac_bcch_data_ind
 #define NR_RRC_MAC_BCCH_DATA_IND(mSGpTR)        (mSGpTR)->ittiMsg.nr_rrc_mac_bcch_data_ind
+#define NR_RRC_MAC_SBCCH_DATA_IND(mSGpTR)       (mSGpTR)->ittiMsg.nr_rrc_mac_sbcch_data_ind

 #define RRC_MAC_BCCH_MBMS_DATA_REQ(mSGpTR)      (mSGpTR)->ittiMsg.rrc_mac_bcch_mbms_data_req
 #define RRC_MAC_BCCH_MBMS_DATA_IND(mSGpTR)      (mSGpTR)->ittiMsg.rrc_mac_bcch_mbms_data_ind
@@ -119,6 +120,17 @@ typedef struct NRRrcMacBcchDataInd_s {
  uint8_t   rsrp;
 } NRRrcMacBcchDataInd;

+typedef struct NRRrcMacSBcchDataInd_s {
+  uint32_t  frame;
+  uint8_t   slot;
+  uint32_t  sdu_size;
+  uint8_t   sdu[BCCH_SDU_SIZE];
+  uint8_t   gnb_index;
+  uint16_t  rx_slss_id;
+  uint8_t   rsrq;
+  uint8_t   rsrp;
+} NRRrcMacSBcchDataInd;
+
 typedef struct RrcMacBcchMbmsDataReq_s {
  uint32_t  frame;
  uint32_t  sdu_size;

--- a/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt
+++ b/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt
@@ -9,6 +9,7 @@ add_library(e2_ran_func_cuup STATIC
            O-RAN/ran_func_kpm.c    # this file should only contain PDCP-U/GTP; to be done in the future
            ../flexric/test/rnd/fill_rnd_data_kpm.c  # this dependancy will be taken out once RAN Function Definition is implemented
            O-RAN/ran_func_rc.c     # this file should only contain PDCP-U/GTP; to be done in the future
+            O-RAN/ran_func_rc_subs.c
            ../flexric/test/rnd/fill_rnd_data_rc.c   # this dependancy will be taken out once RAN Function Definition is implemented
            )

@@ -27,7 +28,9 @@ add_library(e2_ran_func_du_cucp_cuup STATIC
            ../flexric/test/rnd/fill_rnd_data_kpm.c  # this dependancy will be taken out once RAN Function Definition is implemented
            O-RAN/ran_func_rc.c     # this file should only contain RRC/PDCP-C; to be done in the future
                                    # when nr-softmodem is divided in separate executables
+            O-RAN/ran_func_rc_subs.c
            ../flexric/test/rnd/fill_rnd_data_rc.c   # this dependancy will be taken out once RAN Function Definition is implemented
+            ../flexric/src/sm/rc_sm/ie/rc_data_ie.c
            CUSTOMIZED/ran_func_mac.c
            CUSTOMIZED/ran_func_rlc.c
            CUSTOMIZED/ran_func_slice.c
@@ -36,5 +39,5 @@ add_library(e2_ran_func_du_cucp_cuup STATIC
            ../flexric/test/rnd/fill_rnd_data_slice.c
            )

-target_link_libraries(e2_ran_func_du_cucp_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj)
+target_link_libraries(e2_ran_func_du_cucp_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj e2sm_rc_ir_obj sm_common_ie_obj)
 target_compile_definitions(e2_ran_func_du_cucp_cuup PUBLIC ${E2AP_VERSION}  ${KPM_VERSION} NGRAN_GNB_DU NGRAN_GNB_CUCP NGRAN_GNB_CUUP)
--- a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
+++ b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
@@ -20,25 +20,24 @@
 */

 #include "ran_func_rc.h"
+#include "ran_func_rc_subs.h"
+#include "ran_func_rc_extern.h"
 #include "../../flexric/test/rnd/fill_rnd_data_rc.h"  // this dependancy will be taken out once RAN Function Definition is implemented
 #include "../../flexric/src/sm/rc_sm/ie/ir/lst_ran_param.h"
 #include "../../flexric/src/sm/rc_sm/ie/ir/ran_param_list.h"
 #include "../../flexric/src/agent/e2_agent_api.h"

-#include <assert.h>
 #include <stdio.h>
-#include <pthread.h>
 #include <unistd.h>
+#include "common/ran_context.h"

-// Please note: current implementation doesn't take split architecture into account, neither CU/DU nor CU-UP/CU-CP
+static pthread_once_t once_rc_mutex = PTHREAD_ONCE_INIT;
+static rc_subs_data_t rc_subs_data = {0};
+static pthread_mutex_t rc_mutex = PTHREAD_MUTEX_INITIALIZER;

-bool read_rc_sm(void* data)
+static void init_once_rc(void)
 {
-  assert(data != NULL);
-//  assert(data->type == RAN_CTRL_STATS_V1_03);
-  assert(0!=0 && "Not implemented");
-
-  return true;
+  init_rc_subs_data(&rc_subs_data);
 }

 void read_rc_setup_sm(void* data)
@@ -47,8 +46,175 @@ void read_rc_setup_sm(void* data)
 //  assert(data->type == RAN_CTRL_V1_3_AGENT_IF_E2_SETUP_ANS_V0);
  rc_e2_setup_t* rc = (rc_e2_setup_t*)data;
  rc->ran_func_def = fill_rc_ran_func_def();
+
+  // E2 Setup Request is sent periodically until the connection is established
+  // RC subscritpion data should be initialized only once
+  const int ret = pthread_once(&once_rc_mutex, init_once_rc);
+  DevAssert(ret == 0);
+}
+
+
+RB_PROTOTYPE(ric_id_2_param_id_trees, ric_req_id_s, entries, cmp_ric_req_id);
+
+static ue_id_e2sm_t fill_ue_id_data(const gNB_RRC_UE_t *rrc_ue_context)
+{
+  ue_id_e2sm_t ue_id = {0};
+
+  // Check the E2 node type
+  #if defined (NGRAN_GNB_CUUP) && defined (NGRAN_GNB_CUCP)
+  ue_id.type = GNB_UE_ID_E2SM;
+  if (RC.nrrrc[0]->node_type == ngran_gNB_CU) {
+    // gNB-CU UE F1AP ID List
+    // C-ifCUDUseparated
+    ue_id.gnb.gnb_cu_ue_f1ap_lst_len = 1;
+    ue_id.gnb.gnb_cu_ue_f1ap_lst = calloc(ue_id.gnb.gnb_cu_ue_f1ap_lst_len, sizeof(uint32_t));
+    assert(ue_id.gnb.gnb_cu_ue_f1ap_lst != NULL && "Memory exhausted");
+
+    for(size_t i = 0; i < ue_id.gnb.gnb_cu_ue_f1ap_lst_len; i++) {
+      ue_id.gnb.gnb_cu_ue_f1ap_lst[i] = rrc_ue_context->rrc_ue_id;
+    }
+  } else if (RC.nrrrc[0]->node_type == ngran_gNB_CUCP) {
+    //gNB-CU-CP UE E1AP ID List
+    //C-ifCPUPseparated 
+    ue_id.gnb.gnb_cu_cp_ue_e1ap_lst_len = 1;
+    ue_id.gnb.gnb_cu_cp_ue_e1ap_lst = calloc(ue_id.gnb.gnb_cu_cp_ue_e1ap_lst_len, sizeof(uint32_t));
+    assert(ue_id.gnb.gnb_cu_cp_ue_e1ap_lst != NULL && "Memory exhausted");
+
+    for(size_t i = 0; i < ue_id.gnb.gnb_cu_cp_ue_e1ap_lst_len; i++) {
+      ue_id.gnb.gnb_cu_cp_ue_e1ap_lst[i] = rrc_ue_context->rrc_ue_id;
+    }
+  } else if (RC.nrrrc[0]->node_type == ngran_gNB_DU) {
+    assert(false && "RRC state change cannot be triggered from DU\n");
+  }
+
+  #elif defined (NGRAN_GNB_CUUP)
+  assert(false && "RRC state change cannot be triggered from CU-UP\n");
+
+  #endif
+
+  ue_id.gnb.amf_ue_ngap_id = rrc_ue_context->rrc_ue_id;
+  ue_id.gnb.guami.amf_ptr = rrc_ue_context->ue_guami.amf_pointer;
+  ue_id.gnb.guami.amf_region_id = rrc_ue_context->ue_guami.amf_region_id;
+  ue_id.gnb.guami.amf_set_id = rrc_ue_context->ue_guami.amf_set_id;
+  ue_id.gnb.guami.plmn_id.mcc = rrc_ue_context->ue_guami.mcc;
+  ue_id.gnb.guami.plmn_id.mnc = rrc_ue_context->ue_guami.mnc;
+  ue_id.gnb.guami.plmn_id.mnc_digit_len = rrc_ue_context->ue_guami.mnc_len;
+
+  return ue_id;
+}
+
+static seq_ran_param_t fill_rrc_state_change_seq_ran(const rc_sm_rrc_state_e rrc_state)
+{
+  seq_ran_param_t seq_ran_param = {0};
+
+  seq_ran_param.ran_param_id = RRC_STATE_CHANGED_TO_E2SM_RC_RAN_PARAM_ID;
+  seq_ran_param.ran_param_val.type = ELEMENT_KEY_FLAG_FALSE_RAN_PARAMETER_VAL_TYPE;
+  seq_ran_param.ran_param_val.flag_false = calloc(1, sizeof(ran_parameter_value_t));
+  assert(seq_ran_param.ran_param_val.flag_false != NULL && "Memory exhausted");
+  seq_ran_param.ran_param_val.flag_false->type = INTEGER_RAN_PARAMETER_VALUE;
+  seq_ran_param.ran_param_val.flag_false->int_ran = rrc_state;  
+
+  return seq_ran_param;
+}
+
+static rc_ind_data_t* fill_ue_rrc_state_change(const gNB_RRC_UE_t *rrc_ue_context, const rc_sm_rrc_state_e rrc_state)
+{
+  rc_ind_data_t* rc_ind = calloc(1, sizeof(rc_ind_data_t));
+  assert(rc_ind != NULL && "Memory exhausted");
+
+  // Generate Indication Header
+  rc_ind->hdr.format = FORMAT_1_E2SM_RC_IND_HDR;
+  rc_ind->hdr.frmt_1.ev_trigger_id = NULL;
+
+  // Generate Indication Message
+  rc_ind->msg.format = FORMAT_2_E2SM_RC_IND_MSG;
+
+  //Sequence of UE Identifier
+  //[1-65535]
+  rc_ind->msg.frmt_2.sz_seq_ue_id = 1;
+  rc_ind->msg.frmt_2.seq_ue_id = calloc(rc_ind->msg.frmt_2.sz_seq_ue_id, sizeof(seq_ue_id_t));
+  assert(rc_ind->msg.frmt_2.seq_ue_id != NULL && "Memory exhausted");
+
+  // UE ID
+  // Mandatory
+  // 9.3.10
+  rc_ind->msg.frmt_2.seq_ue_id[0].ue_id = fill_ue_id_data(rrc_ue_context);
+
+  // Sequence of
+  // RAN Parameter
+  // [1- 65535]
+  rc_ind->msg.frmt_2.seq_ue_id[0].sz_seq_ran_param = 1;
+  rc_ind->msg.frmt_2.seq_ue_id[0].seq_ran_param = calloc(rc_ind->msg.frmt_2.seq_ue_id[0].sz_seq_ran_param, sizeof(seq_ran_param_t));
+  assert(rc_ind->msg.frmt_2.seq_ue_id[0].seq_ran_param != NULL && "Memory exhausted");
+  rc_ind->msg.frmt_2.seq_ue_id[0].seq_ran_param[0] = fill_rrc_state_change_seq_ran(rrc_state);
+
+  return rc_ind;
+}
+
+void signal_rrc_state_changed_to(const gNB_RRC_UE_t *rrc_ue_context, const rc_sm_rrc_state_e rrc_state)
+{ 
+  pthread_mutex_lock(&rc_mutex);
+  if (rc_subs_data.rb[RRC_STATE_CHANGED_TO_E2SM_RC_RAN_PARAM_ID].rbh_root == NULL) {
+    pthread_mutex_unlock(&rc_mutex);
+    return;
+  }
+  
+  struct ric_req_id_s *node;
+  RB_FOREACH(node, ric_id_2_param_id_trees, &rc_subs_data.rb[RRC_STATE_CHANGED_TO_E2SM_RC_RAN_PARAM_ID]) {
+    rc_ind_data_t* rc_ind_data = fill_ue_rrc_state_change(rrc_ue_context, rrc_state);
+
+    // Needs review: memory ownership of the type rc_ind_data_t is transferred to the E2 Agent. Bad
+    async_event_agent_api(node->ric_req_id, rc_ind_data);
+    printf( "Event for RIC Req ID %u generated\n", node->ric_req_id);
+  }
+  
+  pthread_mutex_unlock(&rc_mutex);
+}
+
+static void free_aperiodic_subscription(uint32_t ric_req_id)
+{
+  remove_rc_subs_data(&rc_subs_data, ric_req_id);
+}
+
+sm_ag_if_ans_t write_subs_rc_sm(void const* src)
+{
+  assert(src != NULL); // && src->type == RAN_CTRL_SUBS_V1_03);
+
+  wr_rc_sub_data_t* wr_rc = (wr_rc_sub_data_t*)src;
+
+  assert(wr_rc->rc.ad != NULL && "Cannot be NULL");
+
+  // 9.2.1.2  RIC ACTION DEFINITION IE
+  switch (wr_rc->rc.ad->format) {
+    case FORMAT_1_E2SM_RC_ACT_DEF: {
+      // Parameters to be Reported List
+      // [1-65535]
+      const uint32_t ric_req_id = wr_rc->ric_req_id;
+      arr_ran_param_id_t* arr_ran_param_id = calloc(1, sizeof(arr_ran_param_id_t));
+      assert(arr_ran_param_id != NULL && "Memory exhausted");
+      arr_ran_param_id->len = wr_rc->rc.ad->frmt_1.sz_param_report_def;
+      arr_ran_param_id->ran_param_id = calloc(arr_ran_param_id->len, sizeof(ran_param_id_e));
+
+      const size_t sz = arr_ran_param_id->len;
+      for(size_t i = 0; i < sz; i++) {    
+        arr_ran_param_id->ran_param_id[i] = wr_rc->rc.ad->frmt_1.param_report_def[i].ran_param_id;
+      }
+      insert_rc_subs_data(&rc_subs_data, ric_req_id, arr_ran_param_id);
+      break;
+    }
+  
+    default:
+      AssertFatal(wr_rc->rc.ad->format == FORMAT_1_E2SM_RC_ACT_DEF, "Action Definition Format %d not yet implemented", wr_rc->rc.ad->format);
+  }
+
+  sm_ag_if_ans_t ans = {.type = SUBS_OUTCOME_SM_AG_IF_ANS_V0};
+  ans.subs_out.type = APERIODIC_SUBSCRIPTION_FLRC;
+  ans.subs_out.aper.free_aper_subs = free_aperiodic_subscription;
+
+  return ans;
 }

+
 sm_ag_if_ans_t write_ctrl_rc_sm(void const* data)
 {
  assert(data != NULL);
@@ -94,42 +260,12 @@ sm_ag_if_ans_t write_ctrl_rc_sm(void const* data)
  return ans;
 }

-static
-void* emulate_rrc_msg(void* ptr)
-{
-  uint32_t* ric_id = (uint32_t*)ptr; 
-  for(size_t i = 0; i < 5; ++i){
-    usleep(rand()%4000);
-    rc_ind_data_t* d = calloc(1, sizeof(rc_ind_data_t)); 
-    assert(d != NULL && "Memory exhausted");
-    *d = fill_rnd_rc_ind_data();
-    async_event_agent_api(*ric_id, d);
-    printf("Event for RIC Req ID %u generated\n", *ric_id);
-  }
-
-  free(ptr);
-  return NULL;
-}
-
-static
-pthread_t t_ran_ctrl;

-sm_ag_if_ans_t write_subs_rc_sm(void const* src)
+bool read_rc_sm(void* data)
 {
-  assert(src != NULL); // && src->type == RAN_CTRL_SUBS_V1_03);
-
-  wr_rc_sub_data_t* wr_rc = (wr_rc_sub_data_t*)src;
-  printf("ric req id %d \n", wr_rc->ric_req_id);
-
-  uint32_t* ptr = malloc(sizeof(uint32_t));
-  assert(ptr != NULL);
-  *ptr = wr_rc->ric_req_id;
-
-  int rc = pthread_create(&t_ran_ctrl, NULL, emulate_rrc_msg, ptr);
-  assert(rc == 0);
-
-  sm_ag_if_ans_t ans = {0}; 
+  assert(data != NULL);
+//  assert(data->type == RAN_CTRL_STATS_V1_03);
+  assert(0!=0 && "Not implemented");

-  return ans;
+  return true;
 }
-
--- a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.h
+++ b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.h
@@ -24,13 +24,12 @@

 #include "openair2/E2AP/flexric/src/agent/../sm/sm_io.h"

-bool read_rc_sm(void *);
-
 void read_rc_setup_sm(void* data);

+sm_ag_if_ans_t write_subs_rc_sm(void const* src);
+
 sm_ag_if_ans_t write_ctrl_rc_sm(void const* data);

-sm_ag_if_ans_t write_subs_rc_sm(void const* src);
+bool read_rc_sm(void *);

 #endif
-
--- a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_extern.h
+++ b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_extern.h
+/*
+ * 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
+ */
+
+#ifndef RAN_FUNC_SM_RAN_CTRL_EXTERN_AGENT_H
+#define RAN_FUNC_SM_RAN_CTRL_EXTERN_AGENT_H
+
+#include "openair2/RRC/NR/nr_rrc_defs.h"
+
+typedef enum { RC_SM_RRC_CONNECTED, RC_SM_RRC_INACTIVE, RC_SM_RRC_IDLE, RC_SM_RRC_ANY } rc_sm_rrc_state_e;
+void signal_rrc_state_changed_to(const gNB_RRC_UE_t *rrc_ue_context, const rc_sm_rrc_state_e rrc_state);
+
+#endif
--- a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.c
+++ b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.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
+ */
+
+#include "ran_func_rc_subs.h"
+#include "common/utils/assertions.h"
+
+#include <assert.h>
+#include <pthread.h>
+
+#define MAX_NUM_RIC_REQ_ID 64
+
+static pthread_mutex_t rc_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+int cmp_ric_req_id(struct ric_req_id_s *c1, struct ric_req_id_s *c2)
+{
+  if (c1->ric_req_id < c2->ric_req_id)
+    return -1;
+
+  if (c1->ric_req_id > c2->ric_req_id)
+    return 1;
+
+  return 0;
+}
+
+RB_GENERATE(ric_id_2_param_id_trees, ric_req_id_s, entries, cmp_ric_req_id);
+
+void init_rc_subs_data(rc_subs_data_t* rc_subs_data)
+{
+  pthread_mutex_lock(&rc_mutex);
+ 
+  // Initialize hash table
+  DevAssert(rc_subs_data->htable == NULL);
+ 
+  // Initialize RB trees
+  // 1 RB tree = 1 ran_param_id => many ric_req_id(s)
+  for (size_t i = 0; i < END_E2SM_RC_RAN_PARAM_ID; i++) {
+    RB_INIT(&rc_subs_data->rb[i]);
+  }
+
+   rc_subs_data->htable = hashtable_create(MAX_NUM_RIC_REQ_ID, NULL, free);
+  assert(rc_subs_data->htable != NULL && "Memory exhausted");
+  pthread_mutex_unlock(&rc_mutex);
+}
+
+void insert_rc_subs_data(rc_subs_data_t* rc_subs_data, uint32_t ric_req_id, arr_ran_param_id_t* arr_ran_param_id)
+{
+  pthread_mutex_lock(&rc_mutex);
+
+  // Insert in hash table
+  DevAssert(rc_subs_data->htable != NULL);
+  uint64_t key = ric_req_id;
+  // Check if the subscription already exists
+  AssertFatal(hashtable_is_key_exists(rc_subs_data->htable, key) == HASH_TABLE_KEY_NOT_EXISTS, "RIC req ID %d already subscribed", ric_req_id);
+  arr_ran_param_id_t* data = malloc(sizeof(*data));
+  assert(data != NULL);
+  *data = *arr_ran_param_id;
+  hashtable_rc_t ret = hashtable_insert(rc_subs_data->htable, key, data);
+  assert(ret == HASH_TABLE_OK  && "Hash table not ok");
+
+  // Insert in RB trees
+  // 1 RB tree = 1 ran_param_id => many ric_req_id(s)
+  const size_t sz = arr_ran_param_id->len;
+  rb_ric_req_id_t *node = calloc(1, sizeof(*node));
+  assert(node != NULL);
+  node->ric_req_id = ric_req_id;
+  for (size_t i = 0; i < sz; i++) {
+    RB_INSERT(ric_id_2_param_id_trees, &rc_subs_data->rb[arr_ran_param_id->ran_param_id[i]], node);
+  }
+
+  pthread_mutex_unlock(&rc_mutex);
+}
+
+void remove_rc_subs_data(rc_subs_data_t* rc_subs_data, uint32_t ric_req_id)
+{
+  pthread_mutex_lock(&rc_mutex);
+  DevAssert(rc_subs_data->htable != NULL);
+
+  uint64_t key = ric_req_id;
+  // Get the array of ran_param_id(s)
+  void *data = NULL;
+  hashtable_rc_t ret = hashtable_get(rc_subs_data->htable, key, &data);
+  AssertFatal(ret == HASH_TABLE_OK && data != NULL, "element for ue_id %d not found\n", ric_req_id);
+  arr_ran_param_id_t arr_ran_param_id = *(arr_ran_param_id_t *)data;
+  // Remove ric_req_id with its ran_param_id(s) from hash table
+  ret = hashtable_remove(rc_subs_data->htable, key);
+  
+  // Remove ric_req_id from each ran_param_id tree where subscribed
+  rb_ric_req_id_t *node = calloc(1, sizeof(*node));
+  assert(node != NULL);
+  node->ric_req_id = ric_req_id;
+  for (size_t i = 0; i < arr_ran_param_id.len; i++) {
+    RB_REMOVE(ric_id_2_param_id_trees, &rc_subs_data->rb[arr_ran_param_id.ran_param_id[i]], node);
+  }
+
+  pthread_mutex_unlock(&rc_mutex);
+}
--- a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.h
+++ b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.h
+/*
+ * 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
+ */
+
+#ifndef RAN_FUNC_SM_RAN_CTRL_SUBSCRIPTION_AGENT_H
+#define RAN_FUNC_SM_RAN_CTRL_SUBSCRIPTION_AGENT_H
+
+#include "common/utils/hashtable/hashtable.h"
+#include "common/utils/collection/tree.h"
+
+typedef enum {
+  RRC_STATE_CHANGED_TO_E2SM_RC_RAN_PARAM_ID = 202,   // 8.2.4  RAN Parameters for Report Service Style 4
+
+  END_E2SM_RC_RAN_PARAM_ID
+} ran_param_id_e;
+
+typedef struct{
+  size_t len;
+  ran_param_id_e* ran_param_id;
+} arr_ran_param_id_t;
+
+typedef struct ric_req_id_s {
+  RB_ENTRY(ric_req_id_s) entries;
+  uint32_t ric_req_id;
+} rb_ric_req_id_t;
+
+typedef struct {
+  RB_HEAD(ric_id_2_param_id_trees, ric_req_id_s) rb[END_E2SM_RC_RAN_PARAM_ID];  //  1 RB tree = (1 RAN Parameter ID) : (n RIC Request ID) => m RB tree = (m RAN Parameter ID) : (n RIC Request ID)
+  hash_table_t* htable;    // 1 Hash table = (n RIC Request ID) : (m RAN Parameter ID)
+} rc_subs_data_t;
+
+
+int cmp_ric_req_id(struct ric_req_id_s *c1, struct ric_req_id_s *c2);
+
+void init_rc_subs_data(rc_subs_data_t* rc_subs_data);
+void insert_rc_subs_data(rc_subs_data_t* rc_subs_data, uint32_t ric_req_id, arr_ran_param_id_t* arr_ran_param_id);
+void remove_rc_subs_data(rc_subs_data_t* rc_subs_data, uint32_t ric_req_id);
+
+#endif
--- a/openair2/E2AP/README.md
+++ b/openair2/E2AP/README.md
@@ -98,7 +98,7 @@ git submodule update
 ```bash
 git clone https://gitlab.eurecom.fr/mosaic5g/flexric flexric
 cd flexric/
-git checkout 70dd779f5339f4dac3ac176a24b49c45046a59fa
+git checkout 29af8408afad3da36824bd7912562202023ae924
 ```

 ### 2.2.2 Build FlexRIC
@@ -124,8 +124,10 @@ At the moment, the following measurements are supported in OAI RAN:
 * "RRU.PrbTotDl"
 * "RRU.PrbTotUl"

-2. RC v01.03 (`xapp_kpm_rc`)
-At the moment, OAI RAN supports the RAN control function "QoS flow mapping configuration", i.e. creating a new DRB.
+2. RC v01.03
+Currently available RC xApps:
+* `xapp_kpm_rc` - RAN control function "QoS flow mapping configuration" support, i.e. creating a new DRB.
+* `xapp_rc_moni` - aperiodic subscription support for "UE RRC State Change"

 3. MAC + RLC + PDCP + GTP (`xapp_gtp_mac_rlc_pdcp_moni`)

@@ -172,13 +174,25 @@ cd flexric
 ./build/examples/ric/nearRT-RIC
 ```

-* start the KPM xApp
+* start the KPM monitor xApp
 ```bash
 cd flexric
 ./build/examples/xApp/c/monitor/xapp_kpm_moni
 ```

-* start the (MAC + RLC + PDCP + GTP) xApp
+* start the RC monitor xApp
+```bash
+cd flexric
+./build/examples/xApp/c/monitor/xapp_rc_moni
+```
+
+* start the RC control xApp
+```bash
+cd flexric
+./build/examples/xApp/c/kpm_rc/xapp_kpm_rc
+```
+
+* start the (MAC + RLC + PDCP + GTP) monitor xApp
 ```bash
 cd flexric
 ./build/examples/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni

--- a/flexric @ 29af8408
+++ b/flexric @ 29af8408
-Subproject commit 70dd779f5339f4dac3ac176a24b49c45046a59fa
+Subproject commit 29af8408afad3da36824bd7912562202023ae924
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -809,7 +809,6 @@ void RCconfig_nr_prs(void)
 void RCconfig_NR_L1(void)
 {
  int j = 0;
-
  if (RC.gNB == NULL) {
    RC.gNB = (PHY_VARS_gNB **)malloc((1 + NUMBER_OF_gNB_MAX) * sizeof(PHY_VARS_gNB *));
    LOG_I(NR_PHY, "RC.gNB = %p\n", RC.gNB);

--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
--- a/openair2/LAYER2/NR_MAC_UE/config_ue_sl.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue_sl.c
--- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
@@ -47,6 +47,7 @@
 #include "LAYER2/NR_MAC_COMMON/nr_mac_common.h"
 #include "LAYER2/MAC/mac.h"
 #include "NR_MAC_COMMON/nr_mac_extern.h"
+#include "mac_defs_sl.h"

 /* RRC */
 #include "NR_DRX-Config.h"
@@ -181,12 +182,10 @@ typedef struct {
  int32_t LCID_buffer_remain;
  // buffer status for each lcid
  uint8_t LCID_status;
-  // Bj bucket usage per  lcid
+  // logical channel group id of this LCID
+  long LCGID;
+  // Bj bucket usage per lcid
  int32_t Bj;
-  // Bucket size per lcid
-  int32_t bucket_size;
-  // logical channel group id for each LCID
-  uint8_t LCGID;
 } NR_LC_SCHEDULING_INFO;

 typedef struct {
@@ -317,9 +316,11 @@ typedef struct {
  /// Received TPC command (in dB) from RAR
  int8_t Msg3_TPC;
  /// Flag to indicate whether it is the first Msg3 to be transmitted
-  uint8_t first_Msg3;
+  bool first_Msg3;
  /// RA Msg3 size in bytes
  uint8_t Msg3_size;
+  /// Msg3 buffer
+  uint8_t *Msg3_buffer;

  /// Random-access Contention Resolution Timer active flag
  uint8_t RA_contention_resolution_timer_active;
@@ -434,10 +435,11 @@ typedef struct ssb_list_info {

 typedef struct nr_lcordered_info_s {
  // logical channels ids ordered as per priority
-  int lcids_ordered;
-
-  // logical channel configurations reordered as per priority
-  NR_LogicalChannelConfig_t *logicalChannelConfig_ordered;
+  NR_LogicalChannelIdentity_t lcid;
+  long priority;
+  long prioritisedBitRate;
+  // Bucket size per lcid
+  uint32_t bucket_size;
 } nr_lcordered_info_t;

 typedef struct {
@@ -482,10 +484,6 @@ typedef struct NR_UE_MAC_INST_s {
  bool phy_config_request_sent;
  frame_type_t frame_type;

-  /* PDUs */
-  /// Outgoing CCCH pdu for PHY
-  CCCH_PDU CCCH_pdu;
-
  /* Random Access */
  /// CRNTI
  uint16_t crnti;
@@ -513,11 +511,9 @@ typedef struct NR_UE_MAC_INST_s {
  /// BSR report flag management
  uint8_t BSR_reporting_active;

-  // Pointers to LogicalChannelConfig indexed by LogicalChannelIdentity. Note NULL means LCHAN is inactive.
-  NR_LogicalChannelConfig_t *logicalChannelConfig[NR_MAX_NUM_LCID];
-
  // order lc info
-  nr_lcordered_info_t lc_ordered_info[NR_MAX_NUM_LCID];
+  A_SEQUENCE_OF(nr_lcordered_info_t) lc_ordered_list;
+
  NR_UE_SCHEDULING_INFO scheduling_info;

  /// PHR
@@ -548,6 +544,9 @@ typedef struct NR_UE_MAC_INST_s {

  pthread_mutex_t mutex_dl_info;

+  //SIDELINK MAC PARAMETERS
+  sl_nr_ue_mac_params_t *SL_MAC_PARAMS;
+
 } NR_UE_MAC_INST_t;

 /*@}*/

--- a/openair2/LAYER2/NR_MAC_UE/mac_defs_sl.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_defs_sl.h
+/*
+ * 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
+ */
+
+#ifndef __MAC_DEFS_SL_H__
+#define __MAC_DEFS_SL_H__
+
+#include "sidelink_nr_ue_interface.h"
+#include "NR_SL-ResourcePool-r16.h"
+#include "NR_TDD-UL-DL-ConfigCommon.h"
+#include "NR_MAC_COMMON/nr_mac.h"
+#include "NR_UE_PHY_INTERFACE/NR_IF_Module.h"
+
+#define SL_NR_MAC_NUM_RX_RESOURCE_POOLS 1
+#define SL_NR_MAC_NUM_TX_RESOURCE_POOLS 1
+#define SL_NUM_BYTES_TIMERESOURCEBITMAP 20
+
+// Size of Fixed fields prio (3), sci_2ndstage(2),
+// betaoffsetindicator(2), num dmrs ports (1), mcs (5bits)
+#define SL_SCI_FORMAT_1A_LEN_IN_BITS_FIXED_FIELDS 13
+
+#define NR_SBCCH_SL_BCH 0xFF
+
+#define sci_field_t dci_field_t
+
+typedef struct sidelink_sci_format_1a_fields {
+
+  // Priority of this transmission
+  uint8_t     priority; //3 bits
+  //Indicates the format to be used in 2nd stage i.e SCI format 2 sent on PSSCH
+  //00 - SCI FORMAT 2A, 01 - SCI FORMAT 2B, 10, 11 - Reserved
+  //Spec 38.212 Table 8.3.1.1-1
+  uint8_t     sci_format_2nd_stage; //2 bits
+  //Num modulated symbols for stage 2 SCI - TBD:
+  // Spec 38.212 Table 8.3.1.1-2
+  uint8_t     beta_offset_indicator; //2 bits
+  //determine the number of layers for data on PSSCH
+  // Spec 38.212 Table 8.3.1.1-3
+  uint8_t     num_dmrs_ports; //1 bit
+  //Modulation and coding scheme to be used for data on PSSCH
+  uint8_t     mcs; //5 bits
+
+  //Identifies the frequence resource (subchannels) to be used for PSSCH/PSCCH
+  //sl-MaxNumPerReserve is 2 - ceil(log2(N_subch*(N_subch+1)/2)) bits
+  //sl-MaxNumPerReserve is 3 - ceil(log2(N_subch*(N_subch+1)(2*N_subch+1)/6)) bits
+  sci_field_t frequency_resource_assignment; //variable
+  //Identifies the Time resource (slots) to be used for PSSCH/PSCCH
+  //sl-MaxNumPerReserve is 2 - 5 bits
+  //sl-MaxNumPerReserve is 3 - 9 bits
+  sci_field_t time_resource_assignment; //variable
+  //TBD:
+  //sl-MultiReserveResource is not configured - 0 bits
+  //sl-MultiReserveResource is configured - ceil(log2(number of entries in sl-ResourceReservePeriodList)) bits
+  sci_field_t resource_reservation_period; //variable
+  //Identifies the DMRS Pattern to be used on PSSCH
+  //ceil(log2(number of dmrs patterns in sl-PSSCH-DMRS-TimePatternList)) bits
+  sci_field_t dmrs_pattern; //variable
+  //Identifies the TABLE to be used to determine MCS on PSSCH
+  //1 table configured in sl-Additional-MCS-Table - 1 bit
+  //2 tables configured in sl-Additional-MCS-Table - 2 bits
+  //Not configured- 0 bits
+  sci_field_t additional_mcs_table_indicator; //variable
+  //Identifies the number of symbols for PSFCH
+  //sl-PSFCH-Period Not configured- 0 bits
+  //if sl-PSFCH-Period configured and value 2 or 4 - 1 bit
+  sci_field_t psfch_overhead_indication; //variable
+  //number of bits determined by sl-NumReservedbits
+  //Value encoded is 0
+  sci_field_t reserved_bits;
+
+} sidelink_sci_format_1a_fields_t;
+
+typedef struct SL_ResourcePool_params {
+
+  //This holds the structure from RRC
+  NR_SL_ResourcePool_r16_t *respool;
+
+  //NUM Subchannels in this resource pool
+  uint16_t num_subch;
+
+  //SCI-1A length is the same for this resource pool.
+  uint16_t sci_1a_len;
+
+  //SCI-1A configuration according to RESPOOL configured.
+  sidelink_sci_format_1a_fields_t sci_1a;
+
+} SL_ResourcePool_params_t;
+
+typedef struct sl_ssb_timealloc {
+
+  uint32_t sl_NumSSB_WithinPeriod;
+  uint32_t sl_TimeOffsetSSB;
+  uint32_t sl_TimeInterval;
+
+} sl_ssb_timealloc_t;
+
+typedef struct sl_bch_params {
+
+  //configured from RRC
+  //Parameters used to determine PSBCH slot
+  sl_ssb_timealloc_t ssb_time_alloc;
+  uint16_t slss_id;
+  bool     status;
+  uint8_t  sl_mib[4];
+
+  //Parameters incremented by MAC PSBCH scheduler
+  //after every SSB txn/reception
+  uint16_t num_ssb;
+  uint16_t ssb_slot;
+
+} sl_bch_params_t;
+
+typedef struct sl_nr_ue_mac_params {
+
+  //Holds the RX resource pool from RRC and its related parameters
+  SL_ResourcePool_params_t *sl_RxPool[SL_NR_MAC_NUM_RX_RESOURCE_POOLS];
+  //Holds the TX resource pool from RRC and its related parameters
+  SL_ResourcePool_params_t *sl_TxPool[SL_NR_MAC_NUM_TX_RESOURCE_POOLS];
+
+  //Holds either the TDD config from RRC
+  //or TDD config decoded from SL-MIB
+  NR_TDD_UL_DL_ConfigCommon_t *sl_TDD_config;
+
+  //Configured from RRC
+  uint32_t sl_MaxNumConsecutiveDTX;
+  uint32_t sl_SSB_PriorityNR;
+  uint8_t sl_CSI_Acquisition;
+
+  //MAC prepares this and sends it to PHY
+  nr_sl_phy_config_t sl_phy_config;
+
+  //Holds Broadcast params incase UE sends Sidelink SSB
+  sl_bch_params_t tx_sl_bch;
+  //Holds Broadcast params incase UE receives SL-SSB
+  sl_bch_params_t rx_sl_bch;
+
+} sl_nr_ue_mac_params_t;
+
+
+#endif
--- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
--- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
@@ -53,10 +53,9 @@ void send_srb0_rrc(int ue_id, const uint8_t *sdu, sdu_size_t sdu_len, void *data
  itti_send_msg_to_task(TASK_RRC_NRUE, ue_id, message_p);
 }

-void nr_ue_init_mac(module_id_t module_idP)
+void nr_ue_init_mac(NR_UE_MAC_INST_t *mac)
 {
-  LOG_I(NR_MAC, "[UE%d] Applying default macMainConfig\n", module_idP);
-  NR_UE_MAC_INST_t *mac = get_mac_inst(module_idP);
+  LOG_I(NR_MAC, "[UE%d] Initializing MAC\n", mac->ue_id);
  mac->first_sync_frame = -1;
  mac->get_sib1 = false;
  mac->get_otherSI = false;
@@ -99,11 +98,9 @@ void nr_ue_mac_default_configs(NR_UE_MAC_INST_t *mac)

  for (int i = 0; i < NR_MAX_NUM_LCID; i++) {
    LOG_D(NR_MAC, "Applying default logical channel config for LCGID %d\n", i);
-    mac->scheduling_info.lc_sched_info[i].Bj = -1;
-    mac->scheduling_info.lc_sched_info[i].bucket_size = -1;
-    mac->scheduling_info.lc_sched_info[i].LCGID = 0; // defaults to 0 irrespective of SRB or DRB
    mac->scheduling_info.lc_sched_info[i].LCID_status = LCID_EMPTY;
    mac->scheduling_info.lc_sched_info[i].LCID_buffer_remain = 0;
+    mac->scheduling_info.lc_sched_info[i].Bj = 0;
  }
 }

@@ -114,9 +111,9 @@ NR_UE_MAC_INST_t *nr_l2_init_ue(int nb_inst)
  AssertFatal(nr_ue_mac_inst, "Couldn't allocate %d instances of MAC module\n", nb_inst);

  for (int j = 0; j < nb_inst; j++) {
-    nr_ue_init_mac(j);
    NR_UE_MAC_INST_t *mac = get_mac_inst(j);
    mac->ue_id = j;
+    nr_ue_init_mac(mac);
    nr_ue_mac_default_configs(mac);
    if (get_softmodem_params()->sa)
      ue_init_config_request(mac, get_softmodem_params()->numerology);
@@ -136,6 +133,7 @@ NR_UE_MAC_INST_t *get_mac_inst(module_id_t module_id)
 {
  NR_UE_MAC_INST_t *mac = &nr_ue_mac_inst[(int)module_id];
  AssertFatal(mac, "Couldn't get MAC inst %d\n", module_id);
+  AssertFatal(mac->ue_id == module_id, "MAC ID %d doesn't match with input %d\n", mac->ue_id, module_id);
  return mac;
 }

@@ -146,7 +144,8 @@ void reset_mac_inst(NR_UE_MAC_INST_t *nr_mac)
  nr_ue_mac_default_configs(nr_mac);

  // initialize Bj for each logical channel to zero
-  // Done in default config but to -1 (is that correct?)
+  for (int i = 0; i < NR_MAX_NUM_LCID; i++)
+    nr_mac->scheduling_info.lc_sched_info[i].Bj = 0;

  // stop all running timers
  // TODO
@@ -166,7 +165,7 @@ void reset_mac_inst(NR_UE_MAC_INST_t *nr_mac)
  // TODO not sure what needs to be done here

  // flush Msg3 buffer
-  // TODO we don't have a Msg3 buffer
+  free_and_zero(nr_mac->ra.Msg3_buffer);

  // cancel any triggered Scheduling Request procedure
  // Done in default config
@@ -221,9 +220,10 @@ void release_mac_configuration(NR_UE_MAC_INST_t *mac)
  for (int i = 0; i < mac->ul_BWPs.count; i++)
    release_ul_BWP(mac, i);

-  for (int i = 0; i < NR_MAX_NUM_LCID; i++) {
-    nr_release_mac_config_logicalChannelBearer(mac, i + 1);
-    memset(&mac->lc_ordered_info[i], 0, sizeof(nr_lcordered_info_t));
+  for (int i = 0; i < mac->lc_ordered_list.count; i++) {
+    nr_lcordered_info_t *lc_info = mac->lc_ordered_list.array[i];
+    asn_sequence_del(&mac->lc_ordered_list, i, 0);
+    free(lc_info);
  }

  memset(&mac->ssb_measurements, 0, sizeof(mac->ssb_measurements));

--- a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -358,8 +358,20 @@ static uint32_t schedule_control_sib1(module_id_t module_id,
                         rbSize, tda_info->nrOfSymbols, N_PRB_DMRS * dmrs_length,0, 0,1) >> 3;
  } while (TBS < gNB_mac->sched_ctrlCommon->num_total_bytes);

-  AssertFatal(TBS>=gNB_mac->sched_ctrlCommon->num_total_bytes,"Couldn't allocate enough resources for %d bytes in SIB1 PDSCH\n",
-              gNB_mac->sched_ctrlCommon->num_total_bytes);
+  if (TBS < gNB_mac->sched_ctrlCommon->num_total_bytes) {
+    for (int rb = 0; rb < bwpSize; rb++)
+      LOG_I(NR_MAC, "vrb_map[%d] %x\n", rbStart + rb, vrb_map[rbStart + rb]);
+  }
+  AssertFatal(
+      TBS >= gNB_mac->sched_ctrlCommon->num_total_bytes,
+      "Couldn't allocate enough resources for %d bytes in SIB1 PDSCH (rbStart %d, rbSize %d, bwpSize %d SLmask %x - [%d,%d])\n",
+      gNB_mac->sched_ctrlCommon->num_total_bytes,
+      rbStart,
+      rbSize,
+      bwpSize,
+      SL_to_bitmap(tda_info->startSymbolIndex, tda_info->nrOfSymbols),
+      tda_info->startSymbolIndex,
+      tda_info->nrOfSymbols);

  pdsch->rbSize = rbSize;
  pdsch->rbStart = 0;

--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
@@ -185,7 +185,16 @@ void nr_schedule_pucch(gNB_MAC_INST *nrmac,
    NR_sched_pucch_t *curr_pucch = &UE->UE_sched_ctrl.sched_pucch[pucch_index];
    if (!curr_pucch->active)
      continue;
-    DevAssert(frameP == curr_pucch->frame && slotP == curr_pucch->ul_slot);
+    if (frameP != curr_pucch->frame || slotP != curr_pucch->ul_slot) {
+      LOG_E(NR_MAC,
+            "PUCCH frame/slot mismatch: current %4d.%2d vs. request %4d.%2d: not scheduling PUCCH\n",
+            curr_pucch->frame,
+            curr_pucch->ul_slot,
+            frameP,
+            slotP);
+      memset(curr_pucch, 0, sizeof(*curr_pucch));;
+      continue;
+    }

    const uint16_t O_ack = curr_pucch->dai_c;
    const uint16_t O_csi = curr_pucch->csi_bits;
@@ -1296,8 +1305,13 @@ int nr_acknack_scheduling(gNB_MAC_INST *mac,
      return pucch_index; // index of current PUCCH structure
    }
    else if (curr_pucch->active) {
-      AssertFatal(1==0, "This shouldn't happen! curr_pucch frame.slot %d.%d not matching with computed frame.slot %d.%d\n",
-                  curr_pucch->frame, curr_pucch->ul_slot, pucch_frame, pucch_slot);
+      LOG_E(NR_MAC,
+            "current PUCCH inactive: curr_pucch frame.slot %d.%d not matching with computed frame.slot %d.%d\n",
+            curr_pucch->frame,
+            curr_pucch->ul_slot,
+            pucch_frame,
+            pucch_slot);
+      memset(curr_pucch, 0, sizeof(*curr_pucch));
    }
    else { // unoccupied occasion
      // checking if in ul_slot the resources potentially to be assigned to this PUCCH are available
@@ -1392,8 +1406,13 @@ void nr_sr_reporting(gNB_MAC_INST *nrmac, frame_t SFN, sub_frame_t slot)
          curr_pucch->resource_indicator == idx)
        curr_pucch->sr_flag = true;
      else if (curr_pucch->active) {
-        AssertFatal(1==0, "This shouldn't happen! curr_pucch frame.slot %d.%d not matching with SR function frame.slot %d.%d\n",
-                    curr_pucch->frame, curr_pucch->ul_slot, SFN, slot);
+        LOG_E(NR_MAC,
+              "current PUCCH inactive: curr_pucch frame.slot %d.%d not matching with computed frame.slot %d.%d\n",
+              curr_pucch->frame,
+              curr_pucch->ul_slot,
+              SFN,
+              slot);
+        memset(curr_pucch, 0, sizeof(*curr_pucch));
        continue;
      }
      else {

--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
@@ -385,12 +385,49 @@ static void match_crc_rx_pdu(nfapi_nr_rx_data_indication_t *rx_ind, nfapi_nr_crc
  }
 }

+static void run_scheduler(module_id_t module_id, int CC_id, int frame, int slot)
+{
+  NR_IF_Module_t *ifi = nr_if_inst[module_id];
+  // gNB_MAC_INST     *mac        = RC.nrmac[module_id];
+
+  NR_Sched_Rsp_t *sched_info;
+  LOG_D(NR_MAC, "Calling scheduler for %d.%d\n", frame, slot);
+  sched_info = allocate_sched_response();
+
+  // clear UL DCI prior to handling ULSCH
+  sched_info->UL_dci_req.numPdus = 0;
+  gNB_dlsch_ulsch_scheduler(module_id, frame, slot, sched_info);
+  ifi->CC_mask = 0;
+  sched_info->module_id = module_id;
+  sched_info->CC_id = CC_id;
+  sched_info->frame = frame;
+  sched_info->slot = slot;
+  /*
+  sched_info->DL_req      = &mac->DL_req[CC_id];
+  sched_info->UL_dci_req  = &mac->UL_dci_req[CC_id];
+
+  sched_info->UL_tti_req  = mac->UL_tti_req[CC_id];
+
+  sched_info->TX_req      = &mac->TX_req[CC_id];
+  */
+#ifdef DUMP_FAPI
+  dump_dl(sched_info);
+#endif
+
+  AssertFatal(ifi->NR_Schedule_response != NULL, "nr_schedule_response is null (mod %d, cc %d)\n", module_id, CC_id);
+  ifi->NR_Schedule_response(sched_info);
+
+  LOG_D(NR_PHY,
+        "NR_Schedule_response: SFN SLOT:%d %d dl_pdus:%d\n",
+        sched_info->frame,
+        sched_info->slot,
+        sched_info->DL_req.dl_tti_request_body.nPDUs);
+}
+
 void NR_UL_indication(NR_UL_IND_t *UL_info) {
  AssertFatal(UL_info!=NULL,"UL_info is null\n");
-  module_id_t      module_id   = UL_info->module_id;
-  int              CC_id       = UL_info->CC_id;
-  NR_Sched_Rsp_t   *sched_info;
-  NR_IF_Module_t   *ifi        = nr_if_inst[module_id];
+  module_id_t module_id = UL_info->module_id;
+  int CC_id = UL_info->CC_id;

  LOG_D(NR_PHY,"SFN/SLOT:%d.%d module_id:%d CC_id:%d UL_info[rach_pdus:%zu rx_ind:%zu crcs:%zu]\n",
        UL_info->frame, UL_info->slot,
@@ -449,57 +486,6 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
  if (get_softmodem_params()->emulate_l1) {
    free_unqueued_nfapi_indications(rach_ind, uci_ind, rx_ind, crc_ind);
  }
-  if (NFAPI_MODE != NFAPI_MODE_PNF) {
-    gNB_MAC_INST     *mac        = RC.nrmac[module_id];
-    if (ifi->CC_mask==0) {
-      ifi->current_frame    = UL_info->frame;
-      ifi->current_slot = UL_info->slot;
-    } else {
-      AssertFatal(UL_info->frame != ifi->current_frame,"CC_mask %x is not full and frame has changed\n",ifi->CC_mask);
-      AssertFatal(UL_info->slot != ifi->current_slot,"CC_mask %x is not full and slot has changed\n",ifi->CC_mask);
-    }
-
-    ifi->CC_mask |= (1<<CC_id);
-
-    if (ifi->CC_mask == ((1<<MAX_NUM_CCs)-1)) {
-      /*
-      eNB_dlsch_ulsch_scheduler(module_id,
-          (UL_info->frame+((UL_info->slot>(9-sl_ahead))?1:0)) % 1024,
-          (UL_info->slot+sl_ahead)%10);
-      */
-      nfapi_nr_config_request_scf_t *cfg = &mac->config[CC_id];
-      int spf = get_spf(cfg);
-      sched_info = allocate_sched_response();
-      // clear UL DCI prior to handling ULSCH
-      sched_info->UL_dci_req.numPdus = 0;
-      gNB_dlsch_ulsch_scheduler(module_id,
-                                (UL_info->frame + ((UL_info->slot > (spf - 1 - ifi->sl_ahead)) ? 1 : 0)) % 1024,
-                                (UL_info->slot + ifi->sl_ahead) % spf,
-                                sched_info);
-
-      ifi->CC_mask            = 0;
-      sched_info->module_id   = module_id;
-      sched_info->CC_id       = CC_id;
-      sched_info->frame       = (UL_info->frame + ((UL_info->slot>(spf-1-ifi->sl_ahead)) ? 1 : 0)) % 1024;
-      sched_info->slot        = (UL_info->slot+ifi->sl_ahead)%spf;
-
-#ifdef DUMP_FAPI
-      dump_dl(sched_info);
-#endif
-
-      AssertFatal(ifi->NR_Schedule_response!=NULL,
-                  "nr_schedule_response is null (mod %d, cc %d)\n",
-                  module_id,
-                  CC_id);
-      ifi->NR_Schedule_response(sched_info);
-
-      LOG_D(NR_PHY,
-            "NR_Schedule_response: SFN SLOT:%d %d dl_pdus:%d\n",
-            sched_info->frame,
-            sched_info->slot,
-            sched_info->DL_req.dl_tti_request_body.nPDUs);
-    }
-  }
 }

 NR_IF_Module_t *NR_IF_Module_init(int Mod_id) {
@@ -514,6 +500,7 @@ NR_IF_Module_t *NR_IF_Module_init(int Mod_id) {

    nr_if_inst[Mod_id]->CC_mask=0;
    nr_if_inst[Mod_id]->NR_UL_indication = NR_UL_indication;
+    nr_if_inst[Mod_id]->NR_slot_indication = run_scheduler;
    AssertFatal(pthread_mutex_init(&nr_if_inst[Mod_id]->if_mutex,NULL)==0,
                "allocation of nr_if_inst[%d]->if_mutex fails\n",Mod_id);
  }

--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.h
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.h
@@ -113,6 +113,7 @@ typedef struct NR_IF_Module_s {
  //define the function pointer
  void (*NR_UL_indication)(NR_UL_IND_t *UL_INFO);
  void (*NR_Schedule_response)(NR_Sched_Rsp_t *Sched_INFO);
+  void (*NR_slot_indication)(module_id_t module_idP, int CC_id, int frame, int slot);
  void (*NR_PHY_config_req)(NR_PHY_Config_t *config_INFO);
  uint32_t CC_mask;
  uint16_t current_frame;

--- a/openair2/NR_PHY_INTERFACE/nr_sched_response.c
+++ b/openair2/NR_PHY_INTERFACE/nr_sched_response.c
@@ -105,6 +105,7 @@ NR_Sched_Rsp_t *allocate_sched_response(void)

 static void release_sched_response(int sched_response_id)
 {
+  LOG_D(NR_MAC,"Releasing sched_response %d\n",sched_response_id);	
  resp_freelist_next[sched_response_id] = resp_freelist_head;
  resp_freelist_head = sched_response_id;
 }
@@ -124,6 +125,7 @@ void deref_sched_response(int sched_response_id)
  AssertFatal(resp_freelist_inited, "sched_response used before init\n");
  AssertFatal(resp_refcount[sched_response_id] > 0, "sched_reponse decreased too much\n");

+  LOG_D(NR_MAC,"resp_refcount[%d] %d\n",sched_response_id,resp_refcount[sched_response_id]);
  resp_refcount[sched_response_id]--;
  if (resp_refcount[sched_response_id] == 0)
    release_sched_response(sched_response_id);
@@ -141,6 +143,8 @@ void inc_ref_sched_response(int sched_response_id)
  if (sched_response_id == -1)
    return;

+  LOG_D(NR_MAC,"Incrementing sched_resp resp_refounct[%d] = %d\n",
+		  sched_response_id,resp_refcount[sched_response_id]);
  if (pthread_mutex_lock(&resp_mutex))
    AssertFatal(0, "pthread_mutex_lock failed\n");


--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -102,6 +102,10 @@
 #include "BIT_STRING.h"
 #include "assertions.h"

+#ifdef E2_AGENT
+#include "openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_extern.h"
+#endif
+
 //#define XER_PRINT

 extern RAN_CONTEXT_t RC;
@@ -500,6 +504,10 @@ static void rrc_gNB_process_RRCSetupComplete(const protocol_ctxt_t *const ctxt_p
  AssertFatal(ctxt_pP->rntiMaybeUEid == ue_context_pP->ue_context.rrc_ue_id, "logic bug: inconsistent IDs, must use CU UE ID!\n");

  rrc_gNB_send_NGAP_NAS_FIRST_REQ(ctxt_pP, ue_context_pP, rrcSetupComplete);
+
+#ifdef E2_AGENT
+  signal_rrc_state_changed_to(&ue_context_pP->ue_context, RC_SM_RRC_CONNECTED);
+#endif
 }

 //-----------------------------------------------------------------------------
@@ -2585,6 +2593,10 @@ rrc_gNB_generate_RRCRelease(
    rrc->cucp_cuup.bearer_context_release(assoc_id, &cmd);
  }

+#ifdef E2_AGENT
+  signal_rrc_state_changed_to(UE, RC_SM_RRC_IDLE);
+#endif
+
  /* UE will be freed after UE context release complete */
 }


--- a/openair2/RRC/NR_UE/L2_interface_ue.c
+++ b/openair2/RRC/NR_UE/L2_interface_ue.c
@@ -94,6 +94,32 @@ int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
      AssertFatal(false, "use RLC instead\n");
      break;

+    case NR_SBCCH_SL_BCH:
+      if (pdu_len>0) {
+        LOG_T(NR_RRC, "[UE %d] Received SL-MIB for NR_SBCCH_SL_BCH.\n", module_id);
+
+        MessageDef *message_p;
+        int msg_sdu_size = BCCH_SDU_SIZE;
+
+        if (pdu_len > msg_sdu_size) {
+          LOG_E(NR_RRC, "SDU larger than NR_SBCCH_SL_BCH 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_SBCCH_DATA_IND);
+        memset(NR_RRC_MAC_SBCCH_DATA_IND (message_p).sdu, 0, BCCH_SDU_SIZE);
+        memcpy(NR_RRC_MAC_SBCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
+        NR_RRC_MAC_SBCCH_DATA_IND (message_p).frame = frame; //frameP
+        NR_RRC_MAC_SBCCH_DATA_IND (message_p).slot = slot;
+        NR_RRC_MAC_SBCCH_DATA_IND (message_p).sdu_size = sdu_size;
+        NR_RRC_MAC_SBCCH_DATA_IND (message_p).gnb_index = gNB_index;
+        NR_RRC_MAC_SBCCH_DATA_IND (message_p).rx_slss_id = rnti;//rx_slss_id is rnti
+        itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(module_id), message_p);
+      }
+      break;
+
    default:
      break;
  }

--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
--- a/openair2/RRC/NR_UE/rrc_defs.h
+++ b/openair2/RRC/NR_UE/rrc_defs.h
@@ -54,6 +54,8 @@
 #include "NR_DL-DCCH-Message.h"
 #include "NR_SystemInformation.h"
 #include "NR_UE-NR-Capability.h"
+#include "NR_SL-PreconfigurationNR-r16.h"
+#include "NR_MasterInformationBlockSidelink.h"

 #include "RRC/NR/nr_rrc_common.h"
 #include "as_message.h"
@@ -210,6 +212,10 @@ typedef struct NR_UE_RRC_INST_s {
  long               selected_plmn_identity;
  Rrc_State_NR_t     nrRrcState;
  as_nas_info_t      initialNasMsg;
+
+  //Sidelink params
+  NR_SL_PreconfigurationNR_r16_t *sl_preconfig;
+
 } NR_UE_RRC_INST_t;

 #endif
--- a/openair2/RRC/NR_UE/rrc_proto.h
+++ b/openair2/RRC/NR_UE/rrc_proto.h
--- a/openair2/RRC/NR_UE/rrc_sl_preconfig.c
+++ b/openair2/RRC/NR_UE/rrc_sl_preconfig.c
--- a/radio/ETHERNET/eth_udp.c
+++ b/radio/ETHERNET/eth_udp.c
--- a/radio/fhi_72/CMakeLists.txt
+++ b/radio/fhi_72/CMakeLists.txt
@@ -2,7 +2,7 @@
 pkg_check_modules(dpdk REQUIRED libdpdk)
 pkg_check_modules(numa REQUIRED numa)

-find_package(xran 5.1.1 EXACT REQUIRED) # E release -> 5
+find_package(xran 5.1.2 EXACT REQUIRED) # E release -> 5

 # Ignore xran-specific warning: we don't care/can't change the following warning, so suppress
 # alignment 1 of 'struct XYZ' is less than 2

--- a/radio/fhi_72/oaioran.c
+++ b/radio/fhi_72/oaioran.c
--- a/radio/fhi_72/oran-config.c
+++ b/radio/fhi_72/oran-config.c
--- a/radio/fhi_72/oran-init.c
+++ b/radio/fhi_72/oran-init.c
--- a/radio/fhi_72/oran-params.h
+++ b/radio/fhi_72/oran-params.h
--- a/radio/fhi_72/oran_isolate.c
+++ b/radio/fhi_72/oran_isolate.c
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.32prb.usrpx410.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.32prb.usrpx410.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf