From eaf28414ca138660a0375d1c0763f2beaeb7a2b1 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 13 Sep 2023 17:45:04 +0200 Subject: [PATCH] kssb < 16 or we cannot do reestablishment: add assert in DU --- ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf | 2 +- openair2/LAYER2/NR_MAC_gNB/config.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 405fb552c4..75dde393e9 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 = 620020; + dl_absoluteFrequencyPointA = 620052; #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 988f7b3233..8d6f1d27fa 100644 --- a/openair2/LAYER2/NR_MAC_gNB/config.c +++ b/openair2/LAYER2/NR_MAC_gNB/config.c @@ -332,6 +332,12 @@ static void config_common(gNB_MAC_INST *nrmac, int pdsch_AntennaPorts, int pusch cfg->ssb_table.ssb_subcarrier_offset.value = get_ssb_subcarrier_offset(*scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB, scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA); + 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++;