Alldownlink IP traffic is transferred consistently from the gNB to the PHY of...

Alldownlink IP traffic is transferred consistently from the gNB to the PHY of the UE now based on testing with the RFSIMULATOR. Slight extension in FAPI interface required to move the received data to the MAC layer of the UE.

openair1/SCHED_NR/fapi_nr_l1.c

@@ -86,7 +86,7 @@ void handle_nr_nfapi_dlsch_pdu(PHY_VARS_gNB *gNB,int frame,int subframe,gNB_L1_r
     //            dl_config_pdu->dlsch_pdu.dlsch_pdu_rel8.pdu_index,dlsch0_harq->round,dlsch0_harq->frame,dlsch0_harq->subframe,dlsch0_harq->pdu,dlsch0_harq->mcs,dlsch0_harq->ndi,dlsch0_harq->pdsch_start);
     if (codeword_index == 0) dlsch0_harq->pdu                    = sdu;
     else                     dlsch1_harq->pdu                    = sdu;
-    LOG_I(PHY, "dlsch PDU filled \n");
+    LOG_I(PHY, "SFN/SF: %d/%d DLSCH PDU filled \n",frame, subframe);
 //  }
 
 }
@@ -182,7 +182,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
 
       //gNB_MAC_INST                        *nr_mac      = RC.nrmac[module_idP];
       //TX_req = TX_req->tx_request_body.tx_pdu_list[TX_req->tx_request_body.number_of_pdus].segments[0].segment_data;
-      LOG_I(PHY, "Before calling handle_nr_nfapi_dlsch_pdu() \n \n \n \n");
+      //LOG_I(PHY, "Before calling handle_nr_nfapi_dlsch_pdu() \n \n \n \n");
       handle_nr_nfapi_dlsch_pdu(gNB, frame,slot,proc,
                             0,
                             TX_req->tx_request_body.tx_pdu_list[TX_req->tx_request_body.number_of_pdus].segments[0].segment_data);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -281,7 +281,9 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
       nr_get_tbs(&dl_config_dlsch_pdu->dlsch_pdu, dl_config_dci_pdu->dci_dl_pdu, *cfg);
       TBS = dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size;*/
 
-      dl_req = &nr_mac->DL_req[CC_id].dl_config_request_body;
+
+      // Move this later for now
+      /*dl_req = &nr_mac->DL_req[CC_id].dl_config_request_body;
           dl_config_dci_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
           memset((void*)dl_config_dci_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
           dl_config_dci_pdu->pdu_type = NFAPI_NR_DL_CONFIG_DCI_DL_PDU_TYPE;
@@ -357,19 +359,22 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                       params_rel15->first_symbol,
                       params_rel15->search_space_type);
         nr_get_tbs(&dl_config_dlsch_pdu->dlsch_pdu, dl_config_dci_pdu->dci_dl_pdu, *cfg);
-	TBS = dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size;
-        LOG_I(MAC, "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d nb_layers %d nb_codewords %d mcs %d\n",
+	    // Hardcode it for now
+	    TBS = dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size;*/
+        TBS = 6784;
+        /*LOG_I(MAC, "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d nb_layers %d nb_codewords %d mcs %d TBS: %d\n",
         dlsch_pdu_rel15->start_prb,
         dlsch_pdu_rel15->n_prb,
         dlsch_pdu_rel15->start_symbol,
         dlsch_pdu_rel15->nb_symbols,
         dlsch_pdu_rel15->nb_layers,
         dlsch_pdu_rel15->nb_codewords,
-        dlsch_pdu_rel15->mcs_idx);
+        dlsch_pdu_rel15->mcs_idx,
+        TBS);
 
         dl_req->number_dci++;
         dl_req->number_pdsch_rnti++;
-        dl_req->number_pdu+=2;
+        dl_req->number_pdu+=2;*/
 
     	for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
     	  // TODO: check if the lcid is active
@@ -487,6 +492,98 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
     		DLSCH_pdu.payload[0][offset + sdu_length_total + j] = 0;
     	}
 
+    	dl_req = &nr_mac->DL_req[CC_id].dl_config_request_body;
+          dl_config_dci_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
+          memset((void*)dl_config_dci_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
+          dl_config_dci_pdu->pdu_type = NFAPI_NR_DL_CONFIG_DCI_DL_PDU_TYPE;
+          dl_config_dci_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_nr_dl_config_dci_dl_pdu));
+
+          dl_config_dlsch_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu+1];
+          memset((void*)dl_config_dlsch_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
+          dl_config_dlsch_pdu->pdu_type = NFAPI_NR_DL_CONFIG_DLSCH_PDU_TYPE;
+          dl_config_dlsch_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_nr_dl_config_dlsch_pdu));
+
+          nfapi_nr_dl_config_dci_dl_pdu_rel15_t *pdu_rel15 = &dl_config_dci_pdu->dci_dl_pdu.dci_dl_pdu_rel15;
+          nfapi_nr_dl_config_pdcch_parameters_rel15_t *params_rel15 = &dl_config_dci_pdu->dci_dl_pdu.pdcch_params_rel15;
+          nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_pdu_rel15 = &dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15;
+
+          dlsch_pdu_rel15->start_prb = 0;
+          dlsch_pdu_rel15->n_prb = 50;
+          dlsch_pdu_rel15->start_symbol = 2;
+          dlsch_pdu_rel15->nb_symbols = 9;
+          dlsch_pdu_rel15->rnti = rnti;
+          dlsch_pdu_rel15->nb_layers =1;
+          dlsch_pdu_rel15->nb_codewords = 1;
+          dlsch_pdu_rel15->mcs_idx = 9;
+          dlsch_pdu_rel15->ndi = 1;
+          dlsch_pdu_rel15->redundancy_version = 0;
+
+          nr_configure_dci_from_pdcch_config(params_rel15,
+                                             coreset,
+                                             search_space,
+                                             *cfg,
+                                             dl_carrier_bandwidth);
+
+          pdu_rel15->frequency_domain_assignment = get_RIV(dlsch_pdu_rel15->start_prb, dlsch_pdu_rel15->n_prb, cfg->rf_config.dl_carrier_bandwidth.value);
+          pdu_rel15->time_domain_assignment = 3; // row index used here instead of SLIV;
+          pdu_rel15->vrb_to_prb_mapping = 1;
+          pdu_rel15->mcs = 9;
+          pdu_rel15->tb_scaling = 1;
+
+          pdu_rel15->ra_preamble_index = 25;
+          pdu_rel15->format_indicator = 1;
+          pdu_rel15->ndi = 1;
+          pdu_rel15->rv = 0;
+          pdu_rel15->harq_pid = 0;
+          pdu_rel15->dai = 2;
+          pdu_rel15->tpc = 2;
+          pdu_rel15->pucch_resource_indicator = 7;
+          pdu_rel15->pdsch_to_harq_feedback_timing_indicator = 7;
+
+          LOG_I(MAC, "[gNB scheduler phytest] DCI type 1 payload: freq_alloc %d, time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d ndi %d rv %d\n",
+                      pdu_rel15->frequency_domain_assignment,
+                      pdu_rel15->time_domain_assignment,
+                      pdu_rel15->vrb_to_prb_mapping,
+                      pdu_rel15->mcs,
+                      pdu_rel15->tb_scaling,
+                      pdu_rel15->ndi,
+                      pdu_rel15->rv);
+
+          params_rel15->rnti = rnti;
+          params_rel15->rnti_type = NFAPI_NR_RNTI_C;
+          params_rel15->dci_format = NFAPI_NR_DL_DCI_FORMAT_1_0;
+
+          //params_rel15->aggregation_level = 1;
+          LOG_I(MAC, "DCI params: rnti %d, rnti_type %d, dci_format %d, config type %d\n \
+                      coreset params: mux_pattern %d, n_rb %d, n_symb %d, rb_offset %d  \n \
+                      ss params : first symb %d, ss type %d\n",
+                      params_rel15->rnti,
+                      params_rel15->rnti_type,
+                      params_rel15->config_type,
+                      params_rel15->dci_format,
+                      params_rel15->mux_pattern,
+                      params_rel15->n_rb,
+                      params_rel15->n_symb,
+                      params_rel15->rb_offset,
+                      params_rel15->first_symbol,
+                      params_rel15->search_space_type);
+        nr_get_tbs(&dl_config_dlsch_pdu->dlsch_pdu, dl_config_dci_pdu->dci_dl_pdu, *cfg);
+	    // Hardcode it for now
+	    TBS = dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size;
+	    LOG_I(MAC, "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d nb_layers %d nb_codewords %d mcs %d TBS: %d\n",
+        dlsch_pdu_rel15->start_prb,
+        dlsch_pdu_rel15->n_prb,
+        dlsch_pdu_rel15->start_symbol,
+        dlsch_pdu_rel15->nb_symbols,
+        dlsch_pdu_rel15->nb_layers,
+        dlsch_pdu_rel15->nb_codewords,
+        dlsch_pdu_rel15->mcs_idx,
+        TBS);
+
+        dl_req->number_dci++;
+        dl_req->number_pdsch_rnti++;
+        dl_req->number_pdu+=2;
+
 
   TX_req = &nr_mac->TX_req[CC_id].tx_request_body.tx_pdu_list[nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus];
   TX_req->pdu_length = 6;