From patchwork Wed Mar 29 15:23:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 22732 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id BB42AFA6B; Wed, 29 Mar 2017 18:57:06 +0200 (CEST) Received: from nbfkord-smmo03.seg.att.com (nbfkord-smmo03.seg.att.com [209.65.160.84]) by dpdk.org (Postfix) with ESMTP id 758D4D460 for ; Wed, 29 Mar 2017 17:24:10 +0200 (CEST) Received: from unknown [12.187.104.26] by nbfkord-smmo03.seg.att.com(mxl_mta-7.2.4-7) with SMTP id 991dbd85.0.1065353.00-2382.2627196.nbfkord-smmo03.seg.att.com (envelope-from ); Wed, 29 Mar 2017 15:24:10 +0000 (UTC) X-MXL-Hash: 58dbd19a3f8a561f-92e8f76743640f40b42810d0b1224db5fe443c20 Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Wed, 29 Mar 2017 08:24:06 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Wed, 29 Mar 2017 08:24:05 -0700 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2TFO4b8014975 for ; Wed, 29 Mar 2017 16:24:04 +0100 Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2TFO47o004801 for ; Wed, 29 Mar 2017 16:24:04 +0100 From: Andrew Rybchenko To: Date: Wed, 29 Mar 2017 16:23:59 +0100 Message-ID: <1490801039-4723-2-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1490801039-4723-1-git-send-email-arybchenko@solarflare.com> References: <1490801039-4723-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=Ze0bQ5hA c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=6Iz7jQTuP9IA:10 a=zRKbQ67AAAAA:8 a=ywTXZHpnoXz3iNGfZ] X-AnalysisOut: [4AA:9 a=PA03WX8tBzeizutn5_OT:22] X-Spam: [F=0.2000000000; CM=0.500; S=0.200(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.26] Subject: [dpdk-dev] [PATCH 2/2] net/sfc: do not drop TSO on device configure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If Tx datapath does not support TSO, TSO was dropped on device configure. It is incorrect to change advertised offloads. Fixes: d5b9bb3c344a ("net/sfc: make TSO a datapath-dependent feature") Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc.c | 9 ++++++--- drivers/net/sfc/sfc_tx.c | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index eda426c..181d87a 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -588,9 +588,12 @@ sfc_attach(struct sfc_adapter *sa) encp = efx_nic_cfg_get(sa->nic); - sa->tso = encp->enc_fw_assisted_tso_v2_enabled; - if (!sa->tso) - sfc_warn(sa, "TSO support isn't available on this adapter"); + if (sa->dp_tx->features & SFC_DP_TX_FEAT_TSO) { + sa->tso = encp->enc_fw_assisted_tso_v2_enabled; + if (!sa->tso) + sfc_warn(sa, + "TSO support isn't available on this adapter"); + } sfc_log_init(sa, "estimate resource limits"); rc = sfc_estimate_resource_limits(sa); diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c index d1a064e..37f25a3 100644 --- a/drivers/net/sfc/sfc_tx.c +++ b/drivers/net/sfc/sfc_tx.c @@ -305,9 +305,6 @@ sfc_tx_init(struct sfc_adapter *sa) goto fail_tx_dma_desc_boundary; } - if (~sa->dp_tx->features & SFC_DP_TX_FEAT_TSO) - sa->tso = B_FALSE; - rc = sfc_tx_check_mode(sa, &dev_conf->txmode); if (rc != 0) goto fail_check_mode;