Commit Graph
1825 Commits
Author SHA1 Message Date
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
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
Raymond Knopp 9dd6e3bb82 Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
Conflicts:
	executables/nr-uesoftmodem.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/RRC/NR/L2_nr_interface.c
2021-03-18 07:50:08 +01:00
rmagueta 9456542678 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
2021-03-16 16:04:23 +00:00
rmagueta 986a9fac1d Fixed issues to allow coexistence of CFRA and CBRA implementations 2021-03-16 16:00:37 +00:00
hardy 9abc8a6425 Merge remote-tracking branch 'origin/ptrs_rrc_config' into integration_2021_wk11 2021-03-16 16:28:31 +01:00
hardy dc60f04a46 Merge remote-tracking branch 'origin/NR_MAC_TCI_UCI_GlobalEdge' into integration_2021_wk11 2021-03-16 16:26:41 +01:00
Thomas Schlichter 8768deaf74 Merge remote-tracking branch 'develop' into ptrs_rrc_config 2021-03-16 14:01:32 +01:00
rmagueta 8646dd0bcb DRB configuration for a new crnti 2021-03-16 12:51:04 +00:00
luis_pereira87 bdc97f7a56 Send MAC NR-BCCH-SL-SCH to RRC through ITTI at UE 2021-03-16 10:08:54 +00:00
francescomani 5eb86207db Merge remote-tracking branch 'origin/develop' into NR_MAC_TCI_UCI_GlobalEdge 2021-03-16 08:49:54 +01:00
luis_pereira87 fd9f2b8fe7 Build errors resolved 2021-03-15 17:44:23 +00:00
luis_pereira87 5ab73a228f Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU
# Conflicts:
#	executables/nr-softmodem.c
#	executables/nr-uesoftmodem.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/main.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-03-15 12:44:16 +00:00
guhan 92c9d80ce0 Reverted the changes as same as develop 2021-03-15 17:47:04 +05:30
hardy ca3aaf700f Merge remote-tracking branch 'origin/fix-nr-pdcp-timer' into integration_2021_wk11 2021-03-15 09:31:40 +01:00
Remi Hardy de9c8634ad Merge remote-tracking branch 'origin/s1_subnormal' into integration_2021_wk10 2021-03-12 11:08:09 +01:00
He Shanyun 44288d7553 fix issue about ittiSIM and CplaneNG of withS1 2021-03-11 16:54:38 +09:00
Shweta Shrivastava 95df7843f3 Fix issues with NSA mode 2021-03-11 00:11:16 -06:00
He Shanyun 8965dd782b Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-11 14:39:36 +09:00
Shweta Shrivastava a0fa146e04 Merge branch 'ptrs_rrc_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into ptrs_rrc_config 2021-03-10 22:58:06 -06:00
Shweta Shrivastava 7eec3e3bcc Merge branch 'develop' into ptrs_rrc_config 2021-03-10 22:37:44 -06:00
Cedric Roux 4ff8f8832e NR: fix: set PDCP discard timer to infinity
The discard timer is used by the PDCP layer to discard packets that were not
transmitted to RLC after some time.

We don't really need it for the moment, maybe never for the default
bearer which is a best-effort bearer passing all kind of IP traffic.
Maybe for voice over IP kind of traffic it's important, or realtime
applications.

I ran an iperf UDP uplink test and saw no error on the PHY layer but still
lots of packets lost in the iperf logs, which was very surprising. By
analyzing the logs in wireshark I saw that, with the current scheduler,
an IP packet sent by the UE took 40ms to be sent piece by piece to the
gNB, and then the next uplink IP packet was never sent at all because
the discard timer was expired, leading to the high count of packets lost
in the iperf logs.

So let's put infinity for the moment for the discard timer. From my
understanding of the moment it's not a problem. If for some reason we
should set it to some non-infinity value, then we can change later.
2021-03-10 10:30:23 +01:00
matzakos 906fd2b68f Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS 2021-03-09 15:24:11 +01:00
Raymond Knopp 666aee7fc2 addition of GNB-CU-Configuration-Update/Update-Acknowledge/Update-Failure 2021-03-08 10:57:00 +01:00
masayuki.harada ff994453a4 Merge remote-tracking branch 'remotes/oai/develop' into HEAD
# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
#	openair3/S1AP/s1ap_eNB_handlers.c
2021-03-08 14:51:11 +09:00
Xue Song c273a9d356 fix problem about CU/DU c-plane failed 2021-03-05 19:43:42 +09:00
Xue Song 834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-03-05 19:07:43 +09:00
rmagueta 245f1e066f Improvements in RA-Msg4 2021-03-04 01:23:56 +00:00
luis_pereira87 d0b9146cd0 Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created) 2021-03-03 01:27:50 +00:00
rmagueta abb894be6b Draft RA-Msg4 at gNB 2021-03-02 20:20:11 +00:00
rmagueta 5f66269a8b Merge remote-tracking branch 'origin/develop' into develop-SA-RA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:01:11 +00:00
luis_pereira87 ca5eb17f28 Fix SIB1 with offsetToPointA = 86 2021-03-01 22:18:51 +00:00
rmagueta deef82d70b Fix RA-Msg3 to logical channel CCCH 2021-03-01 19:23:23 +00:00
luis_pereira87 f18db2bad8 Update SIB1 with q_RxLevMin to -65 and MCC and MNC to match SIM card values 2021-03-01 10:32:12 +00:00
Guhan 02ae169250 Rebased to latest develop and removed nr_rx_acknack function 2021-03-01 11:43:30 +05:30
matzakos e186134061 Preliminary work for separation of SRB from DRB handling in RLC
-For the moment SRBs are preconfigured (as was done for DRBs in noS1 mode)
but this should be removed
2021-02-26 12:11:01 +01:00
guhan 5d4f815181 Removed dead code 2021-02-26 11:50:13 +05:30
k.ramya 0a0a5e48c3 code rearrangement 2021-02-26 11:37:58 +05:30
Francesco Mani 17f830e587 revert to old rrc csi confriguration 2021-02-26 11:29:28 +05:30
r.karey 8c488bfdf8 UCI bitlength calculation 2021-02-26 10:51:42 +05:30
r.karey 03ea28df44 Merged rrc_gNB_reconfig for NR_CSI_reporting 2021-02-26 10:48:37 +05:30
r.karey 21c0af1b7c Merged rrc_gNB_reconfig for NR_CSI_reporting 2021-02-26 10:20:51 +05:30
rmagueta cf70265ba6 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-02-25 13:03:06 +00:00
Xue Song b6febe214f add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
2021-02-25 14:00:14 +09:00
Raymond Knopp 32b74d2f38 nr-softmodem compilation after merge with develop 2021-02-25 01:00:34 +01:00
Raymond Knopp 4d9ebf0ac0 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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_drb_am.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01:00
rmagueta 48811d0f34 Merge branch 'develop' into develop-SA-CBRA
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
rmagueta 910154c7af Merge branch 'develop' into develop-SA-RA
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00