sched: add subband cqi info interface to LTE scheduler

lib/include/srsran/interfaces/enb_mac_interfaces.h

@@ -124,6 +124,18 @@ public:
    */
   virtual int cqi_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t cqi_value) = 0;
 
+  /**
+   * PHY callback for giving MAC the Channel Quality information of a given RNTI, TTI, eNb cell/carrier for a specific
+   * subband
+   * @param tti the given TTI
+   * @param rnti the UE identifier in the eNb
+   * @param cc_idx The eNb Cell/Carrier where the measurement corresponds
+   * @param sb_idx Index of the Sub-band
+   * @param cqi_value the corresponding Channel Quality Information
+   * @return SRSRAN_SUCCESS if no error occurs, SRSRAN_ERROR* if an error occurs
+   */
+  virtual int sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi_value) = 0;
+
   typedef enum { PUSCH = 0, PUCCH, SRS } ul_channel_t;
 
   /**

lib/include/srsran/interfaces/sched_interface.h

@@ -293,6 +293,7 @@ public:
   virtual int dl_ri_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t ri_value)                 = 0;
   virtual int dl_pmi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t pmi_value)               = 0;
   virtual int dl_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t cqi_value)               = 0;
+  virtual int dl_sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi) = 0;
 
   /* UL information */
   virtual int ul_crc_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, bool crc)                       = 0;

srsenb/hdr/phy/nr/worker_pool.h

@@ -49,6 +49,10 @@ private:
     int ri_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t ri_value) override { return 0; }
     int pmi_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t pmi_value) override { return 0; }
     int cqi_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t cqi_value) override { return 0; }
+    int sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t sb_idx, uint32_t cqi_value) override
+    {
+      return 0;
+    }
     int snr_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, float snr_db, ul_channel_t ch) override { return 0; }
     int ta_info(uint32_t tti, uint16_t rnti, float ta_us) override { return 0; }
     int ack_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t tb_idx, bool ack) override { return 0; }

srsenb/hdr/stack/enb_stack_lte.h

@@ -66,6 +66,10 @@ public:
   {
     return mac.cqi_info(tti, rnti, cc_idx, cqi_value);
   }
+  int sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t sb_idx, uint32_t cqi_value) final
+  {
+    return mac.sb_cqi_info(tti, rnti, cc_idx, sb_idx, cqi_value);
+  }
   int snr_info(uint32_t tti_rx, uint16_t rnti, uint32_t cc_idx, float snr_db, ul_channel_t ch) final
   {
     return mac.snr_info(tti_rx, rnti, cc_idx, snr_db, ch);

srsenb/hdr/stack/mac/mac.h

@@ -56,6 +56,7 @@ public:
   int ri_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t ri_value) override;
   int pmi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t pmi_value) override;
   int cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t cqi_value) override;
+  int sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi_value) override;
   int snr_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, float snr, ul_channel_t ch) override;
   int ta_info(uint32_t tti, uint16_t rnti, float ta_us) override;
   int ack_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t tb_idx, bool ack) override;

srsenb/hdr/stack/mac/sched.h

@@ -61,6 +61,7 @@ public:
   int dl_ri_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t ri_value) final;
   int dl_pmi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t pmi_value) final;
   int dl_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t cqi_value) final;
+  int dl_sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi_value) final;
   int ul_crc_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, bool crc) final;
   int ul_sr_info(uint32_t tti, uint16_t rnti) override;
   int ul_bsr(uint16_t rnti, uint32_t lcg_id, uint32_t bsr) final;

srsenb/hdr/stack/mac/sched_ue.h

@@ -60,6 +60,7 @@ public:
   void set_dl_ri(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t ri);
   void set_dl_pmi(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t ri);
   void set_dl_cqi(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t cqi);
+  void set_dl_sb_cqi(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi);
   int  set_ack_info(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t tb_idx, bool ack);
   void set_ul_crc(tti_point tti_rx, uint32_t enb_cc_idx, bool crc_res);
 

srsenb/hdr/stack/mac/sched_ue_ctrl/sched_ue_cell.h

@@ -34,6 +34,7 @@ struct sched_ue_cell {
   void finish_tti(tti_point tti_rx);
 
   int set_dl_wb_cqi(tti_point tti_rx, uint32_t dl_cqi_);
+  int set_dl_sb_cqi(tti_point tti_rx, uint32_t sb_idx, uint32_t dl_cqi_);
 
   bool             configured() const { return ue_cc_idx >= 0; }
   int              get_ue_cc_idx() const { return ue_cc_idx; }
@@ -80,6 +81,8 @@ struct sched_ue_cell {
   int      fixed_mcs_ul = 0, fixed_mcs_dl = 0;
 
 private:
+  void check_cc_activation(uint32_t dl_cqi);
+
   // args
   srslog::basic_logger&            logger;
   const sched_interface::ue_cfg_t* ue_cfg = nullptr;

srsenb/src/stack/mac/mac.cc

@@ -392,6 +392,19 @@ int mac::cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t cqi
   return SRSRAN_SUCCESS;
 }
 
+int mac::sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi_value)
+{
+  logger.set_context(tti);
+  srsran::rwlock_read_guard lock(rwlock);
+
+  if (not check_ue_active(rnti)) {
+    return SRSRAN_ERROR;
+  }
+
+  scheduler.dl_sb_cqi_info(tti, rnti, enb_cc_idx, sb_idx, cqi_value);
+  return SRSRAN_SUCCESS;
+}
+
 int mac::snr_info(uint32_t tti_rx, uint16_t rnti, uint32_t enb_cc_idx, float snr, ul_channel_t ch)
 {
   logger.set_context(tti_rx);

srsenb/src/stack/mac/sched.cc

@@ -209,6 +209,13 @@ int sched::dl_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_
       rnti, [tti, enb_cc_idx, cqi_value](sched_ue& ue) { ue.set_dl_cqi(tti_point{tti}, enb_cc_idx, cqi_value); });
 }
 
+int sched::dl_sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi_value)
+{
+  return ue_db_access_locked(rnti, [tti, enb_cc_idx, cqi_value, sb_idx](sched_ue& ue) {
+    ue.set_dl_sb_cqi(tti_point{tti}, enb_cc_idx, sb_idx, cqi_value);
+  });
+}
+
 int sched::dl_rach_info(uint32_t enb_cc_idx, dl_sched_rar_info_t rar_info)
 {
   std::lock_guard<std::mutex> lock(sched_mutex);

srsenb/src/stack/mac/sched_ue.cc

@@ -275,11 +275,12 @@ void sched_ue::set_dl_pmi(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t pmi)
 
 void sched_ue::set_dl_cqi(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t cqi)
 {
-  if (cells[enb_cc_idx].cc_state() != cc_st::idle) {
   cells[enb_cc_idx].set_dl_wb_cqi(tti_rx, cqi);
-  } else {
-    logger.warning("Received DL CQI for invalid enb cell index %d", enb_cc_idx);
 }
+
+void sched_ue::set_dl_sb_cqi(tti_point tti_rx, uint32_t enb_cc_idx, uint32_t sb_idx, uint32_t cqi)
+{
+  cells[enb_cc_idx].set_dl_sb_cqi(tti_rx, sb_idx, cqi);
 }
 
 void sched_ue::set_ul_snr(tti_point tti_rx, uint32_t enb_cc_idx, float snr, uint32_t ul_ch_code)

srsenb/src/stack/mac/sched_ue_ctrl/sched_ue_cell.cc

@@ -165,15 +165,28 @@ void sched_ue_cell::finish_tti(tti_point tti_rx)
   harq_ent.finish_tti(tti_rx);
 }
 
-int sched_ue_cell::set_dl_wb_cqi(tti_point tti_rx, uint32_t dl_cqi_)
+void sched_ue_cell::check_cc_activation(uint32_t dl_cqi)
 {
-  CHECK_VALID_CC("DL CQI");
+  if (ue_cc_idx > 0 and cc_state_ == cc_st::activating and dl_cqi > 0) {
-  dl_cqi_ctxt.cqi_wb_info(tti_rx, dl_cqi_);
-  if (ue_cc_idx > 0 and cc_state_ == cc_st::activating and dl_cqi_ > 0) {
     // Wait for SCell to receive a positive CQI before activating it
     cc_state_ = cc_st::active;
     logger.info("SCHED: SCell index=%d is now active", ue_cc_idx);
   }
+}
+
+int sched_ue_cell::set_dl_wb_cqi(tti_point tti_rx, uint32_t dl_cqi_)
+{
+  CHECK_VALID_CC("DL CQI");
+  dl_cqi_ctxt.cqi_wb_info(tti_rx, dl_cqi_);
+  check_cc_activation(dl_cqi_);
+  return SRSRAN_SUCCESS;
+}
+
+int sched_ue_cell::set_dl_sb_cqi(tti_point tti_rx, uint32_t sb_idx, uint32_t dl_cqi_)
+{
+  CHECK_VALID_CC("DL CQI");
+  dl_cqi_ctxt.cqi_sb_info(tti_rx, sb_idx, dl_cqi_);
+  check_cc_activation(dl_cqi_);
   return SRSRAN_SUCCESS;
 }
 

srsenb/test/phy/enb_phy_test.cc

@@ -283,6 +283,7 @@ private:
   CALLBACK(ri_info);
   CALLBACK(pmi_info);
   CALLBACK(cqi_info);
+  CALLBACK(sb_cqi_info);
   CALLBACK(snr_info);
   CALLBACK(ta_info);
   CALLBACK(ack_info);
@@ -461,6 +462,13 @@ public:
 
     return SRSRAN_SUCCESS;
   }
+  int sb_cqi_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, uint32_t sb_idx, uint32_t cqi_value) override
+  {
+    notify_sb_cqi_info();
+    logger.info("Received CQI tti=%d; rnti=0x%x; cc_idx=%d; sb_idx=%d cqi=%d;", tti, rnti, cc_idx, sb_idx, cqi_value);
+
+    return SRSRAN_SUCCESS;
+  }
   int snr_info(uint32_t tti, uint16_t rnti, uint32_t cc_idx, float snr_db, ul_channel_t ch) override
   {
     notify_snr_info();