git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ixgbe: use the right debug macro
[dpdk.git] / lib / librte_pmd_ixgbe / ixgbe_rxtx.c
diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index 26cb176..c219a3c 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -142,10 +142,6 @@ ixgbe_tx_free_bufs(struct igb_tx_queue *txq)
         */
        txep = &(txq->sw_ring[txq->tx_next_dd - (txq->tx_rs_thresh - 1)]);
 
-       /* prefetch the mbufs that are about to be freed */
-       for (i = 0; i < txq->tx_rs_thresh; ++i)
-               rte_prefetch0((txep + i)->mbuf);
-
        /* free buffers one at a time */
        if ((txq->txq_flags & (uint32_t)ETH_TXQ_FLAGS_NOREFCOUNT) != 0) {
                for (i = 0; i < txq->tx_rs_thresh; ++i, ++txep) {
@@ -186,6 +182,7 @@ tx4(volatile union ixgbe_adv_tx_desc *txdp, struct rte_mbuf **pkts)
                                ((uint32_t)DCMD_DTYP_FLAGS | pkt_len);
                txdp->read.olinfo_status =
                                (pkt_len << IXGBE_ADVTXD_PAYLEN_SHIFT);
+               rte_prefetch0(&(*pkts)->pool);
        }
 }
 
@@ -205,6 +202,7 @@ tx1(volatile union ixgbe_adv_tx_desc *txdp, struct rte_mbuf **pkts)
                        ((uint32_t)DCMD_DTYP_FLAGS | pkt_len);
        txdp->read.olinfo_status =
                        (pkt_len << IXGBE_ADVTXD_PAYLEN_SHIFT);
+       rte_prefetch0(&(*pkts)->pool);
 }
 
 /*
@@ -1761,33 +1759,36 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
        tx_free_thresh = (uint16_t)((tx_conf->tx_free_thresh) ?
                        tx_conf->tx_free_thresh : DEFAULT_TX_FREE_THRESH);
        if (tx_rs_thresh >= (nb_desc - 2)) {
-               RTE_LOG(ERR, PMD, "tx_rs_thresh must be less than the number "
-                       "of TX descriptors minus 2. (tx_rs_thresh=%u port=%d "
-                               "queue=%d)\n", (unsigned int)tx_rs_thresh,
-                               (int)dev->data->port_id, (int)queue_idx);
+               PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than the number "
+                            "of TX descriptors minus 2. (tx_rs_thresh=%u "
+                            "port=%d queue=%d)", (unsigned int)tx_rs_thresh,
+                            (int)dev->data->port_id, (int)queue_idx);
                return -(EINVAL);
        }
        if (tx_free_thresh >= (nb_desc - 3)) {
-               RTE_LOG(ERR, PMD, "tx_rs_thresh must be less than the "
-                       "tx_free_thresh must be less than the number of TX "
-                       "descriptors minus 3. (tx_free_thresh=%u port=%d "
-                               "queue=%d)\n", (unsigned int)tx_free_thresh,
-                               (int)dev->data->port_id, (int)queue_idx);
+               PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than the "
+                            "tx_free_thresh must be less than the number of "
+                            "TX descriptors minus 3. (tx_free_thresh=%u "
+                            "port=%d queue=%d)",
+                            (unsigned int)tx_free_thresh,
+                            (int)dev->data->port_id, (int)queue_idx);
                return -(EINVAL);
        }
        if (tx_rs_thresh > tx_free_thresh) {
-               RTE_LOG(ERR, PMD, "tx_rs_thresh must be less than or equal to "
-                       "tx_free_thresh. (tx_free_thresh=%u tx_rs_thresh=%u "
-                       "port=%d queue=%d)\n", (unsigned int)tx_free_thresh,
-                       (unsigned int)tx_rs_thresh, (int)dev->data->port_id,
-                                                       (int)queue_idx);
+               PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than or equal to "
+                            "tx_free_thresh. (tx_free_thresh=%u "
+                            "tx_rs_thresh=%u port=%d queue=%d)",
+                            (unsigned int)tx_free_thresh,
+                            (unsigned int)tx_rs_thresh,
+                            (int)dev->data->port_id,
+                            (int)queue_idx);
                return -(EINVAL);
        }
        if ((nb_desc % tx_rs_thresh) != 0) {
-               RTE_LOG(ERR, PMD, "tx_rs_thresh must be a divisor of the "
-                       "number of TX descriptors. (tx_rs_thresh=%u port=%d "
-                               "queue=%d)\n", (unsigned int)tx_rs_thresh,
-                               (int)dev->data->port_id, (int)queue_idx);
+               PMD_INIT_LOG(ERR, "tx_rs_thresh must be a divisor of the "
+                            "number of TX descriptors. (tx_rs_thresh=%u "
+                            "port=%d queue=%d)", (unsigned int)tx_rs_thresh,
+                            (int)dev->data->port_id, (int)queue_idx);
                return -(EINVAL);
        }
 
@@ -1798,10 +1799,10 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
         * accumulates WTHRESH descriptors.
         */
        if ((tx_rs_thresh > 1) && (tx_conf->tx_thresh.wthresh != 0)) {
-               RTE_LOG(ERR, PMD, "TX WTHRESH must be set to 0 if "
-                       "tx_rs_thresh is greater than 1. (tx_rs_thresh=%u "
-                       "port=%d queue=%d)\n", (unsigned int)tx_rs_thresh,
-                               (int)dev->data->port_id, (int)queue_idx);
+               PMD_INIT_LOG(ERR, "TX WTHRESH must be set to 0 if "
+                            "tx_rs_thresh is greater than 1. (tx_rs_thresh=%u "
+                            "port=%d queue=%d)", (unsigned int)tx_rs_thresh,
+                            (int)dev->data->port_id, (int)queue_idx);
                return -(EINVAL);
        }
 
@@ -1875,7 +1876,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
                PMD_INIT_LOG(INFO, "Using simple tx code path\n");
 #ifdef RTE_IXGBE_INC_VECTOR
                if (txq->tx_rs_thresh <= RTE_IXGBE_TX_MAX_FREE_BUF_SZ &&
-                   ixgbe_txq_vec_setup(txq, socket_id) == 0) {
+                   ixgbe_txq_vec_setup(txq) == 0) {
                        PMD_INIT_LOG(INFO, "Vector tx enabled.\n");
                        dev->tx_pkt_burst = ixgbe_xmit_pkts_vec;
                }
@@ -2166,7 +2167,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
                if (!ixgbe_rx_vec_condition_check(dev)) {
                        PMD_INIT_LOG(INFO, "Vector rx enabled, please make "
                                     "sure RX burst size no less than 32.\n");
-                       ixgbe_rxq_vec_setup(rxq, socket_id);
+                       ixgbe_rxq_vec_setup(rxq);
                        dev->rx_pkt_burst = ixgbe_recv_pkts_vec;
                }
 #endif
@@ -3274,7 +3275,7 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
                        IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQRT8TCEN);
                        break;
                default:
-                       RTE_LOG(ERR, PMD, "invalid pool number in IOV mode\n");
+                       PMD_INIT_LOG(ERR, "invalid pool number in IOV mode");
                }
        }
 
@@ -3327,7 +3328,7 @@ ixgbe_dev_mq_tx_configure(struct rte_eth_dev *dev)
                        break;
                default:
                        mtqc = IXGBE_MTQC_64Q_1PB;
-                       RTE_LOG(ERR, PMD, "invalid pool number in IOV mode\n");
+                       PMD_INIT_LOG(ERR, "invalid pool number in IOV mode");
                }
                IXGBE_WRITE_REG(hw, IXGBE_MTQC, mtqc);
        }
@@ -3478,12 +3479,20 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev)
                if ((dev->data->dev_conf.rxmode.max_rx_pkt_len +
                                2 * IXGBE_VLAN_TAG_SIZE) > buf_size){
                        dev->data->scattered_rx = 1;
+#ifdef RTE_IXGBE_INC_VECTOR
+                       dev->rx_pkt_burst = ixgbe_recv_scattered_pkts_vec;
+#else
                        dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
+#endif
                }
        }
 
        if (dev->data->dev_conf.rxmode.enable_scatter) {
+#ifdef RTE_IXGBE_INC_VECTOR
+               dev->rx_pkt_burst = ixgbe_recv_scattered_pkts_vec;
+#else
                dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
+#endif
                dev->data->scattered_rx = 1;
        }
 
@@ -3590,7 +3599,7 @@ ixgbe_dev_tx_init(struct rte_eth_dev *dev)
 static inline void
 ixgbe_setup_loopback_link_82599(struct ixgbe_hw *hw)
 {
-       DEBUGFUNC("ixgbe_setup_loopback_link_82599");
+       PMD_INIT_FUNC_TRACE();
 
        if (ixgbe_verify_lesm_fw_enabled_82599(hw)) {
                if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM) !=
@@ -3971,12 +3980,20 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
                if ((dev->data->dev_conf.rxmode.max_rx_pkt_len +
                                2 * IXGBE_VLAN_TAG_SIZE) > buf_size) {
                        dev->data->scattered_rx = 1;
+#ifdef RTE_IXGBE_INC_VECTOR
+                       dev->rx_pkt_burst = ixgbe_recv_scattered_pkts_vec;
+#else
                        dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
+#endif
                }
        }
 
        if (dev->data->dev_conf.rxmode.enable_scatter) {
+#ifdef RTE_IXGBE_INC_VECTOR
+               dev->rx_pkt_burst = ixgbe_recv_scattered_pkts_vec;
+#else
                dev->rx_pkt_burst = ixgbe_recv_scattered_pkts;
+#endif
                dev->data->scattered_rx = 1;
        }
 
DPDK repo used for reviews