From: Rasesh Mody <rasesh.mody@qlogic.com>
To: <dev@dpdk.org>
Cc: <Dept-EngDPDKDev@qlogic.com>, Rasesh Mody <rasesh.mody@qlogic.com>
Subject: [dpdk-dev] [PATCH v2 20/22] qede: remove external dependency and enable by default
Date: Fri, 30 Sep 2016 00:06:07 -0700 [thread overview]
Message-ID: <1475219169-8774-21-git-send-email-rasesh.mody@qlogic.com> (raw)
In-Reply-To: <1475219169-8774-1-git-send-email-rasesh.mody@qlogic.com>
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 <rasesh.mody@qlogic.com>
---
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 <http://driverdownloads.qlogic.com>`_.
-- 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 <unistd.h>
#define CONFIG_ECORE_BINARY_FW
-#define CONFIG_ECORE_ZIPPED_FW
+#undef CONFIG_ECORE_ZIPPED_FW
#ifdef CONFIG_ECORE_ZIPPED_FW
#include <zlib.h>
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
next prev parent reply other threads:[~2016-09-30 7:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 7:05 [dpdk-dev] [PATCH v2 00/22] qede: update qede pmd to 1.2.2.1 " Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 01/22] qede/base: add new files and shuffle the code Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 02/22] qede/base: formatting changes Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 03/22] qede: use FW CONFIG defines as needed Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 04/22] qede/base: update base driver Rasesh Mody
2016-09-30 16:44 ` Ferruh Yigit
[not found] ` <BLUPR0701MB157207202A7D8EB817D33DA59FC10@BLUPR0701MB1572.namprd07.prod.outlook.com>
2016-10-05 16:29 ` Thomas Monjalon
2016-10-10 23:31 ` Mody, Rasesh
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 05/22] qede/base: add the driver support for the MFW crash dump Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 06/22] qede: enable support for unequal number of RX/TX queues Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 07/22] qede: fix port (re)configuration issue Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 08/22] qede/base: allow MTU change via vport-update Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 09/22] qede: add missing 100G link speed capability Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 10/22] qede: remove unused/dead code Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 11/22] qede: fixes for VLAN filters Rasesh Mody
2016-09-30 7:05 ` [dpdk-dev] [PATCH v2 12/22] qede: add enable/disable VLAN filtering Rasesh Mody
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 13/22] qede: fix RSS related issues Rasesh Mody
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 14/22] qede:add scatter gather support Rasesh Mody
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 15/22] qede/base: change rx tx queue start APIs Rasesh Mody
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 16/22] qede/base: add support to initiate PF FLR Rasesh Mody
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 17/22] qede: skip slowpath polling for 100G VF device Rasesh Mody
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 18/22] qede: fix driver version string Rasesh Mody
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 19/22] qede: add support for queue statistics Rasesh Mody
2016-09-30 7:06 ` Rasesh Mody [this message]
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 21/22] doc: update qede pmd documentation Rasesh Mody
2016-09-30 15:11 ` Mcnamara, John
2016-09-30 7:06 ` [dpdk-dev] [PATCH v2 22/22] qede: update driver version Rasesh Mody
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475219169-8774-21-git-send-email-rasesh.mody@qlogic.com \
--to=rasesh.mody@qlogic.com \
--cc=Dept-EngDPDKDev@qlogic.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).