Commit e82fde24 authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova
Browse files

Merge branch 'integration_2025_w28' into 'develop' 

Integration: `2025.w28`

* !3517 CI: set interface name in UPF container for RFSim5G
* !3501 Fix automatic SSS detection logic
* !3503 DLSCH RB extraction: check DMRS bitmap only in DMRS symbols
* !3498 bugfix: UE AMBR is optional
* !3504 Improvements to the FHI for enabling further use cases

Closes #975

See merge request !3518
parents d71e3333 bc626c32

cmake_targets/tools/MODULES/Findxran.cmake

+1 −4
Original line number Diff line number Diff line
@@ -126,12 +126,9 @@ find_package_handle_standard_args(xran 
  VERSION_VAR xran_VERSION

)



# in proper usage of cmake, include directory should only contain "api", but not header files under "src" directory;

# however, we use xran_dev_get_ctx() and xran_dev_get_ctx_by_id() functions which are defined in xran_common.h;

# since xran_common.h is under "src" directory, we have to include it in ${xran_INCLUDE_DIRS}

if(xran_FOUND)

  set(xran_LIBRARIES ${xran_LIBRARY})

  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR} ${xran_INCLUDE_DIR}/../src)

  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR})

endif()



if(xran_FOUND AND NOT TARGET xran::xran)

cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch

+10 −7
Original line number Diff line number Diff line 
diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h

index 7508117..ce17ebd 100644

index 7508117..318508b 100644

--- a/fhi_lib/app/src/common.h

+++ b/fhi_lib/app/src/common.h

@@ -28,7 +28,7 @@
@@ -7,12 +7,12 @@ index 7508117..ce17ebd 100644 
 #include <rte_mbuf.h>

 

-#define VERSIONX                "oran_e_maintenance_release_v1.0"

+#define VERSIONX                "oran_e_maintenance_release_v1.5"

+#define VERSIONX                "oran_e_maintenance_release_v1.6"

 

 #define APP_O_DU  0

 #define APP_O_RU  1

diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile

index de141bf..fa2923f 100644

index de141bf..c2a448d 100644

--- a/fhi_lib/lib/Makefile

+++ b/fhi_lib/lib/Makefile

@@ -23,12 +23,25 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -50,9 +50,9 @@ index de141bf..fa2923f 100644 
 

-RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)

+ifeq ($(TARGET), x86)

+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)

+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkg-config --cflags-only-I libdpdk)

+else ifeq ($(TARGET), armv8)

+RTE_INC := $(pkgconf --cflags-only-I libdpdk)

+RTE_INC := $(shell pkg-config --cflags-only-I libdpdk)

+endif

 API_DIR := $(PROJECT_DIR)/api

 SRC_DIR := $(PROJECT_DIR)/src
@@ -85,7 +85,7 @@ index de141bf..fa2923f 100644 
 

 CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \

 	-fdata-sections \

@@ -112,12 +132,21 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \

@@ -112,14 +132,23 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \

         -fPIC \

 	-Wall \

 	-Wimplicit-function-declaration \
@@ -110,8 +110,11 @@ index de141bf..fa2923f 100644 
+        -Werror -Wno-unused-variable -std=c++14

+endif

 

 INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)

-INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)

+INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) $(RTE_INC)

 DEF :=

 ifeq ($(MLOG),1)

 	INC  += -I$(MLOG_DIR)/source

@@ -150,8 +179,13 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))

 

 AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))

cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch

+355 −16

File changed.

Preview size limit exceeded, changes collapsed.

executables/main_ru.c

+16 −0
Original line number Diff line number Diff line
@@ -97,11 +97,19 @@ void exit_function(const char *file, const char *function, const int line, const 
  oai_exit = 1;



  if (ru_m.rfdevice.trx_end_func) {

    if (ru_m.rfdevice.trx_get_stats_func) {

      ru_m.rfdevice.trx_get_stats_func(&ru_m.rfdevice);

      ru_m.rfdevice.trx_get_stats_func = NULL;

    }

    ru_m.rfdevice.trx_end_func(&ru_m.rfdevice);

    ru_m.rfdevice.trx_end_func = NULL;

  }



  if (ru_m.ifdevice.trx_end_func) {

    if (ru_m.ifdevice.trx_get_stats_func) {

      ru_m.ifdevice.trx_get_stats_func(&ru_m.ifdevice);

      ru_m.ifdevice.trx_get_stats_func = NULL;

    }

    ru_m.ifdevice.trx_end_func(&ru_m.ifdevice);

    ru_m.ifdevice.trx_end_func = NULL;

  }
@@ -363,11 +371,19 @@ int main ( int argc, char **argv ) 
  end_configmodule(uniqCfg);



  if (ru->rfdevice.trx_end_func) {

    if (ru->rfdevice.trx_get_stats_func) {

      ru->rfdevice.trx_get_stats_func(&ru->rfdevice);

      ru->rfdevice.trx_get_stats_func = NULL;

    }

    ru->rfdevice.trx_end_func(&ru->rfdevice);

    ru->rfdevice.trx_end_func = NULL;

  }

      

  if (ru->ifdevice.trx_end_func) {

    if (ru->ifdevice.trx_get_stats_func) {

      ru->ifdevice.trx_get_stats_func(&ru->ifdevice);

      ru->ifdevice.trx_get_stats_func = NULL;

    }

    ru->ifdevice.trx_end_func(&ru->ifdevice);

    ru->ifdevice.trx_end_func = NULL;

  }

executables/nr-ru.c

+3 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,9 @@ int start_rf(RU_t *ru) { 
}



int stop_rf(RU_t *ru) {

  if (ru->rfdevice.trx_get_stats_func) {

    ru->rfdevice.trx_get_stats_func(&ru->rfdevice);

  }

  ru->rfdevice.trx_end_func(&ru->rfdevice);

  return 0;

}