From 86f4d8c18f626bf62acf8b49fc72b2d03307990e Mon Sep 17 00:00:00 2001
From: Rajeev Gangula <gangula@eurecom.fr>
Date: Mon, 20 Aug 2018 14:17:19 +0200
Subject: [PATCH] Remiving CQI scheduling on special SFs.
---
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c | 32 ++++++++++++++++------
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c | 20 ++++++++++++--
2 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
index 1acf657220..eda84adbab 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
@@ -1696,9 +1696,9 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
// this is the normalized RX power
eNB_UE_stats = &UE_list->eNB_UE_stats[CC_id][UE_id];
- /* TODO: fix how we deal with power, unit is not dBm, it's special from nfapi */
- normalized_rx_power = ue_sched_ctl->pucch1_snr[CC_id];
- target_rx_power = 208;
+ /* Unit is not dBm, it's special from nfapi */
+ normalized_rx_power = (5*ue_sched_ctl->pucch1_snr[CC_id]-640)/10+30;//(+eNB->measurements.n0_power_dB[0])
+ target_rx_power= eNB->puCch10xSnr/10 + 30;//(+eNB->measurements.n0_power_dB[0])
// this assumes accumulated tpc
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
@@ -2690,9 +2690,25 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
if (status < RRC_CONNECTED)
cqi_req = 0;
else if (UE_sched_ctrl->cqi_req_timer>30) {
- cqi_req = 1;
- UE_sched_ctrl->cqi_req_timer=0;
- UE_sched_ctrl->cqi_req_flag |= 1 << sched_subframeP;
+ cqi_req = 1;
+ // To be safe , do not ask CQI in special SFs:36.213/7.2.3 CQI definition
+ if (cc->tdd_Config) {
+ switch (cc->tdd_Config->subframeAssignment) {
+ case 1:
+ if( subframeP == 1 || subframeP == 6 ) cqi_req=0;
+ break;
+ case 3:
+ if( subframeP == 1 ) cqi_req=0;
+ break;
+ default:
+ LOG_E(MAC," TDD config not supported\n");
+ break;
+ }
+ }
+ if(cqi_req == 1){
+ UE_sched_ctrl->cqi_req_timer=0;
+ UE_sched_ctrl->cqi_req_flag |= 1 << sched_subframeP;
+ }
}
else
cqi_req = 0;
@@ -2701,8 +2717,8 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
//compute the expected ULSCH RX power (for the stats)
// this is the normalized RX power and this should be constant (regardless of mcs
- normalized_rx_power = UE_sched_ctrl->pusch_snr[CC_id];
- target_rx_power = 178;
+ normalized_rx_power = (5*UE_sched_ctrl->pusch_snr[CC_id]-640)/10+30; //(+eNB->measurements.n0_power_dB[0])
+ target_rx_power= eNB->puSch10xSnr/10 + 30; //(+eNB->measurements.n0_power_dB[0])
// this assumes accumulated tpc
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 04415a8386..caed575b48 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -1337,10 +1337,24 @@ schedule_ulsch_rnti(module_id_t module_idP,
if (status >= RRC_CONNECTED && UE_sched_ctrl->cqi_req_timer > 30) {
if (UE_sched_ctrl->cqi_received == 0) {
if (nfapi_mode) {
- cqi_req = 0;
+ cqi_req = 0;
} else {
- cqi_req = 1;
- UE_sched_ctrl->cqi_req_flag |= 1 << sched_subframeP;
+ cqi_req = 1;
+ // To be safe , do not ask CQI in special Subframes:36.213/7.2.3 CQI definition
+ if (cc[CC_id].tdd_Config) {
+ switch (cc[CC_id].tdd_Config->subframeAssignment) {
+ case 1:
+ if( subframeP == 1 || subframeP == 6 ) cqi_req=0;
+ break;
+ case 3:
+ if( subframeP == 1 ) cqi_req=0;
+ break;
+ default:
+ LOG_E(MAC," TDD config not supported\n");
+ break;
+ }
+ }
+ if(cqi_req == 1) UE_sched_ctrl->cqi_req_flag |= 1 << sched_subframeP;
}
}
else if (UE_sched_ctrl->cqi_received == 1) {
--
GitLab