net/enic: remove unused code

Remove some files, functions and variables left unused after
Tx performance improvements.

Signed-off-by: John Daley <johndale@cisco.com>

diff --git a/drivers/net/enic/base/enic_vnic_wq.h b/drivers/net/enic/base/enic_vnic_wq.h
deleted file mode 100644 (file)
index 55c5664..0000000
--- a/drivers/net/enic/base/enic_vnic_wq.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2008-2015 Cisco Systems, Inc.  All rights reserved.
- * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
- *
- * Copyright (c) 2015, Cisco Systems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef _ENIC_VNIC_WQ_H_
-#define _ENIC_VNIC_WQ_H_
-
-#include "vnic_dev.h"
-#include "vnic_cq.h"
-
-static inline void enic_vnic_post_wq_index(struct vnic_wq *wq)
-{
-       /* Adding write memory barrier prevents compiler and/or CPU
-        * reordering, thus avoiding descriptor posting before
-        * descriptor is initialized. Otherwise, hardware can read
-        * stale descriptor fields.
-       */
-       wmb();
-       iowrite32(wq->head_idx, &wq->ctrl->posted_index);
-}
-
-static inline void enic_vnic_post_wq(struct vnic_wq *wq,
-                                    void *os_buf, uint8_t cq_entry)
-{
-       struct vnic_wq_buf *buf = &wq->bufs[wq->head_idx];
-       buf->mb = os_buf;
-       wq->head_idx = enic_ring_incr(wq->ring.desc_count, wq->head_idx);
-
-       if (cq_entry)
-               enic_vnic_post_wq_index(wq);
-}
-
-#endif /* _ENIC_VNIC_WQ_H_ */

diff --git a/drivers/net/enic/base/vnic_cq.h b/drivers/net/enic/base/vnic_cq.h
index 922391b..13ab87c 100644 (file)
--- a/drivers/net/enic/base/vnic_cq.h
+++ b/drivers/net/enic/base/vnic_cq.h
@@ -90,50 +90,6 @@ struct vnic_cq {
 #endif
 };
 
-static inline unsigned int vnic_cq_service(struct vnic_cq *cq,
-       unsigned int work_to_do,
-       int (*q_service)(struct vnic_dev *vdev, struct cq_desc *cq_desc,
-       u8 type, u16 q_number, u16 completed_index, void *opaque),
-       void *opaque)
-{
-       struct cq_desc *cq_desc;
-       unsigned int work_done = 0;
-       u16 q_number, completed_index;
-       u8 type, color;
-       struct rte_mbuf **rx_pkts = opaque;
-       unsigned int ret;
-
-       cq_desc = (struct cq_desc *)((u8 *)cq->ring.descs +
-               cq->ring.desc_size * cq->to_clean);
-       cq_desc_dec(cq_desc, &type, &color,
-               &q_number, &completed_index);
-
-       while (color != cq->last_color) {
-               if (opaque)
-                       opaque = (void *)&(rx_pkts[work_done]);
-
-               ret = (*q_service)(cq->vdev, cq_desc, type,
-                       q_number, completed_index, opaque);
-               cq->to_clean++;
-               if (cq->to_clean == cq->ring.desc_count) {
-                       cq->to_clean = 0;
-                       cq->last_color = cq->last_color ? 0 : 1;
-               }
-
-               cq_desc = (struct cq_desc *)((u8 *)cq->ring.descs +
-                       cq->ring.desc_size * cq->to_clean);
-               cq_desc_dec(cq_desc, &type, &color,
-                       &q_number, &completed_index);
-
-               if (ret)
-                       work_done++;
-               if (work_done >= work_to_do)
-                       break;
-       }
-
-       return work_done;
-}
-
 void vnic_cq_free(struct vnic_cq *cq);
 int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
        unsigned int socket_id,

diff --git a/drivers/net/enic/base/vnic_wq.c b/drivers/net/enic/base/vnic_wq.c
index cfef1af..9b9ff4d 100644 (file)
--- a/drivers/net/enic/base/vnic_wq.c
+++ b/drivers/net/enic/base/vnic_wq.c
@@ -179,7 +179,7 @@ int vnic_wq_disable(struct vnic_wq *wq)
 }
 
 void vnic_wq_clean(struct vnic_wq *wq,
-       void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf))
+                  void (*buf_clean)(struct vnic_wq_buf *buf))
 {
        struct vnic_wq_buf *buf;
        unsigned int  to_clean = wq->tail_idx;
@@ -188,7 +188,7 @@ void vnic_wq_clean(struct vnic_wq *wq,
 
        while (vnic_wq_desc_used(wq) > 0) {
 
-               (*buf_clean)(wq, buf);
+               (*buf_clean)(buf);
                to_clean = buf_idx_incr(wq->ring.desc_count, to_clean);
 
                buf = &wq->bufs[to_clean];

diff --git a/drivers/net/enic/base/vnic_wq.h b/drivers/net/enic/base/vnic_wq.h
index 7a66813..38a217f 100644 (file)
--- a/drivers/net/enic/base/vnic_wq.h
+++ b/drivers/net/enic/base/vnic_wq.h
@@ -79,7 +79,6 @@ struct vnic_wq {
        struct vnic_wq_buf *bufs;
        unsigned int head_idx;
        unsigned int tail_idx;
-       unsigned int pkts_outstanding;
        unsigned int socket_id;
        const struct rte_memzone *cqmsg_rz;
        uint16_t last_completed_index;
@@ -193,8 +192,5 @@ unsigned int vnic_wq_error_status(struct vnic_wq *wq);
 void vnic_wq_enable(struct vnic_wq *wq);
 int vnic_wq_disable(struct vnic_wq *wq);
 void vnic_wq_clean(struct vnic_wq *wq,
-       void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf));
-int vnic_wq_mem_size(struct vnic_wq *wq, unsigned int desc_count,
-       unsigned int desc_size);
-
+                  void (*buf_clean)(struct vnic_wq_buf *buf));
 #endif /* _VNIC_WQ_H_ */

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index fe186de..4eb28ee 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -233,5 +233,4 @@ uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                        uint16_t nb_pkts);
 uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                               uint16_t nb_pkts);
-void enic_free_wq_buf(__rte_unused struct vnic_wq *wq, struct vnic_wq_buf *buf);
 #endif /* _ENIC_H_ */

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index eaa206e..996f999 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -102,7 +102,7 @@ void enic_set_hdr_split_size(struct enic *enic, u16 split_hdr_size)
        vnic_set_hdr_split_size(enic->vdev, split_hdr_size);
 }
 
-void enic_free_wq_buf(__rte_unused struct vnic_wq *wq, struct vnic_wq_buf *buf)
+static void enic_free_wq_buf(struct vnic_wq_buf *buf)
 {
        struct rte_mbuf *mbuf = (struct rte_mbuf *)buf->mb;
 

diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 243efe6..98d93bb 100644 (file)
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -37,7 +37,6 @@
 #include "enic_compat.h"
 #include "rq_enet_desc.h"
 #include "enic.h"
-#include "enic_vnic_wq.h"
 
 #define RTE_PMD_USE_PREFETCH