net/enic: remove unused functions in Tx path

Functions existed which were never called. Removed them. Also
rename the 'pmd' from the name of the Tx function to improve clarity.

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

diff --git a/drivers/net/enic/base/vnic_wq.h b/drivers/net/enic/base/vnic_wq.h
index c23de62..d8660e4 100644 (file)
--- a/drivers/net/enic/base/vnic_wq.h
+++ b/drivers/net/enic/base/vnic_wq.h
@@ -191,51 +191,6 @@ static inline u64 vnic_cached_posted_index(dma_addr_t addr, unsigned int len,
        PI_PREFETCH_ADDR_MASK) << PI_PREFETCH_ADDR_OFF);
 }
 
-static inline void vnic_wq_post(struct vnic_wq *wq,
-       void *os_buf, dma_addr_t dma_addr,
-       unsigned int len, int sop, int eop,
-       uint8_t desc_skip_cnt, uint8_t cq_entry,
-       uint8_t compressed_send, uint64_t wrid)
-{
-       struct vnic_wq_buf *buf = wq->to_use;
-
-       buf->sop = sop;
-       buf->cq_entry = cq_entry;
-       buf->compressed_send = compressed_send;
-       buf->desc_skip_cnt = desc_skip_cnt;
-       buf->os_buf = os_buf;
-       buf->dma_addr = dma_addr;
-       buf->len = len;
-       buf->wr_id = wrid;
-
-       buf = buf->next;
-       if (eop) {
-#ifdef DO_PREFETCH
-               uint64_t wr = vnic_cached_posted_index(dma_addr, len,
-                                                       buf->index);
-#endif
-               /* 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();
-#ifdef DO_PREFETCH
-               /* Intel chipsets seem to limit the rate of PIOs that we can
-                * push on the bus.  Thus, it is very important to do a single
-                * 64 bit write here.  With two 32-bit writes, my maximum
-                * pkt/sec rate was cut almost in half. -AJF
-                */
-               iowrite64((uint64_t)wr, &wq->ctrl->posted_index);
-#else
-               iowrite32(buf->index, &wq->ctrl->posted_index);
-#endif
-       }
-       wq->to_use = buf;
-
-       wq->ring.desc_avail -= desc_skip_cnt;
-}
-
 static inline void vnic_wq_service(struct vnic_wq *wq,
        struct cq_desc *cq_desc, u16 completed_index,
        void (*buf_service)(struct vnic_wq *wq,

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 62a8c12..5b58a65 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -207,8 +207,7 @@ extern int enic_clsf_init(struct enic *enic);
 extern void enic_clsf_destroy(struct enic *enic);
 uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                        uint16_t nb_pkts);
-
-uint16_t enicpmd_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_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_ethdev.c b/drivers/net/enic/enic_ethdev.c
index fab8124..697ff82 100644 (file)
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -577,7 +577,7 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev)
        enic->rte_dev = eth_dev;
        eth_dev->dev_ops = &enicpmd_eth_dev_ops;
        eth_dev->rx_pkt_burst = &enic_recv_pkts;
-       eth_dev->tx_pkt_burst = &enicpmd_xmit_pkts;
+       eth_dev->tx_pkt_burst = &enic_xmit_pkts;
 
        pdev = eth_dev->pci_dev;
        rte_eth_copy_pci_info(eth_dev, pdev);

diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h
index 00fa71d..955db71 100644 (file)
--- a/drivers/net/enic/enic_res.h
+++ b/drivers/net/enic/enic_res.h
@@ -57,84 +57,6 @@
 
 #define ENIC_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0)
 
-static inline void enic_queue_wq_desc_ex(struct vnic_wq *wq,
-       void *os_buf, dma_addr_t dma_addr, unsigned int len,
-       unsigned int mss_or_csum_offset, unsigned int hdr_len,
-       int vlan_tag_insert, unsigned int vlan_tag,
-       int offload_mode, int cq_entry, int sop, int eop, int loopback)
-{
-       struct wq_enet_desc *desc = vnic_wq_next_desc(wq);
-       u8 desc_skip_cnt = 1;
-       u8 compressed_send = 0;
-       u64 wrid = 0;
-
-       wq_enet_desc_enc(desc,
-               (u64)dma_addr | VNIC_PADDR_TARGET,
-               (u16)len,
-               (u16)mss_or_csum_offset,
-               (u16)hdr_len, (u8)offload_mode,
-               (u8)eop, (u8)cq_entry,
-               0, /* fcoe_encap */
-               (u8)vlan_tag_insert,
-               (u16)vlan_tag,
-               (u8)loopback);
-
-       vnic_wq_post(wq, os_buf, dma_addr, len, sop, eop, desc_skip_cnt,
-                       (u8)cq_entry, compressed_send, wrid);
-}
-
-static inline void enic_queue_wq_desc_cont(struct vnic_wq *wq,
-       void *os_buf, dma_addr_t dma_addr, unsigned int len,
-       int eop, int loopback)
-{
-       enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
-               0, 0, 0, 0, 0,
-               eop, 0 /* !SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc(struct vnic_wq *wq, void *os_buf,
-       dma_addr_t dma_addr, unsigned int len, int vlan_tag_insert,
-       unsigned int vlan_tag, int eop, int loopback)
-{
-       enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
-               0, 0, vlan_tag_insert, vlan_tag,
-               WQ_ENET_OFFLOAD_MODE_CSUM,
-               eop, 1 /* SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc_csum(struct vnic_wq *wq,
-       void *os_buf, dma_addr_t dma_addr, unsigned int len,
-       int ip_csum, int tcpudp_csum, int vlan_tag_insert,
-       unsigned int vlan_tag, int eop, int loopback)
-{
-       enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
-               (ip_csum ? 1 : 0) + (tcpudp_csum ? 2 : 0),
-               0, vlan_tag_insert, vlan_tag,
-               WQ_ENET_OFFLOAD_MODE_CSUM,
-               eop, 1 /* SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc_csum_l4(struct vnic_wq *wq,
-       void *os_buf, dma_addr_t dma_addr, unsigned int len,
-       unsigned int csum_offset, unsigned int hdr_len,
-       int vlan_tag_insert, unsigned int vlan_tag, int eop, int loopback)
-{
-       enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
-               csum_offset, hdr_len, vlan_tag_insert, vlan_tag,
-               WQ_ENET_OFFLOAD_MODE_CSUM_L4,
-               eop, 1 /* SOP */, eop, loopback);
-}
-
-static inline void enic_queue_wq_desc_tso(struct vnic_wq *wq,
-       void *os_buf, dma_addr_t dma_addr, unsigned int len,
-       unsigned int mss, unsigned int hdr_len, int vlan_tag_insert,
-       unsigned int vlan_tag, int eop, int loopback)
-{
-       enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
-               mss, hdr_len, vlan_tag_insert, vlan_tag,
-               WQ_ENET_OFFLOAD_MODE_TSO,
-               eop, 1 /* SOP */, eop, loopback);
-}
 
 struct enic;
 

diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 70ab356..47f2d7c 100644 (file)
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -416,7 +416,7 @@ void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
                          0 /*wrid*/);
 }
 
-uint16_t enicpmd_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
+uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t nb_pkts)
 {
        uint16_t index;