From f969eddbe27dad3b9d5887d5ec58aa15ee9d1b13 Mon Sep 17 00:00:00 2001 From: Thomas Schlichter Date: Fri, 24 May 2024 13:16:47 +0200 Subject: [PATCH 1/2] fix gNB to print correct --CO parameter for OAI UE in FDD case --- openair1/SCHED_NR/phy_procedures_nr_gNB.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c index cd024fbd86..d6eaafde79 100644 --- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c +++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c @@ -83,7 +83,7 @@ void nr_common_signal_procedures(PHY_VARS_gNB *gNB,int frame,int slot, nfapi_nr_ LOG_A(PHY, "Command line parameters for the UE: -C %lu --CO %ld -r %d --numerology %d --ssb %d\n", fp->dl_CarrierFreq, - fp->dl_CarrierFreq - fp->ul_CarrierFreq, + fp->ul_CarrierFreq - fp->dl_CarrierFreq, fp->N_RB_DL, scs, fp->ssb_start_subcarrier); From 2bb632a7fe87dd41c1e17ee67c07d2f64839180e Mon Sep 17 00:00:00 2001 From: Thomas Schlichter Date: Fri, 24 May 2024 13:21:38 +0200 Subject: [PATCH 2/2] fix 5G NR SA FDD configs for 25 and 25 PRBs make sure the SSB is offset by 4 PRBs from the BW start. Therefore, the ARFCN for the SSB center must be offset by 14 PRB from the ARFCN for the BW start. --- .../conf_files/gnb.sa.band66.u0.25prb.rfsim.conf | 10 +++++----- .../5g_rfsimulator_u0_25prb/docker-compose.yaml | 2 +- .../CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf | 12 ++++++------ .../CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf index c4d063ef45..a05f766fa0 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf @@ -28,11 +28,11 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL - # this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block + # this is 2150.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block absoluteFrequencySSB = 430590; dl_frequencyBand = 66; - # this is 2150 MHz - dl_absoluteFrequencyPointA = 430002; + # this is 2150.43 MHz + dl_absoluteFrequencyPointA = 430086; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -53,8 +53,8 @@ gNBs = #uplinkConfigCommon #frequencyInfoUL ul_frequencyBand = 66; - # this is 1750 MHz - ul_absoluteFrequencyPointA = 350002; + # this is 1750.43 MHz + ul_absoluteFrequencyPointA = 350086; #scs-SpecificCarrierList ul_offstToCarrier = 0; # subcarrierSpacing diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index 79253d5fd6..cedbcb3cbb 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -105,7 +105,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 2152260000 --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 2152680000 --CO -400000000 --ssb 48 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb networks: diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf index 5dc2ba2f80..8273a3a82a 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf @@ -43,11 +43,11 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL - # this is 2150 MHz + 14 PRBs@30kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block - absoluteFrequencySSB = 431008; + # this is 2150.21 MHz + 14 PRBs@30kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block + absoluteFrequencySSB = 431050; dl_frequencyBand = 66; - # this is 2150 MHz - dl_absoluteFrequencyPointA = 430000; + # this is 2150.21 MHz + dl_absoluteFrequencyPointA = 430042; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -68,8 +68,8 @@ gNBs = #uplinkConfigCommon #frequencyInfoUL ul_frequencyBand = 66; - # this is 1750 MHz - ul_absoluteFrequencyPointA = 350000; + # this is 1750.21 MHz + ul_absoluteFrequencyPointA = 350042; #scs-SpecificCarrierList ul_offstToCarrier = 0; # subcarrierSpacing diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf index cb68e65d0c..4e27d924de 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf @@ -43,11 +43,11 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL - # this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block - absoluteFrequencySSB = 430504; + # this is 2150.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block + absoluteFrequencySSB = 430590; dl_frequencyBand = 66; - # this is 2150 MHz - dl_absoluteFrequencyPointA = 430000; + # this is 2150.43 MHz + dl_absoluteFrequencyPointA = 430086; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -68,8 +68,8 @@ gNBs = #uplinkConfigCommon #frequencyInfoUL ul_frequencyBand = 66; - # this is 1750 MHz - ul_absoluteFrequencyPointA = 350000; + # this is 1750.43 MHz + ul_absoluteFrequencyPointA = 350086; #scs-SpecificCarrierList ul_offstToCarrier = 0; # subcarrierSpacing