Commit Graph
8575 Commits
Author SHA1 Message Date
Raymond Knopp 4756c5a167 added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3) 2022-02-13 22:15:48 +01:00
Raymond Knopp 5ba8b83856 Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
Conflicts:
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
	targets/ARCH/AW2SORI/oaiori.c
2022-02-13 12:24:45 +01:00
Raymond Knopp da54df5bb2 Merge remote-tracking branch 'origin/develop' into harq_latency_control
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/CODING/crc_byte.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/rrc_gNB.c
2022-02-13 09:55:01 +01:00
Raymond Knopp 74fd3f029a changes for AW2S NR support in ORI library 2022-02-13 09:44:15 +01:00
francescomani 67efa202e2 call to config_csirs also in sa 2022-02-11 19:32:40 +01:00
francescomani 9237cb545c passing UECAP structure to RRC reconfiguration functions 2022-02-11 18:57:48 +01:00
francescomani d2a559f91e improvements in config_csirs 2022-02-11 18:35:26 +01:00
Raymond Knopp b9b24588af Merge remote-tracking branch 'origin/develop' into aw2s-n41
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-02-11 12:21:29 +01:00
luis_pereira87 5d488fcbfe Merge remote-tracking branch 'origin/multiple-ues-min-prbs-bug-fix' into Dedicated-BWPs
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2022-02-11 10:06:39 +00:00
Robert Schmidt 7e92d44fc2 Merge remote-tracking branch 'origin/oai-ue-time-meas' into integration_2022_wk06_a 2022-02-10 18:57:28 +01:00
Robert Schmidt 0a6322103c Reduce max_num_ue after successful PUCCH alloc 2022-02-10 12:44:26 +01:00
Robert Schmidt 571677b948 Make nr_find_nb_rb() take minimum RBsize 2022-02-10 12:43:54 +01:00
Melissa Elkadi df06a1e8e4 Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master 2022-02-09 16:20:22 -08:00
Melissa Elkadi 4c950bb006 Resetting dl_config->number_pdus in NRUE scheduler 2022-02-09 14:06:55 -08:00
Melissa Elkadi 9322701ce4 Need a break if we queue a ul_tti_req based on PDU state
If we dont have this break we are trying to queue
the UL_TTI_REQ we just queued
2022-02-09 13:32:09 -08:00
luis_pereira87 c1931a60e7 Bug fix in min num of PRBs to schedule to a UE when there is multiple UEs 2022-02-09 20:14:05 +00:00
luis_pereira87 06d07e3a4c Bug fix in min num of PRBs to schedule to a UE when there is multiple UEs 2022-02-09 20:09:51 +00:00
Melissa Elkadi 60a9d41bc6 UCI ACK/NACK most of the way working
We have gotten rid of filling the ACK/NACK with
the DLSCH and now only fill with the PUCCH. This
assumes that the MAC layer is properly decoding the
dl_tti_req and tx_data_req and allows us to
simply use the MAC layers scheduled SNF/Slot
to return the ACK NACK. There are some hacks added
in this commit which ensure that the PDCP packet
has the correct header (1st byte = 80) and now with
15Mbps we are seeing about 20% packet loss and
a gNB bug on the edge case (current frame is 1023
and the gNB schduler wants an ACK in frame 0 but the
scheduled UL_TTI_REQ has a frame of 1023).
2022-02-09 07:59:10 -08:00
luis_pereira87 3dce1171d5 Fixes after merge 2022-02-09 11:16:38 +00:00
luis_pereira87 9610b7124c Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2022-02-09 11:10:31 +00:00
Melissa fb3e3ea6e5 Merge branch 'episys/david/adding_NR_to_NUM_MCS' into 'episys/master-nsa'
Added NR to NUM_MCS for nr channel modeling.

See merge request aburger/openairinterface5g!109
2022-02-08 15:56:44 -08:00
Melissa 8c2a067a22 Merge branch 'episys/david/checking_downlink_siso_model' into 'episys/master-nsa'
Downlink SISO modeling

See merge request aburger/openairinterface5g!104
2022-02-08 14:51:55 -08:00
Melissa Elkadi 9da3cbc9ec Cherry picking UCI multiplexing for CSI reports 2022-02-08 13:03:13 -08:00
Melissa Elkadi 62b525c579 TODO: Revert this change after discussion with OAI 2022-02-08 11:59:54 -08:00
Melissa Elkadi b897287d1f Changes made to gNB cause emulated-L1 mode not to work for multiple UEs.
It seems that the RA procedure in the gNB was modified so
the RAR is sent in a single tx_data_req. The emualted mode
was not previously handling this. We now only process the
PDU in the rx_ind that has a matching preamble. If any
other PDUs exist, we ignore them and only build Msg3 based
on this single matching RAR PDU.

Also, two bug fixes applied here in the emulate-l1 mode.
2022-02-08 11:59:04 -08:00
Melissa Elkadi f518b9d61f Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-08 09:39:13 -08:00
Robert Schmidt a36555b254 Merge remote-tracking branch 'origin/develop-SRS' into integration_2022_wk06_a 2022-02-08 18:06:53 +01:00
francescomani 9ff39f0d92 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-08 16:48:20 +01:00
francescomani 37a517edb7 Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-08 16:18:27 +01:00
luis_pereira87 9c72064883 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair2/GNB_APP/L1_nr_paramdef.h
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
2022-02-08 15:12:32 +00:00
francescomani 46ca8cc2d0 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-08 16:01:59 +01:00
francescomani dd9f285cb7 Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-02-08 15:37:39 +01:00
Robert Schmidt 8e6e4d8237 Log inactivity timer 2022-02-08 14:45:05 +01:00
Robert Schmidt 5bdaeb5718 Stop scheduling DL on UL failure or out of sync 2022-02-08 14:45:05 +01:00
Robert Schmidt 388cfafea8 Stop scheduling in UL after ul_failure_timer 2022-02-08 14:45:05 +01:00
Robert Schmidt eca14f6ec9 Schedule UL 5 RBs at MCS 10 on inactivity 2022-02-08 14:45:00 +01:00
rmagueta e8657ec854 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	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
2022-02-08 09:31:32 +00:00
francescomani 90bc226ac0 Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling 2022-02-08 08:48:04 +01:00
Melissa Elkadi 8b4ae5ef2b Remove the new UL_INFO local variable in the VNF.
This struct is used to store the uplink 5G nFAPI
messages between the proxy and the gNB MAC layer.
The original OAI implementation utilizes a similarly
named variable (UL_info) to store the uplink 5G nFAPI
messages between the PHY and MAC layer. This commit
will utilize the original UL_info variable prior to
calling the handle functions. These changes allow us
to make minimal changes to the nFAPI handle functions
and modifies the NR_UL_Indication parent function instead.
2022-02-07 15:14:22 -08:00
Laurent THOMAS ef2fedfc5b fix existing bug in pucchsim.c and in random_channel.c 2022-02-07 23:50:01 +01:00
Robert Schmidt 9594e422bc Merge remote-tracking branch 'origin/NR_pdcch_improvements' into integration_2022_wk06 2022-02-07 18:48:52 +01:00
luis_pereira87 7c747e5ccd Merge remote-tracking branch 'origin/NR_pdcch_improvements' into Dedicated-BWPs 2022-02-07 13:36:42 +00:00
francescomani f471316394 fix TRUE FALSE 2022-02-07 14:27:33 +01:00
Robert Schmidt ce9d1bd7c5 Always schedule PUCCH to prevent stale PUCCH config 2022-02-07 14:23:17 +01:00
Robert Schmidt b13ea677a2 Give warning when UL Failure on NR link 2022-02-07 14:23:17 +01:00
luis_pereira87 4973424468 Merge remote-tracking branch 'origin/NR_pdcch_improvements' into Dedicated-BWPs 2022-02-07 13:09:10 +00:00
rmagueta c1dd5da155 Fix update_ps flag for PDSCH and PUSCH 2022-02-07 12:45:14 +00:00
francescomani 8dcf0d011d two bugfixes: local pdcch_pdu in ul and wrong initialization place in find_candidate 2022-02-07 13:40:15 +01:00
francescomani 9056bfa926 flag to update ps structure 2022-02-07 09:19:51 +01:00
francescomani e27ce4db1e fix in max mcs for table1 2022-02-06 12:04:36 +01:00