From 7d178e9ef6143b0bf090790ec52896c1ead3247b Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Tue, 18 Oct 2016 21:11:44 -0700 Subject: [PATCH] net/qede: remove zlib dependency and enable PMD The QEDE PMD now uses unzipped firmware file eliminating the dependency on zlib. Hence remove LDLIBS entry form the Makefile and enable qede PMD by default. Fixes: 6adac0bf30b3 ("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/bcm_osal.c | 2 -- drivers/net/qede/base/ecore.h | 2 +- drivers/net/qede/qede_main.c | 2 +- mk/rte.app.mk | 2 +- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/config/common_base b/config/common_base index c7fd3db2d2..750577dd92 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 9d85d8dacb..902e82ba37 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 7965a831f4..39751e417a 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/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c index d53dfeefb5..28be9587a6 100644 --- a/drivers/net/qede/base/bcm_osal.c +++ b/drivers/net/qede/base/bcm_osal.c @@ -6,8 +6,6 @@ * See LICENSE.qede_pmd for copyright and licensing details. */ -#include - #include #include diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h index 89e2bd02bb..907b35b972 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 4f1e3b0285..2d354e19d6 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 72c2fe7303..2b95b75cc7 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -121,7 +121,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 -- 2.20.1