From 4e69a10cbc131814b96a3b34c411d904936e2eb5 Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Mon, 20 Jun 2022 11:41:19 +0200
Subject: [PATCH] change BWP when Msg3_dcch_dtch

---
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c | 18 +++++----------
 .../NR_MAC_gNB/gNB_scheduler_primitives.c     | 22 +++++++++++++------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 57b7d58ad0..89495139da 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -1834,19 +1834,11 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
       harq->round = 0;
       harq->ndi ^= 1;
 
-      // Pause scheduling according to:
-      // 3GPP TS 38.331 Section 12 Table 12.1-1: UE performance requirements for RRC procedures for UEs
-      const NR_COMMON_channels_t *common_channels = &RC.nrmac[module_idP]->common_channels[0];
-      const NR_SIB1_t *sib1 = common_channels->sib1 ? common_channels->sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
-      const NR_ServingCellConfig_t *servingCellConfig = UE->CellGroup ? UE->CellGroup->spCellConfig->spCellConfigDedicated : NULL;
-      NR_BWP_t *genericParameters = get_dl_bwp_genericParameters(sched_ctrl->active_bwp,
-                                                                 common_channels->ServingCellConfigCommon,
-                                                                 sib1);
-      uint32_t delay_ms = servingCellConfig && servingCellConfig->downlinkBWP_ToAddModList ?
-                          NR_RRC_SETUP_DELAY_MS + NR_RRC_BWP_SWITCHING_DELAY_MS : NR_RRC_SETUP_DELAY_MS;
-
-      sched_ctrl->rrc_processing_timer = (delay_ms << genericParameters->subcarrierSpacing);
-      LOG_I(NR_MAC, "(%d.%d) Activating RRC processing timer for UE %04x with %d ms\n", frameP, slotP, UE->rnti, delay_ms);
+      configure_UE_BWP(nr_mac,
+                      scc,
+                      sched_ctrl,
+                      NULL,
+                      UE);
 
       // Reset uplink failure flags/counters/timers at MAC so gNB will resume again scheduling resources for this UE
       UE->UE_sched_ctrl.pusch_consecutive_dtx_cnt = 0;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index bed24dcc36..c363eac31a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -2218,13 +2218,21 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
     csi_MeasConfig = servingCellConfig->csi_MeasConfig ? servingCellConfig->csi_MeasConfig->choice.setup : NULL;
     target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
 
-    // (re)configuring BWP
-    // TODO BWP switching not via RRC reconfiguration
-    // via RRC if firstActiveXlinkBWP_Id is NULL, MAC stays on the same BWP as before
-    if (servingCellConfig->firstActiveDownlinkBWP_Id)
-      DL_BWP->bwp_id = *servingCellConfig->firstActiveDownlinkBWP_Id;
-    if (servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id)
-      UL_BWP->bwp_id = *servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id;
+    if(UE && UE->Msg3_dcch_dtch) {
+      // switching to initial BWP
+      DL_BWP->bwp_id = 0;
+      UL_BWP->bwp_id = 0;
+      UE->Msg3_dcch_dtch = false;
+    }
+    else {
+      // (re)configuring BWP
+      // TODO BWP switching not via RRC reconfiguration
+      // via RRC if firstActiveXlinkBWP_Id is NULL, MAC stays on the same BWP as before
+      if (servingCellConfig->firstActiveDownlinkBWP_Id)
+        DL_BWP->bwp_id = *servingCellConfig->firstActiveDownlinkBWP_Id;
+      if (servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id)
+        UL_BWP->bwp_id = *servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id;
+    }
 
     const struct NR_ServingCellConfig__downlinkBWP_ToAddModList *bwpList = servingCellConfig->downlinkBWP_ToAddModList;
     if(bwpList)