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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
lizhongxiao
OpenXG-RAN
Commits
f5e9c4ec
Commit
f5e9c4ec
authored
Jun 09, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
applying Robert's patch
parent
85b48193
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
143 additions
and
148 deletions
+143
-148
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+143
-148
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
f5e9c4ec
...
...
@@ -537,169 +537,164 @@ void nr_initiate_ra_proc(module_id_t module_idP,
}
for
(
int
i
=
0
;
i
<
NR_NB_RA_PROC_MAX
;
i
++
)
{
NR_RA_t
*
ra
=
&
cc
->
ra
[
i
];
pr_found
=
0
;
NR_UE_info_t
*
UE
=
NULL
;
if
(
ra
->
rnti
!=
0
)
// calling the function only for a valid RNTI
UE
=
find_nr_UE
(
&
nr_mac
->
UE_info
,
ra
->
rnti
);
if
(
UE
)
{
// the UE is already registered
LOG_W
(
NR_MAC
,
"Received RA for existing RNTI %04x
\n
"
,
ra
->
rnti
);
if
(
ra
->
state
!=
RA_IDLE
)
continue
;
}
if
(
ra
->
state
==
RA_IDLE
)
{
for
(
int
j
=
0
;
j
<
ra
->
preambles
.
num_preambles
;
j
++
)
{
//check if the preamble received correspond to one of the listed or configured preambles
if
(
preamble_index
==
ra
->
preambles
.
preamble_list
[
j
])
{
if
(
ra
->
rnti
==
0
&&
get_softmodem_params
()
->
nsa
)
continue
;
pr_found
=
1
;
break
;
}
}
if
(
pr_found
==
0
)
{
continue
;
pr_found
=
0
;
for
(
int
j
=
0
;
j
<
ra
->
preambles
.
num_preambles
;
j
++
)
{
//check if the preamble received correspond to one of the listed or configured preambles
if
(
preamble_index
==
ra
->
preambles
.
preamble_list
[
j
])
{
if
(
ra
->
rnti
==
0
&&
get_softmodem_params
()
->
nsa
)
continue
;
pr_found
=
1
;
break
;
}
}
if
(
pr_found
==
0
)
{
continue
;
}
uint16_t
ra_rnti
;
uint16_t
ra_rnti
;
// ra_rnti from 5.1.3 in 38.321
// FK: in case of long PRACH the phone seems to expect the subframe number instead of the slot number here.
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
prach_RootSequenceIndex
.
present
==
NR_RACH_ConfigCommon__prach_RootSequenceIndex_PR_l839
)
ra_rnti
=
1
+
symbol
+
(
9
/*slotP*/
*
14
)
+
(
freq_index
*
14
*
80
)
+
(
ul_carrier_id
*
14
*
80
*
8
);
else
ra_rnti
=
1
+
symbol
+
(
slotP
*
14
)
+
(
freq_index
*
14
*
80
)
+
(
ul_carrier_id
*
14
*
80
*
8
);
// This should be handled differently when we use the initialBWP for RA
ra
->
dl_bwp_id
=
0
;
//TODO
ra
->
ul_bwp_id
=
0
;
NR_BWP_Downlink_t
*
bwp
=
NULL
;
if
(
ra
->
CellGroup
&&
ra
->
CellGroup
->
spCellConfig
&&
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
)
{
if
(
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
&&
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
)
{
ra
->
dl_bwp_id
=
*
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
;
bwp
=
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
ra
->
dl_bwp_id
-
1
];
}
if
(
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
&&
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
)
ra
->
ul_bwp_id
=
*
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
;
}
// ra_rnti from 5.1.3 in 38.321
// FK: in case of long PRACH the phone seems to expect the subframe number instead of the slot number here.
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
prach_RootSequenceIndex
.
present
==
NR_RACH_ConfigCommon__prach_RootSequenceIndex_PR_l839
)
ra_rnti
=
1
+
symbol
+
(
9
/*slotP*/
*
14
)
+
(
freq_index
*
14
*
80
)
+
(
ul_carrier_id
*
14
*
80
*
8
);
else
ra_rnti
=
1
+
symbol
+
(
slotP
*
14
)
+
(
freq_index
*
14
*
80
)
+
(
ul_carrier_id
*
14
*
80
*
8
);
// This should be handled differently when we use the initialBWP for RA
ra
->
dl_bwp_id
=
0
;
//TODO
ra
->
ul_bwp_id
=
0
;
NR_BWP_Downlink_t
*
bwp
=
NULL
;
if
(
ra
->
CellGroup
&&
ra
->
CellGroup
->
spCellConfig
&&
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
)
{
if
(
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
&&
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
)
{
ra
->
dl_bwp_id
=
*
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
firstActiveDownlinkBWP_Id
;
bwp
=
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
ra
->
dl_bwp_id
-
1
];
}
if
(
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
&&
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
)
ra
->
ul_bwp_id
=
*
ra
->
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
firstActiveUplinkBWP_Id
;
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_INITIATE_RA_PROC
,
1
);
LOG_D
(
NR_MAC
,
"[gNB %d][RAPROC] CC_id %d Frame %d, Slot %d Initiating RA procedure for preamble index %d
\n
"
,
LOG_D
(
NR_MAC
,
"[gNB %d][RAPROC] CC_id %d Frame %d, Slot %d Initiating RA procedure for preamble index %d
\n
"
,
module_idP
,
CC_id
,
frameP
,
slotP
,
preamble_index
);
uint8_t
beam_index
=
ssb_index_from_prach
(
module_idP
,
frameP
,
slotP
,
preamble_index
,
freq_index
,
symbol
);
// the UE sent a RACH either for starting RA procedure or RA procedure failed and UE retries
if
(
ra
->
cfra
)
{
// if the preamble received correspond to one of the listed
if
(
!
(
preamble_index
==
ra
->
preambles
.
preamble_list
[
beam_index
]))
{
LOG_E
(
NR_MAC
,
"[gNB %d][RAPROC] FAILURE: preamble %d does not correspond to any of the ones in rach_ConfigDedicated
\n
"
,
module_idP
,
CC_id
,
frameP
,
slotP
,
preamble_index
);
uint8_t
beam_index
=
ssb_index_from_prach
(
module_idP
,
frameP
,
slotP
,
preamble_index
,
freq_index
,
symbol
);
// the UE sent a RACH either for starting RA procedure or RA procedure failed and UE retries
if
(
ra
->
cfra
)
{
// if the preamble received correspond to one of the listed
if
(
!
(
preamble_index
==
ra
->
preambles
.
preamble_list
[
beam_index
]))
{
LOG_E
(
NR_MAC
,
"[gNB %d][RAPROC] FAILURE: preamble %d does not correspond to any of the ones in rach_ConfigDedicated
\n
"
,
module_idP
,
preamble_index
);
continue
;
// if the PRACH preamble does not correspond to any of the ones sent through RRC abort RA proc
}
}
LOG_D
(
NR_MAC
,
"Frame %d, Slot %d: Activating RA process
\n
"
,
frameP
,
slotP
);
ra
->
state
=
Msg2
;
ra
->
timing_offset
=
timing_offset
;
ra
->
preamble_slot
=
slotP
;
NR_SearchSpaceId_t
ra_SearchSpace
=
0
;
struct
NR_PDCCH_ConfigCommon__commonSearchSpaceList
*
commonSearchSpaceList
=
NULL
;
NR_BWP_t
*
genericParameters
=
NULL
;
if
(
bwp
)
{
commonSearchSpaceList
=
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
;
ra_SearchSpace
=
*
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
ra_SearchSpace
;
genericParameters
=
&
bwp
->
bwp_Common
->
genericParameters
;
}
else
{
commonSearchSpaceList
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
;
ra_SearchSpace
=
*
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
ra_SearchSpace
;
genericParameters
=
&
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
;
continue
;
// if the PRACH preamble does not correspond to any of the ones sent through RRC abort RA proc
}
AssertFatal
(
commonSearchSpaceList
->
list
.
count
>
0
,
"common SearchSpace list has 0 elements
\n
"
);
}
LOG_D
(
NR_MAC
,
"Frame %d, Slot %d: Activating RA process
\n
"
,
frameP
,
slotP
);
ra
->
state
=
Msg2
;
ra
->
timing_offset
=
timing_offset
;
ra
->
preamble_slot
=
slotP
;
// Common SearchSpace list
for
(
int
i
=
0
;
i
<
commonSearchSpaceList
->
list
.
count
;
i
++
)
{
ss
=
commonSearchSpaceList
->
list
.
array
[
i
];
if
(
ss
->
searchSpaceId
==
ra_SearchSpace
)
ra
->
ra_ss
=
ss
;
}
NR_SearchSpaceId_t
ra_SearchSpace
=
0
;
struct
NR_PDCCH_ConfigCommon__commonSearchSpaceList
*
commonSearchSpaceList
=
NULL
;
NR_BWP_t
*
genericParameters
=
NULL
;
if
(
bwp
)
{
commonSearchSpaceList
=
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
;
ra_SearchSpace
=
*
bwp
->
bwp_Common
->
pdcch_ConfigCommon
->
choice
.
setup
->
ra_SearchSpace
;
genericParameters
=
&
bwp
->
bwp_Common
->
genericParameters
;
}
else
{
commonSearchSpaceList
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
;
ra_SearchSpace
=
*
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
ra_SearchSpace
;
genericParameters
=
&
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
;
}
AssertFatal
(
commonSearchSpaceList
->
list
.
count
>
0
,
"common SearchSpace list has 0 elements
\n
"
);
AssertFatal
(
ra
->
ra_ss
!=
NULL
,
"SearchSpace cannot be null for RA
\n
"
);
ra
->
coreset
=
get_coreset
(
nr_mac
,
scc
,
bwp
,
ra
->
ra_ss
,
NR_SearchSpace__searchSpaceType_PR_common
);
ra
->
sched_pdcch
=
set_pdcch_structure
(
nr_mac
,
ra
->
ra_ss
,
ra
->
coreset
,
scc
,
genericParameters
,
&
nr_mac
->
type0_PDCCH_CSS_config
[
ra
->
beam_id
]);
// retrieving ra pdcch monitoring period and offset
find_monitoring_periodicity_offset_common
(
ra
->
ra_ss
,
&
monitoring_slot_period
,
&
monitoring_offset
);
nr_schedule_msg2
(
frameP
,
slotP
,
&
msg2_frame
,
&
msg2_slot
,
scc
,
frame_type
,
monitoring_slot_period
,
monitoring_offset
,
beam_index
,
cc
->
num_active_ssb
,
nr_mac
->
tdd_beam_association
,
nr_mac
->
if_inst
->
sl_ahead
);
ra
->
Msg2_frame
=
msg2_frame
;
ra
->
Msg2_slot
=
msg2_slot
;
LOG_D
(
NR_MAC
,
"%s() Msg2[%04d%d] SFN/SF:%04d%d
\n
"
,
__FUNCTION__
,
ra
->
Msg2_frame
,
ra
->
Msg2_slot
,
frameP
,
slotP
);
int
loop
=
0
;
if
(
ra
->
rnti
==
0
)
{
// This condition allows for the usage of a preconfigured rnti for the CFRA
do
{
ra
->
rnti
=
(
taus
()
%
65518
)
+
1
;
loop
++
;
}
while
(
loop
!=
100
&&
!
((
find_nr_UE
(
&
nr_mac
->
UE_info
,
ra
->
rnti
)
==
NULL
)
&&
(
find_nr_RA_id
(
module_idP
,
CC_id
,
ra
->
rnti
)
==
-
1
)
&&
ra
->
rnti
>=
1
&&
ra
->
rnti
<=
65519
));
if
(
loop
==
100
)
{
LOG_E
(
NR_MAC
,
"%s:%d:%s: [RAPROC] initialisation random access aborted
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
// Common SearchSpace list
for
(
int
i
=
0
;
i
<
commonSearchSpaceList
->
list
.
count
;
i
++
)
{
ss
=
commonSearchSpaceList
->
list
.
array
[
i
];
if
(
ss
->
searchSpaceId
==
ra_SearchSpace
)
ra
->
ra_ss
=
ss
;
}
AssertFatal
(
ra
->
ra_ss
!=
NULL
,
"SearchSpace cannot be null for RA
\n
"
);
ra
->
coreset
=
get_coreset
(
nr_mac
,
scc
,
bwp
,
ra
->
ra_ss
,
NR_SearchSpace__searchSpaceType_PR_common
);
ra
->
sched_pdcch
=
set_pdcch_structure
(
nr_mac
,
ra
->
ra_ss
,
ra
->
coreset
,
scc
,
genericParameters
,
&
nr_mac
->
type0_PDCCH_CSS_config
[
ra
->
beam_id
]);
// retrieving ra pdcch monitoring period and offset
find_monitoring_periodicity_offset_common
(
ra
->
ra_ss
,
&
monitoring_slot_period
,
&
monitoring_offset
);
nr_schedule_msg2
(
frameP
,
slotP
,
&
msg2_frame
,
&
msg2_slot
,
scc
,
frame_type
,
monitoring_slot_period
,
monitoring_offset
,
beam_index
,
cc
->
num_active_ssb
,
nr_mac
->
tdd_beam_association
,
nr_mac
->
if_inst
->
sl_ahead
);
ra
->
Msg2_frame
=
msg2_frame
;
ra
->
Msg2_slot
=
msg2_slot
;
LOG_D
(
NR_MAC
,
"%s() Msg2[%04d%d] SFN/SF:%04d%d
\n
"
,
__FUNCTION__
,
ra
->
Msg2_frame
,
ra
->
Msg2_slot
,
frameP
,
slotP
);
int
loop
=
0
;
if
(
ra
->
rnti
==
0
)
{
// This condition allows for the usage of a preconfigured rnti for the CFRA
do
{
ra
->
rnti
=
(
taus
()
%
65518
)
+
1
;
loop
++
;
}
while
(
loop
!=
100
&&
!
((
find_nr_UE
(
&
nr_mac
->
UE_info
,
ra
->
rnti
)
==
NULL
)
&&
(
find_nr_RA_id
(
module_idP
,
CC_id
,
ra
->
rnti
)
==
-
1
)
&&
ra
->
rnti
>=
1
&&
ra
->
rnti
<=
65519
));
if
(
loop
==
100
)
{
LOG_E
(
NR_MAC
,
"%s:%d:%s: [RAPROC] initialisation random access aborted
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
abort
();
}
}
ra
->
RA_rnti
=
ra_rnti
;
ra
->
preamble_index
=
preamble_index
;
ra
->
beam_id
=
beam_index
;
ra
->
RA_rnti
=
ra_rnti
;
ra
->
preamble_index
=
preamble_index
;
ra
->
beam_id
=
beam_index
;
LOG_I
(
NR_MAC
,
"[gNB %d][RAPROC] CC_id %d Frame %d Activating Msg2 generation in frame %d, slot %d using RA rnti %x SSB, new rnti %04x "
"index %u RA index %d
\n
"
,
module_idP
,
CC_id
,
frameP
,
ra
->
Msg2_frame
,
ra
->
Msg2_slot
,
ra
->
RA_rnti
,
ra
->
rnti
,
cc
->
ssb_index
[
beam_index
],
i
);
LOG_I
(
NR_MAC
,
"[gNB %d][RAPROC] CC_id %d Frame %d Activating Msg2 generation in frame %d, slot %d using RA rnti %x SSB, new rnti %04x "
"index %u RA index %d
\n
"
,
module_idP
,
CC_id
,
frameP
,
ra
->
Msg2_frame
,
ra
->
Msg2_slot
,
ra
->
RA_rnti
,
ra
->
rnti
,
cc
->
ssb_index
[
beam_index
],
i
);
return
;
}
return
;
}
LOG_E
(
NR_MAC
,
"[gNB %d][RAPROC] FAILURE: CC_id %d Frame %d initiating RA procedure for preamble index %d
\n
"
,
module_idP
,
CC_id
,
frameP
,
preamble_index
);
...
...
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