From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Rybchenko Subject: [PATCH 4/4] net/sfc: fix flow control settings set on port start Date: Thu, 12 Jan 2017 09:03:23 +0000 Message-ID: <1484211803-21449-5-git-send-email-arybchenko@solarflare.com> References: <1484211803-21449-1-git-send-email-arybchenko@solarflare.com> Mime-Version: 1.0 Content-Type: text/plain To: Return-path: 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 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 In-Reply-To: <1484211803-21449-1-git-send-email-arybchenko@solarflare.com> 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; -- 1.8.2.3