diff options
author | Damjan Marion <damarion@cisco.com> | 2016-06-07 12:46:55 +0200 |
---|---|---|
committer | Dave Barach <openvpp@barachs.net> | 2016-06-07 16:34:44 +0000 |
commit | 19414deeaa15ea9434f86d40a5bc7ca43916eab5 (patch) | |
tree | acdb991d5696686abd5d082dee30eaef110577a0 /dpdk/dpdk-16.04_patches/0012-enic-Optimization-of-Tx-path-to-reduce-Host-CPU-over.patch | |
parent | 3ef822e1c3eedef8dd3cd95a000a012667641f37 (diff) |
Rebase DPDK patches
Change-Id: I3ef9faceb085bd06b55e3ba7800389eaae56177a
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'dpdk/dpdk-16.04_patches/0012-enic-Optimization-of-Tx-path-to-reduce-Host-CPU-over.patch')
-rw-r--r-- | dpdk/dpdk-16.04_patches/0012-enic-Optimization-of-Tx-path-to-reduce-Host-CPU-over.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dpdk/dpdk-16.04_patches/0012-enic-Optimization-of-Tx-path-to-reduce-Host-CPU-over.patch b/dpdk/dpdk-16.04_patches/0012-enic-Optimization-of-Tx-path-to-reduce-Host-CPU-over.patch index 4858b8f5d39..7acead45615 100644 --- a/dpdk/dpdk-16.04_patches/0012-enic-Optimization-of-Tx-path-to-reduce-Host-CPU-over.patch +++ b/dpdk/dpdk-16.04_patches/0012-enic-Optimization-of-Tx-path-to-reduce-Host-CPU-over.patch @@ -1,7 +1,7 @@ -From ca6bbb723880e91d006de6cc485259da988859aa Mon Sep 17 00:00:00 2001 +From 4e1872a43b3ad824e37f840c9ed1e0c1f1b24a32 Mon Sep 17 00:00:00 2001 From: John Daley <johndale@cisco.com> Date: Tue, 5 Apr 2016 15:19:06 -0700 -Subject: [PATCH 3/3] enic: Optimization of Tx path to reduce Host CPU +Subject: [PATCH 12/17] enic: Optimization of Tx path to reduce Host CPU overhead, cleanup Optimizations and cleanup: @@ -642,7 +642,7 @@ index 6bea940..697ff82 100644 pdev = eth_dev->pci_dev; rte_eth_copy_pci_info(eth_dev, pdev); diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c -index 646d87f..ba73604 100644 +index b164307..9bfdec1 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -40,11 +40,11 @@ @@ -773,7 +773,7 @@ index 646d87f..ba73604 100644 void enic_dev_stats_clear(struct enic *enic) { -@@ -297,12 +217,28 @@ void enic_init_vnic_resources(struct enic *enic) +@@ -298,12 +218,28 @@ void enic_init_vnic_resources(struct enic *enic) unsigned int error_interrupt_enable = 1; unsigned int error_interrupt_offset = 0; unsigned int index = 0; @@ -802,7 +802,7 @@ index 646d87f..ba73604 100644 } for (index = 0; index < enic->wq_count; index++) { -@@ -310,22 +246,19 @@ void enic_init_vnic_resources(struct enic *enic) +@@ -311,22 +247,19 @@ void enic_init_vnic_resources(struct enic *enic) enic_cq_wq(enic, index), error_interrupt_enable, error_interrupt_offset); @@ -830,7 +830,7 @@ index 646d87f..ba73604 100644 } vnic_intr_init(&enic->intr, -@@ -569,6 +502,7 @@ void enic_free_wq(void *txq) +@@ -570,6 +503,7 @@ void enic_free_wq(void *txq) struct vnic_wq *wq = (struct vnic_wq *)txq; struct enic *enic = vnic_dev_priv(wq->vdev); @@ -838,7 +838,7 @@ index 646d87f..ba73604 100644 vnic_wq_free(wq); vnic_cq_free(&enic->cq[enic->rq_count + wq->index]); } -@@ -579,6 +513,8 @@ int enic_alloc_wq(struct enic *enic, uint16_t queue_idx, +@@ -580,6 +514,8 @@ int enic_alloc_wq(struct enic *enic, uint16_t queue_idx, int err; struct vnic_wq *wq = &enic->wq[queue_idx]; unsigned int cq_index = enic_cq_wq(enic, queue_idx); @@ -847,7 +847,7 @@ index 646d87f..ba73604 100644 wq->socket_id = socket_id; if (nb_desc) { -@@ -614,6 +550,18 @@ int enic_alloc_wq(struct enic *enic, uint16_t queue_idx, +@@ -615,6 +551,18 @@ int enic_alloc_wq(struct enic *enic, uint16_t queue_idx, dev_err(enic, "error in allocation of cq for wq\n"); } @@ -1840,5 +1840,5 @@ index 0000000..71ca34e + return index; +} -- -2.7.0 +2.7.4 |