net/virtio: remove simple Tx path

[dpdk.git] / drivers / net / virtio / virtio_ethdev.c

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index df50a57..73c4287 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1320,6 +1320,11 @@ set_rxtx_funcs(struct rte_eth_dev *eth_dev)
                PMD_INIT_LOG(INFO, "virtio: using simple Rx path on port %u",
                        eth_dev->data->port_id);
                eth_dev->rx_pkt_burst = virtio_recv_pkts_vec;
+       } else if (hw->use_inorder_rx) {
+               PMD_INIT_LOG(INFO,
+                       "virtio: using inorder mergeable buffer Rx path on port %u",
+                       eth_dev->data->port_id);
+               eth_dev->rx_pkt_burst = &virtio_recv_mergeable_pkts_inorder;
        } else if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {
                PMD_INIT_LOG(INFO,
                        "virtio: using mergeable buffer Rx path on port %u",
@@ -1331,10 +1336,10 @@ set_rxtx_funcs(struct rte_eth_dev *eth_dev)
                eth_dev->rx_pkt_burst = &virtio_recv_pkts;
        }
 
-       if (hw->use_simple_tx) {
-               PMD_INIT_LOG(INFO, "virtio: using simple Tx path on port %u",
+       if (hw->use_inorder_tx) {
+               PMD_INIT_LOG(INFO, "virtio: using inorder Tx path on port %u",
                        eth_dev->data->port_id);
-               eth_dev->tx_pkt_burst = virtio_xmit_pkts_simple;
+               eth_dev->tx_pkt_burst = virtio_xmit_pkts_inorder;
        } else {
                PMD_INIT_LOG(INFO, "virtio: using standard Tx path on port %u",
                        eth_dev->data->port_id);
@@ -1872,17 +1877,24 @@ virtio_dev_configure(struct rte_eth_dev *dev)
        rte_spinlock_init(&hw->state_lock);
 
        hw->use_simple_rx = 1;
-       hw->use_simple_tx = 1;
+
+       if (vtpci_with_feature(hw, VIRTIO_F_IN_ORDER)) {
+               hw->use_inorder_tx = 1;
+               if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {
+                       hw->use_inorder_rx = 1;
+                       hw->use_simple_rx = 0;
+               } else {
+                       hw->use_inorder_rx = 0;
+               }
+       }
 
 #if defined RTE_ARCH_ARM64 || defined RTE_ARCH_ARM
        if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON)) {
                hw->use_simple_rx = 0;
-               hw->use_simple_tx = 0;
        }
 #endif
        if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {
-               hw->use_simple_rx = 0;
-               hw->use_simple_tx = 0;
+                hw->use_simple_rx = 0;
        }
 
        if (rx_offloads & (DEV_RX_OFFLOAD_UDP_CKSUM |
@@ -2127,7 +2139,8 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        };
 
        host_features = VTPCI_OPS(hw)->get_features(hw);
-       dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP;
+       dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP |
+                                   DEV_RX_OFFLOAD_CRC_STRIP;
        if (host_features & (1ULL << VIRTIO_NET_F_GUEST_CSUM)) {
                dev_info->rx_offload_capa |=
                        DEV_RX_OFFLOAD_TCP_CKSUM |