Commit acb982d0 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w17' into 'develop' 

Integration: `2025.w17`

Closes #947

See merge request !3403

* !3377 Fix all direct MAC memory leaks
* !3397 Fix for MIB/SIB gNB delay mechanism
* !3399 SIBs in DL slot check
* !3401 F1AP: Allocate gNB_DU_ID before storing ID
* !3380 Issue 947 and compilation improvements
* !3391 small bugfix for T tracer
* !3261 Add Bearer Context Modification Request/Response enc/dec lib and adopt in stack
* !3178 mod: refactor PHY multiplications
* !3382 Improve radio for Metanoia RU (and likely others)
* !3388 Update CN5G images tags to the latest release in all CI pipelines
* !3351 Fix ASN1 struct double free
* !3405 Fix for NR UE DLSCH decoding barrier in case of no feedback
* !3404 Polar: remove dead code and a wrong comment
parents 4da30019 68815616

CMakeLists.txt

+3 −15
Original line number Diff line number Diff line
@@ -812,18 +812,14 @@ set(PHY_SRC_COMMON 
  ${OPENAIR1_DIR}/PHY/CODING/viterbi_lte.c

  ${OPENAIR1_DIR}/PHY/INIT/init_top.c

  ${OPENAIR1_DIR}/PHY/INIT/lte_parms.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/dfts_load.c

  ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cdot_prod.c

  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c

  ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c

  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c

  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c

  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c

  ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c

  ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c

  )



set(PHY_SRC
@@ -948,16 +944,12 @@ set(PHY_SRC_UE 
  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_freq_equalization.c

  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c

  ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cdot_prod.c

  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c

  ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c

  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c

  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c

  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c

  ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c

  ${PHY_POLARSRC}

  ${PHY_SMALLBLOCKSRC}

  ${PHY_NRLDPC_CODINGIF}
@@ -1001,16 +993,12 @@ set(PHY_SRC_UE 
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c

  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c

  ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c

  ${OPENAIR1_DIR}/PHY/TOOLS/cdot_prod.c

  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c

  ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c

  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c

  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c

  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c

  ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c

  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c

  ${PHY_POLARSRC}

  ${PHY_SMALLBLOCKSRC}

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ gNBs = 


    pdsch_AntennaPorts_XP = 2;

    pdsch_AntennaPorts_N1 = 2;

    maxMIMO_layers        = 4;

    maxMIMO_layers        = 2;

    pusch_AntennaPorts    = 4;

    do_CSIRS              = 1;

    do_SRS                = 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ services: 
                ipv4_address: 192.168.71.131

    oai-amf:

        container_name: "rfsim5g-oai-amf"

        image: oaisoftwarealliance/oai-amf:v2.0.0

        image: oaisoftwarealliance/oai-amf:v2.1.9

        environment:

            - TZ=Europe/paris

        volumes:
@@ -33,7 +33,7 @@ services: 
                ipv4_address: 192.168.71.132

    oai-smf:

        container_name: "rfsim5g-oai-smf"

        image: oaisoftwarealliance/oai-smf:v2.0.0

        image: oaisoftwarealliance/oai-smf:v2.1.9

        environment:

            - TZ=Europe/Paris

        volumes:
@@ -45,7 +45,7 @@ services: 
                ipv4_address: 192.168.71.133

    oai-upf:

        container_name: "rfsim5g-oai-upf"

        image: oaisoftwarealliance/oai-upf:v2.0.0

        image: oaisoftwarealliance/oai-upf:v2.1.9

        environment:

            - TZ=Europe/Paris

        volumes:

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

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ services: 
                ipv4_address: 192.168.71.131

    oai-amf:

        container_name: "rfsim5g-oai-amf"

        image: oaisoftwarealliance/oai-amf:v2.0.0

        image: oaisoftwarealliance/oai-amf:v2.1.9

        environment:

            - TZ=Europe/paris

        volumes:
@@ -33,7 +33,7 @@ services: 
                ipv4_address: 192.168.71.132

    oai-smf:

        container_name: "rfsim5g-oai-smf"

        image: oaisoftwarealliance/oai-smf:v2.0.0

        image: oaisoftwarealliance/oai-smf:v2.1.9

        environment:

            - TZ=Europe/Paris

        volumes:
@@ -45,7 +45,7 @@ services: 
                ipv4_address: 192.168.71.133

    oai-upf:

        container_name: "rfsim5g-oai-upf"

        image: oaisoftwarealliance/oai-upf:v2.0.0

        image: oaisoftwarealliance/oai-upf:v2.1.9

        environment:

            - TZ=Europe/Paris

        volumes:

ci-scripts/yaml_files/5g_rfsimulator/README.md

+4 −4
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ Now pull images. 


```bash

$ docker pull mysql:8.0

$ docker pull oaisoftwarealliance/oai-amf:v2.0.0

$ docker pull oaisoftwarealliance/oai-smf:v2.0.0

$ docker pull oaisoftwarealliance/oai-upf:v2.0.0

$ docker pull oaisoftwarealliance/oai-amf:v2.1.9

$ docker pull oaisoftwarealliance/oai-smf:v2.1.9

$ docker pull oaisoftwarealliance/oai-upf:v2.1.9

$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal



$ docker pull oaisoftwarealliance/oai-gnb:develop
@@ -52,7 +52,7 @@ $ docker logout 


**CAUTION: 2023/01/27 with the release `v1.5.0` of the `CN5G`, the previous version was not compatible any-more.**



**This new version is working only with the `v2.0.0` of the `CN5G`.**

**This new version is working only with the `v2.1.9` of the `CN5G`.**



# 2. Deploy containers #