From: Ting Xu <ting.xu@intel.com>
To: dev@dpdk.org
Cc: qi.z.zhang@intel.com, qiming.yang@intel.com,
jingjing.wu@intel.com, beilei.xing@intel.com,
marko.kovacevic@intel.com, john.mcnamara@intel.com,
xiaolong.ye@intel.com
Subject: [dpdk-dev] [PATCH v3 04/12] net/ice: complete queue setup in DCF
Date: Tue, 16 Jun 2020 12:41:04 +0000 [thread overview]
Message-ID: <20200616124112.108014-5-ting.xu@intel.com> (raw)
In-Reply-To: <20200616124112.108014-1-ting.xu@intel.com>
From: Qi Zhang <qi.z.zhang@intel.com>
Delete original DCF queue setup functions and use ice
queue setup and release functions instead.
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Signed-off-by: Ting Xu <ting.xu@intel.com>
---
drivers/net/ice/ice_dcf_ethdev.c | 42 +++-----------------------------
drivers/net/ice/ice_dcf_ethdev.h | 3 ---
drivers/net/ice/ice_dcf_parent.c | 7 ++++++
3 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index 41d130cd9..0c3013228 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -231,11 +231,6 @@ ice_dcf_dev_close(struct rte_eth_dev *dev)
ice_dcf_uninit_hw(dev, &adapter->real_hw);
}
-static void
-ice_dcf_queue_release(__rte_unused void *q)
-{
-}
-
static int
ice_dcf_link_update(__rte_unused struct rte_eth_dev *dev,
__rte_unused int wait_to_complete)
@@ -243,45 +238,16 @@ ice_dcf_link_update(__rte_unused struct rte_eth_dev *dev,
return 0;
}
-static int
-ice_dcf_rx_queue_setup(struct rte_eth_dev *dev,
- uint16_t rx_queue_id,
- __rte_unused uint16_t nb_rx_desc,
- __rte_unused unsigned int socket_id,
- __rte_unused const struct rte_eth_rxconf *rx_conf,
- __rte_unused struct rte_mempool *mb_pool)
-{
- struct ice_dcf_adapter *adapter = dev->data->dev_private;
-
- dev->data->rx_queues[rx_queue_id] = &adapter->rxqs[rx_queue_id];
-
- return 0;
-}
-
-static int
-ice_dcf_tx_queue_setup(struct rte_eth_dev *dev,
- uint16_t tx_queue_id,
- __rte_unused uint16_t nb_tx_desc,
- __rte_unused unsigned int socket_id,
- __rte_unused const struct rte_eth_txconf *tx_conf)
-{
- struct ice_dcf_adapter *adapter = dev->data->dev_private;
-
- dev->data->tx_queues[tx_queue_id] = &adapter->txqs[tx_queue_id];
-
- return 0;
-}
-
static const struct eth_dev_ops ice_dcf_eth_dev_ops = {
.dev_start = ice_dcf_dev_start,
.dev_stop = ice_dcf_dev_stop,
.dev_close = ice_dcf_dev_close,
.dev_configure = ice_dcf_dev_configure,
.dev_infos_get = ice_dcf_dev_info_get,
- .rx_queue_setup = ice_dcf_rx_queue_setup,
- .tx_queue_setup = ice_dcf_tx_queue_setup,
- .rx_queue_release = ice_dcf_queue_release,
- .tx_queue_release = ice_dcf_queue_release,
+ .rx_queue_setup = ice_rx_queue_setup,
+ .tx_queue_setup = ice_tx_queue_setup,
+ .rx_queue_release = ice_rx_queue_release,
+ .tx_queue_release = ice_tx_queue_release,
.link_update = ice_dcf_link_update,
.stats_get = ice_dcf_stats_get,
.stats_reset = ice_dcf_stats_reset,
diff --git a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/ice/ice_dcf_ethdev.h
index e60e808d8..b54528bea 100644
--- a/drivers/net/ice/ice_dcf_ethdev.h
+++ b/drivers/net/ice/ice_dcf_ethdev.h
@@ -19,10 +19,7 @@ struct ice_dcf_queue {
struct ice_dcf_adapter {
struct ice_adapter parent; /* Must be first */
-
struct ice_dcf_hw real_hw;
- struct ice_dcf_queue rxqs[ICE_DCF_MAX_RINGS];
- struct ice_dcf_queue txqs[ICE_DCF_MAX_RINGS];
};
void ice_dcf_handle_pf_event_msg(struct ice_dcf_hw *dcf_hw,
diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c
index d13e19d78..322a5273f 100644
--- a/drivers/net/ice/ice_dcf_parent.c
+++ b/drivers/net/ice/ice_dcf_parent.c
@@ -335,6 +335,13 @@ ice_dcf_init_parent_adapter(struct rte_eth_dev *eth_dev)
parent_adapter->eth_dev = eth_dev;
parent_adapter->pf.adapter = parent_adapter;
parent_adapter->pf.dev_data = eth_dev->data;
+ /* create a dummy main_vsi */
+ parent_adapter->pf.main_vsi =
+ rte_zmalloc(NULL, sizeof(struct ice_vsi), 0);
+ if (!parent_adapter->pf.main_vsi)
+ return -ENOMEM;
+ parent_adapter->pf.main_vsi->adapter = parent_adapter;
+
parent_hw->back = parent_adapter;
parent_hw->mac_type = ICE_MAC_GENERIC;
parent_hw->vendor_id = ICE_INTEL_VENDOR_ID;
--
2.17.1
next prev parent reply other threads:[~2020-06-16 4:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 12:41 [dpdk-dev] [PATCH v3 00/12] enable DCF datapath configuration Ting Xu
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 01/12] net/ice: init RSS and supported RXDID in DCF Ting Xu
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 02/12] net/ice: complete device info get " Ting Xu
2020-06-18 6:44 ` Yang, Qiming
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 03/12] net/ice: complete dev configure " Ting Xu
2020-06-16 12:41 ` Ting Xu [this message]
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 05/12] net/ice: add stop flag for device start / stop Ting Xu
2020-06-18 6:48 ` Yang, Qiming
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 06/12] net/ice: add Rx queue init in DCF Ting Xu
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 07/12] net/ice: init RSS during DCF start Ting Xu
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 08/12] net/ice: add queue config in DCF Ting Xu
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 09/12] net/ice: add queue start and stop for DCF Ting Xu
2020-06-18 6:39 ` Yang, Qiming
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 10/12] net/ice: enable stats " Ting Xu
2020-06-18 6:31 ` Yang, Qiming
2020-06-19 2:44 ` Xu, Ting
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 11/12] net/ice: set MAC filter during dev start " Ting Xu
2020-06-16 12:41 ` [dpdk-dev] [PATCH v3 12/12] doc: enable DCF datapath configuration Ting Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200616124112.108014-5-ting.xu@intel.com \
--to=ting.xu@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=john.mcnamara@intel.com \
--cc=marko.kovacevic@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=qiming.yang@intel.com \
--cc=xiaolong.ye@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).