From 10247cfbed390e8becb8cf2bc4587be07e8ee5ad Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Tue, 14 Oct 2025 14:52:13 +0200
Subject: [PATCH] taking into account maximum number of layers for PUSCH
 supported by the UE for TBSlbrm

---
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c |  5 ++---
 openair2/LAYER2/NR_MAC_gNB/nr_radio_config.c     | 11 ++++++++---
 openair2/LAYER2/NR_MAC_gNB/nr_radio_config.h     |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 3f546d41b4..7488161ab7 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -2375,10 +2375,9 @@ nfapi_nr_pusch_pdu_t *prepare_pusch_pdu(nfapi_nr_ul_tti_request_t *future_ul_tti
     long *maxMIMO_Layers = UE->sc_info.maxMIMO_Layers_PUSCH;
     if (!maxMIMO_Layers && ul_bwp && ul_bwp->pusch_Config)
       maxMIMO_Layers = ul_bwp->pusch_Config->maxRank;
+    long lbrm_layers = maxMIMO_Layers ? *maxMIMO_Layers : ue_supported_ul_layers(UE->capability);
     AssertFatal (maxMIMO_Layers != NULL,"Option with max MIMO layers not configured is not supported\n");
-    pusch_pdu->maintenance_parms_v3.tbSizeLbrmBytes = nr_compute_tbslbrm(ul_bwp->mcs_table,
-                                                                         UE->sc_info.ul_bw_tbslbrm,
-                                                                         *maxMIMO_Layers);
+    pusch_pdu->maintenance_parms_v3.tbSizeLbrmBytes = nr_compute_tbslbrm(ul_bwp->mcs_table, UE->sc_info.ul_bw_tbslbrm, lbrm_layers);
   }
   /* PUSCH PTRS */
   if (sched_pusch->dmrs_info.ptrsConfig) {
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.c b/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.c
index 4ba5cc6fd9..3d0e3ed246 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.c
@@ -3739,10 +3739,11 @@ NR_CellGroupConfig_t *get_initial_cellGroupConfig(int uid,
   return cellGroupConfig;
 }
 
-static long set_ul_max_layers(const nr_mac_config_t *configuration, const NR_UE_NR_Capability_t *uecap)
+long ue_supported_ul_layers(const NR_UE_NR_Capability_t *uecap)
 {
   long ul_max_layers = 1;
-  if (uecap && uecap->featureSets
+  if (uecap
+      && uecap->featureSets
       && uecap->featureSets->featureSetsUplinkPerCC
       && uecap->featureSets->featureSetsUplinkPerCC->list.count > 0) {
     NR_FeatureSetUplinkPerCC_t *ul_feature_setup_per_cc = uecap->featureSets->featureSetsUplinkPerCC->list.array[0];
@@ -3758,11 +3759,15 @@ static long set_ul_max_layers(const nr_mac_config_t *configuration, const NR_UE_
           ul_max_layers = 1;
       }
     }
-    ul_max_layers = min(ul_max_layers, configuration->pusch_AntennaPorts);
   }
   return ul_max_layers;
 }
 
+static long set_ul_max_layers(const nr_mac_config_t *configuration, const NR_UE_NR_Capability_t *uecap)
+{
+  return min(ue_supported_ul_layers(uecap), configuration->pusch_AntennaPorts);
+}
+
 NR_CellGroupConfig_t * update_cellGroupConfig_for_BWP_switch(NR_CellGroupConfig_t *cellGroupConfig,
                                                              const nr_mac_config_t *configuration,
                                                              const NR_UE_NR_Capability_t *uecap,
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.h b/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.h
index 9a556dc5ea..270aed4b71 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_radio_config.h
@@ -134,5 +134,6 @@ NR_CellGroupConfig_t * update_cellGroupConfig_for_BWP_switch(NR_CellGroupConfig_
 NR_MeasurementTimingConfiguration_t *get_nr_mtc(uint8_t *buf, uint32_t len);
 measgap_config_t create_measgap_config(const NR_MeasurementTimingConfiguration_t *mtc, int scs, int min_rxtxtime);
 int encode_measgap_config(const measgap_config_t *c, uint8_t *buf);
+long ue_supported_ul_layers(const NR_UE_NR_Capability_t *uecap);
 long ue_supported_dl_layers(const NR_ServingCellConfigCommon_t *scc, const NR_UE_NR_Capability_t *uecap);
 #endif