ethdev: update VMDq/DCB support

Signed-off-by: Intel

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index cb9c14e..5d99447 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1562,8 +1562,8 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
                }
  
                /*set DCB mode of RX and TX of multiple queues*/
-               eth_conf->rxmode.mq_mode = ETH_VMDQ_DCB;
-               eth_conf->txmode.mq_mode = ETH_VMDQ_DCB_TX;
+               eth_conf->rxmode.mq_mode = ETH_MQ_RX_VMDQ_DCB;
+               eth_conf->txmode.mq_mode = ETH_MQ_TX_VMDQ_DCB;
                if (dcb_conf->pfc_en)
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT;
                else
@@ -1591,8 +1591,8 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)
                        rx_conf.dcb_queue[i] = i;
                        tx_conf.dcb_queue[i] = i;
                }
-               eth_conf->rxmode.mq_mode = ETH_DCB_RX;
-               eth_conf->txmode.mq_mode = ETH_DCB_TX;
+               eth_conf->rxmode.mq_mode = ETH_MQ_RX_DCB;
+               eth_conf->txmode.mq_mode = ETH_MQ_TX_DCB;
                if (dcb_conf->pfc_en)
                        eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT;
                else

diff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c
index 0c89670..38f55a1 100644 (file)
--- a/examples/dpdk_qat/main.c
+++ b/examples/dpdk_qat/main.c
@@ -173,7 +173,7 @@ static struct rte_eth_conf port_conf = {
                },
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/exception_path/main.c b/examples/exception_path/main.c
index 0a19831..70c1009 100644 (file)
--- a/examples/exception_path/main.c
+++ b/examples/exception_path/main.c
@@ -149,7 +149,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc = 0,      /* CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/ipv4_frag/main.c b/examples/ipv4_frag/main.c
index dec6c24..f5285d8 100644 (file)
--- a/examples/ipv4_frag/main.c
+++ b/examples/ipv4_frag/main.c
@@ -167,7 +167,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 548c36a..856dfa1 100644 (file)
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -175,7 +175,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/kni/main.c b/examples/kni/main.c
index 34a6f4a..cda3d73 100644 (file)
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -149,7 +149,7 @@ static struct rte_eth_conf port_conf = {
                .hw_strip_crc = 0,      /* CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 017fe0e..9f5ba4b 100644 (file)
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -148,7 +148,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index 6e8726e..74c5cfe 100644 (file)
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -197,7 +197,7 @@ static struct rte_eth_conf port_conf = {
                },
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 5a6ddd5..998093f 100755 (executable)
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -228,7 +228,7 @@ static struct rte_eth_conf port_conf = {
                },
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c
index 0126c51..aec84ea 100644 (file)
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -151,7 +151,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
        .intr_conf = {
                .lsc = 1, /**< lsc interrupt feature enabled */

diff --git a/examples/load_balancer/init.c b/examples/load_balancer/init.c
index 916094f..f9071bd 100644 (file)
--- a/examples/load_balancer/init.c
+++ b/examples/load_balancer/init.c
@@ -91,7 +91,7 @@ static struct rte_eth_conf port_conf = {
                },
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 

diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index ebf69ae..505ca6d 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -164,7 +164,7 @@ init_port(uint8_t port_num)
        /* for port configuration all features are off by default */
        const struct rte_eth_conf port_conf = {
                .rxmode = {
-                       .mq_mode = ETH_RSS
+                       .mq_mode = ETH_MQ_RX_RSS
                }
        };
        const uint16_t rx_rings = 1, tx_rings = num_clients;

diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index f97a294..efd6a47 100644 (file)
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -243,7 +243,7 @@ smp_port_init(uint8_t port, struct rte_mempool *mbuf_pool, uint16_t num_queues)
 {
        struct rte_eth_conf port_conf = {
                        .rxmode = {
-                               .mq_mode = ETH_RSS,
+                               .mq_mode = ETH_MQ_RX_RSS,
                                .split_hdr_size = 0,
                                .header_split   = 0, /**< Header Split disabled */
                                .hw_ip_checksum = 1, /**< IP checksum offload enabled */
@@ -258,7 +258,7 @@ smp_port_init(uint8_t port, struct rte_mempool *mbuf_pool, uint16_t num_queues)
                                },
                        },
                        .txmode = {
-                               .mq_mode = ETH_DCB_NONE,
+                               .mq_mode = ETH_MQ_TX_NONE,
                        }
        };
        const uint16_t rx_rings = num_queues, tx_rings = num_queues;

diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 659f46f..0b17875 100644 (file)
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -122,7 +122,7 @@ static const struct rte_eth_txconf tx_conf_default = {
 /* empty vmdq+dcb configuration structure. Filled in programatically */
 static const struct rte_eth_conf vmdq_dcb_conf_default = {
        .rxmode = {
-               .mq_mode        = ETH_VMDQ_DCB,
+               .mq_mode        = ETH_MQ_RX_VMDQ_DCB,
                .split_hdr_size = 0,
                .header_split   = 0, /**< Header Split disabled */
                .hw_ip_checksum = 0, /**< IP checksum offload disabled */
@@ -130,7 +130,7 @@ static const struct rte_eth_conf vmdq_dcb_conf_default = {
                .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
        .rx_adv_conf = {
                /*

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 4e8e73c..afc9b72 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -331,6 +331,150 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
        return (0);
 }
 
+static int
+rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
+                     const struct rte_eth_conf *dev_conf)
+{
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+
+       if (RTE_ETH_DEV_SRIOV(dev).active != 0) {
+               /* check multi-queue mode */
+               if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) || 
+                   (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) ||
+                   (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB_RSS) ||
+                   (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB)) {
+                       /* SRIOV only works in VMDq enable mode */
+                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
+                                       "wrong VMDQ mq_mode rx %d tx %d\n", 
+                                       port_id, dev_conf->rxmode.mq_mode,
+                                       dev_conf->txmode.mq_mode);
+                       return (-EINVAL);
+               }
+
+               switch (dev_conf->rxmode.mq_mode) {
+               case ETH_MQ_RX_VMDQ_RSS:
+               case ETH_MQ_RX_VMDQ_DCB:
+               case ETH_MQ_RX_VMDQ_DCB_RSS:
+                       /* DCB/RSS VMDQ in SRIOV mode, not implement yet */
+                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
+                                       "unsupported VMDQ mq_mode rx %d\n", 
+                                       port_id, dev_conf->rxmode.mq_mode);
+                       return (-EINVAL);
+               default: /* ETH_MQ_RX_VMDQ_ONLY or ETH_MQ_RX_NONE */
+                       /* if nothing mq mode configure, use default scheme */
+                       dev->data->dev_conf.rxmode.mq_mode = ETH_MQ_RX_VMDQ_ONLY;
+                       if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1)
+                               RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = 1;
+                       break;
+               }
+
+               switch (dev_conf->txmode.mq_mode) {
+               case ETH_MQ_TX_VMDQ_DCB:
+                       /* DCB VMDQ in SRIOV mode, not implement yet */
+                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
+                                       "unsupported VMDQ mq_mode tx %d\n", 
+                                       port_id, dev_conf->txmode.mq_mode);
+                       return (-EINVAL);
+               default: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */
+                       /* if nothing mq mode configure, use default scheme */
+                       dev->data->dev_conf.txmode.mq_mode = ETH_MQ_TX_VMDQ_ONLY;
+                       if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1)
+                               RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = 1;
+                       break;
+               }
+
+               /* check valid queue number */
+               if ((nb_rx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) ||
+                   (nb_tx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool)) {
+                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
+                                   "queue number must less equal to %d\n", 
+                                       port_id, RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool);
+                       return (-EINVAL);
+               }
+       } else {
+               /* For vmdb+dcb mode check our configuration before we go further */
+               if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {
+                       const struct rte_eth_vmdq_dcb_conf *conf;
+                       
+                       if (nb_rx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q "
+                                               "!= %d\n",
+                                               port_id, ETH_VMDQ_DCB_NUM_QUEUES);
+                               return (-EINVAL);
+                       }
+                       conf = &(dev_conf->rx_adv_conf.vmdq_dcb_conf);
+                       if (! (conf->nb_queue_pools == ETH_16_POOLS ||
+                              conf->nb_queue_pools == ETH_32_POOLS)) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
+                                               "nb_queue_pools must be %d or %d\n",
+                                               port_id, ETH_16_POOLS, ETH_32_POOLS);
+                               return (-EINVAL);
+                       }
+               }
+               if (dev_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {
+                       const struct rte_eth_vmdq_dcb_tx_conf *conf;
+                       
+                       if (nb_tx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q "
+                                               "!= %d\n",
+                                               port_id, ETH_VMDQ_DCB_NUM_QUEUES);
+                               return (-EINVAL);
+                       }
+                       conf = &(dev_conf->tx_adv_conf.vmdq_dcb_tx_conf);
+                       if (! (conf->nb_queue_pools == ETH_16_POOLS ||
+                              conf->nb_queue_pools == ETH_32_POOLS)) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
+                                               "nb_queue_pools != %d or nb_queue_pools "
+                                               "!= %d\n",
+                                               port_id, ETH_16_POOLS, ETH_32_POOLS);
+                               return (-EINVAL);
+                       }
+               }
+               
+               /* For DCB mode check our configuration before we go further */
+               if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) {
+                       const struct rte_eth_dcb_rx_conf *conf;
+                       
+                       if (nb_rx_q != ETH_DCB_NUM_QUEUES) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q "
+                                               "!= %d\n",
+                                               port_id, ETH_DCB_NUM_QUEUES);
+                               return (-EINVAL);
+                       }
+                       conf = &(dev_conf->rx_adv_conf.dcb_rx_conf);
+                       if (! (conf->nb_tcs == ETH_4_TCS ||
+                              conf->nb_tcs == ETH_8_TCS)) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
+                                               "nb_tcs != %d or nb_tcs "
+                                               "!= %d\n",
+                                               port_id, ETH_4_TCS, ETH_8_TCS);
+                               return (-EINVAL);
+                       }
+               }
+               
+               if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {
+                       const struct rte_eth_dcb_tx_conf *conf;
+                       
+                       if (nb_tx_q != ETH_DCB_NUM_QUEUES) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q "
+                                               "!= %d\n",
+                                               port_id, ETH_DCB_NUM_QUEUES);
+                               return (-EINVAL);
+                       }
+                       conf = &(dev_conf->tx_adv_conf.dcb_tx_conf);
+                       if (! (conf->nb_tcs == ETH_4_TCS ||
+                              conf->nb_tcs == ETH_8_TCS)) {
+                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
+                                               "nb_tcs != %d or nb_tcs "
+                                               "!= %d\n",
+                                               port_id, ETH_4_TCS, ETH_8_TCS);
+                               return (-EINVAL);
+                       }
+               }
+       }
+       return 0;
+}
+
 int
 rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                      const struct rte_eth_conf *dev_conf)
@@ -413,84 +557,12 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                /* Use default value */
                dev->data->dev_conf.rxmode.max_rx_pkt_len = ETHER_MAX_LEN;
 
-       /* For vmdb+dcb mode check our configuration before we go further */
-       if (dev_conf->rxmode.mq_mode == ETH_VMDQ_DCB) {
-               const struct rte_eth_vmdq_dcb_conf *conf;
-
-               if (nb_rx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q "
-                                       "!= %d\n",
-                                       port_id, ETH_VMDQ_DCB_NUM_QUEUES);
-                       return (-EINVAL);
-               }
-               conf = &(dev_conf->rx_adv_conf.vmdq_dcb_conf);
-               if (! (conf->nb_queue_pools == ETH_16_POOLS ||
-                      conf->nb_queue_pools == ETH_32_POOLS)) {
-                   PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
-                                   "nb_queue_pools must be %d or %d\n",
-                                   port_id, ETH_16_POOLS, ETH_32_POOLS);
-                   return (-EINVAL);
-               }
-       }
-       if (dev_conf->txmode.mq_mode == ETH_VMDQ_DCB_TX) {
-               const struct rte_eth_vmdq_dcb_tx_conf *conf;
-
-               if (nb_tx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q "
-                                       "!= %d\n",
-                                       port_id, ETH_VMDQ_DCB_NUM_QUEUES);
-                       return (-EINVAL);
-               }
-               conf = &(dev_conf->tx_adv_conf.vmdq_dcb_tx_conf);
-               if (! (conf->nb_queue_pools == ETH_16_POOLS ||
-                      conf->nb_queue_pools == ETH_32_POOLS)) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
-                                   "nb_queue_pools != %d or nb_queue_pools "
-                                   "!= %d\n",
-                                   port_id, ETH_16_POOLS, ETH_32_POOLS);
-                       return (-EINVAL);
-               }
-       }
-       
-       /* For DCB mode check our configuration before we go further */
-       if (dev_conf->rxmode.mq_mode == ETH_DCB_RX) {
-               const struct rte_eth_dcb_rx_conf *conf;
-
-               if (nb_rx_q != ETH_DCB_NUM_QUEUES) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q "
-                                       "!= %d\n",
-                                       port_id, ETH_DCB_NUM_QUEUES);
-                       return (-EINVAL);
-               }
-               conf = &(dev_conf->rx_adv_conf.dcb_rx_conf);
-               if (! (conf->nb_tcs == ETH_4_TCS ||
-                      conf->nb_tcs == ETH_8_TCS)) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
-                                   "nb_tcs != %d or nb_tcs "
-                                   "!= %d\n",
-                                   port_id, ETH_4_TCS, ETH_8_TCS);
-                       return (-EINVAL);
-               }
-       }
-
-       if (dev_conf->txmode.mq_mode == ETH_DCB_TX) {
-               const struct rte_eth_dcb_tx_conf *conf;
-
-               if (nb_tx_q != ETH_DCB_NUM_QUEUES) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q "
-                                       "!= %d\n",
-                                       port_id, ETH_DCB_NUM_QUEUES);
-                       return (-EINVAL);
-               }
-               conf = &(dev_conf->tx_adv_conf.dcb_tx_conf);
-               if (! (conf->nb_tcs == ETH_4_TCS ||
-                      conf->nb_tcs == ETH_8_TCS)) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
-                                   "nb_tcs != %d or nb_tcs "
-                                   "!= %d\n",
-                                   port_id, ETH_4_TCS, ETH_8_TCS);
-                       return (-EINVAL);
-               }
+       /* multipe queue mode checking */
+       diag = rte_eth_dev_check_mq_mode(port_id, nb_rx_q, nb_tx_q, dev_conf);
+       if (diag != 0) {
+               PMD_DEBUG_TRACE("port%d rte_eth_dev_check_mq_mode = %d\n",
+                               port_id, diag);
+               return diag;
        }
 
        /*

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index a1c898a..b778326 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -247,21 +247,43 @@ struct rte_eth_thresh {
  *  packets to multiple queues.
  */
 enum rte_eth_rx_mq_mode {
-       ETH_RSS     = 0,     /**< Default to RSS mode */
-       ETH_VMDQ_DCB,        /**< Use VMDQ+DCB to route traffic to queues */
-       ETH_DCB_RX           /**< For RX side,only DCB is on. */
+       ETH_MQ_RX_NONE = 0,  /**< None of DCB,RSS or VMDQ mode */
+
+       ETH_MQ_RX_RSS,       /**< For RX side, only RSS is on */
+       ETH_MQ_RX_DCB,       /**< For RX side,only DCB is on. */
+       ETH_MQ_RX_DCB_RSS,   /**< Both DCB and RSS enable */
+
+       ETH_MQ_RX_VMDQ_ONLY, /**< Only VMDQ, no RSS nor DCB */
+       ETH_MQ_RX_VMDQ_RSS,  /**< RSS mode with VMDQ */
+       ETH_MQ_RX_VMDQ_DCB,  /**< Use VMDQ+DCB to route traffic to queues */
+       ETH_MQ_RX_VMDQ_DCB_RSS, /**< Enable both VMDQ and DCB in VMDq */
 };
 
+/**
+ * for rx mq mode backward compatible 
+ */
+#define ETH_RSS                       ETH_MQ_RX_RSS
+#define VMDQ_DCB                      ETH_MQ_RX_VMDQ_DCB
+#define ETH_DCB_RX                    ETH_MQ_RX_DCB
+
 /**
  * A set of values to identify what method is to be used to transmit 
  * packets using multi-TCs.
  */
 enum rte_eth_tx_mq_mode {
-       ETH_DCB_NONE    = 0,    /**< It is not in DCB mode. */
-       ETH_VMDQ_DCB_TX,        /**< For TX side,both DCB and VT is on. */
-       ETH_DCB_TX              /**< For TX side,only DCB is on. */
+       ETH_MQ_TX_NONE    = 0,  /**< It is in neither DCB nor VT mode. */
+       ETH_MQ_TX_DCB,          /**< For TX side,only DCB is on. */
+       ETH_MQ_TX_VMDQ_DCB,     /**< For TX side,both DCB and VT is on. */
+       ETH_MQ_TX_VMDQ_ONLY,    /**< Only VT on, no DCB */
 };
 
+/**
+ * for tx mq mode backward compatible 
+ */
+#define ETH_DCB_NONE                ETH_MQ_TX_NONE
+#define ETH_VMDQ_DCB_TX             ETH_MQ_TX_VMDQ_DCB
+#define ETH_DCB_TX                  ETH_MQ_TX_DCB
+
 /**
  * A structure used to configure the RX features of an Ethernet port.
  */
@@ -356,10 +378,10 @@ enum rte_eth_nb_tcs {
  * in VMDQ+DCB configurations.
  */
 enum rte_eth_nb_pools {
-       ETH_8_POOLS  =  8, /**<  8 pools with DCB. */
-       ETH_16_POOLS = 16, /**< 16 pools with DCB. */
-       ETH_32_POOLS = 32, /**< 32 pools with DCB. */
-       ETH_64_POOLS = 64  /**< 32 pools with DCB. */
+       ETH_8_POOLS = 8,    /**< 8 VMDq pools. */
+       ETH_16_POOLS = 16,  /**< 16 VMDq pools. */
+       ETH_32_POOLS = 32,  /**< 32 VMDq pools. */
+       ETH_64_POOLS = 64   /**< 64 VMDq pools. */
 };
 
 /* This structure may be extended in future. */