Commit Graph
7281 Commits
Author SHA1 Message Date
Melissa Elkadi 3ec5210652 Merge branch 'episys/master-sa' into episys/mel/merge_bw_testing_abs 2021-10-28 06:36:43 -07:00
Melissa Elkadi 18aaa88517 Merge branch 'eurecom-develop' into episys/mel/merge_bw_testing_abs 2021-10-27 08:05:26 -07:00
Melissa Elkadi f816f8df8d Merge branch 'episys/master-nsa' into origin-episys-merge-nsa 2021-10-27 07:39:52 -07:00
Melissa Elkadi bf4bf813dd Merge remote-tracking branch 'eurecom/develop' into eurecom-episys-merge-nsa 2021-10-27 07:31:35 -07:00
Melissa Elkadi 16b5da25a2 Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs 2021-10-26 16:18:21 -07:00
Melissa Elkadi 0fd35a229a Instead of removing the frees we allocated from heap.
In SA mode, there were DCI_INDs and RX_INDS that
were allocated on the stack and were assigned to
pointers used in the MAC instance. In NSA mode we
allocated these members on the heap so we free'd
them once we were done. In SA mode, they were not
allocated on the heap so this free call caused an
a free() error. We have now allocated these pointers
on the heap to avoid this error and ensure the
pointers are correct.
2021-10-26 15:48:03 -07:00
Raymond Knopp a8bfa8ea5a MAC statistics in separate thread 2021-10-26 20:05:46 +02:00
Melissa Elkadi 0f1723a485 Properly calling init_tun and nas_conf for SA and NSA 2021-10-26 09:56:09 -07:00
Melissa Elkadi 99183b1761 Freeing memory that wasnt allocated on heap in SA mode 2021-10-26 09:19:41 -07:00
Deokseong "David" Kim a13ed80cb7 Added one more condition for valid cell config 2021-10-25 21:46:27 +00:00
Melissa Elkadi 8a56d146cc Merge branch 'episys/master-nsa' into episys/mel/merge_bw_testing_abs 2021-10-25 11:07:59 -07:00
Melissa Elkadi e4ad4a6b17 Merge branch 'episys/master-nsa' into origin-episys-merge-nsa 2021-10-25 10:46:36 -07:00
Melissa Elkadi 74b2dbe73a Merge branch 'origin-episys-merge-nsa' into eurecom-episys-merge-nsa 2021-10-25 10:34:53 -07:00
Melissa Elkadi b56c8ac3ce Merge remote-tracking branch 'eurecom/develop' into origin-episys-merge-nsa 2021-10-25 10:27:11 -07:00
Melissa Elkadi 2edfdb20a4 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_bw_testing_abs 2021-10-25 09:52:23 -07:00
hardy 50c87a05ac Merge remote-tracking branch 'origin/bugfix-multi-rach' into integration_2021_wk42_b 2021-10-22 14:36:12 +02:00
hardy c834ea5899 Merge remote-tracking branch 'origin/NR_min_channel_bw_for_type0_pdcch' into integration_2021_wk42_b 2021-10-22 14:35:49 +02:00
hardy 5a792a1563 Merge remote-tracking branch 'origin/NR_DLSCH_retransmission_fix_pucch_allocation' into integration_2021_wk42_b 2021-10-22 14:35:19 +02:00
hardy fae36540ca Merge remote-tracking branch 'origin/NR_cleanup_MACPHY' into integration_2021_wk42_b 2021-10-20 21:09:48 +02:00
hardy a9982cf5cb Merge remote-tracking branch 'origin/NRUE_usedlschparallel' into integration_2021_wk42_b 2021-10-20 21:01:31 +02:00
frtabu b15373e414 remove 2 useless modif which added alignment attributes, fix telnet server compilation erro 2021-10-20 17:09:46 +02:00
frtabu c3c02bbd91 Use same port number for source and destination number in new gtp implementation. 2021-10-20 17:09:46 +02:00
frtabu 9707cb9910 rebase on develop 2021-10-20 17:09:46 +02:00
francescomani a8d2265a9d Merge remote-tracking branch 'origin/develop' into NR_cleanup_MACPHY 2021-10-20 15:50:18 +02:00
francescomani 82ba8ab0b1 Merge remote-tracking branch 'origin/develop' into pdsch_semistatic_fixes 2021-10-20 12:02:38 +02:00
francescomani bb08abb17f fix for pucch allocation in case of retransmission for DLSCH 2021-10-20 10:49:59 +02:00
Melissa Elkadi 7665f397a6 Only calling init_pdcp for NSA mode in gNB executable
Also, reverted some init_pdcp logic to match
the develop branch and added NSA mode. Lastly,
added additional error checking for cellConfig
to avoid crash in MAC layer.
2021-10-19 14:52:41 -07:00
Melissa Elkadi 58eb8d2af4 Creating new queue for ul_ttis if dl_tti is late
Also, this commit changes the len argument in the
pusharray32 to match the actual field type (uint16_t).
There is also simple name change from sf -> slot.
The new queueing system is not a permanent solution.
It was simply a way for us to try to handle late
dl_tti_requests. If we queue every single ul_tti_req
that we get, the queue gets full very quickly becasue
we only remove ul_ttis from the queue when a uci has
been populated with a matching sfn/sf. Because of this,
we only queue ul_ttis if we have a uci_indication
prepared already. Rarely, a dl_tti_req will arrive at
the NRUE too late, and the NRUE does not have time
to create the uci_ind so we dont process the corresponding
ul_tti. A seprate queue was made to hold all other ul_ttis
the arrive in the NRUE (this queue will continuously
get full and then emptied) but will occasionally hold
a ul_tti that corresponds to a uci that hasnt
been populated yet.
2021-10-19 07:59:55 -07:00
rmagueta 4e949657fb Fix after merge 2021-10-14 14:59:11 +01:00
rmagueta b1a8b06547 Merge remote-tracking branch 'origin/integration_2021_wk41' into integration_2021_wk41_bwt-abs
# Conflicts:
#	ci-scripts/xml_files/fr1_sa_quectel.xml
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/GNB_APP/gnb_paramdef.h
2021-10-14 14:22:23 +01:00
Raymond Knopp 98a72d6c42 reduced logging 2021-10-14 07:56:58 +02:00
Raymond Knopp 166a8f69bb prb_mask calculation for mixed slot (for blacklisted PRBs) 2021-10-14 01:35:01 +02:00
Deokseong "David" Kim a5d23a0e08 Fixed nr_dlsim and nr_ulsim build errors. 2021-10-13 16:27:13 +00:00
Raymond Knopp 0a87da0b74 bugfix for allocation of blacklisted PRBs in MAC 2021-10-13 17:05:12 +02:00
Raymond Knopp c92899f704 blacklisting modification in ULSCH scheduler. 2021-10-13 15:54:27 +02:00
Melissa Elkadi 28391dad6a Updating pdcp init functions to maintain SA behavior 2021-10-13 06:52:15 -07:00
Melissa Elkadi ea2495ea0a Attemping to stop filling UL_TTI_REQ queue
This is sort of hacky, but it stops the gNB
from crashing for 2 UEs with the proxy and
4 UEs with our internal proxy.
2021-10-12 17:06:00 -07:00
Melissa Elkadi b17a5189b7 Adding timing informtion to rx'd slot indictions
Ensuring in the NRUE that the slot indications we
process are 500us apart.
2021-10-12 10:27:15 -07:00
luis_pereira87 545ee44407 Remove unreachable "else" statement 2021-10-11 18:14:45 +01:00
Raymond Knopp 0e6e2c3c52 Msg3 PRB reduction to 8. Gives 8 byte Msg3 with MCS 0 2021-10-11 16:03:02 +02:00
Raymond Knopp b05d165cd0 hand cherry-picked PRB blacklisting 2021-10-11 14:34:49 +02:00
Melissa Elkadi f37264e676 Avoiding unnecessary casting and fixed bug in ul_tti handling 2021-10-08 15:45:28 -07:00
Melissa Elkadi b3145dec04 Removing commented code 2021-10-08 08:53:49 -07:00
rmagueta a189a3a58c Revert BWPSize for Msg2 2021-10-08 13:52:00 +01:00
rmagueta 085a98b14c Improve get_coreset to handle also coreset0 2021-10-08 11:58:28 +01:00
Melissa Elkadi 4b8a15fa14 Allocating NR nFAPI messages on the heap prior to queueing
This commit is properly allocating the NR nFAPI
messages on the heap; however, when we do this,
it makes the NR UE behind the gNB even more and
casuses us to not finish the CFRA procedure. This
is because the RAR is recevied in the NR UE, but
the slot indications are too far in advance, so
the CRC/RX pair (msg3) is never sent because
the scheduled ul_slot and ul_frame already was
received prior to getting the RAR.
Need to fix this!!
2021-10-07 18:37:20 -07:00
Melissa Elkadi 9355495ad1 Unqueueing UL_TTI_REQs based on active harq sfn sf
Also fixed some silly spelling errors.
2021-10-07 16:46:10 -07:00
Melissa Elkadi 5552d53b08 gNB and NRUE slots not matching is what happens in LTE
This commit allows us to call the scheduler for
every slot indication we get to ensure we properly
configure the DCI. Also, we are sure to process the
DCI only when we have both the config (dl_tti) and
the payload (tx_req). Lastly, removed the hack
to the slot indication (we do not shift the slot
indication by -6 anymore). We are passing up to 4
NSA UEs, but sometimes one will not complete the CFRA
procedure.
2021-10-07 10:06:40 -07:00
francescomani 90ff07c6cc aggregation level loops at gnb (currently selecting the lowest value) 2021-10-07 16:45:38 +02:00
Guido Casati 218de9342d Bugifx simultaneous RACH with multiple UEs
- replaced taus with a random seed + random number generation
- this fixes the bug with multiple UEs starting RA in the same time frame and slot
  and selecting the same preamble index
2021-10-07 15:56:43 +02:00