From nobody Thu Apr 16 02:12:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04241C433FE for ; Wed, 23 Nov 2022 09:17:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237339AbiKWJRG (ORCPT ); Wed, 23 Nov 2022 04:17:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237309AbiKWJQr (ORCPT ); Wed, 23 Nov 2022 04:16:47 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BEAD10B410; Wed, 23 Nov 2022 01:16:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669194977; x=1700730977; h=from:to:cc:subject:date:message-id; bh=W3JPMcfxADxcaQcKNXuih5D3EZGPzDYcLZU7qgIXdnw=; b=lFE32huPZns4grkjukiTZap3TFXDgR7xHxg6beK8Vy+fng3OLQ3SXaRB FQhEETH+Rb+5HniKzQDiRQmfSFclicsSZgA8pBJxF6DEWse5S4DtX3TYa 1MU61t0bevtozXrI40mFcqNkMry/EIBeL8yrbR+/nsNrmS0kjIkvsFWt3 /8CtvOLrkIxAJ/AjKEx7cw8AH9WTDLWRVS81cZQImx4yoogLc7ZciuSQ4 uBRC4WKvecJ8IsEIwGps0UPAjjN/v7nrsJx9RkyMVyNhy/IUzc+P4jyKx ix3TMGiK3X5ZX8svIlLbZaail2+6zaaT2BMkayhqCrHky4VrNqgBU2B8M w==; X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="315174364" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="315174364" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2022 01:16:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="672805025" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="672805025" Received: from p12ill01gohweish.png.intel.com ([10.88.229.16]) by orsmga008.jf.intel.com with ESMTP; 23 Nov 2022 01:16:10 -0800 From: "Goh, Wei Sheng" To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Ong Boon Leong , Voon Wei Feng , Tan Tee Min , Ahmad Tarmizi Noor Azura , Looi Hong Aun , Goh Wei Sheng Subject: [PATCH net v3] net: stmmac: Set MAC's flow control register to reflect current settings Date: Wed, 23 Nov 2022 17:15:29 +0800 Message-Id: <20221123091529.22018-1-wei.sheng.goh@intel.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, pause frame register GMAC_RX_FLOW_CTRL_RFE is not updated correctly when 'ethtool -A autoneg off rx off tx off' command is issued. This fix ensures the flow control change is reflected directly in the GMAC_RX_FLOW_CTRL_RFE register. Fixes: 46f69ded988d ("net: stmmac: Use resolved link config in mac_link_up(= )") Cc: # 5.10.x Signed-off-by: Goh, Wei Sheng Signed-off-by: Noor Azura Ahmad Tarmizi Reviewed-by: Andrew Lunn --- V2 -> V3: Removed value assign for 'flow' in else statement based on review= comments V1 -> V2: Removed needless condition based on review comments drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/ne= t/ethernet/stmicro/stmmac/dwmac4_core.c index c25bfecb4a2d..369db308b1dd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -748,6 +748,8 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw= , unsigned int duplex, if (fc & FLOW_RX) { pr_debug("\tReceive Flow-Control ON\n"); flow |=3D GMAC_RX_FLOW_CTRL_RFE; + } else { + pr_debug("\tReceive Flow-Control OFF\n"); } writel(flow, ioaddr + GMAC_RX_FLOW_CTRL); =20 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index 8273e6a175c8..ab7f48f32f5b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1061,8 +1061,16 @@ static void stmmac_mac_link_up(struct phylink_config= *config, ctrl |=3D priv->hw->link.duplex; =20 /* Flow Control operation */ - if (tx_pause && rx_pause) - stmmac_mac_flow_ctrl(priv, duplex); + if (rx_pause && tx_pause) + priv->flow_ctrl =3D FLOW_AUTO; + else if (rx_pause && !tx_pause) + priv->flow_ctrl =3D FLOW_RX; + else if (!rx_pause && tx_pause) + priv->flow_ctrl =3D FLOW_TX; + else + priv->flow_ctrl =3D FLOW_OFF; + + stmmac_mac_flow_ctrl(priv, duplex); =20 if (ctrl !=3D old_ctrl) writel(ctrl, priv->ioaddr + MAC_CTRL_REG); --=20 2.17.1