Commit 5bd2eb86 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2024_w50' into 'develop' 

Integration: `2024.w50`

Closes #753

See merge request !3166

* !3159 CI: Add FHI7.2 test with Metanoia RU
* !3111 Enable USRP Tx thread in nrUE
* !3144 UE data race fix
* !3149 Fix several issues in ulsch_mmse_2layers
* !3158 GTP: use direct call instead of ITTI
* !3160 FHI-72: initialize mask, find correct libxran
* !3019 SIB19 utilization on UE
* !3162 Add Rocky 9.5 to list of distributions
* !3163 NGAP-Initial Context Setup Failure
* !2952 New LDPC coding library interface for decoding and encoding complete slots in one call to the library
* !3125 Add support for O1 in O-DU via telnet
* !3161 Cmd line option for sync in frames for iqrecorder
parents 054506f5 d4ca4201

CMakeLists.txt

+11 −116
Original line number Diff line number Diff line
@@ -485,26 +485,6 @@ target_link_libraries(params_libconfig PRIVATE config_internals ${libconfig_LIBR 
add_library(shlib_loader OBJECT common/utils/load_module_shlib.c)

target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)



##########################################################



# LDPC offload library - AMD T2 Accelerator Card

##########################################################



add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)

if (ENABLE_LDPC_T2)

  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)

  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})

  if (NOT PMD_T2)

    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")

  endif()

  message(STATUS "T2 build: use ${PMD_T2}")

  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)

  set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")

  target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})

endif()



##########################################################



include_directories ("${OPENAIR_DIR}/radio/COMMON")



##############################################################
@@ -770,14 +750,6 @@ include_directories(${NFAPI_USER_DIR}) 


# Layer 1

#############################

set(PHY_TURBOSRC

  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c

  ${OPENAIR1_DIR}/PHY/CODING/3gpplte.c

  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c

  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c

  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c

  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder.c

)

set(PHY_POLARSRC

  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c

  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
@@ -800,76 +772,16 @@ set(PHY_TURBOIF 
  ${OPENAIR1_DIR}/PHY/CODING/coding_load.c

)



set(PHY_LDPC_ORIG_SRC

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c

)

add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )

target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)



set(PHY_LDPC_OPTIM_SRC

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c

  )

add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )

target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)



set(PHY_LDPC_OPTIM8SEG_SRC

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c

)

add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )

target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)



set(PHY_LDPC_OPTIM8SEGMULTI_SRC

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c

  )

add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )

target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)



set(PHY_LDPC_CUDA_SRC

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c

)



set(PHY_LDPC_CL_SRC

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c

)

add_custom_target( nrLDPC_decoder_kernels_CL

                   COMMAND gcc ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c -dD -DNRLDPC_KERNEL_SOURCE -E -o ${CMAKE_CURRENT_BINARY_DIR}/nrLDPC_decoder_kernels_CL.clc

                   SOURCES ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c

)

add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )

target_link_libraries(ldpc_cl OpenCL)

add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)



set(PHY_NR_CODINGIF

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c

)



##############################################

# Base CUDA setting

##############################################



add_boolean_option(ENABLE_LDPC_CUDA OFF "Build support for CUDA" OFF)

if (ENABLE_LDPC_CUDA)

  find_package(CUDA REQUIRED)

  SET(CUDA_NVCC_FLAG "${CUDA_NVCC_FLAGS};-arch=sm_60;")

  SET(CUDA_VERBOSE_BUILD ON)

  cuda_add_library(ldpc_cuda MODULE ${PHY_LDPC_CUDA_SRC})

  set_target_properties(ldpc_cuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON)

  if (NOT CUDA_FOUND)

    message(FATAL_ERROR "no CUDA found")

  endif()

endif()



add_library(coding MODULE ${PHY_TURBOSRC} )

set(PHY_NRLDPC_CODINGIF

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface_load.c

)



add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)





set(PHY_SRC_COMMON

  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c

  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
@@ -1057,7 +969,7 @@ set(PHY_SRC_UE 
  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c

  ${PHY_POLARSRC}

  ${PHY_SMALLBLOCKSRC}

  ${PHY_NR_CODINGIF}

  ${PHY_NRLDPC_CODINGIF}

  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c

  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/srs_rx.c

  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_uci_tools_common.c
@@ -1112,7 +1024,7 @@ set(PHY_SRC_UE 
  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c

  ${PHY_POLARSRC}

  ${PHY_SMALLBLOCKSRC}

  ${PHY_NR_CODINGIF}

  ${PHY_NRLDPC_CODINGIF}

  )
@@ -1474,6 +1386,7 @@ add_library(L2_UE 
  ${MAC_SRC_UE}

)

target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

target_link_libraries(L2_UE PRIVATE GTPV1U)



add_library(L2_UE_LTE_NR

  ${L2_RRC_SRC_UE}
@@ -1942,6 +1855,7 @@ target_link_libraries(lte-softmodem PRIVATE 
target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)

target_link_libraries(lte-softmodem PRIVATE ${T_LIB})

target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})



if(E2_AGENT)

  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1997,6 +1911,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE 
target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt sctp)

target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})

target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})



# force the generation of ASN.1 so that we don't need to wait during the build

target_link_libraries(lte-uesoftmodem PRIVATE
@@ -2043,12 +1958,6 @@ if(E2_AGENT) 
endif()





add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)



if (ENABLE_LDPC_T2)

  add_dependencies(nr-softmodem ldpc_t2)

endif()



# force the generation of ASN.1 so that we don't need to wait during the build

target_link_libraries(nr-softmodem PRIVATE

  asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
@@ -2079,6 +1988,7 @@ add_executable(nr-uesoftmodem 
  ${rrc_h}

  ${s1ap_h}

  ${OPENAIR_DIR}/executables/nr-uesoftmodem.c

  ${OPENAIR_DIR}/executables/position_interface.c

  ${OPENAIR_DIR}/executables/nr-ue.c

  ${OPENAIR_DIR}/executables/softmodem-common.c

  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
@@ -2100,12 +2010,6 @@ target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_m 
target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})

target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )

if (ENABLE_LDPC_CUDA)

   add_dependencies(nr-uesoftmodem ldpc_cuda)

   add_dependencies(nr-softmodem ldpc_cuda)

endif()



# force the generation of ASN.1 so that we don't need to wait during the build

target_link_libraries(nr-uesoftmodem PRIVATE

                      asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
@@ -2159,11 +2063,6 @@ add_executable(ldpctest 
   ${PHY_NR_CODINGIF}

   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c

   )



add_dependencies(ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc)

if (ENABLE_LDPC_CUDA)

  add_dependencies(ldpctest ldpc_cuda)

endif()

target_link_libraries(ldpctest PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group

  m pthread dl shlib_loader ${T_LIB}
@@ -2260,10 +2159,6 @@ add_executable(nr_ulsim 
  ${PHY_INTERFACE_DIR}/queue_t.c

  )



if (ENABLE_LDPC_T2)

  add_dependencies(nr_ulsim ldpc_t2)

endif()



target_link_libraries(nr_ulsim PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group

  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
@@ -2322,14 +2217,14 @@ if (${T_TRACER}) 
        #all "add_library" definitions

        ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap

        params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer

        oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO

        oai_eth_transpro oai_mobipass HASHTABLE UTIL OMG_SUMO

        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL

        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB

        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB

        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX

        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap

        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB

        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals nr_common)

        dfts config_internals nr_common)

    if (TARGET ${i})

      add_dependencies(${i} generate_T)

    endif()

ci-scripts/checkCodingFormattingRules.sh

+4 −4
Original line number Diff line number Diff line
@@ -73,9 +73,9 @@ then 
    do

       IS_NFAPI=`echo $FILE | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`

       IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FILE || true`

       IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`

       IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FILE || true`

       IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FILE || true`

       IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`

       IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`

       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]

       then

           if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
@@ -184,9 +184,9 @@ do 
        then

            IS_NFAPI=`echo $FULLFILE | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`

            IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FULLFILE || true`

            IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`

            IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FULLFILE || true`

            IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FULLFILE || true`

            IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`

            IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`

            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]

            then

                if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]

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

+7 −0
Original line number Diff line number Diff line
@@ -148,6 +148,13 @@ gNBs = 
  #ext2

    #ntn_Config_r17

      cellSpecificKoffset_r17                                       = 478;

      ta-Common-r17                                                 = 29314900;

      positionX-r17                                                 = 0;

      positionY-r17                                                 = 0;

      positionZ-r17                                                 = 32433846;

      velocityVX-r17                                                = 0;

      velocityVY-r17                                                = 0;

      velocityVZ-r17                                                = 0;

  }



  );

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf

0 → 100644
+254 −0
Original line number Diff line number Diff line 
Active_gNBs = ( "oai-du");

# Asn1_verbosity, choice in: none, info, annoying

Asn1_verbosity = "none";

gNBs =

(

 {

    ////////// Identification parameters:

    gNB_ID    =  0xe00;

    gNB_name  =  "oai-du";

    // Tracking area code, 0x0000 and 0xfffe are reserved values

    tracking_area_code  =  1;

    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });

    nr_cellid = 1;



    ////////// Physical parameters:

    pdsch_AntennaPorts_XP = 2;

    pusch_AntennaPorts    = 4;

    pdsch_AntennaPorts_N1 = 2;

    maxMIMO_layers        = 2;

    do_CSIRS              = 1;

    do_SRS                = 0;

    force_UL256qam_off    = 1;



    servingCellConfigCommon = (

    {

#spCellConfigCommon

      physCellId                                                    = 0;

#  downlinkConfigCommon

    #frequencyInfoDL

      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)

      absoluteFrequencySSB                                          = 649920; #JF maybe we should adjust a bit

      dl_frequencyBand                                              = 78;

      # this is 3300.24 MHz

      dl_absoluteFrequencyPointA                                    = 646724;

      #scs-SpecificCarrierList

        dl_offstToCarrier                                           = 0;

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120

        dl_subcarrierSpacing                                        = 1;

        dl_carrierBandwidth                                         = 273;

     #initialDownlinkBWP

      #genericParameters

       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))

       initialDLBWPlocationAndBandwidth                             = 1099;

       #

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120

        initialDLBWPsubcarrierSpacing                               = 1;

      #pdcch-ConfigCommon

        initialDLBWPcontrolResourceSetZero                          = 12;

        initialDLBWPsearchSpaceZero                                 = 0;

  #uplinkConfigCommon

     #frequencyInfoUL

      ul_frequencyBand                                              = 78;

      #scs-SpecificCarrierList

      ul_offstToCarrier                                             = 0;

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120

      ul_subcarrierSpacing                                          = 1;

      ul_carrierBandwidth                                           = 273;

      pMax                                                          = 20;

     #initialUplinkBWP

      #genericParameters

        initialULBWPlocationAndBandwidth                            = 1099;

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120

        initialULBWPsubcarrierSpacing                               = 1;

      #rach-ConfigCommon

        #rach-ConfigGeneric

          prach_ConfigurationIndex                                  = 148; # JF check this and other PRACH related params

#prach_msg1_FDM

#0 = one, 1=two, 2=four, 3=eight

          prach_msg1_FDM                                            = 0;

          prach_msg1_FrequencyStart                                 = 0;

          zeroCorrelationZoneConfig                                 = 12;

          preambleReceivedTargetPower                               = -96;

#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)

          preambleTransMax                                          = 6;

#powerRampingStep

# 0=dB0,1=dB2,2=dB4,3=dB6

        powerRampingStep                                            = 1;

#ra_ReponseWindow

#1,2,4,8,10,20,40,80

        ra_ResponseWindow                                           = 5;

#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR

#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen

        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;

#one (0..15) 4,8,12,16,...60,64

        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;

#ra_ContentionResolutionTimer

#(0..7) 8,16,24,32,40,48,56,64

        ra_ContentionResolutionTimer                                = 7;

        rsrp_ThresholdSSB                                           = 19;

#prach-RootSequenceIndex_PR

#1 = 839, 2 = 139

        prach_RootSequenceIndex_PR                                  = 2;

        prach_RootSequenceIndex                                     = 1;

        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex

        #

        msg1_SubcarrierSpacing                                      = 1,

# restrictedSetConfig

# 0=unrestricted, 1=restricted type A, 2=restricted type B

        restrictedSetConfig                                         = 0,

        msg3_DeltaPreamble                                          = 1;

        p0_NominalWithGrant                                         = -90;

# pucch-ConfigCommon setup :

# pucchGroupHopping

# 0 = neither, 1= group hopping, 2=sequence hopping

        pucchGroupHopping                                           = 0;

        hoppingId                                                   = 40;

        p0_nominal                                                  = -90;

# ssb_PositionsInBurs_BitmapPR

# 1=short, 2=medium, 3=long

      ssb_PositionsInBurst_Bitmap                                   = 1;

# ssb_periodicityServingCell

# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1

      ssb_periodicityServingCell                                    = 2;

# dmrs_TypeA_position

# 0 = pos2, 1 = pos3

      dmrs_TypeA_Position                                           = 0;

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120

      subcarrierSpacing                                             = 1;

  #tdd-UL-DL-ConfigurationCommon

# subcarrierSpacing

# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120

      referenceSubcarrierSpacing                                    = 1;

      # pattern1

      # dl_UL_TransmissionPeriodicity

      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10

      dl_UL_TransmissionPeriodicity                                 = 5; #6;

      nrofDownlinkSlots                                             = 3; #7;

      nrofDownlinkSymbols                                           = 6;

      nrofUplinkSlots                                               = 1; #2;

      nrofUplinkSymbols                                             = 4;

      ssPBCH_BlockPower                                             = -10;

  }

  );

    # ------- SCTP definitions

    SCTP :

    {

        # Number of streams to use in input/output

        SCTP_INSTREAMS  = 2;

        SCTP_OUTSTREAMS = 2;

    };



        ////////// AMF parameters:

    amf_ip_address = ({ ipv4 = "172.21.6.103"; });



    NETWORK_INTERFACES :

    {

        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.18.20";

        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.18.20";

        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152

    };

  }

);

MACRLCs = (

{

  num_cc                      = 1;

  tr_s_preference             = "local_L1";

  tr_n_preference             = "local_RRC";

  pusch_TargetSNRx10          = 220;

  pucch_TargetSNRx10          = 220;

  ul_bler_target_upper=.35;

  ul_bler_target_lower=.15;

  pusch_FailureThres          = 100;

  ul_max_mcs                  = 28;

}

);

L1s = (

{

  num_cc = 1;

  tr_n_preference = "local_mac";

  prach_dtx_threshold = 130;

  pucch0_dtx_threshold = 80;

  pusch_dtx_threshold = 10;

  max_ldpc_iterations = 10;

  tx_amp_backoff_dB = 12; #9; needs to match O-RU configuration # JF important to check

  L1_rx_thread_core = 3;

  L1_tx_thread_core = 4; # relevant after merge of l1_tx_thread

  phase_compensation = 0; # needs to match O-RU configuration # JF to be tested

}

);

RUs = (

{

  local_rf       = "no";

  nb_tx          = 4;

  nb_rx          = 4;

  att_tx         = 0

  att_rx         = 0;

  bands          = [78];

  max_pdschReferenceSignalPower = -27;

  max_rxgain                    = 75;

  sf_extension                  = 0;

  eNB_instances  = [0];

  ru_thread_core = 6;

  sl_ahead       = 10; #5;

  ##beamforming 1x2 matrix: 1 layer x 2 antennas

  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];

  tr_preference  = "raw_if4p5"; # important: activate FHI7.2

  do_precoding = 0; # needs to match O-RU configuration

}

);



security = {

  # preferred ciphering algorithms

  # the first one of the list that an UE supports in chosen

  # valid values: nea0, nea1, nea2, nea3

  ciphering_algorithms = ( "nea0" );



  # preferred integrity algorithms

  # the first one of the list that an UE supports in chosen

  # valid values: nia0, nia1, nia2, nia3

  integrity_algorithms = ( "nia2", "nia0" );



  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter

  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'

  drb_ciphering = "yes";

  drb_integrity = "no";

};



log_config :

{

  global_log_level                      ="info";

  hw_log_level                          ="info";

  phy_log_level                         ="info";

  mac_log_level                         ="info";

  rlc_log_level                         ="info";

  pdcp_log_level                        ="info";

  rrc_log_level                         ="info";

  ngap_log_level                        ="info";

  f1ap_log_level                        ="info";

};



fhi_72 = {

  dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");

  system_core = 0;

  io_core = 1;

  worker_cores = (2);

  ru_addr = ("00:E0:0C:00:AE:06", "00:E0:0C:00:AE:06");

  mtu = 9000;

  fh_config = ({

    T1a_cp_dl = (285, 470);

    T1a_cp_ul = (285, 429);

    T1a_up = (125, 350);

    Ta4 = (110, 180);

    ru_config = {

      iq_width = 9;

      iq_width_prach = 9;

    };

  });

};

ci-scripts/conf_files/nrue.uicc.conf

+7 −1
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ uicc0 = { 
  nssai_sst=1;

}



position0 = {

    x = 0.0;

    y = 0.0;

    z = 6377900.0;

}



thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"



#/* configuration for channel modelisation */