From 9c929d38c3bc6ae39ed658d0a7297612e5525b00 Mon Sep 17 00:00:00 2001 From: Balaji Shankaran Date: Thu, 1 Oct 2020 11:57:02 +0530 Subject: [PATCH] Fix for L2 compilation with WLS [Issue-ID: ODUHIGH-240] Change-Id: Idcdae5cbb6b213a9e6eda0aed575c4797afd623a Signed-off-by: Balaji Shankaran --- build/common/compile.mak | 2 +- build/common/mac.mak | 1 + build/common/mt.mak | 1 + build/odu/makefile | 30 +++++++++++++++++++++++++++++- src/5gnrmac/lwr_mac_phy.c | 2 +- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/build/common/compile.mak b/build/common/compile.mak index e7464926b..0af6203d7 100644 --- a/build/common/compile.mak +++ b/build/common/compile.mak @@ -101,7 +101,7 @@ xCPP_OPTS+=-g -pipe -pedantic -Wall -Werror -Wno-comment -Wshadow \ -Wcast-qual -fno-strict-aliasing -fsigned-char -lstdc++ # Include path settings -I_OPTS+=-I$(SRC_DIR) -I$(ROOT_DIR)/src/cm -I$(ROOT_DIR)/src/mt -I$(ROOT_DIR)/src/rlog +I_OPTS+=-I$(SRC_DIR) -I$(ROOT_DIR)/src/cm -I$(ROOT_DIR)/src/mt -I$(ROOT_DIR)/src/rlog -I$(ROOT_DIR)/src/wls_lib I_OPTS+=$(PLTFRM_INCLUDES) .SUFFIXES:.c .o diff --git a/build/common/mac.mak b/build/common/mac.mak index 0b6b45533..2c0f44edd 100644 --- a/build/common/mac.mak +++ b/build/common/mac.mak @@ -58,6 +58,7 @@ include $(COM_BUILD_DIR)/compile.mak I_OPTS+=-I$(ROOT_DIR)/src/5gnrsch I_OPTS+=-I$(ROOT_DIR)/src/intel_fapi +I-OPTS+=-I$(ROOT_DIR)/src/wls_lib #-------------------------------------------------------------# #Linker macros diff --git a/build/common/mt.mak b/build/common/mt.mak index f22a83e39..81f94c4a7 100755 --- a/build/common/mt.mak +++ b/build/common/mt.mak @@ -50,6 +50,7 @@ endif C_OBJS_WO_LOG=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS)) I_OPTS+=-isystem $(BSPPATH)/usr/include/brcm I_OPTS+=-I$(SRC_DIR)/security +I-OPTS+=-I$(ROOT_DIR)/src/wls_lib #mtSRCS= \ diff --git a/build/odu/makefile b/build/odu/makefile index 2b9d037bf..d07491deb 100644 --- a/build/odu/makefile +++ b/build/odu/makefile @@ -96,7 +96,35 @@ export I_OPTS # Add to the linker options the platform specific components #L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp -L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp +L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp #-L/root/intel/phy/wls_lib/lib -lwls \ + -lhugetlbfs -lnuma -ldl -L/root/intel/dpdk-19.11/x86_64-native-linuxapp-gcc/lib \ + -ldpdk -lrte_gso -lrte_pmd_atlantic -lrte_pmd_iavf -lrte_pmd_tap -lrte_acl \ + -lrte_hash -lrte_pmd_avp -lrte_pmd_ice -lrte_pmd_thunderx_nicvf -lrte_bbdev \ + -lrte_ip_frag -lrte_pmd_axgbe -lrte_pmd_ifc -lrte_pmd_vdev_netvsc -lrte_bitratestats \ + -lrte_ipsec -lrte_pmd_bbdev_fpga_lte_fec -lrte_pmd_ixgbe -lrte_pmd_vhost \ + -lrte_bpf -lrte_jobstats -lrte_pmd_bbdev_null -lrte_pmd_kni -lrte_pmd_virtio \ + -lrte_bus_dpaa -lrte_kni -lrte_pmd_bbdev_turbo_sw -lrte_pmd_lio -lrte_pmd_virtio_crypto \ + -lrte_bus_fslmc -lrte_kvargs -lrte_pmd_bnxt -lrte_pmd_memif -lrte_pmd_vmxnet3_uio \ + -lrte_bus_ifpga -lrte_latencystats -lrte_pmd_bond -lrte_pmd_netvsc -lrte_port \ + -lrte_bus_pci -lrte_lpm -lrte_pmd_caam_jr -lrte_pmd_nfp -lrte_power -lrte_bus_vdev \ + -lrte_mbuf -lrte_pmd_crypto_scheduler -lrte_pmd_nitrox -lrte_rawdev -lrte_bus_vmbus \ + -lrte_member -lrte_pmd_cxgbe -lrte_pmd_null -lrte_rawdev_dpaa2_cmdif -lrte_cfgfile \ + -lrte_mempool -lrte_pmd_dpaa -lrte_pmd_null_crypto -lrte_rawdev_dpaa2_qdma \ + -lrte_cmdline -lrte_mempool_bucket -lrte_pmd_dpaa2 -lrte_pmd_octeontx -lrte_rawdev_ioat \ + -lrte_common_cpt -lrte_mempool_dpaa -lrte_pmd_dpaa2_event -lrte_pmd_octeontx2 \ + -lrte_rawdev_ntb -lrte_common_dpaax -lrte_mempool_dpaa2 -lrte_pmd_dpaa2_sec \ + -lrte_pmd_octeontx2_crypto -lrte_rawdev_octeontx2_dma -lrte_common_octeontx \ + -lrte_mempool_octeontx -lrte_pmd_dpaa_event -lrte_pmd_octeontx2_event -lrte_rawdev_skeleton \ + -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_pmd_dpaa_sec -lrte_pmd_octeontx_crypto \ + -lrte_rcu -lrte_compressdev -lrte_mempool_ring -lrte_pmd_dsw_event -lrte_pmd_octeontx_ssovf \ + -lrte_reorder -lrte_cryptodev -lrte_mempool_stack -lrte_pmd_e1000 -lrte_pmd_octeontx_zip \ + -lrte_rib -lrte_distributor -lrte_meter -lrte_pmd_ena -lrte_pmd_opdl_event -lrte_ring \ + -lrte_eal -lrte_metrics -lrte_pmd_enetc -lrte_pmd_qat -lrte_sched -lrte_efd -lrte_net \ + -lrte_pmd_enic -lrte_pmd_qede -lrte_security -lrte_ethdev -lrte_pci -lrte_pmd_failsafe \ + -lrte_pmd_ring -lrte_stack -lrte_eventdev -lrte_pdump -lrte_pmd_fm10k -lrte_pmd_sfc_efx \ + -lrte_table -lrte_fib -lrte_pipeline -lrte_pmd_hinic -lrte_pmd_skeleton_event -lrte_timer \ + -lrte_flow_classify -lrte_pmd_af_packet -lrte_pmd_hns3 -lrte_pmd_softnic -lrte_vhost \ + -lrte_gro -lrte_pmd_ark -lrte_pmd_i40e -lrte_pmd_sw_event # Export some of the flags expected from the command line. # # These macros are made available for the makefiles called from this makefile diff --git a/src/5gnrmac/lwr_mac_phy.c b/src/5gnrmac/lwr_mac_phy.c index c9aa3bd54..b27813d8e 100644 --- a/src/5gnrmac/lwr_mac_phy.c +++ b/src/5gnrmac/lwr_mac_phy.c @@ -210,7 +210,7 @@ void LwrMacRecvPhyMsg() if(l1Msg) { l1MsgPtr = WLS_PA2VA(wlsHdlr, l1Msg); - handlePhyMessages(msgType, msgSize, l1MsgPtr); + procPhyMessages(msgType, msgSize, l1MsgPtr); } numToGet--; } -- 2.16.6