From patchwork Wed Sep 4 09:21:17 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: 13790209 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75D161CEEA0; Wed, 4 Sep 2024 09:22:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725441742; cv=none; b=jY3yAXm1u60CrU3SLMvyALR3BCJSbmGCocwCYOApAnOZLr3b4zPnHX4DQFZQDUaokenB9afZ0snb3dWGa0dB3NdnQGy2xC0Sp+7immx3AsTdA1s0xRNTEdut3MPhNQi+Ntft9QHmXKTgmItknytw7l9HwXX1KmCaEQaHjcoBWao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725441742; c=relaxed/simple; bh=Uf03NK+TcTTM3jFMPZZRi2Aq+HZ0s1AWpNTiYA/4EUU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PBfjVtfHSE5KVJLW9rSmvJZjGG+p3zEP9iSNa2n06cnM42Zm8G/L2zSR1eNTPdxOGh/Fu4TRXMp+0rH4KdT/XMk/INBdPV3BI0H3mqa53HWzF4NSCG/urK05qrAdH50hHfZdQyg8P02xsO3NyihRRHHLvboLo9T0/tj7fnRCn2c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P4R3rFuT; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P4R3rFuT" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7141d7b270dso5111024b3a.2; Wed, 04 Sep 2024 02:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725441741; x=1726046541; darn=vger.kernel.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=P4R3rFuTmYgrHgHnYYD86O256UMWMmBBJVvuIFIZ0VSyXZ4Xz9K0EKPViYqvvbH883 zc1Uv/4dRadPMlYkobMdvHuZFYupuJNytW4wSt+ZQEINKqzH9BiGQm9I1jFXiJcnnMjA VmiJfiJrwcfPy8pMZNJ6ajds4hRPaO8PDvpXmNjS88g6NfaZ5vBt8RFqVPJdSXsPGM6C WK+f28/Jtnp/oHkUJplgNn1z22aNZsYGiK1pGPLvsHv5TuIjEqPQGfV7rOboyJK9xL34 9vWNk2/+I3h2ISN9wSKGuVWuLQdOz3AcxmewRIOoA8jQTx6MDuuE1mUlnBOKJo5TuPA+ S6Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725441741; x=1726046541; 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=bEBIRBgD93hxDcppJ+Rb01zu3z/Mm8Bz9ZHjzAEEXd6YHWbex2EqLEFb+5/PhXT05y ecYf/D3M0JDstcyOIaKWXn5hjmDaFsuyrWed9yHc+aTVXdD5JomNWe2WMLB7zigr1b69 U6O9548b89rvEPfE3I68EF9JeBGEiiBenMvzDjDjIE9SbcC+KLT0Vchfj/h5Jv0sbHye snTLb7HTGaqiTrzu48+Jqz3GIIIbofS3Wrt5Xx+dNNR8HSrFUCNV+VN3vdb7XcL64Z+D rpiruScuFMpT7dz/sCsrvYdZ0kBVwrJoJ1DmyyIes6ZVuoBbJ1dZyrO8Ik4eU9UIiSSw a0SQ== X-Forwarded-Encrypted: i=1; AJvYcCUwyhhe+xmwDbg9ANA9MRsp2QwLmRxxZ6n5HWeZgWz3RbRhjHZnDvKAp8tknExi3Q4Rf29//Hi0/fDjI/M=@vger.kernel.org X-Gm-Message-State: AOJu0YzK6xQhg5KACvFmTuKcp/Ez9Ze5YoTnujLf7yOhK+GeQxrMdis8 m3xE+nmi5fHpwpvDWs93Q662kJB2aQE7MtC81++aJ8L+GK6AfAms X-Google-Smtp-Source: AGHT+IHdq3sVapbRYq4l9nGJyNi+FevwDUjjB+Np83QBjG7H+u4PXfmAQWz+izGuwNtcg8vswni34w== X-Received: by 2002:a05:6a00:1893:b0:714:128b:abe4 with SMTP id d2e1a72fcca58-7174435989bmr12191466b3a.10.1725441740701; Wed, 04 Sep 2024 02:22:20 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7177859968csm1232048b3a.146.2024.09.04.02.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 02:22:20 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: Vladimir Oltean , Alexander Lobakin , 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 v7 2/7] net: stmmac: drop stmmac_fpe_handshake Date: Wed, 4 Sep 2024 17:21:17 +0800 Message-Id: <88bfaada3e92b046bbcfd90b473de043488e9f8a.1725441317.git.0x1207@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.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; }