From patchwork Tue Aug 20 11:20:36 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: 13770063 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 C99EFC3DA4A for ; Tue, 20 Aug 2024 12:30:44 +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=LVDwdCzbnOeidXl/hDBd3l3mbR23PEP/JczHyoisLlw=; b=qS7lO4yKu8/yoUSOTrMGJhVnZd 0rkRkGpYOVrRMxB6NRksirQ99gV6GJTIuYt4bNSkrqSoDNaC+o6vOCZLa6pfywq1XOd4Mwqy2xY1/ gwS9T+sDzmeK0dUaIEQEZLDjeLK0/gP3IFiHBodo8iRRIk+Vj+6HaCJRBLmUNajBQPfQjbej8N7xM sfHCDJQDR7oJuDnj8NSpUKmLoS23nkJ2J/cwbhQmA/4uk5Ii5yUIrc4gs7Nnr5YUcifqdR32L2OVO 59M7QbXIQLElUEQkaxX+dpwtIxUNd3hWwigdE4IfZLvBNEmcqV+/uanx5UUKHqUAtFwvdpKkZE7ag /xtSDkkw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgO0O-00000005CSs-2Hgp; Tue, 20 Aug 2024 12:30:32 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgMvc-00000004zW3-32ky for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2024 11:21:34 +0000 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-201fba05363so35040585ad.3 for ; Tue, 20 Aug 2024 04:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724152892; x=1724757692; 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=LVDwdCzbnOeidXl/hDBd3l3mbR23PEP/JczHyoisLlw=; b=fAGVznhY+ko816vjX185J9hrsYMupScSNVMHkGajz2ZGhrMfVcPmXFXU5nmAjdQ+Q7 Fr/vL34KND2z3eXyeNPLNu0JtBaAJMoupDqQDoWV3rsKJKc/ikvWsBi9kDr21bn7X2G8 igmqYeSqC1FN5r9JAHC0xz9J0m59B8qQ6FPP0wCq78bq0WLpFlDa7iT4YJoVWIWzxu21 i1ckb7UqsnMPZoHylwdt/TJ7tM4UsW6KGyw3lMOReKsGv9Zr6ULk7LYkgTuRngBez6dx 8KcnhCRAjN+cVBQTatj40wF2jLH5X8wl0D/VotIbx1uSMk8wE+/lo7TNQ9yKMxqlkB9p aA2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724152892; x=1724757692; 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=LVDwdCzbnOeidXl/hDBd3l3mbR23PEP/JczHyoisLlw=; b=qTRpOW+uHHYcQWRyqlo/F+3tG7mv9OkiWoIBju7fO2V+KLaaf2xuwGh+IQuehssYz+ /qvi0mHLnqS4w8NCiVYDJe53O6Ne1fC/JYW6hjuwkzOvFR5X4Lo6Y+TlhUVTi4ZH7MnH VWNm4gfSB/hPL0JzWoiT7GTZLX3ENbG1Tr+used75qsuEs7MgNlowZSGz9dDIn90XE0s PhcxhqJhyP4jI2mBTnR+XBakAXHeqcPktqeTjMloTLgYQazQJZQbZw+VN7jb+xLoMM2/ ya7xWhExA79+vna6eVCmbNkLUj2Cr9JURcswpsozC8zG1fP/sb48NKbe6/1Q67E2Uvhf hxlA== X-Forwarded-Encrypted: i=1; AJvYcCVFakdiXiKq3rvuGundi8Wzh7jg0rJq7X1NZK1eofep3gH23Gc1HkQvGpsGltWtvRn6pooMCuWr5gr9xU8OFyAfqEjCXQt7dqu9nfJ8JsV6QXgdLic= X-Gm-Message-State: AOJu0YzON7DX4VUwK9stNM6GPEdSepRR+sBgJcH3sw65T4kui5Ywvr8T cZaKq8MdnICBezlCdFhYRNu38SsrAKGekS/7aMVOIAPEz7bkX3ZE X-Google-Smtp-Source: AGHT+IFudCQbVwdrFeCFCkW6U4cd9Z6nyRYFjjSO2yta7woZbYAqM+UwO/W6VYoUoKZuIjA8vY3X+Q== X-Received: by 2002:a17:902:c942:b0:201:ffef:4652 with SMTP id d9443c01a7336-20203e4f49fmr155363785ad.2.1724152891473; Tue, 20 Aug 2024 04:21:31 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-201f03756f6sm76465355ad.172.2024.08.20.04.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 04:21:30 -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, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v5 2/7] net: stmmac: drop stmmac_fpe_handshake Date: Tue, 20 Aug 2024 19:20:36 +0800 Message-Id: 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-20240820_042132_784309_ECC1FC5A X-CRM114-Status: GOOD ( 12.92 ) 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 --- .../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; }