francescomani
d74181aa19
fix after merge with develop
2021-04-29 14:57:48 +02:00
francescomani
e39e2dbafd
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-29 14:46:19 +02:00
Eurecom
518edc742c
n300 fixes 50 MHz configuration
2021-04-29 13:07:20 +02:00
hardy
af1735059e
Merge remote-tracking branch 'origin/NR_UE_CONFIG_REQ_FIXES' into integration_2021_wk17_b
2021-04-29 11:54:37 +02:00
Raymond Knopp
439ceafa62
applied extra MAC config IE to RRCSetup
2021-04-29 10:39:18 +02:00
rmagueta
7a07d57ac9
Fix segmentation fault after merge
2021-04-28 20:02:12 +01:00
rmagueta
537d81058f
Fix uplink for NR_UL_DCI_FORMAT_0_0 after merge
2021-04-28 19:51:06 +01:00
Thomas Schlichter
5f6be27f5d
fix 2 layer MIMO in nr_dlsim after last merge with develop
2021-04-28 18:06:14 +02:00
Raymond Knopp
fdc91e791f
removed discard in pdcp upon integrity failure for testing
2021-04-28 15:58:00 +02:00
rmagueta
d5a7e6ad7e
Fix segmentations fault after merge
2021-04-28 14:22:23 +01:00
rmagueta
43b7c16e83
Fix RA after merge
2021-04-28 00:17:25 +01:00
rmagueta
72b5fccce3
Fix build issues after merge
2021-04-27 18:44:39 +01:00
Thomas Schlichter
da799243d5
Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
2021-04-27 16:55:29 +02:00
rmagueta
0a3f128e27
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# 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_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
2021-04-27 15:46:18 +01:00
francescomani
b08037d6d1
Merge remote-tracking branch 'origin/develop' into multiple_ssb_sib1_bugfix
2021-04-27 16:14:43 +02:00
Cedric Roux
3633bcd367
nr pdcp: bugfixes
...
- use bearer-1 in compute_t of integrity NIA2
- compare integrity at the right place in nr_pdcp_entity_recv_pdu
- proper handling of security parameters settings (algos, keys)
2021-04-27 14:46:42 +02:00
rmagueta
edb790ab04
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
2021-04-27 12:36:31 +01:00
rmagueta
987455b9e6
Fix warnings after merge
2021-04-27 12:35:35 +01:00
matzakos
9f0c10617a
Include rlc bearer configuration list for the configuration of RLC and PDCP RBs
2021-04-27 13:28:59 +02:00
rmagueta
9372be0466
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
2021-04-27 12:12:59 +01:00
rmagueta
e8d48e5cc1
Minor improvements for RA at gNB
2021-04-27 12:10:27 +01:00
Raymond Knopp
d88ce5b9bf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-27 11:58:31 +02:00
Thomas Schlichter
247637f5ed
Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer
2021-04-27 11:26:11 +02:00
Thomas Schlichter
0da9ec9cfb
Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes
2021-04-27 10:27:31 +02:00
Cedric Roux
a8adcf862c
sa: nr pdcp: we don't use the hash table anymore
2021-04-27 10:00:24 +02:00
Robert Schmidt
6c162e3808
Remove unused variables
2021-04-27 08:36:43 +02:00
Robert Schmidt
821a5e5dfe
Correct T310 & N310 to avoid RA
2021-04-27 08:30:33 +02:00
Robert Schmidt
74fa01463c
Do PUCCH TPC only if Acknack or positive SR
...
otherwise, if we only have a (negative) SR, the UE did not send
anything, and the PUCCH CQI is invalid
2021-04-27 08:30:33 +02:00
Robert Schmidt
8187361615
Schedule UE periodically every 10 frames in UL
2021-04-27 08:30:33 +02:00
imad
800330e41c
Call nr_sr_reporting
2021-04-27 08:30:33 +02:00
Robert Schmidt
cba2d9e413
Schedule UEs on SR or BSR
2021-04-27 08:30:33 +02:00
imad
a8149b5e0e
Add functions for SR scheduling
2021-04-27 08:30:33 +02:00
imad
27bfe23c9b
Add schedulingRequestResourceConfig
2021-04-27 08:30:33 +02:00
imad
50ac9ef252
Add schedulingRequestConfig
2021-04-27 08:30:33 +02:00
Robert Schmidt
51e844e19f
Bugfix ul preproc: check correct slot for UL
2021-04-27 08:30:33 +02:00
Robert Schmidt
f73e8e0459
Bugfixes in nr_acknack_scheduling()
...
1: there can be 2bits AckNack + SR in PUCCH F0
2: when allocating csi_pucch, zero out struct
3: Make unfree resources a warning
4: When asserting, explain the issue
2021-04-27 08:30:33 +02:00
Robert Schmidt
4f4e25852f
Reduce sched_pucch array length, we only need two entries
2021-04-27 08:30:33 +02:00
Robert Schmidt
b005f9594b
Statically allocate PUCCH F0 resource index 0 for AckNack
2021-04-27 08:30:33 +02:00
Robert Schmidt
c2d16eb8d5
Configure secondaryCellGroup: dedicated PUCCH, CSI, Preamble
...
- Configure PUCCH Format 0 to be in separate RBs (each UE has dedicated
resources)
- Configure RA preamble to be different per UE
- Configure CSI offset such that no two UEs have their report in the
same frame
2021-04-27 08:30:31 +02:00
Robert Schmidt
f39b97a9e8
Execute nr_schedule_pucch() only in UL slots
2021-04-27 08:29:55 +02:00
Robert Schmidt
84e57113c8
initial_csi_index depends on local_uid
...
Nb_ue is not unique among UEs: consider 2 UEs present. The last UE has
CSI idx "2". Now the first UE disconnects, and a new UE connects. It
will also get CSI idx "2", and I assume this is not what we want.
2021-04-27 08:29:55 +02:00
rmagueta
5aa999337a
Minor corrections after merge
2021-04-26 15:44:50 +01:00
francescomani
ff87164011
bugfixes in FR2 scheduling of ssbs
2021-04-26 16:31:20 +02:00
rmagueta
e1ef4e2d3b
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair2/GNB_APP/L1_nr_paramdef.h
# 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
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-26 15:11:00 +01:00
Thomas Schlichter
626ab8aa3a
NR_UE: adjust some LOG levels
2021-04-26 14:58:01 +02:00
Sakthivel Velumani
33021bd826
Adding offset divisor parameter to all config files
2021-04-26 13:32:02 +02:00
Raymond Knopp
458f199dce
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
2021-04-26 12:06:43 +02:00
Raymond Knopp
a304c87659
resolved a missing conflict after merge with develop
2021-04-26 12:06:03 +02:00
Cedric Roux
9135d4200f
sa: nr pdcp: improve security
...
This commit implements integrity and security settings for nr pdcp. It will
only work for SRBs.
This commit has not been tested. It may fail to work completely. To be checked.
2021-04-26 11:43:44 +02:00
Raymond Knopp
2be602e938
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS
2021-04-26 10:51:18 +02:00
francescomani