faluco
e0238f4092
NR: Fix a race condition where we could remove a UE from the mac while still being accessed by the NR PHY worker.
2021-10-06 11:31:54 +02:00
faluco
a703279975
Fix a data race when passing the nr_workers to the txrx worker.
...
There was an unprotected access of the txrx reading this variable while being set from a different thread.
Fix it by starting the txrx thread after all variables are ready.
2021-10-06 11:31:54 +02:00
Andre Puschmann
06fbb58d70
gnb,mac: add dedicated arguments struct for MAC-NR
...
as the PCAP object is now only visible inside MAC-NR we can't
share the PCAP file between EUTRA/NR (like we do in the UE).
This patch removes the hard-coded filename for the NR PCAP file.
2021-10-06 10:44:56 +02:00
Fabian Eckermann
cb721aa292
fix calculation of ssb frequency.
2021-10-05 18:21:58 +02:00
Ismael Gomez
2111788740
Move DRB activation/deactivation to after filling endc connectionReconfiguration ( #3371 )
...
* Move DRB activation/deactivation to after filling endc connectionReconfiguration
* Move bearer update in the scheduler to after filling endc connectionReconfiguration
Co-authored-by: Francisco Paisana <francisco.paisana@softwareradiosystems.com>
2021-10-05 17:30:31 +02:00
Xavier Arteaga
b6ea78dfd3
Fix gNb PHY-Stack UL-DL time paradox ( #3365 )
...
* Fix gNb PHY-Stack UL-DL time paradox
* Fix clang compilation
2021-10-05 17:22:36 +02:00
Ismael Gomez
6bdeb2d6b6
Fix division by zero in JSON metrics
2021-10-05 17:19:07 +02:00
Francisco Paisana
b58915d7ed
rrc,nr: make gnb cell CSI NZP configuration consistent with UE NSA configuration.
2021-10-05 10:28:36 +02:00
Ismael Gomez
410cec7557
NR: assume all zero LCG is SBSR with 0 is received
2021-10-05 10:26:30 +02:00
Francisco Paisana
23bf542ae7
stack,nr: isolate calls between LTE and NR stacks via the task multiqueue
2021-10-05 10:12:28 +02:00
Francisco Paisana
9160c783c9
sched,nr: fix nr sched test
2021-10-04 19:26:07 +02:00
Francisco Paisana
7aa701eb85
nr,config: fix default SSB periodicity configuration in rrc and scheduler
2021-10-04 19:26:07 +02:00
Francisco Paisana
0cb76681a8
sched,nr: forbid concurrent SSB and PDSCH until it is supported
2021-10-04 19:26:07 +02:00
Andre Puschmann
8bb06ff2c0
Added SSB in gNb PHY
2021-10-04 19:26:07 +02:00
Francisco Paisana
952b958aff
nr: signal RRC activity when an NR UL PDU is received
2021-10-04 19:00:36 +02:00
Andre Puschmann
3e5b40fd36
enb,rrc: fix compilation after freq point a has been removed from nr_carrier_t
...
since absolute freq point a members have been removed from the srslte_nr_carrier_t
struct (they are now actual frequencies) the abs_point_a values are now in
the RRC cell structs
2021-10-04 17:52:14 +02:00
Fabian Eckermann
95abfbfec8
Calculate ssb frequency from freqency point a.
2021-10-04 15:59:05 +02:00
Xavier Arteaga
ca19b466bb
Fix paging float to int conversion
2021-10-04 15:24:55 +02:00
Francisco Paisana
f97b92abd0
sched,nr: fix nzp csi rs allocation in NR scheduler
2021-10-04 14:44:35 +02:00
Francisco Paisana
55ea2cbcee
sched,nr: fix harq delay derivation
2021-10-04 14:44:35 +02:00
Francisco Paisana
8ceb573ea7
mac,nr: avoid concurrency in update of pdsch/pusch slot
2021-10-04 12:24:51 +02:00
Carlo Galiotto
f177a03605
sched,nr: add const to function input parameter
...
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto
9887c17c17
sched,nr: move ssb_sched test to different file...
...
and also:
- correct half-frame bit in MIB package
- rename slot_index variable in ssb_sched function
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto
d18af603aa
sched,nr: address comments in PR (code formatting)
...
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto
bc7c21b8c3
sched,nr: add test case for SSB scheduling
...
The SSB test checks whether, with the given periodicity, the
SSB grant is present within the dl_sched structure passed to the PHY.
It also checks that the SSB grant is not scheduled outside
the required time slots.
NOTE: The test is a modified version of an existing scheduler test.
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto
fd4b368f71
sched,nr: handle case of ssb_periodicity not given
...
If the parameter ssb_periodicity is not given by higher layers,
the function needs to handle this case. The parameters could be
passed with 0 value, which makes the function crash.
For the time being, if ssb_periodicity is not given, the std value
5 ms will be used.
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto
9d864bbe55
sched,nr: add function that schedule SSB
...
Notes:
- NOT YET TESTED
- Requires rebase on commit with PHY changes to work
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Ismael Gomez
6b506ec357
phy_common: clear tx_hold flag before releasing the semaphore ( #3342 )
2021-10-03 20:05:38 +02:00
Andre Puschmann
f8d55a6fd3
Refactor rrc nr.
2021-10-03 14:20:42 +02:00
yagoda
82bda02b36
adding nr metrics
2021-10-03 13:06:59 +02:00
Andre Puschmann
86938e8474
sched_nr_cfg: bump fixed UL MCS to 28
2021-10-03 12:07:18 +02:00
Andre Puschmann
782aefa553
enb,rrc: derive ENDC configuration from cell config
...
* move ENDC config struct to main RRC config (same for all UEs)
* remove hard-coded measurement config for NR carrier
* now both TDD and FDD cells are correctly handled
2021-10-02 17:39:19 +02:00
Fabian Eckermann
eb294fd4e3
Add phy object to rrc_nr_test.
2021-10-01 19:21:08 +02:00
Fabian Eckermann
992d1bb02a
Configure PHY from RRC.
2021-10-01 19:21:08 +02:00
Francisco Paisana
28e25b12b4
sched,nr: add error checking and logging for invalid PIDs
2021-10-01 17:35:54 +02:00
Francisco Paisana
14b3a65dfe
sched,nr: fix assignment of PID for PUSCH grants that the scheduler outputs
2021-10-01 17:35:54 +02:00
Andre Puschmann
2b1be3dbce
enb,rrc_nr: fix wrong fmt formater
2021-10-01 12:34:05 +02:00
Andre Puschmann
a66994aa80
gnb,rrc: disable NZP and ZP CSI configs
2021-10-01 12:21:54 +02:00
Fabian Eckermann
1018e7ae1c
fix validation of ul_arfcn.
2021-10-01 10:56:57 +02:00
Fabian Eckermann
93eb6e93d9
Read band from rr config.
2021-10-01 10:56:57 +02:00
Ismael Gomez
a1294ed06a
srsgnb: use lcg=3 for as a default for drb. Pass lcg to MAC config
2021-10-01 10:00:36 +02:00
Francisco Paisana
78dad52cc8
rrc,nr,gnb: disable CQI configuration in gNB until gNB PHY supports it
2021-09-30 11:34:22 +02:00
Francisco Paisana
a64750e1be
rrc,nr,gnb: fix number of PDCCH candidates in search space
2021-09-30 11:34:22 +02:00
Fabian Eckermann
e02218e4ab
configure phy to be tdd by default (currently static).
2021-09-29 22:31:23 +02:00
Ismael Gomez
91401ae3a4
Fix meascfg test
2021-09-29 21:39:56 +02:00
Ismael Gomez
7bc8bb8500
combine all report configuration with all measurement objects
2021-09-29 21:39:56 +02:00
Ismael Gomez
ada05ea0c8
Add A1, A2 and A4 measurement Reports event triggers
2021-09-29 21:39:56 +02:00
Ismael Gomez
04db8c6bbf
Log measurementReport before checking if it's valid
2021-09-29 21:39:56 +02:00
Fabian Eckermann
8830c2796f
Add support for NSA FDD on band n3, n5 and n7.
2021-09-29 16:03:44 +02:00
Francisco Paisana
c45c3ec95c
sched,nr: ensure the SSB and NZP CSI RS allocations are cleared at the end of every slot
2021-09-29 13:42:48 +02:00
Francisco Paisana
d927b779dc
sched,nr: implement methods to fill nzp csi-rs in scheduler
2021-09-29 13:42:48 +02:00
faluco
a8f58f503c
- Fix arm compiler warning. GCC treats chars as unsigned in this arch.
...
- Fix race condition in json metrics.
2021-09-29 13:26:14 +02:00
Francisco Paisana
17e015df62
rrc,nr: fix PUCCH Resource CSI configuration to avoid collisions with SR
2021-09-28 19:43:02 +02:00
Andre Puschmann
315057d11c
enb: signal user activity to EUTRA RRC when doing NR DL traffic
...
to avoid releasing the UE when only NR DL traffic is done.
similar to the EUTRA solution.
2021-09-28 16:55:54 +02:00
Xavier Arteaga
8b2514ded3
Added NZP-CSI-RS signals in gNb
2021-09-28 16:54:37 +02:00
Andre Puschmann
6054e1229b
enb,rrc,rrc_nr: fix logging when removing user
...
each action should only be logged once
2021-09-27 21:15:30 +02:00
Andre Puschmann
9cefddd739
enb,mac_nr: remove user from scheduler when removed from MAC
2021-09-27 21:15:30 +02:00
Francisco Paisana
698eff29f4
sched,nr: avoid ul pending bytes of each UE becoming negative
2021-09-27 15:43:16 +02:00
Francisco Paisana
3119214124
nr,rrc: defer drb activation in NR to when the C-RNTI is received
2021-09-27 15:43:16 +02:00
Francisco Paisana
cbb709d4e3
sched,nr: function to log UEs buffer status before scheduling decision, fix const_iterator of circular_map
2021-09-27 15:43:16 +02:00
Ismael Gomez
1c77998df5
Stop PDCP for data bearers before initiating HO
2021-09-27 13:54:51 +02:00
faluco
fa351cd285
Rename functions that contain the unsafe word to nolock.
...
The term "unsafe" does not clearly state that the function is not locking the shared date and it sounds "dangerous", so use a more explicit term.
2021-09-27 13:26:21 +02:00
Francisco Paisana
c7e2038904
lte: stop radio before stopping stack
2021-09-27 11:35:42 +02:00
Andre Puschmann
593d28fa4d
enb,stack_lte: protect access to sync queue
...
the sync queue is only created during init so access needs to be protected
2021-09-27 11:35:42 +02:00
Francisco Paisana
8ba623f954
sched,nr: remove unecessary setup of lcid=0 in scheduler
2021-09-24 17:35:15 +02:00
Andre Puschmann
88212ed3e0
fix NR sched configuration of UE generated in RRC
2021-09-24 17:35:15 +02:00
Francisco Paisana
a952f0f62d
sched,nr: expose sched nr UE bearer configuration in sched interface
2021-09-24 17:35:15 +02:00
Francisco Paisana
d1b1ef181a
fix conflicts in rebasing
2021-09-24 17:35:15 +02:00
Francisco Paisana
bdf18856d1
sched,nr: fix handling of DL BSR in NR scheduler and computation of UCI
2021-09-24 17:35:15 +02:00
Francisco Paisana
70fe48a5ab
sched,nr: change NR sched configuration api
2021-09-24 13:27:45 +02:00
Francisco Paisana
a035ad144b
mac,nr: create sched_nr object only at mac::init()
2021-09-24 13:27:45 +02:00
Andre Puschmann
7cdb9c00c0
enb,rrc: disable log error when non-EUTRA reports arrive
...
since this will be cause an Error log for NR events
2021-09-24 11:43:53 +02:00
Andre Puschmann
5966760458
rrc_endc: start SgNB addition from start if B1 events are disabled
2021-09-24 11:43:53 +02:00
Andre Puschmann
af73c57780
rrc_endc: prepare ENDC paramter
...
exposes some of the hard-coded params as struct.
filling/parsing from file still needs to be added.
2021-09-24 11:43:53 +02:00
Francisco Paisana
12d63468e3
sched,lte: separated adaptive mcs learning rate argument into two arguments, one for DL and the other for UL
2021-09-23 19:12:46 +02:00
Andre Puschmann
7f897d83e2
gnb,mac_nr: push DL buffer state to scheduler
2021-09-23 19:07:31 +02:00
Andre Puschmann
426e876047
enb,nr: fix GTPU handler to forward UL PDUs
2021-09-23 19:07:31 +02:00
yagoda
bc4388a78c
-adding temp crnti removal for NR carrier attach
2021-09-23 18:27:13 +02:00
Ismael Gomez
1c44546c0b
srsenb: allocate pucch for new UE on reestablishment request
2021-09-23 18:26:24 +02:00
Ismael Gomez
af9822bede
srsenb: add error handling on RRC message generation
2021-09-23 18:26:24 +02:00
Francisco Paisana
3351e97aa2
nr,mac: use SR to send an UL grant after Msg3 and complete ContextResolution of UE NSA NR
2021-09-23 16:08:48 +02:00
Francisco Paisana
e1a4e63ec8
sched,nr: use MAC-NR as prefix for NR scheduler
2021-09-23 09:46:56 +02:00
Francisco Paisana
aabec3d7af
sched,nr: forward SRs present in PUCCH from MAC to scheduler
2021-09-23 09:46:56 +02:00
Francisco Paisana
5a45767c73
sched,nr: fix SR PUCCH resource configuration
2021-09-23 09:46:56 +02:00
Francisco Paisana
37bdf53f42
sched,nr: fix SR slot derivation in scheduler
2021-09-23 09:46:56 +02:00
Francisco Paisana
8d30ed0721
sched,nr: ensure PUCCHs are cleared at the end of a slot
2021-09-23 09:46:56 +02:00
Francisco Paisana
00cc8fb8d8
sched,nr: ensure PUCCH is generated for SR even if the UE doesn't have any pending ACK
2021-09-23 09:46:56 +02:00
Ismael Gomez
3bbf173149
Allocate PUCCH resources on ConnectionRequest and send ConnectionReject if not available
2021-09-22 17:48:20 +02:00
Ismael Gomez
6e18bd1c71
Do not accept a UE if SR resources are defined
2021-09-22 17:48:20 +02:00
Ismael Gomez
2b16c1b8f5
Do not accept a UE if n_rb_cqi=0
2021-09-22 17:48:20 +02:00
Andre Puschmann
faf9d2dbd8
gnb,rrc: replace hard-coded PCI with actual value in rrc_cfg
2021-09-22 16:41:18 +02:00
Andre Puschmann
802b22ac91
enb,nsa: refactor NR RRC/cell config parsing
...
this allows to access all cell-related params from within RRC
2021-09-22 16:41:18 +02:00
faluco
feec3c5905
Fix a data race during enb initialization.
...
The stack unique pointer in the enb class is written while the phy workers are calling enb::tti_clock() where it is read.
Avoid the read access until the whole class has been properly initialized.
2021-09-22 16:07:51 +02:00
David Rupprecht
611255aa5f
Added GTPU bind address as output parameter
2021-09-22 15:15:47 +02:00
Bedran Karakoc
43915550cc
NGAP GTP Bearer Establishment
2021-09-22 15:15:47 +02:00
David Rupprecht
3712983308
Added PDU Session est request
2021-09-22 15:15:47 +02:00
David Rupprecht
0385980347
Fixed minor NGAP issues
2021-09-22 15:15:47 +02:00
Andre Puschmann
b134781d36
enb: remove redundant RLC/PDPC classes for NR
...
the RLC/PDCP entities for NR are included in the RLC/PDCP wrapper classes
and don't require their own
2021-09-22 10:56:56 +02:00
Fabian Eckermann
651a76000e
Add function to pack secondary cell group config for FDD.
2021-09-21 18:12:34 +02:00
Xavier Arteaga
0324806d6c
Packed NR TDD config in duplex configuration and created test case for FDD
2021-09-21 18:11:16 +02:00
Xavier Arteaga
53bf29a540
Add nr label to MAC NR tests
2021-09-21 18:11:16 +02:00
Fabian Eckermann
dd8db1a929
Replaced inet_addr() with inet_pton.
2021-09-21 11:59:40 +02:00
Ismael Gomez
5d051d8832
Set default pucch_harq_max_rb to 0
2021-09-21 11:49:04 +02:00
Ismael Gomez
3eaf5c50cb
Make PUCCH HARQ region a configurable parameter. Skip grants when ACK falls outside region
2021-09-21 11:49:04 +02:00
Ismael Gomez
28b956d128
Limit PUCCH ACK resources to the max CCE from the configured max_ctrl_symbols instead of from MAX_CFI
2021-09-21 11:49:04 +02:00
Xavier Arteaga
25a4c7db92
SRSENB: make nr_cell_list optional
2021-09-21 11:30:56 +02:00
Xavier Arteaga
e0be361fde
Corrected default rb.conf
2021-09-21 11:30:56 +02:00
Ismael Gomez
fb294c8b34
Set default UE inactivity timeout after RRC Reestablishment complete
2021-09-20 20:16:13 +02:00
Andre Puschmann
39e00bdbe8
enb,nsa: fix deriviation of UL ARFCN from DL ARFCN for FDD bands
2021-09-17 17:32:50 +02:00
Andre Puschmann
3fd47d2af4
enb: refactor L2/L3 and (re)move all NR components to gNB stack
...
* decouple EUTRA and NR stack classes
* implement dummy X2 interface with control and data plane methods
* implement eNB time source interface that PHY calls
2021-09-17 14:57:33 +02:00
Andre Puschmann
1e9a4e3fba
enb: remove stack type variable
2021-09-17 14:57:33 +02:00
Andre Puschmann
8d49e58078
enb: prepare split of EUTRA and NR stack classes
...
this allows for a slimmer base station if only EUTRA or NR cells are used.
also it seperates entities in a cleaner way
2021-09-17 14:57:33 +02:00
faluco
8a2231251a
Fix data race in enb::mac::ue class.
2021-09-17 11:34:42 +02:00
faluco
457dcf4de4
Fix data race in enb::ta class.
2021-09-17 11:34:42 +02:00
Pedro Alvarez
c988fc49b4
Remove comparison between LGC priority and allocation retantion priority, as these do not seem related.
2021-09-16 19:41:08 +01:00
Andre Puschmann
c9478a4306
enb,erab: fix error handling when setting up ERABs
...
when handling ERAB setup requests from MME, don't add the ERAB
before all checks have been performed, otherwise the ERAB
needs to be removed again.
Since this was not the case, invalid NAS PDUs have been transmitted.
Also raise error level for some events to error since the eNB
misses a config or is mal-configured and cant recover from that.
2021-09-16 15:25:46 +02:00
Andre Puschmann
ed92f2bd34
enb,mac_nr: remove EUTRA cell param for MAC-NR cell config calls
...
* the old srsran_cell_cfg_t is only carried for SIB params
* the SIB scheduling, etc needs to be ported and integrated into NR data structures
* disbable SIB test for the moment
2021-09-15 14:49:28 +02:00
Andre Puschmann
e2b1bbe2dc
enb,metrics: add helper method to print MAC metrics
...
preparation to be used to print MAC metrics for EUTRA and NR cells
2021-09-15 14:49:28 +02:00
Andre Puschmann
6a46931144
mac_nr,enb: move header into nr subfolder
2021-09-15 14:49:28 +02:00
Andre Puschmann
4a5d2a8659
mac_nr: add basic get_metrics() implementation
2021-09-15 14:49:28 +02:00
Andre Puschmann
dbcf5c9503
sched_nr: add ue_exists() helper
2021-09-15 14:49:28 +02:00
faluco
485ec2edab
Implement a new option to flush the file sink contents on every write.
2021-09-14 10:22:37 +02:00
Andre Puschmann
88878e07c6
sched_nr_test: enable auto-refill for failing NR sched tests
2021-09-13 17:10:32 +02:00
Andre Puschmann
9a49d47968
sched_nr_interface: disable auto-refill of NR scheduler
2021-09-13 17:10:32 +02:00
Andre Puschmann
dbbc621905
phy_common: fix PRB lookup for NR cells
2021-09-10 22:08:26 +02:00
Andre Puschmann
93e1d7712d
enb,phy: add checks for invalid EARFCN and exit eNB if config is wrong
2021-09-10 22:08:26 +02:00
Andre Puschmann
1f01e4be51
rr.conf.example: add empty NR cell list to example
2021-09-10 22:08:26 +02:00
Andre Puschmann
b5dcf7804c
enb,cfg: add new NR cell list to RR configuration parser
2021-09-10 22:08:26 +02:00
Andre Puschmann
312a91a460
enb,rrc_nr: disable encryption for DRB
2021-09-09 14:29:04 +02:00
Andre Puschmann
f814a0ed09
ue_nr: reduction of log level when packing MAC PDU
2021-09-09 14:29:04 +02:00
Andre Puschmann
c1892eb2ec
enb,nsa: refactor of SgNB addition interface
...
* update of FSM
* better integration of parameter for X2 calls
2021-09-09 14:29:04 +02:00
Andre Puschmann
f7e943b6b6
enb,mac_nr: add handling of SBSR MAC CE
2021-09-09 14:29:04 +02:00
faluco
5798f09252
Re-format the enb stdout metrics and port the code to use the fmt library.
2021-09-08 17:05:37 +02:00
faluco
934802d23c
Report the SIB9 home enb name in the enb sector start/sector stop events.
2021-09-07 16:36:56 +02:00
faluco
2fd3ed789a
Rename sector_id to carrier_id JSON key in enb metrics and events.
2021-09-07 16:36:56 +02:00
faluco
fdb4b91e98
Adapt the enb metrics to allow adding a PCI field for each CC.
...
Include the PCI field in the enb JSON metrics.
2021-09-07 16:36:56 +02:00
faluco
fd013e8a17
- Implement intra enb HO command reporting.
...
- Fix reversed rnti values in connection_resume event.
2021-09-07 16:36:56 +02:00
faluco
d168536bc4
Add a new program option to control how ASN1 messages get printed into the enb JSON report file.
2021-09-07 16:36:56 +02:00
faluco
df6ae7b0e0
- Implement new enb events:
...
* ho_command
* connection_resume
* rlf_detected
- Rename rlf_report event to "rlf_report".
2021-09-07 16:36:56 +02:00
faluco
8a3586dfbf
Include a ASN1 json representation for RRC enb events.
2021-09-07 16:36:56 +02:00
Ismael Gomez
00653bdd46
Fix PUCCH2 RRC scheduling
2021-09-07 12:14:36 +02:00
Andre Puschmann
88bb92dc0d
mac_nr,sched: handle C-RNTI CE
2021-09-06 10:35:59 +02:00
Andre Puschmann
66c87aafdb
rrc_nr: fix PRACH seq and RNTI for RRC Reconfig
2021-09-06 10:35:59 +02:00
Andre Puschmann
14758b087c
enb,mac_nr: fix Msg3 UL grant packing in RAR
2021-09-06 10:35:59 +02:00
Francisco Paisana
e146345df0
sched,nr: add ue removal method to nr sched
2021-09-04 11:34:56 +02:00
Francisco Paisana
a7bf1ad26d
sched,nr: use NR UL DCI to fill RAR grant contents
2021-09-03 12:50:36 +02:00
Andre Puschmann
efa79bf408
sched_nr_helpers: fix copy-paste error UL vs DL
2021-09-03 12:09:41 +02:00
Andre Puschmann
548c45a8fc
enb,mac_nr: add RAR packing
2021-09-03 12:09:41 +02:00
Andre Puschmann
9b4f6cb8bb
mac_nr: pretty-print received/transmitted MAC PDUs in logs
2021-09-03 12:09:41 +02:00
Francisco Paisana
1dfc884b65
Changed S1AP causes for non-existing cell in HO and not available radio resources in HO for more apropriate ones.
2021-09-03 12:06:28 +02:00