Commit Graph
7249 Commits
Author SHA1 Message Date
Melissa Elkadi 8a56d146cc Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs 2021-10-25 11:07:59 -07:00
Melissa Elkadi 2edfdb20a4 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_bw_testing_abs 2021-10-25 09:52:23 -07:00
Melissa Elkadi 7665f397a6 Only calling init_pdcp for NSA mode in gNB executable
Also, reverted some init_pdcp logic to match
the develop branch and added NSA mode. Lastly,
added additional error checking for cellConfig
to avoid crash in MAC layer.
2021-10-19 14:52:41 -07:00
Melissa Elkadi 58eb8d2af4 Creating new queue for ul_ttis if dl_tti is late
Also, this commit changes the len argument in the
pusharray32 to match the actual field type (uint16_t).
There is also simple name change from sf -> slot.
The new queueing system is not a permanent solution.
It was simply a way for us to try to handle late
dl_tti_requests. If we queue every single ul_tti_req
that we get, the queue gets full very quickly becasue
we only remove ul_ttis from the queue when a uci has
been populated with a matching sfn/sf. Because of this,
we only queue ul_ttis if we have a uci_indication
prepared already. Rarely, a dl_tti_req will arrive at
the NRUE too late, and the NRUE does not have time
to create the uci_ind so we dont process the corresponding
ul_tti. A seprate queue was made to hold all other ul_ttis
the arrive in the NRUE (this queue will continuously
get full and then emptied) but will occasionally hold
a ul_tti that corresponds to a uci that hasnt
been populated yet.
2021-10-19 07:59:55 -07: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 98a72d6c42 reduced logging 2021-10-14 07:56:58 +02:00
Raymond Knopp 166a8f69bb prb_mask calculation for mixed slot (for blacklisted PRBs) 2021-10-14 01:35:01 +02:00
Deokseong "David" Kim a5d23a0e08 Fixed nr_dlsim and nr_ulsim build errors. 2021-10-13 16:27:13 +00:00
Raymond Knopp 0a87da0b74 bugfix for allocation of blacklisted PRBs in MAC 2021-10-13 17:05:12 +02:00
Raymond Knopp c92899f704 blacklisting modification in ULSCH scheduler. 2021-10-13 15:54:27 +02:00
Melissa Elkadi 28391dad6a Updating pdcp init functions to maintain SA behavior 2021-10-13 06:52:15 -07:00
Melissa Elkadi ea2495ea0a Attemping to stop filling UL_TTI_REQ queue
This is sort of hacky, but it stops the gNB
from crashing for 2 UEs with the proxy and
4 UEs with our internal proxy.
2021-10-12 17:06:00 -07:00
Melissa Elkadi b17a5189b7 Adding timing informtion to rx'd slot indictions
Ensuring in the NRUE that the slot indications we
process are 500us apart.
2021-10-12 10:27:15 -07:00
luis_pereira87 545ee44407 Remove unreachable "else" statement 2021-10-11 18:14:45 +01:00
Raymond Knopp 0e6e2c3c52 Msg3 PRB reduction to 8. Gives 8 byte Msg3 with MCS 0 2021-10-11 16:03:02 +02:00
Raymond Knopp b05d165cd0 hand cherry-picked PRB blacklisting 2021-10-11 14:34:49 +02:00
Melissa Elkadi f37264e676 Avoiding unnecessary casting and fixed bug in ul_tti handling 2021-10-08 15:45:28 -07:00
Melissa Elkadi b3145dec04 Removing commented code 2021-10-08 08:53:49 -07:00
rmagueta a189a3a58c Revert BWPSize for Msg2 2021-10-08 13:52:00 +01:00
rmagueta 085a98b14c Improve get_coreset to handle also coreset0 2021-10-08 11:58:28 +01:00
Melissa Elkadi 4b8a15fa14 Allocating NR nFAPI messages on the heap prior to queueing
This commit is properly allocating the NR nFAPI
messages on the heap; however, when we do this,
it makes the NR UE behind the gNB even more and
casuses us to not finish the CFRA procedure. This
is because the RAR is recevied in the NR UE, but
the slot indications are too far in advance, so
the CRC/RX pair (msg3) is never sent because
the scheduled ul_slot and ul_frame already was
received prior to getting the RAR.
Need to fix this!!
2021-10-07 18:37:20 -07:00
Melissa Elkadi 9355495ad1 Unqueueing UL_TTI_REQs based on active harq sfn sf
Also fixed some silly spelling errors.
2021-10-07 16:46:10 -07:00
Melissa Elkadi 5552d53b08 gNB and NRUE slots not matching is what happens in LTE
This commit allows us to call the scheduler for
every slot indication we get to ensure we properly
configure the DCI. Also, we are sure to process the
DCI only when we have both the config (dl_tti) and
the payload (tx_req). Lastly, removed the hack
to the slot indication (we do not shift the slot
indication by -6 anymore). We are passing up to 4
NSA UEs, but sometimes one will not complete the CFRA
procedure.
2021-10-07 10:06:40 -07:00
francescomani 90ff07c6cc aggregation level loops at gnb (currently selecting the lowest value) 2021-10-07 16:45:38 +02:00
francescomani b59b94046f fix compilation 2021-10-07 09:22:07 +02:00
Melissa Elkadi 746d074646 Queuing all nFAPI messages and handling after slot ind
This commit changes the stub functionality entirely.
We are now queueing any received NR nFAPI message
and handling it only after we recevie a slot ind
that corresponds with the nFAPI message's sfn/slot
value. When doing this, an existing issue has been
brought to light. The gNB and NR UE are not in sync
when it comes to their slot indications. Generally,
the NR UE seems to be ahead of the gNB by around 6-7
slots. This commit has a hack... when we receive a
slot indication at the moment, we decrament it by 6
to try to keep the NRUE from being ahead of the gNB.
This will be fixed shortly... This was a temporary
fix..
2021-10-06 18:13:13 -07:00
Melissa Elkadi 98bc149e98 Reverting change that that forces DCI config before handling
By reverting this change, we will see the NRUE2 crash
because the DCI wont be configured before handling.
This will get fixed in the next commit by adding
queues for the nFAPI messages, therefore forcing
us to handle the nfapi messages only after we have
processes the corresponding slot indication.
2021-10-06 09:47:19 -07:00
francescomani 652d0f57eb improve sib1 code for aggregation levels 2021-10-06 16:45:46 +02:00
Melissa Elkadi 47e96132f6 Handling multiple DCIs in a single DL_TTI and TX_REQ 2021-10-05 16:09:52 -07:00
Melissa Elkadi 1b2d8b5288 def_dci_pdu_rel15 fix.
In this commit we were trying to understand why
the memset of the def_dci_pdu_rel15 array in the NRUE
was casuing the NR UE to crash. This was happening
becuase some of the members of the def_dci_pdu_rel15
array canont be zero in NSA mode. This was happening
because sometimes, we would recevied two DCI indications
in a row, after the first one, we would be memesetting
the array to all 0s and then try to process the second
DCI. The fix we have implemnted is to call the configure_dci()
prior to processing ANY DCI, to ensure we have properly
configured the UE to handle these DCIs.

Also, in the gNB, it was not able to find the UL scheduled
slot for the feedback harq because it was not accounting for
the slot wrapping.
2021-10-05 11:40:40 -07:00
luis_pereira87 db2c6ce79e Fix maxL for NSA 2021-10-04 18:40:41 +01:00
Raphael Defosseux 05f0206cf0 style(MAC): lowering one log line to match previous behavior
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2021-10-04 16:44:18 +02:00
Melissa Elkadi fb0a80ee84 Adding memset of def_dci_pdu_rel15 back in
Removing the memset seemed to hide the problem
and now the problem is appearing in a differnt
manner... it is causing the NRUE to skip HARQ
PIDs as its filling the UCI indication and process
the DCI PDUs. So adding the memset causes the NR UE
to crash becasue the DL_BWP_ID is becoming 0
which leads us to index into an pointer that is not
allocated and then a crash happens in DCI handling.
2021-10-01 15:53:23 -07:00
Melissa Elkadi a5d6ff5a75 We are now sending either SR or HARQ based on UL_TTI_REQ
This requires some updates to the nFAPI code as well.
We also have declared the def_dci_rel15 extern variable
consistently throughout the code.

In this commit, the gNB is still crashing. However, it seems
that the NSA UE is sending the proper responses back, but there
some sort of incorrect management of the def_dci_pdu_rel15
variable. If we memset this array to 0, we can see incorrect
0 assignments to elements of the UCI indications. Hopefully
fixing this issue will result in less gNB crashes.
2021-10-01 14:52:32 -07:00
luis_pereira87 4fd861a28a Fix nr_get_tpc to return increase 3dB 2021-10-01 13:36:49 +01:00
luis_pereira87 bf0bc0de54 Remove hardcoded maxL (kept only for do-ra) 2021-10-01 10:59:45 +01:00
luis_pereira87 c23117da6f Fix effective_BWPSize when coreset has 96 PRBs for Msg2 2021-10-01 10:26:09 +01:00
Melissa Elkadi ce8301ba38 Setting SR flag to 0 in NR UE to ensure we dont handle SRs 2021-09-30 19:25:57 -07:00
Melissa 3eafdff63a Syncing our OAI merge branch with our internal NSA master branch 2021-09-30 23:16:46 +00:00
rmagueta ff34838423 Put back scheduling request configuration after the cherry-pick which solved the segfault 2021-09-30 17:18:00 +01:00
rmagueta a58fd73e17 Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing-abs 2021-09-30 17:15:41 +01:00
Mario Joa-Ng dffd63d35a fix a segfault when uci_01->harq is null 2021-09-30 17:12:02 +01:00
francescomani 0fdd2fb42a comment added log fixed 2021-09-30 18:11:49 +02:00
Melissa Elkadi 354cf0820f Merge remote-tracking branch 'eurecom/bandwidth-testing-abs' into episys/mel/merge_bw_testing_abs 2021-09-30 07:10:51 -07:00
francescomani 70d81ac8fa additional fix for coreset in calculate_preferred_dl_tda 2021-09-30 15:49:57 +02:00
mjoang f48c1d913b handle pdu_length up 65535byte. 2021-09-30 13:22:04 +01:00
rmagueta 081d566201 Fix calculate_preferred_dl_tda and remove duplicated code 2021-09-30 13:08:15 +01:00
rmagueta 568071cb57 Change LOG levels 2021-09-30 12:52:22 +01:00
rmagueta dc1cbfaa63 Revert wrong merge related to num_dmrs_cdm_grps_no_data in scheduler DLSCH 2021-09-30 10:16:11 +01:00