From patchwork Fri Sep 6 14:30:07 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: 13794280 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 27E2ECE7B1B for ; Fri, 6 Sep 2024 14:33:59 +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=awdxA94+EDwJxMaDIv2LrPwLHdX9C7ivLS6VUmJAIug=; b=Rx6wBprtqsLt26HPBpB5c4Q/Nk AEtIF7zPLlsMRT8Vhkqt6z1rc/7ErRW3QDowiDDEjPfmcrdafdeXuJR+XJ2S2PaYWsZgl0R6atd7H oN7TIleh4wsCP0bb+pD9yRpmA0cNJs7LDMnUhLyL+NimEVrY9BYgbf9La/p2tKRp6xBOkvSlLjPyD y7PXYmEcfmKMueEPtuzQTXuBvAjGFbPwVT4JFZ+KZM0Bz1gmR2MYTX2fOm4UquEdbG1Mc0zRDVLMC X33azMRbjI0uCg7cBfqj5zQaburXskPcvXywsZ9igvqTrBkeXfrxe9bMYZU6PP+74aXP9qUQ3S29K sLXYNNVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sma1z-0000000CY7P-2GkL; Fri, 06 Sep 2024 14:33:47 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1smZz9-0000000CX5j-1KOy for linux-arm-kernel@lists.infradead.org; Fri, 06 Sep 2024 14:30:52 +0000 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2068bee21d8so22211645ad.2 for ; Fri, 06 Sep 2024 07:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725633051; x=1726237851; 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=awdxA94+EDwJxMaDIv2LrPwLHdX9C7ivLS6VUmJAIug=; b=iZXMeCEcLLyec2GnAgKQOxtDd/Z3RJaigztjZr6j/9h9k9VekmqSkLCzXV8xVULQ8S bFMpTrCrRK8SPo/OY0RI3czBzDr/zz7mRn3ylilPJ+o0WdHwu5Efwd/HmRJRpE6duQkR Qx+owMLrzVoqZalENN7hdG//BqtR5NXBmvwsjlCUsXUL38wyNZZBvVU6DIxF3j4YEO2r pUGtlzzaKKQCjggnr1uJY4wg9trjjRPX/XbFoVVYlGugUiSXMwTlvZG7yjCf/EItUjfS VBVr1E3HqqzeYa82FpF4vlyWPFMnQF3hkF6/Mjke8ZJ6jIYM+ayko9SJ8NObM9lhE7yN 4zVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725633051; x=1726237851; 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=awdxA94+EDwJxMaDIv2LrPwLHdX9C7ivLS6VUmJAIug=; b=j/UvYXJgPgzhF6Wis/ZWggf2GOH+XkB4Hqjtz54oH0TZA/PoApix8DK+nBcgYWCt0F T8rYsB4G8s/vjhP9wbKqhyOSs7pRKwOwqX3KMA+s4M4W/ITWAjPmz1Zo+cTpELthAIfG 059C6u+oHhhGuVLt6SsrtL6JkW/8+6rQKMOstFPuMvsJFGtRD+7cNmg4dbxfyW5YaORe 92xXAQ94D12S9qRQ3ifbAoNkxKnm7f/B5qK8tfneqNnYlt/qk3qJOVbiyWiSA9GC0SDV z11JVkW8plWHWq+yaYv/lSyE6Iw9cn5LP0Pd45QowrWNHY8lmon75WPL+Rt+GthZ9XV9 41nA== X-Forwarded-Encrypted: i=1; AJvYcCWSjpHRuMZNct0geL/dUbOwBn+XEGkDveM7waIe45DTf0eede8pkRtw3XzdAxu07XiUePMdQc4squHXvq3Am/KG@lists.infradead.org X-Gm-Message-State: AOJu0YxjF4CmeuN15PnC4I/zhId9sh9Yfxhckjw14/JBxQYX3tgxaOnz vmF+bw9wp+AUml98PvEEH1wvKyjrBDykGJAtiv7q+sK2eaHNYrzq X-Google-Smtp-Source: AGHT+IFzZCrAUEVZJhp3/dgNTm/ePgkDAtbdtsSkmJiBTbfLT842CI3EEnlRgDIcXOZLkIzHl5TKsw== X-Received: by 2002:a17:902:d4c1:b0:205:913b:d9ad with SMTP id d9443c01a7336-205913bdac2mr142716705ad.0.1725633050435; Fri, 06 Sep 2024 07:30:50 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-206ae94dcf3sm43951975ad.80.2024.09.06.07.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 07:30:50 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: Vladimir Oltean , Serge Semin , "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, rmk+kernel@armlinux.org.uk, linux@armlinux.org.uk, xfr@outlook.com, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v10 2/7] net: stmmac: drop stmmac_fpe_handshake Date: Fri, 6 Sep 2024 22:30:07 +0800 Message-Id: <42018b1a15eb3ced567fd6a73798c7cd4e08799a.1725631883.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-20240906_073051_361859_29A3FF66 X-CRM114-Status: GOOD ( 13.05 ) 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 process by calling stmmac_fpe_send_mpacket, stmmac_fpe_handshake should be gone. Signed-off-by: Furong Xu <0x1207@gmail.com> Reviewed-by: Vladimir Oltean --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 - .../net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +------------------ .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 8 ------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 458d6b16ce21..3ad182ef8e97 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -425,7 +425,6 @@ bool stmmac_eee_init(struct stmmac_priv *priv); int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt); int stmmac_reinit_ringparam(struct net_device *dev, u32 rx_size, u32 tx_size); int stmmac_bus_clks_config(struct stmmac_priv *priv, bool enabled); -void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable); static inline bool stmmac_xdp_is_enabled(struct stmmac_priv *priv) { 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; }