From 0b873bb6207eee81c7407633ddaa403e878d0377 Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Tue, 17 Sep 2019 17:35:48 +0200 Subject: [PATCH] Time Alignment procedure with time adjustment as per TS 38.213 section 4.2 - UE processing capability 1 - Setting the TA update to be applied after the reception of the TA command - Durations of N1 and N2 symbols corresponding to PDSCH and PUSCH are computed according to sections 5.3 and 6.4 of TS 38.214 - Introduced tables 5.3-1, 5.3-2, 6.4-1, 6.4-2 from TS 38.214 --- openair1/PHY/INIT/nr_init_ue.c | 10 ++ openair1/PHY/impl_defs_nr.h | 10 +- openair1/SCHED_NR_UE/phy_procedures_nr_ue.c | 80 ++++++++++++- .../SCHED_NR_UE/phy_sch_processing_time.h | 109 ++++++++++++++++++ 4 files changed, 203 insertions(+), 6 deletions(-) create mode 100644 openair1/SCHED_NR_UE/phy_sch_processing_time.h diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c index 0c7ce1cdd6..2658fbeeaa 100644 --- a/openair1/PHY/INIT/nr_init_ue.c +++ b/openair1/PHY/INIT/nr_init_ue.c @@ -703,11 +703,21 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, ue->pusch_config.pusch_TimeDomainResourceAllocation[i]->mappingType = typeA; } + for (i=0;iPDSCH_Config.pdsch_TimeDomainResourceAllocation[i] = (NR_PDSCH_TimeDomainResourceAllocation_t *)malloc16(sizeof(NR_PDSCH_TimeDomainResourceAllocation_t)); + ue->PDSCH_Config.pdsch_TimeDomainResourceAllocation[i]->mappingType = typeA; + } + //------------- config DMRS parameters--------------// ue->dmrs_UplinkConfig.pusch_dmrs_type = pusch_dmrs_type1; ue->dmrs_UplinkConfig.pusch_dmrs_AdditionalPosition = pusch_dmrs_pos0; ue->dmrs_UplinkConfig.pusch_maxLength = pusch_len1; //-------------------------------------------------// + ue->dmrs_DownlinkConfig.pdsch_dmrs_type = pdsch_dmrs_type1; + ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition = pdsch_dmrs_pos0; + ue->dmrs_DownlinkConfig.pdsch_maxLength = pdsch_len1; + //-------------------------------------------------// + ue->nr_gold_pusch_dmrs = (uint32_t ****)malloc16(fp->slots_per_frame*sizeof(uint32_t ***)); pusch_dmrs = ue->nr_gold_pusch_dmrs; n_scid = 0; // This quantity is indicated by higher layer parameter dmrs-SeqInitialization diff --git a/openair1/PHY/impl_defs_nr.h b/openair1/PHY/impl_defs_nr.h index cff2f02444..099ecd122a 100644 --- a/openair1/PHY/impl_defs_nr.h +++ b/openair1/PHY/impl_defs_nr.h @@ -36,6 +36,7 @@ #include #include "types.h" +#include "NR_PDSCH-TimeDomainResourceAllocation.h" #ifdef DEFINE_VARIABLES_PHY_IMPLEMENTATION_DEFS_NR_H #define EXTERN @@ -377,8 +378,10 @@ typedef enum { ////////////////////////////////////////////////////////////////////////////////################################ -#define MAX_NR_RATE_MATCH_PATTERNS 4 -#define MAX_NR_ZP_CSI_RS_RESOURCES 32 +#define MAX_NR_RATE_MATCH_PATTERNS 4 +#define MAX_NR_ZP_CSI_RS_RESOURCES 32 +#define MAX_NR_OF_DL_ALLOCATIONS 16 +#define MAX_NR_OF_UL_ALLOCATIONS (16) typedef enum{ dl_resourceAllocationType0 = 1, @@ -473,6 +476,8 @@ typedef struct { */ maxNrofCodeWordsScheduledByDCI_t maxNrofCodeWordsScheduledByDCI; + NR_PDSCH_TimeDomainResourceAllocation_t *pdsch_TimeDomainResourceAllocation[MAX_NR_OF_DL_ALLOCATIONS]; + } PDSCH_Config_t; /*********************************************************************** @@ -483,7 +488,6 @@ typedef struct { * ************************************************************************/ -#define MAX_NR_OF_UL_ALLOCATIONS (16) typedef enum { enable_tpc_accumulation = 0, /* by default it is enable */ diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c index c4df96c56a..f07e22a087 100644 --- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c +++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c @@ -45,6 +45,7 @@ //#include "PHY/extern.h" #include "SCHED_NR_UE/defs.h" #include "SCHED_NR/extern.h" +#include "SCHED_NR_UE/phy_sch_processing_time.h" //#include //#include "targets/RT/USER/nr-softmodem.h" #include "PHY/NR_UE_ESTIMATION/nr_estimation.h" @@ -3549,7 +3550,17 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment = &ue->ul_time_alignment[eNB_id]; unsigned char *apply_ta = &ul_time_alignment->apply_ta; uint16_t slots_per_frame = ue->frame_parms.slots_per_frame; - int ul_tx_timing_adjustment = 6; // temporary hardcoded + uint16_t slots_per_subframe = ue->frame_parms.slots_per_subframe; + uint8_t numerology = ue->frame_parms.numerology_index, mapping_type_ul, mapping_type_dl; + int ul_tx_timing_adjustment, N_TA_max, factor_mu, N_t_1, N_t_2, N_1, N_2, d_1_1, d_2_1, d; + uint8_t d_2_2 = 0;// set to 0 because there is only 1 BWP + // TODO this should corresponds to the switching time as defined in + // TS 38.133 + uint16_t ofdm_symbol_size = ue->frame_parms.ofdm_symbol_size; + uint16_t nb_prefix_samples = ue->frame_parms.nb_prefix_samples; + uint32_t t_subframe = 1; // subframe duration of 1 msec + uint16_t bw_scaling, start_symbol; + float tc_factor; if (dlsch0==NULL) AssertFatal(0,"dlsch0 should be defined at this level \n"); @@ -3558,6 +3569,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue, harq_pid = dlsch0->current_harq_pid; is_cw0_active = dlsch0->harq_processes[harq_pid]->status; nb_symb_sch = dlsch0->harq_processes[harq_pid]->nb_symbols; + start_symbol = dlsch0->harq_processes[harq_pid]->start_symbol; @@ -3887,8 +3899,70 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue, break; } - /* Time alignment procedure set the TA to be applied 6 slots - // after the reception of the command */ + // scale the 16 factor in N_TA calculation in 38.213 section 4.2 according to the used FFT size + switch (ue->frame_parms.N_RB_DL) { + case 106: bw_scaling = 16; break; + case 217: bw_scaling = 32; break; + case 245: bw_scaling = 32; break; + case 273: bw_scaling = 32; break; + default: abort(); + } + + /* Time Alignment procedure + // - UE processing capability 1 + // - Setting the TA update to be applied after the reception of the TA command + // - Timing adjustment computed according to TS 38.213 section 4.2 + // - Durations of N1 and N2 symbols corresponding to PDSCH and PUSCH are + // computed according to sections 5.3 and 6.4 of TS 38.214 */ + factor_mu = 1 << numerology; + N_TA_max = 3846 * bw_scaling / factor_mu; + + /* PDSCH decoding time N_1 for processing capability 1 */ + if (ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition == pdsch_dmrs_pos0) + N_1 = pdsch_N_1_capability_1[numerology][1]; + else if (ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition == pdsch_dmrs_pos1 || ue->dmrs_DownlinkConfig.pdsch_dmrs_AdditionalPosition == 2) // TODO set to pdsch_dmrs_pos2 when available + N_1 = pdsch_N_1_capability_1[numerology][2]; + else + N_1 = pdsch_N_1_capability_1[numerology][3]; + + /* PUSCH preapration time N_2 for processing capability 1 */ + N_2 = pusch_N_2_timing_capability_1[numerology][1]; + mapping_type_dl = ue->PDSCH_Config.pdsch_TimeDomainResourceAllocation[0]->mappingType; + mapping_type_ul = ue->pusch_config.pusch_TimeDomainResourceAllocation[0]->mappingType; + + /* d_1_1 depending on the number of PDSCH symbols allocated */ + d = 0; // TODO number of overlapping symbols of the scheduling PDCCH and the scheduled PDSCH + if (mapping_type_dl == typeA) + if (nb_symb_sch + start_symbol < 7) + d_1_1 = 7 - (nb_symb_sch + start_symbol); + else + d_1_1 = 0; + else // mapping type B + switch (nb_symb_sch){ + case 7: d_1_1 = 0; break; + case 4: d_1_1 = 3; break; + case 2: d_1_1 = 3 + d; break; + default: break; + } + + /* d_2_1 */ + if (mapping_type_ul == typeB && start_symbol != 0) + d_2_1 = 0; + else + d_2_1 = 1; + + /* N_t_1 time duration in msec of N_1 symbols corresponding to a PDSCH reception time + // N_t_2 time duration in msec of N_2 symbols corresponding to a PUSCH preparation time */ + N_t_1 = (N_1 + d_1_1) * (ofdm_symbol_size + nb_prefix_samples) / factor_mu; + N_t_2 = (N_2 + d_2_1) * (ofdm_symbol_size + nb_prefix_samples) / factor_mu; + if (N_t_2 < d_2_2) N_t_2 = d_2_2; + + /* Time alignment procedure */ + // N_t_1 + N_t_2 + N_TA_max is in unit of Ts, therefore must be converted to Tc + // N_t_1 + N_t_2 + N_TA_max must be in msec + tc_factor = 64 * 0.509 * 10e-7; + ul_tx_timing_adjustment = 1 + ceil(slots_per_subframe*((N_t_1 + N_t_2 + N_TA_max)*tc_factor + 0.5)/t_subframe); + if (ul_time_alignment->apply_ta == 1){ ul_time_alignment->ta_slot = (nr_tti_rx + ul_tx_timing_adjustment) % slots_per_frame; if (nr_tti_rx + ul_tx_timing_adjustment > slots_per_frame){ diff --git a/openair1/SCHED_NR_UE/phy_sch_processing_time.h b/openair1/SCHED_NR_UE/phy_sch_processing_time.h new file mode 100644 index 0000000000..1962df22ee --- /dev/null +++ b/openair1/SCHED_NR_UE/phy_sch_processing_time.h @@ -0,0 +1,109 @@ +/* + * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The OpenAirInterface Software Alliance licenses this file to You under + * the OAI Public License, Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.openairinterface.org/?page_id=698 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *------------------------------------------------------------------------------- + * For more information about the OpenAirInterface (OAI) Software Alliance: + * contact@openairinterface.org + */ + +/*! \file phy_sch_processing_time.h + \brief tables for UE PDSCH processing and UE PUSCH preparation procedure time + from TS 38.214 Physical procedures for data v15.6.0 + \author Guido Casati + \date 2019 + \version 0.1 + \company Fraunhofer IIS + \email: guido.casati@iis.fraunhofer.de + \note + \warning +*/ + +/* TS 38.214 Table 5.3-1: PDSCH processing time for PDSCH processing capability 1 +// corresponding to the PDSCH decoding time N_1 [symbols] +// where mu corresponds to the one of {mu_PDCCH, mu_PDSCH, mu_UL} +// resulting with the largest T_proc_1 +// where mu_PDCCH is the SCS of PDCCH scheduling PDSCH +// mu_PDSCH is the SCS of the scheduled PDSCH +// mu_UL is the SCS of the UL channel with which the HARQ-ACK is to be transmitted +// column A is N_1 corresponding to dmrs-AdditionalPosition pos0 in DMRS-DownlinkConfig +// in both dmrs-DownlinkForPDSCH-MappingTypeA and dmrs-DownlinkForPDSCH-MappingTypeB +// column B is N_1 corresponding to corresponds to dmrs-AdditionalPosition !0 +// in DMRS-DownlinkConfig in both dmrs-DownlinkForPDSCH-MappingTypeA, +// dmrs-DownlinkForPDSCH-MappingTypeB or if the higher layer param is not configured +// when PDSCH DM-RS position l1 for the additional DM-RS is l1 = 1,2 +// column C is N_1 corresponding to corresponds to dmrs-AdditionalPosition !0 +// in DMRS-DownlinkConfig in both dmrs-DownlinkForPDSCH-MappingTypeA, +// dmrs-DownlinkForPDSCH-MappingTypeB or if the higher layer param is not configured +// when PDSCH DM-RS position l1 for the additional DM-RS is != 1,2 + +*/ +int8_t pdsch_N_1_capability_1[4][4] = { +/* mu A B C */ +{ 0, 8, 14, 13 }, +{ 1, 10, 13, 13 }, +{ 2, 17, 20, 20 }, +{ 3, 20, 24, 24 }, +}; + +/* TS 38.214 Table 5.3-2: PDSCH processing time for PDSCH processing capability 2 +// corresponding to the PDSCH decoding time N_1 [symbols] +// where mu corresponds to the one of {mu_PDCCH, mu_PDSCH, mu_UL} +// resulting with the largest T_proc_1 +// where mu_PDCCH is the SCS of PDCCH scheduling PDSCH +// mu_PDSCH is the SCS of the scheduled PDSCH +// mu_UL is the SCS of the UL channel with which the HARQ-ACK is to be transmitted +// column A is N_1 corresponding to dmrs-AdditionalPosition pos0 in DMRS-DownlinkConfig in both +// dmrs-DownlinkForPDSCH-MappingTypeA and dmrs-DownlinkForPDSCH-MappingTypeB +// mu == 2 is for FR1 only +*/ +float pdsch_N_1_capability_2[3][2] = { +/* mu A */ +{ 0, 3 }, +{ 1, 4.5 }, +{ 2, 9 }, +}; + +/* TS 38.214 Table 6.4-1: PUSCH preparation time for PUSCH timing capability 1 +// corresponding to the PUSCH preparation time N_2 [symbols] +// where mu corresponds to the one of {mu_DL, mu_UL} +// resulting with the largest T_proc_2 +// where mu_DL is the SCS with which the PDCCH +// carrying the DCI scheduling the PUSCH was transmitted +// mu_UL is the SCS of the UL channel with which PUSCH to be transmitted +*/ +int8_t pusch_N_2_timing_capability_1[4][2] = { +/* mu N_2 */ +{ 0, 10 }, +{ 1, 12 }, +{ 2, 23 }, +{ 3, 36 }, +}; + +/* TS 38.214 Table 6.4-2: PUSCH preparation time for PUSCH timing capability 2 +// corresponding to the PUSCH preparation time N_2 [symbols] +// where mu corresponds to the one of {mu_DL, mu_UL} +// resulting with the largest T_proc_2 +// where mu_DL is the SCS with which the PDCCH +// carrying the DCI scheduling the PUSCH was transmitted +// mu_UL is the SCS of the UL channel with which PUSCH to be transmitted +// mu == 2 is for FR1 only +*/ +float pusch_N_2_timing_capability_2[3][2] = { +/* mu N_2 */ +{ 0, 5 }, +{ 1, 5.5 }, +{ 2, 11 }, +}; \ No newline at end of file