From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Subject: [dpdk-dev] [PATCH v2 5/5] net/sfc: support choice of FW subvariant without Tx checksum
Date: Wed, 4 Apr 2018 15:17:07 +0100 [thread overview]
Message-ID: <1522851427-2855-6-git-send-email-arybchenko@solarflare.com> (raw)
In-Reply-To: <1522851427-2855-1-git-send-email-arybchenko@solarflare.com>
If running FW variant supports subvariant without checksumming
on transmit and all transmit queues do not use checksumming,
it may be disabled.
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/efsys.h | 2 +-
drivers/net/sfc/sfc.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/drivers/net/sfc/efsys.h b/drivers/net/sfc/efsys.h
index ac7121d..7eb2c3f 100644
--- a/drivers/net/sfc/efsys.h
+++ b/drivers/net/sfc/efsys.h
@@ -200,7 +200,7 @@ prefetch_read_once(const volatile void *addr)
#define EFSYS_OPT_TUNNEL 1
-#define EFSYS_OPT_FW_SUBVARIANT_AWARE 0
+#define EFSYS_OPT_FW_SUBVARIANT_AWARE 1
/* ID */
diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index e456bca..69abaff 100644
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -260,6 +260,58 @@ sfc_set_drv_limits(struct sfc_adapter *sa)
}
static int
+sfc_set_fw_subvariant(struct sfc_adapter *sa)
+{
+ const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+ uint64_t tx_offloads = sa->eth_dev->data->dev_conf.txmode.offloads;
+ unsigned int txq_index;
+ efx_nic_fw_subvariant_t req_fw_subvariant;
+ efx_nic_fw_subvariant_t cur_fw_subvariant;
+ int rc;
+
+ if (!encp->enc_fw_subvariant_no_tx_csum_supported) {
+ sfc_info(sa, "no-Tx-checksum subvariant not supported");
+ return 0;
+ }
+
+ for (txq_index = 0; txq_index < sa->txq_count; ++txq_index) {
+ struct sfc_txq_info *txq_info = &sa->txq_info[txq_index];
+
+ if (txq_info->txq != NULL)
+ tx_offloads |= txq_info->txq->offloads;
+ }
+
+ if (tx_offloads & (DEV_TX_OFFLOAD_IPV4_CKSUM |
+ DEV_TX_OFFLOAD_TCP_CKSUM |
+ DEV_TX_OFFLOAD_UDP_CKSUM |
+ DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM))
+ req_fw_subvariant = EFX_NIC_FW_SUBVARIANT_DEFAULT;
+ else
+ req_fw_subvariant = EFX_NIC_FW_SUBVARIANT_NO_TX_CSUM;
+
+ rc = efx_nic_get_fw_subvariant(sa->nic, &cur_fw_subvariant);
+ if (rc != 0) {
+ sfc_err(sa, "failed to get FW subvariant: %d", rc);
+ return rc;
+ }
+ sfc_info(sa, "FW subvariant is %u vs required %u",
+ cur_fw_subvariant, req_fw_subvariant);
+
+ if (cur_fw_subvariant == req_fw_subvariant)
+ return 0;
+
+ rc = efx_nic_set_fw_subvariant(sa->nic, req_fw_subvariant);
+ if (rc != 0) {
+ sfc_err(sa, "failed to set FW subvariant %u: %d",
+ req_fw_subvariant, rc);
+ return rc;
+ }
+ sfc_info(sa, "FW subvariant set to %u", req_fw_subvariant);
+
+ return 0;
+}
+
+static int
sfc_try_start(struct sfc_adapter *sa)
{
const efx_nic_cfg_t *encp;
@@ -270,6 +322,11 @@ sfc_try_start(struct sfc_adapter *sa)
SFC_ASSERT(sfc_adapter_is_locked(sa));
SFC_ASSERT(sa->state == SFC_ADAPTER_STARTING);
+ sfc_log_init(sa, "set FW subvariant");
+ rc = sfc_set_fw_subvariant(sa);
+ if (rc != 0)
+ goto fail_set_fw_subvariant;
+
sfc_log_init(sa, "set resource limits");
rc = sfc_set_drv_limits(sa);
if (rc != 0)
@@ -336,6 +393,7 @@ sfc_try_start(struct sfc_adapter *sa)
fail_nic_init:
fail_set_drv_limits:
+fail_set_fw_subvariant:
sfc_log_init(sa, "failed %d", rc);
return rc;
}
--
2.7.4
next prev parent reply other threads:[~2018-04-04 14:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 15:07 [dpdk-dev] [PATCH 0/5] " Andrew Rybchenko
2018-04-03 15:07 ` [dpdk-dev] [PATCH 1/5] net/sfc/base: update MCDI headers Andrew Rybchenko
2018-04-03 15:07 ` [dpdk-dev] [PATCH 2/5] net/sfc/base: add firmware subvariant aware driver option Andrew Rybchenko
2018-04-03 15:07 ` [dpdk-dev] [PATCH 3/5] net/sfc/base: report no Tx checksum FW subvariant support Andrew Rybchenko
2018-04-03 15:07 ` [dpdk-dev] [PATCH 4/5] net/sfc/base: support FW subvariant choice Andrew Rybchenko
2018-04-03 15:07 ` [dpdk-dev] [PATCH 5/5] net/sfc: support choice of FW subvariant without Tx checksum Andrew Rybchenko
2018-04-04 14:17 ` [dpdk-dev] [PATCH v2 0/5] " Andrew Rybchenko
2018-04-04 14:17 ` [dpdk-dev] [PATCH v2 1/5] net/sfc/base: update MCDI headers Andrew Rybchenko
2018-04-04 14:17 ` [dpdk-dev] [PATCH v2 2/5] net/sfc/base: add firmware subvariant aware driver option Andrew Rybchenko
2018-04-04 14:17 ` [dpdk-dev] [PATCH v2 3/5] net/sfc/base: report no Tx checksum FW subvariant support Andrew Rybchenko
2018-04-04 14:17 ` [dpdk-dev] [PATCH v2 4/5] net/sfc/base: support FW subvariant choice Andrew Rybchenko
2018-04-04 14:17 ` Andrew Rybchenko [this message]
2018-04-04 14:23 ` [dpdk-dev] [PATCH v3 0/5] net/sfc: support choice of FW subvariant without Tx checksum Andrew Rybchenko
2018-04-04 14:23 ` [dpdk-dev] [PATCH v3 1/5] net/sfc/base: update MCDI headers Andrew Rybchenko
2018-04-04 14:23 ` [dpdk-dev] [PATCH v3 2/5] net/sfc/base: add firmware subvariant aware driver option Andrew Rybchenko
2018-04-04 14:23 ` [dpdk-dev] [PATCH v3 3/5] net/sfc/base: report no Tx checksum FW subvariant support Andrew Rybchenko
2018-04-04 14:23 ` [dpdk-dev] [PATCH v3 4/5] net/sfc/base: support FW subvariant choice Andrew Rybchenko
2018-04-04 14:23 ` [dpdk-dev] [PATCH v3 5/5] net/sfc: support choice of FW subvariant without Tx checksum Andrew Rybchenko
2018-04-06 17:37 ` [dpdk-dev] [PATCH v3 0/5] " 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=1522851427-2855-6-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).