Commit Graph
1892 Commits
Author SHA1 Message Date
rmagueta ef8aaa8c9b Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
2021-04-20 11:37:33 +01:00
Raymond Knopp 564311525e applied patch for UE PUCCH TX from Albesmart. changed p-NR-FR1 to 0 (from 20) to reduce SNR on UL. PUCCH is now functional after inserting physicalCellGroupConfig (before and after applying MasterCellGroupConfig) 2021-04-19 23:53:28 +02:00
luis_pereira87 2fb267145e Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-04-19 12:12:44 +01:00
Raymond Knopp a22a2b5745 fixed bug in physicalCellGroupConfig initialization 2021-04-19 13:01:08 +02:00
Raymond Knopp 2556b087f9 added physicalCellGroupConfig to RRCSetup message 2021-04-19 12:41:21 +02:00
Raymond Knopp 7d100407ee added ue-specific searchspace on initialBWP to RRCSetup message. 2021-04-19 00:02:48 +02:00
Raymond Knopp 2b2285747d OK up to RRCSetupComplete received in RRC and decoded correctly 2021-04-17 00:09:43 +02:00
Raymond Knopp 7818958da0 Validated up to reception of first PUSCH after Msg4 (contains RRCSetupComplete) 2021-04-16 15:30:50 +02:00
rmagueta 50bd0f0f33 Remove bwp_dedicated from fill_default_initialDownlinkBWP 2021-04-15 23:46:39 +01:00
rmagueta 131cef2b6b Fix build warnings 2021-04-15 22:59:35 +01:00
rmagueta 4301582f88 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
rmagueta 2c907fb6e5 Fix minor issues of develop 2021-04-15 15:09:22 +01:00
hardy b5ffe11bd8 Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
Conflicts:
	openair1/PHY/TOOLS/nr_phy_scope.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
hardy c4745c3e46 Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
Raymond Knopp cfe8224590 Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-14 12:19:02 +02:00
Raymond Knopp cee0f9451d intermediate commit. up to Msg4 ACK and DCI_0_0 reception verified with COTS UE (Quectel).
- first PUSCH containing RRCSetupComplete not programmed for reception in PHY for some reason. DCI_0_0 received by UE.
- if RA fails, on the second attempt there is usually a crash (sometimes in L2_interface.c when getting UE context (added AssertFatal on this now).
2021-04-14 12:15:59 +02:00
matzakos ea65e1899e Add calls to initialization and configuration functions for RLC and PDCP at nrUE for SA mode
-RRCSetupComplete successfully transferred to RLC of the UE now through SRB1, but not at the MAC yet.
-Needed to enable some additional elements for RLC config. at the gNB side (asn1_msg.c) so that the addition of the SRB does not fail at the UE.
 To verify if these are really required.
2021-04-14 10:20:33 +02:00
Laurent THOMAS 86f1c69f26 Fix code review remarks, merge develop, revert some merge errors 2021-04-13 22:28:02 +02:00
Raymond Knopp 22059801fe reduced logging, UE MIB processing 2021-04-12 23:10:02 +02:00
rmagueta e8f8297892 Fix search space and coreset for Msg2 and Msg4 at gNB 2021-04-12 19:20:23 +01:00
Raymond Knopp 4b712adc76 removed reading reconfig.raw with --sa. Also a segfault upon reception of RRCSetup-CellGroupConfig when this is not in the RRC context. 2021-04-12 16:36:11 +02:00
Raymond Knopp 1236f4c389 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2021-04-12 16:03:09 +02:00
Raymond Knopp 1e60fbd49f Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-04-12 10:21:25 +02:00
rmagueta ddfc737c65 Fix search space for Msg2 and Msg4 at gNB 2021-04-09 19:46:35 +01:00
Laurent Thomas 307098da4a merge develop 2021-04-09 12:39:33 +02:00
Raymond Knopp e3d13131b4 fix for last commit (removal on one line in asn1_msg.c) 2021-04-08 11:00:03 +02:00
Raymond Knopp 60e0048c29 added call to NAS for RRCSetupComplete message in UE. other minor modification in gNB/UE scheduling for SA 2021-04-08 08:40:40 +02:00
Raymond Knopp 470d0ac121 full configuration including Msg4/RRCSetup. InitialBWP handling at gNodeB 2021-04-07 10:57:00 +02:00
rmagueta 79864d001b Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-04-06 11:38:33 +01:00
Laurent Thomas 89598e3bad Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1 2021-04-06 12:11:29 +02:00
Laurent OpenCells 4511e70fac fix from ci results 2021-04-05 12:56:52 +02:00
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
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
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
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
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
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
Laurent THOMAS 738728142f merge develop 2021-03-29 15:33:45 +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
hardy a84b1b4340 Merge remote-tracking branch 'origin/fix-quectel' into integration_2021_wk12_b 2021-03-28 21:36:45 +02:00
Raymond Knopp 4d0d4fcb29 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
Laurent THOMAS 818c9b2c88 first pass 2021-03-25 20:13:50 +01:00
Raymond Knopp a6b24211ac configuration of SRB1 for monolithic and CU/DU, move some parameters from RRC to MACRLC section in configuration file. 2021-03-25 14:26:28 +01:00
Raymond Knopp f6d53094c4 added DUtoCURRCContainer IE in UL INITIAL RRC MESSAGE TRANSFER
added generation of initial Master Cell Group Configuration for both CU/DU and monolithic gNB.

Tested until transmission of RRCSetupComplete from UE
2021-03-23 21:52:57 +01:00
rmagueta d37552db4c Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00:00
Thomas Schlichter dade64ea43 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-19 11:18:02 +01:00