Merge branch 'next' into next_testers

lib/include/srslte/phy/common/phy_common.h

@@ -242,6 +242,9 @@ SRSLTE_API uint32_t srslte_N_ta_new_rar(uint32_t ta);
 SRSLTE_API uint32_t srslte_N_ta_new(uint32_t N_ta_old, 
                                     uint32_t ta);
 
+SRSLTE_API float srslte_coderate(uint32_t tbs,
+                                 uint32_t nof_re);
+
 SRSLTE_API char *srslte_cp_string(srslte_cp_t cp); 
 
 SRSLTE_API char *srslte_mod_string(srslte_mod_t mod);

lib/include/srslte/phy/phch/pdsch.h

@@ -93,9 +93,6 @@ SRSLTE_API int srslte_pdsch_set_rnti(srslte_pdsch_t *q,
 SRSLTE_API void srslte_pdsch_free_rnti(srslte_pdsch_t *q, 
                                       uint16_t rnti);
 
-SRSLTE_API float srslte_pdsch_coderate(uint32_t tbs, 
-                                       uint32_t nof_re); 
-
 SRSLTE_API int srslte_pdsch_cfg(srslte_pdsch_cfg_t *cfg,
                                 srslte_cell_t cell, 
                                 srslte_ra_dl_grant_t *grant, 

lib/src/phy/common/phy_common.c

@@ -178,6 +178,11 @@ uint32_t srslte_N_ta_new(uint32_t N_ta_old, uint32_t ta) {
   }
 }
 
+float srslte_coderate(uint32_t tbs, uint32_t nof_re)
+{
+  return (float) (tbs + 24)/(nof_re);
+}
+
 /* Returns the new time advance as indicated by the random access response 
  * as specified in Section 4.2.3 of 36.213 */
 uint32_t srslte_N_ta_new_rar(uint32_t ta) {

lib/src/phy/phch/pdsch.c

@@ -58,11 +58,6 @@ extern int indices[100000];
 extern int indices_ptr; 
 #endif
 
-float srslte_pdsch_coderate(uint32_t tbs, uint32_t nof_re) 
-{
-  return (float) (tbs + 24)/(nof_re);
-}
-
 int srslte_pdsch_cp(srslte_pdsch_t *q, cf_t *input, cf_t *output, srslte_ra_dl_grant_t *grant, uint32_t lstart_grant, uint32_t nsubframe, bool put)
 {
   uint32_t s, n, l, lp, lstart, lend, nof_refs;

srsenb/enb.conf.example

@@ -121,7 +121,7 @@ enable = false
 #pdsch_mcs        = -1
 #pdsch_max_mcs    = -1
 #pusch_mcs        = -1
-pusch_max_mcs    = 16
+#pusch_max_mcs    = -1
 nof_ctrl_symbols = 2
 
 #####################################################################

srsenb/hdr/mac/scheduler_ue.h

@@ -131,8 +131,10 @@ private:
   int        alloc_pdu(int tbs, sched_interface::dl_sched_pdu_t* pdu);
 
   static uint32_t format1_count_prb(uint32_t bitmask, uint32_t cell_nof_prb); 
-  static int cqi_to_tbs(uint32_t cqi, uint32_t nof_prb, uint32_t nof_re, uint32_t max_mcs, uint32_t *mcs);
+  static int cqi_to_tbs(uint32_t cqi, uint32_t nof_prb, uint32_t nof_re, uint32_t max_mcs, uint32_t max_Qm, uint32_t *mcs);
-  static int alloc_tbs(uint32_t cqi, uint32_t nof_prb, uint32_t nof_re, uint32_t req_bytes, uint32_t max_mcs, int *mcs); 
+  int alloc_tbs_dl(uint32_t nof_prb, uint32_t nof_re, uint32_t req_bytes, int *mcs);
+  int alloc_tbs_ul(uint32_t nof_prb, uint32_t nof_re, uint32_t req_bytes, int *mcs);
+  int alloc_tbs(uint32_t nof_prb, uint32_t nof_re, uint32_t req_bytes, bool is_ul, int *mcs);
   
   static bool bearer_is_ul(ue_bearer_t *lch);
   static bool bearer_is_dl(ue_bearer_t *lch);

srsenb/sib.conf.example

@@ -60,7 +60,7 @@ sib2 =
             n_sb = 1;
             hopping_mode = "inter-subframe";
             pusch_hopping_offset = 2;
-            enable_64_qam = false;
+            enable_64_qam = false; // 64QAM PUSCH is not currently enabled
             ul_rs = 
             {
                 cyclic_shift = 0; 

srsenb/src/mac/scheduler_ue.cc

@@ -395,7 +395,7 @@ int sched_ue::generate_format1(dl_harq_proc *h,
     uint32_t nof_ctrl_symbols = cfi+(cell.nof_prb<10?1:0);
     uint32_t nof_re = srslte_ra_dl_grant_nof_re(&grant, cell, sf_idx, nof_ctrl_symbols);
     if (fixed_mcs_dl < 0) {
-      tbs = alloc_tbs(dl_cqi, nof_prb, nof_re, req_bytes, max_mcs_dl, &mcs);      
+      tbs = alloc_tbs_dl(nof_prb, nof_re, req_bytes, &mcs);
     } else {
       tbs = srslte_ra_tbs_from_idx(srslte_ra_tbs_idx_from_mcs(fixed_mcs_dl), nof_prb);
       mcs = fixed_mcs_dl; 
@@ -466,7 +466,7 @@ int sched_ue::generate_format0(ul_harq_proc *h,
     uint32_t N_srs = 0; 
     uint32_t nof_re = (2*(SRSLTE_CP_NSYMB(cell.cp)-1) - N_srs)*allocation.L*SRSLTE_NRE;
     if (fixed_mcs_ul < 0) {
-      tbs = alloc_tbs(ul_cqi, allocation.L, nof_re, req_bytes, max_mcs_ul, &mcs);      
+      tbs = alloc_tbs_ul(allocation.L, nof_re, req_bytes, &mcs);
     } else {
       tbs = srslte_ra_tbs_from_idx(srslte_ra_tbs_idx_from_mcs(fixed_mcs_ul), allocation.L);
       mcs = fixed_mcs_ul;
@@ -610,7 +610,7 @@ uint32_t sched_ue::get_required_prb_dl(uint32_t req_bytes, uint32_t nof_ctrl_sym
   for (n=1;n<cell.nof_prb && nbytes < req_bytes;n++) {
     nof_re = srslte_ra_dl_approx_nof_re(cell, n, nof_ctrl_symbols);
     if (fixed_mcs_dl < 0) {
-      tbs = alloc_tbs(dl_cqi, n, nof_re, 0, max_mcs_dl, &mcs);      
+      tbs = alloc_tbs_dl(n, nof_re, 0, &mcs);
     } else {
       tbs = srslte_ra_tbs_from_idx(srslte_ra_tbs_idx_from_mcs(fixed_mcs_dl), n);
     }
@@ -639,7 +639,7 @@ uint32_t sched_ue::get_required_prb_ul(uint32_t req_bytes)
     uint32_t nof_re = (2*(SRSLTE_CP_NSYMB(cell.cp)-1) - N_srs)*n*SRSLTE_NRE;
     int tbs = 0; 
     if (fixed_mcs_ul < 0) {
-      tbs = alloc_tbs(ul_cqi, n, nof_re, 0, max_mcs_ul, &mcs);      
+      tbs = alloc_tbs_ul(n, nof_re, 0, &mcs);
     } else {
       tbs = srslte_ra_tbs_from_idx(srslte_ra_tbs_idx_from_mcs(fixed_mcs_ul), n);
     }
@@ -760,36 +760,60 @@ uint32_t sched_ue::format1_count_prb(uint32_t bitmask, uint32_t cell_nof_prb) {
   return nof_prb; 
 }
 
-int sched_ue::cqi_to_tbs(uint32_t cqi, uint32_t nof_prb, uint32_t nof_re, uint32_t max_mcs, uint32_t *mcs) {
+int sched_ue::cqi_to_tbs(uint32_t cqi, uint32_t nof_prb, uint32_t nof_re, uint32_t max_mcs, uint32_t max_Qm, uint32_t *mcs) {
   float max_coderate = srslte_cqi_to_coderate(cqi);
   int sel_mcs = max_mcs+1; 
   float coderate = 99;
+  float eff_coderate = 99;
+  uint32_t Qm = 1;
   int tbs = 0; 
 
   do {
     sel_mcs--; 
     uint32_t tbs_idx = srslte_ra_tbs_idx_from_mcs(sel_mcs);
     tbs = srslte_ra_tbs_from_idx(tbs_idx, nof_prb);
-    coderate = srslte_pdsch_coderate(tbs, nof_re);     
+    coderate = srslte_coderate(tbs, nof_re);
-  } while(sel_mcs > 0 && coderate >= max_coderate);
+    Qm = SRSLTE_MIN(max_Qm, srslte_mod_bits_x_symbol(srslte_ra_mod_from_mcs(sel_mcs)));
+    eff_coderate = coderate/Qm;
+  } while((sel_mcs > 0 && coderate > max_coderate) || eff_coderate > 0.930);
   if (mcs) {
     *mcs = (uint32_t) sel_mcs; 
   }
   return tbs; 
 }
 
-/* In this scheduler we tend to use all the available bandwidth and select the MCS 
+int sched_ue::alloc_tbs_dl(uint32_t nof_prb,
+                        uint32_t nof_re,
+                        uint32_t req_bytes,
+                        int *mcs)
+{
+  return alloc_tbs(nof_prb, nof_re, req_bytes, false, mcs);
+}
+
+int sched_ue::alloc_tbs_ul(uint32_t nof_prb,
+                           uint32_t nof_re,
+                           uint32_t req_bytes,
+                           int *mcs)
+{
+  return alloc_tbs(nof_prb, nof_re, req_bytes, true, mcs);
+}
+
+  /* In this scheduler we tend to use all the available bandwidth and select the MCS
  * that approximates the minimum between the capacity and the requested rate 
  */
-int sched_ue::alloc_tbs(uint32_t cqi, 
+int sched_ue::alloc_tbs(uint32_t nof_prb,
-                              uint32_t nof_prb, 
                         uint32_t nof_re,
                         uint32_t req_bytes,
-                              uint32_t max_mcs, 
+                        bool is_ul,
                         int *mcs)
 {
   uint32_t sel_mcs = 0;
-  int tbs = cqi_to_tbs(cqi, nof_prb, nof_re, max_mcs, &sel_mcs)/8;
+
+  uint32_t cqi     = is_ul?ul_cqi:dl_cqi;
+  uint32_t max_mcs = is_ul?max_mcs_ul:max_mcs_dl;
+  uint32_t max_Qm  = is_ul?4:6; // Allow 16-QAM in PUSCH Only
+
+  int tbs = cqi_to_tbs(cqi, nof_prb, nof_re, max_mcs, max_Qm, &sel_mcs)/8;
   
   /* If less bytes are requested, lower the MCS */
   if (tbs > (int) req_bytes && req_bytes > 0) {

srsenb/src/main.cc

@@ -130,7 +130,7 @@ void parse_args(all_args_t *args, int argc, char* argv[]) {
         bpo::value<int>(&args->expert.mac.sched.pusch_mcs)->default_value(-1),
         "Optional fixed PUSCH MCS (ignores reported CQIs if specified)")
     ("scheduler.pusch_max_mcs",
-        bpo::value<int>(&args->expert.mac.sched.pusch_max_mcs)->default_value(16),
+        bpo::value<int>(&args->expert.mac.sched.pusch_max_mcs)->default_value(-1),
         "Optional PUSCH MCS limit")
     ("scheduler.nof_ctrl_symbols",
         bpo::value<int>(&args->expert.mac.sched.nof_ctrl_symbols)->default_value(3),

srsenb/src/phy/phch_worker.cc

@@ -49,6 +49,8 @@ using namespace std;
 #ifdef ENABLE_GUI
 #include "srsgui/srsgui.h"
 #include <semaphore.h>
+#include <srslte/phy/phch/ra.h>
+
 void init_plots(srsenb::phch_worker *worker);
 pthread_t plot_thread; 
 sem_t plot_sem; 
@@ -363,6 +365,10 @@ int phch_worker::decode_pusch(srslte_enb_ul_pusch_t *grants, uint32_t nof_pusch,
       srslte_ra_ul_grant_t phy_grant; 
       int res = -1;
       if (!srslte_ra_ul_dci_to_grant(&grants[i].grant, enb_ul.cell.nof_prb, n_rb_ho, &phy_grant, tti%8)) {
+        if (phy_grant.mcs.mod == SRSLTE_MOD_64QAM) {
+          phy_grant.mcs.mod = SRSLTE_MOD_16QAM;
+        }
+        phy_grant.Qm = SRSLTE_MIN(phy_grant.Qm, 4);
         res = srslte_enb_ul_get_pusch(&enb_ul, &phy_grant, grants[i].softbuffer,
                                                 rnti, grants[i].rv_idx, 
                                                 grants[i].current_tx_nb,