Commit Graph
16373 Commits
Author SHA1 Message Date
Cedric Roux 46c1aff489 fix: do NR only if at least one gNB is connected to the eNB
We used to set 'does_nr' of an UE if we detect ENDC supported in the
UE capabilities.

Then we activate NR measurements if 'does_nr' is true.

The problem is that if the eNB is not connected to a gNB but the UE
reports some NR measurements (because a gNB is running somewhere near)
then the eNB will crash when starting the switch to NR.

A (quick) solution is to set 'does_nr' only if there is a gNB connected to
the eNB.

Maybe not the best solution. To be changed if needed.
2021-03-31 16:39:30 +02:00
rmagueta 1175463c7e Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-03-31 15:33:48 +01:00
rmagueta 8c9ed555d9 Remove runtime callocs for dmrs_AdditionalPosition 2021-03-31 15:32:45 +01:00
Raymond Knopp f851af22f2 fixing previous commit 2021-03-31 14:39:55 +01:00
rmagueta 53f77219d4 Rework default PDSCH time domain resource allocation tables 2021-03-31 14:31:19 +01:00
hardy 5af77e8fb3 Merge remote-tracking branch 'origin/small_nr_bugfixes' into integration_2021_wk13_d 2021-03-31 13:49:24 +02:00
hardy d5f8a6161f Merge remote-tracking branch 'origin/NRPRACH_highSpeed_saankhya' into integration_2021_wk13_d 2021-03-31 13:48:45 +02:00
hardy 4896e80e2c Merge remote-tracking branch 'origin/NR_MAC_SSB' into integration_2021_wk13_d 2021-03-31 13:47:58 +02:00
Raymond Knopp 9be7c35f68 changing config file for SA to connect to AMF
also enabling connection to AMF only when --sa option is used.
2021-03-31 11:44:56 +02:00
Raymond Knopp ce4e699874 fixing previous commit 2021-03-31 11:44:56 +02:00
Laurent THOMAS de5e64c722 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1 2021-03-31 10:13:50 +02:00
Raymond Knopp 13a9e49d65 additional DMRS for CoreSet0 back in gNB/UE resource allocations 2021-03-31 10:05:27 +02:00
Laurent THOMAS 58d372d3a2 one cppcheck, merge develop 2021-03-31 10:01:11 +02:00
Laurent THOMAS e1c73a0632 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-31 09:45:53 +02:00
Remi Hardy 1f3513b1e7 Integration 2021 wk13 c
MR !1092: Nr pdcp nia2 integrity
This code has not been tested with a COTS UE. We need SRB1/2 (so we need SA) to test.
The activation of security and integrity for SRB1 will need more code (new functions) because it happens after some time, not at creation time of the PDCP entity and there is no way to do this with current code.
 
MR !1075: Fft bench hotfix 
Simple fix to make the FFT testbench compile and run on current develop.

MR !1083: NR power measurement fixes
2021-03-31 05:15:29 +00:00
Raymond Knopp 2913757461 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	executables/nr-softmodem.c
	executables/nr-ue.c
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-03-31 03:14:48 +02:00
Raymond Knopp cbe2da1c46 OAI UE and eNB SA configuration up to reception of SIB1 and configuration of UE L1/L2 stack 2021-03-31 00:43:52 +02:00
Laurent THOMAS c2257d8687 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1 2021-03-30 19:46:45 +02:00
Laurent THOMAS 29dd729a93 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-30 19:45:10 +02:00
hardy f76ec27726 Merge remote-tracking branch 'origin/fft_bench_hotfix' into integration_2021_wk13_c 2021-03-30 16:41:24 +02:00
hardy 1214836e75 Merge remote-tracking branch 'origin/nr_power_measurement_fixes' into integration_2021_wk13_c 2021-03-30 16:40:41 +02:00
Cedric Roux fe4a9b005a nr: add some comments to pdcp nia2 integrity 2021-03-30 16:01:57 +02:00
francescomani 579f0290f6 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-30 15:10:28 +02:00
Thomas Schlichter ca963e68ff gNB: fix allocation of RC.gNB[] array
If the array of pointers is allocated using malloc(), it is not guaranteed that the pointers are NULL, so the actual PHY_VARS_gNB might nit be allocated correctly!
Also replace a malloc() + memset() combination by just a calloc().
2021-03-30 14:05:40 +02:00
rmagueta feb2651ea7 Fix issues due to merge 2021-03-30 12:38:31 +01:00
rmagueta b55b11b125 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-03-30 11:51:56 +01:00
Cedric Roux 63b7ff981e bugfix: fix compilation of simulators 2021-03-30 11:57:51 +02:00
Cedric Roux 18cb68ecc2 nr pdcp: first draft of NIA2 integrity
This code has not been tested with a COTS UE. We need SRB1/2 (so we need SA)
to test.

The activation of security and integrity for SRB1 will need more code
(new functions) because it happens after some time, not at creation time
of the PDCP entity and there is no way to do this with current code.
2021-03-30 11:57:51 +02:00
Cedric Roux 14c823037f nr pdcp: bugfix: D/C bit set only for DRBs 2021-03-30 11:57:51 +02:00
Thomas Schlichter 9916076fbd gNB: fix pucch indexing in fill_ul_rb_mask() 2021-03-30 10:45:03 +02:00
Thomas Schlichter 7848e2575c add missing pusch_AntennaPorts to conf files 2021-03-30 10:44:15 +02:00
Remi Hardy 77c36950d4 Integration 2021 wk13 a
-MR !1052 : Nr fapi beamindex ssb ro
This branch completes RA procedure for FR2 and includes improvements for beam index communication through FAPI interface.

-fix_rb_corruption:
A memcpy() introduced to optimize for the case of no precoding corrupted RBs which are not allocated to PDSCH in the common txdataF array.
So instead, fall back to memcpy() for each PDSCH RB.

-benetel configuration files update
2021-03-30 08:27:48 +00:00
francescomani d65af6d8ca Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-30 09:35:18 +02:00
Raymond Knopp df05672a4c Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_nsa.c
2021-03-30 04:48:51 +02:00
Raymond Knopp 707c20dd74 changes in UE to start configuration from Initial/MIB/SIB1/RRCSetup 2021-03-30 03:44:58 +02:00
Laurent THOMAS f5022585d9 format astyle only 2021-03-29 21:50:06 +02:00
rmagueta 56673386dc Skip invalid MAC CCCH messages for being processed at UE 2021-03-29 16:56:25 +01:00
rmagueta 80941b0c31 Minor LOG improvements 2021-03-29 16:43:55 +01:00
rmagueta b43c054f02 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2021-03-29 15:51:37 +01:00
rmagueta 1b427efaa1 Revert LOG to pass CI tests for RA 2021-03-29 15:42:03 +01:00
Laurent THOMAS 738728142f merge develop 2021-03-29 15:33:45 +02:00
Thomas Schlichter 104aa7eed5 gNB: fix precoding matrix related compile error 2021-03-29 14:59:58 +02:00
rohan 7a65decae4 Added High Speed flag Test case for nr_prachsim 2021-03-29 12:03:32 +00:00
Laurent THOMAS 68a81f65b2 merge develop 2021-03-29 11:24:34 +02:00
Florian Kaltenberger d08bb68b15 updating config file for benetel in CI folder 2021-03-29 10:35:35 +02:00
Florian Kaltenberger 5e9248938a applying new TDA to benetel config file 2021-03-29 10:35:17 +02:00
Florian Kaltenberger 2e9ac3672d removing annoying printf 2021-03-29 10:35:00 +02:00
hardy 74d2a6bbab Merge remote-tracking branch 'origin/fix_rb_corruption' into integration_2021_wk13_a 2021-03-29 10:31:15 +02:00
Thomas Schlichter fe191c7d0a gNB: fix corruption of RBs not used by PDSCH in nr_generate_pdsch()
A memcpy() introduced to optimize for the case of no precoding corrupted RBs which are not allocated to PDSCH in the common txdataF array.
So instead fall back to memcpy() for each PDSCH RB.
2021-03-29 10:10:08 +02:00
hardy ddf3f9e88c Merge remote-tracking branch 'origin/NR_FAPI_beamindex_SSB_RO' into integration_2021_wk13_a 2021-03-29 10:02:51 +02:00