Melissa Elkadi
2205d6472d
Adding AssertFatal to check for array indicies
2021-11-18 10:43:15 -08:00
Melissa Elkadi
c008c8e60d
IP TRAFFIC IS WORKING WITH ONE NR UE IN SA MODE
...
This commit includes a hack fix that has allowed
the Ip traffic to work in SA mode. Furthermore,
NSA mode (without the EPC) works in this commit
as well with up to 4 NSA UEs. We will need to
understand better the issue with the UL_DCI
handling in the NRUE that was causing the gNB
to crash.
The AssertFatal in the gNB when the gNB runs out
of downlink HARQ PIDs is caused by the NRUE
receiving a UL_DCI and then building BOTH a UCI
and a CRC/RX pair. So we are essentially sending
a UL and DL DCI to the gNB in this case which
results in an unexpected HARQ PID being received
in the gNB. The filtering in this commit stops
the UCI being built in the NRUE when a UL_DCI
is recevied.
2021-11-18 08:26:12 -08:00
Melissa Elkadi
bb4db86d61
Do not handle multiplexing of UCIs if nothing is in UCI queue
2021-11-17 15:39:07 -08:00
Melissa Elkadi
236f980ba0
Merge branch 'episys/master-nsa' into episys/5gcn_traffic_testing
2021-11-17 15:12:59 -08:00
Melissa Elkadi
40e213dd9d
Merge branch 'eurecom-develop' into episys/master-nsa
2021-11-17 14:31:30 -08:00
Melissa Elkadi
d28deb3c34
Handling multiplexing of UCI indications
...
The IP traffic of a single NRUE works most
of the time in this commit. There seems to
be a bug in the gNB and it will occassionally
crash with a heap-buffer-overflow. This will
be looked at in the next commit.
The changes in this commit include gathering
all of the UCI indications in the queue that
have the same scheduled sfn_slot and sending
them as one aggregated UCI when the scheduled
sfn_slot matches the received ul_tti_request.
2021-11-17 11:33:05 -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
368977b3bb
The NRUE and gNB are connected to the 5GCN!
...
When IP traffic is started on the NRUE, the
gNB immediately crashes
2021-11-12 09:03:47 -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
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
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
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