Commit Graph
7417 Commits
Author SHA1 Message Date
David Kim 1803b1fb34 Integrated ra procedure for both nsa and sa. 2021-11-10 13:52:29 -08:00
Melissa Elkadi 046258f1ba Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-09 15:17:58 -08:00
David Kim 0429f7e872 Merge remote-tracking branch 'origin/episys/master-nsa' into episys/david/nsa_ci_debug_for_sa 2021-11-09 11:10:40 -08:00
Melissa Elkadi 83f8d71233 Fixing indentation in if statement and adding conf file 2021-11-09 09:44:48 -08:00
David Kim d564d8f94d Updated to emulate_l1 instead of nsa in gNB indication. 2021-11-08 21:27:55 -08:00
David Kim e5ac73a552 Merge remote-tracking branch 'origin/episys/mel/sa_development_init' into episys/david/nsa_ci_debug_for_sa 2021-11-08 21:21:44 -08:00
David Kim b13fce5385 Removed NSA mode further in nrUE codes and fixed format. 2021-11-08 16:04:39 -08:00
Melissa Elkadi dbacbfd0cd Removing more unnecessary filtering in NRUE
Got rid of unnecessary mac->scc check as well
2021-11-08 11:28:41 -08:00
Melissa Elkadi fa4617c0bf Fixing MR based on OAI feedback
The following was changed in this commit:
 - A new struct in the mac instance was created
   for all emulated L1 fields.
 - NR UE RRC state bug was fixed
 - Checking the RAR rnti based on the MAC instance
   ra.ra_rnti and not hardcoding to 0x10b
 - Modified the name of the new emulate_l2 flag
   to make sense: emulate_l1
2021-11-08 10:59:28 -08:00
hardy 88fd5df1f0 Merge remote-tracking branch 'origin/nr_multiple_ue' into integration_2021_wk45_b 2021-11-08 13:13:56 +01:00
hardy cf41f0ccda Merge remote-tracking branch 'origin/NR_debug_sib1_reception' into integration_2021_wk45_b 2021-11-08 13:13:35 +01:00
hardy 4c2c7f92a5 Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b 2021-11-08 13:12:52 +01:00
hardy 9c1336157e Merge remote-tracking branch 'origin/NR_SA_band_96' into integration_2021_wk45_b 2021-11-08 13:12:28 +01:00
Melissa Elkadi 85e066054f Checking for emulate_l2 instead of NSA flag 2021-11-05 15:45:48 -07:00
Melissa Elkadi f536682367 Fixing formatting and added AssertFatal 2021-11-05 14:59:00 -07:00
David Kim d51314f57d Updated coding format in unified way. 2021-11-05 14:42:39 -07:00
David Kim 6420c3166b Removed unrequired comments. 2021-11-05 14:34:18 -07:00
David Kim 8d6b112c17 Removed unrequired nsa conditions. 2021-11-05 12:35:15 -07:00
Melissa Elkadi fbd791d4a4 Removing unnecessary DCI filtering.
The DCIs are filtered already in the NRUE when
the NFAPI messages are handled.
2021-11-05 12:22:00 -07:00
Melissa Elkadi a2a823d54b Removing log 2021-11-05 11:56:28 -07:00
Melissa Elkadi 3569ba630c Reverted log level and gNB_RA_sched for NSA mode 2021-11-05 11:49:34 -07:00
David Kim fc1815170e Fixed a bug on setting the number of pdus. 2021-11-05 09:48:48 -07:00
Melissa Elkadi bf8a37f878 CBRA and CFRA procedure complete!! 2021-11-04 18:27:26 -07:00
Melissa Elkadi 954a64a1c0 SA mode SIB processing
In SA mode, we will not be able to process the SIB if
we change for mac->scc_SIB == NULL : return;

So we change the statement for NSA mode
2021-11-04 17:58:01 -07:00
Melissa Elkadi 7c484fba33 Changing how we filter DCI's fixes NSA mode
It will likely break SA mode because it will
filter out Msg3. I will come back to this and
fix it for Msg3.
2021-11-04 17:17:55 -07:00
Melissa Elkadi f9b8461548 Reverting more changing that were unnecessary for SA 2021-11-04 16:40:44 -07:00
Melissa Elkadi 59458c9690 Reverting changes that did not fix SA mode 2021-11-04 16:36:50 -07:00
David Kim ae8e0ea3da Reverted unncessary changes. 2021-11-04 13:46:24 -07:00
Melissa Elkadi 479784a064 Calling proper nr_ue_get_rach function
Also, reverted a DCI filtering change to exist again.
2021-11-04 13:15:58 -07:00
Melissa Elkadi e0991d3cec Reverting log changes for MR 2021-11-04 12:44:30 -07:00
Melissa Elkadi f4448023df Merge branch 'episys/master-nsa' into episys/mel/sa_development_init 2021-11-04 11:48:34 -07:00
Melissa Elkadi 10dec919ce Temp fix to try to get CBRA procdeure complete
Need to review this with Raymond.
2021-11-04 11:11:13 -07:00
David Kim d2ecd40fbd Removed unused debug log. 2021-11-04 10:34:06 -07:00
David Kim 4fb67cbd9c Resolved conflict in Merge remote-tracking branch 'origin/episys/master-nsa' into episys/david/nsa_ci_debug_for_sa 2021-11-04 10:24:48 -07:00
Melissa Elkadi 7dc523355d Return 0 is not a fail, so changing to -1 2021-11-04 10:07:25 -07:00
David Kim f4049a9fe2 Code cleanup 2021-11-04 09:31:42 -07:00
Melissa Elkadi d7b4adb006 Only filtering DCIs in MAC layer after RA is complete. 2021-11-04 09:17:16 -07:00
David Kim c7f083b14a Updated gNB part to handle CI test 2021-11-03 22:30:28 -07:00
Melissa Elkadi 81716e4c77 Filtering for multiple UEs in MAC excluding SIB and RAR
For multiple UEs, we need to be able to filter the rx'd messages by
the RNTI. However, we do not have the RNTI value until the CFRA (NSA)
or CBRA (SA) procedure is complete. The check below will handle this.
Also, depending on the RNTI value, we can have a SIB (0xffff), RAR (0x10b),
Msg3 (TC_RNTI) or an actual DCI message (CRNTI). When we get Msg3, the
MAC instance of the UE still has a CRNTI = 0. Only once the RA procedure
succeeds is the CRNTI value updated to the TC_RNTI.
2021-11-03 16:28:42 -07:00
Melissa Elkadi edd710f6a9 Removing bad log and changing RA state when we get prach 2021-11-03 15:52:49 -07:00
Melissa Elkadi 54a894e534 Updated the following for SA development:
1. The preamble index in the NRUE is random for SA.
   Using the preamble index from the mac->ra is
   correct.

2. The dl_pathloss calculated is from L1. We should
   shunt this feature out for our emulated mode. If
   we add the abstraction later, we can model the
   pathloss in the proxy and update it in the RA
   procedure of the NRUE.

3. Checking that the crnti != t_crnti is not valid
   for SA mode. And may only be needed for multi-UE
   in NSA mode. We might be able to delete it all
   together. For now, we only use for NSA mode.

4. Checking the RAR based on rnti = 10b and not the
   RA_STATE is better.
2021-11-03 10:54:33 -07:00
Melissa Elkadi c87141fbcf Updating gNB RA PROC to match develop branch 2021-11-03 09:14:40 -07:00
Melissa Elkadi b8444ecbc1 Merge branch 'eurecom-develop' into episys/mel/sa_development_init 2021-11-03 08:54:06 -07:00
Mario Joa-Ng b64f9f379f fix bug in GNB MAC nr_store_dlsch_buffer() to handle multipe UEs correctly. 2021-11-03 11:34:47 -04:00
Melissa Elkadi e8f965d010 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-03 06:32:38 -07:00
hardy cc18013320 Merge remote-tracking branch 'origin/NR_cset_bwp_fixes' into integration_2021_wk44 2021-11-03 13:38:55 +01:00
hardy cb9defc629 Merge remote-tracking branch 'origin/develop-NR_SA_nrUE_security_update' into integration_2021_wk44 2021-11-03 13:38:33 +01:00
hardy cd28e3fbd7 Merge remote-tracking branch 'origin/crash-gcc-O0' into integration_2021_wk44 2021-11-03 13:38:10 +01:00
Melissa Elkadi ceda62cde8 Merge branch 'eurecom-episys-merge-nsa' into episys/master-nsa 2021-11-02 15:53:36 -07:00
Melissa Elkadi b29fd449d0 Changed ul_tti_req queueing mechanism:
Instead of resetting queue when full,
take last item out.
2021-11-02 14:35:32 -07:00