From patchwork Wed Jul 31 10:43:12 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: 13748470 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 454B5C3DA7F for ; Wed, 31 Jul 2024 10:45:04 +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=snaCsACqyJEvDPoCe8c6j2mEdiz6XpKSMeazDSmVYA8=; b=bZJUGvBos2OGgxgf4lEgxuV7Pt 7f/xScz1VKiiA8/U+V1xGnukA4CzfgvFVT8k+WILYalDJSiE/ibl6pLuvmccKW/OSvYMaKCAEm3u8 6eHUlfXW8Eo4QRAc3Jx5nbmmTaY8jAoTKFSyK3A6XCwe1bpCP8D6o+yDDlsMD6m7zNymVniAJEkUB vsTAhfsFZ4qcbqfLE/C9AJ6lB7s0U8fWCCKl1M8p7es8/2F2LxmIRrHvEt+avxE8q7ryY8Em3GUFV HNt7BjFaScY39tu82+WpE9ytFiQaycq/VI2D5thiVO4BK47kqt1HYNvzf1qAWsl0Irz6iZuH0wZig tl6mzDig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6p8-00000000lif-3o5v; Wed, 31 Jul 2024 10:44:50 +0000 Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6oK-00000000lPc-1bPV for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 10:44:03 +0000 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-26109c97728so3437463fac.0 for ; Wed, 31 Jul 2024 03:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722422639; x=1723027439; 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=snaCsACqyJEvDPoCe8c6j2mEdiz6XpKSMeazDSmVYA8=; b=iactXHCtn5oMXvFXMy0U0C4+oln6D6MjXT5NBuLWwKYuEpbWHyhYabToVUEqXKq1Rn R9oVt8my9muYYmt0i4bMt3uQJjHTMVLbqMLvHZD42b2U4jSt6sjntlaDrlaF7teo0P8f GTB5EfonSPacXMj2CDGxeU5GuGs4koUPH184/pjwwxw2Kqz7rlIMHGXXe2V0IPHXfFml 7JRRHNYTLM3Kxb/NtYS7BHiUSQ522/6FtxE3yTJoeB8RIneq7kxUc1RYNNaPFpM3AeTJ Hm8OAgnEX7gQzVVwqYMiwr6dX14M2m3i+REv/ew2eytquNzTbpcRnVGrsQCXZENLCV26 E57A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722422639; x=1723027439; 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=snaCsACqyJEvDPoCe8c6j2mEdiz6XpKSMeazDSmVYA8=; b=V/eRHG07mUU4rILnjxEE78iXNEVHqe8pXz5CHPO/Jfmkp7/R9n9zzOr+sAGZnLKDlg rhBHbay1Gt9p+RgcMEqxfnBHwnPIqK/soQlx9D4v5/RYYCQDYLt0d8tUTO+svzvuGXxO rfEo0dEhfe111E8iduOgTgomuNBqpqLQ55HoZNfwu1yX+xk3bRN2aQydLZ/TSFeVz3Y7 fVJ4jrutq+INPip0wtkCiDk0EbyXMZ31F7YTR90yRlBMz044PZFLViQxm16FoCuk0JUo owv4++dtGkvEhs2LrPIqsns/sWvBzluAiWwBcMgGWYmJNW3QRz5IAOP3XDgOkMJx/F3o g1Kg== X-Forwarded-Encrypted: i=1; AJvYcCXMosJF4RUGJhd69HRAzL0qgy0NT72J40GtSmN02A+NmSVgVmkL2vH6MNPTvZR+D4diy318WfMWDiAMKS1cUBIC@lists.infradead.org X-Gm-Message-State: AOJu0YzICxWDkGUSf34zEWdL86HVBr5jW89MoBB6WjiTT/j2v9L/9yIM HBoECpumykMKtrmed6Lmvnt0GXqB1vjqmHWI5mtMe1pDQV3XTnLv X-Google-Smtp-Source: AGHT+IFvZHTHnA2mtTbaHt9st4XF5vvQ0tz9N8ooQBOxEewsYWTEfsn8Xwb59WNXcqec07rlupgtug== X-Received: by 2002:a05:6870:1685:b0:25e:24a0:4c96 with SMTP id 586e51a60fabf-267d4d0710bmr16665666fac.11.1722422639081; Wed, 31 Jul 2024 03:43:59 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-7a9f816da59sm8791375a12.29.2024.07.31.03.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 03:43:58 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: 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 v1 1/5] net: stmmac: configure FPE via ethtool-mm Date: Wed, 31 Jul 2024 18:43:12 +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-20240731_034400_589524_4BC37118 X-CRM114-Status: GOOD ( 20.06 ) 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 Implement ethtool --show-mm and --set-mm callbacks. 0) Setup two DWMAC CORE 5.10a devices, connect in a back-to-back manner. 1) After kernel booted, get initial status: ethtool --include-statistics --json --show-mm eth1 [ { "ifname": "eth1", "pmac-enabled": true, "tx-enabled": false, "tx-active": false, "tx-min-frag-size": 60, "rx-min-frag-size": 60, "verify-enabled": false, "verify-time": 0, "max-verify-time": 128, "verify-status": "DISABLED", "statistics": { "MACMergeFrameAssErrorCount": 0, "MACMergeFrameSmdErrorCount": 0, "MACMergeFrameAssOkCount": 0, "MACMergeFragCountRx": 0, "MACMergeFragCountTx": 0, "MACMergeHoldCount": 0 } } ] 3) Enable FPE on local device, keep FPE disabled on remote device: ethtool --set-mm eth1 verify-enabled on verify-time 100 tx-enabled on 4) Get status on local device: ethtool --include-statistics --json --show-mm eth1 [ { "ifname": "eth1", "pmac-enabled": true, "tx-enabled": true, "tx-active": false, "tx-min-frag-size": 60, "rx-min-frag-size": 60, "verify-enabled": true, "verify-time": 100, "max-verify-time": 128, "verify-status": "VERIFYING", "statistics": { "MACMergeFrameAssErrorCount": 0, "MACMergeFrameSmdErrorCount": 0, "MACMergeFrameAssOkCount": 0, "MACMergeFragCountRx": 0, "MACMergeFragCountTx": 0, "MACMergeHoldCount": 0 } } ] 5) Enable FPE on remote device, handshake can be finished now: ethtool --set-mm eth1 verify-enabled on verify-time 100 tx-enabled on 6) Get status on local and remote device, both report SUCCEEDED: ethtool --include-statistics --json --show-mm eth1 [ { "ifname": "eth1", "pmac-enabled": true, "tx-enabled": true, "tx-active": true, "tx-min-frag-size": 60, "rx-min-frag-size": 60, "verify-enabled": true, "verify-time": 100, "max-verify-time": 128, "verify-status": "SUCCEEDED", "statistics": { "MACMergeFrameAssErrorCount": 0, "MACMergeFrameSmdErrorCount": 0, "MACMergeFrameAssOkCount": 0, "MACMergeFragCountRx": 0, "MACMergeFragCountTx": 0, "MACMergeHoldCount": 0 } } ] 7) tc-mqprio or tc-taprio can be used to select whether traffic classes are express or preemptible. Signed-off-by: Furong Xu <0x1207@gmail.com> --- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 17 +++ drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 5 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 6 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 + .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 111 ++++++++++++++++++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- include/linux/stmmac.h | 1 + 8 files changed, 149 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index f98741d2607e..af871cce767e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -1268,6 +1268,8 @@ const struct stmmac_ops dwmac410_ops = { .fpe_configure = dwmac5_fpe_configure, .fpe_send_mpacket = dwmac5_fpe_send_mpacket, .fpe_irq_status = dwmac5_fpe_irq_status, + .fpe_get_add_frag_size = dwmac5_fpe_get_add_frag_size, + .fpe_set_add_frag_size = dwmac5_fpe_set_add_frag_size, .add_hw_vlan_rx_fltr = dwmac4_add_hw_vlan_rx_fltr, .del_hw_vlan_rx_fltr = dwmac4_del_hw_vlan_rx_fltr, .restore_hw_vlan_rx_fltr = dwmac4_restore_hw_vlan_rx_fltr, @@ -1320,6 +1322,8 @@ const struct stmmac_ops dwmac510_ops = { .fpe_configure = dwmac5_fpe_configure, .fpe_send_mpacket = dwmac5_fpe_send_mpacket, .fpe_irq_status = dwmac5_fpe_irq_status, + .fpe_get_add_frag_size = dwmac5_fpe_get_add_frag_size, + .fpe_set_add_frag_size = dwmac5_fpe_set_add_frag_size, .add_hw_vlan_rx_fltr = dwmac4_add_hw_vlan_rx_fltr, .del_hw_vlan_rx_fltr = dwmac4_del_hw_vlan_rx_fltr, .restore_hw_vlan_rx_fltr = dwmac4_restore_hw_vlan_rx_fltr, diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index e02cebc3f1b7..5d132bada3fe 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -638,3 +638,20 @@ void dwmac5_fpe_send_mpacket(void __iomem *ioaddr, struct stmmac_fpe_cfg *cfg, writel(value, ioaddr + MAC_FPE_CTRL_STS); } + +int dwmac5_fpe_get_add_frag_size(void __iomem *ioaddr) +{ + return FIELD_GET(AFSZ, readl(ioaddr + MTL_FPE_CTRL_STS)); +} + +void dwmac5_fpe_set_add_frag_size(void __iomem *ioaddr, u32 add_frag_size) +{ + u32 value; + + value = readl(ioaddr + MTL_FPE_CTRL_STS); + + value &= ~AFSZ; + value |= FIELD_PREP(AFSZ, add_frag_size); + + writel(value, ioaddr + MTL_FPE_CTRL_STS); +} diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h index bf33a51d229e..6b1c9d2da308 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h @@ -39,6 +39,9 @@ #define MAC_PPSx_INTERVAL(x) (0x00000b88 + ((x) * 0x10)) #define MAC_PPSx_WIDTH(x) (0x00000b8c + ((x) * 0x10)) +#define MTL_FPE_CTRL_STS 0x00000c90 +#define AFSZ GENMASK(1, 0) + #define MTL_RXP_CONTROL_STATUS 0x00000ca0 #define RXPI BIT(31) #define NPE GENMASK(23, 16) @@ -109,5 +112,7 @@ void dwmac5_fpe_send_mpacket(void __iomem *ioaddr, struct stmmac_fpe_cfg *cfg, enum stmmac_mpacket_type type); int dwmac5_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev); +int dwmac5_fpe_get_add_frag_size(void __iomem *ioaddr); +void dwmac5_fpe_set_add_frag_size(void __iomem *ioaddr, u32 add_frag_size); #endif /* __DWMAC5_H__ */ diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index e53c32362774..f868ffc3e64f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -425,6 +425,8 @@ struct stmmac_ops { struct stmmac_fpe_cfg *cfg, enum stmmac_mpacket_type type); int (*fpe_irq_status)(void __iomem *ioaddr, struct net_device *dev); + int (*fpe_get_add_frag_size)(void __iomem *ioaddr); + void (*fpe_set_add_frag_size)(void __iomem *ioaddr, u32 add_frag_size); }; #define stmmac_core_init(__priv, __args...) \ @@ -529,6 +531,10 @@ struct stmmac_ops { stmmac_do_void_callback(__priv, mac, fpe_send_mpacket, __args) #define stmmac_fpe_irq_status(__priv, __args...) \ stmmac_do_callback(__priv, mac, fpe_irq_status, __args) +#define stmmac_fpe_get_add_frag_size(__priv, __args...) \ + stmmac_do_callback(__priv, mac, fpe_get_add_frag_size, __args) +#define stmmac_fpe_set_add_frag_size(__priv, __args...) \ + stmmac_do_void_callback(__priv, mac, fpe_set_add_frag_size, __args) /* PTP and HW Timer helpers */ struct stmmac_hwtimestamp { diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index b23b920eedb1..5228493bc68c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -345,6 +345,9 @@ struct stmmac_priv { struct work_struct fpe_task; char wq_name[IFNAMSIZ + 4]; + /* Serialize access to MAC Merge state between ethtool requests */ + struct mutex mm_lock; + /* TC Handling */ unsigned int tc_entries_max; unsigned int tc_off_max; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 7008219fd88d..ca85e8694285 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -19,6 +19,7 @@ #include "stmmac.h" #include "dwmac_dma.h" #include "dwxgmac2.h" +#include "dwmac5.h" #define REG_SPACE_SIZE 0x1060 #define GMAC4_REG_SPACE_SIZE 0x116C @@ -1270,6 +1271,113 @@ static int stmmac_set_tunable(struct net_device *dev, return ret; } +static int stmmac_get_mm(struct net_device *ndev, + struct ethtool_mm_state *state) +{ + struct stmmac_priv *priv = netdev_priv(ndev); + enum stmmac_fpe_state lo_state = priv->plat->fpe_cfg->lo_fpe_state; + u32 add_frag_size; + + if (!priv->dma_cap.fpesel) + return -EOPNOTSUPP; + + mutex_lock(&priv->mm_lock); + + /* If FPE is supported by hardware, preemptible MAC is always enabled */ + state->pmac_enabled = true; + + state->verify_time = priv->plat->fpe_cfg->verify_time; + + /* 802.3-2018 clause 30.14.1.6, says that the aMACMergeVerifyTime + * variable has a range between 1 and 128 ms inclusive. Limit to that. + */ + state->max_verify_time = 128; + + if (lo_state == FPE_STATE_CAPABLE) + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_VERIFYING; + else if (lo_state == FPE_STATE_ENTERING_ON || lo_state == FPE_STATE_ON) + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED; + else if (lo_state == FPE_STATE_OFF) + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_DISABLED; + else + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_UNKNOWN; + + /* Cannot read MAC_FPE_CTRL_STS register here, or FPE interrupt events + * can lose. + * + * See commit 37e4b8df27bc ("net: stmmac: fix FPE events losing") + */ + state->tx_enabled = !!(priv->plat->fpe_cfg->fpe_csr == EFPE); + + /* FPE active if common tx_enabled and verification success or disabled (forced) */ + state->tx_active = state->tx_enabled && + (state->verify_status == ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED || + state->verify_status == ETHTOOL_MM_VERIFY_STATUS_DISABLED); + + state->verify_enabled = priv->plat->fpe_cfg->hs_enable; + + add_frag_size = stmmac_fpe_get_add_frag_size(priv, priv->ioaddr); + state->tx_min_frag_size = ethtool_mm_frag_size_add_to_min(add_frag_size); + + state->rx_min_frag_size = ETH_ZLEN; + + mutex_unlock(&priv->mm_lock); + + return 0; +} + +static int stmmac_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg, + struct netlink_ext_ack *extack) +{ + struct stmmac_priv *priv = netdev_priv(ndev); + u32 add_frag_size; + int err; + + if (!priv->dma_cap.fpesel) + return -EOPNOTSUPP; + + err = ethtool_mm_frag_size_min_to_add(cfg->tx_min_frag_size, + &add_frag_size, extack); + if (err) + return err; + + mutex_lock(&priv->mm_lock); + + priv->plat->fpe_cfg->verify_time = cfg->verify_time; + + stmmac_fpe_configure(priv, priv->ioaddr, priv->plat->fpe_cfg, + priv->plat->tx_queues_to_use, + priv->plat->rx_queues_to_use, + cfg->tx_enabled); + + stmmac_fpe_set_add_frag_size(priv, priv->ioaddr, add_frag_size); + + stmmac_fpe_handshake(priv, cfg->verify_enabled); + + mutex_unlock(&priv->mm_lock); + + return 0; +} + +static void stmmac_get_mm_stats(struct net_device *ndev, + struct ethtool_mm_stats *s) +{ + struct stmmac_priv *priv = netdev_priv(ndev); + struct stmmac_counters *mmc = &priv->mmc; + + if (!priv->dma_cap.rmon) + return; + + stmmac_mmc_read(priv, priv->mmcaddr, mmc); + + s->MACMergeFrameAssErrorCount = mmc->mmc_rx_packet_assembly_err_cntr; + s->MACMergeFrameSmdErrorCount = mmc->mmc_rx_packet_smd_err_cntr; + s->MACMergeFrameAssOkCount = mmc->mmc_rx_packet_assembly_ok_cntr; + s->MACMergeFragCountRx = mmc->mmc_rx_fpe_fragment_cntr; + s->MACMergeFragCountTx = mmc->mmc_tx_fpe_fragment_cntr; + s->MACMergeHoldCount = mmc->mmc_tx_hold_req_cntr; +} + static const struct ethtool_ops stmmac_ethtool_ops = { .supported_coalesce_params = ETHTOOL_COALESCE_USECS | ETHTOOL_COALESCE_MAX_FRAMES, @@ -1309,6 +1417,9 @@ static const struct ethtool_ops stmmac_ethtool_ops = { .set_tunable = stmmac_set_tunable, .get_link_ksettings = stmmac_ethtool_get_link_ksettings, .set_link_ksettings = stmmac_ethtool_set_link_ksettings, + .get_mm = stmmac_get_mm, + .set_mm = stmmac_set_mm, + .get_mm_stats = stmmac_get_mm_stats, }; void stmmac_set_ethtool_ops(struct net_device *netdev) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 12689774d755..9b1cf81c50ea 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7384,7 +7384,6 @@ static void stmmac_fpe_lp_task(struct work_struct *work) enum stmmac_fpe_state *lo_state = &fpe_cfg->lo_fpe_state; enum stmmac_fpe_state *lp_state = &fpe_cfg->lp_fpe_state; bool *hs_enable = &fpe_cfg->hs_enable; - bool *enable = &fpe_cfg->enable; int retries = 20; while (retries-- > 0) { @@ -7394,11 +7393,6 @@ static void stmmac_fpe_lp_task(struct work_struct *work) if (*lo_state == FPE_STATE_ENTERING_ON && *lp_state == FPE_STATE_ENTERING_ON) { - stmmac_fpe_configure(priv, priv->ioaddr, - fpe_cfg, - priv->plat->tx_queues_to_use, - priv->plat->rx_queues_to_use, - *enable); netdev_info(priv->dev, "configured FPE\n"); @@ -7418,7 +7412,7 @@ static void stmmac_fpe_lp_task(struct work_struct *work) MPACKET_VERIFY); } /* Sleep then retry */ - msleep(500); + msleep(fpe_cfg->verify_time); } clear_bit(__FPE_TASK_SCHED, &priv->fpe_task_state); @@ -7720,6 +7714,7 @@ int stmmac_dvr_probe(struct device *device, stmmac_napi_add(ndev); mutex_init(&priv->lock); + mutex_init(&priv->mm_lock); /* If a specific clk_csr value is passed from the platform * this means that the CSR Clock Range selection cannot be diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 84e13bd5df28..707a6916e51a 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -162,6 +162,7 @@ struct stmmac_fpe_cfg { enum stmmac_fpe_state lp_fpe_state; /* Link Partner FPE state */ enum stmmac_fpe_state lo_fpe_state; /* Local station FPE state */ u32 fpe_csr; /* MAC_FPE_CTRL_STS reg cache */ + u32 verify_time; /* see struct ethtool_mm_state */ }; struct stmmac_safety_feature_cfg { From patchwork Wed Jul 31 10:43:13 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: 13748471 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 4FF75C3DA64 for ; Wed, 31 Jul 2024 10:45:27 +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=C5uCSeDS2KlYFiPNdbR3vKj49AmACS3RssJxcitTbJU=; b=OrDx5OHDcqpUqmDVHyxqr5mWU6 s30rTdowLjN6wtihStJVMl6C6v/rJUz3BAiItW4//SVJNtBSWx5jJ9Uk8ZeXgis10suk9JAlXhYfb 9yOkVUBzOvtz6NWA4C5TKc1kEg3k9cwnwYFyqd06XIPdqDXRfXrZMeS8XDkJXzpyvH9SERTOCs5ty DURetMcM+Vr3rfA+3wRYnVeSjSwfQ1mnzDZqii5txVPzozKJsrqg3H0FtUGvD3OkZ8Ng+PnGbk101 pXmBWC18RQpTxqhK7g2rOHMAgPJQmxooand9m/QeZqBQR8OEZ0xSLxLPsWVTN7fNBp3I9RY6rDg4T t8m4F4KQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6pa-00000000lty-2rny; Wed, 31 Jul 2024 10:45:18 +0000 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6oT-00000000lUc-3okX for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 10:44:11 +0000 Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-3daf0e73a5bso3786678b6e.0 for ; Wed, 31 Jul 2024 03:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722422649; x=1723027449; 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=C5uCSeDS2KlYFiPNdbR3vKj49AmACS3RssJxcitTbJU=; b=j9A4gFR7DGm7w70G4r0cJGCRPTyvj1RpBpoBKy7EHHR//cAb+sGzMSXFY7bKc2lPO7 0woKEvqftePH5VFzL0iIWfqoVLAbp+YlHpcfTJsjiKqIVtcE4CcynapbUAWTSIh6bxZL crrdNQUS2B2AVduPK6JFO5yNZhTjnfcXiycbWYsg1KS3lL64kMTA/hHxz7pucT7GOGd1 vWgHZiHrN7aWoLLwpW5yDNZAl18QnfSwa7QCWKxfAlp9kP3ESZPji8HVWFTVDV+sbo91 kyud8liaV8lRAzR1wUR//eVIndsVGPOXpI7mIERWHM8JUXiJartCxKSZlZqhZ7vexpZe NgLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722422649; x=1723027449; 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=C5uCSeDS2KlYFiPNdbR3vKj49AmACS3RssJxcitTbJU=; b=LK/NR0Yp9DqB165mWxwLG3+uWFo2vXCdgbZu0cwMkKV5fTrMfVJWRNWuTqGBJmvT22 Hb07av2ZyRtnS7QgzCt2h9zZAGD5MZostA0MRGYeBVmbkksm/fKIifSW8JG7l0WTb3D6 dVUCt4oy2ehDmfljLPaP8JPcHUL0JSvCLk8PVnX+XmuIzNypd2q3RN6gFY72VLDAJPnF T+y4QW/JYzar1j9Uod+DfDgIixIngIO8oUNoupdeG/IFHLtGvlSaXD5sHdixE8j8kZo2 xZ0b0S96O5HmTduy2BvU5ZAorX5MzHis5x3ph9NA+qvACdFWFEgOXc0IoqBQJLcxIyUW dDBg== X-Forwarded-Encrypted: i=1; AJvYcCVWRCAlgkCT7tMZaabRqjqPkgQw6rU1qsmfIL6bSf5zVic5z7klnJBrezR3YLuF4H/s1XIJASwlcQz1jtHh1jKxhk1WS5kDbBqJcLZZkgSVWZAwYtk= X-Gm-Message-State: AOJu0Yy9uFY7JsMc1LuOBWAuOZcPGkFEHg0u8j1r0fClfGOtj+uPgSwP wz0cdm52YO043NnL6cRMc1dZAuXOYBMXJQd2nj6G/0N79sF6peiw X-Google-Smtp-Source: AGHT+IHcHs92dpP656QF9x0ILt6Q+QZ+HokBNWMSIIQRCqfEkorPMSQjHNCWI7OPXpiMNpEaK7cxPQ== X-Received: by 2002:aca:905:0:b0:3da:aae9:718e with SMTP id 5614622812f47-3db23d7a442mr14618692b6e.46.1722422648801; Wed, 31 Jul 2024 03:44:08 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-7a9f816da59sm8791375a12.29.2024.07.31.03.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 03:44:08 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: 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 v1 2/5] net: stmmac: support fp parameter of tc-mqprio Date: Wed, 31 Jul 2024 18:43:13 +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-20240731_034409_976936_7D432D05 X-CRM114-Status: GOOD ( 18.68 ) 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 tc-mqprio can select whether traffic classes are express or preemptible. Tested on DWMAC CORE 5.10a Signed-off-by: Furong Xu <0x1207@gmail.com> --- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 12 ++++ drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 2 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 +++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 2 + .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 61 +++++++++++++++++++ 6 files changed, 87 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index af871cce767e..68cdfd9e7c8c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -1270,6 +1270,7 @@ const struct stmmac_ops dwmac410_ops = { .fpe_irq_status = dwmac5_fpe_irq_status, .fpe_get_add_frag_size = dwmac5_fpe_get_add_frag_size, .fpe_set_add_frag_size = dwmac5_fpe_set_add_frag_size, + .fpe_set_preemptible_tcs = dwmac5_fpe_set_preemptible_tcs, .add_hw_vlan_rx_fltr = dwmac4_add_hw_vlan_rx_fltr, .del_hw_vlan_rx_fltr = dwmac4_del_hw_vlan_rx_fltr, .restore_hw_vlan_rx_fltr = dwmac4_restore_hw_vlan_rx_fltr, @@ -1324,6 +1325,7 @@ const struct stmmac_ops dwmac510_ops = { .fpe_irq_status = dwmac5_fpe_irq_status, .fpe_get_add_frag_size = dwmac5_fpe_get_add_frag_size, .fpe_set_add_frag_size = dwmac5_fpe_set_add_frag_size, + .fpe_set_preemptible_tcs = dwmac5_fpe_set_preemptible_tcs, .add_hw_vlan_rx_fltr = dwmac4_add_hw_vlan_rx_fltr, .del_hw_vlan_rx_fltr = dwmac4_del_hw_vlan_rx_fltr, .restore_hw_vlan_rx_fltr = dwmac4_restore_hw_vlan_rx_fltr, diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 5d132bada3fe..068859284691 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -655,3 +655,15 @@ void dwmac5_fpe_set_add_frag_size(void __iomem *ioaddr, u32 add_frag_size) writel(value, ioaddr + MTL_FPE_CTRL_STS); } + +void dwmac5_fpe_set_preemptible_tcs(void __iomem *ioaddr, unsigned long tcs) +{ + u32 value; + + value = readl(ioaddr + MTL_FPE_CTRL_STS); + + value &= ~PEC; + value |= FIELD_PREP(PEC, tcs); + + writel(value, ioaddr + MTL_FPE_CTRL_STS); +} diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h index 6b1c9d2da308..bce7e88418ac 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h @@ -40,6 +40,7 @@ #define MAC_PPSx_WIDTH(x) (0x00000b8c + ((x) * 0x10)) #define MTL_FPE_CTRL_STS 0x00000c90 +#define PEC GENMASK(15, 8) #define AFSZ GENMASK(1, 0) #define MTL_RXP_CONTROL_STATUS 0x00000ca0 @@ -114,5 +115,6 @@ void dwmac5_fpe_send_mpacket(void __iomem *ioaddr, int dwmac5_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev); int dwmac5_fpe_get_add_frag_size(void __iomem *ioaddr); void dwmac5_fpe_set_add_frag_size(void __iomem *ioaddr, u32 add_frag_size); +void dwmac5_fpe_set_preemptible_tcs(void __iomem *ioaddr, unsigned long tcs); #endif /* __DWMAC5_H__ */ diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index f868ffc3e64f..109699d3df0a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -7,6 +7,7 @@ #include #include +#include #define stmmac_do_void_callback(__priv, __module, __cname, __arg0, __args...) \ ({ \ @@ -427,6 +428,7 @@ struct stmmac_ops { int (*fpe_irq_status)(void __iomem *ioaddr, struct net_device *dev); int (*fpe_get_add_frag_size)(void __iomem *ioaddr); void (*fpe_set_add_frag_size)(void __iomem *ioaddr, u32 add_frag_size); + void (*fpe_set_preemptible_tcs)(void __iomem *ioaddr, unsigned long tcs); }; #define stmmac_core_init(__priv, __args...) \ @@ -535,6 +537,8 @@ struct stmmac_ops { stmmac_do_callback(__priv, mac, fpe_get_add_frag_size, __args) #define stmmac_fpe_set_add_frag_size(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, fpe_set_add_frag_size, __args) +#define stmmac_fpe_set_preemptible_tcs(__priv, __args...) \ + stmmac_do_void_callback(__priv, mac, fpe_set_preemptible_tcs, __args) /* PTP and HW Timer helpers */ struct stmmac_hwtimestamp { @@ -622,6 +626,8 @@ struct stmmac_tc_ops { struct tc_etf_qopt_offload *qopt); int (*query_caps)(struct stmmac_priv *priv, struct tc_query_caps_base *base); + int (*setup_mqprio)(struct stmmac_priv *priv, + struct tc_mqprio_qopt_offload *qopt); }; #define stmmac_tc_init(__priv, __args...) \ @@ -638,6 +644,8 @@ struct stmmac_tc_ops { stmmac_do_callback(__priv, tc, setup_etf, __args) #define stmmac_tc_query_caps(__priv, __args...) \ stmmac_do_callback(__priv, tc, query_caps, __args) +#define stmmac_tc_setup_mqprio(__priv, __args...) \ + stmmac_do_callback(__priv, tc, setup_mqprio, __args) struct stmmac_counters; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 9b1cf81c50ea..a5e3316bc410 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -6256,6 +6256,8 @@ static int stmmac_setup_tc(struct net_device *ndev, enum tc_setup_type type, switch (type) { case TC_QUERY_CAPS: return stmmac_tc_query_caps(priv, priv, type_data); + case TC_SETUP_QDISC_MQPRIO: + return stmmac_tc_setup_mqprio(priv, priv, type_data); case TC_SETUP_BLOCK: return flow_block_cb_setup_simple(type_data, &stmmac_block_cb_list, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 996f2bcd07a2..494fe2f68300 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -1198,6 +1198,13 @@ static int tc_query_caps(struct stmmac_priv *priv, struct tc_query_caps_base *base) { switch (base->type) { + case TC_SETUP_QDISC_MQPRIO: { + struct tc_mqprio_caps *caps = base->caps; + + caps->validate_queue_counts = true; + + return 0; + } case TC_SETUP_QDISC_TAPRIO: { struct tc_taprio_caps *caps = base->caps; @@ -1214,6 +1221,59 @@ static int tc_query_caps(struct stmmac_priv *priv, } } +static void stmmac_reset_tc_mqprio(struct net_device *ndev) +{ + struct stmmac_priv *priv = netdev_priv(ndev); + + netdev_reset_tc(ndev); + netif_set_real_num_tx_queues(ndev, priv->plat->tx_queues_to_use); + + stmmac_fpe_set_preemptible_tcs(priv, priv->ioaddr, 0); +} + +static int tc_setup_mqprio(struct stmmac_priv *priv, + struct tc_mqprio_qopt_offload *mqprio) +{ + struct tc_mqprio_qopt *qopt = &mqprio->qopt; + struct net_device *ndev = priv->dev; + int num_stack_tx_queues = 0; + int num_tc = qopt->num_tc; + int offset, count; + int tc, err; + + if (!num_tc) { + stmmac_reset_tc_mqprio(ndev); + return 0; + } + + err = netdev_set_num_tc(ndev, num_tc); + if (err) + return err; + + for (tc = 0; tc < num_tc; tc++) { + offset = qopt->offset[tc]; + count = qopt->count[tc]; + num_stack_tx_queues += count; + + err = netdev_set_tc_queue(ndev, tc, count, offset); + if (err) + goto err_reset_tc; + } + + err = netif_set_real_num_tx_queues(ndev, num_stack_tx_queues); + if (err) + goto err_reset_tc; + + stmmac_fpe_set_preemptible_tcs(priv, priv->ioaddr, mqprio->preemptible_tcs); + + return 0; + +err_reset_tc: + stmmac_reset_tc_mqprio(ndev); + + return err; +} + const struct stmmac_tc_ops dwmac510_tc_ops = { .init = tc_init, .setup_cls_u32 = tc_setup_cls_u32, @@ -1222,4 +1282,5 @@ const struct stmmac_tc_ops dwmac510_tc_ops = { .setup_taprio = tc_setup_taprio, .setup_etf = tc_setup_etf, .query_caps = tc_query_caps, + .setup_mqprio = tc_setup_mqprio, }; From patchwork Wed Jul 31 10:43:14 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: 13748472 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 668CDC3DA64 for ; Wed, 31 Jul 2024 10:45:56 +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=RikSfSLSzK3NY5MUlBg8b34sVeLezToR4ZzwAPjg5Sw=; b=w28Xng7zbVFukdxH40LsKnEK5Q TUgAcsIXC696/VQiZRiaDoEOaUlYiWuRoRg2Z6GhrfpECr4KomESbtmO0o/bFJ8rUxzePyTHA+c7C OeC46bSSnU+6WDs43eaaQ4nhGOLSrBxHSKy4eMkFQPd4z52eEmdyPr/xjoiSjF3rXVNOzPMxC0EJp lCCWqRBZwaQUGAbwVUYuwLcuo5X2c0Dz/4dLY7B+wlnGIf7HVjHJnvs43CjpSPWSuDg28wSZ33iTD d+anH5OnShJhVucTyvqHB+OsdKt+xVC1FjLxhLXdK3EmVoCLdwg5eijoV6vmBQnQp/BFuBZy0Yra1 YKcbkBJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6q1-00000000m3o-36JW; Wed, 31 Jul 2024 10:45:45 +0000 Received: from mail-ot1-x331.google.com ([2607:f8b0:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6od-00000000lX6-3uHz for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 10:44:21 +0000 Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-70945a007f0so2595158a34.2 for ; Wed, 31 Jul 2024 03:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722422659; x=1723027459; 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=RikSfSLSzK3NY5MUlBg8b34sVeLezToR4ZzwAPjg5Sw=; b=gtsR8UOATl+nhYKuiJNe5AmL07+CwgYnIQM6/rsgChgtWBU0HvxW71/922x1QrF34+ CpuK9/0+EhqYgVzlToALcIWIYeT/5pCxl9W7Q+afLFaarI62um5IGCxt+K72WYxK0uTx 53bdoQUQO7ol/Nidc3mpRfIrg1Mhy0EqTT20dbf4S00HhKsJh8NPFjUyVSQyIwe89bxj wBas2NfAm8hlvhCAQIRlFah1zxPHa4mejWrf0QhxsxU79lc+U5CgEYEhuRCc2e2GCG0t 3Kaz19HevY8RgA3WGMM07iNnb/Rbne6C2FqLZqw4jDt8qrbIlbKMIKVUyIM4Xfds/bDn ymOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722422659; x=1723027459; 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=RikSfSLSzK3NY5MUlBg8b34sVeLezToR4ZzwAPjg5Sw=; b=sLxHnVmt/zdJhh5MaNWTsd6/mMDlT9Xz+jz9eyx/ua+IlZGAMd0xO0D/etMmgjwgxE OMCQ7IjgG0ezBzR4FdVXbf+33ru2VkRZ5cOVy8oEio9UHrP3xvFHG1Z+Vj6jAGQEJJva Uh3r9rmEeQqUL2r6grGcBuQMs5RyXUXaGzeUnf/yp4LJGl3x6JM86kxj546FVOKgdXJf qaFSY+N5NSMUq/T7h9htSqMI4ckp+c8gyE84zXBdO2Nan0zBbIoQqWuTvCkH/FzuXg7K CAMGHrNwCdMIZcB9X6FUUhWIZkdQa4LMWcoiU3FAvd9IJVbuqgxfzi3SnI6OB19SW/a3 Wdig== X-Forwarded-Encrypted: i=1; AJvYcCW7Oqd2ApfbJT9A36/ACzYSAEGqFJriRA218V5RvJ6SOiYFRs8k/TYMkPNu12cmCtIExOYnYdyvX3CZ+a7K3O+/4TJ41rA9Hp7pemYb6BQU/pQnQ1k= X-Gm-Message-State: AOJu0Yw2OI5S12JIhIdFb9dfC1mm17CkCdvfLoBLtUhm+1e/j/MyaCdV l3f5SRGy+hUVziV0Us6Oz7d5fFdeg6zfbcK8uZuS/0uDK14Ud08H X-Google-Smtp-Source: AGHT+IE2jiVapYwFvA5Ymfuzc66v1gbK3DosbYWq6PakXzXkcZhsXP+tkGA7JHLN1NMmna4+AcYEmA== X-Received: by 2002:a05:6358:d3aa:b0:1af:1b40:5357 with SMTP id e5c5f4694b2df-1af1b405467mr466369255d.24.1722422658533; Wed, 31 Jul 2024 03:44:18 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-7a9f816da59sm8791375a12.29.2024.07.31.03.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 03:44:17 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: 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 v1 3/5] net: stmmac: support fp parameter of tc-taprio Date: Wed, 31 Jul 2024 18:43:14 +0800 Message-Id: <4603a4f68616ce41aca97bac2f55e5d51c865f53.1722421644.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-20240731_034419_995747_63AFACFF X-CRM114-Status: GOOD ( 12.45 ) 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 tc-taprio can select whether traffic classes are express or preemptible. After some traffic tests, MAC merge layer statistics are all good. Local device: ethtool --include-statistics --json --show-mm eth1 [ { "ifname": "eth1", "pmac-enabled": true, "tx-enabled": true, "tx-active": true, "tx-min-frag-size": 60, "rx-min-frag-size": 60, "verify-enabled": true, "verify-time": 100, "max-verify-time": 128, "verify-status": "SUCCEEDED", "statistics": { "MACMergeFrameAssErrorCount": 0, "MACMergeFrameSmdErrorCount": 0, "MACMergeFrameAssOkCount": 0, "MACMergeFragCountRx": 0, "MACMergeFragCountTx": 1398, "MACMergeHoldCount": 15783 } } ] Remote device: ethtool --include-statistics --json --show-mm eth1 [ { "ifname": "eth1", "pmac-enabled": true, "tx-enabled": true, "tx-active": true, "tx-min-frag-size": 60, "rx-min-frag-size": 60, "verify-enabled": true, "verify-time": 100, "max-verify-time": 128, "verify-status": "SUCCEEDED", "statistics": { "MACMergeFrameAssErrorCount": 0, "MACMergeFrameSmdErrorCount": 0, "MACMergeFrameAssOkCount": 1388, "MACMergeFragCountRx": 1398, "MACMergeFragCountTx": 0, "MACMergeHoldCount": 0 } } ] Tested on DWMAC CORE 5.10a Signed-off-by: Furong Xu <0x1207@gmail.com> --- .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 494fe2f68300..eeb5eb453b98 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -943,7 +943,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv, u32 size, wid = priv->dma_cap.estwid, dep = priv->dma_cap.estdep; struct timespec64 time, current_time, qopt_time; ktime_t current_time_ns; - bool fpe = false; int i, ret = 0; u64 ctr; @@ -1028,16 +1027,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv, switch (qopt->entries[i].command) { case TC_TAPRIO_CMD_SET_GATES: - if (fpe) - return -EINVAL; - break; - case TC_TAPRIO_CMD_SET_AND_HOLD: - gates |= BIT(0); - fpe = true; - break; - case TC_TAPRIO_CMD_SET_AND_RELEASE: - gates &= ~BIT(0); - fpe = true; break; default: return -EOPNOTSUPP; @@ -1068,16 +1057,11 @@ static int tc_taprio_configure(struct stmmac_priv *priv, tc_taprio_map_maxsdu_txq(priv, qopt); - if (fpe && !priv->dma_cap.fpesel) { + if (qopt->mqprio.preemptible_tcs && !priv->dma_cap.fpesel) { mutex_unlock(&priv->est_lock); return -EOPNOTSUPP; } - /* Actual FPE register configuration will be done after FPE handshake - * is success. - */ - priv->plat->fpe_cfg->enable = fpe; - ret = stmmac_est_configure(priv, priv, priv->est, priv->plat->clk_ptp_rate); mutex_unlock(&priv->est_lock); @@ -1088,10 +1072,7 @@ 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"); - } + stmmac_fpe_set_preemptible_tcs(priv, priv->ioaddr, qopt->mqprio.preemptible_tcs); return 0; @@ -1109,16 +1090,7 @@ static int tc_taprio_configure(struct stmmac_priv *priv, mutex_unlock(&priv->est_lock); } - priv->plat->fpe_cfg->enable = false; - stmmac_fpe_configure(priv, priv->ioaddr, - priv->plat->fpe_cfg, - priv->plat->tx_queues_to_use, - priv->plat->rx_queues_to_use, - false); - netdev_info(priv->dev, "disabled FPE\n"); - - stmmac_fpe_handshake(priv, false); - netdev_info(priv->dev, "stop FPE handshake\n"); + stmmac_fpe_set_preemptible_tcs(priv, priv->ioaddr, 0); return ret; } From patchwork Wed Jul 31 10:43:15 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: 13748473 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 2F219C3DA64 for ; Wed, 31 Jul 2024 10:46:20 +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=DPGHY6v5CIr+Eb9z9smFgMyzujoybq7sK/FaJAiXSc0=; b=1j/AKAjm6Q28w/oWrCyEgJ9Y7l mWGRjNqpR614/8oSG2IDKaki4b2RUTY8NpHwz4i2r2zlmM3BWYeg/bOBQ9Eg5lObd2rc7KSBa3amp FjSJH2PxOTFV0zXePYZO8fAH7EqvyuwyDRcIbro/h28D6yqg0hgVxL0uld3jVl389J8L3qT4dqDmY dU7mazQtChjl7Tf98pgxIJxcV2qhUV/XCqiSTqTxg5YScKHrmOlrD4OqPaqjM12P++a2tewutT1aU R8pB3kO4xwuf3fy4dSCgpysvrXxC43q0Oplp03c/hficbEwy7sfDgI/602/FRKeSdYDU8gxGtFqem uLMUhitQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6qR-00000000mA5-0urb; Wed, 31 Jul 2024 10:46:11 +0000 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6on-00000000lb1-18EE for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 10:44:30 +0000 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-70ea2f25bfaso3975415b3a.1 for ; Wed, 31 Jul 2024 03:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722422668; x=1723027468; 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=DPGHY6v5CIr+Eb9z9smFgMyzujoybq7sK/FaJAiXSc0=; b=keIndLBJyDyjrWBLDYbiI+seXp3poYHiUHU6KJ0ItFXsOUTakOipzfHF/xG3SaQ0yW X4oew4/WqwPzuxYASRx4wADFI49s9St3SFNzYh6GECJ9rcOXUWAjdx97l5y9irwD5+km I+wg0ZrFp1vR0it7uKjkT369e1IFAgirCH0iLHH7V7OnC++U6JLHH8XuamXwBlkGQ47r iUmTBXEbaKsZMh1TyiLQzlOQZv8GpER6UXnKhzF5+K8OImeh776XC4ckiuJP2thLoLb2 jR5hvqb4qKuMd3mX3YetanZQzm+xzNUahhCOTE9RSQsYV9IftPUut/466/VoUOGQ6rho EkvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722422668; x=1723027468; 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=DPGHY6v5CIr+Eb9z9smFgMyzujoybq7sK/FaJAiXSc0=; b=u2jCTY3YtFM30JBWiCIUpXzxUtTd39/lEvTSOjig/fznT8XlceOELKsnq3d2uehFNz zY4m14cMu8eeU7fdE3mDExXvm+Brfr1/4gvwwFk+3TseWQJg8nNHrBjqxJhIa6LXJvyN +mNTH2gh1RaHbPWUZlnBXRFer7MvLMn/yDZZiBKsQXKvU2dYJCSio2aE9A4dxIRo9D2O iA7PJRKTuxFx/Zc6ac4bEMlBai1OkNeN7VFAocd3uU/ACToNar4FM086xHEZw6up57nb WcA1MVmuLD7Y6OLFUiUk9BRkh5pXgnYVs0WKRx2NAPGpVgJJS+vuja8skEVU+sglPRg+ uOeA== X-Forwarded-Encrypted: i=1; AJvYcCW3I7NEY5hq+ggq6TgbR1koju2qcTzgq3aXc1adtOfhxRcgmXZBx9Hr0KKMgCe0wBsR5Ur6SWtwzMaU6M2e+TDgDbwnQq1lCtnfof0KfSa00Rn29Ws= X-Gm-Message-State: AOJu0YwbA3TONNp614sAXpCyW/n7cAQgVwHf5ybMS1qfNkyNgWuN7d7I uY+U2ovbnivBq0JdDlapXGsbfGoR9oAYHKwJ+lTUoy7nHTqQ5PShZuGS1A== X-Google-Smtp-Source: AGHT+IFTctTZ1qQ55uQCVBFKWaKO8LVEq4OqBYk1wWdf3UiDgyEsaVyIy02DJQJqJ0/PrRnYWTUxGA== X-Received: by 2002:a05:6a00:21c9:b0:70e:a4ef:e5c2 with SMTP id d2e1a72fcca58-70ecea30033mr13327588b3a.13.1722422668091; Wed, 31 Jul 2024 03:44:28 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-7a9f816da59sm8791375a12.29.2024.07.31.03.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 03:44:27 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: 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 v1 4/5] net: stmmac: drop unneeded FPE handshake code Date: Wed, 31 Jul 2024 18:43:15 +0800 Message-Id: <62d2b178672ced64f98d51bff17006728e77dea9.1722421644.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-20240731_034429_353648_C023CA22 X-CRM114-Status: GOOD ( 12.60 ) 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 FPE is configured via ethtool-mm, the hardcoded way shall be no more. Signed-off-by: Furong Xu <0x1207@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +----- include/linux/stmmac.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index a5e3316bc410..fba44bd1990a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3532,13 +3532,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->plat->fpe_cfg->enable) - stmmac_fpe_handshake(priv, true); - } - return 0; } diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 707a6916e51a..66eb4627bd47 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -157,7 +157,6 @@ enum stmmac_fpe_task_state_t { }; struct stmmac_fpe_cfg { - bool enable; /* FPE enable */ bool hs_enable; /* FPE handshake enable */ enum stmmac_fpe_state lp_fpe_state; /* Link Partner FPE state */ enum stmmac_fpe_state lo_fpe_state; /* Local station FPE state */ From patchwork Wed Jul 31 10:43:16 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: 13748505 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 5F1F6C3DA64 for ; Wed, 31 Jul 2024 10:46:49 +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=fu1ouNnrG9bF+uAnA7GwZya1Ys3715c6hhI6EtcZ2RA=; b=uWWYOqSK5Lebj3JtvHhNtzmxqg /gE+TM3tSZBDW6S46C36mFOun+10xyklV/6YUXzCGFZWix6gviQElk0L49MMytmOnCfHXX38lcRBG 4IrnBo1HmfhDVFrUr3l2FCr6Eg5Rl9DzkmrWC+Wr9OHYpbZckgXNnWMsQfyxunV/vsQkUf+q3Ayhx VaxMtOLatVIipW4CH6/qOzBa/wNrR1OIeXijYxjKput5Bq4C5UbCODV+p75QvuYTvbc+RJfjp+M/y Uf2MgIP+26EUF3H1Ip0puchAPkAe+aQl+/cjcWFXyW02WoTaHBpwJJL7hMI+odyiWbJRXNqx8UsF+ v95e5qGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6qr-00000000mFT-2OOU; Wed, 31 Jul 2024 10:46:37 +0000 Received: from mail-oa1-x35.google.com ([2001:4860:4864:20::35]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ6ox-00000000le7-05Rj for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 10:44:41 +0000 Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-26106ec9336so3079657fac.2 for ; Wed, 31 Jul 2024 03:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722422678; x=1723027478; 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=fu1ouNnrG9bF+uAnA7GwZya1Ys3715c6hhI6EtcZ2RA=; b=PiXG4Odr3vHfa4p3TJ4uTt5Oc4mcJ9N46re1a8q8GAWvgheiISYcW2CgBgsP3j2Jkt KhtbA3V/XfDYS9DnyYPR1691UwkW3Sc1z+XsgoPOS1GDLHLCD3TvBwbOAxf7BygigW+7 EhW/00/ukVJ6HVu+VGt3OjoYN564AyVXCCFOOzex0UXW2BTUQoxeL7EJe2J8Qmf0bW7P 0wDoXhMUEdT3WBPSlMkwfrYCKotFUalkBA6i1TwiNGEFrm9nM0ZvU8/2gZ/8RIxLQ/ZP +taWe5b/7DzdHAzjK63pG1j8wrNd7YhCye1k1aY82HISxH4Rx5S+PEr14a1gvZmp9+kU 5ZEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722422678; x=1723027478; 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=fu1ouNnrG9bF+uAnA7GwZya1Ys3715c6hhI6EtcZ2RA=; b=md9DEz2yuU6s3vUXqKGi8Cg+wDE2MikLsXEFFOPHZxqBGUrvphl52tM2x0gwxtrG9j S1LrpqgbMO3n64yWhmuT1toA3CgqbVKUdz+Rkq9T/419fAJGX/DEIeG9IQgdUXN1vegV UGPgS5cVikCsO+9pWn6W7Bv4MciDWMr2kX/hCAk7AG/HWsdb84EtTz9mmYUCUwBEaakv c99zgdcE0/BOgw/PDBoyhuR13CKsvWAyURtHtqRyeF1qUB2IbLGxYu/zcONbu9Fq5KIV 1sen5iCqypGDL3fMRiZX6hKt8PuTJs88Ved1PLtjfk66yehKoHGutzocFNDFxO1ovgYt oE9g== X-Forwarded-Encrypted: i=1; AJvYcCX43Lm7BFARlJrMFtkckZpBAKTs3OiqfyPo+riDUxB1Tk6NN7yapEdqTUX7Ps1eh62VMRMIgmptTyPoRS0+eNaO2sXV0dQsm1zGovsuK00+Gi1dQ3o= X-Gm-Message-State: AOJu0Yz2Z3wMz0WIeHKbbvQeZZ+eLUrnRQVuUHylmbn6N07uhux8cuj3 0xncRE3HeIOJ+6Iy/9wHSklkv0m/VUt0asN3JR5m3wPpNrgMWHCk/39n1A== X-Google-Smtp-Source: AGHT+IEvFA1K3zu3i0XikbrUbT49e6jRM+kXTRxXXH210S3QRwo16GCTK94T7ErsdT4YoniWaIZ6jg== X-Received: by 2002:a05:6870:e244:b0:25e:7a9:b603 with SMTP id 586e51a60fabf-267d4ccf5a4mr14061153fac.5.1722422677818; Wed, 31 Jul 2024 03:44:37 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-7a9f816da59sm8791375a12.29.2024.07.31.03.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 03:44:37 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: 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 v1 5/5] net: stmmac: silence FPE kernel logs Date: Wed, 31 Jul 2024 18:43:16 +0800 Message-Id: <370d89a46a15856856c601e1c8036cbb4bc7bb4e.1722421644.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-20240731_034439_088408_48A8A05D X-CRM114-Status: GOOD ( 12.45 ) 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 --show-mm can get real-time state of FPE. Those kernel logs should keep quiet. Signed-off-by: Furong Xu <0x1207@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 8 ++++---- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 068859284691..3abacd863fe4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -605,22 +605,22 @@ int dwmac5_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev) if (value & TRSP) { status |= FPE_EVENT_TRSP; - netdev_info(dev, "FPE: Respond mPacket is transmitted\n"); + netdev_dbg(dev, "FPE: Respond mPacket is transmitted\n"); } if (value & TVER) { status |= FPE_EVENT_TVER; - netdev_info(dev, "FPE: Verify mPacket is transmitted\n"); + netdev_dbg(dev, "FPE: Verify mPacket is transmitted\n"); } if (value & RRSP) { status |= FPE_EVENT_RRSP; - netdev_info(dev, "FPE: Respond mPacket is received\n"); + netdev_dbg(dev, "FPE: Respond mPacket is received\n"); } if (value & RVER) { status |= FPE_EVENT_RVER; - netdev_info(dev, "FPE: Verify mPacket is received\n"); + netdev_dbg(dev, "FPE: Verify mPacket is received\n"); } return status; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index fba44bd1990a..5531c26cba34 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7392,19 +7392,19 @@ static void stmmac_fpe_lp_task(struct work_struct *work) if (*lo_state == FPE_STATE_ENTERING_ON && *lp_state == FPE_STATE_ENTERING_ON) { - netdev_info(priv->dev, "configured FPE\n"); + netdev_dbg(priv->dev, "configured FPE\n"); *lo_state = FPE_STATE_ON; *lp_state = FPE_STATE_ON; - netdev_info(priv->dev, "!!! BOTH FPE stations ON\n"); + netdev_dbg(priv->dev, "!!! BOTH FPE stations ON\n"); break; } if ((*lo_state == FPE_STATE_CAPABLE || *lo_state == FPE_STATE_ENTERING_ON) && *lp_state != FPE_STATE_ON) { - netdev_info(priv->dev, SEND_VERIFY_MPAKCET_FMT, - *lo_state, *lp_state); + netdev_dbg(priv->dev, SEND_VERIFY_MPAKCET_FMT, + *lo_state, *lp_state); stmmac_fpe_send_mpacket(priv, priv->ioaddr, fpe_cfg, MPACKET_VERIFY);