Commit Graph
353 Commits
Author SHA1 Message Date
francescomani 59195807cc Merge remote-tracking branch 'origin/develop' into NR_MCS_BLER 2021-11-03 14:03:01 +01:00
francescomani d55158eb14 temporarily remove conditions on 2nd and 3rd rtx and increase max mcs to 28 2021-11-03 14:01:17 +01: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
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
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
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
Eurecom 33cd8cafbb after merge with abs 2021-09-01 10:27:13 +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
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
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
Rahul Gottipati 540d2e2977 Rebase to latest develop 2021-08-12 15:20:16 +05:30
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
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
Sakthivel Velumani 6050776f55 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-02 12:17:03 +02:00
francescomani d2127b65f3 flexible csi configuration including do_csirs config parameter 2021-07-26 12:45:04 +02:00
francescomani ef84130e7c Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-07-23 16:01:43 +02:00
luis_pereira87 17f466a9bf Fix define MACRLC idx that overlaps 2021-07-22 10:50:44 +01:00
Eurecom 2c01000955 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into bandwidth-testing 2021-07-18 09:17:00 +02:00
Eurecom 3c303223f0 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into bandwidth-testing
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-07-18 09:16:14 +02:00
rmagueta 64c28bf9ac Normalization of energy over ifft and receive antennas 2021-07-16 16:50:51 +01:00
Roberto Louro Magueta abef7f0b08 Revert "Temporary fix for prach_thres"
This reverts commit af0d7dabba
2021-07-16 15:34:53 +00:00
francescomani 2fe8dd7657 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA 2021-07-14 10:35:09 +02:00
Eurecom 8c482709dc changes for initialBWP size different than Coreset0. Tested with 50 MHz 2x2 configuration, initialBWP with 133 PRBs. 2021-07-11 19:42:01 +02:00
rmagueta af0d7dabba Temporary fix for prach_thres 2021-07-09 20:32:54 +01:00
Mahesh 02f3fecfef future_ul_tti hardcoding solved, other hardcodings commented out 2021-07-05 22:55:35 +05:30
rmagueta 160cb0b930 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	cmake_targets/tools/build_helper
#	executables/nr-gnb.c
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.h
#	openair2/F1AP/f1ap_du_task.c
#	openair2/GNB_APP/gnb_app.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_NGAP.c
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair3/NAS/NR_UE/nr_nas_msg_sim.c
#	openair3/ocp-gtpu/gtp_itf.cpp
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
Laurent THOMAS aef67d0310 fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp) 2021-06-21 21:01:59 +02:00
Raymond Knopp 1198ef18dc Add missing function calls for proper gtp-u initialization in NSA scenario 2021-06-15 15:35:53 +02:00
Masayuki Harada 1b69c2a00d Remove pdcp_layer_init_for_CU function and merge to pdcp_layer_init. 2021-06-08 15:32:12 +09:00
rmagueta e72a6798c1 Change some LOG levels 2021-06-05 14:20:39 +01:00
Eurecom ac4670990c handling for UL failure. added do_precoding flag to nr-ru procedures. testing with 2x2 N310. 2021-05-30 23:14:12 +02:00
Raymond Knopp 8456908ef8 F1Setup procedure working for both LTE and NR 2021-05-27 15:49:30 +02:00
Raymond Knopp 1c4fef02dd Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
Conflicts:
	cmake_targets/autotests/test_case_list.xml
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
2021-05-22 16:33:44 +02:00