Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
b61d3d95
Commit
b61d3d95
authored
Jun 17, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set mcs from csi report
parent
4cb1d607
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
129 additions
and
61 deletions
+129
-61
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+64
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+57
-58
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+4
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+3
-2
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
b61d3d95
...
@@ -601,7 +601,7 @@ void pf_dl(module_id_t module_id,
...
@@ -601,7 +601,7 @@ void pf_dl(module_id_t module_id,
continue
;
continue
;
/* Calculate coeff */
/* Calculate coeff */
s
ched_pdsch
->
mcs
=
9
;
s
et_dl_mcs
(
sched_pdsch
,
sched_ctrl
,
ps
->
mcsTableIdx
)
;
uint32_t
tbs
=
pf_tbs
[
ps
->
mcsTableIdx
][
sched_pdsch
->
mcs
];
uint32_t
tbs
=
pf_tbs
[
ps
->
mcsTableIdx
][
sched_pdsch
->
mcs
];
coeff_ue
[
UE_id
]
=
(
float
)
tbs
/
thr_ue
[
UE_id
];
coeff_ue
[
UE_id
]
=
(
float
)
tbs
/
thr_ue
[
UE_id
];
LOG_D
(
NR_MAC
,
"b %d, thr_ue[%d] %f, tbs %d, coeff_ue[%d] %f
\n
"
,
LOG_D
(
NR_MAC
,
"b %d, thr_ue[%d] %f, tbs %d, coeff_ue[%d] %f
\n
"
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
b61d3d95
...
@@ -112,6 +112,20 @@ uint8_t nr_ss_first_symb_idx_scs_120_120_mux3[4] = {4,8,2,6};
...
@@ -112,6 +112,20 @@ uint8_t nr_ss_first_symb_idx_scs_120_120_mux3[4] = {4,8,2,6};
uint8_t
nr_max_number_of_candidates_per_slot
[
4
]
=
{
44
,
36
,
22
,
20
};
uint8_t
nr_max_number_of_candidates_per_slot
[
4
]
=
{
44
,
36
,
22
,
20
};
uint8_t
nr_max_number_of_cces_per_slot
[
4
]
=
{
56
,
56
,
48
,
32
};
uint8_t
nr_max_number_of_cces_per_slot
[
4
]
=
{
56
,
56
,
48
,
32
};
// CQI TABLES
// Table 1 (38.214 5.2.2.1-2)
uint16_t
cqi_table1
[
16
][
2
]
=
{{
0
,
0
},{
2
,
78
},{
2
,
120
},{
2
,
193
},{
2
,
308
},{
2
,
449
},{
2
,
602
},{
4
,
378
},
{
4
,
490
},{
4
,
616
},{
6
,
466
},{
6
,
567
},{
6
,
666
},{
6
,
772
},{
6
,
873
},{
6
,
948
}};
// Table 2 (38.214 5.2.2.1-3)
uint16_t
cqi_table2
[
16
][
2
]
=
{{
0
,
0
},{
2
,
78
},{
2
,
193
},{
2
,
449
},{
4
,
378
},{
4
,
490
},{
4
,
616
},{
6
,
466
},
{
6
,
567
},{
6
,
666
},{
6
,
772
},{
6
,
873
},{
8
,
711
},{
8
,
797
},{
8
,
885
},{
8
,
948
}};
// Table 2 (38.214 5.2.2.1-4)
uint16_t
cqi_table3
[
16
][
2
]
=
{{
0
,
0
},{
2
,
30
},{
2
,
50
},{
2
,
78
},{
2
,
120
},{
2
,
193
},{
2
,
308
},{
2
,
449
},
{
2
,
602
},{
4
,
378
},{
4
,
490
},{
4
,
616
},{
6
,
466
},{
6
,
567
},{
6
,
666
},{
6
,
772
}};
static
inline
uint8_t
get_max_candidates
(
uint8_t
scs
)
{
static
inline
uint8_t
get_max_candidates
(
uint8_t
scs
)
{
AssertFatal
(
scs
<
4
,
"Invalid PDCCH subcarrier spacing %d
\n
"
,
scs
);
AssertFatal
(
scs
<
4
,
"Invalid PDCCH subcarrier spacing %d
\n
"
,
scs
);
return
(
nr_max_number_of_candidates_per_slot
[
scs
]);
return
(
nr_max_number_of_candidates_per_slot
[
scs
]);
...
@@ -122,6 +136,55 @@ static inline uint8_t get_max_cces(uint8_t scs) {
...
@@ -122,6 +136,55 @@ static inline uint8_t get_max_cces(uint8_t scs) {
return
(
nr_max_number_of_cces_per_slot
[
scs
]);
return
(
nr_max_number_of_cces_per_slot
[
scs
]);
}
}
void
set_dl_mcs
(
NR_sched_pdsch_t
*
sched_pdsch
,
NR_UE_sched_ctrl_t
*
sched_ctrl
,
uint8_t
mcs_table_idx
)
{
if
(
sched_ctrl
->
set_mcs
)
{
// TODO for wideband case and multiple TB
int
cqi_idx
=
sched_ctrl
->
CSI_report
.
choice
.
cri_ri_li_pmi_cqi_report
.
wb_cqi_1tb
;
uint16_t
target_coderate
,
target_qm
;
if
(
cqi_idx
>
0
)
{
int
cqi_table
=
sched_ctrl
->
CSI_report
.
choice
.
cri_ri_li_pmi_cqi_report
.
cqi_table
;
AssertFatal
(
cqi_table
==
mcs_table_idx
,
"Indices of MCS tables don't correspond
\n
"
);
switch
(
cqi_table
)
{
case
0
:
target_qm
=
cqi_table1
[
cqi_idx
][
0
];
target_coderate
=
cqi_table1
[
cqi_idx
][
0
];
break
;
case
1
:
target_qm
=
cqi_table2
[
cqi_idx
][
0
];
target_coderate
=
cqi_table2
[
cqi_idx
][
0
];
break
;
case
2
:
target_qm
=
cqi_table3
[
cqi_idx
][
0
];
target_coderate
=
cqi_table3
[
cqi_idx
][
0
];
break
;
default:
AssertFatal
(
1
==
0
,
"Invalid cqi table index %d
\n
"
,
cqi_table
);
}
int
max_mcs
=
28
;
int
R
,
Qm
;
if
(
mcs_table_idx
==
1
)
max_mcs
=
27
;
for
(
int
i
=
0
;
i
<=
max_mcs
;
i
++
)
{
R
=
nr_get_code_rate_dl
(
i
,
mcs_table_idx
);
Qm
=
nr_get_Qm_dl
(
i
,
mcs_table_idx
);
if
((
Qm
==
target_qm
)
&&
(
target_coderate
<=
R
))
{
sched_pdsch
->
mcs
=
i
;
break
;
}
}
}
else
// default value
sched_pdsch
->
mcs
=
9
;
sched_ctrl
->
set_mcs
=
FALSE
;
}
}
NR_ControlResourceSet_t
*
get_coreset
(
NR_ServingCellConfigCommon_t
*
scc
,
NR_ControlResourceSet_t
*
get_coreset
(
NR_ServingCellConfigCommon_t
*
scc
,
NR_BWP_Downlink_t
*
bwp
,
NR_BWP_Downlink_t
*
bwp
,
NR_SearchSpace_t
*
ss
,
NR_SearchSpace_t
*
ss
,
...
@@ -1839,6 +1902,7 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
...
@@ -1839,6 +1902,7 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
compute_csi_bitlen
(
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
csi_MeasConfig
->
choice
.
setup
,
UE_info
,
UE_id
,
mod_idP
);
compute_csi_bitlen
(
CellGroup
->
spCellConfig
->
spCellConfigDedicated
->
csi_MeasConfig
->
choice
.
setup
,
UE_info
,
UE_id
,
mod_idP
);
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
memset
(
sched_ctrl
,
0
,
sizeof
(
*
sched_ctrl
));
memset
(
sched_ctrl
,
0
,
sizeof
(
*
sched_ctrl
));
sched_ctrl
->
set_mcs
=
TRUE
;
sched_ctrl
->
ta_frame
=
0
;
sched_ctrl
->
ta_frame
=
0
;
sched_ctrl
->
ta_update
=
31
;
sched_ctrl
->
ta_update
=
31
;
sched_ctrl
->
ta_apply
=
false
;
sched_ctrl
->
ta_apply
=
false
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
b61d3d95
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
b61d3d95
...
@@ -415,6 +415,10 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
...
@@ -415,6 +415,10 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
void
find_SSB_and_RO_available
(
module_id_t
module_idP
);
void
find_SSB_and_RO_available
(
module_id_t
module_idP
);
void
set_dl_mcs
(
NR_sched_pdsch_t
*
sched_pdsch
,
NR_UE_sched_ctrl_t
*
sched_ctrl
,
uint8_t
mcs_table_idx
);
void
calculate_preferred_dl_tda
(
module_id_t
module_id
,
const
NR_BWP_Downlink_t
*
bwp
);
void
calculate_preferred_dl_tda
(
module_id_t
module_id
,
const
NR_BWP_Downlink_t
*
bwp
);
void
calculate_preferred_ul_tda
(
module_id_t
module_id
,
const
NR_BWP_Uplink_t
*
ubwp
);
void
calculate_preferred_ul_tda
(
module_id_t
module_id
,
const
NR_BWP_Uplink_t
*
ubwp
);
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
b61d3d95
...
@@ -441,6 +441,7 @@ struct CRI_RI_LI_PMI_CQI {
...
@@ -441,6 +441,7 @@ struct CRI_RI_LI_PMI_CQI {
uint8_t
pmi_x2
;
uint8_t
pmi_x2
;
uint8_t
wb_cqi_1tb
;
uint8_t
wb_cqi_1tb
;
uint8_t
wb_cqi_2tb
;
uint8_t
wb_cqi_2tb
;
uint8_t
cqi_table
;
};
};
typedef
struct
CRI_SSB_RSRP
{
typedef
struct
CRI_SSB_RSRP
{
...
@@ -573,9 +574,9 @@ typedef struct {
...
@@ -573,9 +574,9 @@ typedef struct {
int
pusch_consecutive_dtx_cnt
;
int
pusch_consecutive_dtx_cnt
;
int
pucch_consecutive_dtx_cnt
;
int
pucch_consecutive_dtx_cnt
;
int
ul_failure
;
int
ul_failure
;
struct
CSI_Report
CSI_report
[
MAX_CSI_REPORTS
]
;
struct
CSI_Report
CSI_report
;
bool
SR
;
bool
SR
;
bool
set_mcs
;
/// information about every HARQ process
/// information about every HARQ process
NR_UE_harq_t
harq_processes
[
NR_MAX_NB_HARQ_PROCESSES
];
NR_UE_harq_t
harq_processes
[
NR_MAX_NB_HARQ_PROCESSES
];
/// HARQ processes that are free
/// HARQ processes that are free
...
...
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