From: Rasesh Mody <Rasesh.Mody@cavium.com>
To: <dev@dpdk.org>
Cc: <Dept-EngDPDKDev@cavium.com>, Rasesh Mody <Rasesh.Mody@cavium.com>
Subject: [dpdk-dev] [PATCH 08/25] net/qede/base: fix updating VF queue zone id
Date: Sat, 3 Dec 2016 01:11:12 -0800 [thread overview]
Message-ID: <1480756289-11835-9-git-send-email-Rasesh.Mody@cavium.com> (raw)
In-Reply-To: <1480756289-11835-1-git-send-email-Rasesh.Mody@cavium.com>
Pass the absolute qzone_id when creating queues.
Fixes: 5cdd769a ("qede: add L2 support")
Signed-off-by: Rasesh Mody <Rasesh.Mody@cavium.com>
---
drivers/net/qede/base/ecore_dev.c | 9 ++++++---
drivers/net/qede/base/ecore_l2.c | 10 +++++-----
drivers/net/qede/base/ecore_l2_api.h | 11 +++++++++--
drivers/net/qede/base/ecore_sriov.c | 1 +
drivers/net/qede/qede_eth_if.c | 1 +
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c
index 1d906b73..8b7d1da0 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -542,11 +542,14 @@ enum _ecore_status_t ecore_resc_alloc(struct ecore_dev *p_dev)
/* Allocate Memory for the Queue->CID mapping */
for_each_hwfn(p_dev, i) {
struct ecore_hwfn *p_hwfn = &p_dev->hwfns[i];
+ u32 num_tx_conns = RESC_NUM(p_hwfn, ECORE_L2_QUEUE);
+ int tx_size, rx_size;
/* @@@TMP - resc management, change to actual required size */
- int tx_size = sizeof(struct ecore_hw_cid_data) *
- RESC_NUM(p_hwfn, ECORE_L2_QUEUE);
- int rx_size = sizeof(struct ecore_hw_cid_data) *
+ if (p_hwfn->pf_params.eth_pf_params.num_cons > num_tx_conns)
+ num_tx_conns = p_hwfn->pf_params.eth_pf_params.num_cons;
+ tx_size = sizeof(struct ecore_hw_cid_data) * num_tx_conns;
+ rx_size = sizeof(struct ecore_hw_cid_data) *
RESC_NUM(p_hwfn, ECORE_L2_QUEUE);
p_hwfn->p_tx_cids = OSAL_ZALLOC(p_hwfn->p_dev, GFP_KERNEL,
diff --git a/drivers/net/qede/base/ecore_l2.c b/drivers/net/qede/base/ecore_l2.c
index b139c398..9cb554c6 100644
--- a/drivers/net/qede/base/ecore_l2.c
+++ b/drivers/net/qede/base/ecore_l2.c
@@ -663,7 +663,7 @@ ecore_sp_eth_rx_queue_start(struct ecore_hwfn *p_hwfn,
if (IS_VF(p_hwfn->p_dev)) {
return ecore_vf_pf_rxq_start(p_hwfn,
- p_params->queue_id,
+ (u8)p_params->queue_id,
p_params->sb,
(u8)p_params->sb_idx,
bd_max_bytes,
@@ -840,9 +840,9 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
struct ecore_spq_entry *p_ent = OSAL_NULL;
struct ecore_sp_init_data init_data;
struct ecore_hw_cid_data *p_tx_cid;
- u16 pq_id, abs_tx_q_id = 0;
- u8 abs_vport_id;
+ u16 pq_id, abs_tx_qzone_id = 0;
enum _ecore_status_t rc = ECORE_NOTIMPL;
+ u8 abs_vport_id;
/* Store information for the stop */
p_tx_cid = &p_hwfn->p_tx_cids[p_params->queue_id];
@@ -853,7 +853,7 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
if (rc != ECORE_SUCCESS)
return rc;
- rc = ecore_fw_l2_queue(p_hwfn, p_params->queue_id, &abs_tx_q_id);
+ rc = ecore_fw_l2_queue(p_hwfn, p_params->qzone_id, &abs_tx_qzone_id);
if (rc != ECORE_SUCCESS)
return rc;
@@ -876,7 +876,7 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
p_ramrod->sb_index = (u8)p_params->sb_idx;
p_ramrod->stats_counter_id = p_params->stats_id;
- p_ramrod->queue_zone_id = OSAL_CPU_TO_LE16(abs_tx_q_id);
+ p_ramrod->queue_zone_id = OSAL_CPU_TO_LE16(abs_tx_qzone_id);
p_ramrod->pbl_size = OSAL_CPU_TO_LE16(pbl_size);
DMA_REGPAIR_LE(p_ramrod->pbl_base_addr, pbl_addr);
diff --git a/drivers/net/qede/base/ecore_l2_api.h b/drivers/net/qede/base/ecore_l2_api.h
index c12d97c9..247316b8 100644
--- a/drivers/net/qede/base/ecore_l2_api.h
+++ b/drivers/net/qede/base/ecore_l2_api.h
@@ -28,10 +28,17 @@ enum ecore_rss_caps {
#endif
struct ecore_queue_start_common_params {
- /* Rx/Tx queue id */
- u8 queue_id;
+ /* Rx/Tx queue relative id to keep obtained cid in corresponding array
+ * RX - upper-bounded by number of FW-queues
+ */
+ u16 queue_id;
u8 vport_id;
+ /* q_zone_id is relative, may be different from queue id
+ * currently used by Tx-only, upper-bounded by number of FW-queues
+ */
+ u8 qzone_id;
+
/* stats_id is relative or absolute depends on function */
u8 stats_id;
u16 sb;
diff --git a/drivers/net/qede/base/ecore_sriov.c b/drivers/net/qede/base/ecore_sriov.c
index bdf91647..0e2b3248 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -2107,6 +2107,7 @@ static void ecore_iov_vf_mbx_start_txq(struct ecore_hwfn *p_hwfn,
goto out;
p_params.queue_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
+ p_params.qzone_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
p_params.vport_id = vf->vport_id;
p_params.stats_id = vf->abs_vf_id + 0x10,
p_params.sb = req->hw_sb;
diff --git a/drivers/net/qede/qede_eth_if.c b/drivers/net/qede/qede_eth_if.c
index 7d212003..d0f6e87a 100644
--- a/drivers/net/qede/qede_eth_if.c
+++ b/drivers/net/qede/qede_eth_if.c
@@ -213,6 +213,7 @@ qed_start_txq(struct ecore_dev *edev,
p_hwfn = &edev->hwfns[hwfn_index];
p_params->queue_id = p_params->queue_id / edev->num_hwfns;
+ p_params->qzone_id = p_params->queue_id;
p_params->stats_id = p_params->vport_id;
rc = ecore_sp_eth_tx_queue_start(p_hwfn,
--
2.11.0.rc1
next prev parent reply other threads:[~2016-12-03 9:12 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-03 9:11 [dpdk-dev] [PATCH 00/25] net/qede: update qede pmd to 2.0.0.1 Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 01/25] net/qede/base: add request for PF FLR before load request Rasesh Mody
2016-12-23 15:32 ` Ferruh Yigit
2016-12-23 19:07 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 02/25] net/qede/base: improve set field macro Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 03/25] net/qede/base: add handling of malicious VF Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 04/25] net/qede/base: change return codes in SR-IOV Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 05/25] net/qede/base: make API non-static Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 06/25] net/qede/base: rename macro Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 07/25] net/qede/base: add check to validate txq Rasesh Mody
2016-12-03 9:11 ` Rasesh Mody [this message]
2016-12-23 15:36 ` [dpdk-dev] [PATCH 08/25] net/qede/base: fix updating VF queue zone id Ferruh Yigit
2016-12-03 9:11 ` [dpdk-dev] [PATCH 09/25] net/qede/base: improve Tx-switching performance Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 10/25] net/qede/base: semantic change Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 11/25] net/qede: remove unused struct member Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 12/25] net/qede/base: enhance resource info set printouts Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 13/25] net/qede/base: add new enum member to status codes Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 14/25] net/qede/base: add macros for converting pointer Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 15/25] net/qede: add new host ring type option Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 16/25] net/qede/base: add check for get nvm info return code Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 17/25] net/qede/base: retrieve FW crash dump info Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 18/25] net/qede/base: add support for external PHY Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 19/25] net/qede/base: add support for 2x10G mode Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 20/25] net/qede: add PCI ids for new chip variant Rasesh Mody
2016-12-23 15:39 ` Ferruh Yigit
2016-12-23 19:18 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 21/25] net/qede: add 50G device PCI id Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 22/25] net/qede/base: add support for new firmware Rasesh Mody
2016-12-23 15:40 ` Ferruh Yigit
2016-12-31 7:40 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 23/25] net/qede/base: semantic/formatting changes Rasesh Mody
2016-12-23 15:42 ` Ferruh Yigit
2016-12-31 7:41 ` Mody, Rasesh
2017-01-03 15:40 ` Ferruh Yigit
2017-01-05 7:16 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 24/25] net/qede/base: dcbx changes for base driver Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 25/25] net/qede: update PMD version to 2.0.0.1 Rasesh Mody
2016-12-09 16:53 ` [dpdk-dev] [PATCH 00/25] net/qede: update qede pmd " Ferruh Yigit
2016-12-09 17:48 ` Mody, Rasesh
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 00/26] " Rasesh Mody
2017-01-05 13:18 ` Ferruh Yigit
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 01/26] net/qede/base: add request for PF FLR before load request Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 02/26] net/qede/base: improve set field macro Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 03/26] net/qede/base: add handling of malicious VF Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 04/26] net/qede/base: change return codes in SR-IOV Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 05/26] net/qede/base: make API non-static Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 06/26] net/qede/base: rename macro Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 07/26] net/qede/base: add check to validate txq Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 08/26] net/qede/base: fix updating VF queue zone id Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 09/26] net/qede/base: improve Tx-switching performance Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 10/26] net/qede/base: semantic change Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 11/26] net/qede: remove unused struct member Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 12/26] net/qede/base: enhance resource info set printouts Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 13/26] net/qede/base: add new enum member to status codes Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 14/26] net/qede/base: add macros for converting pointer Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 15/26] net/qede: add new host ring type option Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 16/26] net/qede/base: add check for get nvm info return code Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 17/26] net/qede/base: retrieve FW crash dump info Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 18/26] net/qede/base: add support for external PHY Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 19/26] net/qede/base: add support for 2x10G mode Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 20/26] net/qede: add PCI ids for new chip variant Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 21/26] net/qede: add 50G device PCI id Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 22/26] net/qede/base: add support for new firmware Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 23/26] net/qede/base: semantic/formatting changes Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 24/26] net/qede/base: refactor some code bits Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 25/26] net/qede/base: dcbx changes for base driver Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 26/26] net/qede: update PMD version to 2.0.0.1 Rasesh Mody
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=1480756289-11835-9-git-send-email-Rasesh.Mody@cavium.com \
--to=rasesh.mody@cavium.com \
--cc=Dept-EngDPDKDev@cavium.com \
--cc=dev@dpdk.org \
/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).