Merge branch 'use_msgq_new_fhidriver' of...

Merge branch 'use_msgq_new_fhidriver' of https://gitlab.eurecom.fr/oai/openairinterface5g into use_msgq_new_fhidriver

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -698,7 +698,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
   int pusch_DTX = 0;
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_UESPEC_RX,1);
-  LOG_D(PHY,"phy_procedures_gNB_uespec_RX frame %d, slot %d\n",frame_rx,slot_rx);
+  LOG_I(PHY,"phy_procedures_gNB_uespec_RX frame %d, slot %d\n",frame_rx,slot_rx);
 
   fill_ul_rb_mask(gNB, frame_rx, slot_rx);
 

radio/ETHERNET/oran/5g/app_profile_xran-G.h

+/******************************************************************************
+*
+*   Copyright (c) 2020 Intel.
+*
+*   Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*   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.
+*
+*******************************************************************************/
+
+#ifndef _APP_PROFILE_XRAN_H_
+#define _APP_PROFILE_XRAN_H_
+
+#include "config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct xran_mlog_times
+{
+    uint64_t ticks_per_usec;
+    uint64_t core_total_time;   /* in us */
+    uint64_t core_used_time;    /* in us */
+    uint64_t xran_total_time;   /* in us */
+    uint64_t mlog_total_time;   /* in us */
+};
+
+struct xran_mlog_stats
+{
+    uint32_t cnt;
+    uint32_t max;
+    uint32_t min;
+    float avg;
+};
+
+struct xran_mlog_taskid
+{
+    uint16_t taskId;
+    uint16_t taskType;
+    char taskName[80];
+};
+
+enum xran_mlog_task_type {
+    XRAN_TASK_TYPE_GNB = 0,
+    XRAN_TASK_TYPE_BBDEV,
+    XRAN_TASK_TYPE_TIMER,
+    XRAN_TASK_TYPE_RADIO,
+    XRAN_TASK_TYPE_CP,
+    XRAN_TASK_TYPE_UP,
+    XRAN_TASK_TYPE_MAX, /* The last entry : total# of types */
+};
+
+#define XRAN_REPORT_FILE    "xran_mlog_stats"
+
+#ifdef MLOG_ENABLED
+int32_t app_profile_xran_print_mlog_stats(char *usecase_file);
+#else
+#define app_profile_xran_print_mlog_stats(a)
+#endif
+
+#ifndef WIN32
+#ifdef PRINTF_ERR_OK
+#define print_err(fmt, args...) printf("%s:[err] " fmt "\n", __FUNCTION__, ## args)
+#else  /* PRINTF_LOG_OK */
+#define print_err(fmt, args...)
+#endif  /* PRINTF_LOG_OK */
+#else
+#define print_err(fmt, ...) printf("%s:[err] " fmt "\n", __FUNCTION__, __VA_ARGS__)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+extern struct xran_mlog_times mlog_times;
+
+#endif /* _APP_PROFILE_XRAN_ */

radio/ETHERNET/oran/5g/common-G.h

+/******************************************************************************
+*
+*   Copyright (c) 2020 Intel.
+*
+*   Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*   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.
+*
+*******************************************************************************/
+
+#ifndef _XRAN_APP_COMMON_H_
+#define _XRAN_APP_COMMON_H_
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include "xran_fh_o_du.h"
+#include "xran_pkt_up.h"
+
+#include <rte_common.h>
+#include <rte_mbuf.h>
+
+#define VERSIONX                "oran_f_release_v1.0"
+
+#define APP_O_DU  0
+#define APP_O_RU  1
+
+enum app_state
+{
+    APP_RUNNING,
+    APP_STOPPED
+};
+
+enum nRChBwOptions
+{
+    PHY_BW_5_0_MHZ = 5,   PHY_BW_10_0_MHZ = 10, PHY_BW_15_0_MHZ = 15, PHY_BW_20_0_MHZ = 20, PHY_BW_25_0_MHZ = 25,
+    PHY_BW_30_0_MHZ = 30, PHY_BW_40_0_MHZ = 40, PHY_BW_50_0_MHZ = 50, PHY_BW_60_0_MHZ = 60, PHY_BW_70_0_MHZ = 70,
+    PHY_BW_80_0_MHZ = 80, PHY_BW_90_0_MHZ = 90, PHY_BW_100_0_MHZ = 100, PHY_BW_200_0_MHZ = 200, PHY_BW_400_0_MHZ = 400
+};
+
+#define N_SC_PER_PRB 12
+#define N_SYM_PER_SLOT 14
+#define MAX_ANT_CARRIER_SUPPORTED (XRAN_MAX_SECTOR_NR*XRAN_MAX_ANTENNA_NR)
+#define MAX_ANT_CARRIER_SUPPORTED_CAT_B (XRAN_MAX_SECTOR_NR*XRAN_MAX_ANT_ARRAY_ELM_NR)
+
+#define SUBFRAME_DURATION_US       1000
+
+#define SUBFRAMES_PER_SYSTEMFRAME  10
+#define IQ_PLAYBACK_BUFFER_BYTES (XRAN_NUM_OF_SLOT_IN_TDD_LOOP*N_SYM_PER_SLOT*XRAN_MAX_PRBS*N_SC_PER_PRB*4L)
+/* PRACH data samples are 32 bits wide, 16bits for I and 16bits for Q. Each packet contains 840 samples for long sequence or 144 for short sequence. The payload length is 840*16*2/8 octets.*/
+#ifdef FCN_1_2_6_EARLIER
+#define PRACH_PLAYBACK_BUFFER_BYTES (144*4L)
+#else
+#define PRACH_PLAYBACK_BUFFER_BYTES (840*4L)
+#endif
+
+#ifdef _DEBUG
+#define iAssert(p) if(!(p)){fprintf(stderr,\
+    "Assertion failed: %s, file %s, line %d, val %d\n",\
+    #p, __FILE__, __LINE__, p);exit(-1);}
+#else /* _DEBUG */
+#define iAssert(p)
+#endif /* _DEBUG */
+
+/**< all the buffers allocated for O-XU */
+struct o_xu_buffers {
+    int iq_playback_buffer_size_dl;
+    int iq_playback_buffer_size_ul;
+
+    int iq_bfw_buffer_size_dl;
+    int iq_bfw_buffer_size_ul;
+
+    int iq_srs_buffer_size_ul;
+
+    int numSlots;  /**< number of slots in IQ vector */
+
+    int16_t *p_tx_play_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_play_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+    int16_t *p_tx_prach_play_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_prach_play_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_prach_play_buffer_position[MAX_ANT_CARRIER_SUPPORTED];
+
+    int16_t *p_tx_srs_play_buffer[MAX_ANT_CARRIER_SUPPORTED_CAT_B];
+    int32_t tx_srs_play_buffer_size[MAX_ANT_CARRIER_SUPPORTED_CAT_B];
+    int32_t tx_srs_play_buffer_position[MAX_ANT_CARRIER_SUPPORTED_CAT_B];
+
+    int16_t *p_rx_log_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t rx_log_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+    int16_t *p_prach_log_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t prach_log_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+    int16_t *p_srs_log_buffer[MAX_ANT_CARRIER_SUPPORTED_CAT_B];
+    int32_t srs_log_buffer_size[MAX_ANT_CARRIER_SUPPORTED_CAT_B];
+
+    int16_t *p_tx_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+    int16_t *p_rx_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t rx_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+/* beamforming weights for UL (O-DU) */
+    int16_t *p_tx_dl_bfw_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_dl_bfw_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+    int16_t *p_tx_dl_bfw_log_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_dl_bfw_log_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+/* beamforming weights for UL (O-DU) */
+    int16_t *p_tx_ul_bfw_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_ul_bfw_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+    int16_t *p_tx_ul_bfw_log_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t tx_ul_bfw_log_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+
+/* beamforming weights for UL (O-RU) */
+    int16_t *p_rx_dl_bfw_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t rx_dl_bfw_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t rx_dl_bfw_buffer_position[MAX_ANT_CARRIER_SUPPORTED];
+
+/* beamforming weights for UL (O-RU) */
+    int16_t *p_rx_ul_bfw_buffer[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t rx_ul_bfw_buffer_size[MAX_ANT_CARRIER_SUPPORTED];
+    int32_t rx_ul_bfw_buffer_position[MAX_ANT_CARRIER_SUPPORTED];
+};
+
+extern struct o_xu_buffers* p_o_xu_buff[XRAN_PORTS_NUM];
+
+void sys_save_buf_to_file_txt(char *filename, char *bufname, unsigned char *pBuffer, unsigned int size, unsigned int buffers_num);
+void sys_save_buf_to_file(char *filename, char *bufname, unsigned char *pBuffer, unsigned int size, unsigned int buffers_num);
+int  sys_load_file_to_buff(char *filename, char *bufname, unsigned char *pBuffer, unsigned int size, unsigned int buffers_num);
+
+uint32_t app_xran_get_scs(uint8_t nMu);
+uint16_t app_xran_get_num_rbs(uint8_t ranTech, uint32_t nNumerology, uint32_t nBandwidth, uint32_t nAbsFrePointA);
+uint32_t app_xran_cal_nrarfcn(uint32_t nCenterFreq);
+int32_t app_xran_set_slot_type(uint32_t nPhyInstanceId, uint32_t nFrameDuplexType,
+                uint32_t nTddPeriod, struct xran_slot_config *psSlotConfig);
+uint32_t app_xran_get_tti_interval(uint8_t nMu);
+
+#endif /*_XRAN_APP_COMMON_H_*/

radio/ETHERNET/oran/5g/config-G.c

@@ -123,6 +123,8 @@
 
 #define KEY_PRACH_CFGIDX   "prachConfigIndex"
 #define KEY_PRACH_CFGIDX_LTE   "prachConfigIndexLTE"
+#define KEY_PRACH_FREQSTART  "prachFreqStart"
+#define KEY_PRACH_FREQOFFSET "prachFreqOffset"
 #define KEY_SRS_SYM_IDX    "srsSym"
 #define KEY_SRS_SLOT        "srsSlot"
 #define KEY_SRS_NDM_OFFSET  "srsNdmOffset"
@@ -505,6 +507,15 @@ static int fillConfigStruct(RuntimeConfig *config, const char *key, const char *
     } else if (strcmp(key, KEY_PRACH_CFGIDX_LTE) == 0) {
         config->prachConfigIndexLTE = atoi(value);
         printf("Prach config index LTE for DSS: %d\n",config->prachConfigIndexLTE);
+    } else if (strcmp(key, KEY_PRACH_CFGIDX) == 0) {
+        config->prachConfigIndex = atoi(value);
+        printf("Prach config index: %d\n",config->prachConfigIndex);
+    } else if (strcmp(key, KEY_PRACH_FREQSTART) == 0) {
+        config->prachOffset = atoi(value);
+        printf("Prach Frequency Start: %d\n",config->prachOffset);
+    } else if (strcmp(key, KEY_PRACH_FREQOFFSET) == 0) {
+        config->prachFreqOffset = atoi(value);
+        printf("Prach Frequency Offset: %d\n",config->prachFreqOffset);
     } else if (strncmp(key, KEY_FILE_PRACH_AxC, strlen(KEY_FILE_PRACH_AxC)) == 0) {
         unsigned int ant_num = 0;
         sscanf(key,"antPrachC%02u",&ant_num);

radio/ETHERNET/oran/5g/config_bronze.c

@@ -87,7 +87,7 @@
 #define KEY_FILE_AxC        "antC"
 #define KEY_FILE_PRACH_AxC  "antPrachC"
 
-#define KEY_PRACH_ENABLE   "rachEanble"
+#define KEY_PRACH_ENABLE   "rachEnable"
 #define KEY_SRS_ENABLE     "srsEanble"
 
 #define KEY_PRACH_CFGIDX   "prachConfigIndex"

radio/ETHERNET/oran/5g/debug-G.h

+/******************************************************************************
+*
+*   Copyright (c) 2020 Intel.
+*
+*   Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*   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.
+*
+*******************************************************************************/
+
+/**
+ * @brief
+ * @file
+ * @ingroup
+ * @author Intel Corporation
+ **/
+
+#ifndef _SAMPLEAPP__DEBUG_H_
+#define _SAMPLEAPP__DEBUG_H_
+
+#include <stdio.h>
+
+#include "config.h"
+
+#define MAX_FILE_NAME_LEN (512)
+#define MAX_PATH_NAME_LEN (1024)
+
+#ifdef _DEBUG
+    #define log_dbg(fmt, ...)                       \
+        fprintf(stderr,                     \
+            "DEBUG: %s(%d): " fmt "\n",             \
+            __FILE__,                       \
+            __LINE__, ##__VA_ARGS__)
+#else
+    #define log_dbg(fmt, ...)
+#endif
+
+#if defined(_DEBUG) || defined(_VERBOSE)
+    #define log_wrn(fmt, ...)                               \
+        fprintf(                                            \
+            stderr,                                     \
+            "WARNING: %s(%d): " fmt "\n",                   \
+            __FILE__,                                       \
+            __LINE__, ##__VA_ARGS__)
+#else
+    #define log_dbg(fmt, ...)
+    #define log_wrn(fmt, ...)
+#endif
+
+
+#define log_err(fmt, ...)                       \
+    fprintf(stderr,                     \
+        "ERROR: %s(%d): " fmt "\n",             \
+        __FILE__,                       \
+        __LINE__, ##__VA_ARGS__)
+
+
+inline void ShowData(void* ptr, unsigned int size)
+{
+    uint8_t *d =  (uint8_t *)ptr;
+    unsigned int i;
+
+    for(i = 0; i < size; i++)
+    {
+        if ( !(i & 0xf) )
+            printf("\n");
+        printf("%02x ", d[i]);
+    }
+    printf("\n");
+}
+
+
+#endif /* _SAMPLEAPP__DEBUG_H_ */

radio/ETHERNET/oran/5g/oaioran.c

@@ -279,6 +279,7 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot){
               // This loop would better be more inner to avoid confusion and maybe also errors.
               for(int32_t sym_idx = 0; sym_idx < XRAN_NUM_OF_SYMBOL_PER_SLOT; sym_idx++) {
 
+		 LOG_D(PHY,"ORAN RX: CC %d, ant %d, sym %d, tti %d\n",cc_id,ant_id,sym_idx,tti);
                  uint8_t *pData = xran_ctx->sFrontHaulRxBbuIoBufCtrl[tti % XRAN_N_FE_BUF_LEN][cc_id][ant_id].sBufferList.pBuffers[sym_idx%XRAN_NUM_OF_SYMBOL_PER_SLOT].pData;
                  uint8_t *pPrbMapData = xran_ctx->sFrontHaulRxPrbMapBbuIoBufCtrl[tti % XRAN_N_FE_BUF_LEN][cc_id][ant_id].sBufferList.pBuffers->pData;
                  struct xran_prb_map *pPrbMap = (struct xran_prb_map *)pPrbMapData;
@@ -303,7 +304,10 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot){
 
                     struct xran_prb_elm* p_prbMapElm = &pRbMap->prbMap[idxElm];
 
+		    LOG_D(PHY,"pRbMap->nPrbElm %d\n",pRbMap->nPrbElm);
                     for (idxElm = 0;  idxElm < pRbMap->nPrbElm; idxElm++) {
+		        LOG_D(PHY,"prbMap[%d] : PRBstart %d nPRBs %d\n",
+			      idxElm,pRbMap->prbMap[idxElm].nRBStart,pRbMap->prbMap[idxElm].nRBSize);
                        struct xran_section_desc *p_sec_desc = NULL;
                        p_prbMapElm = &pRbMap->prbMap[idxElm];
 #ifdef ORAN_BRONZE 
@@ -334,6 +338,7 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot){
                           for (idx = 0; idx < payload_len/(2*sizeof(int16_t)); idx++) {
                             ((int16_t *)dst1)[idx] = ((int16_t)ntohs(((uint16_t *)src1)[idx]))>>2;
                             ((int16_t *)dst2)[idx] = ((int16_t)ntohs(((uint16_t *)src2)[idx]))>>2;
+			    //if (sym_idx==0 && idx<16) LOG_I(PHY,"%d: %d,%d\n",idx,((int16_t *)dst1)[idx],((int16_t *)dst1)[idx]);
                           }
                        } else if (p_prbMapElm->compMethod == XRAN_COMPMETHOD_BLKFLOAT) {
                           struct xranlib_decompress_request  bfp_decom_req_2;
@@ -444,9 +449,12 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot){
                      exit(-1);
                      printf("ptr ==NULL\n");
                 }
-              }
-            }
-          }
+
+		 LOG_I(PHY,"%d.%d ant %d sym %d : %p en %d\n",*frame,*slot,ant_id,sym_idx,pos,
+                       signal_energy_nodc(pos,4096));
+              }//sym_ind
+            }//ant_ind
+          }//vv_inf
 #ifdef ORAN_BRONZE
         if ((*frame&0x7f)==0 && *slot == 0 && xran_get_common_counters(xranHandle, &x_counters[0]) == XRAN_STATUS_SUCCESS)
 #else