From patchwork Tue Aug 13 11:47:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Furong Xu <0x1207@gmail.com> X-Patchwork-Id: 13761877 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD54EC52D7B for ; Tue, 13 Aug 2024 11:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=e93oae2VnzqVNZVCAViMoa1uvgxDslJYuHwS+x1kihw=; b=3zYj7b1xn4143VcFxMsNJKBW0i wg0vSYf5iCPSXNmAMnfeYFSf+lR+A4booGy7OrxDFZsl7IXf4gOIMlsX3MIcgHI2KvNKagxKMr2VP ZLDvRJeUq9p1feq3oa1TadkyCUPuhW910YWDdS6A9ERbirh7kpEBIsAtYdhQV9G2cRo9o1Q13G7z3 IYH2vSP720QDowmNH8kNn2530MdB899nFRzmkcuHQwqHgny6ElIUn9NDHNoRx/gvRibqT1Bjy5qyk soCymgHB4jTkzeaWc8A6+Rqzu6pU/Yp4rlU8dRGe8wUEauWCmRmgEnshCaE4bJZVMAOBISjPkheFx o+ZhYFGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdq2G-00000003ZST-3kJO; Tue, 13 Aug 2024 11:49:57 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdq0n-00000003Yzv-2qnP for linux-arm-kernel@lists.infradead.org; Tue, 13 Aug 2024 11:48:27 +0000 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-710dc3015bfso2577227b3a.0 for ; Tue, 13 Aug 2024 04:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723549705; x=1724154505; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e93oae2VnzqVNZVCAViMoa1uvgxDslJYuHwS+x1kihw=; b=U0z23HHcuK5MBSReYbDRQF5a+sdUlCcfBkBsaW23ItSdRaIT2N0bGrO+sjg1kxtXfc KK/GagFz9+TnsVfPg78a3v7UDUuWiCrxuhsfsP0xAtRTw2/3lZMvYal2Nt2qNjca8Cp/ 21d3ZoIyRwULOiiipmjwjLwWHr9fMyW09km3PzHCM1i/H6GXwlAVzIImAoIAr3cgoKzq pBw7Bpdpjur42CnTa/dLuCeerQySvNH3ZOmWyEDcQkS3D799BHP0lLIf2semK/3GH7wI 27GeZDJCQBUUtnTtCs6ewnZjzX6zKpDRpAB/wYD8tRNgpY8nQptAFKh52mwDUqYHH1ry 3JCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723549705; x=1724154505; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e93oae2VnzqVNZVCAViMoa1uvgxDslJYuHwS+x1kihw=; b=DOzZfr5ZW2m8kF5h/pUAlkPYzScLFpPV963ZotuQ5j1PgiHRtZ+eVJpG2wYZMy+XMf 9INfIxc9oyUqVRgL5cNSQPqOZC/TiifGxV6NpJh5/tucnnolBu0Ahf7zhccBAE6t2ftG EFr8d3rYBoTVOGMLBEOAVqasgy1mOrCWUyfQWlfNXe2AahJl6CKw1uCD8/UsYCDekYUP bsDSA15pkLr/dupQpPT6RyijreOZgneRoopVFJ6TALwIweTrqPE84rzFTlF6EdklnrLt lSOim7KjoV9pc+U9cuNAiH3hPmiqcOuYNnAKWd7lUOHB5+Dk0W3FQdT54dpd4fs6JiBD qo1w== X-Forwarded-Encrypted: i=1; AJvYcCUTg2V2KzKpH/9tBl4XsfaFV6oo+ixQZVumnJ6aHH9+QsPkUkaQ6RMnbhIsw/L+1p70sCIVzSWXnQN/fM9I3ItUXJDwpQviCv74yWJCj07BxXU9sN4= X-Gm-Message-State: AOJu0Yyeue1oQKSH+3WmHaa4klb/V3XqZM3BynVxzQ/UnBWZ0oq88Jy4 iUNe4kaZSmZ8Yc5xQU4Hc53AcP+LIF49gYRvg72KWrZEJoCooipZ X-Google-Smtp-Source: AGHT+IGxt8hPD8mJsm6gJter71iHAjEsFjuWECdz+VoqMfy71FcU+f7SGPt+SjXcXj2P7sGD0bgpJQ== X-Received: by 2002:a05:6a20:c78f:b0:1c3:b148:690e with SMTP id adf61e73a8af0-1c8da1925c8mr4631707637.5.1723549704906; Tue, 13 Aug 2024 04:48:24 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-710e5a562bbsm5548755b3a.111.2024.08.13.04.48.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 04:48:24 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: Serge Semin , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Alexandre Torgue , Jose Abreu , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Joao Pinto Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xfr@outlook.com, rock.xu@nio.com, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v2 2/7] net: stmmac: drop stmmac_fpe_handshake Date: Tue, 13 Aug 2024 19:47:28 +0800 Message-Id: <02703a16d35eaa28ad513d56bc52427e0fcbbddd.1723548320.git.0x1207@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240813_044825_747597_5D6085F9 X-CRM114-Status: GOOD ( 13.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org ethtool --set-mm can trigger FPE verification processe by calling stmmac_fpe_send_mpacket, stmmac_fpe_handshake should be gone. Signed-off-by: Furong Xu <0x1207@gmail.com> --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +------------------ .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 8 ------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 529fe31f8b04..3072ad33b105 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3533,13 +3533,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) stmmac_set_hw_vlan_mode(priv, priv->hw); - if (priv->dma_cap.fpesel) { + if (priv->dma_cap.fpesel) stmmac_fpe_start_wq(priv); - if (priv->fpe_cfg.enable) - stmmac_fpe_handshake(priv, true); - } - return 0; } @@ -7425,22 +7421,6 @@ static void stmmac_fpe_lp_task(struct work_struct *work) clear_bit(__FPE_TASK_SCHED, &priv->fpe_task_state); } -void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable) -{ - if (priv->fpe_cfg.hs_enable != enable) { - if (enable) { - stmmac_fpe_send_mpacket(priv, priv->ioaddr, - &priv->fpe_cfg, - MPACKET_VERIFY); - } else { - priv->fpe_cfg.lo_fpe_state = FPE_STATE_OFF; - priv->fpe_cfg.lp_fpe_state = FPE_STATE_OFF; - } - - priv->fpe_cfg.hs_enable = enable; - } -} - static int stmmac_xdp_rx_timestamp(const struct xdp_md *_ctx, u64 *timestamp) { const struct stmmac_xdp_buff *ctx = (void *)_ctx; @@ -7902,7 +7882,6 @@ int stmmac_suspend(struct device *dev) priv->plat->tx_queues_to_use, priv->plat->rx_queues_to_use, false); - stmmac_fpe_handshake(priv, false); stmmac_fpe_stop_wq(priv); } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 9cc41ed01882..b0cc45331ff7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -1078,11 +1078,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv, netdev_info(priv->dev, "configured EST\n"); - if (fpe) { - stmmac_fpe_handshake(priv, true); - netdev_info(priv->dev, "start FPE handshake\n"); - } - return 0; disable: @@ -1107,9 +1102,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv, false); netdev_info(priv->dev, "disabled FPE\n"); - stmmac_fpe_handshake(priv, false); - netdev_info(priv->dev, "stop FPE handshake\n"); - return ret; }