Commit Graph
100 Commits
Author SHA1 Message Date
Robert Schmidt d10eb372ff Merge remote-tracking branch 'origin/bugfix-define-constants' into integration_2023_w30 2023-07-29 07:25:15 +02:00
Robert Schmidt 70926b2cbd Merge remote-tracking branch 'origin/CI-attach-detach' into integration_2023_w30 2023-07-29 07:24:28 +02:00
Robert Schmidt f79bab42fa Merge remote-tracking branch 'origin/asn1_log_issue' into integration_2023_w30 2023-07-29 07:24:15 +02:00
Robert Schmidt e188faa377 Merge remote-tracking branch 'origin/NR_UE_SIB1_outside_of_initial_sync' into integration_2023_w30 2023-07-29 07:24:10 +02:00
Robert Schmidt cb9dbb6591 Merge remote-tracking branch 'origin/NR_UE_otherSI_improv' into integration_2023_w30 2023-07-29 07:23:26 +02:00
Robert Schmidt 56f0b708ed Merge remote-tracking branch 'origin/NR_SL_RRC' into integration_2023_w30 2023-07-29 07:23:06 +02:00
Robert Schmidt 051fb056f6 Merge remote-tracking branch 'origin/fr2-interdigital-usrp-interface' into integration_2023_w30 2023-07-29 07:22:50 +02:00
Robert Schmidt 9bc00465a9 Merge remote-tracking branch 'origin/fix-context-setup-response' into integration_2023_w30 2023-07-28 12:03:14 +02:00
Robert Schmidt da17b17b83 Merge remote-tracking branch 'origin/fix_nr_slot_fep_init_sync' into integration_2023_w30 2023-07-28 12:03:06 +02:00
Robert Schmidt a655026dce Merge remote-tracking branch 'origin/ci-add-sc-fdma-test' into integration_2023_w30 2023-07-28 12:02:58 +02:00
Robert Schmidt 1cbd6c714b Merge branch 'integration_2023_w29' into 'develop'
integration_2023_w29

See merge request oai/openairinterface5g!2254

* !2159 chore(ci): adding back part of old IF4.5 LTE legacy tests
* !2236 Remove crypt dependency
* !2238 Fix cppcheck warnings related to uninitialized variables
* !2239 incorrectStringBooleanError CPPCheck warnings fix
* !2241 nrUE: quick fix for compatibility with Open5GS
* !2244 Fix support for NR band n40 accordingly with 3GPP TS 38.101-1 V15.22.0
* add timeout to Jenkinsfiles to prevent long hangs in CI
* !2168 NR FR2 undefined behavior sanitize (segfault in one test)
* !2212 make common code for data copy to the scope
* !2242 Fix out-of-bound array accesses in PUCCH2 decoder
* !2245 Fix warnings emitted by gcc 13
* !2226 CI: modifications in CI scripts - usage of f-strings, constants
* !2251 T GUI tools: guard with cmake option, default off
* !2252 UE PHY: remove dead code
* update timing thresholds
* !2249 Fix bug in scheduler locking mechanism
2023-07-24 07:41:42 +00:00
Robert Schmidt 082af9863d Merge remote-tracking branch 'origin/fix-bug-sched-lock' into integration_2023_w29 2023-07-21 16:24:49 +02:00
Robert Schmidt a1f7284ee3 Update 40 MHz 1x1 timing thresholds
These timings shifted slightly in an MR recently. Since it is only
micro-seconds, and these thresholds are much higher in the 60 MHz (1x1
and 2x2) tests, it is safe to increase.
2023-07-21 16:01:02 +02:00
Robert Schmidt 233aa55f26 Merge remote-tracking branch 'origin/remove-ue-dead-var' into integration_2023_w29 2023-07-21 15:33:07 +02:00
Robert Schmidt b0b3c7ee67 Merge remote-tracking branch 'origin/t-tools-dependency-fix' into integration_2023_w29 2023-07-21 15:32:54 +02:00
Robert Schmidt 169b026b66 Merge remote-tracking branch 'origin/ci-multi-modifs' into integration_2023_w29 2023-07-21 15:31:12 +02:00
Robert Schmidt 1f8e95833c Merge remote-tracking branch 'origin/fix_warnings_gcc13' into integration_2023_w29 2023-07-21 14:06:41 +02:00
Robert Schmidt 526c84f4f2 Merge remote-tracking branch 'origin/fix-rx_pucch2' into integration_2023_w29 2023-07-21 14:06:38 +02:00
Robert Schmidt a0f375f50c Merge remote-tracking branch 'origin/improve-scope-interface' into integration_2023_w29 2023-07-21 14:06:34 +02:00
Robert Schmidt 04dee38c71 Merge remote-tracking branch 'origin/NR_FR2_sanitize' into integration_2023_w29 2023-07-21 14:06:29 +02:00
Robert Schmidt 22d467c339 Merge remote-tracking branch 'origin/NR_Band_n40' into integration_2023_w29 2023-07-20 17:28:55 +02:00
Robert Schmidt 9966a24a22 Merge remote-tracking branch 'origin/ue-compatible-with-open5gs' into integration_2023_w29 2023-07-20 17:28:49 +02:00
Robert Schmidt d989760d1f Merge remote-tracking branch 'origin/incorrectStringBooleanError_cppcheck_fix_on_w27_2023' into integration_2023_w29 2023-07-20 17:28:43 +02:00
Robert Schmidt 7c847cd908 Merge remote-tracking branch 'origin/uninitvar_cppcheck_fix_on_w27_2023' into integration_2023_w29 2023-07-20 17:28:34 +02:00
Robert Schmidt a6b6b61b51 Merge remote-tracking branch 'origin/oai_crypt_rm' into integration_2023_w29 2023-07-20 17:28:16 +02:00
Robert Schmidt 0325b15c66 Merge remote-tracking branch 'origin/ci-adding-back-lte-if4-5-tests' into integration_2023_w29 2023-07-20 17:28:09 +02:00
Robert Schmidt 0ba050f419 libxft is an optional dependency
Reason: see previous commit.

Don't install libxft by default
2023-07-20 13:45:22 +02:00
Robert Schmidt 372c067335 T GUI tools: guard with cmake option, default off
The T tools offering a GUI use libxft as a dependency. By default, we
try to limit the amount of dependencies, but libxft comes with X11.

Put the GUI tools behind cmake option T_TOOLS_GUI (default: off) to only
build on demand with a cmake option.
2023-07-20 13:42:26 +02:00
Robert Schmidt 9a55658b57 Fix bug in scheduler lock mechanism
nr_mac_prepare_ra_ue() is called with the scheduler being locked via
NR_SCHED_ENSURE_LOCKED(), but if there is no free RA process, it
unlocks the scheduler via NR_SCHED_UNLOCK().  This is commit fixes this.

In short, when calling nr_mac_prepare_ra_ue(), the scheduler is locked,
and should always return with the scheduler being locked.
2023-07-20 13:23:01 +02:00
Robert Schmidt fe61354173 Merge branch 'NR_SL_FAPI' into 'develop'
Sidelink MAC-PHY interface definition

See merge request oai/openairinterface5g!2234
2023-07-18 08:59:05 +00:00
Robert Schmidt 0806903541 Harmonize additional packages installer: RHEL/Fedora are identical 2023-07-18 10:51:57 +02:00
Robert Schmidt 6050c5db66 GnuTLS: only used by webserver, so move it to additional packages 2023-07-18 10:50:38 +02:00
Robert Schmidt 86563e8058 Remove unused libgcrypt dependency 2023-07-18 10:48:47 +02:00
Robert Schmidt 578fbfb9f6 Merge branch 'integration_2023_w28' into 'develop'
integration_2023_w28

See merge request oai/openairinterface5g!2232

* !2190 Reduce compilation time of OAI using ccache
* !2209 T: don't use execute_process, integrate in cmake
* !2210 only cleaning, not change
* !2219 NR UE decode other SI
* !2223 Fix rfsimulator build
* !2225 Add XnAP ASN.1 definitions
* !2131 Polar coding according to the standard
* !2160 Add memory sanitizer flag to build_oai and fix some bugs
* !2206 Bugfix tx rf burst
* !2227 Remove commented code, fix CI issues
2023-07-16 13:48:23 +00:00
Robert Schmidt c3931c9fe0 Merge remote-tracking branch 'origin/fixes-ci-ue' into integration_2023_w28 2023-07-13 19:19:31 +02:00
Robert Schmidt a0c2c5d1e9 Merge remote-tracking branch 'origin/bugfix_tx_rf_burst' into integration_2023_w28 2023-07-13 19:19:23 +02:00
Robert Schmidt 516d4b9fc1 Merge remote-tracking branch 'origin/use-memsan' into integration_2023_w28 2023-07-13 19:19:15 +02:00
Robert Schmidt 92ba679bbf Merge remote-tracking branch 'origin/develop-PUCCH2' into integration_2023_w28 2023-07-13 18:47:46 +02:00
Robert Schmidt 52f21f525c Merge remote-tracking branch 'origin/IISc_XnHandover' into integration_2023_w28 2023-07-13 17:00:05 +02:00
Robert Schmidt 8be52f6c8d Merge remote-tracking branch 'origin/fix-simu' into integration_2023_w28 2023-07-13 16:59:59 +02:00
Robert Schmidt 70475fecec Merge remote-tracking branch 'origin/NR_UE_RRC_handle_otherSI' into integration_2023_w28 2023-07-13 16:59:49 +02:00
Robert Schmidt b55bff37ca Merge remote-tracking branch 'origin/ue-code-cleanup' into integration_2023_w28 2023-07-13 16:56:36 +02:00
Robert Schmidt 3a49a44c2b Merge remote-tracking branch 'origin/t-no-execute-process' into integration_2023_w28 2023-07-13 16:56:23 +02:00
Robert Schmidt bf246a6582 Merge remote-tracking branch 'origin/ccache' into integration_2023_w28 2023-07-13 16:56:16 +02:00
Robert Schmidt 630ee18b79 Use BladeRF log level directly without OAI Log Levels
- bladerf depends on UTIL via common_lib.h
- use header guards
2023-07-13 10:29:33 +02:00
Robert Schmidt 9132992801 T: add tutorial for new trace 2023-07-13 10:29:33 +02:00
Robert Schmidt abf04db97b Allow to use cmake to generate T tracer programs
- Add CMakeLists.txt to build all T tracer user tools
- Previous Makefiles are retained in common/utils/T: you can do
  $ cd common/utils/T/tracer
  $ make # all executables are there
  or also
  $ mkdir build && cd build
  $ cmake .. -GNinja
  $ ninja T_tools # all executables are in build/common/utils/T/tracer
2023-07-13 10:29:33 +02:00
Robert Schmidt a9e8a02dec Install libxft-dev by default, required by T tools 2023-07-13 10:29:33 +02:00
Robert Schmidt 5a98ead92b Disable T tracer in clang build
We disable for two reasons:
- in the CI, with clang, it did not build once, but I cannot reproduce
  locally (even with clang)
- we want to maintain to be able to build without T tracer, so in one
  pipeline, we have to build without it. What a lucky coincidence!
2023-07-13 10:29:33 +02:00
Robert Schmidt 66893739b8 Make USRP compile, depends on T
USRP code uses the logging module, which has a dependency on T, if
configured. Therefore, include UTIL to satisfy this dependency
2023-07-13 10:29:33 +02:00
Robert Schmidt 9ed7ab6863 Remove unused VCD signal dumper from ETHERNET lib 2023-07-13 10:29:33 +02:00
Robert Schmidt c853f74167 Include T.h in log.h only when T_TRACER=ON 2023-07-13 10:29:33 +02:00
Robert Schmidt c1e8acb2e2 Repair build when T tracer build disabled 2023-07-13 10:28:38 +02:00
Robert Schmidt 2ae1908339 Put T source library in subdirectory, don't build multiple times
- UTIL: has LOG which brings as (public) dependency T, so link it publicly
- Move T to top to ensure all targets can have it
2023-07-13 10:28:38 +02:00
Robert Schmidt ec3acac9f8 Remove functions present due to (non-existing) linking issues 2023-07-12 16:46:50 +02:00
Robert Schmidt eed29f8900 Remove commented, SDR ADRV9731-specific code 2023-07-12 16:46:11 +02:00
Robert Schmidt 454258d2e1 Remove unused preprocessor defines
commit ddf549b1f3 moved the CMakeLists.txt
for building radio libraries down to radio/. Previously, each option
would also declare a constant (e.g., OAI_USRP for USRP). With the
definition being below radio/, the executables don't have that define.

This commits removes the couple of defines that were in place:
- one that only shows a log, but it also applies for e.g., rfsimulator.
  It is also missing in the CI. Simply put it back
- two other places guard a commented(!) function call, which can go out
  entirely
2023-07-12 16:43:27 +02:00
Robert Schmidt 49be2e9b8f reduce sleep 2023-07-11 10:31:51 +02:00
Robert Schmidt 2b85595f22 MSan: check that not UBSan and ASan set; check that clang set 2023-07-11 10:31:43 +02:00
Robert Schmidt 79fe8f58a7 Speed up rfsimulator build
The ASN.1 RRC (4G/5G) headers are not needed
2023-07-10 16:33:04 +02:00
Robert Schmidt 5b62e0eb41 Fix target name for build_oai -w SIMU 2023-07-10 16:32:55 +02:00
Robert Schmidt c3f8488456 Generate T headers using cmake 2023-07-10 09:18:14 +02:00
Robert Schmidt 392ef79b28 Merge branch 'integration_2023_w27' into 'develop'
integration_2023_w27

See merge request oai/openairinterface5g!2218

* !2163 CI: use same Ping functionality everywhere
* !2173 Remove RFSIMULATOR environment variable; rename two env vars, add one; documentation
* !2205 Add support for NR band n48
* !2211 Fix bug
* !2213 CI: AW2S pipeline - disable retransmissions check
* !2133 Add E2 agent
* !2208 Bugfix when deleting a SDAP entity
* !2195 remove redundant copies of pdu sessions list
* !2174 Refactor CMakeLists.txt
* !2167 CI: Creation of pipeline for OAIUE testing
* !2165 improvements in CI config files
2023-07-10 06:58:59 +00:00
Robert Schmidt 9dd27e60f9 Fix after merging ssh asterix into integration; conflict from ls 2023-07-10 08:57:18 +02:00
Robert Schmidt c632f9c8e7 Merge remote-tracking branch 'origin/CI_config_improvements' into integration_2023_w27 2023-07-09 14:06:57 +02:00
Robert Schmidt 7b1703441f Merge remote-tracking branch 'origin/ci-nrue-test' into integration_2023_w27 2023-07-09 14:05:45 +02:00
Robert Schmidt 4ae73af46f Merge remote-tracking branch 'origin/cmake-refactor' into integration_2023_w27 2023-07-08 13:29:55 +02:00
Robert Schmidt 4e18ce02e3 Merge remote-tracking branch 'origin/remove-redundant-stored-drb-list' into integration_2023_w27 2023-07-08 13:29:37 +02:00
Robert Schmidt 079866bf4f Check for libforms for building scopes 2023-07-08 13:28:52 +02:00
Robert Schmidt 306b4974ad Simplify build_oai 2023-07-08 13:28:52 +02:00
Robert Schmidt 5f58ccb56c Remove unused build_oai variables 2023-07-08 13:28:52 +02:00
Robert Schmidt c25ee6fd32 Move symlink creation to radio/transport device to cmake 2023-07-08 13:28:52 +02:00
Robert Schmidt 6919f29060 Merge remote-tracking branch 'origin/Bugfix_SDAP_delete_entity' into integration_2023_w27 2023-07-07 16:55:50 +02:00
Robert Schmidt be8a401242 Merge remote-tracking branch 'origin/e2_sub' into integration_2023_w27 2023-07-07 16:55:36 +02:00
Robert Schmidt 1f14195543 Move inclusion of openair2/E2AP where it belongs 2023-07-07 13:49:17 +02:00
Robert Schmidt 31b7d7c432 !2173: Favor --rfsimulator.serveraddr "server" over RFSIMULATOR=server 2023-07-07 13:49:17 +02:00
Robert Schmidt 126e7bb432 Reference E2 agent tutorial in doc/README.md 2023-07-07 13:45:18 +02:00
Robert Schmidt 60d232e214 Merge remote-tracking branch 'origin/ci-aw2s-xml' into integration_2023_w27 2023-07-07 09:01:16 +02:00
Robert Schmidt 93ec943b12 Merge remote-tracking branch 'origin/bug_fix_tp' into integration_2023_w27 2023-07-07 09:01:09 +02:00
Robert Schmidt 15d1cd9500 Merge remote-tracking branch 'origin/NR_Band_n48' into integration_2023_w27 2023-07-07 09:01:01 +02:00
Robert Schmidt 97cf8a48a9 Merge remote-tracking branch 'origin/doc-env-var' into integration_2023_w27 2023-07-07 09:00:54 +02:00
Robert Schmidt 00e3c5acdd Run ldconfig to find libparams_libconfig.so in nr-cuup container 2023-07-07 08:35:29 +02:00
Robert Schmidt 0163a52b7a Add libcblas for docker containers 2023-07-07 08:35:29 +02:00
Robert Schmidt b90a469131 Correctly build AW2S in dockerfile 2023-07-07 08:35:29 +02:00
Robert Schmidt 4db08dc68a Simplify compilations build helper
Instead of using ninja/make directly, there is a cmake command option to
trigger the build using whatever build tool has been configured. Use it;
if there is a mismatch, there will also be a clearer cmake error.

Remove build_oai's --build-coverity: we don't use it, and it can
trivially be added if required (probably, most users would run it by
hand anyway).

Add an error if the compilations function is not called with the right
noumber of arguments.
2023-07-07 08:35:29 +02:00
Robert Schmidt b896da85e7 Harmonize build_oai color output 2023-07-07 08:35:29 +02:00
Robert Schmidt 557e3ba800 Make ethernet off by default in build_oai
If it was one, build_oai without parameters would attempt to build the
ethernet library. However, this is unexpected, and will lead to an error
(as it is by default off in CMake). Set it to off, and build it where
required.
2023-07-07 08:35:28 +02:00
Robert Schmidt ddf549b1f3 Move radio CMakeLists.txt to subdirectory
- move following radios: AW2S, BladeRF, IRIS, LMSSDR, RFsimulator, USRP
- move following transports: Ethernet, benetel4g, benetel5g
- for each: create independent cmake variable to switch compilation
  on/off, in order: OAI_AW2S, OAI_BLADERF, OAI_IRIS, OAI_LMSSDR,
  OAI_SIMU, OAI_USRP, OAI_ETHERNET, OAI_BENETEL4G, OAI_BENETEL5G
- Remove RF_BOARD variable, allows to compile multiple boards at once
- where applicable: remove USERSPACE/LIB in path, i.e., move files up to
  directories, as all are userspace libraries

Note that with the above, it is now mandatory to enable a radio
implementation before compiling it, e.g., for USRP:

./build_oai -w USRP
cmake .. -DOAI_USRP=ON && ninja oai_usrpdevif
2023-07-07 08:35:28 +02:00
Robert Schmidt 52cb72c0ee build_oai: allow to only build radio/transport libraries 2023-07-07 08:35:28 +02:00
Robert Schmidt 47da0a024d Remove libcrypto, correctly search and link libcrypt
- libcrypto is not used
- we use libcrypt, so correctly check for it, and link to the
  corresponding targets
2023-07-07 08:35:28 +02:00
Robert Schmidt c9231dd02d CONFIG_LIB: do not include libconfig headers globally
Use target_include_directories() only on relevant targets.
Remove from some targets that don't use the config module.
2023-07-07 08:35:28 +02:00
Robert Schmidt 1875190521 Repair rftest
- needs forms library, so link it
- fix warnings
2023-07-07 08:35:28 +02:00
Robert Schmidt 387f5e4118 Make shlib_loader OBJECT library to prevent multiple compilations
Including sources in targets makes that file being compiled multiple
times. Instead, define an OBJECT library (i.e., it is only compiled, but
not linked), and link it into each target that uses it.
2023-07-07 08:35:28 +02:00
Robert Schmidt 28ec4944a5 Fix minimal_stub.c
It uses definitions from stdlib.h, so include it.
2023-07-07 08:35:28 +02:00
Robert Schmidt be4c03c90c Properly check and link (C)BLAS and LAPACKE dependencies
Instead of using the adhoc code for checking and including (globally!)
BLAS/LAPACKE, use PkgConfig to correctly identify libs (see deleted
comment: "Hope this gets fixed in future!" -- you are welcome). Next,
only link into those libraries that need it (PHY_UE, SIMU). Note that
only RHEL also needs cblas, so it is a non-REQUIREd dependency that is
only linked in if available. Further, take out linking into all other
modules, as they don't need it.

In the source code, take out preprocessor directives to correctly
include headers -- that is cmake's job, which it does just fine now.
2023-07-07 08:35:28 +02:00
Robert Schmidt 25f2a48265 Remove targets/Makerules: it is not used 2023-07-07 08:35:28 +02:00
Robert Schmidt 25edebb593 Refactor CMakeLists.txt OpenSSL handling
First, we do not include openssl globally using `include_directories()`,
as most modules don't need it. Further, it is linked into SECURITY, and
removed from all other targets (they don't need it, only SECURITY).

Finally, remove a header include in NR PDCP that is not needed
2023-07-07 08:35:28 +02:00
Robert Schmidt 439b6027cf Remove CMakeLists.txt reference to xpm: it is not used 2023-07-07 08:35:28 +02:00
Robert Schmidt cd6dd99d43 Remove CMakeLists.txt reference to openpgm: it is not used 2023-07-07 08:35:28 +02:00
Robert Schmidt 5b534c957f Remove unused cmake options and commented code
- LINUX: option to optionally set a sighandler for certain simulators,
  no practical relevance
- LINUX_LIST: not used anywhere
- DEBUG_DLSCH: referenced in the code, but those files have a separate
  (commented) line `#define DEBUG_DLSCH`; probably never used
- LINK_ENB_PDCP_TO_IP_DRIVER, LINK_ENB_PDCP_TO_GTPV1U: commented in
  cmake, although they are referenced. It is likely that code behaves
  unexpected if re-enabled; we therefore remove these options to avoid
  future problems
- Remove some more commented code
2023-07-07 08:35:28 +02:00