summaryrefslogtreecommitdiffstats
path: root/dpdk/dpdk-17.08_patches
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-06-06 14:23:42 +0200
committerMarco Varlese <marco.varlese@suse.de>2018-06-07 05:48:49 +0000
commit0e969ac8431c80ff4bca5f6985876b1c584eefcd (patch)
tree3860c4273c016bd23f2fa1e5cd51f854999c1274 /dpdk/dpdk-17.08_patches
parentd018870d1b02109fc8b328446f15312fdd2fcd11 (diff)
Add support for DPDK 18.05
Change-Id: I205932bc727c990011bbbe1dc6c0cf5349d19806 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'dpdk/dpdk-17.08_patches')
-rw-r--r--dpdk/dpdk-17.08_patches/0001-net-bonding-support-for-mlx.patch63
-rw-r--r--dpdk/dpdk-17.08_patches/0002-crypto-qat-align-capabilities.patch101
2 files changed, 0 insertions, 164 deletions
diff --git a/dpdk/dpdk-17.08_patches/0001-net-bonding-support-for-mlx.patch b/dpdk/dpdk-17.08_patches/0001-net-bonding-support-for-mlx.patch
deleted file mode 100644
index 13a2ba67b0a..00000000000
--- a/dpdk/dpdk-17.08_patches/0001-net-bonding-support-for-mlx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
-index bb634c6..7c65dda 100644
---- a/drivers/net/bonding/rte_eth_bond_args.c
-+++ b/drivers/net/bonding/rte_eth_bond_args.c
-@@ -61,16 +61,6 @@
- unsigned i;
-
- for (i = 0; i < rte_eth_dev_count(); i++) {
--
-- /* Currently populated by rte_eth_copy_pci_info().
-- *
-- * TODO: Once the PCI bus has arrived we should have a better
-- * way to test for being a PCI device or not.
-- */
-- if (rte_eth_devices[i].data->kdrv == RTE_KDRV_UNKNOWN ||
-- rte_eth_devices[i].data->kdrv == RTE_KDRV_NONE)
-- continue;
--
- pci_dev = RTE_ETH_DEV_TO_PCI(&rte_eth_devices[i]);
- eth_pci_addr = &pci_dev->addr;
-
-@@ -98,6 +88,16 @@
- return -1;
- }
-
-+static inline int
-+pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr)
-+{
-+ struct rte_pci_device *pdev;
-+ const struct rte_pci_addr *paddr = _pci_addr;
-+
-+ pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev);
-+ return rte_eal_compare_pci_addr(&pdev->addr, paddr);
-+}
-+
- /**
- * Parses a port identifier string to a port id by pci address, then by name,
- * and finally port id.
-@@ -106,10 +106,23 @@
- parse_port_id(const char *port_str)
- {
- struct rte_pci_addr dev_addr;
-+ struct rte_bus *pci_bus;
-+ struct rte_device *dev;
- int port_id;
-
-+ pci_bus = rte_bus_find_by_name("pci");
-+ if (pci_bus == NULL) {
-+ RTE_LOG(ERR, PMD, "unable to find PCI bus\n");
-+ return -1;
-+ }
-+
- /* try parsing as pci address, physical devices */
-- if (eal_parse_pci_DomBDF(port_str, &dev_addr) == 0) {
-+ if (pci_bus->parse(port_str, &dev_addr) == 0) {
-+ dev = pci_bus->find_device(NULL, pci_addr_cmp, &dev_addr);
-+ if (dev == NULL) {
-+ RTE_LOG(ERR, PMD, "unable to find PCI device\n");
-+ return -1;
-+ }
- port_id = find_port_id_by_pci_addr(&dev_addr);
- if (port_id < 0)
- return -1;
diff --git a/dpdk/dpdk-17.08_patches/0002-crypto-qat-align-capabilities.patch b/dpdk/dpdk-17.08_patches/0002-crypto-qat-align-capabilities.patch
deleted file mode 100644
index 8179e5e6c7e..00000000000
--- a/dpdk/dpdk-17.08_patches/0002-crypto-qat-align-capabilities.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From f8184af94214f1c76c0ffda45b9de9243aea287c Mon Sep 17 00:00:00 2001
-From: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
-Date: Tue, 17 Oct 2017 20:05:59 +0100
-Subject: [PATCH] crypto/qat: align capabilities
-
-Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
----
- drivers/crypto/qat/qat_crypto_capabilities.h | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/crypto/qat/qat_crypto_capabilities.h b/drivers/crypto/qat/qat_crypto_capabilities.h
-index d8d3fa1..00f8056 100644
---- a/drivers/crypto/qat/qat_crypto_capabilities.h
-+++ b/drivers/crypto/qat/qat_crypto_capabilities.h
-@@ -48,9 +48,9 @@
- .increment = 1 \
- }, \
- .digest_size = { \
-- .min = 20, \
-+ .min = 12, \
- .max = 20, \
-- .increment = 0 \
-+ .increment = 1 \
- }, \
- .iv_size = { 0 } \
- }, } \
-@@ -69,9 +69,9 @@
- .increment = 1 \
- }, \
- .digest_size = { \
-- .min = 28, \
-+ .min = 14, \
- .max = 28, \
-- .increment = 0 \
-+ .increment = 1 \
- }, \
- .iv_size = { 0 } \
- }, } \
-@@ -90,9 +90,9 @@
- .increment = 1 \
- }, \
- .digest_size = { \
-- .min = 32, \
-+ .min = 16, \
- .max = 32, \
-- .increment = 0 \
-+ .increment = 1 \
- }, \
- .iv_size = { 0 } \
- }, } \
-@@ -111,9 +111,9 @@
- .increment = 1 \
- }, \
- .digest_size = { \
-- .min = 48, \
-+ .min = 24, \
- .max = 48, \
-- .increment = 0 \
-+ .increment = 1 \
- }, \
- .iv_size = { 0 } \
- }, } \
-@@ -132,9 +132,9 @@
- .increment = 1 \
- }, \
- .digest_size = { \
-- .min = 64, \
-+ .min = 32, \
- .max = 64, \
-- .increment = 0 \
-+ .increment = 1 \
- }, \
- .iv_size = { 0 } \
- }, } \
-@@ -153,9 +153,9 @@
- .increment = 1 \
- }, \
- .digest_size = { \
-- .min = 16, \
-+ .min = 12, \
- .max = 16, \
-- .increment = 0 \
-+ .increment = 1 \
- }, \
- .iv_size = { 0 } \
- }, } \
-@@ -174,9 +174,9 @@
- .increment = 0 \
- }, \
- .digest_size = { \
-- .min = 16, \
-+ .min = 12, \
- .max = 16, \
-- .increment = 0 \
-+ .increment = 1 \
- }, \
- .aad_size = { 0 }, \
- .iv_size = { 0 } \
---
-2.9.5
-