hardy
320b43c462
Merge remote-tracking branch 'origin/lte-ulsch-bugfix' into integration_2021_wk05
2021-02-02 15:38:54 +01:00
Robert Schmidt
f1cb44a005
Bugfix: decrease actual MCS value
2021-01-29 09:31:56 +01:00
hardy
5db5657df7
Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b
2021-01-29 07:41:47 +01:00
masayuki.harada
bbaef50932
Fix est buffer.
2020-12-27 20:19:33 +09:00
Laurent
42a110338c
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
masayuki.harada
50146dec06
Merge remote-tracking branch 'remotes/oai/develop' into lte_uplink_improvement
...
# Conflicts:
# openair1/SCHED/phy_procedures_lte_eNb.c
# openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2020-12-15 19:01:43 +09:00
masayuki.harada
b125b93e9e
Fix log and minor bugs.
2020-12-15 18:19:22 +09:00
He Shanyun
65bad0f5a8
fix cppcheck warning
2020-12-11 16:42:58 +09:00
Remi Hardy
98fd8279bf
Merge remote-tracking branch 'origin/develop-oriecpriupdates' into rh_wk50_debug
2020-12-09 14:16:19 +01:00
masayuki.harada
1de8776c43
Fix compile error
2020-12-09 13:59:49 +09:00
masayuki.harada
0555b108db
Merge remote-tracking branch 'remotes/oai/develop' into lte_uplink_improvement
2020-12-07 21:17:59 +09:00
masayuki.harada
b0f5a37fba
Fix indentation, merge miss and remove unnecessary comment.
2020-12-07 20:08:03 +09:00
zhenghuangkun
88699deb81
Merge branch fujitsu_lte_contribution into lte_uplink_improvement
2020-11-30 18:56:26 +09:00
masayuki.harada
20f1d347ac
Fix DCI0 aggregation and call ulsch scheduling.
2020-11-30 12:00:23 +09:00
Ding Yumei
a332423d97
fix segmentation fault(mac head error)
2020-11-30 11:30:58 +09:00
Ding Yumei
67da5c7cf3
fix segmentation fault(ccch/dcch length eror)
2020-11-30 11:30:46 +09:00
Ding Yumei
0dd16fb6f5
fix segmentation fault(ul error)
2020-11-30 11:30:32 +09:00
Ding Yumei
1568055310
fix segmentation fault(ul dtch length error)
2020-11-30 11:30:18 +09:00
zhenghuangkun
6d0ef37c8e
Modify DRB_active array size to NB_RB_MAX -2
2020-11-30 11:13:53 +09:00
Haruki NAOI
fc595236b3
add logs.
2020-11-30 10:55:39 +09:00
Haruki NAOI
1a320bc6d4
Fix: SNR feedback to PUSCH TPC and PUCCH TPC of default scheduler.
2020-11-30 10:55:19 +09:00
masayuki.harada
b54c32b70d
Change UL DCI aggregation level by DL cqi.
...
(cherry picked from commit 175c59ae3aedf612777cd1c8c88b6d6f254b9334)
2020-11-30 10:45:34 +09:00
Raymond Knopp
18756c35eb
demotion of LOG_W to LOG_D
2020-11-27 21:46:22 +01:00
masayuki.harada
cb927c7f9a
Add statistics logs.
...
(cherry picked from commit cf8f14edf4a261e1df72579423786d39ba6d97f9)
2020-11-27 17:06:11 +09:00
Haruki NAOI
7243b6d67a
Avoid Segfault with abnormal MAC header.
...
(cherry picked from commit 04c5431468c9102dd625a73d9e5219b40b638fe3)
(cherry picked from commit 17880778c848406e562f98c20f7b7a6428502279)
(cherry picked from commit a26f44c197e854dd4261267a3695932392f09265)
2020-11-27 16:26:11 +09:00
Haruki NAOI
deeded689d
Fix: guard multiple UL scheduling for same UE.
...
(cherry picked from commit 57caca9ba87fda3f73aa30d86f4af01a6062224c)
2020-11-27 15:24:26 +09:00
masayuki.harada
9ad810bab4
Fix ul_cqi and tpc filtering.
...
(cherry picked from commit 120ea0950e1f52c1c5dd1d0dd4f7080e66d7ee93)
2020-11-27 12:37:09 +09:00
Ding Yumei
548eaae610
fix Msg3 PHICH issue and C-RNTI DRB active issue
2020-11-27 11:12:31 +09:00
zhenghuangkun
df5e22efee
Modify CQI timer to 64 subframe
2020-11-27 11:09:56 +09:00
zhenghuangkun
d00297aeb9
Modify UL timer and CQI timer to 64 subframe
2020-11-27 11:04:20 +09:00
Kuroiwa Kenichi
80f83843f0
Initialize scheduled_ul_bytes
...
(cherry picked from commit 4a18e26f8c1dfb80a5af2fac4104b06b648a598c)
2020-11-27 10:55:16 +09:00
Haruki NAOI
7a89100a9f
fix compilation.
2020-11-27 10:54:02 +09:00
Kuroiwa Kenichi
934cc715f8
Initialize scheduled_ul_bytes
...
(cherry picked from commit b0d6c5150db520bd7840d1604c3f82a0b59bc218)
2020-11-27 10:22:48 +09:00
Haruki NAOI
179775b72c
Temporary: change tpc filter.
...
(cherry picked from commit d82fc4805ef9032c9bfd9705fef702a6e130f7b2)
# Conflicts:
# openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
2020-11-27 10:08:27 +09:00
Haruki NAOI
52dfba49cd
Fix: smooth ULSCH AMC and TPC control.
...
(cherry picked from commit 56720c68864f6b04409deb00676e59a41c8f050b)
2020-11-27 10:07:56 +09:00
Haruki NAOI
b573fd4dbd
Fix: The remaining UL buffer size is incorrectly calculated and UL scheduling does not occur. (scheduled_ul_bytes is not subtracted correctly when receiving NACK rarely.)
...
(cherry picked from commit 2fb4823b57320c4c4e4d800ae9bb0570f18ad353)
2020-11-27 09:44:39 +09:00
masayuki.harada
05eb88f068
Fix scheduled_ul_bytes size remain when no crc report has come from L1.
...
(cherry picked from commit ce10221c2761fb3058ccb77b73ba87f97d5e2cd2)
2020-11-27 09:41:56 +09:00
Cedric Roux
6f9fe2681c
rlc v2: add tick for UE
2020-11-26 11:53:22 +01:00
Cedric Roux
25ab3a5ed3
rlc v2: change time keeping
...
RLC has timers. We need to keep track of time. We chose to not use
realtime but 'processing time'. That is we send a tick to RLC for every
subframe when it is processed by the softmodem. Before this commit we
used to increase time in the function mac_rlc_status_ind which may not be
called every subframe (especially in TDD mode). So we need another way
to keep track of time.
We introduce rlc_tick() and call it in eNB_dlsch_ulsch_scheduler, which
is called every subframe, both in FDD and TDD.
We also call rlc_tick() in the function ru_thread_synch() because
pdcp_run() and rrc_rx_tx() are called there too.
It may not be the best solution. To be revised if needed.
Note: the UE has not been touched. Some modification is needed for the UE
too, most probably.
2020-11-26 11:53:22 +01:00
Haruki NAOI
ffdc67daa4
Add: PUSCH AMC using average BLER.
...
(cherry picked from commit 1ab0a979fdbcc933ae249838841dc7f61c0e5aba)
2020-11-26 18:44:44 +09:00
Haruki NAOI
55207a5062
Fix: add SNR filter for ULSCH AMC.
2020-11-26 18:28:56 +09:00
Haruki NAOI
66f99a9020
Fix: ULSCH AMC by instantaneous SINR value.
2020-11-26 18:21:13 +09:00
Haruki NAOI
1b61e10af6
fix compilation.
2020-11-26 18:07:21 +09:00
masayuki.harada
04d6de7d58
add variables TPC command interval and forgetting filter of UL SNR.
2020-11-26 18:04:14 +09:00
Haruki NAOI
dbb8a8924e
Fix: TPC control with average SNR value.
...
(cherry picked from commit 243c90f647a1f97dc3a1486502dc6263b5705e39)
2020-11-26 17:57:41 +09:00
Laurent
5c69510f17
merge develop, improve doc
2020-10-21 14:38:17 +02:00
Robert Schmidt
9882460607
Remove Mutexes in phy_stub_UE.c
...
Various mutexes are present in the phy_stub_UE.c file. However, it will
only be run in a single thread; the multiple-thread implementation also
runs the higher layers concurrently, which leads to races and segfaults.
Therefore, remove these mutexes, as we don't need them.
2020-10-13 08:49:30 +02:00
Robert Schmidt
581de8b2d8
Limit UE UL RBs to 48
2020-10-13 08:49:30 +02:00
Robert Schmidt
41a440fad2
Do not schedule static slices if 0 RB(G)s
2020-10-13 08:49:29 +02:00
Robert Schmidt
ca1b0e2bbc
Bugfix RR algo: if a UE cannot be allocated, skip it
2020-10-13 08:49:29 +02:00