From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Subject: [dpdk-dev] [PATCH 33/38] net/sfc/base: pass Rx buffer size to RxQ init if supported
Date: Thu, 7 Feb 2019 16:29:38 +0000 [thread overview]
Message-ID: <1549556983-10896-34-git-send-email-arybchenko@solarflare.com> (raw)
In-Reply-To: <1549556983-10896-1-git-send-email-arybchenko@solarflare.com>
Riverhead requires Rx buffer size to be specified in INIT_RXQ.
If the parameter is not supported (e.g. on EF10 family adapters),
zero must be used on INIT_RXQ.
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/base/ef10_nic.c | 10 ++++++++++
drivers/net/sfc/base/ef10_rx.c | 15 ++++++++++-----
drivers/net/sfc/base/efx.h | 1 +
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
index 39ca53f03..6ba2fe3b9 100644
--- a/drivers/net/sfc/base/ef10_nic.c
+++ b/drivers/net/sfc/base/ef10_nic.c
@@ -1205,6 +1205,16 @@ ef10_get_datapath_caps(
else
encp->enc_no_cont_ev_mode_supported = B_FALSE;
+ /*
+ * Check if buffer size may and must be specified on INIT_RXQ.
+ * It may be always specified to efx_rx_qcreate(), but will be
+ * just kept libefx internal if MCDI does not support it.
+ */
+ if (CAP_FLAGS2(req, INIT_RXQ_WITH_BUFFER_SIZE))
+ encp->enc_init_rxq_with_buffer_size = B_TRUE;
+ else
+ encp->enc_init_rxq_with_buffer_size = B_FALSE;
+
/*
* Check if firmware-verified NVRAM updates must be used.
*
diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c
index 5cb7da99b..c060d2e4d 100644
--- a/drivers/net/sfc/base/ef10_rx.c
+++ b/drivers/net/sfc/base/ef10_rx.c
@@ -21,6 +21,7 @@ efx_mcdi_init_rxq(
__in efsys_mem_t *esmp,
__in boolean_t disable_scatter,
__in boolean_t want_inner_classes,
+ __in uint32_t buf_size,
__in uint32_t ps_bufsize,
__in uint32_t es_bufs_per_desc,
__in uint32_t es_max_dma_len,
@@ -29,8 +30,8 @@ efx_mcdi_init_rxq(
{
efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
efx_mcdi_req_t req;
- EFX_MCDI_DECLARE_BUF(payload, MC_CMD_INIT_RXQ_V3_IN_LEN,
- MC_CMD_INIT_RXQ_V3_OUT_LEN);
+ EFX_MCDI_DECLARE_BUF(payload, MC_CMD_INIT_RXQ_V4_IN_LEN,
+ MC_CMD_INIT_RXQ_V4_OUT_LEN);
int npages = efx_rxq_nbufs(enp, ndescs);
int i;
efx_qword_t *dma_addr;
@@ -84,9 +85,9 @@ efx_mcdi_init_rxq(
req.emr_cmd = MC_CMD_INIT_RXQ;
req.emr_in_buf = payload;
- req.emr_in_length = MC_CMD_INIT_RXQ_V3_IN_LEN;
+ req.emr_in_length = MC_CMD_INIT_RXQ_V4_IN_LEN;
req.emr_out_buf = payload;
- req.emr_out_length = MC_CMD_INIT_RXQ_V3_OUT_LEN;
+ req.emr_out_length = MC_CMD_INIT_RXQ_V4_OUT_LEN;
MCDI_IN_SET_DWORD(req, INIT_RXQ_EXT_IN_SIZE, ndescs);
MCDI_IN_SET_DWORD(req, INIT_RXQ_EXT_IN_TARGET_EVQ, eep->ee_index);
@@ -120,6 +121,10 @@ efx_mcdi_init_rxq(
hol_block_timeout);
}
+ if (encp->enc_init_rxq_with_buffer_size)
+ MCDI_IN_SET_DWORD(req, INIT_RXQ_V4_IN_BUFFER_SIZE_BYTES,
+ buf_size);
+
dma_addr = MCDI_IN2(req, efx_qword_t, INIT_RXQ_IN_DMA_ADDR);
addr = EFSYS_MEM_ADDR(esmp);
@@ -1140,7 +1145,7 @@ ef10_rx_qcreate(
want_inner_classes = B_FALSE;
if ((rc = efx_mcdi_init_rxq(enp, ndescs, eep, label, index,
- esmp, disable_scatter, want_inner_classes,
+ esmp, disable_scatter, want_inner_classes, erp->er_buf_size,
ps_buf_size, es_bufs_per_desc, es_max_dma_len,
es_buf_stride, hol_block_timeout)) != 0)
goto fail12;
diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 35f896750..2cd2c36c3 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1371,6 +1371,7 @@ typedef struct efx_nic_cfg_s {
boolean_t enc_enhanced_set_mac_supported;
boolean_t enc_init_evq_v2_supported;
boolean_t enc_no_cont_ev_mode_supported;
+ boolean_t enc_init_rxq_with_buffer_size;
boolean_t enc_rx_packed_stream_supported;
boolean_t enc_rx_var_packed_stream_supported;
boolean_t enc_rx_es_super_buffer_supported;
--
2.17.1
next prev parent reply other threads:[~2019-02-07 16:30 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 16:29 [dpdk-dev] [PATCH 00/38] net/sfc: update base driver Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 01/38] net/sfc/base: correct annotations where NULL input is OK Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 02/38] net/sfc/base: update external port number calculation Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 03/38] net/sfc/base: ensure EvQ poll stops when abort is requested Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 04/38] net/sfc/base: report support for Tx checksum op descriptors Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 05/38] net/sfc/base: remove min define for number of Tx descs Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 06/38] net/sfc/base: define max desc number for every EF10 NIC Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 07/38] net/sfc/base: remove min/max defines for number of Rx descs Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 08/38] net/sfc/base: remove min/max defines for number of events Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 09/38] net/sfc: use NIC min number of Tx descs instead of define Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 10/38] net/sfc: use NIC Rx descs limits instead of defines Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 11/38] net/sfc: use NIC EVQ " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 12/38] net/sfc/base: move Tx descs number check to generic place Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 13/38] net/sfc/base: move Rx " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 14/38] net/sfc/base: move EVQ " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 15/38] net/sfc/base: move a macro to Siena implementation header Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 16/38] net/sfc/base: make max number of TxQ bufs EF10-specific Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 17/38] net/sfc/base: make NIC pointer const in NIC config get Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 18/38] net/sfc/base: support different Tx descriptor sizes Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 19/38] net/sfc/base: support different Rx " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 20/38] net/sfc/base: support different event " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 21/38] net/sfc/base: round number of queue buffers up Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 22/38] net/sfc: use NIC Tx descritor size instead of common Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 23/38] net/sfc: use NIC Rx " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 24/38] net/sfc: use NIC event " Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 25/38] net/sfc/base: remove deprecated min/max desc defines Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 26/38] net/sfc/base: remove deprecated macros that get queue sizes Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 27/38] net/sfc/base: update auto-generated MCDI definition headers Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 28/38] net/sfc/base: add support for the Rx event mode w/o continue Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 29/38] net/sfc/base: rename header with MCDI strings Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 30/38] net/sfc/base: add Rx parse incomplete event queue statistic Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 31/38] net/sfc/base: make bundle partition type available for X2 Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 32/38] net/sfc/base: allow to specify Rx buffer size on queue setup Andrew Rybchenko
2019-02-07 16:29 ` Andrew Rybchenko [this message]
2019-02-07 16:29 ` [dpdk-dev] [PATCH 34/38] net/sfc/base: simplify EF10 family conditional code checks Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 35/38] net/sfc/base: simplify EF10 family run-time checks Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 36/38] net/sfc/base: avoid division by 0 if no event queue timers Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 37/38] net/sfc/base: improve MCDI interface header inclusion Andrew Rybchenko
2019-02-07 16:29 ` [dpdk-dev] [PATCH 38/38] net/sfc/base: share macro to increment per-event type stats Andrew Rybchenko
2019-02-08 13:18 ` [dpdk-dev] [PATCH 00/38] net/sfc: update base driver Ferruh Yigit
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=1549556983-10896-34-git-send-email-arybchenko@solarflare.com \
--to=arybchenko@solarflare.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).