Commit Graph
376 Commits
Author SHA1 Message Date
Raymond Knopp e51cd863fe Merge branch 'bler_txoptim' into F1C_extensions_develop
Conflicts:
	cmake_targets/CMakeLists.txt
	common/utils/nr/nr_common.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/ocp-gtpu/gtp_itf.cpp
	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-11-14 21:18:50 +01:00
matzakos 40263348f9 Merge with NR_F1C_F1U_extensions and resolve conflicts 2021-11-12 17:01:27 +01:00
rmagueta 70d3c7973c Merge remote-tracking branch 'origin/develop' into bler_txoptim 2021-11-09 10:39:49 +00:00
hardy 4c2c7f92a5 Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b 2021-11-08 13:12:52 +01:00
luis_pereira87 29eca46833 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/GNB_APP/gnb_config.c
2021-11-04 11:32:03 +00:00
Raymond Knopp 2f30123fc2 testing up to mcs 28 2021-10-31 07:44:25 +01:00
matzakos b103ada542 Fix decoding of SIB1 RRC container at the processing function of F1 setup request at the CU
after modifications done at the encoded SIB1 message type included in the RRC container of F1 setup request at the DU
-Some cleanup required
2021-10-26 18:30:51 +02:00
matzakos e7f8b56b65 Include NR_SIB1_t type in F1 setup req container instead of the whole NR_BCCH_DL_SCH_Message_t message
-Wireshark is not complaining after that
-Issue at decoding F1 Setup req at the CU due to the new encoding
-Keep the previous encoding as the default for now until the CU issue is fixed
-Fix PUCCH allocation for ACK/NAK issue appearing when DU runs without OAI CU
2021-10-26 13:11:50 +02:00
Laurent THOMAS e3f9fd6b01 code cleanup, no feature 2021-10-24 14:47:24 +02:00
francescomani 137e81970e Merge remote-tracking branch 'origin/develop' into NR_MCS_BLER 2021-10-21 15:55:15 +02:00
Mario Joa-Ng d483410e2a Merge develop. 2021-10-20 21:06:16 -04:00
rmagueta 4e949657fb Fix after merge 2021-10-14 14:59:11 +01:00
rmagueta b1a8b06547 Merge remote-tracking branch 'origin/integration_2021_wk41' into integration_2021_wk41_bwt-abs
# Conflicts:
#	ci-scripts/xml_files/fr1_sa_quectel.xml
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/GNB_APP/gnb_paramdef.h
2021-10-14 14:22:23 +01:00
Raymond Knopp 166a8f69bb prb_mask calculation for mixed slot (for blacklisted PRBs) 2021-10-14 01:35:01 +02:00
Raymond Knopp 0a87da0b74 bugfix for allocation of blacklisted PRBs in MAC 2021-10-13 17:05:12 +02:00
Raymond Knopp b05d165cd0 hand cherry-picked PRB blacklisting 2021-10-11 14:34:49 +02:00
Robert Schmidt 41dff7b190 Add MCS from HARQ BLER
- Estimates correct MCS using EMA, kept between target thresholds
  dl_bler_target_upper and dl_bler_target_lower (conf options) for 1st
  retx and below dl_rd2_bler_threshold for 2nd retx
- Maximum MCS configurable
- on 3rd retx, reduce MCS by 5
2021-10-06 08:38:21 +02:00
mjoang 626e3a7015 merge develop 2021-09-23 10:44:43 -04:00
Laurent THOMAS 9b691b3ecf fix old code errors, add CU to DU, 4G F1-U 2021-09-21 20:33:35 +02:00
Laurent Thomas 8e66c6a489 F1-U development 2021-09-09 19:37:07 +02:00
rmagueta 71cd100335 Merge remote-tracking branch 'origin/nr-pdcp-security-w34' into bandwidth-testing-abs
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-09-08 17:22:28 +01:00
Laurent Thomas 7b2f3440e9 merge develop 2021-09-07 16:51:30 +02:00
Cedric Roux eeca38368e gnb sa: improve security
Note: some modifications have been done to the UE too, but for syntactic
reasons. The UE may fail to work, not tested.

For the UE, we have the problem of handling properly SecurityModeCommand.
We don't verify its integrity. This is a bit complicated to handle properly
and may require some API changes in the PDCP layer. So, as of today, the
integrity of this message is not verified.

Also, NSA mode has been touched, but it should not be a problem. But not
tested, so not sure.
2021-09-06 11:06:47 +02:00
Laurent THOMAS 00a47807b1 some progress in du ue context setup 2021-09-02 19:28:28 +02:00
rmagueta 5e1065e88f Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-02 17:57:48 +01:00
Laurent THOMAS 7cde9f7a88 DU sends packet in UL over F1-U 2021-09-02 15:10:11 +02:00
Eurecom 33cd8cafbb after merge with abs 2021-09-01 10:27:13 +02:00
Laurent THOMAS 49c4fceb76 fix memory error: too early paramters read, then free (before end of usage 2021-08-31 20:51:11 +02:00
Laurent THOMAS 0f033d99ff merge develop 2021-08-31 13:29:28 +02:00
francescomani 6a2352f843 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-30 17:55:38 +02:00
hardy b798755347 Merge remote-tracking branch 'origin/prb_based_dl_channel_estimation' into integration_2021_wk34 2021-08-26 14:33:33 +02:00
matzakos ca8b7c915c Merge remote-tracking branch 'origin/develop' into NR_F1C_F1U_extensions 2021-08-25 17:06:17 +02:00
francescomani b6ef23a395 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-25 15:01:40 +02:00
francescomani a1595c3109 setting ulsch inactivity timer from slots to frames and removing it from config files (default 10 frames) 2021-08-24 18:02:54 +02:00
Laurent THOMAS e0cb79d2d8 make SIB1 encoding readable and ARM compatible 2021-08-24 11:21:53 +02:00
Eurecom bafd82a935 Merge remote-tracking branch 'origin/NR_UE_SA' into bandwidth-testing
Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-08-21 07:48:04 +02:00
Sakthivel Velumani 7f5009d7cc fixed SA issues 2021-08-17 17:59:41 +05:30
Sakthivel Velumani a87dca8691 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-16 18:59:29 +05:30
francescomani e083bd4330 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-13 15:09:52 +02:00
Laurent THOMAS 19af86b163 little fixes 2021-08-12 21:53:56 +02:00
Rahul Gottipati 540d2e2977 Rebase to latest develop 2021-08-12 15:20:16 +05:30
Laurent THOMAS 89eb5850cf merge develop, no big issue, we are sync 2021-08-12 10:08:25 +02:00
Laurent THOMAS 457dc5816b fixes commit before merge develop 2021-08-12 09:31:36 +02:00
Mahesh 49fc03a65e Cleanup and some minor bugfixes 2021-08-11 13:16:32 +05:30
Raphael Defosseux a0e3cc8de4 Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into integration_2021_w32 2021-08-06 10:39:56 +02:00
francescomani 2daa9144c4 Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into NR_UE_SA 2021-08-06 09:26:17 +02:00
francescomani 62b1531c55 improvement in fix for commonControlResourceSet for SIB1 2021-08-04 14:23:50 +02:00
Laurent THOMAS 7fcd5e3e29 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_F1C_F1U_extensions 2021-08-04 13:49:43 +02:00
Rahul Gottipati 4ec3434128 Rebase to latest develop 2021-08-04 14:57:52 +05:30
Eurecom 1385af17e9 end2end functional again (sort of). 2021-08-04 11:21:39 +02:00