Melissa Elkadi
40e213dd9d
Merge branch 'eurecom-develop' into episys/master-nsa
2021-11-17 14:31:30 -08:00
Melissa Elkadi
e928ef991a
Merge branch 'episys/david/nsa_integrated_RA' into eurecom-episys-merge-nsa
2021-11-12 10:52:27 -08:00
David Kim
27163417a0
Fixed id mismatch problem for pdcp tun interface in enm.
2021-11-12 10:25:49 -08:00
Melissa Elkadi
36250e72f2
Merge branch 'episys/david/nsa_integrated_RA' into eurecom-episys-merge-nsa
2021-11-11 18:58:14 -08:00
Melissa Elkadi
04d0004e4d
Merge branch 'episys/david/nsa_integrated_RA' into eurecom-episys-merge-nsa
2021-11-11 13:59:42 -08:00
David Kim
d118cbfadc
Consolidated two 'if' condition in ra procedures for nsa and sa.
2021-11-10 18:18:12 -08:00
Melissa Elkadi
5fcea85427
Getting rid of duplicate if statement contents
2021-11-10 14:41:54 -08:00
David Kim
1803b1fb34
Integrated ra procedure for both nsa and sa.
2021-11-10 13:52:29 -08:00
hardy
032ec1cdad
Merge remote-tracking branch 'origin/NR_MCS_BLER' into integration_2021_wk45_c
2021-11-10 20:44:32 +01:00
Melissa Elkadi
c5ad7d89fe
Removing white space
2021-11-10 08:59:46 -08:00
Melissa Elkadi
046258f1ba
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-09 15:17:58 -08:00
hardy
4b9f7ec404
Merge remote-tracking branch 'origin/ci-test-newstats' into integration_2021_wk45_c
2021-11-09 10:19:10 +01: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
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
3569ba630c
Reverted log level and gNB_RA_sched for NSA mode
2021-11-05 11:49:34 -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
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
hardy
60a91cc207
Merge remote-tracking branch 'origin/NR_MAC_statisticsthread' into ci-test-newstats
2021-11-04 17:00:34 +01:00
Sakthivel Velumani
3799aeb86b
Merge branch 'develop' into NR_MAC_statisticsthread
2021-11-04 15:54:37 +05:30
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
francescomani
59195807cc
Merge remote-tracking branch 'origin/develop' into NR_MCS_BLER
2021-11-03 14:03:01 +01:00
francescomani
d55158eb14
temporarily remove conditions on 2nd and 3rd rtx and increase max mcs to 28
2021-11-03 14:01:17 +01: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