gnb: force CSI-cfg to use same table as PDSCH-MCS

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

apps/gnb/gnb_appconfig_translators.cpp

@@ -320,6 +320,28 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
 
     // CSI related parameters.
     if (out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.has_value()) {
+      // Set CQI table according to the MCS table used for PDSCH.
+      if (not out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list.empty()) {
+        if (out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list[0].cqi_table.has_value()) {
+          out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list[0].cqi_table.reset();
+        }
+        out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list[0].cqi_table.emplace();
+        switch (base_cell.pdsch_cfg.mcs_table) {
+          case pdsch_mcs_table::qam64:
+            out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list[0].cqi_table =
+                csi_report_config::cqi_table_t::table1;
+            break;
+          case pdsch_mcs_table::qam256:
+            out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list[0].cqi_table =
+                csi_report_config::cqi_table_t::table2;
+            break;
+          case pdsch_mcs_table::qam64LowSe:
+            out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().csi_report_cfg_list[0].cqi_table =
+                csi_report_config::cqi_table_t::table3;
+            break;
+        }
+      }
+
       for (auto& nzp_csi_res : out_cell.ue_ded_serv_cell_cfg.csi_meas_cfg.value().nzp_csi_rs_res_list) {
         nzp_csi_res.pwr_ctrl_offset = base_cell.csi_cfg.pwr_ctrl_offset;
       }

include/srsran/ran/csi_rs/csi_report_config.h

@@ -165,8 +165,9 @@ struct csi_report_config {
     bool operator!=(const report_frequency_config& rhs) const { return !(rhs == *this); }
   };
 
-  /// \brief Which CQI table to use for CQI calculation.
+  /// \brief CQI table to use for CQI calculation.
   /// \remark See TS 38.331, \c cqi-Table in \c CSI-ReportConfig and TS 38.214, clause 5.2.2.1.
+  /// \remark Value \c table4 is for Rel.16 or above only.
   enum class cqi_table_t { table1, table2, table3, table4 };
 
   /// Indicates one out of two possible BWP-dependent values for the subband size as indicated in TS 38.214,