From 740189c625b4fae4beedb62173d553cb323e9d18 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 24 Apr 2024 18:06:30 +0200 Subject: [PATCH] Revert "kssb < 16 or we cannot do reestablishment: add assert in DU" This reverts commit eaf28414ca138660a0375d1c0763f2beaeb7a2b1. This assertion was introduced as we (wrongfully) thought we needed to calculate the SSB ARFCN at the CU. Since PBCH might carry one bit, which is not available at the CU, only certain SSB ARFCNs would have been possible. With the availability of the SSB ARFCN through the MeasurementTimingConfiguration, this is not necessary anymore. --- ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf | 2 +- openair2/LAYER2/NR_MAC_gNB/config.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf index d42f6a36ab..c39f38d55e 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf @@ -30,7 +30,7 @@ gNBs = absoluteFrequencySSB = 620736; dl_frequencyBand = 78; # this is 3300.30 MHz - dl_absoluteFrequencyPointA = 620052; + dl_absoluteFrequencyPointA = 620020; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c index 5d3985b2d3..29c1f2ce83 100644 --- a/openair2/LAYER2/NR_MAC_gNB/config.c +++ b/openair2/LAYER2/NR_MAC_gNB/config.c @@ -540,13 +540,6 @@ static void config_common(gNB_MAC_INST *nrmac, nr_pdsch_AntennaPorts_t pdsch_Ant get_ssb_subcarrier_offset(*scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB, scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA, *scc->ssbSubcarrierSpacing); - - AssertFatal(cfg->ssb_table.ssb_subcarrier_offset.value < 16, - "cannot handle ssb_subcarrier_offset %d resulting from Point A %ld SSB %ld: please increase dl_absoluteFrequencyPointA " - "in the config by 16\n", - cfg->ssb_table.ssb_subcarrier_offset.value, - scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA, - *scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB); cfg->ssb_table.ssb_subcarrier_offset.tl.tag = NFAPI_NR_CONFIG_SSB_SUBCARRIER_OFFSET_TAG; cfg->num_tlv++;