Commit Graph
6736 Commits
Author SHA1 Message Date
Cedric Roux 14c823037f nr pdcp: bugfix: D/C bit set only for DRBs 2021-03-30 11:57:51 +02:00
Robert Schmidt f5a1d356db Refactor after merge
With the merge of fix_NR_DLUL_PF, gNB_dlsch_ulsch_scheduler() has no
nb_periods_per_frame variable. There are two changes here:

1) calculate this locally for initializing tdd_beam_association

2) do not pass it into schedule_nr_mib(). Further, use the following:
   nb_periods_per_frame = slots_per_frame / slots_per_period
   slots_per_frame / nb_periods_per_frame =
     = slots_per_frame / (slots_per_frame / slots_per_period)
     = slots_per_period
2021-03-30 10:49:00 +02:00
Robert Schmidt 576df55450 Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12 2021-03-30 10:48:57 +02: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
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
Laurent THOMAS 68a81f65b2 merge develop 2021-03-29 11:24:34 +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
luis_pereira87 86d252ef92 Revert LOG to pass CI tests for RA 2021-03-28 11:35:15 +01:00
rmagueta 8e89ab0022 Fix Msg4 Ack at gNB and pdsch_to_harq_feedback_time_ind at UE 2021-03-27 23:46:37 +00: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
rmagueta 774b8d9a9f Fix TA in CFRA 2021-03-26 16:54:34 +00:00
Laurent THOMAS fbf39eecc1 cppcheck fixes 2021-03-26 16:32:20 +01:00
Cedric Roux 9d1c24d461 nr rlc: bugfix: fix NACK with range
We do some sanity checks for incoming rlc control packets. One of them
is to check that so_start is not > so_end when present.

But when 'range' is present and bigger than 1 it means that so_start refers
to one PDU and so_end to another one. So we may well have so_start > so_end.

This commit fixes that and reorganizes a bit the code to do the check before
processing and rejecting the PDU if the values are not correct. (Before this
commit we were NACKing the whole PDUs if so_start > so_end.)
2021-03-26 15:36:43 +01:00
luis_pereira87 1af7e716e6 Fix mac sdu len calculation for CCCH and skip invalid CCCH1 messages for being processed 2021-03-26 09:46:30 +00:00
Laurent THOMAS 818c9b2c88 first pass 2021-03-25 20:13:50 +01:00
rmagueta 7c90e58d39 Fix BWP selection for NSA mode 2021-03-25 17:37:03 +00:00
rmagueta 8800789b0a Fix preamble detection for NSA 2021-03-25 15:15:03 +00: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 08b781ebfe Merge remote-tracking branch 'origin/develop' into oairu 2021-03-25 06:44:11 +01:00
Raymond Knopp 39868c400a adding format_indicator to dci_payload of msg3 2021-03-24 16:09:48 +01:00
Raymond Knopp e84d1fe678 adding UL LCID 52 for CCCH with 48 bits 2021-03-24 16:09:48 +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 86f70e2777 Add RA support for up to NUMBER_OF_NR_ULSCH_MAX UEs 2021-03-23 20:13:23 +00:00
rmagueta ee047b88e9 Remove TC-RNTI at PHY when RA procedure does not succeeded 2021-03-23 17:59:31 +00:00
rmagueta 8c13604d61 Fix PRACH with k1 = msg1-FrequencyStart + initialUplinkBWPStart 2021-03-23 15:22:36 +00:00
Roberto Louro Magueta 7c2591f318 Revert "Fix PRACH msg1-FrequencyStart/k1"
This reverts commit b6513faa82
2021-03-23 16:04:01 +01:00
rmagueta b6513faa82 Fix PRACH msg1-FrequencyStart/k1 2021-03-22 20:07:14 +00:00
francescomani 6b391b3274 activating a log to print rsrp 2021-03-22 10:26:02 +01:00
Laurent THOMAS 1cb33aa7de code review fixes, merge latest develop 2021-03-22 09:46:24 +01:00
francescomani 70a1556c51 Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-03-19 18:50:59 +01:00
Thomas Schlichter bc041092c8 NR_UE: always break out of MAC PDU processing after pdu_len Bytes
In case of false positive PDSCH CRC check, a random MAC PDU is processed.
Currently pdu_len is unsigned 16 Bit, so we did break out of the processing loop only if we _exactly_ hit a residual pdu_len of 0, or we hit a LCID of DL_SCH_LCID_PADDING.
If we didn't hit either of these, pdu_len wrapped to a very positive value, and we continued processing the PDU even beyond its bounds!
This behavior was observed with SNR 1 dB and MCS 9.

So better make pdu_len signed and break out of the loop after processing at max. pdu_len Bytes!
2021-03-19 17:45:14 +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 14f3d6a77a gNB: fix memory allocations in fix_scc() and prepare_scd()
issues found by valgrind
2021-03-19 11:40:21 +01:00
Thomas Schlichter dade64ea43 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-19 11:18:02 +01:00
francescomani f659a76f43 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-03-19 10:06:20 +01:00
francescomani f0d6298475 new attempt at improving call to RC L1 config 2021-03-19 09:55:18 +01:00
rmagueta 1ee7d7e551 Remove some hard code values 2021-03-18 17:39:01 +00:00
Roberto Louro Magueta 642c639406 Revert "Fix preamble sequence"
This reverts commit 9efe4187e7
2021-03-18 17:14:31 +01:00
francescomani a1f1d53cb5 another tentative fix for gnb initialization crashes 2021-03-18 13:09:36 +01: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 9efe4187e7 Fix preamble sequence 2021-03-18 01:20:59 +00:00
francescomani d30b8c69ae fix dlsim crashes (wrong detection of dci for ul) 2021-03-17 18:45:56 +01:00
Mahesh 4454627ba3 Uplink constellation + CRC OK 2021-03-17 14:43:05 +05:30