Commit Graph
100 Commits
Author SHA1 Message Date
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 Elkadi f336cbc645 Fixing pull/push array 32 and cleaning nFAPI code
Several of these changes were made previously and
lost in the merge.
2022-02-09 07:30:04 -08:00
Melissa Elkadi a1dee602fe Duplicated packing and unpacking fixed in this commit
This now matches the develop branch as well.
2022-02-08 17:11:59 -08:00
Melissa Elkadi a8a04c7293 Accidentally ommited SISO channel modeling change
We should be setting the queued UCI indication slot
based on the SCHEDULED slot, not the current slot.
2022-02-08 16:55:25 -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 2ec11592c3 Merge branch 'episys/david/fixing_Bler_tables' into 'episys/master-nsa'
Removed strange characters in the first line.

See merge request aburger/openairinterface5g!108
2022-02-08 14:55:13 -08:00
Melissa cfc2311a96 Merge branch 'episys/david/adding_logs_for_timing_analysis' into 'episys/master-nsa'
Added logs for timing analysis.

See merge request aburger/openairinterface5g!106
2022-02-08 14:54:20 -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
Melissa Elkadi 5e182c4e50 Adding a few more LOG_A's for critical milestones 2022-02-01 05:41:24 -08:00
Melissa af6d95a348 Update rtusage.md 2022-02-01 13:37:06 +00:00
Melissa cfa636ce5f Update rtusage.md 2022-02-01 13:36:30 +00:00
Melissa 761d154fe7 Update addconsoletrace.md 2022-02-01 13:33:17 +00:00
Melissa Elkadi a2b0f455cd Updating config file for min_rxtxtime 2022-01-31 07:18:46 -08:00
Melissa Elkadi 4c4d317822 Removing commented code that causes SEG_FAULT in NSA mode 2022-01-25 16:57:58 +01:00
Melissa Elkadi fd54f2cf76 This commit includes several nfapi bug fixes
-cell_config.phy_cell_id is a uint16 and was being push/pulled
as a uint8_t
-several members of the p5 message we not push/pulled
-the second member of the ssb_mask_list is causing invalid tag length
-the error code of the push response was push8 when it should have
been a push32
-packing vendor extension causes invalid tag id(0x000)
2022-01-25 16:57:44 +01:00
Melissa Elkadi 918862475c Removing log_minimal and adding new run-time logging opts 2022-01-25 05:53:41 -08:00
Melissa Elkadi 0ea0965a35 Modifying new changes from develop to exclude emulated L1 mode 2021-12-21 06:08:24 -08:00
Melissa Elkadi e7ef264226 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-21 06:02:40 -08:00
Melissa Elkadi 30c14c2f5a nFAPI bug fix. Not properly packing/unpacking PUCCH PDU 2021-12-21 05:51:25 -08:00
Melissa Elkadi f32244136a Demoting more logs to log_D 2021-12-14 12:19:10 -08:00
Melissa Elkadi acb5db8ecd Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-14 12:03:04 -08:00
Melissa Elkadi d61bcb2113 Demoting several PHY logs 2021-12-14 10:27:23 -08:00
Melissa Elkadi 60e39af311 Updating min_txtxtime_pdsch and dl_harq_pid fix 2021-12-14 09:56:02 -08:00
Melissa Elkadi f028f8e209 Added new conf file for NR UE 2021-12-09 10:45:58 -08:00
Melissa Elkadi 932f8b385f Reverting changes to ue_test_sfr (SIM) conf file for NSA mode 2021-12-08 05:38:29 -08:00
Melissa Elkadi 118bd8b36f Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-06 13:23:21 -08:00
Melissa Elkadi fd2f61debc Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-03 05:44:34 -08:00
Melissa Elkadi 3fac8bd2e1 Merge branch 'episys/master-nsa' into eurecom-episys-merge-nsa 2021-11-29 14:40:21 -08:00
Melissa Elkadi 4f9c2bd869 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-29 14:33:23 -08:00
Melissa Elkadi 67df305219 Merge branch 'eurecom-develop' into episys/master-nsa 2021-11-29 10:59:20 -08:00
Melissa 85047dd70c Merge branch 'episys/master-nsa-LOG_A' into 'episys/master-nsa'
Change some LOG_I's to LOG_A's

See merge request aburger/openairinterface5g!88
2021-11-29 17:12:55 +00:00
Melissa Elkadi df72429b04 Merge branch 'eurecom-episys-merge-nsa' into episys/master-nsa 2021-11-24 08:54:14 -08:00
Melissa Elkadi 92ef60d07f This commit does the following:
1. Reverts GTPU_need_ITTI back to develop
2. Removed gdb helper and co files
3. Reverts changes to logging mechanism
4. Reverts changes to assert that were unnecessary
5. Reverts changes to VNF that occured from a bad merge
6. Removes unnecessary else() in gNB softmodem
2021-11-23 15:49:47 -08:00
Melissa ba5fa308e2 Merge branch 'episys/david/multi_ue_sa' into 'episys/master-nsa'
Updated for multiple UEs CBRA procedure.

See merge request aburger/openairinterface5g!86
2021-11-23 22:32:07 +00:00
Melissa Elkadi d7b23238da Removing unnecessary filtering in NRUE MAC layer 2021-11-23 14:12:45 -08:00
Melissa Elkadi cf9686f787 Setting ctxt by mod_id instead of instance in gNB
This change allows multiple UEs to have a tunnel interface
brought up when connecting to the 5GCN

Also, adding two new config files for mutltiple UEs
to connect to the 5GCN
2021-11-23 14:01:20 -08:00
Melissa Elkadi dd891537a7 Checking for pointers to be NULL before allocating memory 2021-11-23 12:37:22 -08:00
Melissa Elkadi efdd06584f Merge branch 'episys/master-nsa' into episys/david/multi_ue_sa 2021-11-23 08:13:18 -08:00
Melissa Elkadi 94d146e80b Renaming queue.h in PHY_INTERFACE layer to queue_t.h
There are two queue.h files in this repository.
2021-11-23 08:05:58 -08:00
Melissa Elkadi 97eda100c7 Removed logic around CALLOCs
When we check if the pointer is NULL before CALLOCing,
then the gNB will crash. It seems that we are mostlikely
leaking memeory since the gNB only crashes with the old
change. By reverting these changes, the gNB does not crash.
We are seeing UE-to-UE IP traffic on this commit when
the tunnel interfaces are established (~50% of the time).
2021-11-23 07:33:31 -08:00
Melissa Elkadi 8688f8ad83 Merge branch 'episys/master-nsa' into episys/david/multi_ue_sa 2021-11-23 06:47:37 -08:00
Melissa Elkadi 8e18afec55 Merge branch 'episys/master-nsa' into eurecom-episys-merge-nsa 2021-11-23 06:25:07 -08:00
Melissa Elkadi c08b0c2b56 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-23 06:24:33 -08:00
Melissa Elkadi 23582a4483 Adding more error checking 2021-11-22 16:31:47 -08:00
Melissa Elkadi eaa5782579 Merge branch 'episys/master-nsa' into episys/david/multi_ue_sa 2021-11-22 14:29:58 -08:00
Melissa 543570a1ac Merge branch 'episys/5gcn_traffic_testing' into 'episys/master-nsa'
5G IP Traffic for SA mode

See merge request aburger/openairinterface5g!85
2021-11-22 22:29:08 +00:00
Melissa Elkadi 8d94b36349 Adding assertFatals and code cleanup for MR 2021-11-22 14:24:06 -08:00
Melissa Elkadi 6d556607d4 Reverting incorrect CALLOC 2021-11-22 12:34:18 -08:00
Melissa Elkadi fc140b2007 Allocating for the number of DCIs and changing pdu_idx check 2021-11-22 07:40:36 -08:00
Melissa Elkadi 37c1f1ec1d Unnecessary filtering/changes to OAI MAC layer
The filtering added in the nrue_procedures.c file
are already happening in the stub function so we
should be duplicating them in the NRUE MAC layer.
2021-11-22 07:24:39 -08:00
Melissa Elkadi 8d1196a9cd Merge branch 'episys/5gcn_traffic_testing' into episys/david/multi_ue_sa 2021-11-22 07:15:59 -08:00
Melissa Elkadi 32cca25075 Modifying how we handle the UCI multiplexing.
In this commit, we changed the UCI handling.
When the UL_TTI_REQ arrives at the NRUE it
has info related to how many UCIs we should
pull from the queue and send to the gNB. If
we do not have that many UCIs available (likely
becasue a DL_TTI_REQ is late), then we will
requeue the UL_TTI_REQ and wait until we have
all the UCI indications before multiplexing.
This change makes it easier to handle multiple
UCIs becasue previously we would send what we
had and then try again later which made keeping
track of the UL_TTI_REQ and second UCI more
difficult.
2021-11-19 14:14:21 -08:00
Melissa Elkadi e1d50ead74 Removing incorrect setting of num_pdus to 0 2021-11-19 11:37:02 -08:00
Melissa Elkadi 7f7bda5421 The number of active harqs is included in the UL_TTI_REQ
Also, we had two heap-buffer-overflow crashes while
filling the CRC_IND and RX_IND. The corrected CALLOC
command is included in this commit as well.

Lastly, we included a better fix for handling late
DL_TTI_REQs. If the number of active harqs is larger
than the number of UCIs we have built, this is a good
indicator that the DL_TTI_REQ is late. To mitigate
problems, we will requeue the UL_TTI_REQ to when the
late DL_TTI_REQ comes in, we can handle the late
UCI that is built from it.
2021-11-19 11:23:47 -08:00
Melissa Elkadi 87097d9767 Adding assertFatal to UCI multiplexing 2021-11-19 07:55:03 -08:00
Melissa Elkadi a279503db0 Fixing formatting for if statement 2021-11-18 11:51:03 -08:00
Melissa Elkadi 6f69e836a8 This commit allows IP traffic to work for 2 UEs in NSA mode
The nr_rrc_ue_process_RadioBearerConfig() function
call in the RRC layer of the NRUE was removed when
it should not have been for NSA mode. This is now
added back in for NSA mode. Also, the call to
pdcp_run should only be when were NOT in NOS1 mode
and ARE in SA mode. This was fixed as well.

Ue-to-Ue IP traffic in NSA works, but eventually
the NSA UE will crash due to an incorrect PDCCH
configuration. This is a bug we will need to look
into. It doesnt always crash, only about 40% of
the time. And even when the NRUE does crash, it
happens towards the end of the simulation.
2021-11-18 11:45:47 -08:00
Melissa Elkadi 16d82de9cf Only call pdcp_run for SA 5GCN mode, not NSA mode 2021-11-18 11:08:53 -08:00
Melissa Elkadi 2205d6472d Adding AssertFatal to check for array indicies 2021-11-18 10:43:15 -08:00
Melissa Elkadi 2da73cfed7 Merge branch 'episys/master-nsa' into episys/5gcn_traffic_testing 2021-11-18 08:29:36 -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 99a75d6fbb Merge branch 'eurecom-episys-merge-nsa' into episys/master-nsa 2021-11-18 05:36:04 -08:00
Melissa Elkadi 6c49b7c799 Fixing AssertFatal command 2021-11-18 05:35:34 -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 8241eb8e90 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-17 14:34:51 -08:00
Melissa Elkadi 40e213dd9d Merge branch 'eurecom-develop' into episys/master-nsa 2021-11-17 14:31:30 -08:00
Melissa Elkadi 638b32bbb2 Merge branch 'episys/master-nsa' into eurecom-episys-merge-nsa 2021-11-17 13:31:16 -08:00
Melissa c92323fb13 Merge branch 'episys/david/nsa_integrated_RA' into 'episys/master-nsa'
Integrated ra procedure for both nsa and sa.

See merge request aburger/openairinterface5g!83
2021-11-17 21:13:37 +00: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
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
Melissa Elkadi 5fcea85427 Getting rid of duplicate if statement contents 2021-11-10 14:41:54 -08: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
Melissa 9fb044588d Merge branch 'episys/david/nsa_ci_debug_for_sa' into 'episys/master-nsa'
NSA CI debug update for SA mode

See merge request aburger/openairinterface5g!82
2021-11-09 23:00:14 +00:00
Melissa dfd428672b Merge branch 'episys/mel/sa_development_init' into 'episys/master-nsa'
CBRA Procedure Working for SA Mode

See merge request aburger/openairinterface5g!81
2021-11-09 17:46:07 +00:00
Melissa Elkadi 83f8d71233 Fixing indentation in if statement and adding conf file 2021-11-09 09:44:48 -08:00
Melissa Elkadi dbf2aba843 Reverting white space change 2021-11-08 14:41:51 -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
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
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
Melissa Elkadi f04f8e7d7b Setting ra_state breaks RA Procedure for NSA mode
Also, changed some if statement formatting.
2021-11-05 11:29:45 -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
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