ENIC driver updates for DPDK 16.04 and 2.2.0

Change-Id: I896925ea2208d318d353d486707b97f295c78426
Signed-off-by: John Lo <loj@cisco.com>

dpdk/dpdk-2.2.0_patches/0024-enic-fix-imissed-rx-counter.patch

@@ -1,18 +1,20 @@
-From c6c5a3f41528b28764ee4aa96a72d89c94d695df Mon Sep 17 00:00:00 2001
+From 3433c7828ec909fccb768636ee21867030da14c9 Mon Sep 17 00:00:00 2001
 From: John Daley <johndale@cisco.com>
-Date: Fri, 15 Apr 2016 14:43:11 -0700
-Subject: [PATCH] enic: fix imissed rx counter
+Date: Tue, 26 Apr 2016 13:30:50 -0700
+Subject: [PATCH 1/3] enic: fix 'imissed' to count drops due to lack of RX
+ buffers
 
+Fixes: 7182d3e7d177 ("enic: expose Rx missed packets counter")
 Signed-off-by: John Daley <johndale@cisco.com>
 ---
  drivers/net/enic/enic_main.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
-index c61433f..8d6bbeb 100644
+index 60fe765..be4e9e5 100644
 --- a/drivers/net/enic/enic_main.c
 +++ b/drivers/net/enic/enic_main.c
-@@ -165,10 +165,10 @@ void enic_dev_stats_get(struct enic *enic, struct rte_eth_stats *r_stats)
+@@ -243,10 +243,10 @@ void enic_dev_stats_get(struct enic *enic, struct rte_eth_stats *r_stats)
  	r_stats->ibytes = stats->rx.rx_bytes_ok;
  	r_stats->obytes = stats->tx.tx_bytes_ok;
  
@@ -23,8 +25,8 @@ index c61433f..8d6bbeb 100644
 -	r_stats->imissed = stats->rx.rx_drop;
 +	r_stats->imissed = stats->rx.rx_no_bufs;
  
- 	r_stats->imcasts = stats->rx.rx_multicast_frames_ok;
  	r_stats->rx_nombuf = stats->rx.rx_no_bufs;
+ }
 -- 
 2.7.0
 

dpdk/dpdk-2.2.0_patches/0025-enic-fix-misalignment-of-Rx-mbuf-data.patch

@@ -0,0 +1,55 @@
+From 454eb71eca1912e32a509c738a99a340cc2488cf Mon Sep 17 00:00:00 2001
+From: John Daley <johndale@cisco.com>
+Date: Mon, 25 Apr 2016 16:24:53 -0700
+Subject: [PATCH 2/3] enic: fix misalignment of Rx mbuf data
+
+Data DMA used m->data_off of uninitialized mbufs instead of
+RTE_PKTMBUF_HEADROOM, potentially causing Rx data to be
+placed at the wrong alignment in the mbuf.
+
+Fixes: 947d860c821f ("enic: improve Rx performance")
+Signed-off-by: John Daley <johndale@cisco.com>
+---
+ drivers/net/enic/enic_main.c | 5 +++--
+ drivers/net/enic/enic_rx.c   | 6 ++++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
+index be4e9e5..646d87f 100644
+--- a/drivers/net/enic/enic_main.c
++++ b/drivers/net/enic/enic_main.c
+@@ -354,10 +354,11 @@ enic_alloc_rx_queue_mbufs(struct enic *enic, struct vnic_rq *rq)
+ 			return -ENOMEM;
+ 		}
+ 
+-		dma_addr = (dma_addr_t)(mb->buf_physaddr + mb->data_off);
++		dma_addr = (dma_addr_t)(mb->buf_physaddr
++			   + RTE_PKTMBUF_HEADROOM);
+ 
+ 		rq_enet_desc_enc(rqd, dma_addr, RQ_ENET_TYPE_ONLY_SOP,
+-				 mb->buf_len);
++				 mb->buf_len - RTE_PKTMBUF_HEADROOM);
+ 		rq->mbuf_ring[i] = mb;
+ 	}
+ 
+diff --git a/drivers/net/enic/enic_rx.c b/drivers/net/enic/enic_rx.c
+index 232987a..39bb55c 100644
+--- a/drivers/net/enic/enic_rx.c
++++ b/drivers/net/enic/enic_rx.c
+@@ -314,9 +314,11 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+ 				 + rx_id);
+ 
+ 		/* Push descriptor for newly allocated mbuf */
+-		dma_addr = (dma_addr_t)(nmb->buf_physaddr + nmb->data_off);
++		dma_addr = (dma_addr_t)(nmb->buf_physaddr
++			   + RTE_PKTMBUF_HEADROOM);
+ 		rqd_ptr->address = rte_cpu_to_le_64(dma_addr);
+-		rqd_ptr->length_type = cpu_to_le16(nmb->buf_len);
++		rqd_ptr->length_type = cpu_to_le16(nmb->buf_len
++				       - RTE_PKTMBUF_HEADROOM);
+ 
+ 		/* Fill in the rest of the mbuf */
+ 		rxmb->data_off = RTE_PKTMBUF_HEADROOM;
+-- 
+2.7.0
+