diff --git a/common/utils/nr/nr_common.c b/common/utils/nr/nr_common.c
index 8ba4633604a5933d7245d3656b0c754b849f47bf..4c76721bbd91a2856fa4e1718ed92831af6dadd6 100644
--- a/common/utils/nr/nr_common.c
+++ b/common/utils/nr/nr_common.c
@@ -230,7 +230,6 @@ uint32_t nr_get_code_rate(uint8_t Imcs, uint8_t table_idx) {
}
}
-
int get_dmrs_port(int nl, uint16_t dmrs_ports) {
if (dmrs_ports == 0) return 0; // dci 1_0
@@ -249,7 +248,6 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports) {
return p;
}
-
int get_subband_size(int NPRB,int size) {
// implements table 5.2.1.4-2 from 36.214
//
diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 05ccf1655ae2f00eff473342ee03837d360eb171..2f88211440349e1f8f527d31ddf18caa4a008e57 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -126,7 +126,6 @@ void tx_func(void *param) {
slot_tx,
1);
info->slot = -1;
- if ((frame_tx&127) == 0) dump_pdsch_stats(gNB);
// If the later of the 2 L1 tx thread finishes first,
// we wait for the earlier one to finish and start the RU thread
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
index e1bb2579eb056cfb686307bea53ddf7a893890ba..84b5f346a785e752e1676187c5c3a7db390f6a29 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
@@ -404,7 +404,7 @@ typedef struct {
double scaling_factor_S;
int8_t accumulated_delta_PUCCH;
uint8_t n_dmrs_cdm_groups;
- uint8_t dmrs_ports[10];
+ uint16_t dmrs_ports;
uint8_t n_front_load_symb;
uint8_t tci_state;
fapi_nr_dl_srs_config_t srs_config;
diff --git a/openair1/PHY/INIT/nr_init_ru.c b/openair1/PHY/INIT/nr_init_ru.c
index 4024ed16172ebf2ae87f7bdb4469458f6d2a7ce1..d032746718b215e190288af832a6815677cc074e 100644
--- a/openair1/PHY/INIT/nr_init_ru.c
+++ b/openair1/PHY/INIT/nr_init_ru.c
@@ -124,32 +124,32 @@ int nr_phy_init_RU(RU_t *ru) {
ru->num_gNB,NUMBER_OF_gNB_MAX);
LOG_I(PHY,"[INIT] %s() ru->num_gNB:%d \n", __FUNCTION__, ru->num_gNB);
-
- if (ru->do_precoding == 1) {
+ if (ru->do_precoding == 1) {
int beam_count = 0;
if (ru->nb_tx>1) {//Enable beamforming when nb_tx > 1
+
for (p=0;p<ru->nb_log_antennas;p++) {
//if ((fp->L_ssb >> (63-p)) & 0x01)//64 bit-map with the MSB @2â¶Â³ corresponds to SSB ssb_index 0
beam_count++;
}
AssertFatal(ru->nb_bfw==(beam_count*ru->nb_tx),"Number of beam weights from config file is %d while the expected number is %d",ru->nb_bfw,(beam_count*ru->nb_tx));
- for (i=0; i<ru->num_gNB; i++) {
- int l_ind = 0;
- for (p=0;p<ru->nb_log_antennas;p++) {
+ for (i=0; i<ru->num_gNB; i++) {
+ int l_ind = 0;
+ for (p=0;p<ru->nb_log_antennas;p++) {
//if ((fp->L_ssb >> (63-p)) & 0x01) {
- ru->beam_weights[i][p] = (int32_t **)malloc16_clear(ru->nb_tx*sizeof(int32_t*));
- for (j=0; j<ru->nb_tx; j++) {
- ru->beam_weights[i][p][j] = (int32_t *)malloc16_clear(fp->ofdm_symbol_size*sizeof(int32_t));
- AssertFatal(ru->bw_list[i],"ru->bw_list[%d] is null\n",i);
- for (re=0; re<fp->ofdm_symbol_size; re++)
- ru->beam_weights[i][p][j][re] = ru->bw_list[i][l_ind];
- //printf("Beam Weight %08x for beam %d and tx %d\n",ru->bw_list[i][l_ind],p,j);
- l_ind++;
- } // for j
+ ru->beam_weights[i][p] = (int32_t **)malloc16_clear(ru->nb_tx*sizeof(int32_t*));
+ for (j=0; j<ru->nb_tx; j++) {
+ ru->beam_weights[i][p][j] = (int32_t *)malloc16_clear(fp->ofdm_symbol_size*sizeof(int32_t));
+ AssertFatal(ru->bw_list[i],"ru->bw_list[%d] is null\n",i);
+ for (re=0; re<fp->ofdm_symbol_size; re++)
+ ru->beam_weights[i][p][j][re] = ru->bw_list[i][l_ind];
+ //printf("Beam Weight %08x for beam %d and tx %d\n",ru->bw_list[i][l_ind],p,j);
+ l_ind++;
+ } // for j
//}
- } // for p
- } //for i
+ } // for p
+ } //for i
}
ru->common.beam_id = (uint8_t**)malloc16_clear(ru->nb_tx*sizeof(uint8_t*));
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index ecc2cded11c530c980d693ce80be7e003cf0a696..2b48bbd12d08f61bc450202b0e49076f938ddd67 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -38,6 +38,7 @@
#include "PHY/NR_REFSIG/ptrs_nr.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "LAYER2/NR_MAC_gNB/mac_proto.h"
+#include "common/utils/nr/nr_common.h"
//#define DEBUG_DLSCH
//#define DEBUG_DLSCH_MAPPING
@@ -279,20 +280,21 @@ uint8_t nr_generate_pdsch(processingData_L1tx_t *msgTx,
start_sc, rel15->StartSymbolIndex, rel15->rbSize, nb_re,rel15->nrOfLayers);
#endif
- for (int ap=0; ap<rel15->nrOfLayers; ap++) {
+ for (int nl=0; nl<rel15->nrOfLayers; nl++) {
- // DMRS params for this ap
- get_Wt(Wt, ap, dmrs_Type);
- get_Wf(Wf, ap, dmrs_Type);
- delta = get_delta(ap, dmrs_Type);
- l_prime = 0; // single symbol ap 0
+ int dmrs_port = get_dmrs_port(nl,rel15->dmrsPorts);
+ // DMRS params for this dmrs port
+ get_Wt(Wt, dmrs_port, dmrs_Type);
+ get_Wf(Wf, dmrs_port, dmrs_Type);
+ delta = get_delta(dmrs_port, dmrs_Type);
+ l_prime = 0; // single symbol nl 0
l0 = get_l0(rel15->dlDmrsSymbPos);
l_overline = l0;
#ifdef DEBUG_DLSCH_MAPPING
uint8_t dmrs_symbol = l0+l_prime;
- printf("DMRS Type %d params for ap %d: Wt %d %d \t Wf %d %d \t delta %d \t l_prime %d \t l0 %d\tDMRS symbol %d\n",
- 1+dmrs_Type,ap, Wt[0], Wt[1], Wf[0], Wf[1], delta, l_prime, l0, dmrs_symbol);
+ printf("DMRS Type %d params for nl %d: Wt %d %d \t Wf %d %d \t delta %d \t l_prime %d \t l0 %d\tDMRS symbol %d\n",
+ 1+dmrs_Type,nl, Wt[0], Wt[1], Wf[0], Wf[1], delta, l_prime, l0, dmrs_symbol);
#endif
uint16_t m=0, dmrs_idx=0;
@@ -366,7 +368,7 @@ uint8_t nr_generate_pdsch(processingData_L1tx_t *msgTx,
if(ptrs_symbol){
is_ptrs_re = is_ptrs_subcarrier(k,
rel15->rnti,
- ap,
+ nl,
rel15->dmrsConfigType,
rel15->PTRSFreqDensity,
rel15->rbSize,
@@ -377,12 +379,12 @@ uint8_t nr_generate_pdsch(processingData_L1tx_t *msgTx,
/* Map DMRS Symbol */
if ( ( dmrs_symbol_map & (1 << l) ) && (k == ((start_sc+get_dmrs_freq_idx(n, k_prime, delta, dmrs_Type))%(frame_parms->ofdm_symbol_size)))) {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[dmrs_idx<<1]) >> 15;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[(dmrs_idx<<1) + 1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[dmrs_idx<<1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[(dmrs_idx<<1) + 1]) >> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("dmrs_idx %d\t l %d \t k %d \t k_prime %d \t n %d \t txdataF: %d %d\n",
- dmrs_idx, l, k, k_prime, n, txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)],
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)]);
+ dmrs_idx, l, k, k_prime, n, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)],
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)]);
#endif
dmrs_idx++;
k_prime++;
@@ -391,30 +393,30 @@ uint8_t nr_generate_pdsch(processingData_L1tx_t *msgTx,
}
/* Map PTRS Symbol */
else if(is_ptrs_re){
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = (beta_ptrs*amp*mod_ptrs[ptrs_idx<<1]) >> 15;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = (beta_ptrs*amp*mod_ptrs[(ptrs_idx<<1) + 1])>> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = (beta_ptrs*amp*mod_ptrs[ptrs_idx<<1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = (beta_ptrs*amp*mod_ptrs[(ptrs_idx<<1) + 1])>> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("ptrs_idx %d\t l %d \t k %d \t k_prime %d \t n %d \t txdataF: %d %d\n",
- ptrs_idx, l, k, k_prime, n, ((int16_t*)txdataF[ap])[((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)],
- ((int16_t*)txdataF[ap])[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)]);
+ ptrs_idx, l, k, k_prime, n, ((int16_t*)txdataF_precoding[nl])[((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)],
+ ((int16_t*)txdataF_precoding[nl])[((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)]);
#endif
ptrs_idx++;
}
/* Map DATA Symbol */
else if( (!(dmrs_symbol_map & (1 << l))) || allowed_xlsch_re_in_dmrs_symbol(k,start_sc,frame_parms->ofdm_symbol_size,rel15->numDmrsCdmGrpsNoData,dmrs_Type)) {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = (amp * tx_layers[ap][m<<1]) >> 15;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = (amp * tx_layers[ap][(m<<1) + 1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = (amp * tx_layers[nl][m<<1]) >> 15;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = (amp * tx_layers[nl][(m<<1) + 1]) >> 15;
#ifdef DEBUG_DLSCH_MAPPING
printf("m %d\t l %d \t k %d \t txdataF: %d %d\n",
- m, l, k, txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)],
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)]);
+ m, l, k, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)],
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)]);
#endif
m++;
}
/* mute RE */
else {
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = 0;
- txdataF_precoding[ap][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = 0;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + (2*txdataF_offset)] = 0;
+ txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 + (2*txdataF_offset)] = 0;
}
if (++k >= frame_parms->ofdm_symbol_size)
k -= frame_parms->ofdm_symbol_size;
diff --git a/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c b/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
index e6a9b8c5dc979cc611b1748fa9e0e8d2610df46b..159f1172f899bd14145682e9fa8081fa98534378 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
@@ -92,6 +92,6 @@ uint8_t get_l0(uint16_t dlDmrsSymbPos) {
if ((mask&1) == 1) break;
mask>>=1;
}
- AssertFatal(l0 < 4,"impossible l0 %d\n",l0);
+ AssertFatal(l0 < 4,"impossible l0 %d, dlDmrsSymbPos %x\n",l0,dlDmrsSymbPos);
return (l0);
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
index 8bbf569814795d36cb6ad4d94134264126ad6a4a..a855ca813e9246f8b84d9240475311fd96246968 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
@@ -370,8 +370,8 @@ void nr_processULSegment(void* arg) {
rv_index,
ulsch_harq->new_rx,
E,
- ulsch_harq->F,
- Kr-ulsch_harq->F-2*(p_decoderParms->Z))==-1) {
+ ulsch_harq->F,
+ Kr-ulsch_harq->F-2*(p_decoderParms->Z))==-1) {
stop_meas(&phy_vars_gNB->ulsch_rate_unmatching_stats);
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
index b4ee4f5b41d047483cdd90afa7491a225072d478..ebe194d1758a434d7c0836836865edb6a675bddb 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
@@ -272,6 +272,8 @@ typedef struct {
uint8_t dmrsConfigType;
// Number of DMRS CDM groups with no data
uint8_t n_dmrs_cdm_groups;
+ /// DMRS ports bitmap
+ uint16_t dmrs_ports;
/// Starting Symbol number
uint16_t start_symbol;
/// Current subband PMI allocation
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index 0bfb524902d16725be839acc0e1aabb374d7e132..f5b9da8273f3b759483a8b47c1f3218fb2cc1f0b 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -94,7 +94,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame,int slot,nfapi_nr_
nr_generate_pss(gNB->d_pss, &txdataF[0][txdataF_offset], AMP, ssb_start_symbol, cfg, fp);
nr_generate_sss(gNB->d_sss, &txdataF[0][txdataF_offset], AMP, ssb_start_symbol, cfg, fp);
- if (cfg->carrier_config.num_tx_ant.value <= 4)
+ if (fp->Lmax == 4)
nr_generate_pbch_dmrs(gNB->nr_gold_pbch_dmrs[n_hf][ssb_index&7],&txdataF[0][txdataF_offset], AMP, ssb_start_symbol, cfg, fp);
else
nr_generate_pbch_dmrs(gNB->nr_gold_pbch_dmrs[0][ssb_index&7],&txdataF[0][txdataF_offset], AMP, ssb_start_symbol, cfg, fp);
@@ -200,7 +200,7 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
//apply the OFDM symbol rotation here
for (aa=0; aa<cfg->carrier_config.num_tx_ant.value; aa++) {
- apply_nr_rotation(fp,(int16_t*) &gNB->common_vars.txdataF[aa][txdataF_offset],slot,0,fp->Ncp==EXTENDED?12:14,fp->ofdm_symbol_size);
+ apply_nr_rotation(fp,(int16_t*) &gNB->common_vars.txdataF[aa][txdataF_offset],slot,0,fp->Ncp==EXTENDED?12:14,fp->ofdm_symbol_size);
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_TX+offset,0);
diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index 697f5b19d10f3b5e8effa4958a8ba5dfa854f80d..b29055db62104c75c844b31397e90ac05d7d4925 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -119,13 +119,14 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
dlsch0_harq->dlDmrsSymbPos = dlsch_config_pdu->dlDmrsSymbPos;
dlsch0_harq->dmrsConfigType = dlsch_config_pdu->dmrsConfigType;
dlsch0_harq->n_dmrs_cdm_groups = dlsch_config_pdu->n_dmrs_cdm_groups;
+ dlsch0_harq->dmrs_ports = dlsch_config_pdu->dmrs_ports;
dlsch0_harq->mcs = dlsch_config_pdu->mcs;
dlsch0_harq->rvidx = dlsch_config_pdu->rv;
dlsch0->g_pucch = dlsch_config_pdu->accumulated_delta_PUCCH;
//get nrOfLayers from DCI info
uint8_t Nl = 0;
- for (i = 0; i < 4; i++) {
- if (dlsch_config_pdu->dmrs_ports[i] >= i) Nl += 1;
+ for (i = 0; i < 12; i++) { // max 12 ports
+ if ((dlsch_config_pdu->dmrs_ports>>i)&0x01) Nl += 1;
}
dlsch0_harq->Nl = Nl;
dlsch0_harq->mcs_table=dlsch_config_pdu->mcs_table;
@@ -142,7 +143,8 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
dlsch0_harq->nEpreRatioOfPDSCHToPTRS = dlsch_config_pdu->nEpreRatioOfPDSCHToPTRS;
dlsch0_harq->PTRSReOffset = dlsch_config_pdu->PTRSReOffset;
dlsch0_harq->pduBitmap = dlsch_config_pdu->pduBitmap;
- LOG_D(MAC, ">>>> \tdlsch0->g_pucch = %d\tdlsch0_harq.mcs = %d\n", dlsch0->g_pucch, dlsch0_harq->mcs);
+ LOG_D(MAC, ">>>> \tdlsch0->g_pucch = %d\tdlsch0_harq.mcs = %d\n",
+ dlsch0->g_pucch, dlsch0_harq->mcs);
}
}
}
diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index bf12fe4f39ba526d127a5503a662e6aec74a10f7..0abc6c45f2efc70561c2a1da7edf5983de03d4ed 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -781,7 +781,8 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int gNB_
uint16_t s1 = dlsch0_harq->nb_symbols;
bool is_SI = dlsch0->rnti_type == _SI_RNTI_;
- LOG_D(PHY,"[UE %d] PDSCH type %d active in nr_slot_rx %d, harq_pid %d (%d), rb_start %d, nb_rb %d, symbol_start %d, nb_symbols %d, DMRS mask %x\n",ue->Mod_id,pdsch,nr_slot_rx,harq_pid,dlsch0_harq->status,pdsch_start_rb,pdsch_nb_rb,s0,s1,dlsch0_harq->dlDmrsSymbPos);
+ LOG_D(PHY,"[UE %d] PDSCH type %d active in nr_slot_rx %d, harq_pid %d (%d), rb_start %d, nb_rb %d, symbol_start %d, nb_symbols %d, DMRS mask %x\n",
+ ue->Mod_id,pdsch,nr_slot_rx,harq_pid,dlsch0_harq->status,pdsch_start_rb,pdsch_nb_rb,s0,s1,dlsch0_harq->dlDmrsSymbPos);
for (m = s0; m < (s0 +s1); m++) {
if (dlsch0_harq->dlDmrsSymbPos & (1 << m)) {
@@ -791,7 +792,7 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int gNB_
gNB_id,
is_SI,
nr_slot_rx,
- aatx /*p*/,
+ get_dmrs_port(aatx,dlsch0_harq->dmrs_ports),
m,
BWPStart,
ue->frame_parms.first_carrier_offset+(BWPStart + pdsch_start_rb)*12,
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index 83d662583017dadc28de44dd900f786c6c54eac6..9029c23664219751338ce742175a059a464f2c70 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -277,7 +277,8 @@ void nr_dlsim_preprocessor(module_id_t module_id,
sched_ctrl->active_bwp,
NULL,
/* tda = */ 2,
- dci_format,
+ g_nrOfLayers,
+ sched_ctrl,
ps);
NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
@@ -287,6 +288,7 @@ void nr_dlsim_preprocessor(module_id_t module_id,
/* the following might override the table that is mandated by RRC
* configuration */
ps->mcsTableIdx = g_mcsTableIdx;
+ ps->nrOfLayers = g_nrOfLayers;
sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
@@ -765,7 +767,7 @@ int main(int argc, char **argv)
prepare_scd(scd);
- fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 0, 0, 0);
+ fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 0, 0);
/* RRC parameter validation for secondaryCellGroup */
fix_scd(scd);
@@ -1194,6 +1196,7 @@ int main(int argc, char **argv)
}
nr_ue_dcireq(&dcireq); //to be replaced with function pointer later
+ UE_harq_process->Nl = g_nrOfLayers;
nr_ue_scheduled_response(&scheduled_response);
phy_procedures_nrUE_RX(UE,
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 69316d6b884c21dab4290b0e505dff962799f462..f49693c2f59a5b4e099a3ea5cdc2298492b19f28 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -713,7 +713,7 @@ int main(int argc, char **argv)
prepare_scd(scd);
- fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 0, 0, 0);
+ fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, n_tx, 0, 0);
// xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void*)secondaryCellGroup);
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
index 3750bb156d8fa97395349cac6f7c9060d55f6a2c..972d241f96a0a45c8d3dd5f83d0e12b62867ed1f 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -2523,10 +2523,6 @@ int get_num_dmrs(uint16_t dmrs_mask ) {
for (int i=0;i<16;i++) num_dmrs+=((dmrs_mask>>i)&1);
return(num_dmrs);
}
-/* returns the total DMRS symbols in a slot*/
-uint8_t get_num_dmrs_symbols(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,int NrOfSymbols, int startSymbol, int mappingtype){
- return get_num_dmrs(fill_dmrs_mask(pdsch_Config,dmrs_TypeA_Position,NrOfSymbols, startSymbol, mappingtype));
-}
// Table 5.1.2.2.1-1 38.214
uint8_t getRBGSize(uint16_t bwp_size, long rbg_size_config) {
@@ -3248,9 +3244,9 @@ int is_nr_UL_slot(NR_TDD_UL_DL_ConfigCommon_t *tdd_UL_DL_ConfigurationCommon, sl
else return(slot_in_period >= slots1+tdd_UL_DL_ConfigurationCommon->pattern2->nrofDownlinkSlots ? 1 : 0);
}
-int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,int NrOfSymbols, int startSymbol, int mappingtype_fromDCI) {
+int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,int NrOfSymbols, int startSymbol, int mappingtype_fromDCI, int length) {
- int l0;int dmrs_AdditionalPosition = 0;int maxLength = 0;
+ int l0;int dmrs_AdditionalPosition = 0;
NR_DMRS_DownlinkConfig_t *dmrs_config = NULL;
LOG_D(MAC, "NrofSymbols:%d, startSymbol:%d, mappingtype:%d, dmrs_TypeA_Position:%d\n", NrOfSymbols, startSymbol, mappingtype_fromDCI, dmrs_TypeA_Position);
@@ -3262,7 +3258,6 @@ int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,i
// in case of DCI FORMAT 1_0 or dedicated pdsch config not received additionposition = pos2, len1 should be used
// referred to section 5.1.6.2 in 38.214
dmrs_AdditionalPosition = 2;
- maxLength = 1;
if (pdsch_Config != NULL) {
if (mappingtype_fromDCI == typeA) { // Type A
@@ -3277,8 +3272,7 @@ int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,i
AssertFatal(dmrs_config != NULL," DMRS configs not present in PDSCH DMRS Downlink config\n");
- // default values of maxlength = len2, additionalposition is pos2
- if (dmrs_config->maxLength != NULL) maxLength = 2;
+ // default values of additionalposition is pos2
if (dmrs_config->dmrs_AdditionalPosition != NULL) dmrs_AdditionalPosition = *dmrs_config->dmrs_AdditionalPosition;
}
@@ -3293,11 +3287,6 @@ int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,i
// For TypeB, ld is the duration of the scheduled PDSCH resources
ld = (mappingtype_fromDCI == typeA) ? (NrOfSymbols + startSymbol) : NrOfSymbols;
- // Section 7.4.1.1.2 in Spec 38.211
- //For PDSCH Mapping typeB, if PDSCH duration ld <=4, only single symbol DMRS is supported
- if (mappingtype_fromDCI == typeB && ld <= 4)
- maxLength = 1;
-
AssertFatal(ld > 2 && ld < 15,"Illegal NrOfSymbols according to Table 5.1.2.1-1 Spec 38.214 %d\n",ld);
AssertFatal((NrOfSymbols + startSymbol) < 15,"Illegal S+L according to Table 5.1.2.1-1 Spec 38.214 S:%d L:%d\n",startSymbol, NrOfSymbols);
@@ -3314,7 +3303,8 @@ int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,i
}
- if (maxLength == 1) {
+ // number of front loaded symbols
+ if (length == 1) {
row = ld - 2;
l_prime = table_7_4_1_1_2_3_pdsch_dmrs_positions_l[row][column];
l0 = 1 << l0;
@@ -3325,7 +3315,7 @@ int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,i
l0 = 1<<l0 | 1<<(l0+1);
}
- LOG_D(MAC, "l0:%d, ld:%d,row:%d, column:%d, addpos:%d, maxlen:%d\n", l0, ld, row, column, dmrs_AdditionalPosition, maxLength);
+ LOG_D(MAC, "l0:%d, ld:%d,row:%d, column:%d, addpos:%d, maxlen:%d\n", l0, ld, row, column, dmrs_AdditionalPosition, length);
AssertFatal(l_prime>=0,"ERROR in configuration.Check Time Domain allocation of this Grant. l_prime < 1. row:%d, column:%d\n", row, column);
l_prime = (mappingtype_fromDCI == typeA) ? (l_prime | l0) : (l_prime << startSymbol);
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
index e107553117d5dbe60e3b09f6f34be93b70912a93..33d878f49b92016914b370cfed1b88ef98c91096 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
@@ -47,7 +47,7 @@ uint64_t from_nrarfcn(int nr_bandP, uint8_t scs_index, uint32_t dl_nrarfcn);
uint32_t to_nrarfcn(int nr_bandP, uint64_t dl_CarrierFreq, uint8_t scs_index, uint32_t bw);
-int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,int NrOfSymbols,int startSymbol,int mappingtype_fromDCI);
+int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,int NrOfSymbols,int startSymbol,int mappingtype_fromDCI,int length);
int is_nr_DL_slot(NR_TDD_UL_DL_ConfigCommon_t *tdd_UL_DL_ConfigurationCommon,slot_t slotP);
@@ -183,8 +183,6 @@ bool set_ul_ptrs_values(NR_PTRS_UplinkConfig_t *ul_ptrs_config,
uint8_t *reOffset, uint8_t *maxNumPorts, uint8_t *ulPower,
uint8_t NrOfSymbols);
-uint8_t get_num_dmrs_symbols(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,int NrOfSymbols,int startSymbol,int mappingtype);
-
/* \brief Set the transform precoding according to 6.1.3 of 3GPP TS 38.214 version 16.3.0 Release 16
@param *pusch_config, pointer to pusch config
@param *ubwp pointer to uplink bwp
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_extern.h b/openair2/LAYER2/NR_MAC_UE/mac_extern.h
index e551790f7aa1bd8e67f6bf4924fd6c5237817240..3affa41d51e8234fc2951ab8dd9e4abdacc28aa8 100644
--- a/openair2/LAYER2/NR_MAC_UE/mac_extern.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_extern.h
@@ -57,12 +57,12 @@ extern const uint8_t table_7_3_1_1_2_21[19][4];
extern const uint8_t table_7_3_1_1_2_22[6][5];
extern const uint8_t table_7_3_1_1_2_23[5][6];
extern const uint8_t table_7_3_2_3_3_1[12][5];
-extern const uint8_t table_7_3_2_3_3_2_oneCodeword[31][6];
+extern const uint8_t table_7_3_2_3_3_2_oneCodeword[31][10];
extern const uint8_t table_7_3_2_3_3_2_twoCodeword[4][10];
-extern const uint8_t table_7_3_2_3_3_3_oneCodeword[24][5];
+extern const uint8_t table_7_3_2_3_3_3_oneCodeword[24][7];
extern const uint8_t table_7_3_2_3_3_3_twoCodeword[2][7];
-extern const uint8_t table_7_3_2_3_3_4_oneCodeword[58][6];
-extern const uint8_t table_7_3_2_3_3_4_twoCodeword[6][10];
+extern const uint8_t table_7_3_2_3_3_4_oneCodeword[58][14];
+extern const uint8_t table_7_3_2_3_3_4_twoCodeword[6][14];
extern const uint16_t table_7_2_1[16];
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_vars.c b/openair2/LAYER2/NR_MAC_UE/mac_vars.c
index 383267090f553b052db2ff2ced66f556edbb4cab..b435dd773f7435d0e46697d4b253cf0379182eaa 100644
--- a/openair2/LAYER2/NR_MAC_UE/mac_vars.c
+++ b/openair2/LAYER2/NR_MAC_UE/mac_vars.c
@@ -257,161 +257,161 @@ const uint8_t table_7_3_1_1_2_23[5][6] = {
};
const uint8_t table_7_3_2_3_3_1[12][5] = {
- {1,0,0,0,0},
{1,1,0,0,0},
{1,0,1,0,0},
- {2,0,0,0,0},
+ {1,1,1,0,0},
{2,1,0,0,0},
- {2,2,0,0,0},
- {2,3,0,0,0},
{2,0,1,0,0},
- {2,2,3,0,0},
- {2,0,1,2,0},
- {2,0,1,2,3},
- {2,0,2,0,0}
+ {2,0,0,1,0},
+ {2,0,0,0,1},
+ {2,1,1,0,0},
+ {2,0,0,1,1},
+ {2,1,1,1,0},
+ {2,1,1,1,1},
+ {2,1,0,1,0}
};
-const uint8_t table_7_3_2_3_3_2_oneCodeword[31][6] = {
- {1,0,0,0,0,1},
- {1,1,0,0,0,1},
- {1,0,1,0,0,1},
- {2,0,0,0,0,1},
- {2,1,0,0,0,1},
- {2,2,0,0,0,1},
- {2,3,0,0,0,1},
- {2,0,1,0,0,1},
- {2,2,3,0,0,1},
- {2,0,1,2,0,1},
- {2,0,1,2,3,1},
- {2,0,2,0,0,1},
- {2,0,0,0,0,2},
- {2,1,0,0,0,2},
- {2,2,0,0,0,2},
- {2,3,0,0,0,2},
- {2,4,0,0,0,2},
- {2,5,0,0,0,2},
- {2,6,0,0,0,2},
- {2,7,0,0,0,2},
- {2,0,1,0,0,2},
- {2,2,3,0,0,2},
- {2,4,5,0,0,2},
- {2,6,7,0,0,2},
- {2,0,4,0,0,2},
- {2,2,6,0,0,2},
- {2,0,1,4,0,2},
- {2,2,3,6,0,2},
- {2,0,1,4,5,2},
- {2,2,3,6,7,2},
- {2,0,2,4,6,2}
+const uint8_t table_7_3_2_3_3_2_oneCodeword[31][10] = {
+ {1,1,0,0,0,0,0,0,0,1},
+ {1,0,1,0,0,0,0,0,0,1},
+ {1,1,1,0,0,0,0,0,0,1},
+ {2,1,0,0,0,0,0,0,0,1},
+ {2,0,1,0,0,0,0,0,0,1},
+ {2,0,0,1,0,0,0,0,0,1},
+ {2,0,0,0,1,0,0,0,0,1},
+ {2,1,1,0,0,0,0,0,0,1},
+ {2,0,0,1,1,0,0,0,0,1},
+ {2,1,1,1,0,0,0,0,0,1},
+ {2,1,1,1,1,0,0,0,0,1},
+ {2,1,0,1,0,0,0,0,0,1},
+ {2,1,0,0,0,0,0,0,0,2},
+ {2,0,1,0,0,0,0,0,0,2},
+ {2,0,0,1,0,0,0,0,0,2},
+ {2,0,0,0,1,0,0,0,0,2},
+ {2,0,0,0,0,1,0,0,0,2},
+ {2,0,0,0,0,0,1,0,0,2},
+ {2,0,0,0,0,0,0,1,0,2},
+ {2,0,0,0,0,0,0,0,1,2},
+ {2,1,1,0,0,0,0,0,0,2},
+ {2,0,0,1,1,0,0,0,0,2},
+ {2,0,0,0,0,1,1,0,0,2},
+ {2,0,0,0,0,0,0,1,1,2},
+ {2,1,0,0,0,1,0,0,0,2},
+ {2,0,0,1,0,0,0,1,0,2},
+ {2,1,1,0,0,1,0,0,0,2},
+ {2,0,0,1,1,0,0,1,0,2},
+ {2,1,1,0,0,1,1,0,0,2},
+ {2,0,0,1,1,0,0,1,1,2},
+ {2,1,0,1,0,1,0,1,0,2}
};
const uint8_t table_7_3_2_3_3_2_twoCodeword[4][10] = {
- {2,0,1,2,3,4,0,0,0,2},
- {2,0,1,2,3,4,6,0,0,2},
- {2,0,1,2,3,4,5,6,0,2},
- {2,0,1,2,3,4,5,6,7,2}
+ {2,1,1,1,1,1,0,0,0,2},
+ {2,1,1,1,1,1,0,1,0,2},
+ {2,1,1,1,1,1,1,1,0,2},
+ {2,1,1,1,1,1,1,1,1,2}
};
-const uint8_t table_7_3_2_3_3_3_oneCodeword[24][5] = {
- {1,0,0,0,0},
- {1,1,0,0,0},
- {1,0,1,0,0},
- {2,0,0,0,0},
- {2,1,0,0,0},
- {2,2,0,0,0},
- {2,3,0,0,0},
- {2,0,1,0,0},
- {2,2,3,0,0},
- {2,0,1,2,0},
- {2,0,1,2,3},
- {3,0,0,0,0},
- {3,1,0,0,0},
- {3,2,0,0,0},
- {3,3,0,0,0},
- {3,4,0,0,0},
- {3,5,0,0,0},
- {3,0,1,0,0},
- {3,2,3,0,0},
- {3,4,5,0,0},
- {3,0,1,2,0},
- {3,3,4,5,0},
- {3,0,1,2,3},
- {2,0,2,0,0}
+const uint8_t table_7_3_2_3_3_3_oneCodeword[24][7] = {
+ {1,1,0,0,0,0,0},
+ {1,0,1,0,0,0,0},
+ {1,1,1,0,0,0,0},
+ {2,1,0,0,0,0,0},
+ {2,0,1,0,0,0,0},
+ {2,0,0,1,0,0,0},
+ {2,0,0,0,1,0,0},
+ {2,1,1,0,0,0,0},
+ {2,0,0,1,1,0,0},
+ {2,1,1,1,0,0,0},
+ {2,1,1,1,1,0,0},
+ {3,1,0,0,0,0,0},
+ {3,0,1,0,0,0,0},
+ {3,0,0,1,0,0,0},
+ {3,0,0,0,1,0,0},
+ {3,0,0,0,0,1,0},
+ {3,0,0,0,0,0,1},
+ {3,1,1,0,0,0,0},
+ {3,0,0,1,1,0,0},
+ {3,0,0,0,0,1,1},
+ {3,1,1,1,0,0,0},
+ {3,0,0,0,1,1,1},
+ {3,1,1,1,1,0,0},
+ {3,1,0,1,0,0,0}
};
const uint8_t table_7_3_2_3_3_3_twoCodeword[2][7] = {
- {3,0,1,2,3,4,0},
- {3,0,1,2,3,4,5}
+ {3,1,1,1,1,1,0},
+ {3,1,1,1,1,1,1}
};
-const uint8_t table_7_3_2_3_3_4_oneCodeword[58][6] = {
- {1,0,0,0,0,1},
- {1,1,0,0,0,1},
- {1,0,1,0,0,1},
- {2,0,0,0,0,1},
- {2,1,0,0,0,1},
- {2,2,0,0,0,1},
- {2,3,0,0,0,1},
- {2,0,1,0,0,1},
- {2,2,3,0,0,1},
- {2,0,1,2,0,1},
- {2,0,1,2,3,1},
- {3,0,0,0,0,1},
- {3,1,0,0,0,1},
- {3,2,0,0,0,1},
- {3,3,0,0,0,1},
- {3,4,0,0,0,1},
- {3,5,0,0,0,1},
- {3,0,1,0,0,1},
- {3,2,3,0,0,1},
- {3,4,5,0,0,1},
- {3,0,1,2,0,1},
- {3,3,4,5,0,1},
- {3,0,1,2,3,1},
- {2,0,2,0,0,1},
- {3,0,0,0,0,2},
- {3,1,0,0,0,2},
- {3,2,0,0,0,2},
- {3,3,0,0,0,2},
- {3,4,0,0,0,2},
- {3,5,0,0,0,2},
- {3,6,0,0,0,2},
- {3,7,0,0,0,2},
- {3,8,0,0,0,2},
- {3,9,0,0,0,2},
- {3,10,0,0,0,2},
- {3,11,0,0,0,2},
- {3,0,1,0,0,2},
- {3,2,3,0,0,2},
- {3,4,5,0,0,2},
- {3,6,7,0,0,2},
- {3,8,9,0,0,2},
- {3,10,11,0,0,2},
- {3,0,1,6,0,2},
- {3,2,3,8,0,2},
- {3,4,5,10,0,2},
- {3,0,1,6,7,2},
- {3,2,3,8,9,2},
- {3,4,5,10,11,2},
- {1,0,0,0,0,2},
- {1,1,0,0,0,2},
- {1,6,0,0,0,2},
- {1,7,0,0,0,2},
- {1,0,1,0,0,2},
- {1,6,7,0,0,2},
- {2,0,1,0,0,2},
- {2,2,3,0,0,2},
- {2,6,7,0,0,2},
- {2,8,9,0,0,2}
+const uint8_t table_7_3_2_3_3_4_oneCodeword[58][14] = {
+ {1,1,0,0,0,0,0,0,0,0,0,0,0,1},
+ {1,0,1,0,0,0,0,0,0,0,0,0,0,1},
+ {1,1,1,0,0,0,0,0,0,0,0,0,0,1},
+ {2,1,0,0,0,0,0,0,0,0,0,0,0,1},
+ {2,0,1,0,0,0,0,0,0,0,0,0,0,1},
+ {2,0,0,1,0,0,0,0,0,0,0,0,0,1},
+ {2,0,0,0,1,0,0,0,0,0,0,0,0,1},
+ {2,1,1,0,0,0,0,0,0,0,0,0,0,1},
+ {2,0,0,1,1,0,0,0,0,0,0,0,0,1},
+ {2,1,1,1,0,0,0,0,0,0,0,0,0,1},
+ {2,1,1,1,1,0,0,0,0,0,0,0,0,1},
+ {3,1,0,0,0,0,0,0,0,0,0,0,0,1},
+ {3,0,1,0,0,0,0,0,0,0,0,0,0,1},
+ {3,0,0,1,0,0,0,0,0,0,0,0,0,1},
+ {3,0,0,0,1,0,0,0,0,0,0,0,0,1},
+ {3,0,0,0,0,1,0,0,0,0,0,0,0,1},
+ {3,0,0,0,0,0,1,0,0,0,0,0,0,1},
+ {3,1,1,0,0,0,0,0,0,0,0,0,0,1},
+ {3,0,0,1,1,0,0,0,0,0,0,0,0,1},
+ {3,0,0,0,0,1,1,0,0,0,0,0,0,1},
+ {3,1,1,1,0,0,0,0,0,0,0,0,0,1},
+ {3,0,0,0,1,1,1,0,0,0,0,0,0,1},
+ {3,1,1,1,1,0,0,0,0,0,0,0,0,1},
+ {2,1,0,1,0,0,0,0,0,0,0,0,0,1},
+ {3,1,0,0,0,0,0,0,0,0,0,0,0,2},
+ {3,0,1,0,0,0,0,0,0,0,0,0,0,2},
+ {3,0,0,1,0,0,0,0,0,0,0,0,0,2},
+ {3,0,0,0,1,0,0,0,0,0,0,0,0,2},
+ {3,0,0,0,0,1,0,0,0,0,0,0,0,2},
+ {3,0,0,0,0,0,1,0,0,0,0,0,0,2},
+ {3,0,0,0,0,0,0,1,0,0,0,0,0,2},
+ {3,0,0,0,0,0,0,0,1,0,0,0,0,2},
+ {3,0,0,0,0,0,0,0,0,1,0,0,0,2},
+ {3,0,0,0,0,0,0,0,0,0,1,0,0,2},
+ {3,0,0,0,0,0,0,0,0,0,0,1,0,2},
+ {3,0,0,0,0,0,0,0,0,0,0,0,1,2},
+ {3,1,1,0,0,0,0,0,0,0,0,0,0,2},
+ {3,0,0,1,1,0,0,0,0,0,0,0,0,2},
+ {3,0,0,0,0,1,1,0,0,0,0,0,0,2},
+ {3,0,0,0,0,0,0,1,1,0,0,0,0,2},
+ {3,0,0,0,0,0,0,0,0,1,1,0,0,2},
+ {3,0,0,0,0,0,0,0,0,0,0,1,1,2},
+ {3,1,1,0,0,0,0,1,0,0,0,0,0,2},
+ {3,0,0,1,1,0,0,0,0,1,0,0,0,2},
+ {3,0,0,0,0,1,1,0,0,0,0,1,0,2},
+ {3,1,1,0,0,0,0,1,1,0,0,0,0,2},
+ {3,0,0,1,1,0,0,0,0,1,1,0,0,2},
+ {3,0,0,0,0,1,1,0,0,0,0,1,1,2},
+ {1,1,0,0,0,0,0,0,0,0,0,0,0,2},
+ {1,0,1,0,0,0,0,0,0,0,0,0,0,2},
+ {1,0,0,0,0,0,0,1,0,0,0,0,0,2},
+ {1,0,0,0,0,0,0,0,1,0,0,0,0,2},
+ {1,1,1,0,0,0,0,0,0,0,0,0,0,2},
+ {1,0,0,0,0,0,0,1,1,0,0,0,0,2},
+ {2,1,1,0,0,0,0,0,0,0,0,0,0,2},
+ {2,0,0,1,1,0,0,0,0,0,0,0,0,2},
+ {2,0,0,0,0,0,0,1,1,0,0,0,0,2},
+ {2,0,0,0,0,0,0,0,0,1,1,0,0,2}
};
-const uint8_t table_7_3_2_3_3_4_twoCodeword[6][10] = {
- {3,0,1,2,3,4,0,0,0,1},
- {3,0,1,2,3,4,5,0,0,1},
- {2,0,1,2,3,6,0,0,0,2},
- {2,0,1,2,3,6,8,0,0,2},
- {2,0,1,2,3,6,7,8,0,2},
- {2,0,1,2,3,6,7,8,9,2}
+const uint8_t table_7_3_2_3_3_4_twoCodeword[6][14] = {
+ {3,1,1,1,1,1,0,0,0,0,0,0,0,1},
+ {3,1,1,1,1,1,1,0,0,0,0,0,0,1},
+ {2,1,1,1,1,0,0,1,0,0,0,0,0,2},
+ {2,1,1,1,1,0,0,1,0,1,0,0,0,2},
+ {2,1,1,1,1,0,0,1,1,1,0,0,0,2},
+ {2,1,1,1,1,0,0,1,1,1,1,0,0,2},
};
// table 7.2-1 TS 38.321
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index f06d50be487b69ab7397090cd717b74f13869e24..30ae6b2c97f6255ed54dd4f3b36bc646b485b86c 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -821,14 +821,16 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
mac->mib->dmrs_TypeA_Position,
dlsch_config_pdu_1_0->number_symbols,
dlsch_config_pdu_1_0->start_symbol,
- mappingtype);
+ mappingtype, 1);
dlsch_config_pdu_1_0->dmrsConfigType = (mac->DLbwp[0] != NULL) ?
(mac->DLbwp[0]->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? 0 : 1) : 0;
+
/* number of DM-RS CDM groups without data according to subclause 5.1.6.2 of 3GPP TS 38.214 version 15.9.0 Release 15 */
if (dlsch_config_pdu_1_0->number_symbols == 2)
dlsch_config_pdu_1_0->n_dmrs_cdm_groups = 1;
else
dlsch_config_pdu_1_0->n_dmrs_cdm_groups = 2;
+ dlsch_config_pdu_1_0->dmrs_ports = 1; // only port 0 in case of DCI 1_0
/* VRB_TO_PRB_MAPPING */
dlsch_config_pdu_1_0->vrb_to_prb_mapping = (dci->vrb_to_prb_mapping.val == 0) ? vrb_to_prb_mapping_non_interleaved:vrb_to_prb_mapping_interleaved;
/* MCS TABLE INDEX */
@@ -1089,31 +1091,35 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
if ((dmrs_type == NULL) && (max_length == NULL)){
// Table 7.3.1.2.2-1: Antenna port(s) (1000 + DMRS port), dmrs-Type=1, maxLength=1
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = table_7_3_2_3_3_1[dci->antenna_ports.val][0];
- dlsch_config_pdu_1_1->dmrs_ports[0] = table_7_3_2_3_3_1[dci->antenna_ports.val][1];
- dlsch_config_pdu_1_1->dmrs_ports[1] = table_7_3_2_3_3_1[dci->antenna_ports.val][2];
- dlsch_config_pdu_1_1->dmrs_ports[2] = table_7_3_2_3_3_1[dci->antenna_ports.val][3];
- dlsch_config_pdu_1_1->dmrs_ports[3] = table_7_3_2_3_3_1[dci->antenna_ports.val][4];
+ dlsch_config_pdu_1_1->dmrs_ports = (table_7_3_2_3_3_1[dci->antenna_ports.val][1] +
+ (table_7_3_2_3_3_1[dci->antenna_ports.val][2]<<1) +
+ (table_7_3_2_3_3_1[dci->antenna_ports.val][2]<<2) +
+ (table_7_3_2_3_3_1[dci->antenna_ports.val][4]<<3));
}
if ((dmrs_type == NULL) && (max_length != NULL)){
// Table 7.3.1.2.2-2: Antenna port(s) (1000 + DMRS port), dmrs-Type=1, maxLength=2
if (n_codewords == 1) {
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][0];
- dlsch_config_pdu_1_1->dmrs_ports[0] = table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][1];
- dlsch_config_pdu_1_1->dmrs_ports[1] = table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][2];
- dlsch_config_pdu_1_1->dmrs_ports[2] = table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][3];
- dlsch_config_pdu_1_1->dmrs_ports[3] = table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][4];
- dlsch_config_pdu_1_1->n_front_load_symb = table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][5];
+ dlsch_config_pdu_1_1->dmrs_ports = (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][1] +
+ (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][2]<<1) +
+ (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][2]<<2) +
+ (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][4]<<3) +
+ (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][5]<<4) +
+ (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][6]<<5) +
+ (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][7]<<6) +
+ (table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][8]<<7));
+ dlsch_config_pdu_1_1->n_front_load_symb = table_7_3_2_3_3_2_oneCodeword[dci->antenna_ports.val][9];
}
if (n_codewords == 2) {
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][0];
- dlsch_config_pdu_1_1->dmrs_ports[0] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][1];
- dlsch_config_pdu_1_1->dmrs_ports[1] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][2];
- dlsch_config_pdu_1_1->dmrs_ports[2] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][3];
- dlsch_config_pdu_1_1->dmrs_ports[3] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][4];
- dlsch_config_pdu_1_1->dmrs_ports[4] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][5];
- dlsch_config_pdu_1_1->dmrs_ports[5] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][6];
- dlsch_config_pdu_1_1->dmrs_ports[6] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][7];
- dlsch_config_pdu_1_1->dmrs_ports[7] = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][8];
+ dlsch_config_pdu_1_1->dmrs_ports = (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][1] +
+ (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][2]<<1) +
+ (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][2]<<2) +
+ (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][4]<<3) +
+ (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][5]<<4) +
+ (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][6]<<5) +
+ (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][7]<<6) +
+ (table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][8]<<7));
dlsch_config_pdu_1_1->n_front_load_symb = table_7_3_2_3_3_2_twoCodeword[dci->antenna_ports.val][9];
}
}
@@ -1121,44 +1127,67 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
// Table 7.3.1.2.2-3: Antenna port(s) (1000 + DMRS port), dmrs-Type=2, maxLength=1
if (n_codewords == 1) {
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][0];
- dlsch_config_pdu_1_1->dmrs_ports[0] = table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][1];
- dlsch_config_pdu_1_1->dmrs_ports[1] = table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][2];
- dlsch_config_pdu_1_1->dmrs_ports[2] = table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][3];
- dlsch_config_pdu_1_1->dmrs_ports[3] = table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][4];
+ dlsch_config_pdu_1_1->dmrs_ports = (table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][1] +
+ (table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][2]<<1) +
+ (table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][2]<<2) +
+ (table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][4]<<3) +
+ (table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][5]<<4) +
+ (table_7_3_2_3_3_3_oneCodeword[dci->antenna_ports.val][6]<<5));
}
if (n_codewords == 2) {
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][0];
- dlsch_config_pdu_1_1->dmrs_ports[0] = table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][1];
- dlsch_config_pdu_1_1->dmrs_ports[1] = table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][2];
- dlsch_config_pdu_1_1->dmrs_ports[2] = table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][3];
- dlsch_config_pdu_1_1->dmrs_ports[3] = table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][4];
- dlsch_config_pdu_1_1->dmrs_ports[4] = table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][5];
- dlsch_config_pdu_1_1->dmrs_ports[5] = table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][6];
+ dlsch_config_pdu_1_1->dmrs_ports = (table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][1] +
+ (table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][2]<<1) +
+ (table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][2]<<2) +
+ (table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][4]<<3) +
+ (table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][5]<<4) +
+ (table_7_3_2_3_3_3_twoCodeword[dci->antenna_ports.val][6]<<5));
}
}
if ((dmrs_type != NULL) && (max_length != NULL)){
// Table 7.3.1.2.2-4: Antenna port(s) (1000 + DMRS port), dmrs-Type=2, maxLength=2
if (n_codewords == 1) {
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][0];
- dlsch_config_pdu_1_1->dmrs_ports[0] = table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][1];
- dlsch_config_pdu_1_1->dmrs_ports[1] = table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][2];
- dlsch_config_pdu_1_1->dmrs_ports[2] = table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][3];
- dlsch_config_pdu_1_1->dmrs_ports[3] = table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][4];
- dlsch_config_pdu_1_1->n_front_load_symb = table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][5];
+ dlsch_config_pdu_1_1->dmrs_ports = (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][1] +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][2]<<1) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][2]<<2) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][4]<<3) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][5]<<4) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][6]<<5) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][7]<<6) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][8]<<7) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][9]<<8) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][10]<<9) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][11]<<10) +
+ (table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][12]<<11));
+ dlsch_config_pdu_1_1->n_front_load_symb = table_7_3_2_3_3_4_oneCodeword[dci->antenna_ports.val][13];
}
if (n_codewords == 2) {
dlsch_config_pdu_1_1->n_dmrs_cdm_groups = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][0];
- dlsch_config_pdu_1_1->dmrs_ports[0] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][1];
- dlsch_config_pdu_1_1->dmrs_ports[1] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][2];
- dlsch_config_pdu_1_1->dmrs_ports[2] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][3];
- dlsch_config_pdu_1_1->dmrs_ports[3] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][4];
- dlsch_config_pdu_1_1->dmrs_ports[4] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][5];
- dlsch_config_pdu_1_1->dmrs_ports[5] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][6];
- dlsch_config_pdu_1_1->dmrs_ports[6] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][7];
- dlsch_config_pdu_1_1->dmrs_ports[7] = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][8];
+ dlsch_config_pdu_1_1->dmrs_ports = (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][1] +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][2]<<1) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][2]<<2) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][4]<<3) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][5]<<4) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][6]<<5) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][7]<<6) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][8]<<7) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][9]<<8) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][10]<<9) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][11]<<10) +
+ (table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][12]<<11));
dlsch_config_pdu_1_1->n_front_load_symb = table_7_3_2_3_3_4_twoCodeword[dci->antenna_ports.val][9];
}
}
+
+ /* dmrs symbol positions*/
+ dlsch_config_pdu_1_1->dlDmrsSymbPos = fill_dmrs_mask(pdsch_config,
+ mac->scc->dmrs_TypeA_Position,
+ dlsch_config_pdu_1_1->number_symbols,
+ dlsch_config_pdu_1_1->start_symbol,
+ mappingtype,
+ dlsch_config_pdu_1_1->n_front_load_symb);
+
/* TCI */
if (mac->dl_config_request.dl_config_list[0].dci_config_pdu.dci_config_rel15.coreset.tci_present_in_dci == 1){
// 0 bit if higher layer parameter tci-PresentInDCI is not enabled
diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index 15dd5c15619fecb5e14103cc0a6ec8c4d11b39eb..e6a207af9dd426cbe349b9c4c5701404580eb8d9 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -363,8 +363,9 @@ void config_common(int Mod_idP, int ssb_SubcarrierOffset, int pdsch_AntennaPorts
cfg->ssb_table.ssb_mask_list[1].ssb_mask.tl.tag = NFAPI_NR_CONFIG_SSB_MASK_TAG;
cfg->num_tlv+=2;
+ // logical antenna ports
cfg->carrier_config.num_tx_ant.value = pdsch_AntennaPorts;
- AssertFatal(pdsch_AntennaPorts > 0 && pdsch_AntennaPorts < 13, "pdsch_AntennaPorts in 1...12\n");
+ AssertFatal(pdsch_AntennaPorts > 0 && pdsch_AntennaPorts < 33, "pdsch_AntennaPorts in 1...32\n");
cfg->carrier_config.num_tx_ant.tl.tag = NFAPI_NR_CONFIG_NUM_TX_ANT_TAG;
int num_ssb=0;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index b836ed0286fe848c0f5c5d7e8a2951335a8e1808..69b978b0287b121f528e819f885e7e7ee25c3d7c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -1277,7 +1277,7 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
nr_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position,
nrOfSymbols,
startSymbolIndex,
- mappingtype);
+ mappingtype, 1);
int x_Overhead = 0;
uint8_t tb_scaling = 0;
@@ -1496,7 +1496,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
scc->dmrs_TypeA_Position,
nrOfSymbols,
startSymbolIndex,
- mappingtype);
+ mappingtype, 1);
uint16_t N_DMRS_SLOT = get_num_dmrs(dlDmrsSymbPos);
@@ -1537,14 +1537,23 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
int rbSize = 0;
uint8_t tb_scaling = 0;
uint16_t *vrb_map = cc[CC_id].vrb_map;
+ // increase PRBs until we get to BWPSize or TBS is bigger than MAC PDU size
do {
rbSize++;
- LOG_D(NR_MAC,"Calling nr_compute_tbs with N_PRB_DMRS %d, N_DMRS_SLOT %d\n",N_PRB_DMRS,N_DMRS_SLOT);
+ LOG_D(NR_MAC,"Msg4 Allocation : RBloop Calling nr_compute_tbs with N_PRB_DMRS %d, N_DMRS_SLOT %d\n",N_PRB_DMRS,N_DMRS_SLOT);
harq->tb_size = nr_compute_tbs(nr_get_Qm_dl(mcsIndex, mcsTableIdx),
nr_get_code_rate_dl(mcsIndex, mcsTableIdx),
rbSize, nrOfSymbols, N_PRB_DMRS * N_DMRS_SLOT, 0, tb_scaling,1) >> 3;
} while (rbSize < BWPSize && harq->tb_size < ra->mac_pdu_length);
-
+ // increase mcs until we get a TBS that is big enough to fix the MAC PDU
+ do {
+ mcsIndex++;
+ LOG_D(NR_MAC,"Msg4 Allocation: MCSloop Calling nr_compute_tbs with N_PRB_DMRS %d, N_DMRS_SLOT %d\n",N_PRB_DMRS,N_DMRS_SLOT);
+ harq->tb_size = nr_compute_tbs(nr_get_Qm_dl(mcsIndex, mcsTableIdx),
+ nr_get_code_rate_dl(mcsIndex, mcsTableIdx),
+ rbSize, nrOfSymbols, N_PRB_DMRS * N_DMRS_SLOT, 0, tb_scaling,1) >> 3;
+ } while (harq->tb_size < ra->mac_pdu_length && mcsIndex<10);
+ AssertFatal(mcsIndex<10,"Cannot fit Msg4 in %d PRBs with QPSK\n",(int)BWPSize);
int i = 0;
while ((i < rbSize) && (rbStart + rbSize <= BWPSize)) {
if (vrb_map[rbStart + i]) {
@@ -1665,7 +1674,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
dci_payload.pucch_resource_indicator = delta_PRI; // This is delta_PRI from 9.2.1 in 38.213
dci_payload.pdsch_to_harq_feedback_timing_indicator.val = pucch->timing_indicator;
- LOG_D(NR_MAC,
+ LOG_I(NR_MAC,
"[RAPROC] DCI 1_0 payload: freq_alloc %d (%d,%d,%d), time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d pucchres %d harqtiming %d\n",
dci_payload.frequency_domain_assignment.val,
pdsch_pdu_rel15->rbStart,
@@ -1678,7 +1687,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
dci_payload.pucch_resource_indicator,
dci_payload.pdsch_to_harq_feedback_timing_indicator.val);
- LOG_D(NR_MAC,
+ LOG_I(NR_MAC,
"[RAPROC] DCI params: rnti 0x%x, rnti_type %d, dci_format %d coreset params: FreqDomainResource %llx, start_symbol %d n_symb %d, BWPsize %d\n",
pdcch_pdu_rel15->dci_pdu[0].RNTI,
NR_RNTI_TC,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
index 28b7ea3c21f7ed95dafb705f48fa22d75c08fc09..0ff387f3a2e3a922bc9b0eb5bdd684d5f3e5b31a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -375,7 +375,6 @@ uint32_t schedule_control_sib1(module_id_t module_id,
// Calculate number of PRB_DMRS
uint8_t N_PRB_DMRS = gNB_mac->sched_ctrlCommon->pdsch_semi_static.numDmrsCdmGrpsNoData * 6;
uint16_t dmrs_length = get_num_dmrs(dlDmrsSymbPos);
-
LOG_D(MAC,"dlDmrsSymbPos %x\n",dlDmrsSymbPos);
int rbSize = 0;
uint32_t TBS = 0;
@@ -605,8 +604,7 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
// TODO: There are exceptions to this in table 5.1.2.1.1-4,5 (Default time domain allocation tables B, C)
int mappingtype = (startSymbolIndex <= 3)? typeA: typeB;
-
- uint16_t dlDmrsSymbPos = fill_dmrs_mask(NULL, gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position, nrOfSymbols, startSymbolIndex, mappingtype);
+ uint16_t dlDmrsSymbPos = fill_dmrs_mask(NULL, gNB_mac->common_channels->ServingCellConfigCommon->dmrs_TypeA_Position, nrOfSymbols, startSymbolIndex, mappingtype, 1);
// Configure sched_ctrlCommon for SIB1
uint32_t TBS = schedule_control_sib1(module_idP, CC_id,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index d32e45a37918873de50a54c9fdb2a0cbcafbdb5d..9bdedb0357d1c68490921a324284d1baa2165767 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -488,7 +488,6 @@ bool allocate_dl_retransmission(module_id_t module_id,
int rbStart = NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
- const long f = (sched_ctrl->active_bwp ||bwpd) ? sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats : 0;
int rbSize = 0;
const int tda = RC.nrmac[module_id]->preferred_dl_tda[sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0][slot];
AssertFatal(tda>=0,"Unable to find PDSCH time domain allocation in list\n");
@@ -509,7 +508,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
/* check whether we need to switch the TDA allocation since the last
* (re-)transmission */
if (ps->time_domain_allocation != tda)
- nr_set_pdsch_semi_static(scc, cg, sched_ctrl->active_bwp, bwpd, tda, f, ps);
+ nr_set_pdsch_semi_static(scc, cg, sched_ctrl->active_bwp, bwpd, tda, ps->nrOfLayers,sched_ctrl,ps);
} else {
/* the retransmission will use a different time domain allocation, check
* that we have enough resources */
@@ -517,13 +516,13 @@ bool allocate_dl_retransmission(module_id_t module_id,
rbStart++;
while (rbStart + rbSize < bwpSize && rballoc_mask[rbStart + rbSize])
rbSize++;
- NR_pdsch_semi_static_t temp_ps;
- temp_ps.nrOfLayers = 1;
- nr_set_pdsch_semi_static(scc, cg, sched_ctrl->active_bwp, bwpd, tda, f, &temp_ps);
+ NR_pdsch_semi_static_t temp_ps = *ps;
+ nr_set_pdsch_semi_static(scc, cg, sched_ctrl->active_bwp, bwpd,tda, ps->nrOfLayers, sched_ctrl, &temp_ps);
uint32_t new_tbs;
uint16_t new_rbSize;
bool success = nr_find_nb_rb(retInfo->Qm,
retInfo->R,
+ temp_ps.nrOfLayers,
temp_ps.nrOfSymbols,
temp_ps.N_PRB_DMRS * temp_ps.N_DMRS_SLOT,
retInfo->tb_size,
@@ -599,6 +598,7 @@ void pf_dl(module_id_t module_id,
float coeff_ue[MAX_MOBILES_PER_GNB];
// UEs that could be scheduled
int ue_array[MAX_MOBILES_PER_GNB];
+ int layers[MAX_MOBILES_PER_GNB];
NR_list_t UE_sched = { .head = -1, .next = ue_array, .tail = -1, .len = MAX_MOBILES_PER_GNB };
/* Loop UE_info->list to check retransmission */
@@ -611,6 +611,8 @@ void pf_dl(module_id_t module_id,
/* get the PID of a HARQ process awaiting retrnasmission, or -1 otherwise */
sched_pdsch->dl_harq_pid = sched_ctrl->retrans_dl_harq.head;
+ layers[UE_id] = ps->nrOfLayers; // initialization of layers to the previous value in the strcuture
+
/* Calculate Throughput */
const float a = 0.0005f; // corresponds to 200ms window
const uint32_t b = UE_info->mac_stats[UE_id].dlsch_current_bytes;
@@ -634,9 +636,18 @@ void pf_dl(module_id_t module_id,
continue;
/* Calculate coeff */
- sched_pdsch->mcs = 9;
- ps->nrOfLayers = 1;
- uint32_t tbs = pf_tbs[ps->mcsTableIdx][sched_pdsch->mcs];
+ set_dl_mcs(sched_pdsch,sched_ctrl,ps->mcsTableIdx);
+ layers[UE_id] = set_dl_nrOfLayers(sched_ctrl);
+ const uint8_t Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
+ const uint16_t R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
+ uint32_t tbs = nr_compute_tbs(Qm,
+ R,
+ 1, /* rbSize */
+ 10, /* hypothetical number of slots */
+ 0, /* N_PRB_DMRS * N_DMRS_SLOT */
+ 0 /* N_PRB_oh, 0 for initialBWP */,
+ 0 /* tb_scaling */,
+ layers[UE_id]) >> 3;
coeff_ue[UE_id] = (float) tbs / thr_ue[UE_id];
LOG_D(NR_MAC,"b %d, thr_ue[%d] %f, tbs %d, coeff_ue[%d] %f\n",
b, UE_id, thr_ue[UE_id], tbs, UE_id, coeff_ue[UE_id]);
@@ -719,9 +730,9 @@ void pf_dl(module_id_t module_id,
AssertFatal(tda>=0,"Unable to find PDSCH time domain allocation in list\n");
NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
- const long f = (sched_ctrl->active_bwp || bwpd) ? sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats : 0;
- if (ps->time_domain_allocation != tda)
- nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, bwpd, tda, f, ps);
+ if (ps->nrOfLayers != layers[UE_id] ||
+ ps->time_domain_allocation != tda)
+ nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, bwpd, tda, layers[UE_id], sched_ctrl, ps);
sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
sched_pdsch->pucch_allocation = alloc;
@@ -730,6 +741,7 @@ void pf_dl(module_id_t module_id,
const int oh = 3 + 2 * (frame == (sched_ctrl->ta_frame + 10) % 1024);
nr_find_nb_rb(sched_pdsch->Qm,
sched_pdsch->R,
+ ps->nrOfLayers,
ps->nrOfSymbols,
ps->N_PRB_DMRS * ps->N_DMRS_SLOT,
sched_ctrl->num_total_bytes + oh,
@@ -893,8 +905,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
harq->is_waiting = true;
UE_info->mac_stats[UE_id].dlsch_rounds[harq->round]++;
- LOG_D(NR_MAC,
- "%4d.%2d [DLSCH/PDSCH/PUCCH] UE %d RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) TPC %d\n",
+ LOG_I(NR_MAC,
+ "%4d.%2d [DLSCH/PDSCH/PUCCH] UE %d RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d nrOfLayer %d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) TPC %d\n",
frame,
slot,
UE_id,
@@ -906,6 +918,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
ps->nrOfSymbols,
ps->dl_dmrs_symb_pos,
sched_pdsch->mcs,
+ nrOfLayers,
TBS,
current_harq_pid,
harq->round,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index 2b1c26b82a7604d29f5efc625ed0183497876c38..e51f4afe1f2e495de6fb1201d48bbc86a305206e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -169,7 +169,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
scc->dmrs_TypeA_Position,
NrOfSymbols,
StartSymbolIndex,
- mappingtype);
+ mappingtype, 1);
/*
AssertFatal(k0==0,"k0 is not zero for Initial DL BWP TimeDomain Alloc\n");
@@ -376,13 +376,8 @@ void nr_preprocessor_phytest(module_id_t module_id,
sched_pdsch->rbStart = rbStart;
sched_pdsch->rbSize = rbSize;
const int tda = sched_ctrl->active_bwp ? RC.nrmac[module_id]->preferred_dl_tda[sched_ctrl->active_bwp->bwp_Id][slot] : 1;
- const uint8_t num_dmrs_cdm_grps_no_data = 1;
- const long f = 1;
- ps->nrOfLayers = target_dl_Nl;
- if (ps->time_domain_allocation != tda || ps->numDmrsCdmGrpsNoData != num_dmrs_cdm_grps_no_data)
- nr_set_pdsch_semi_static(
- scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, NULL, tda, f, ps);
-
+ if (ps->time_domain_allocation != tda || ps->nrOfLayers != target_dl_Nl)
+ nr_set_pdsch_semi_static(scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, NULL, tda, target_dl_Nl, sched_ctrl, ps);
sched_pdsch->mcs = target_dl_mcs;
sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 3fb98620dec5d5e942418340e9771fa709eac4b4..ea1eae17e2f7ca396a37a9f8c7ac1fa0a9b77d80 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -113,6 +113,20 @@ uint8_t nr_ss_first_symb_idx_scs_120_120_mux3[4] = {4,8,2,6};
uint8_t nr_max_number_of_candidates_per_slot[4] = {44, 36, 22, 20};
uint8_t nr_max_number_of_cces_per_slot[4] = {56, 56, 48, 32};
+// CQI TABLES
+// Table 1 (38.214 5.2.2.1-2)
+uint16_t cqi_table1[16][2] = {{0,0},{2,78},{2,120},{2,193},{2,308},{2,449},{2,602},{4,378},
+ {4,490},{4,616},{6,466},{6,567},{6,666},{6,772},{6,873},{6,948}};
+
+// Table 2 (38.214 5.2.2.1-3)
+uint16_t cqi_table2[16][2] = {{0,0},{2,78},{2,193},{2,449},{4,378},{4,490},{4,616},{6,466},
+ {6,567},{6,666},{6,772},{6,873},{8,711},{8,797},{8,885},{8,948}};
+
+// Table 2 (38.214 5.2.2.1-4)
+uint16_t cqi_table3[16][2] = {{0,0},{2,30},{2,50},{2,78},{2,120},{2,193},{2,308},{2,449},
+ {2,602},{4,378},{4,490},{4,616},{6,466},{6,567},{6,666},{6,772}};
+
+
static inline uint8_t get_max_candidates(uint8_t scs) {
AssertFatal(scs<4, "Invalid PDCCH subcarrier spacing %d\n", scs);
return (nr_max_number_of_candidates_per_slot[scs]);
@@ -123,6 +137,61 @@ static inline uint8_t get_max_cces(uint8_t scs) {
return (nr_max_number_of_cces_per_slot[scs]);
}
+uint8_t set_dl_nrOfLayers(NR_UE_sched_ctrl_t *sched_ctrl) {
+
+ // TODO check this but it should be enough for now
+ // if there is not csi report RI is 0 from initialization
+ return (sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.ri + 1);
+
+}
+
+void set_dl_mcs(NR_sched_pdsch_t *sched_pdsch,
+ NR_UE_sched_ctrl_t *sched_ctrl,
+ uint8_t mcs_table_idx) {
+
+ if (sched_ctrl->set_mcs) {
+ // TODO for wideband case and multiple TB
+ int cqi_idx = sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.wb_cqi_1tb;
+ uint16_t target_coderate,target_qm;
+ if (cqi_idx>0) {
+ int cqi_table = sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.cqi_table;
+ AssertFatal(cqi_table == mcs_table_idx, "Indices of MCS tables don't correspond\n");
+ switch (cqi_table) {
+ case 0:
+ target_qm = cqi_table1[cqi_idx][0];
+ target_coderate = cqi_table1[cqi_idx][1];
+ break;
+ case 1:
+ target_qm = cqi_table2[cqi_idx][0];
+ target_coderate = cqi_table2[cqi_idx][1];
+ break;
+ case 2:
+ target_qm = cqi_table3[cqi_idx][0];
+ target_coderate = cqi_table3[cqi_idx][1];
+ break;
+ default:
+ AssertFatal(1==0,"Invalid cqi table index %d\n",cqi_table);
+ }
+ int max_mcs = 28;
+ int R,Qm;
+ if (mcs_table_idx == 1)
+ max_mcs = 27;
+ for (int i=0; i<=max_mcs; i++) {
+ R = nr_get_code_rate_dl(i, mcs_table_idx);
+ Qm = nr_get_Qm_dl(i, mcs_table_idx);
+ if ((Qm == target_qm) && (target_coderate <= R)) {
+ sched_pdsch->mcs = i;
+ break;
+ }
+ }
+ }
+ else // default value
+ sched_pdsch->mcs = 9;
+
+ sched_ctrl->set_mcs = FALSE;
+ }
+}
+
void set_dl_dmrs_ports(NR_pdsch_semi_static_t *ps) {
//TODO first basic implementation of dmrs port selection
@@ -130,23 +199,29 @@ void set_dl_dmrs_ports(NR_pdsch_semi_static_t *ps) {
// for now it assumes a selection of Nl consecutive dmrs ports
// and a single front loaded symbol
// dmrs_ports_id is the index of Tables 7.3.1.2.2-1/2/3/4
+ // number of front loaded symbols need to be consistent with maxLength
+ // when a more complete implementation is done
switch (ps->nrOfLayers) {
case 1:
ps->dmrs_ports_id = 0;
ps->numDmrsCdmGrpsNoData = 1;
+ ps->frontloaded_symb = 1;
break;
case 2:
ps->dmrs_ports_id = 2;
ps->numDmrsCdmGrpsNoData = 1;
+ ps->frontloaded_symb = 1;
break;
case 3:
ps->dmrs_ports_id = 9;
ps->numDmrsCdmGrpsNoData = 2;
+ ps->frontloaded_symb = 1;
break;
case 4:
ps->dmrs_ports_id = 10;
ps->numDmrsCdmGrpsNoData = 2;
+ ps->frontloaded_symb = 1;
break;
default:
AssertFatal(1==0,"Number of layers %d\n not supported or not valid\n",ps->nrOfLayers);
@@ -257,6 +332,7 @@ int allocate_nr_CCEs(gNB_MAC_INST *nr_mac,
bool nr_find_nb_rb(uint16_t Qm,
uint16_t R,
+ uint8_t nrOfLayers,
uint16_t nb_symb_sch,
uint16_t nb_dmrs_prb,
uint32_t bytes,
@@ -266,7 +342,7 @@ bool nr_find_nb_rb(uint16_t Qm,
{
/* is the maximum (not even) enough? */
*nb_rb = nb_rb_max;
- *tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, 1) >> 3;
+ *tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, nrOfLayers) >> 3;
/* check whether it does not fit, or whether it exactly fits. Some algorithms
* might depend on the return value! */
if (bytes > *tbs)
@@ -276,7 +352,7 @@ bool nr_find_nb_rb(uint16_t Qm,
/* is the minimum enough? */
*nb_rb = 5;
- *tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, 1) >> 3;
+ *tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, nrOfLayers) >> 3;
if (bytes <= *tbs)
return true;
@@ -285,7 +361,7 @@ bool nr_find_nb_rb(uint16_t Qm,
int hi = nb_rb_max;
int lo = 1;
for (int p = (hi + lo) / 2; lo + 1 < hi; p = (hi + lo) / 2) {
- const uint32_t TBS = nr_compute_tbs(Qm, R, p, nb_symb_sch, nb_dmrs_prb, 0, 0, 1) >> 3;
+ const uint32_t TBS = nr_compute_tbs(Qm, R, p, nb_symb_sch, nb_dmrs_prb, 0, 0, nrOfLayers) >> 3;
if (bytes == TBS) {
hi = p;
break;
@@ -296,7 +372,7 @@ bool nr_find_nb_rb(uint16_t Qm,
}
}
*nb_rb = hi;
- *tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, 1) >> 3;
+ *tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, nrOfLayers) >> 3;
/* return whether we could allocate all bytes and stay below nb_rb_max */
return *tbs >= bytes && *nb_rb <= nb_rb_max;
}
@@ -306,7 +382,8 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
const NR_BWP_Downlink_t *bwp,
const NR_BWP_DownlinkDedicated_t *bwpd0,
int tda,
- const long dci_format,
+ uint8_t layers,
+ NR_UE_sched_ctrl_t *sched_ctrl,
NR_pdsch_semi_static_t *ps)
{
ps->time_domain_allocation = tda;
@@ -327,7 +404,9 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
}
ps->mcsTableIdx = 0;
- if (bwpd->pdsch_Config &&
+ bool reset_dmrs = false;
+ if (bwpd &&
+ bwpd->pdsch_Config &&
bwpd->pdsch_Config->choice.setup &&
bwpd->pdsch_Config->choice.setup->mcs_Table) {
if (*bwpd->pdsch_Config->choice.setup->mcs_Table == 0)
@@ -337,16 +416,60 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
}
else ps->mcsTableIdx = 0;
- if(dci_format == 0) // format 1_0
- ps->numDmrsCdmGrpsNoData = (ps->nrOfSymbols == 2 ? 1 : 2);
- else
- set_dl_dmrs_ports(ps);
- ps->dmrsConfigType = bwp!=NULL ? (bwp->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? 0 : 1) : 0;
+ NR_PDSCH_Config_t *pdsch_Config=NULL;
+ if (bwpd) pdsch_Config = bwpd->pdsch_Config->choice.setup;
+ LOG_I(NR_MAC,"tda %d, ps->time_domain_allocation %d,layers %d, ps->nrOfLayers %d, pdsch_config %p\n",tda,ps->time_domain_allocation,layers,ps->nrOfLayers,pdsch_Config);
+ if (ps->time_domain_allocation != tda) {
+ reset_dmrs = true;
+ ps->time_domain_allocation = tda;
+ const struct NR_PDSCH_TimeDomainResourceAllocationList *tdaList = bwp ?
+ bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList :
+ scc->downlinkConfigCommon->initialDownlinkBWP->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList;
+ AssertFatal(tda < tdaList->list.count, "time_domain_allocation %d>=%d\n", tda, tdaList->list.count);
+ ps->mapping_type = tdaList->list.array[tda]->mappingType;
+ if (pdsch_Config) {
+ if (ps->mapping_type == NR_PDSCH_TimeDomainResourceAllocation__mappingType_typeB)
+ ps->dmrsConfigType = pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeB->choice.setup->dmrs_Type == NULL ? 0 : 1;
+ else
+ ps->dmrsConfigType = pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? 0 : 1;
+ }
+ else
+ ps->dmrsConfigType = NFAPI_NR_DMRS_TYPE1;
+ const int startSymbolAndLength = tdaList->list.array[tda]->startSymbolAndLength;
+ SLIV2SL(startSymbolAndLength, &ps->startSymbolIndex, &ps->nrOfSymbols);
+ }
+
+ const long dci_format = sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats;
+ LOG_I(NR_MAC,"dci_format %d\n",(int)dci_format);
+ if (dci_format == NR_SearchSpace__searchSpaceType__ue_Specific__dci_Formats_formats0_0_And_1_0 ||
+ pdsch_Config == NULL) {
+ if (ps->nrOfSymbols == 2 && ps->mapping_type == NR_PDSCH_TimeDomainResourceAllocation__mappingType_typeB)
+ ps->numDmrsCdmGrpsNoData = 1;
+ else {
+ if (ps->dmrsConfigType == NFAPI_NR_DMRS_TYPE1)
+ ps->numDmrsCdmGrpsNoData = 2;
+ else
+ ps->numDmrsCdmGrpsNoData = 3;
+ }
+ ps->dmrs_ports_id = 0;
+ ps->frontloaded_symb = 1;
+ ps->nrOfLayers = 1;
+ }
+ else {
+ LOG_I(NR_MAC,"checking layers\n");
+ if (ps->nrOfLayers != layers) {
+ reset_dmrs = true;
+ ps->nrOfLayers = layers;
+ set_dl_dmrs_ports(ps);
+ }
+ }
ps->N_PRB_DMRS = ps->numDmrsCdmGrpsNoData * (ps->dmrsConfigType == NFAPI_NR_DMRS_TYPE1 ? 6 : 4);
- ps->dl_dmrs_symb_pos = fill_dmrs_mask(bwpd ? bwpd->pdsch_Config->choice.setup : NULL, scc->dmrs_TypeA_Position, ps->nrOfSymbols, ps->startSymbolIndex, mapping_type);
- ps->N_DMRS_SLOT = get_num_dmrs(ps->dl_dmrs_symb_pos);
- LOG_D(NR_MAC,"bwpd0 %p, bwpd %p : Filling dmrs info, ps->N_PRB_DMRS %d, ps->dl_dmrs_symb_pos %x, ps->N_DMRS_SLOT %d\n",bwpd0,bwpd,ps->N_PRB_DMRS,ps->dl_dmrs_symb_pos,ps->N_DMRS_SLOT);
+ if (reset_dmrs) {
+ ps->dl_dmrs_symb_pos = fill_dmrs_mask(bwpd ? bwpd->pdsch_Config->choice.setup : NULL, scc->dmrs_TypeA_Position, ps->nrOfSymbols, ps->startSymbolIndex, ps->mapping_type, ps->frontloaded_symb);
+ ps->N_DMRS_SLOT = get_num_dmrs(ps->dl_dmrs_symb_pos);
+ LOG_I(NR_MAC,"bwpd0 %p, bwpd %p : Filling dmrs info, ps->N_PRB_DMRS %d, ps->dl_dmrs_symb_pos %x, ps->N_DMRS_SLOT %d\n",bwpd0,bwpd,ps->N_PRB_DMRS,ps->dl_dmrs_symb_pos,ps->N_DMRS_SLOT);
+ }
}
void nr_set_pusch_semi_static(const NR_ServingCellConfigCommon_t *scc,
@@ -1944,6 +2067,7 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
compute_csi_bitlen (CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup, UE_info, UE_id, mod_idP);
NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
memset(sched_ctrl, 0, sizeof(*sched_ctrl));
+ sched_ctrl->set_mcs = TRUE;
sched_ctrl->lcid_mask = 0;
if (!get_softmodem_params()->phy_test && !get_softmodem_params()->do_ra && !get_softmodem_params()->sa) {
sched_ctrl->lcid_mask = 1<<DL_SCH_LCID_DTCH;
@@ -2214,10 +2338,10 @@ void nr_csirs_scheduling(int Mod_idP,
int period, offset;
nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
- NR_BWP_Downlink_t *bwp=sched_ctrl->active_bwp ?
- CellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[sched_ctrl->active_bwp->bwp_Id-1]:
- CellGroup->spCellConfig->spCellConfigDedicated->initialDownlinkBWP;
-
+ NR_BWP_Downlink_t *bwp=sched_ctrl->active_bwp;
+ NR_BWP_t *genericParameters = sched_ctrl->active_bwp ?
+ &sched_ctrl->active_bwp->bwp_Common->genericParameters:
+ &gNB_mac->common_channels[0].ServingCellConfigCommon->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
NR_CSI_RS_ResourceMapping_t resourceMapping = nzpcsi->resourceMapping;
@@ -2234,11 +2358,11 @@ void nr_csirs_scheduling(int Mod_idP,
nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *csirs_pdu_rel15 = &dl_tti_csirs_pdu->csi_rs_pdu.csi_rs_pdu_rel15;
- csirs_pdu_rel15->bwp_size = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
- csirs_pdu_rel15->bwp_start = NRRIV2PRBOFFSET(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
- csirs_pdu_rel15->subcarrier_spacing = bwp->bwp_Common->genericParameters.subcarrierSpacing;
- if (bwp->bwp_Common->genericParameters.cyclicPrefix)
- csirs_pdu_rel15->cyclic_prefix = *bwp->bwp_Common->genericParameters.cyclicPrefix;
+ csirs_pdu_rel15->bwp_size = NRRIV2BW(genericParameters->locationAndBandwidth,275);
+ csirs_pdu_rel15->bwp_start = NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth,275);
+ csirs_pdu_rel15->subcarrier_spacing = genericParameters->subcarrierSpacing;
+ if (genericParameters->cyclicPrefix)
+ csirs_pdu_rel15->cyclic_prefix = *genericParameters->cyclicPrefix;
else
csirs_pdu_rel15->cyclic_prefix = 0;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
index 65972017daf74620dbca75308ac983e0fd837a0a..da18f324efb9c9e85fd0bff83aff638b1d707bc7 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
@@ -161,7 +161,7 @@ void nr_schedule_pucch(int Mod_idP,
//! Calculating number of bits set
-uint8_t number_of_bits_set (uint8_t buf,uint8_t * max_ri){
+uint8_t number_of_bits_set (uint8_t buf){
uint8_t nb_of_bits_set = 0;
uint8_t mask = 0xff;
uint8_t index = 0;
@@ -172,14 +172,13 @@ uint8_t number_of_bits_set (uint8_t buf,uint8_t * max_ri){
mask>>=1;
}
- *max_ri = 8-index;
return nb_of_bits_set;
}
void compute_rsrp_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
uint8_t nb_resources,
- nr_csi_report_t *csi_report){
+ nr_csi_report_t *csi_report) {
if (NR_CSI_ReportConfig__groupBasedBeamReporting_PR_disabled == csi_reportconfig->groupBasedBeamReporting.present) {
if (NULL != csi_reportconfig->groupBasedBeamReporting.choice.disabled->nrofReportedRS)
@@ -211,42 +210,24 @@ uint8_t compute_ri_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
nr_csi_report_t *csi_report){
struct NR_CodebookConfig *codebookConfig = csi_reportconfig->codebookConfig;
- uint8_t nb_allowed_ri, ri_restriction,ri_bitlen;
- uint8_t max_ri = 0;
+ uint8_t nb_allowed_ri, ri_bitlen;
+ uint8_t ri_restriction = 0;
if (codebookConfig == NULL) {
csi_report->csi_meas_bitlen.ri_bitlen=0;
- return max_ri;
+ return ri_restriction;
}
// codebook type1 single panel
if (NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel==codebookConfig->codebookType.choice.type1->subType.present){
struct NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel *type1single = codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel;
if (type1single->nrOfAntennaPorts.present == NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts_PR_two){
- // two antenna ports case
- /* From Spec 38.212
- * If the higher layer parameter nrofCQIsPerReport=1, nRI in Table 6.3.1.1.2-3 is the number of allowed rank indicator
- * values in the 4 LSBs of the higher layer parameter typeI-SinglePanel-ri-Restriction according to Subclause 5.2.2.2.1 [6,
- * TS 38.214]; otherwise nRI in Table 6.3.1.1.2-3 is the number of allowed rank indicator values according to Subclause
- * 5.2.2.2.1 [6, TS 38.214].
- *
- * But from Current RRC ASN structures nrofCQIsPerReport is not present. Present a dummy variable is present so using it to
- * calculate RI for antennas equal or more than two.
- * */
- AssertFatal (NULL!=csi_reportconfig->dummy, "nrofCQIsPerReport is not present");
ri_restriction = csi_reportconfig->codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->typeI_SinglePanel_ri_Restriction.buf[0];
- /* Replace dummy with the nrofCQIsPerReport from the CSIreport
- config when equalent ASN structure present */
- if (0==*(csi_reportconfig->dummy)){
- nb_allowed_ri = number_of_bits_set((ri_restriction & 0xf0), &max_ri);
- ri_bitlen = ceil(log2(nb_allowed_ri));
- }
- else{
- nb_allowed_ri = number_of_bits_set(ri_restriction, &max_ri);
- ri_bitlen = ceil(log2(nb_allowed_ri));
- }
+ nb_allowed_ri = number_of_bits_set(ri_restriction);
+ ri_bitlen = ceil(log2(nb_allowed_ri));
+
ri_bitlen = ri_bitlen<1?ri_bitlen:1; //from the spec 38.212 and table 6.3.1.1.2-3: RI, LI, CQI, and CRI of codebookType=typeI-SinglePanel
csi_report->csi_meas_bitlen.ri_bitlen=ri_bitlen;
}
@@ -254,109 +235,322 @@ uint8_t compute_ri_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
if (type1single->nrOfAntennaPorts.choice.moreThanTwo->n1_n2.present ==
NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_two_one_TypeI_SinglePanel_Restriction) {
// 4 ports
- AssertFatal (NULL!=csi_reportconfig->dummy, "nrofCQIsPerReport is not present");
ri_restriction = csi_reportconfig->codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->typeI_SinglePanel_ri_Restriction.buf[0];
- /* Replace dummy with the nrofCQIsPerReport from the CSIreport
- config when equalent ASN structure present*/
- if (0==*(csi_reportconfig->dummy)){
- nb_allowed_ri = number_of_bits_set((ri_restriction & 0xf0), &max_ri);
- ri_bitlen = ceil(log2(nb_allowed_ri));
- }
- else{
- nb_allowed_ri = number_of_bits_set(ri_restriction,&max_ri);
- ri_bitlen = ceil(log2(nb_allowed_ri));
- }
+ nb_allowed_ri = number_of_bits_set(ri_restriction);
+ ri_bitlen = ceil(log2(nb_allowed_ri));
+
ri_bitlen = ri_bitlen<2?ri_bitlen:2; //from the spec 38.212 and table 6.3.1.1.2-3: RI, LI, CQI, and CRI of codebookType=typeI-SinglePanel
csi_report->csi_meas_bitlen.ri_bitlen=ri_bitlen;
}
else {
// more than 4 ports
- AssertFatal (NULL!=csi_reportconfig->dummy, "nrofCQIsPerReport is not present");
ri_restriction = csi_reportconfig->codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->typeI_SinglePanel_ri_Restriction.buf[0];
- /* Replace dummy with the nrofCQIsPerReport from the CSIreport
- config when equalent ASN structure present */
- if (0==*(csi_reportconfig->dummy)){
- nb_allowed_ri = number_of_bits_set((ri_restriction & 0xf0),&max_ri);
- ri_bitlen = ceil(log2(nb_allowed_ri));
- }
- else{
- nb_allowed_ri = number_of_bits_set(ri_restriction, &max_ri);
- ri_bitlen = ceil(log2(nb_allowed_ri));
- }
+ nb_allowed_ri = number_of_bits_set(ri_restriction);
+ ri_bitlen = ceil(log2(nb_allowed_ri));
+
csi_report->csi_meas_bitlen.ri_bitlen=ri_bitlen;
}
}
- return max_ri;
+ return ri_restriction;
}
else
AssertFatal(1==0,"Other configurations not yet implemented\n");
}
void compute_li_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
- uint8_t max_ri,
+ uint8_t ri_restriction,
nr_csi_report_t *csi_report){
struct NR_CodebookConfig *codebookConfig = csi_reportconfig->codebookConfig;
- if (codebookConfig == NULL) {
- csi_report->csi_meas_bitlen.li_bitlen=0;
- return;
+ for(int i=0; i<8; i++) {
+ if (codebookConfig == NULL || ((ri_restriction>>i)&0x01) == 0)
+ csi_report->csi_meas_bitlen.li_bitlen[i]=0;
+ else {
+ // codebook type1 single panel
+ if (NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel==codebookConfig->codebookType.choice.type1->subType.present)
+ csi_report->csi_meas_bitlen.li_bitlen[i]=ceil(log2(i+1))<2?ceil(log2(i+1)):2;
+ else
+ AssertFatal(1==0,"Other configurations not yet implemented\n");
+ }
}
- // codebook type1 single panel
- if (NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel==codebookConfig->codebookType.choice.type1->subType.present){
- /* From Spec 38.212
- * If the higher layer parameter nrofCQIsPerReport=1, nRI in Table 6.3.1.1.2-3 is the number of allowed rank indicator
- * values in the 4 LSBs of the higher layer parameter typeI-SinglePanel-ri-Restriction according to Subclause 5.2.2.2.1 [6,
- * TS 38.214]; otherwise nRI in Table 6.3.1.1.2-3 is the number of allowed rank indicator values according to Subclause
- * 5.2.2.2.1 [6, TS 38.214].
- *
- * But from Current RRC ASN structures nrofCQIsPerReport is not present. Present a dummy variable is present so using it to
- * calculate RI for antennas equal or more than two.
- */
- //! TODO: The bit length of LI is as follows LI = log2(RI), Need to confirm wheather we should consider maximum RI can be reported from ri_restricted
- // or we should consider reported RI. If we need to consider reported RI for calculating LI bit length then we need to modify the code.
- csi_report->csi_meas_bitlen.li_bitlen=ceil(log2(max_ri))<2?ceil(log2(max_ri)):2;
+}
+
+
+void get_n1n2_o1o2_singlepanel(int *n1, int *n2, int *o1, int *o2,
+ struct NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo *morethantwo) {
+
+ // Table 5.2.2.2.1-2 in 38.214 for supported configurations
+ switch(morethantwo->n1_n2.present){
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_two_one_TypeI_SinglePanel_Restriction):
+ *n1 = 2;
+ *n2 = 1;
+ *o1 = 4;
+ *o2 = 1;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_two_two_TypeI_SinglePanel_Restriction):
+ *n1 = 2;
+ *n2 = 2;
+ *o1 = 4;
+ *o2 = 4;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_four_one_TypeI_SinglePanel_Restriction):
+ *n1 = 4;
+ *n2 = 1;
+ *o1 = 4;
+ *o2 = 1;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_three_two_TypeI_SinglePanel_Restriction):
+ *n1 = 3;
+ *n2 = 2;
+ *o1 = 4;
+ *o2 = 4;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_six_one_TypeI_SinglePanel_Restriction):
+ *n1 = 6;
+ *n2 = 1;
+ *o1 = 4;
+ *o2 = 1;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_four_two_TypeI_SinglePanel_Restriction):
+ *n1 = 4;
+ *n2 = 2;
+ *o1 = 4;
+ *o2 = 4;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_eight_one_TypeI_SinglePanel_Restriction):
+ *n1 = 8;
+ *n2 = 1;
+ *o1 = 4;
+ *o2 = 1;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_four_three_TypeI_SinglePanel_Restriction):
+ *n1 = 4;
+ *n2 = 3;
+ *o1 = 4;
+ *o2 = 4;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_six_two_TypeI_SinglePanel_Restriction):
+ *n1 = 4;
+ *n2 = 2;
+ *o1 = 4;
+ *o2 = 4;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_twelve_one_TypeI_SinglePanel_Restriction):
+ *n1 = 12;
+ *n2 = 1;
+ *o1 = 4;
+ *o2 = 1;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_four_four_TypeI_SinglePanel_Restriction):
+ *n1 = 4;
+ *n2 = 4;
+ *o1 = 4;
+ *o2 = 4;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_eight_two_TypeI_SinglePanel_Restriction):
+ *n1 = 8;
+ *n2 = 2;
+ *o1 = 4;
+ *o2 = 4;
+ break;
+ case (NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_sixteen_one_TypeI_SinglePanel_Restriction):
+ *n1 = 16;
+ *n2 = 1;
+ *o1 = 4;
+ *o2 = 1;
+ break;
+ default:
+ AssertFatal(1==0,"Not supported configuration for n1_n2 in codebook configuration");
}
- else
- AssertFatal(1==0,"Other configurations not yet implemented\n");
}
+void get_x1x2_bitlen_singlepanel(int n1, int n2, int o1, int o2,
+ int *x1, int *x2, int rank, int codebook_mode) {
+
+ // Table 6.3.1.1.2-1 in 38.212
+ switch(rank){
+ case 1:
+ if(n2>1) {
+ if (codebook_mode == 1) {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 2;
+ }
+ else {
+ *x1 = ceil(log2(n1*o1/2)) + ceil(log2(n2*o2/2));
+ *x2 = 4;
+ }
+ }
+ else{
+ if (codebook_mode == 1) {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 2;
+ }
+ else {
+ *x1 = ceil(log2(n1*o1/2));
+ *x2 = 4;
+ }
+ }
+ break;
+ case 2:
+ if(n1*n2 == 2) {
+ if (codebook_mode == 1) {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 1;
+ }
+ else {
+ *x1 = ceil(log2(n1*o1/2));
+ *x2 = 3;
+ }
+ *x1 += 1;
+ }
+ else {
+ if(n2>1) {
+ if (codebook_mode == 1) {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 3;
+ }
+ else {
+ *x1 = ceil(log2(n1*o1/2)) + ceil(log2(n2*o2/2));
+ *x2 = 3;
+ }
+ }
+ else{
+ if (codebook_mode == 1) {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 1;
+ }
+ else {
+ *x1 = ceil(log2(n1*o1/2));
+ *x2 = 3;
+ }
+ }
+ *x1 += 2;
+ }
+ break;
+ case 3:
+ case 4:
+ if(n1*n2 == 2) {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 1;
+ }
+ else {
+ if(n1*n2 >= 8) {
+ *x1 = ceil(log2(n1*o1/2)) + ceil(log2(n2*o2)) + 2;
+ *x2 = 1;
+ }
+ else {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2)) + 2;
+ *x2 = 1;
+ }
+ }
+ break;
+ case 5:
+ case 6:
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 1;
+ break;
+ case 7:
+ case 8:
+ if(n1 == 4 && n2 == 1) {
+ *x1 = ceil(log2(n1*o1/2)) + ceil(log2(n2*o2));
+ *x2 = 1;
+ }
+ else {
+ if(n1 > 2 && n2 == 2) {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2/2));
+ *x2 = 1;
+ }
+ else {
+ *x1 = ceil(log2(n1*o1)) + ceil(log2(n2*o2));
+ *x2 = 1;
+ }
+ }
+ break;
+ default:
+ AssertFatal(1==0,"Invalid rank in x1 x2 bit length computation\n");
+ }
+}
+
+
+void compute_pmi_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
+ uint8_t ri_restriction,
+ nr_csi_report_t *csi_report){
+
+ struct NR_CodebookConfig *codebookConfig = csi_reportconfig->codebookConfig;
+ for(int i=0; i<8; i++) {
+ csi_report->csi_meas_bitlen.pmi_x1_bitlen[i]=0;
+ csi_report->csi_meas_bitlen.pmi_x2_bitlen[i]=0;
+ if (codebookConfig == NULL || ((ri_restriction>>i)&0x01) == 0)
+ return;
+ else {
+ if(codebookConfig->codebookType.present == NR_CodebookConfig__codebookType_PR_type1) {
+ if(codebookConfig->codebookType.choice.type1->subType.present == NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel) {
+ if(codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->nrOfAntennaPorts.present ==
+ NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts_PR_two) {
+ if (i==0)
+ csi_report->csi_meas_bitlen.pmi_x2_bitlen[i]=2;
+ if (i==1)
+ csi_report->csi_meas_bitlen.pmi_x2_bitlen[i]=1;
+ }
+ else { // more than two
+ int n1,n2,o1,o2,x1,x2;
+ get_n1n2_o1o2_singlepanel(&n1,&n2,&o1,&o2,codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->nrOfAntennaPorts.choice.moreThanTwo);
+ get_x1x2_bitlen_singlepanel(n1,n2,o1,o2,&x1,&x2,i+1,codebookConfig->codebookType.choice.type1->codebookMode);
+ csi_report->csi_meas_bitlen.pmi_x1_bitlen[i]=x1;
+ csi_report->csi_meas_bitlen.pmi_x2_bitlen[i]=x2;
+ }
+ }
+ else
+ AssertFatal(1==0,"Type1 Multi-panel Codebook Config not yet implemented\n");
+ }
+ else
+ AssertFatal(1==0,"Type2 Codebook Config not yet implemented\n");
+ }
+ }
+}
void compute_cqi_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
- uint8_t max_ri,
+ uint8_t ri_restriction,
nr_csi_report_t *csi_report){
struct NR_CodebookConfig *codebookConfig = csi_reportconfig->codebookConfig;
struct NR_CSI_ReportConfig__reportFreqConfiguration *freq_config = csi_reportconfig->reportFreqConfiguration;
if (*freq_config->cqi_FormatIndicator == NR_CSI_ReportConfig__reportFreqConfiguration__cqi_FormatIndicator_widebandCQI) {
- csi_report->csi_meas_bitlen.cqi_bitlen = 4;
- if(codebookConfig != NULL) {
- if (NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel == codebookConfig->codebookType.choice.type1->subType.present){
- struct NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel *type1single = codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel;
- if (type1single->nrOfAntennaPorts.present == NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts_PR_moreThanTwo) {
- if (type1single->nrOfAntennaPorts.choice.moreThanTwo->n1_n2.present >
- NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_two_one_TypeI_SinglePanel_Restriction) {
- // more than 4 antenna ports
- if (max_ri > 4)
- csi_report->csi_meas_bitlen.cqi_bitlen += 4; // CQI for second TB
+ for(int i=0; i<8; i++) {
+ if ((ri_restriction>>i)&0x01) {
+ csi_report->csi_meas_bitlen.cqi_bitlen[i] = 4;
+ if(codebookConfig != NULL) {
+ if (NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel == codebookConfig->codebookType.choice.type1->subType.present){
+ struct NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel *type1single = codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel;
+ if (type1single->nrOfAntennaPorts.present == NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts_PR_moreThanTwo) {
+ if (type1single->nrOfAntennaPorts.choice.moreThanTwo->n1_n2.present >
+ NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts__moreThanTwo__n1_n2_PR_two_one_TypeI_SinglePanel_Restriction) {
+ // more than 4 antenna ports
+ if (i > 4)
+ csi_report->csi_meas_bitlen.cqi_bitlen[i] += 4; // CQI for second TB
+ }
+ }
}
}
}
+ else
+ csi_report->csi_meas_bitlen.cqi_bitlen[i] = 0;
}
}
else
AssertFatal(1==0,"Sub-band CQI reporting not yet supported");
}
+
//!TODO : same function can be written to handle csi_resources
void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE_info, int UE_id, module_id_t Mod_idP){
uint8_t csi_report_id = 0;
uint8_t nb_resources = 0;
- uint8_t max_ri = 0;
NR_CSI_ReportConfig__reportQuantity_PR reportQuantity_type;
NR_CSI_ResourceConfigId_t csi_ResourceConfigId;
struct NR_CSI_ResourceConfig *csi_resourceconfig;
@@ -428,8 +622,21 @@ void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE_in
break;
case (NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_CQI):
csi_report->csi_meas_bitlen.cri_bitlen=ceil(log2(nb_resources));
- max_ri = compute_ri_bitlen(csi_reportconfig, csi_report);
- compute_cqi_bitlen(csi_reportconfig, max_ri, csi_report);
+ csi_report->csi_meas_bitlen.ri_restriction = compute_ri_bitlen(csi_reportconfig, csi_report);
+ compute_cqi_bitlen(csi_reportconfig, csi_report->csi_meas_bitlen.ri_restriction, csi_report);
+ break;
+ case (NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_PMI_CQI):
+ csi_report->csi_meas_bitlen.cri_bitlen=ceil(log2(nb_resources));
+ csi_report->csi_meas_bitlen.ri_restriction = compute_ri_bitlen(csi_reportconfig, csi_report);
+ compute_cqi_bitlen(csi_reportconfig, csi_report->csi_meas_bitlen.ri_restriction, csi_report);
+ compute_pmi_bitlen(csi_reportconfig, csi_report->csi_meas_bitlen.ri_restriction, csi_report);
+ break;
+ case (NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_LI_PMI_CQI):
+ csi_report->csi_meas_bitlen.cri_bitlen=ceil(log2(nb_resources));
+ csi_report->csi_meas_bitlen.ri_restriction = compute_ri_bitlen(csi_reportconfig, csi_report);
+ compute_li_bitlen(csi_reportconfig, csi_report->csi_meas_bitlen.ri_restriction, csi_report);
+ compute_cqi_bitlen(csi_reportconfig, csi_report->csi_meas_bitlen.ri_restriction, csi_report);
+ compute_pmi_bitlen(csi_reportconfig, csi_report->csi_meas_bitlen.ri_restriction, csi_report);
break;
default:
AssertFatal(1==0,"Not yet supported CSI report quantity type");
@@ -442,7 +649,8 @@ uint16_t nr_get_csi_bitlen(int Mod_idP,
int UE_id,
uint8_t csi_report_id) {
- uint16_t csi_bitlen =0;
+ uint16_t csi_bitlen = 0;
+ uint16_t max_bitlen = 0;
NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
L1_RSRP_bitlen_t * CSI_report_bitlen = NULL;
CSI_Meas_bitlen_t * csi_meas_bitlen = NULL;
@@ -455,7 +663,18 @@ uint16_t nr_get_csi_bitlen(int Mod_idP,
(CSI_report_bitlen->nb_ssbri_cri -1 )));
} else{
csi_meas_bitlen = &(UE_info->csi_report_template[UE_id][csi_report_id].csi_meas_bitlen); //This might need to be moodif for Aperiodic CSI-RS measurements
- csi_bitlen+= (csi_meas_bitlen->cri_bitlen +csi_meas_bitlen->ri_bitlen+csi_meas_bitlen->li_bitlen+csi_meas_bitlen->cqi_bitlen+csi_meas_bitlen->pmi_x1_bitlen+csi_meas_bitlen->pmi_x2_bitlen);
+ uint16_t temp_bitlen;
+ for (int i=0; i<8; i++) {
+ temp_bitlen = (csi_meas_bitlen->cri_bitlen+
+ csi_meas_bitlen->ri_bitlen+
+ csi_meas_bitlen->li_bitlen[i]+
+ csi_meas_bitlen->cqi_bitlen[i]+
+ csi_meas_bitlen->pmi_x1_bitlen[i]+
+ csi_meas_bitlen->pmi_x2_bitlen[i]);
+ if(temp_bitlen>max_bitlen)
+ max_bitlen = temp_bitlen;
+ }
+ csi_bitlen += max_bitlen;
}
return csi_bitlen;
@@ -733,37 +952,34 @@ void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
idx: resource set index
*/
- //for all reported SSB
- for (idx = 0; idx < nb_of_csi_ssb_report; idx++) {
- nr_ssbri_cri = sched_ctrl->CSI_report[idx].choice.ssb_cri_report.nr_ssbri_cri;
- //extracting the ssb indexes
- for (ssb_idx = 0; ssb_idx < nr_ssbri_cri; ssb_idx++) {
- ssb_index[idx * nb_of_csi_ssb_report + ssb_idx] = sched_ctrl->CSI_report[idx].choice.ssb_cri_report.CRI_SSBRI[ssb_idx];
- }
+ nr_ssbri_cri = sched_ctrl->CSI_report.ssb_cri_report.nr_ssbri_cri;
+ //extracting the ssb indexes
+ for (ssb_idx = 0; ssb_idx < nr_ssbri_cri; ssb_idx++) {
+ ssb_index[idx * nb_of_csi_ssb_report + ssb_idx] = sched_ctrl->CSI_report.ssb_cri_report.CRI_SSBRI[ssb_idx];
+ }
- //if strongest measured RSRP is configured
- strongest_ssb_rsrp = get_measured_rsrp(sched_ctrl->CSI_report[idx].choice.ssb_cri_report.RSRP);
- // including ssb rsrp in mac stats
- stats->cumul_rsrp += strongest_ssb_rsrp;
- stats->num_rsrp_meas++;
- ssb_rsrp[idx * nb_of_csi_ssb_report] = strongest_ssb_rsrp;
- LOG_D(NR_MAC,"ssb_rsrp = %d\n",strongest_ssb_rsrp);
-
- //if current ssb rsrp is greater than better rsrp
- if(ssb_rsrp[idx * nb_of_csi_ssb_report] > better_rsrp_reported) {
- better_rsrp_reported = ssb_rsrp[idx * nb_of_csi_ssb_report];
- target_ssb_beam_index = idx * nb_of_csi_ssb_report;
- }
+ //if strongest measured RSRP is configured
+ strongest_ssb_rsrp = get_measured_rsrp(sched_ctrl->CSI_report.ssb_cri_report.RSRP);
+ // including ssb rsrp in mac stats
+ stats->cumul_rsrp += strongest_ssb_rsrp;
+ stats->num_rsrp_meas++;
+ ssb_rsrp[idx * nb_of_csi_ssb_report] = strongest_ssb_rsrp;
+ LOG_D(MAC,"ssb_rsrp = %d\n",strongest_ssb_rsrp);
+
+ //if current ssb rsrp is greater than better rsrp
+ if(ssb_rsrp[idx * nb_of_csi_ssb_report] > better_rsrp_reported) {
+ better_rsrp_reported = ssb_rsrp[idx * nb_of_csi_ssb_report];
+ target_ssb_beam_index = idx * nb_of_csi_ssb_report;
+ }
- for(diff_rsrp_idx =1; diff_rsrp_idx < nr_ssbri_cri; diff_rsrp_idx++) {
- ssb_rsrp[idx * nb_of_csi_ssb_report + diff_rsrp_idx] = get_diff_rsrp(sched_ctrl->CSI_report[idx].choice.ssb_cri_report.diff_RSRP[diff_rsrp_idx-1], strongest_ssb_rsrp);
+ for(diff_rsrp_idx =1; diff_rsrp_idx < nr_ssbri_cri; diff_rsrp_idx++) {
+ ssb_rsrp[idx * nb_of_csi_ssb_report + diff_rsrp_idx] = get_diff_rsrp(sched_ctrl->CSI_report.ssb_cri_report.diff_RSRP[diff_rsrp_idx-1], strongest_ssb_rsrp);
- //if current reported rsrp is greater than better rsrp
- if(ssb_rsrp[idx * nb_of_csi_ssb_report + diff_rsrp_idx] > better_rsrp_reported) {
- better_rsrp_reported = ssb_rsrp[idx * nb_of_csi_ssb_report + diff_rsrp_idx];
- target_ssb_beam_index = idx * nb_of_csi_ssb_report + diff_rsrp_idx;
- }
- }
+ //if current reported rsrp is greater than better rsrp
+ if(ssb_rsrp[idx * nb_of_csi_ssb_report + diff_rsrp_idx] > better_rsrp_reported) {
+ better_rsrp_reported = ssb_rsrp[idx * nb_of_csi_ssb_report + diff_rsrp_idx];
+ target_ssb_beam_index = idx * nb_of_csi_ssb_report + diff_rsrp_idx;
+ }
}
@@ -897,7 +1113,8 @@ void evaluate_rsrp_report(NR_UE_info_t *UE_info,
int *cumul_bits,
NR_CSI_ReportConfig__reportQuantity_PR reportQuantity_type){
- uint8_t cri_ssbri_bitlen = UE_info->csi_report_template[UE_id][csi_report_id].CSI_report_bitlen.cri_ssbri_bitlen;
+ nr_csi_report_t *csi_report = &UE_info->csi_report_template[UE_id][csi_report_id];
+ uint8_t cri_ssbri_bitlen = csi_report->CSI_report_bitlen.cri_ssbri_bitlen;
uint16_t curr_payload;
/*! As per the spec 38.212 and table: 6.3.1.1.2-12 in a single UCI sequence we can have multiple CSI_report
@@ -918,36 +1135,35 @@ void evaluate_rsrp_report(NR_UE_info_t *UE_info,
multiple simultaneous spatial domain receive filter
*/
- int idx = 0; //Since for SSB RSRP reporting in RRC can configure only one ssb resource set per one report config
- sched_ctrl->CSI_report[idx].choice.ssb_cri_report.nr_ssbri_cri = UE_info->csi_report_template[UE_id][csi_report_id].CSI_report_bitlen.nb_ssbri_cri;
+ sched_ctrl->CSI_report.ssb_cri_report.nr_ssbri_cri = csi_report->CSI_report_bitlen.nb_ssbri_cri;
- for (int csi_ssb_idx = 0; csi_ssb_idx < sched_ctrl->CSI_report[idx].choice.ssb_cri_report.nr_ssbri_cri ; csi_ssb_idx++) {
+ for (int csi_ssb_idx = 0; csi_ssb_idx < sched_ctrl->CSI_report.ssb_cri_report.nr_ssbri_cri ; csi_ssb_idx++) {
curr_payload = pickandreverse_bits(payload, cri_ssbri_bitlen, *cumul_bits);
if (NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP == reportQuantity_type)
- sched_ctrl->CSI_report[idx].choice.ssb_cri_report.CRI_SSBRI [csi_ssb_idx] =
- *(UE_info->csi_report_template[UE_id][csi_report_id].SSB_Index_list[cri_ssbri_bitlen>0?((curr_payload)&~(~1<<(cri_ssbri_bitlen-1))):cri_ssbri_bitlen]);
+ sched_ctrl->CSI_report.ssb_cri_report.CRI_SSBRI [csi_ssb_idx] =
+ *(csi_report->SSB_Index_list[cri_ssbri_bitlen>0?((curr_payload)&~(~1<<(cri_ssbri_bitlen-1))):cri_ssbri_bitlen]);
else
- sched_ctrl->CSI_report[idx].choice.ssb_cri_report.CRI_SSBRI [csi_ssb_idx] =
- *(UE_info->csi_report_template[UE_id][csi_report_id].CSI_Index_list[cri_ssbri_bitlen>0?((curr_payload)&~(~1<<(cri_ssbri_bitlen-1))):cri_ssbri_bitlen]);
+ sched_ctrl->CSI_report.ssb_cri_report.CRI_SSBRI [csi_ssb_idx] =
+ *(csi_report->CSI_Index_list[cri_ssbri_bitlen>0?((curr_payload)&~(~1<<(cri_ssbri_bitlen-1))):cri_ssbri_bitlen]);
*cumul_bits += cri_ssbri_bitlen;
- LOG_D(MAC,"SSB_index = %d\n",sched_ctrl->CSI_report[idx].choice.ssb_cri_report.CRI_SSBRI [csi_ssb_idx]);
+ LOG_D(MAC,"SSB_index = %d\n",sched_ctrl->CSI_report.ssb_cri_report.CRI_SSBRI [csi_ssb_idx]);
}
curr_payload = pickandreverse_bits(payload, 7, *cumul_bits);
- sched_ctrl->CSI_report[idx].choice.ssb_cri_report.RSRP = curr_payload & 0x7f;
+ sched_ctrl->CSI_report.ssb_cri_report.RSRP = curr_payload & 0x7f;
*cumul_bits += 7;
- for (int diff_rsrp_idx =0; diff_rsrp_idx < sched_ctrl->CSI_report[idx].choice.ssb_cri_report.nr_ssbri_cri - 1; diff_rsrp_idx++ ) {
+ for (int diff_rsrp_idx =0; diff_rsrp_idx < sched_ctrl->CSI_report.ssb_cri_report.nr_ssbri_cri - 1; diff_rsrp_idx++ ) {
curr_payload = pickandreverse_bits(payload, 4, *cumul_bits);
- sched_ctrl->CSI_report[idx].choice.ssb_cri_report.diff_RSRP[diff_rsrp_idx] = curr_payload & 0x0f;
+ sched_ctrl->CSI_report.ssb_cri_report.diff_RSRP[diff_rsrp_idx] = curr_payload & 0x0f;
*cumul_bits += 4;
}
- UE_info->csi_report_template[UE_id][csi_report_id].nb_of_csi_ssb_report++;
+ csi_report->nb_of_csi_ssb_report++;
LOG_D(MAC,"rsrp_id = %d rsrp = %d\n",
- sched_ctrl->CSI_report[idx].choice.ssb_cri_report.RSRP,
- get_measured_rsrp(sched_ctrl->CSI_report[idx].choice.ssb_cri_report.RSRP));
+ sched_ctrl->CSI_report.ssb_cri_report.RSRP,
+ get_measured_rsrp(sched_ctrl->CSI_report.ssb_cri_report.RSRP));
}
@@ -956,40 +1172,122 @@ void evaluate_cri_report(uint8_t *payload,
int cumul_bits,
NR_UE_sched_ctrl_t *sched_ctrl){
- int idx = 0; // FIXME not sure about this index. Should it be the same as csi_report_id?
-
uint8_t temp_cri = pickandreverse_bits(payload, cri_bitlen, cumul_bits);
- sched_ctrl->CSI_report[idx].choice.cri_ri_li_pmi_cqi_report.cri = temp_cri;
- LOG_I(NR_MAC,"CRI Report %d\n",temp_cri);
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.cri = temp_cri;
}
-void evaluate_ri_report(uint8_t *payload,
- uint8_t ri_bitlen,
- NR_UE_sched_ctrl_t *sched_ctrl){
-
- AssertFatal(1==0,"Evaluation of RI report not yet implemented\n");
+int evaluate_ri_report(uint8_t *payload,
+ uint8_t ri_bitlen,
+ uint8_t ri_restriction,
+ int cumul_bits,
+ NR_UE_sched_ctrl_t *sched_ctrl){
+
+ uint8_t ri_index = pickandreverse_bits(payload, ri_bitlen, cumul_bits);
+ int count=0;
+ for (int i=0; i<8; i++) {
+ if ((ri_restriction>>i)&0x01) {
+ if(count == ri_index) {
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.ri = i;
+ LOG_I(MAC,"CSI Reported Rank %d\n", i+1);
+ return i;
+ }
+ count++;
+ }
+ }
+ AssertFatal(1==0, "Decoded ri %d does not correspond to any valid value in ri_restriction %d\n",ri_index,ri_restriction);
}
void evaluate_cqi_report(uint8_t *payload,
- uint8_t cqi_bitlen,
- int *cumul_bits,
- NR_UE_sched_ctrl_t *sched_ctrl){
+ nr_csi_report_t *csi_report,
+ int cumul_bits,
+ uint8_t ri,
+ NR_UE_sched_ctrl_t *sched_ctrl,
+ long *cqi_Table){
//TODO sub-band CQI report not yet implemented
- int idx = 0; // FIXME not sure about this index. Should it be the same as csi_report_id?
-
- uint8_t temp_cqi = pickandreverse_bits(payload, 4, *cumul_bits);
- sched_ctrl->CSI_report[idx].choice.cri_ri_li_pmi_cqi_report.wb_cqi_1tb = temp_cqi;
- *cumul_bits += 4;
+ int cqi_bitlen = csi_report->csi_meas_bitlen.cqi_bitlen[ri];
+
+ uint8_t temp_cqi = pickandreverse_bits(payload, 4, cumul_bits);
+
+ // NR_CSI_ReportConfig__cqi_Table_table1 = 0
+ // NR_CSI_ReportConfig__cqi_Table_table2 = 1
+ // NR_CSI_ReportConfig__cqi_Table_table3 = 2
+ if (cqi_Table)
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.cqi_table = *cqi_Table;
+ else
+ AssertFatal(1==0,"CQI Table not present in RRC configuration\n");
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.wb_cqi_1tb = temp_cqi;
LOG_I(MAC,"Wide-band CQI for the first TB %d\n", temp_cqi);
if (cqi_bitlen > 4) {
- temp_cqi = pickandreverse_bits(payload, 4, *cumul_bits);
- sched_ctrl->CSI_report[idx].choice.cri_ri_li_pmi_cqi_report.wb_cqi_2tb = temp_cqi;
+ temp_cqi = pickandreverse_bits(payload, 4, cumul_bits);
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.wb_cqi_2tb = temp_cqi;
LOG_D(MAC,"Wide-band CQI for the second TB %d\n", temp_cqi);
}
+ sched_ctrl->set_mcs = TRUE;
}
+
+uint8_t evaluate_pmi_report(uint8_t *payload,
+ nr_csi_report_t *csi_report,
+ int cumul_bits,
+ uint8_t ri,
+ NR_UE_sched_ctrl_t *sched_ctrl){
+
+ int x1_bitlen = csi_report->csi_meas_bitlen.pmi_x1_bitlen[ri];
+ int x2_bitlen = csi_report->csi_meas_bitlen.pmi_x2_bitlen[ri];
+ int tot_bitlen = x1_bitlen + x2_bitlen;
+
+ //in case of 2 port CSI configuration x1 is empty and the information bits are in x2
+ int temp_pmi = pickandreverse_bits(payload, tot_bitlen, cumul_bits);
+
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.pmi_x1 = temp_pmi&((1<<x1_bitlen)-1);
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.pmi_x2 = (temp_pmi>>x1_bitlen)&((1<<x2_bitlen)-1);
+ LOG_I(MAC,"PMI Report: X1 %d X2 %d\n",
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.pmi_x1,
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.pmi_x2);
+
+ return tot_bitlen;
+
+}
+
+
+int evaluate_li_report(uint8_t *payload,
+ nr_csi_report_t *csi_report,
+ int cumul_bits,
+ uint8_t ri,
+ NR_UE_sched_ctrl_t *sched_ctrl){
+
+ int li_bitlen = csi_report->csi_meas_bitlen.li_bitlen[ri];
+
+ if (li_bitlen>0) {
+ int temp_li = pickandreverse_bits(payload, li_bitlen, cumul_bits);
+ LOG_I(MAC,"LI %d\n",temp_li);
+ sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.li = temp_li;
+ }
+ return li_bitlen;
+
+}
+
+void skip_zero_padding(int *cumul_bits,
+ nr_csi_report_t *csi_report,
+ uint8_t ri,
+ uint16_t max_bitlen) {
+
+ // actual number of reported bits depends on the reported rank
+ // zero padding bits are added to have a predetermined max bit length to decode
+
+ uint16_t reported_bitlen = csi_report->csi_meas_bitlen.cri_bitlen+
+ csi_report->csi_meas_bitlen.ri_bitlen+
+ csi_report->csi_meas_bitlen.li_bitlen[ri]+
+ csi_report->csi_meas_bitlen.cqi_bitlen[ri]+
+ csi_report->csi_meas_bitlen.pmi_x1_bitlen[ri]+
+ csi_report->csi_meas_bitlen.pmi_x2_bitlen[ri];
+
+ *cumul_bits+=(max_bitlen-reported_bitlen);
+}
+
+
void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
const nfapi_nr_uci_pucch_pdu_format_2_3_4_t *uci_pdu,
frame_t frame,
@@ -1002,22 +1300,26 @@ void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
RC.nrmac[Mod_idP]->common_channels->ServingCellConfigCommon;
const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
uint8_t *payload = uci_pdu->csi_part1.csi_part1_payload;
+ uint16_t bitlen = uci_pdu->csi_part1.csi_part1_bit_len;
NR_CSI_ReportConfig__reportQuantity_PR reportQuantity_type = NR_CSI_ReportConfig__reportQuantity_PR_NOTHING;
NR_UE_info_t *UE_info = &(RC.nrmac[Mod_idP]->UE_info);
NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
int cumul_bits = 0;
+ int r_index = -1;
for (int csi_report_id = 0; csi_report_id < csi_MeasConfig->csi_ReportConfigToAddModList->list.count; csi_report_id++ ) {
- UE_info->csi_report_template[UE_id][csi_report_id].nb_of_csi_ssb_report = 0;
+ nr_csi_report_t *csi_report = &UE_info->csi_report_template[UE_id][csi_report_id];
+ csi_report->nb_of_csi_ssb_report = 0;
uint8_t cri_bitlen = 0;
uint8_t ri_bitlen = 0;
- uint8_t cqi_bitlen = 0;
+ uint8_t li_bitlen = 0;
+ uint8_t pmi_bitlen = 0;
NR_CSI_ReportConfig_t *csirep = csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id];
int period, offset;
csi_period_offset(csirep, NULL, &period, &offset);
// verify if report with current id has been scheduled for this frame and slot
if ((n_slots_frame*frame + slot - offset)%period == 0) {
- reportQuantity_type = UE_info->csi_report_template[UE_id][csi_report_id].reportQuantity_type;
- LOG_I(MAC,"SFN/SF:%d/%d reportQuantity type = %d\n",frame,slot,reportQuantity_type);
+ reportQuantity_type = csi_report->reportQuantity_type;
+ LOG_D(MAC,"SFN/SF:%d/%d reportQuantity type = %d\n",frame,slot,reportQuantity_type);
switch(reportQuantity_type){
case NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP:
evaluate_rsrp_report(UE_info,sched_ctrl,UE_id,csi_report_id,payload,&cumul_bits,reportQuantity_type);
@@ -1026,18 +1328,49 @@ void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
evaluate_rsrp_report(UE_info,sched_ctrl,UE_id,csi_report_id,payload,&cumul_bits,reportQuantity_type);
break;
case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_CQI:
- cri_bitlen = UE_info->csi_report_template[UE_id][csi_report_id].csi_meas_bitlen.cri_bitlen;
+ cri_bitlen = csi_report->csi_meas_bitlen.cri_bitlen;
+ if(cri_bitlen)
+ evaluate_cri_report(payload,cri_bitlen,cumul_bits,sched_ctrl);
+ cumul_bits += cri_bitlen;
+ ri_bitlen = csi_report->csi_meas_bitlen.ri_bitlen;
+ if(ri_bitlen)
+ r_index = evaluate_ri_report(payload,ri_bitlen,csi_report->csi_meas_bitlen.ri_restriction,cumul_bits,sched_ctrl);
+ cumul_bits += ri_bitlen;
+ if (r_index != -1)
+ skip_zero_padding(&cumul_bits,csi_report,r_index,bitlen);
+ evaluate_cqi_report(payload,csi_report,cumul_bits,r_index,sched_ctrl,csirep->cqi_Table);
+ break;
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_PMI_CQI:
+ cri_bitlen = csi_report->csi_meas_bitlen.cri_bitlen;
+ if(cri_bitlen)
+ evaluate_cri_report(payload,cri_bitlen,cumul_bits,sched_ctrl);
+ cumul_bits += cri_bitlen;
+ ri_bitlen = csi_report->csi_meas_bitlen.ri_bitlen;
+ if(ri_bitlen)
+ r_index = evaluate_ri_report(payload,ri_bitlen,csi_report->csi_meas_bitlen.ri_restriction,cumul_bits,sched_ctrl);
+ cumul_bits += ri_bitlen;
+ if (r_index != -1)
+ skip_zero_padding(&cumul_bits,csi_report,r_index,bitlen);
+ pmi_bitlen = evaluate_pmi_report(payload,csi_report,cumul_bits,r_index,sched_ctrl);
+ cumul_bits += pmi_bitlen;
+ evaluate_cqi_report(payload,csi_report,cumul_bits,r_index,sched_ctrl,csirep->cqi_Table);
+ break;
+ case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_LI_PMI_CQI:
+ cri_bitlen = csi_report->csi_meas_bitlen.cri_bitlen;
if(cri_bitlen)
evaluate_cri_report(payload,cri_bitlen,cumul_bits,sched_ctrl);
cumul_bits += cri_bitlen;
- ri_bitlen = UE_info->csi_report_template[UE_id][csi_report_id].csi_meas_bitlen.ri_bitlen;
+ ri_bitlen = csi_report->csi_meas_bitlen.ri_bitlen;
if(ri_bitlen)
- evaluate_ri_report(payload,ri_bitlen,sched_ctrl);
+ r_index = evaluate_ri_report(payload,ri_bitlen,csi_report->csi_meas_bitlen.ri_restriction,cumul_bits,sched_ctrl);
cumul_bits += ri_bitlen;
- //TODO add zero padding bits when needed
- cqi_bitlen = UE_info->csi_report_template[UE_id][csi_report_id].csi_meas_bitlen.cqi_bitlen;
- if(cqi_bitlen)
- evaluate_cqi_report(payload,cqi_bitlen,&cumul_bits,sched_ctrl);
+ li_bitlen = evaluate_li_report(payload,csi_report,cumul_bits,r_index,sched_ctrl);
+ cumul_bits += li_bitlen;
+ if (r_index != -1)
+ skip_zero_padding(&cumul_bits,csi_report,r_index,bitlen);
+ pmi_bitlen = evaluate_pmi_report(payload,csi_report,cumul_bits,r_index,sched_ctrl);
+ cumul_bits += pmi_bitlen;
+ evaluate_cqi_report(payload,csi_report,cumul_bits,r_index,sched_ctrl,csirep->cqi_Table);
break;
default:
AssertFatal(1==0, "Invalid or not supported CSI measurement report\n");
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 11516225a1a12b90566b79535b095ef04e212f39..89410b6c2beddfb6ff31600ecc96c6f13b727c29 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -971,6 +971,7 @@ bool allocate_ul_retransmission(module_id_t module_id,
uint16_t new_rbSize;
bool success = nr_find_nb_rb(retInfo->Qm,
retInfo->R,
+ 1, // layers
temp_ps.nrOfSymbols,
temp_ps.N_PRB_DMRS * temp_ps.num_dmrs_symb,
retInfo->tb_size,
@@ -988,6 +989,9 @@ bool allocate_ul_retransmission(module_id_t module_id,
retInfo->rbSize = new_rbSize;
retInfo->time_domain_allocation = tda;
sched_ctrl->pusch_semi_static = temp_ps;
+
+ // Get previous PUSCH filed info
+ sched_ctrl->sched_pusch = *retInfo;
}
/* Find free CCE */
@@ -1248,6 +1252,7 @@ void pf_ul(module_id_t module_id,
nr_find_nb_rb(sched_pusch->Qm,
sched_pusch->R,
+ 1, // layers
ps->nrOfSymbols,
ps->N_PRB_DMRS * ps->num_dmrs_symb,
B,
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index 7568c8d9fe1cfd15181a23166c1c9ab2e754f5e2..8b0da876fcb4ab9f0adee0c6949a25c579635c98 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -244,7 +244,7 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
uint16_t O_csi,
uint16_t O_ack,
uint8_t O_sr,
- int r_pucch);
+ int r_pucch);
void find_search_space(int ss_type,
NR_BWP_Downlink_t *bwp,
@@ -290,7 +290,8 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
const NR_BWP_Downlink_t *bwp,
const NR_BWP_DownlinkDedicated_t *bwpd0,
int tda,
- const long dci_format,
+ uint8_t layers,
+ NR_UE_sched_ctrl_t *sched_ctrl,
NR_pdsch_semi_static_t *ps);
void nr_set_pusch_semi_static(const NR_ServingCellConfigCommon_t *scc,
@@ -427,6 +428,12 @@ void find_SSB_and_RO_available(module_id_t module_idP);
void set_dl_dmrs_ports(NR_pdsch_semi_static_t *ps);
+void set_dl_mcs(NR_sched_pdsch_t *sched_pdsch,
+ NR_UE_sched_ctrl_t *sched_ctrl,
+ uint8_t mcs_table_idx);
+
+uint8_t set_dl_nrOfLayers(NR_UE_sched_ctrl_t *sched_ctrl);
+
void calculate_preferred_dl_tda(module_id_t module_id, const NR_BWP_Downlink_t *bwp);
void calculate_preferred_ul_tda(module_id_t module_id, const NR_BWP_Uplink_t *ubwp);
@@ -434,6 +441,7 @@ bool find_free_CCE(module_id_t module_id, sub_frame_t slot, int UE_id);
bool nr_find_nb_rb(uint16_t Qm,
uint16_t R,
+ uint8_t nrOfLayers,
uint16_t nb_symb_sch,
uint16_t nb_dmrs_prb,
uint32_t bytes,
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index b2735b24287423956f5ec37d5592ac05fccaa6f2..db3295b15272b3baffdf2c36f0483f9bc522143c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -365,7 +365,8 @@ typedef struct NR_sched_pusch {
typedef struct NR_pdsch_semi_static {
int time_domain_allocation;
uint8_t numDmrsCdmGrpsNoData;
-
+ uint8_t frontloaded_symb;
+ int mapping_type;
int startSymbolIndex;
int nrOfSymbols;
uint8_t nrOfLayers;
@@ -444,6 +445,7 @@ struct CRI_RI_LI_PMI_CQI {
uint8_t pmi_x2;
uint8_t wb_cqi_1tb;
uint8_t wb_cqi_2tb;
+ uint8_t cqi_table;
};
typedef struct CRI_SSB_RSRP {
@@ -454,11 +456,8 @@ typedef struct CRI_SSB_RSRP {
} CRI_SSB_RSRP_t;
struct CSI_Report {
- NR_CSI_Report_Config_PR present;
- union Config_CSI_Report {
- struct CRI_RI_LI_PMI_CQI cri_ri_li_pmi_cqi_report;
- struct CRI_SSB_RSRP ssb_cri_report;
- } choice;
+ struct CRI_RI_LI_PMI_CQI cri_ri_li_pmi_cqi_report;
+ struct CRI_SSB_RSRP ssb_cri_report;
};
#define MAX_SR_BITLEN 8
@@ -471,12 +470,13 @@ typedef struct {
}L1_RSRP_bitlen_t;
typedef struct{
+ uint8_t ri_restriction;
uint8_t cri_bitlen;
uint8_t ri_bitlen;
- uint8_t li_bitlen;
- uint8_t pmi_x1_bitlen;
- uint8_t pmi_x2_bitlen;
- uint8_t cqi_bitlen;
+ uint8_t li_bitlen[8];
+ uint8_t pmi_x1_bitlen[8];
+ uint8_t pmi_x2_bitlen[8];
+ uint8_t cqi_bitlen[8];
} CSI_Meas_bitlen_t;
typedef struct nr_csi_report {
@@ -578,9 +578,9 @@ typedef struct {
int pusch_consecutive_dtx_cnt;
int pucch_consecutive_dtx_cnt;
int ul_failure;
- struct CSI_Report CSI_report[MAX_CSI_REPORTS];
+ struct CSI_Report CSI_report;
bool SR;
-
+ bool set_mcs;
/// information about every HARQ process
NR_UE_harq_t harq_processes[NR_MAX_NB_HARQ_PROCESSES];
/// HARQ processes that are free
@@ -633,7 +633,6 @@ typedef struct {
NR_mac_stats_t mac_stats[MAX_MOBILES_PER_GNB];
NR_list_t list;
int num_UEs;
-
bool active[MAX_MOBILES_PER_GNB];
rnti_t rnti[MAX_MOBILES_PER_GNB];
NR_CellGroupConfig_t *CellGroup[MAX_MOBILES_PER_GNB];
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index f9076c50aebfc59c01eae6e6e1e320b669b1775a..c863123747b589c0f5bdb872832f2a3e58401591 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -952,7 +952,7 @@ boolean_t nr_rrc_pdcp_config_asn1_req(
if (kRRCint != NULL) {
/* todo */
}
-
+
if (drb2release_list != NULL) {
// TODO
}
diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c
index a7f2a7dabd8de501cc3f1a8e88dcece6a4f67ee7..c1d0359bd260d0569778c337b4ce1e9bec817e9c 100644
--- a/openair2/RRC/NR/L2_nr_interface.c
+++ b/openair2/RRC/NR/L2_nr_interface.c
@@ -366,10 +366,10 @@ int8_t nr_mac_rrc_data_ind(const module_id_t module_idP,
}
void nr_mac_gNB_rrc_ul_failure(const module_id_t Mod_instP,
- const int CC_idP,
- const frame_t frameP,
- const sub_frame_t subframeP,
- const rnti_t rntiP) {
+ const int CC_idP,
+ const frame_t frameP,
+ const sub_frame_t subframeP,
+ const rnti_t rntiP) {
struct rrc_gNB_ue_context_s *ue_context_p = NULL;
ue_context_p = rrc_gNB_get_ue_context(
RC.nrrrc[Mod_instP],
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c
index c0fe0510c90856618d46df91f4a3810894e8c8cb..121696744b37a39069e3700163a76ffc8f391034 100755
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c
@@ -1267,8 +1267,8 @@ void fill_initial_SpCellConfig(rnti_t rnti,
// frequency domain resources depends on BWP size
// options are 24, 48 or 96
coreset->frequencyDomainResources.buf = calloc(1,6);
+ int curr_bwp = scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
if (0) {
- int curr_bwp = scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
if (curr_bwp < 48)
coreset->frequencyDomainResources.buf[0] = 0xf0;
else
@@ -1422,7 +1422,7 @@ void fill_initial_SpCellConfig(rnti_t rnti,
csi_MeasConfig->nzp_CSI_RS_ResourceSetToReleaseList = NULL;
- config_csirs(scc, csi_MeasConfig,carrier->pdsch_AntennaPorts,carrier->do_CSIRS);
+ config_csirs(scc, csi_MeasConfig,carrier->pdsch_AntennaPorts,curr_bwp,carrier->do_CSIRS);
csi_MeasConfig->csi_SSB_ResourceSetToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_SSB_ResourceSetToAddModList));
csi_MeasConfig->csi_SSB_ResourceSetToReleaseList = NULL;
@@ -1493,6 +1493,8 @@ void fill_initial_SpCellConfig(rnti_t rnti,
NR_CSI_IM_ResourceSetId_t *csiim00 = calloc(1,sizeof(*csiim00));
*csiim00 = 0;
ASN_SEQUENCE_ADD(&csires2->csi_RS_ResourceSetList.choice.csi_IM_ResourceSetList->list,csiim00);
+ csires2->bwp_Id=0;
+ csires2->resourceType = NR_CSI_ResourceConfig__resourceType_periodic;
ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ResourceConfigToAddModList->list,csires2);
}
@@ -1522,14 +1524,15 @@ void fill_initial_SpCellConfig(rnti_t rnti,
*csirep1->reportFreqConfiguration->cqi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__cqi_FormatIndicator_widebandCQI;
csirep1->reportFreqConfiguration->pmi_FormatIndicator = calloc(1,sizeof(*csirep1->reportFreqConfiguration->pmi_FormatIndicator));
*csirep1->reportFreqConfiguration->pmi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__pmi_FormatIndicator_widebandPMI;
- csirep1->reportFreqConfiguration->csi_ReportingBand = calloc(1,sizeof(*csirep1->reportFreqConfiguration->csi_ReportingBand));
+ csirep1->reportFreqConfiguration->csi_ReportingBand = NULL;
+/*calloc(1,sizeof(*csirep1->reportFreqConfiguration->csi_ReportingBand));
csirep1->reportFreqConfiguration->csi_ReportingBand->present = NR_CSI_ReportConfig__reportFreqConfiguration__csi_ReportingBand_PR_subbands7;
csirep1->reportFreqConfiguration->csi_ReportingBand->choice.subbands7.size=1;
csirep1->reportFreqConfiguration->csi_ReportingBand->choice.subbands7.bits_unused=1;
csirep1->reportFreqConfiguration->csi_ReportingBand->choice.subbands7.buf=malloc(1);
- csirep1->reportFreqConfiguration->csi_ReportingBand->choice.subbands7.buf[0]=254;
- csirep1->timeRestrictionForChannelMeasurements= NR_CSI_ReportConfig__timeRestrictionForChannelMeasurements_configured;
- csirep1->timeRestrictionForInterferenceMeasurements=NR_CSI_ReportConfig__timeRestrictionForInterferenceMeasurements_configured;
+ csirep1->reportFreqConfiguration->csi_ReportingBand->choice.subbands7.buf[0]=254;*/
+ csirep1->timeRestrictionForChannelMeasurements= NR_CSI_ReportConfig__timeRestrictionForChannelMeasurements_notConfigured;
+ csirep1->timeRestrictionForInterferenceMeasurements=NR_CSI_ReportConfig__timeRestrictionForInterferenceMeasurements_notConfigured;
csirep1->codebookConfig=calloc(1,sizeof(*csirep1->codebookConfig));
csirep1->codebookConfig->codebookType.present = NR_CodebookConfig__codebookType_PR_type1;
csirep1->codebookConfig->codebookType.choice.type1 = calloc(1,sizeof(*csirep1->codebookConfig->codebookType.choice.type1));
@@ -1593,40 +1596,6 @@ void fill_initial_SpCellConfig(rnti_t rnti,
csirep2->ext1 = NULL;
ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ReportConfigToAddModList->list,csirep2);
}
- /*
- NR_CSI_ReportConfig_t *csirep2 = calloc(1,sizeof(*csirep2));
- csirep2->reportConfigId=1;
- csirep2->carrier=NULL;
- csirep2->resourcesForChannelMeasurement=1;
- csirep2->csi_IM_ResourcesForInterference=NULL;
- csirep2->nzp_CSI_RS_ResourcesForInterference=NULL;
- csirep2->reportConfigType.present = NR_CSI_ReportConfig__reportConfigType_PR_periodic;
- csirep2->reportConfigType.choice.periodic = calloc(1,sizeof(*csirep2->reportConfigType.choice.periodic));
- csirep2->reportConfigType.choice.periodic->reportSlotConfig.present=NR_CSI_ReportPeriodicityAndOffset_PR_slots320;
- csirep2->reportConfigType.choice.periodic->reportSlotConfig.choice.slots320 = 29 + (20 * uid) % 320;
- ASN_SEQUENCE_ADD(&csirep2->reportConfigType.choice.periodic->pucch_CSI_ResourceList.list,pucchcsires1);
- csirep2->reportQuantity.present = NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP;
- csirep2->reportQuantity.choice.ssb_Index_RSRP=(NULL_t)0;
- csirep2->reportFreqConfiguration = calloc(1,sizeof(*csirep2->reportFreqConfiguration));
- csirep2->reportFreqConfiguration->cqi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__cqi_FormatIndicator_widebandCQI;
- csirep2->reportFreqConfiguration->pmi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__pmi_FormatIndicator_widebandPMI;
- csirep2->reportFreqConfiguration->csi_ReportingBand=NULL;
- csirep2->timeRestrictionForChannelMeasurements= NR_CSI_ReportConfig__timeRestrictionForChannelMeasurements_configured;
- csirep2->timeRestrictionForInterferenceMeasurements=NR_CSI_ReportConfig__timeRestrictionForInterferenceMeasurements_configured;
- csirep2->codebookConfig= NULL;
- csirep2->dummy = NULL;
- csirep2->groupBasedBeamReporting.present = NR_CSI_ReportConfig__groupBasedBeamReporting_PR_disabled;
- csirep2->groupBasedBeamReporting.choice.disabled=calloc(1,sizeof(*csirep2->groupBasedBeamReporting.choice.disabled));
- csirep2->groupBasedBeamReporting.choice.disabled->nrofReportedRS = calloc(1,sizeof(*csirep2->groupBasedBeamReporting.choice.disabled->nrofReportedRS));
- *csirep2->groupBasedBeamReporting.choice.disabled->nrofReportedRS=NR_CSI_ReportConfig__groupBasedBeamReporting__disabled__nrofReportedRS_n1;
- csirep2->cqi_Table = calloc(1,sizeof(*csirep2->cqi_Table));
- *csirep2->cqi_Table = NR_CSI_ReportConfig__cqi_Table_table1;
- csirep2->subbandSize = NR_CSI_ReportConfig__subbandSize_value1;
- csirep2->non_PMI_PortIndication = NULL;
- csirep2->ext1 = NULL;
- ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ReportConfigToAddModList->list,csirep2);
-*/
-
pdsch_servingcellconfig->codeBlockGroupTransmission = NULL;
pdsch_servingcellconfig->xOverhead = NULL;
pdsch_servingcellconfig->nrofHARQ_ProcessesForPDSCH = calloc(1, sizeof(*pdsch_servingcellconfig->nrofHARQ_ProcessesForPDSCH));
diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index 17e8f00e74665bd960ffde14c80c3d47094a5658..1744182034620446ecff53147400abd5a9b7f01d 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -455,7 +455,6 @@ typedef struct {
NR_CellGroupConfig_t *secondaryCellGroup[MAX_NR_RRC_UE_CONTEXTS];
NR_SRB_INFO SI;
NR_SRB_INFO Srb0;
- int initial_csi_index[MAX_NR_RRC_UE_CONTEXTS];
int p_gNB;
} rrc_gNB_carrier_data_t;
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index 6249416fa027cc305b042f6bab6a55ebab8285e1..df8853a19d4eb24c0b2b31265b80bb88860b3551 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -80,10 +80,13 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
int servCellIndex,
int dl_antenna_ports,
int do_csirs,
- int initial_csi_index,
int uid);
-void config_csirs(NR_ServingCellConfigCommon_t *servingcellconfigcommon, NR_CSI_MeasConfig_t *csi_MeasConfig, int dl_antenna_ports, int do_csirs);
+void config_csirs(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
+ NR_CSI_MeasConfig_t *csi_MeasConfig,
+ int dl_antenna_ports,
+ int curr_bwp,
+ int do_csirs);
void fill_default_reconfig(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
NR_ServingCellConfig_t *servingcellconfigdedicated,
@@ -91,7 +94,6 @@ void fill_default_reconfig(NR_ServingCellConfigCommon_t *servingcellconfigcommon
NR_CellGroupConfig_t *secondaryCellGroup,
int dl_antenna_ports,
int do_csirs,
- int initial_csi_index,
int uid);
void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 655e6973a161a5f11228134b1cc1f77d7937ca79..1ee3798164a098e392cf3c4fe594406a3d4b77c9 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -3096,20 +3096,20 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &(RC.nrrrc[ctxt_pP->module_id]->rrc_ue_head)) {
ctxt_pP->rnti = ue_context_p->ue_id_rnti;
- if (fd) {
- if (ue_context_p->ue_context.Initialue_identity_5g_s_TMSI.presence == TRUE) {
- fprintf(fd,"NR RRC UE rnti %x: S-TMSI %x failure timer %d/8\n",
+ if (fd) {
+ if (ue_context_p->ue_context.Initialue_identity_5g_s_TMSI.presence == TRUE) {
+ fprintf(fd,"NR RRC UE rnti %x: S-TMSI %x failure timer %d/8\n",
ue_context_p->ue_id_rnti,
ue_context_p->ue_context.Initialue_identity_5g_s_TMSI.fiveg_tmsi,
ue_context_p->ue_context.ul_failure_timer);
- } else {
- fprintf(fd,"NR RRC UE rnti %x failure timer %d/8\n",
+ } else {
+ fprintf(fd,"NR RRC UE rnti %x failure timer %d/8\n",
ue_context_p->ue_id_rnti,
ue_context_p->ue_context.ul_failure_timer);
- }
+ }
- if (ue_context_p->ue_context.UE_Capability_nr) {
- fprintf(fd,"NR RRC UE cap: BW DL %x. BW UL %x, 256 QAM DL %s, 256 QAM UL %s, DL MIMO Layers %d UL MIMO Layers (CB) %d UL MIMO Layers (nonCB) %d\n",
+ if (ue_context_p->ue_context.UE_Capability_nr) {
+ fprintf(fd,"NR RRC UE cap: BW DL %x. BW UL %x, 256 QAM DL %s, 256 QAM UL %s, DL MIMO Layers %d UL MIMO Layers (CB) %d UL MIMO Layers (nonCB) %d\n",
get_dl_bw_mask(RC.nrrrc[0],ue_context_p->ue_context.UE_Capability_nr),
get_ul_bw_mask(RC.nrrrc[0],ue_context_p->ue_context.UE_Capability_nr),
is_dl_256QAM_supported(RC.nrrrc[0],ue_context_p->ue_context.UE_Capability_nr) == 1 ? "yes" : "no",
@@ -3117,7 +3117,7 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
get_dl_mimo_layers(RC.nrrrc[0],ue_context_p->ue_context.UE_Capability_nr),
get_ul_mimo_layersCB(RC.nrrrc[0],ue_context_p->ue_context.UE_Capability_nr),
get_ul_mimo_layers(RC.nrrrc[0],ue_context_p->ue_context.UE_Capability_nr));
- }
+ }
}
if (ue_context_p->ue_context.ul_failure_timer > 0) {
ue_context_p->ue_context.ul_failure_timer++;
@@ -3178,6 +3178,7 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
if (fd) fclose(fd);
+
/* send a tick to x2ap */
if (is_x2ap_enabled()){
msg = itti_alloc_new_message(TASK_RRC_ENB, 0, X2AP_SUBFRAME_PROCESS);
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index 52f451d7bb4bd41ea43b9e76e5c0c11681c97116..57906384ac37b5cc2378b7dc92c6ffe18ed2ce41 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -153,7 +153,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
ue_context_p->ue_context.reconfig->criticalExtensions.present = NR_RRCReconfiguration__criticalExtensions_PR_rrcReconfiguration;
NR_RRCReconfiguration_IEs_t *reconfig_ies=calloc(1,sizeof(NR_RRCReconfiguration_IEs_t));
ue_context_p->ue_context.reconfig->criticalExtensions.choice.rrcReconfiguration = reconfig_ies;
- carrier->initial_csi_index[ue_context_p->local_uid + 1] = 0;
ue_context_p->ue_context.rb_config = calloc(1,sizeof(NR_RRCReconfiguration_t));
if (get_softmodem_params()->phy_test == 1 || get_softmodem_params()->do_ra == 1 || get_softmodem_params()->sa == 1){
fill_default_rbconfig(ue_context_p->ue_context.rb_config,
@@ -257,7 +256,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
ue_context_p->ue_context.secondaryCellGroup,
carrier->pdsch_AntennaPorts,
carrier->do_CSIRS,
- carrier->initial_csi_index[ue_context_p->local_uid + 1],
ue_context_p->local_uid);
} else {
fill_default_reconfig(carrier->servingcellconfigcommon,
@@ -266,7 +264,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
ue_context_p->ue_context.secondaryCellGroup,
carrier->pdsch_AntennaPorts,
carrier->do_CSIRS,
- carrier->initial_csi_index[ue_context_p->local_uid + 1],
ue_context_p->local_uid);
}
ue_context_p->ue_id_rnti = ue_context_p->ue_context.secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity;
diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c
index 980bd39c379e7eab06f769f561b1158d68b31c7e..a54ce7856a307aaabd48a10e54b371b96d21ea8a 100644
--- a/openair2/RRC/NR/rrc_gNB_reconfig.c
+++ b/openair2/RRC/NR/rrc_gNB_reconfig.c
@@ -56,8 +56,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
int servCellIndex,
int dl_antenna_ports,
int do_csirs,
- int initial_csi_index,
int uid) {
+
AssertFatal(servingcellconfigcommon!=NULL,"servingcellconfigcommon is null\n");
AssertFatal(secondaryCellGroup!=NULL,"secondaryCellGroup is null\n");
@@ -553,7 +553,9 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
}
bwp->bwp_Dedicated->pdsch_Config->choice.setup->dataScramblingIdentityPDSCH = NULL;
- if (dl_antenna_ports > 1)// for MIMO, we use DMRS Config Type 2
+ if ((get_softmodem_params()->do_ra ||
+ get_softmodem_params()->phy_test) &&
+ dl_antenna_ports > 1) // for MIMO, we use DMRS Config Type 2 but only with OAI UE
bwp->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type=calloc(1,sizeof(*bwp->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type));
else
bwp->bwp_Dedicated->pdsch_Config->choice.setup->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type=NULL;
@@ -1032,7 +1034,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
pdsch_servingcellconfig->pucch_Cell= NULL;
pdsch_servingcellconfig->ext1=calloc(1,sizeof(*pdsch_servingcellconfig->ext1));
pdsch_servingcellconfig->ext1->maxMIMO_Layers = calloc(1,sizeof(*pdsch_servingcellconfig->ext1->maxMIMO_Layers));
- *pdsch_servingcellconfig->ext1->maxMIMO_Layers = 2;
+ *pdsch_servingcellconfig->ext1->maxMIMO_Layers = dl_antenna_ports;
pdsch_servingcellconfig->ext1->processingType2Enabled = NULL;
secondaryCellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig=NULL;
@@ -1053,7 +1055,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
imres0->csi_IM_ResourceElementPattern->choice.pattern1->symbolLocation_p1 = 6;
imres0->freqBand = calloc(1,sizeof(*imres0->freqBand));
imres0->freqBand->startingRB = 0;
- imres0->freqBand->nrofRBs = 108;
+ imres0->freqBand->nrofRBs = ((curr_bwp>>2)+(curr_bwp%4>0))<<2;
imres0->periodicityAndOffset = calloc(1,sizeof(*imres0->periodicityAndOffset));
imres0->periodicityAndOffset->present = NR_CSI_ResourcePeriodicityAndOffset_PR_slots320;
imres0->periodicityAndOffset->choice.slots320 = 0;
@@ -1072,7 +1074,6 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
}
csi_MeasConfig->csi_IM_ResourceToReleaseList = NULL;
- csi_MeasConfig->csi_IM_ResourceSetToAddModList = NULL;
csi_MeasConfig->csi_IM_ResourceSetToReleaseList = NULL;
if (do_csirs) {
@@ -1092,7 +1093,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
csi_MeasConfig->nzp_CSI_RS_ResourceSetToReleaseList = NULL;
- config_csirs(servingcellconfigcommon, csi_MeasConfig,dl_antenna_ports,do_csirs);
+ config_csirs(servingcellconfigcommon, csi_MeasConfig,dl_antenna_ports,curr_bwp,do_csirs);
csi_MeasConfig->csi_SSB_ResourceSetToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_SSB_ResourceSetToAddModList));
csi_MeasConfig->csi_SSB_ResourceSetToReleaseList = NULL;
@@ -1147,6 +1148,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
NR_CSI_IM_ResourceSetId_t *csiim00 = calloc(1,sizeof(*csiim00));
*csiim00 = 0;
ASN_SEQUENCE_ADD(&csires2->csi_RS_ResourceSetList.choice.csi_IM_ResourceSetList->list,csiim00);
+ csires2->bwp_Id = 1;
+ csires2->resourceType = NR_CSI_ResourceConfig__resourceType_periodic;
ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ResourceConfigToAddModList->list,csires2);
}
@@ -1291,7 +1294,11 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
}
-void config_csirs(NR_ServingCellConfigCommon_t *servingcellconfigcommon, NR_CSI_MeasConfig_t *csi_MeasConfig, int dl_antenna_ports, int do_csirs) {
+void config_csirs(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
+ NR_CSI_MeasConfig_t *csi_MeasConfig,
+ int dl_antenna_ports,
+ int curr_bwp,
+ int do_csirs) {
if (do_csirs) {
csi_MeasConfig->nzp_CSI_RS_ResourceToAddModList = calloc(1,sizeof(*csi_MeasConfig->nzp_CSI_RS_ResourceToAddModList));
@@ -1326,7 +1333,7 @@ void config_csirs(NR_ServingCellConfigCommon_t *servingcellconfigcommon, NR_CSI_
resourceMapping.density.present = NR_CSI_RS_ResourceMapping__density_PR_one;
resourceMapping.density.choice.one = (NULL_t)0;
resourceMapping.freqBand.startingRB = 0;
- resourceMapping.freqBand.nrofRBs = 108;
+ resourceMapping.freqBand.nrofRBs = ((curr_bwp>>2)+(curr_bwp%4>0))<<2;
nzpcsi0->resourceMapping = resourceMapping;
nzpcsi0->powerControlOffset = 0;
nzpcsi0->powerControlOffsetSS=calloc(1,sizeof(*nzpcsi0->powerControlOffsetSS));
@@ -1349,7 +1356,6 @@ void fill_default_reconfig(NR_ServingCellConfigCommon_t *servingcellconfigcommon
NR_CellGroupConfig_t *secondaryCellGroup,
int dl_antenna_ports,
int do_csirs,
- int initial_csi_index,
int uid) {
AssertFatal(servingcellconfigcommon!=NULL,"servingcellconfigcommon is null\n");
AssertFatal(reconfig!=NULL,"reconfig is null\n");
@@ -1364,7 +1370,6 @@ void fill_default_reconfig(NR_ServingCellConfigCommon_t *servingcellconfigcommon
1,
dl_antenna_ports,
do_csirs,
- initial_csi_index,
uid);
xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void*)secondaryCellGroup);
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index f7303dc6b5bb2d6f5c721566aabbf8f91f27ab3e..5da5cd0b6786940befaf150fc63093a7cfcdf51b 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -648,30 +648,29 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
AssertFatal(1==0,"Shouldn't be here\n");
}
- samples_received=0;
- while (samples_received != nsamps) {
+ samples_received=0;
+ while (samples_received != nsamps) {
- if (cc>1) {
+ if (cc>1) {
// receive multiple channels (e.g. RF A and RF B)
- std::vector<void *> buff_ptrs;
-
- for (int i=0; i<cc; i++) buff_ptrs.push_back(buff_tmp[i]+samples_received);
+ std::vector<void *> buff_ptrs;
- samples_received += s->rx_stream->recv(buff_ptrs, nsamps, s->rx_md);
- } else {
+ for (int i=0; i<cc; i++) buff_ptrs.push_back(buff_tmp[i]+samples_received);
+ samples_received += s->rx_stream->recv(buff_ptrs, nsamps, s->rx_md);
+ } else {
// receive a single channel (e.g. from connector RF A)
- samples_received += s->rx_stream->recv((void*)((int32_t*)buff_tmp[0]+samples_received),
- nsamps-samples_received, s->rx_md);
- }
- if ((s->wait_for_first_pps == 0) && (s->rx_md.error_code!=uhd::rx_metadata_t::ERROR_CODE_NONE))
- break;
+ samples_received += s->rx_stream->recv((void*)((int32_t*)buff_tmp[0]+samples_received),
+ nsamps-samples_received, s->rx_md);
+ }
+ if ((s->wait_for_first_pps == 0) && (s->rx_md.error_code!=uhd::rx_metadata_t::ERROR_CODE_NONE))
+ break;
- if ((s->wait_for_first_pps == 1) && (samples_received != nsamps)) {
- printf("sleep...\n"); //usleep(100);
- }
+ if ((s->wait_for_first_pps == 1) && (samples_received != nsamps)) {
+ printf("sleep...\n"); //usleep(100);
}
- if (samples_received == nsamps) s->wait_for_first_pps=0;
+ }
+ if (samples_received == nsamps) s->wait_for_first_pps=0;
// bring RX data into 12 LSBs for softmodem RX
for (int i=0; i<cc; i++) {
@@ -694,12 +693,12 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
for (int j=0; j<nsamps2; j++)
((int16x8_t *)buff[i])[j] = vshrq_n_s16(buff_tmp[i][j],rxshift);
#endif
-
}
+ }
- if (samples_received < nsamps) {
- LOG_E(HW,"[recv] received %d samples out of %d\n",samples_received,nsamps);
- }
+ if (samples_received < nsamps) {
+ LOG_E(HW,"[recv] received %d samples out of %d\n",samples_received,nsamps);
+ }
if ( s->rx_md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE)
LOG_E(HW, "%s\n", s->rx_md.to_pp_string(true).c_str());