Merge remote-tracking branch 'origin/fix-ssb-arfcn' into integration_2023_w40

ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf

@@ -32,7 +32,7 @@ gNBs =
       absoluteFrequencySSB                                             = 432990;
       dl_frequencyBand                                                 = 66;
       # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 430000;
+      dl_absoluteFrequencyPointA                                       = 430002;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -53,7 +53,7 @@ gNBs =
   #uplinkConfigCommon
      #frequencyInfoUL
       ul_frequencyBand                                              = 66;
-      ul_absoluteFrequencyPointA                                    = 350000;
+      ul_absoluteFrequencyPointA                                    = 350002;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                             = 0;
 # subcarrierSpacing

ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf

@@ -32,7 +32,7 @@ gNBs =
       absoluteFrequencySSB                                          = 430590;
       dl_frequencyBand                                              = 66;
       # this is 2150 MHz
-      dl_absoluteFrequencyPointA                                    = 430000;
+      dl_absoluteFrequencyPointA                                    = 430002;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -54,7 +54,7 @@ gNBs =
      #frequencyInfoUL
       ul_frequencyBand                                              = 66;
       # this is 1750 MHz
-      ul_absoluteFrequencyPointA                                    = 350000;
+      ul_absoluteFrequencyPointA                                    = 350002;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                             = 0;
 # subcarrierSpacing

ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml

@@ -185,7 +185,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment: 
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -186,7 +186,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

openair2/RRC/NR/rrc_gNB.c

@@ -269,7 +269,7 @@ static int get_ssb_arfcn(const f1ap_served_cell_info_t *cell_info, const NR_MIB_
     // taken out (but the reestablishment will likely not work).
     const NR_ServingCellConfigCommon_t *scc = RC.nrmac[0]->common_channels[0].ServingCellConfigCommon;
     uint32_t scc_ssb_arfcn = *scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB;
-    AssertFatal(ssb_arfcn == scc_ssb_arfcn, "fuck: SCC SSB ARFCN original %d vs. computed %d\n", scc_ssb_arfcn, ssb_arfcn);
+    AssertFatal(ssb_arfcn == scc_ssb_arfcn, "mismatch of SCC SSB ARFCN original %d vs. computed %d! Note: you can remove this Assert, the gNB might run but UE connection instable\n", scc_ssb_arfcn, ssb_arfcn);
   }
 
   return ssb_arfcn;