Commit Graph
7820 Commits
Author SHA1 Message Date
Melissa Elkadi 13401a5f8c Comments from OAI:
This commit include dynamically setting the slots_per_frame
value based on configuration. It also includes some comments.
Lastly, simplified bug fix in MAC layer related to sched_frame
calculation.
2022-02-24 09:49:47 -08:00
Melissa Elkadi 5f7f56f056 Added a comment to justify pdu_len checks in gNB 2022-02-24 09:03:00 -08:00
Melissa Elkadi 0165ffd160 Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master 2022-02-23 15:55:06 -08:00
Deokseong "David" Kim bfebc0cb18 Using message_id to identify channel info. 2022-02-23 22:59:45 +00:00
Melissa Elkadi ca336ea917 Fixing comments from MR review. 2022-02-18 10:27:34 -08:00
Melissa Elkadi 221e8402cc Fixing spacing in lines were already changing 2022-02-18 10:14:16 -08:00
Melissa Elkadi b7c767147e Hacks with comments are added in this commit.
These allow the NRUE to reach roughtly 15-25 Mbps
with ~20%-34% packetloss without crashing.
2022-02-18 09:48:38 -08:00
Melissa Elkadi cc22ec9978 Calling scheduler before handling DCI to ensure nbits are set
Previously, we thought the memset in the nr_ue_dl_indication()
was causing issues / exposing a race. This is not the case. The
memset is not problematic, the issue is that in the emulate_l1
mode we were not always configuring the DCI nbits before handling
the DCI when we are pushing high (15 Mbps) throughput traffic.
2022-02-18 09:29:00 -08:00
Melissa Elkadi a21fb77dd1 Added comment to justify uci_size condition
Also, properly filling the CCE index and Agg level
in the stub function when we get the DCI from
nfapi
2022-02-17 10:25:28 -08:00
Melissa Elkadi 2208abfedd Modifying change to MAC layer
Instead of conditionally calling the pucch_scheduler
we now only call the functions we need from the stub
function directly. This is better because we are not
modifying the OAI MAC layer code and ensuring that we
are not calling the pucch_scheduler twice for the same
sfn/slot
2022-02-17 08:48:26 -08:00
Melissa Elkadi 5637b62ed8 Return in gNB if pdu_len is less than cast length
This is what we did in the NRUE for NSA mode
2022-02-16 16:26:41 -08:00
Melissa Elkadi c917352dd2 Resolving issues in MR:
Adding error checking before indexing in mac layer harq array
Adding error checking before writing ul_harq_sfn_slot
Added comments
Made a "static" free_uci_inds() actually static
2022-02-16 16:11:19 -08:00
Melissa Elkadi abddc13a13 Adding \n to several logs and demoting two logs 2022-02-14 13:51:57 -08:00
Melissa Elkadi 5e7de1cdfc Fixing typo and adding .h files for linking 2022-02-14 11:41:22 -08:00
Melissa Elkadi af18fc7e70 Log demotion and white space clean up 2022-02-14 11:14:13 -08:00
Melissa Elkadi 26349dbe20 More clean up for merge request 2022-02-14 11:07:14 -08:00
Melissa Elkadi 987363b8a8 Clean up for MR 2022-02-14 10:34:23 -08: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
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
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
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
Robert Schmidt 9594e422bc Merge remote-tracking branch 'origin/NR_pdcch_improvements' into integration_2022_wk06 2022-02-07 18:48:52 +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
francescomani 8dcf0d011d two bugfixes: local pdcch_pdu in ul and wrong initialization place in find_candidate 2022-02-07 13:40:15 +01:00
Robert Schmidt c14d9a3c2a Merge remote-tracking branch 'origin/thread_pool_size' into integration_2022_wk05_b 2022-02-04 19:13:48 +01:00
Robert Schmidt 66137d2bf9 Merge remote-tracking branch 'origin/bler_txoptim' into integration_2022_wk05_b 2022-02-04 19:11:33 +01:00
Robert Schmidt 0b39690044 Merge remote-tracking branch 'origin/episys-remove-log-minimal' into integration_2022_wk05_b 2022-02-04 19:07:09 +01:00
Robert Schmidt 49df71ddaa Merge remote-tracking branch 'origin/episys-nfapi-p5-bug-fixes' into integration_2022_wk05_b 2022-02-04 19:07:09 +01:00
francescomani 2408f82ace Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements 2022-02-02 18:13:46 +01:00
Melissa Elkadi 5e182c4e50 Adding a few more LOG_A's for critical milestones 2022-02-01 05:41:24 -08:00
francescomani e346608b04 bugfix after nr_set_pdsch_semi_static 2022-01-31 19:28:08 +01:00
francescomani e4acf7e21d bugfix for pdu_index in sib1 sched function 2022-01-31 19:21:06 +01:00
hardy 27ac95f5e0 Merge remote-tracking branch 'origin/nr-fix-harq-round' into integration_2022_wk05 2022-01-28 16:58:15 +01:00
francescomani aec56c9a86 additional review comments 2022-01-27 12:22:03 +01:00
francescomani 5eb9e1f421 compute Y every time 2022-01-26 10:31:10 +01:00
Melissa Elkadi 4c4d317822 Removing commented code that causes SEG_FAULT in NSA mode 2022-01-25 16:57:58 +01:00
luis_pereira87 0e159f8b6b Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/SCHED_NR/fapi_nr_l1.c
2022-01-25 08:49:16 +00:00
francescomani e7f544e139 Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements 2022-01-24 19:08:21 +01:00
Cedric Roux fe4c988c97 nr ue: fix security setting of DRB
Maybe this fix won't work for non-openair gNB. We use the same keys and
algorithms as for SRBs, which is what openair gNB does.

(I hope I'm right there.)

To be changed if needed.
2022-01-24 15:56:45 +01:00
luis_pereira87 d0bbcaef50 Merge remote-tracking branch 'origin/develop' into thread_pool_size
# Conflicts:
#	ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
#	ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
#	openair2/GNB_APP/L1_nr_paramdef.h
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
2022-01-24 11:13:38 +00:00
hardy 08c9d4ae4c Merge remote-tracking branch 'origin/tx-thread-update' into integration_2022_wk04_a 2022-01-21 16:39:24 +01:00
Laurent Thomas 1eb1c17f0c merge develo 2022-01-19 16:46:46 +01:00