Merge remote-tracking branch 'origin/NR_PHR_improvements' into integration_2023_w07

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -1373,7 +1373,7 @@ void nr_ue_max_mcs_min_rb(int mu, int ph_limit, NR_sched_pusch_t *sched_pusch, N
                                    sched_pusch->dmrs_info.N_PRB_DMRS*sched_pusch->dmrs_info.num_dmrs_symb,
                                    deltaMCS);
 
-  while (ph_limit < tx_power && *Rb >= minRb) {
+  while (ph_limit < tx_power && *Rb > minRb) {
     (*Rb)--;
     tbs_bits = nr_compute_tbs(Qm, R, *Rb,
                               sched_pusch->tda_info.nrOfSymbols,
@@ -1390,7 +1390,7 @@ void nr_ue_max_mcs_min_rb(int mu, int ph_limit, NR_sched_pusch_t *sched_pusch, N
                                  deltaMCS);
   }
 
-  while (ph_limit < tx_power && *mcs > 6) {
+  while (ph_limit < tx_power && *mcs > 0) {
     (*mcs)--;
     update_ul_ue_R_Qm(*mcs, ul_bwp->mcs_table, ul_bwp->pusch_Config, &R, &Qm);
     tbs_bits = nr_compute_tbs(Qm, R, *Rb,