Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-RAN
Commits
709db951
Commit
709db951
authored
Apr 19, 2022
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix DL/UL failure due to wrong dedicated BWP when an RA fails on Msg4 and then succeeds
parent
e59ac44c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
0 deletions
+28
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+28
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
709db951
...
...
@@ -2807,14 +2807,42 @@ void nr_csirs_scheduling(int Mod_idP,
void
nr_mac_update_timers
(
module_id_t
module_id
,
frame_t
frame
,
sub_frame_t
slot
)
{
NR_UE_info_t
*
UE_info
=
&
RC
.
nrmac
[
module_id
]
->
UE_info
;
const
NR_list_t
*
UE_list
=
&
UE_info
->
list
;
for
(
int
UE_id
=
UE_list
->
head
;
UE_id
>=
0
;
UE_id
=
UE_list
->
next
[
UE_id
])
{
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
if
(
sched_ctrl
->
rrc_processing_timer
>
0
)
{
sched_ctrl
->
rrc_processing_timer
--
;
if
(
sched_ctrl
->
rrc_processing_timer
==
0
)
{
LOG_I
(
NR_MAC
,
"(%d.%d) De-activating RRC processing timer for UE %d
\n
"
,
frame
,
slot
,
UE_id
);
// If needed, update the Dedicated BWP
const
int
current_bwp_id
=
sched_ctrl
->
active_bwp
?
sched_ctrl
->
active_bwp
->
bwp_Id
:
0
;
const
int
current_ubwp_id
=
sched_ctrl
->
active_ubwp
?
sched_ctrl
->
active_ubwp
->
bwp_Id
:
0
;
if
(
UE_info
->
CellGroup
[
UE_id
]
&&
UE_info
->
CellGroup
[
UE_id
]
->
spCellConfig
&&
UE_info
->
CellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
&&
UE_info
->
CellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
&&
UE_info
->
CellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
&&
UE_info
->
CellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
)
{
const
NR_ServingCellConfig_t
*
servingCellConfig
=
UE_info
->
CellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
;
if
(
*
servingCellConfig
->
firstActiveDownlinkBWP_Id
!=
current_bwp_id
)
{
sched_ctrl
->
active_bwp
=
servingCellConfig
->
downlinkBWP_ToAddModList
->
list
.
array
[
*
servingCellConfig
->
firstActiveDownlinkBWP_Id
-
1
];
LOG_I
(
NR_MAC
,
"Changing to DL-BWP %li
\n
"
,
sched_ctrl
->
active_bwp
->
bwp_Id
);
}
if
(
*
servingCellConfig
->
uplinkConfig
->
firstActiveUplinkBWP_Id
!=
current_ubwp_id
)
{
sched_ctrl
->
active_ubwp
=
servingCellConfig
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
*
servingCellConfig
->
uplinkConfig
->
firstActiveUplinkBWP_Id
-
1
];
LOG_I
(
NR_MAC
,
"Changing to UL-BWP %li
\n
"
,
sched_ctrl
->
active_ubwp
->
bwp_Id
);
}
}
sched_ctrl
->
update_pdsch_ps
=
true
;
sched_ctrl
->
update_pusch_ps
=
true
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment