From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasesh Mody Subject: [PATCH v2 20/22] qede: remove external dependency and enable by default Date: Fri, 30 Sep 2016 00:06:07 -0700 Message-ID: <1475219169-8774-21-git-send-email-rasesh.mody@qlogic.com> References: <1475219169-8774-1-git-send-email-rasesh.mody@qlogic.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , Rasesh Mody To: Return-path: Received: from mx0b-0016ce01.pphosted.com (mx0a-0016ce01.pphosted.com [67.231.148.157]) by dpdk.org (Postfix) with ESMTP id 2D9A67E93 for ; Fri, 30 Sep 2016 09:07:24 +0200 (CEST) Received: from pps.filterd (m0095336.ppops.net [127.0.0.1]) by mx0a-0016ce01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8U76Ck2005601 for ; Fri, 30 Sep 2016 00:07:23 -0700 Received: from avcashub1.qlogic.com ([198.186.0.115]) by mx0a-0016ce01.pphosted.com with ESMTP id 25s5nvk6m9-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Fri, 30 Sep 2016 00:07:23 -0700 In-Reply-To: <1475219169-8774-1-git-send-email-rasesh.mody@qlogic.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The qede driver doesn't depend on libz anymore. Hence remove the LDLIBS entry form the Makefile. This patch enables the qede PMD by default. Fixes: 6adac0bf ("qede: add missing external dependency and disable by default") Signed-off-by: Rasesh Mody --- config/common_base | 2 +- doc/guides/nics/qede.rst | 5 +---- drivers/net/qede/Makefile | 2 -- drivers/net/qede/base/ecore.h | 2 +- drivers/net/qede/qede_main.c | 2 +- mk/rte.app.mk | 2 +- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/config/common_base b/config/common_base index 7830535..2b03d61 100644 --- a/config/common_base +++ b/config/common_base @@ -317,7 +317,7 @@ CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n # QLogic 25G/40G/100G PMD # -CONFIG_RTE_LIBRTE_QEDE_PMD=n +CONFIG_RTE_LIBRTE_QEDE_PMD=y CONFIG_RTE_LIBRTE_QEDE_DEBUG_INIT=n CONFIG_RTE_LIBRTE_QEDE_DEBUG_INFO=n CONFIG_RTE_LIBRTE_QEDE_DEBUG_DRIVER=n diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index 50e6f87..d32fba2 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -77,14 +77,11 @@ Prerequisites - Requires firmware version **8.10.x.** and management firmware version **8.10.x or higher**. Firmware may be available inbox in certain newer Linux distros under the standard directory - ``E.g. /lib/firmware/qed/qed_init_values_zipped-8.10.9.0.bin`` + ``E.g. /lib/firmware/qed/qed_init_values-8.10.9.0.bin`` - If the required firmware files are not available then visit `QLogic Driver Download Center `_. -- This driver relies on external zlib library (-lz) for uncompressing - the firmware file. - Performance note ~~~~~~~~~~~~~~~~ diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile index 7965a83..39751e4 100644 --- a/drivers/net/qede/Makefile +++ b/drivers/net/qede/Makefile @@ -14,8 +14,6 @@ LIB = librte_pmd_qede.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lz - EXPORT_MAP := rte_pmd_qede_version.map LIBABIVER := 1 diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h index 4359343..f99a045 100644 --- a/drivers/net/qede/base/ecore.h +++ b/drivers/net/qede/base/ecore.h @@ -15,7 +15,7 @@ #include #define CONFIG_ECORE_BINARY_FW -#define CONFIG_ECORE_ZIPPED_FW +#undef CONFIG_ECORE_ZIPPED_FW #ifdef CONFIG_ECORE_ZIPPED_FW #include diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c index 0483116..a0a146a 100644 --- a/drivers/net/qede/qede_main.c +++ b/drivers/net/qede/qede_main.c @@ -21,7 +21,7 @@ static uint8_t npar_tx_switching = 1; char fw_file[PATH_MAX]; const char *QEDE_DEFAULT_FIRMWARE = - "/lib/firmware/qed/qed_init_values_zipped-8.10.9.0.bin"; + "/lib/firmware/qed/qed_init_values-8.10.9.0.bin"; static void qed_update_pf_params(struct ecore_dev *edev, struct ecore_pf_params *params) diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 1a0095b..9b12da3 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -120,7 +120,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lrte_pmd_mpipe -lgxio _LDLIBS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += -lrte_pmd_nfp -lm _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += -lrte_pmd_null _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lrte_pmd_pcap -lpcap -_LDLIBS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += -lrte_pmd_qede -lz +_LDLIBS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += -lrte_pmd_qede _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING) += -lrte_pmd_ring _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += -lrte_pmd_szedata2 -lsze2 _LDLIBS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += -lrte_pmd_thunderx_nicvf -lm -- 1.8.3.1