Commit Graph
289 Commits
Author SHA1 Message Date
Sakthivel Velumani c6fd2419d4 Remove ue->pucch_vars and scheduler call cleanup 2022-09-26 11:20:32 -04:00
Roberto Louro Magueta 2141d6b5af Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
# Conflicts:
#	openair2/RRC/NR/nr_rrc_config.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
2022-06-27 10:24:58 +01:00
Melissa Elkadi 630f8ac2b1 Putting all CM code in one file
This commit includes reorganization of
all of the SISO/MIMO channel modelling
support being moved into a single CM
file. Furthermore, it includes a bug
fix for the number of MCS simulation
tables (29 total, 0-28).
2022-06-14 12:52:01 -07:00
rmagueta 751335765f Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/nr_rrc_config.c
2022-04-30 15:52:48 +01:00
Laurent THOMAS b2560daa3d merge develop and fix one double free bug in nr_dlschsim 2022-04-13 15:15:11 +02:00
rmagueta 9b1db62f38 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 2022-04-13 10:40:58 +01:00
rmagueta 04b234c878 Send CSI-RS measurements from PHY to MAC at UE 2022-04-12 19:06:02 +01:00
Mario Hudon 06b637c1cf Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UE_thread_improvement_IDCC 2022-04-12 12:59:27 -04:00
Laurent Thomas 95a58d646a merge develop, no test 2022-04-10 22:22:52 +02:00
Robert Schmidt 6ad71e290a Comment unused function that have been introduced in this integration branch 2022-04-08 11:30:19 +02:00
Laurent THOMAS a7e7d05da3 fix difficult to read code 2022-03-24 14:38:17 +01:00
Laurent THOMAS ed1c87b598 commit before rebase 2022-03-24 14:05:30 +01:00
Mario Hudon 4a00c99ab0 Fixed rebaseline to develop 2022-03-23 17:11:02 -04:00
Mario Hudon 5ec4a94094 Merge remote-tracking branch 'oai-eurecom/develop' into NR_UE_thread_improvement_IDCC 2022-03-22 11:35:22 -04:00
Robert Schmidt 937f593028 Merge remote-tracking branch 'origin/develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-21 13:36:38 +01:00
Melissa Elkadi a5e4cbb971 Merge branch 'episys-throughput-updates-and-downlink-siso-cm' of https://gitlab.eurecom.fr/oai/openairinterface5g into episys-throughput-updates-and-downlink-siso-cm 2022-03-17 12:48:14 -07:00
Melissa Elkadi 91d42fd5ec Fixing memory leaks and hoping to fix num_dci_option bug 2022-03-17 12:44:30 -07:00
Robert Schmidt 5a8b235ab4 Fix: make simulators compile 2022-03-16 10:00:43 +01:00
Melissa Elkadi a6049bcddf Relying on mac->ra.ra_state instead of RRC state. 2022-03-07 11:59:23 -08:00
Laurent Thomas 4c62aef755 rebase on develop 2022-03-02 11:26:16 +01:00
Melissa Elkadi 2b1cc455b0 Merge branch 'episys-ul-info-cleanup' into episys/master-sa 2022-02-24 15:48:43 -08:00
Mario Hudon 2e4c90dd56 Merge remote-tracking branch 'develop' into NR_UE_thread_improvement_IDCC 2022-02-24 17:24:58 -05:00
Mario Hudon c918e76f74 Complete NR_UE_PDCCH global variable/structure cleanup 2022-02-24 15:28:50 -05:00
Melissa Elkadi 0165ffd160 Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master 2022-02-23 15:55:06 -08:00
Deokseong "David" Kim bfebc0cb18 Using message_id to identify channel info. 2022-02-23 22:59:45 +00:00
Melissa Elkadi 4398630da7 Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-23 08:55:10 -08:00
Melissa Elkadi ca336ea917 Fixing comments from MR review. 2022-02-18 10:27:34 -08:00
Melissa Elkadi cc22ec9978 Calling scheduler before handling DCI to ensure nbits are set
Previously, we thought the memset in the nr_ue_dl_indication()
was causing issues / exposing a race. This is not the case. The
memset is not problematic, the issue is that in the emulate_l1
mode we were not always configuring the DCI nbits before handling
the DCI when we are pushing high (15 Mbps) throughput traffic.
2022-02-18 09:29:00 -08:00
Laurent THOMAS 18a421578f finish remove global vars for UE PBCH 2022-02-18 09:41:18 +01:00
Melissa Elkadi a21fb77dd1 Added comment to justify uci_size condition
Also, properly filling the CCE index and Agg level
in the stub function when we get the DCI from
nfapi
2022-02-17 10:25:28 -08:00
Melissa Elkadi 2208abfedd Modifying change to MAC layer
Instead of conditionally calling the pucch_scheduler
we now only call the functions we need from the stub
function directly. This is better because we are not
modifying the OAI MAC layer code and ensuring that we
are not calling the pucch_scheduler twice for the same
sfn/slot
2022-02-17 08:48:26 -08:00
Melissa Elkadi c917352dd2 Resolving issues in MR:
Adding error checking before indexing in mac layer harq array
Adding error checking before writing ul_harq_sfn_slot
Added comments
Made a "static" free_uci_inds() actually static
2022-02-16 16:11:19 -08:00
Melissa Elkadi 6de93fbb59 Only assigning harq_pid in emulated L1 mode. 2022-02-14 16:15:39 -08:00
Melissa Elkadi abddc13a13 Adding \n to several logs and demoting two logs 2022-02-14 13:51:57 -08:00
Melissa Elkadi 5e7de1cdfc Fixing typo and adding .h files for linking 2022-02-14 11:41:22 -08:00
Melissa Elkadi 26349dbe20 More clean up for merge request 2022-02-14 11:07:14 -08:00
Melissa Elkadi 987363b8a8 Clean up for MR 2022-02-14 10:34:23 -08:00
Melissa Elkadi 9322701ce4 Need a break if we queue a ul_tti_req based on PDU state
If we dont have this break we are trying to queue
the UL_TTI_REQ we just queued
2022-02-09 13:32:09 -08:00
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 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 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 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
Laurent THOMAS 3e7c22e7c6 gtp-u old code delete 2022-01-26 11:27:02 +01:00
Melissa Elkadi 118bd8b36f Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-06 13:23:21 -08:00
Melissa Elkadi dd891537a7 Checking for pointers to be NULL before allocating memory 2021-11-23 12:37:22 -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 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 Elkadi 8d94b36349 Adding assertFatals and code cleanup for MR 2021-11-22 14:24:06 -08:00