From patchwork Thu Jan 12 09:03:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 19208 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 8A630F8AA; Thu, 12 Jan 2017 10:04:23 +0100 (CET) Received: from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com [209.65.160.78]) by dpdk.org (Postfix) with ESMTP id A37DC5424 for ; Thu, 12 Jan 2017 10:04:08 +0100 (CET) Received: from unknown [12.187.104.26] by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with SMTP id 88647785.0.1337743.00-2274.2735076.nbfkord-smmo02.seg.att.com (envelope-from ); Thu, 12 Jan 2017 09:04:08 +0000 (UTC) X-MXL-Hash: 587746886256cda0-82b517afdcf0deb19571ad13649d6a6e1ff58404 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; Thu, 12 Jan 2017 01:03:42 -0800 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; Thu, 12 Jan 2017 01:03:42 -0800 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 v0C93fsF031681 for ; Thu, 12 Jan 2017 09:03:41 GMT 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 v0C93fkZ021496 for ; Thu, 12 Jan 2017 09:03:41 GMT From: Andrew Rybchenko To: Date: Thu, 12 Jan 2017 09:03:23 +0000 Message-ID: <1484211803-21449-5-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1484211803-21449-1-git-send-email-arybchenko@solarflare.com> References: <1484211803-21449-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=ALPOwa1d c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=IgFoBzBjUZAA:10 a=zRKbQ67AAAAA:8 a=w3hP23x4xAShDU9fY] X-AnalysisOut: [uoA:9 a=PA03WX8tBzeizutn5_OT:22] X-Spam: [F=0.2856664718; CM=0.500; S=0.285(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.26] Subject: [dpdk-dev] [PATCH 4/4] net/sfc: fix flow control settings set on port start 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" efx_phy_adv_cap_set() sets all advertised phy capabilities including pause capabilities which are also configured using efx_mac_fcntl_set(). If we set speed and autonegotiation capabilities only, we should preserve already configured pause capabilities. Fixes: 7a56123f8a60 ("net/sfc: support link speed and duplex settings") Signed-off-by: Andrew Rybchenko Reviewed-by: Andrew Lee --- drivers/net/sfc/sfc_port.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c index e2d8544..5998a99 100644 --- a/drivers/net/sfc/sfc_port.c +++ b/drivers/net/sfc/sfc_port.c @@ -87,6 +87,9 @@ { struct sfc_port *port = &sa->port; int rc; + uint32_t phy_adv_cap; + const uint32_t phy_pause_caps = + ((1u << EFX_PHY_CAP_PAUSE) | (1u << EFX_PHY_CAP_ASYM)); sfc_log_init(sa, "entry"); @@ -107,8 +110,13 @@ if (rc != 0) goto fail_mac_fcntl_set; - sfc_log_init(sa, "set phy adv caps to %#x", port->phy_adv_cap); - rc = efx_phy_adv_cap_set(sa->nic, port->phy_adv_cap); + /* Preserve pause capabilities set by above efx_mac_fcntl_set() */ + efx_phy_adv_cap_get(sa->nic, EFX_PHY_CAP_CURRENT, &phy_adv_cap); + SFC_ASSERT((port->phy_adv_cap & phy_pause_caps) == 0); + phy_adv_cap = port->phy_adv_cap | (phy_adv_cap & phy_pause_caps); + + sfc_log_init(sa, "set phy adv caps to %#x", phy_adv_cap); + rc = efx_phy_adv_cap_set(sa->nic, phy_adv_cap); if (rc != 0) goto fail_phy_adv_cap_set;