net/virtio: allocate queue at init stage

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

diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index df2cb7d..8a3fa6d 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -42,21 +42,19 @@
 #define SPEED_100      100
 #define SPEED_1000     1000
 #define SPEED_10G      10000
-#define HALF_DUPLEX    1
-#define FULL_DUPLEX    2
 
 #ifndef PAGE_SIZE
 #define PAGE_SIZE 4096
 #endif
 
-#define VIRTIO_MAX_RX_QUEUES 128
-#define VIRTIO_MAX_TX_QUEUES 128
+#define VIRTIO_MAX_RX_QUEUES 128U
+#define VIRTIO_MAX_TX_QUEUES 128U
 #define VIRTIO_MAX_MAC_ADDRS 64
 #define VIRTIO_MIN_RX_BUFSIZE 64
 #define VIRTIO_MAX_RX_PKTLEN  9728
 
 /* Features desired/implemented by this driver. */
-#define VIRTIO_PMD_GUEST_FEATURES              \
+#define VIRTIO_PMD_DEFAULT_GUEST_FEATURES      \
        (1u << VIRTIO_NET_F_MAC           |     \
         1u << VIRTIO_NET_F_STATUS        |     \
         1u << VIRTIO_NET_F_MQ            |     \
@@ -64,7 +62,13 @@
         1u << VIRTIO_NET_F_CTRL_VQ       |     \
         1u << VIRTIO_NET_F_CTRL_RX       |     \
         1u << VIRTIO_NET_F_CTRL_VLAN     |     \
-        1u << VIRTIO_NET_F_MRG_RXBUF)
+        1u << VIRTIO_NET_F_CSUM          |     \
+        1u << VIRTIO_NET_F_HOST_TSO4     |     \
+        1u << VIRTIO_NET_F_HOST_TSO6     |     \
+        1u << VIRTIO_NET_F_MRG_RXBUF     |     \
+        1u << VIRTIO_RING_F_INDIRECT_DESC |    \
+        1ULL << VIRTIO_F_VERSION_1       |     \
+        1ULL << VIRTIO_F_IOMMU_PLATFORM)
 
 /*
  * CQ function prototype
@@ -76,14 +80,6 @@ void virtio_dev_cq_start(struct rte_eth_dev *dev);
  */
 void virtio_dev_rxtx_start(struct rte_eth_dev *dev);
 
-int virtio_dev_queue_setup(struct rte_eth_dev *dev,
-                       int queue_type,
-                       uint16_t queue_idx,
-                       uint16_t  vtpci_queue_idx,
-                       uint16_t nb_desc,
-                       unsigned int socket_id,
-                       struct virtqueue **pvq);
-
 int  virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
                uint16_t nb_rx_desc, unsigned int socket_id,
                const struct rte_eth_rxconf *rx_conf,
@@ -102,14 +98,12 @@ uint16_t virtio_recv_mergeable_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 uint16_t virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                uint16_t nb_pkts);
 
+uint16_t virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
+               uint16_t nb_pkts);
 
-/*
- * The VIRTIO_NET_F_GUEST_TSO[46] features permit the host to send us
- * frames larger than 1514 bytes. We do not yet support software LRO
- * via tcp_lro_rx().
- */
-#define VTNET_LRO_FEATURES (VIRTIO_NET_F_GUEST_TSO4 | \
-                           VIRTIO_NET_F_GUEST_TSO6 | VIRTIO_NET_F_GUEST_ECN)
+uint16_t virtio_xmit_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts,
+               uint16_t nb_pkts);
 
+int eth_virtio_dev_init(struct rte_eth_dev *eth_dev);
 
 #endif /* _VIRTIO_ETHDEV_H_ */