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
zzha zzha
OpenXG-RAN
Commits
7db8dce5
Commit
7db8dce5
authored
Nov 16, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for allowing softmodem to schedule PUSCH with transform precoding
parent
bf03abae
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
28 deletions
+37
-28
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+8
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+15
-11
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+13
-9
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_config.c
+0
-4
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
View file @
7db8dce5
...
@@ -602,7 +602,7 @@ typedef struct NR_UE_UL_BWP {
...
@@ -602,7 +602,7 @@ typedef struct NR_UE_UL_BWP {
NR_CSI_MeasConfig_t
*
csi_MeasConfig
;
NR_CSI_MeasConfig_t
*
csi_MeasConfig
;
NR_SRS_Config_t
*
srs_Config
;
NR_SRS_Config_t
*
srs_Config
;
long
*
msg3_DeltaPreamble
;
long
*
msg3_DeltaPreamble
;
uint8_t
transform_precoding
;
long
*
transform_precoding
;
uint8_t
mcs_table
;
uint8_t
mcs_table
;
nr_dci_format_t
dci_format
;
nr_dci_format_t
dci_format
;
int
max_fb_time
;
int
max_fb_time
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
7db8dce5
...
@@ -1016,9 +1016,14 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
...
@@ -1016,9 +1016,14 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
pusch_pdu
->
cyclic_prefix
=
0
;
pusch_pdu
->
cyclic_prefix
=
0
;
pusch_pdu
->
mcs_table
=
0
;
pusch_pdu
->
mcs_table
=
0
;
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
==
NULL
)
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
==
NULL
)
pusch_pdu
->
transform_precoding
=
1
;
pusch_pdu
->
transform_precoding
=
1
;
// disabled
else
else
{
pusch_pdu
->
transform_precoding
=
0
;
pusch_pdu
->
transform_precoding
=
0
;
// enabled
pusch_pdu
->
dfts_ofdm
.
low_papr_group_number
=
*
scc
->
physCellId
%
30
;
pusch_pdu
->
dfts_ofdm
.
low_papr_sequence_number
=
0
;
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
->
groupHoppingEnabledTransformPrecoding
)
AssertFatal
(
1
==
0
,
"Hopping mode is not supported in transform precoding
\n
"
);
}
pusch_pdu
->
data_scrambling_id
=
*
scc
->
physCellId
;
pusch_pdu
->
data_scrambling_id
=
*
scc
->
physCellId
;
pusch_pdu
->
nrOfLayers
=
1
;
pusch_pdu
->
nrOfLayers
=
1
;
pusch_pdu
->
ul_dmrs_symb_pos
=
get_l_prime
(
nr_of_symbols
,
mappingtype
,
pusch_dmrs_pos2
,
pusch_len1
,
start_symbol_index
,
scc
->
dmrs_TypeA_Position
);
pusch_pdu
->
ul_dmrs_symb_pos
=
get_l_prime
(
nr_of_symbols
,
mappingtype
,
pusch_dmrs_pos2
,
pusch_len1
,
start_symbol_index
,
scc
->
dmrs_TypeA_Position
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
7db8dce5
...
@@ -2173,11 +2173,6 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
...
@@ -2173,11 +2173,6 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
UL_BWP
->
initial_BWPSize
=
NRRIV2BW
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
UL_BWP
->
initial_BWPSize
=
NRRIV2BW
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
UL_BWP
->
initial_BWPStart
=
NRRIV2PRBOFFSET
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
UL_BWP
->
initial_BWPStart
=
NRRIV2PRBOFFSET
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
if
(
UL_BWP
->
pusch_Config
==
NULL
||
!
UL_BWP
->
pusch_Config
->
transformPrecoder
)
UL_BWP
->
transform_precoding
=
!
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
;
else
UL_BWP
->
transform_precoding
=
*
UL_BWP
->
pusch_Config
->
transformPrecoder
;
if
(
UL_BWP
->
bwp_id
>
0
)
{
if
(
UL_BWP
->
bwp_id
>
0
)
{
UL_BWP
->
pucch_ConfigCommon
=
ul_bwp
->
bwp_Common
->
pucch_ConfigCommon
?
ul_bwp
->
bwp_Common
->
pucch_ConfigCommon
->
choice
.
setup
:
NULL
;
UL_BWP
->
pucch_ConfigCommon
=
ul_bwp
->
bwp_Common
->
pucch_ConfigCommon
?
ul_bwp
->
bwp_Common
->
pucch_ConfigCommon
->
choice
.
setup
:
NULL
;
UL_BWP
->
rach_ConfigCommon
=
ul_bwp
->
bwp_Common
->
rach_ConfigCommon
?
ul_bwp
->
bwp_Common
->
rach_ConfigCommon
->
choice
.
setup
:
NULL
;
UL_BWP
->
rach_ConfigCommon
=
ul_bwp
->
bwp_Common
->
rach_ConfigCommon
?
ul_bwp
->
bwp_Common
->
rach_ConfigCommon
->
choice
.
setup
:
NULL
;
...
@@ -2263,14 +2258,23 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
...
@@ -2263,14 +2258,23 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
long
*
dl_mcs_Table
=
DL_BWP
->
pdsch_Config
?
DL_BWP
->
pdsch_Config
->
mcs_Table
:
NULL
;
long
*
dl_mcs_Table
=
DL_BWP
->
pdsch_Config
?
DL_BWP
->
pdsch_Config
->
mcs_Table
:
NULL
;
DL_BWP
->
mcsTableIdx
=
get_pdsch_mcs_table
(
dl_mcs_Table
,
DL_BWP
->
dci_format
,
NR_RNTI_C
,
target_ss
);
DL_BWP
->
mcsTableIdx
=
get_pdsch_mcs_table
(
dl_mcs_Table
,
DL_BWP
->
dci_format
,
NR_RNTI_C
,
target_ss
);
long
*
ul_mcs_Table
=
NULL
;
// 0 precoding enabled 1 precoding disabled
if
(
UL_BWP
->
dci_format
==
NR_UL_DCI_FORMAT_0_0
||
UL_BWP
->
pusch_Config
==
NULL
||
UL_BWP
->
pusch_Config
->
transformPrecoder
==
NULL
)
UL_BWP
->
transform_precoding
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
;
else
UL_BWP
->
transform_precoding
=
UL_BWP
->
pusch_Config
->
transformPrecoder
;
// Set uplink MCS table
long
*
mcs_Table
=
NULL
;
bool
not_tp
=
(
UL_BWP
->
transform_precoding
==
NULL
||
*
UL_BWP
->
transform_precoding
==
1
);
if
(
UL_BWP
->
pusch_Config
)
if
(
UL_BWP
->
pusch_Config
)
ul_mcs_Table
=
UL_BWP
->
transform_precoding
?
mcs_Table
=
not_tp
?
UL_BWP
->
pusch_Config
->
mcs_Table
:
UL_BWP
->
pusch_Config
->
mcs_Table
:
UL_BWP
->
pusch_Config
->
mcs_TableTransformPrecoder
;
UL_BWP
->
pusch_Config
->
mcs_TableTransformPrecoder
;
UL_BWP
->
mcs_table
=
get_pusch_mcs_table
(
ul_
mcs_Table
,
UL_BWP
->
mcs_table
=
get_pusch_mcs_table
(
mcs_Table
,
UL_BWP
->
transform_precoding
?
0
:
1
,
!
not_tp
,
UL_BWP
->
dci_format
,
UL_BWP
->
dci_format
,
NR_RNTI_C
,
NR_RNTI_C
,
target_ss
,
target_ss
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
7db8dce5
...
@@ -1041,7 +1041,7 @@ uint8_t get_max_tpmi(const NR_PUSCH_Config_t *pusch_Config,
...
@@ -1041,7 +1041,7 @@ uint8_t get_max_tpmi(const NR_PUSCH_Config_t *pusch_Config,
void
get_precoder_matrix_coef
(
char
*
w
,
void
get_precoder_matrix_coef
(
char
*
w
,
const
uint8_t
ul_ri
,
const
uint8_t
ul_ri
,
const
uint16_t
num_ue_srs_ports
,
const
uint16_t
num_ue_srs_ports
,
const
uint8_t
transform_precoding
,
const
long
*
transform_precoding
,
const
uint8_t
tpmi
,
const
uint8_t
tpmi
,
const
uint8_t
uI
,
const
uint8_t
uI
,
int
layer_idx
)
int
layer_idx
)
...
@@ -1050,7 +1050,7 @@ void get_precoder_matrix_coef(char *w,
...
@@ -1050,7 +1050,7 @@ void get_precoder_matrix_coef(char *w,
if
(
num_ue_srs_ports
==
2
)
{
if
(
num_ue_srs_ports
==
2
)
{
*
w
=
table_38211_6_3_1_5_1
[
tpmi
][
uI
][
layer_idx
];
*
w
=
table_38211_6_3_1_5_1
[
tpmi
][
uI
][
layer_idx
];
}
else
{
}
else
{
if
(
transform_precoding
==
NR_PUSCH_Config__transformPrecoder_enabled
)
{
if
(
transform_precoding
&&
*
transform_precoding
==
NR_PUSCH_Config__transformPrecoder_enabled
)
{
*
w
=
table_38211_6_3_1_5_2
[
tpmi
][
uI
][
layer_idx
];
*
w
=
table_38211_6_3_1_5_2
[
tpmi
][
uI
][
layer_idx
];
}
else
{
}
else
{
*
w
=
table_38211_6_3_1_5_3
[
tpmi
][
uI
][
layer_idx
];
*
w
=
table_38211_6_3_1_5_3
[
tpmi
][
uI
][
layer_idx
];
...
@@ -1068,7 +1068,7 @@ void get_precoder_matrix_coef(char *w,
...
@@ -1068,7 +1068,7 @@ void get_precoder_matrix_coef(char *w,
}
}
int
nr_srs_tpmi_estimation
(
const
NR_PUSCH_Config_t
*
pusch_Config
,
int
nr_srs_tpmi_estimation
(
const
NR_PUSCH_Config_t
*
pusch_Config
,
const
uint8_t
transform_precoding
,
const
long
*
transform_precoding
,
const
uint8_t
*
channel_matrix
,
const
uint8_t
*
channel_matrix
,
const
uint8_t
normalized_iq_representation
,
const
uint8_t
normalized_iq_representation
,
const
uint16_t
num_gnb_antenna_elements
,
const
uint16_t
num_gnb_antenna_elements
,
...
@@ -2149,7 +2149,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
...
@@ -2149,7 +2149,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
pusch_pdu
->
qam_mod_order
=
sched_pusch
->
Qm
;
pusch_pdu
->
qam_mod_order
=
sched_pusch
->
Qm
;
pusch_pdu
->
mcs_index
=
sched_pusch
->
mcs
;
pusch_pdu
->
mcs_index
=
sched_pusch
->
mcs
;
pusch_pdu
->
mcs_table
=
current_BWP
->
mcs_table
;
pusch_pdu
->
mcs_table
=
current_BWP
->
mcs_table
;
pusch_pdu
->
transform_precoding
=
current_BWP
->
transform_precoding
;
pusch_pdu
->
transform_precoding
=
current_BWP
->
transform_precoding
?
*
current_BWP
->
transform_precoding
:
1
;
if
(
current_BWP
->
pusch_Config
&&
current_BWP
->
pusch_Config
->
dataScramblingIdentityPUSCH
)
if
(
current_BWP
->
pusch_Config
&&
current_BWP
->
pusch_Config
->
dataScramblingIdentityPUSCH
)
pusch_pdu
->
data_scrambling_id
=
*
current_BWP
->
pusch_Config
->
dataScramblingIdentityPUSCH
;
pusch_pdu
->
data_scrambling_id
=
*
current_BWP
->
pusch_Config
->
dataScramblingIdentityPUSCH
;
else
else
...
@@ -2174,7 +2174,9 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
...
@@ -2174,7 +2174,9 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
}
}
else
{
else
{
pusch_pdu
->
ul_dmrs_scrambling_id
=
*
scc
->
physCellId
;
pusch_pdu
->
ul_dmrs_scrambling_id
=
*
scc
->
physCellId
;
if
(
NR_DMRS_UplinkConfig
&&
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
nPUSCH_Identity
!=
NULL
)
if
(
NR_DMRS_UplinkConfig
&&
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
&&
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
nPUSCH_Identity
!=
NULL
)
pusch_pdu
->
pusch_identity
=
*
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
nPUSCH_Identity
;
pusch_pdu
->
pusch_identity
=
*
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
nPUSCH_Identity
;
else
if
(
NR_DMRS_UplinkConfig
)
else
if
(
NR_DMRS_UplinkConfig
)
pusch_pdu
->
pusch_identity
=
*
scc
->
physCellId
;
pusch_pdu
->
pusch_identity
=
*
scc
->
physCellId
;
...
@@ -2231,13 +2233,15 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
...
@@ -2231,13 +2233,15 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
pusch_pdu
->
dfts_ofdm
.
low_papr_group_number
=
pusch_pdu
->
pusch_identity
%
30
;
pusch_pdu
->
dfts_ofdm
.
low_papr_group_number
=
pusch_pdu
->
pusch_identity
%
30
;
// V as specified in section 6.4.1.1.1.2 in 38.211 V = 0 if sequence hopping and group hopping are disabled
// V as specified in section 6.4.1.1.1.2 in 38.211 V = 0 if sequence hopping and group hopping are disabled
if
((
NR_DMRS_UplinkConfig
==
NULL
)
||
((
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
sequenceGroupHopping
==
NULL
)
&&
if
((
!
NR_DMRS_UplinkConfig
||
(
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
sequenceHopping
==
NULL
)))
!
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
||
(
!
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
sequenceGroupHopping
&&
!
NR_DMRS_UplinkConfig
->
transformPrecodingEnabled
->
sequenceHopping
))
&&
!
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
->
groupHoppingEnabledTransformPrecoding
)
pusch_pdu
->
dfts_ofdm
.
low_papr_sequence_number
=
0
;
pusch_pdu
->
dfts_ofdm
.
low_papr_sequence_number
=
0
;
else
else
AssertFatal
(
1
==
0
,
"
SequenceGroupHopping or sequenceHopping are NOT Supported
\n
"
);
AssertFatal
(
1
==
0
,
"
Hopping mode is not supported in transform precoding
\n
"
);
LOG_
D
(
NR_MAC
,
"TRANSFORM PRECODING IS ENABLED. CDM groups: %d, U: %d MCS table: %d
\n
"
,
pusch_pdu
->
num_dmrs_cdm_grps_no_data
,
pusch_pdu
->
dfts_ofdm
.
low_papr_group_number
,
current_BWP
->
mcs_table
);
LOG_
I
(
NR_MAC
,
"TRANSFORM PRECODING IS ENABLED. CDM groups: %d, U: %d MCS table: %d
\n
"
,
pusch_pdu
->
num_dmrs_cdm_grps_no_data
,
pusch_pdu
->
dfts_ofdm
.
low_papr_group_number
,
current_BWP
->
mcs_table
);
}
}
/*-----------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------*/
...
...
openair2/RRC/NR/nr_rrc_config.c
View file @
7db8dce5
...
@@ -1048,10 +1048,6 @@ struct NR_SetupRelease_PUSCH_Config *config_pusch(NR_PUSCH_Config_t *pusch_Confi
...
@@ -1048,10 +1048,6 @@ struct NR_SetupRelease_PUSCH_Config *config_pusch(NR_PUSCH_Config_t *pusch_Confi
pusch_Config
->
mcs_Table
=
NULL
;
pusch_Config
->
mcs_Table
=
NULL
;
pusch_Config
->
mcs_TableTransformPrecoder
=
NULL
;
pusch_Config
->
mcs_TableTransformPrecoder
=
NULL
;
pusch_Config
->
transformPrecoder
=
NULL
;
pusch_Config
->
transformPrecoder
=
NULL
;
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
==
NULL
)
{
pusch_Config
->
transformPrecoder
=
calloc
(
1
,
sizeof
(
*
pusch_Config
->
transformPrecoder
));
*
pusch_Config
->
transformPrecoder
=
NR_PUSCH_Config__transformPrecoder_disabled
;
}
pusch_Config
->
codebookSubset
=
calloc
(
1
,
sizeof
(
*
pusch_Config
->
codebookSubset
));
pusch_Config
->
codebookSubset
=
calloc
(
1
,
sizeof
(
*
pusch_Config
->
codebookSubset
));
*
pusch_Config
->
codebookSubset
=
NR_PUSCH_Config__codebookSubset_nonCoherent
;
*
pusch_Config
->
codebookSubset
=
NR_PUSCH_Config__codebookSubset_nonCoherent
;
asn1cCallocOne
(
pusch_Config
->
maxRank
,
1
);
asn1cCallocOne
(
pusch_Config
->
maxRank
,
1
);
...
...
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