From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3C2C606A325 for ; Wed, 18 Nov 2026 02:55:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=D5qSygXJ; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=kJW4mxFQ 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: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:In-Reply-To:References: List-Unsubscribe-Post:List-Owner; bh=Cc1CenNSOFeQKanbwZUmn2fS8ubg1Oyl3pgDvfLoRhU=; b=D5qSygXJk8c1kKJ3QC4D8COqwP xwprL4VtyzT2F2euaWJbIQB1FSEUmd5iLHinhOUV+1VdB9MK7VkpXEc4nvvENoOskl/1UvsmoZ9V1 c4D241faUTSDWOgjS+OD6MZhFnR3B+IhrmslbPbkdOIUD3IClZ5kPs2DeI4nW7snhLp1lvYXDq5wC T9mEl8NzCrXGoU5ZBmHo4hIFB64AwyruqsRkMkkUWdINvvXEuawh3MNBnZybpnBN6XB47iEP680LO wchIerMUThn6CC18026isVhubCD5Io4NwmM17P7rLoocKAlZyPj95ONQgwdlNqHSkBaIvYWbULaGO g+p0zJSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTVpl-00000007Z54-1Jdv; Wed, 18 Nov 2026 02:55:41 +0000 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTVpg-00000007Z4g-17MA for linux-arm-kernel@lists.infradead.org; Wed, 18 Nov 2026 02:55:38 +0000 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-8a070781f63so245680b3a.1 for ; Tue, 17 Nov 2026 18:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794970535; x=1795575335; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Cc1CenNSOFeQKanbwZUmn2fS8ubg1Oyl3pgDvfLoRhU=; b=kJW4mxFQ1awuM85yUKRxQmmIiHC7YKkgRmRLXVaeE01hoTGCefR1ipPFDgyef9BY99 z4EXBGfsKm+aOU65NO9tFRuVy1+9qYyWPbavBd+4xUjBHYPkIfI1/zVSWt5uZHXobdcC tY4j/P7v21kUB1M1TRfgZlclIPFEF32IVYs/SL8XMZuLak8lhu34Yyu5bIsjnOw2kHBo xKAXCPn3A/NcQXBU0bqwfVBrRP9Vfgz3r2oBwg15sFMyMaeO8jKT44MDAzlW+4xPGt4H vUTOfU4v8bR81+aJqSu/6HGK56m1ps/vP+q3Q9+ZHjsnqzgJGysJ2YDsk8ymHBr8CF0d bd5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794970535; x=1795575335; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Cc1CenNSOFeQKanbwZUmn2fS8ubg1Oyl3pgDvfLoRhU=; b=kf9DOWVPdToTYCNoW12EafIticxmJFGNgu5Y3Dtex+Jwib8eGBCePlMI4hTwNN6Mwi w6oUCqoogdUmh9nF7ULtwqzhkiZchisEkC7IUe3ll0haU8XPGGFt9fShSx5Yyajslbcj JwkeBogOWvwMM0mCxsrjunRzmcf8cXnfk9x3VXrxH31L+lW8VLVUzRHlJHOz3jvGdYHb eAmsfZ9kf5ztIHa8xOCfBeIWxywO7mZNV919S9nXuQGLkuCPAZ5KZiX6ZIK/Q+ZhazNt 8IgQQAd56Z8zMba9YC8l8QMZD/zWqUcaSm3PrFRXAW6+1XSNy3KFoNPgZf6T8v8lUEyl ndqw== X-Forwarded-Encrypted: i=1; AL+hErHg3RTeyKBwKbUaa+DB9ZF0Go1TiFGroutbQ+/mhltzyg0sK2VElNfZphjr7UlT28911feF6NFL+TRAGyWByxl/@lists.infradead.org X-Gm-Message-State: APuU4Z8V5XdIEgYZ+ShenzOBtwPGyQ1WHvjZA5q2nOf1jMgXhi4PIPQS uT1+NhhDWXIupvRjce7bW0RfVCk2R5fM4YF5lzDAPx1ipNf6zS/tzlnn X-Gm-Gg: AYBFou1+qxHLZotB6Ubog92KHZGh6itFnHO5W52+Y+WAW1l8gciufilFLMXKireYz0E I2vbQ+opJScdIY/rWzJ2u1N3Lvk9qYRFfYbtDAT6afSMI1KfNrtsedMtj+ykRUNvJPDf0K85qNw p8EA5xnZJYPs5wkOdR7br5I8ca7o6MybeY1G2c2K3j1MkSLTfN2ys6s8ZxbYDhxsPYTxoerhtAM xIJh/64h1GCOa6JNn9s0kRnDpeVnAnwu/HHYdtmflKIoDE2NF4WGGF3f3MMeos8u/oqLfFz6Ef8 YTPVC2ypaQDVyArGVauDJSBArktD3+uKf5z6D9oghGXROGOverdv2v7M2SdQqf6bnsHigVJx7Ho C6XcU7s5QTJ55WyVctpbioJvrZsw1IJbbHaj/GlwiweKSBmPoFzLnw8zdVSeI6vtBvV8FDIqVnZ MZaseAH4ipnaHNxY72/dtvzTVxrlrJtIfl/TBslhTKcmoRqV1Z3DoeUXtgozzIVEuOvC3RMlcv3 xGJgi5xLnC371NaVvU7i5JuJOpSZp71+ttBeqbKapZFnKx91whBmcu685EmGeN/DjrYn0jbtd6B lX3EW1UVpKloIYbHH+qO+OYpNv+3 X-Received: by 2002:a05:6a21:880a:b0:3fb:6e73:ce48 with SMTP id adf61e73a8af0-3fe980f7b76mr958069637.48.1794970534917; Tue, 17 Nov 2026 18:55:34 -0800 (PST) Received: from server227.. ([39.170.101.209]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cde3af30db8sm304885a12.1.2026.11.17.18.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 18:55:34 -0800 (PST) From: Zxyan Zhu To: maxime.chevallier@bootlin.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, rmk+kernel@armlinux.org.uk, Zxyan Zhu Subject: [PATCH net-next v4] net: stmmac: program the FSM timeout timer Date: Wed, 18 Nov 2026 10:55:28 +0800 Message-Id: <20261118025528.2703790-1-zxyan0222@gmail.com> X-Mailer: git-send-email 2.34.1 X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261117_185536_342820_4499E86D X-CRM114-Status: GOOD ( 21.83 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 stmmac enables the FSM timeout checker (TMOUTEN) but never programs the MAC_FSM_ACT_Timer register. Per the databook the checker only fires once NTMRMD is programmed with a non-zero duration; NTMRMD == 0 disables the timer, so with TMOUTEN set but the timer left at reset a stuck FSM is never reported and the advertised timeout protection is ineffective. Program MAC_FSM_ACT_Timer right after TMOUTEN is enabled, deriving the TMR field (CSR clocks per 1us tic) from the CSR clock rate and using a 1s timeout. The NTMRMD field holds a power-of-two microsecond timeout per the databook: 0x0 disables it, and 0x1..0xa encode 1us, 1.024ms (~1ms), 16.384ms (~16ms), 65.536ms (~64ms), 262.144ms (~256ms), 1.048s (~1s), 4.194s (~4s), 16.777s (~16s), 33.554s (~32s), 67.108s (~64s). The issue was hit in testing on dwmac4 and dwxgmac, where a stuck FSM was not reported through the safety interrupt despite TMOUTEN being set. Signed-off-by: Zxyan Zhu --- v4: - Drop the warning on a missing CSR clock. - Drop the ntmrmd field and hardcode the 1s timeout (NTMRMD = 0x6). v3: https://lore.kernel.org/netdev/20261116114923.1157920-1-zxyan0222@gmail.com/ v2: https://lore.kernel.org/netdev/20261112053321.1103678-1-zxyan0222@gmail.com/ v1: https://lore.kernel.org/netdev/20261111143322.2234321-1-zxyan0222@gmail.com/ drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 17 ++++++++++++++++- drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 6 +++++- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 +++ .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 18 +++++++++++++++++- drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 ++- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 8 +++++++- include/linux/stmmac.h | 12 ++++++++++++ 7 files changed, 62 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index f1bb981cab7c..5cf5139f442a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -2,6 +2,7 @@ // Copyright (c) 2017 Synopsys, Inc. and/or its affiliates. // stmmac Support for 5.xx Ethernet QoS cores +#include #include #include #include "common.h" @@ -184,7 +185,8 @@ static void dwmac5_handle_dma_err(struct net_device *ndev, } int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp, - struct stmmac_safety_feature_cfg *safety_feat_cfg) + struct stmmac_safety_feature_cfg *safety_feat_cfg, + unsigned int csr_clk_mhz) { struct stmmac_safety_feature_cfg all_safety_feats = { .tsoee = 1, @@ -245,6 +247,19 @@ int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp, value |= TMOUTEN; /* FSM Timeout Feature */ writel(value, ioaddr + MAC_FSM_CONTROL); + /* Program the FSM active timer so the timeout checker actually fires. + * TMR is the number of CSR clocks per 1us tic, i.e. csr_clk in MHz. + * Use a 1s timeout. + */ + if (safety_feat_cfg->tmouten && csr_clk_mhz) { + value = readl(ioaddr + MAC_FSM_ACT_TIMER); + value &= ~(MAC_FSM_ACT_TIMER_NTMRMD | MAC_FSM_ACT_TIMER_TMR); + value |= FIELD_PREP(MAC_FSM_ACT_TIMER_NTMRMD, + STMMAC_NTMRMD_1SEC) | + FIELD_PREP(MAC_FSM_ACT_TIMER_TMR, csr_clk_mhz); + writel(value, ioaddr + MAC_FSM_ACT_TIMER); + } + /* 4. Enable Data Parity Protection */ value = readl(ioaddr + MTL_DPP_CONTROL); if (safety_feat_cfg->edpp) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h index 00b151b3b688..734e7630f28d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h @@ -8,8 +8,11 @@ #define MAC_DPP_FSM_INT_STATUS 0x00000140 #define MAC_AXI_SLV_DPE_ADDR_STATUS 0x00000144 #define MAC_FSM_CONTROL 0x00000148 +#define MAC_FSM_ACT_TIMER 0x0000014C #define PRTYEN BIT(1) #define TMOUTEN BIT(0) +#define MAC_FSM_ACT_TIMER_TMR GENMASK(9, 0) +#define MAC_FSM_ACT_TIMER_NTMRMD GENMASK(19, 16) #define MAC_PPS_CONTROL 0x00000b70 #define PPS_MAXIDX(x) ((((x) + 1) * 8) - 1) @@ -82,7 +85,8 @@ #define GMAC_INT_FPE_EN BIT(17) int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp, - struct stmmac_safety_feature_cfg *safety_cfg); + struct stmmac_safety_feature_cfg *safety_cfg, + unsigned int csr_clk_mhz); int dwmac5_safety_feat_irq_status(struct net_device *ndev, void __iomem *ioaddr, unsigned int asp, struct stmmac_safety_stats *stats); diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h index f8ab347f7b5b..1fd501728b18 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -169,8 +169,11 @@ #define XGMAC_HWFEAT_PCSEL GENMASK(1, 0) #define XGMAC_MAC_DPP_FSM_INT_STATUS 0x00000150 #define XGMAC_MAC_FSM_CONTROL 0x00000158 +#define XGMAC_MAC_FSM_ACT_TIMER 0x0000015C #define XGMAC_PRTYEN BIT(1) #define XGMAC_TMOUTEN BIT(0) +#define XGMAC_MAC_FSM_ACT_TIMER_TMR GENMASK(9, 0) +#define XGMAC_MAC_FSM_ACT_TIMER_NTMRMD GENMASK(19, 16) #define XGMAC_MDIO_ADDR 0x00000200 #define XGMAC_MDIO_DATA 0x00000204 #define XGMAC_MDIO_C22P 0x00000220 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index 7ad08651675e..3caab23527a1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -4,6 +4,7 @@ * stmmac XGMAC support. */ +#include #include #include #include @@ -837,7 +838,8 @@ static void dwxgmac3_handle_dma_err(struct net_device *ndev, static int dwxgmac3_safety_feat_config(void __iomem *ioaddr, unsigned int asp, - struct stmmac_safety_feature_cfg *safety_cfg) + struct stmmac_safety_feature_cfg *safety_cfg, + unsigned int csr_clk_mhz) { u32 value; @@ -873,6 +875,20 @@ dwxgmac3_safety_feat_config(void __iomem *ioaddr, unsigned int asp, value |= XGMAC_TMOUTEN; /* FSM Timeout Feature */ writel(value, ioaddr + XGMAC_MAC_FSM_CONTROL); + /* Program the FSM active timer so the timeout checker actually fires. + * TMR is the number of CSR clocks per 1us tic, i.e. csr_clk in MHz. + * Use a 1s timeout. + */ + if (safety_cfg && safety_cfg->tmouten && csr_clk_mhz) { + value = readl(ioaddr + XGMAC_MAC_FSM_ACT_TIMER); + value &= ~(XGMAC_MAC_FSM_ACT_TIMER_NTMRMD | + XGMAC_MAC_FSM_ACT_TIMER_TMR); + value |= FIELD_PREP(XGMAC_MAC_FSM_ACT_TIMER_NTMRMD, + STMMAC_NTMRMD_1SEC) | + FIELD_PREP(XGMAC_MAC_FSM_ACT_TIMER_TMR, csr_clk_mhz); + writel(value, ioaddr + XGMAC_MAC_FSM_ACT_TIMER); + } + /* 5. Enable Data Path Parity Protection */ value = readl(ioaddr + XGMAC_MTL_DPP_CONTROL); /* already enabled by default, explicit enable it again */ diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index 8ae95e91a36a..395655b01ea8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -378,7 +378,8 @@ struct stmmac_ops { bool srgmi_ral); /* Safety Features */ int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp, - struct stmmac_safety_feature_cfg *safety_cfg); + struct stmmac_safety_feature_cfg *safety_cfg, + unsigned int csr_clk_mhz); int (*safety_feat_irq_status)(struct net_device *ndev, void __iomem *ioaddr, unsigned int asp, struct stmmac_safety_stats *stats); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 4da728962638..5e5c54b58bee 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3691,10 +3691,16 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) static void stmmac_safety_feat_configuration(struct stmmac_priv *priv) { + unsigned int csr_clk_mhz = 0; + if (priv->dma_cap.asp) { netdev_info(priv->dev, "Enabling Safety Features\n"); + if (priv->plat->stmmac_clk) + csr_clk_mhz = clk_get_rate(priv->plat->stmmac_clk) / + 1000000; stmmac_safety_feat_config(priv, priv->ioaddr, priv->dma_cap.asp, - priv->plat->safety_feat_cfg); + priv->plat->safety_feat_cfg, + csr_clk_mhz); } else { netdev_info(priv->dev, "No Safety Features support found\n"); } diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 00be2df63d22..659f5db528d3 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -170,6 +170,18 @@ struct stmmac_safety_feature_cfg { u32 tmouten; }; +/* MAC_FSM_ACT_Timer.NTMRMD timeout durations */ +#define STMMAC_NTMRMD_1US 0x1 +#define STMMAC_NTMRMD_1MS 0x2 +#define STMMAC_NTMRMD_16MS 0x3 +#define STMMAC_NTMRMD_64MS 0x4 +#define STMMAC_NTMRMD_256MS 0x5 +#define STMMAC_NTMRMD_1SEC 0x6 +#define STMMAC_NTMRMD_4SEC 0x7 +#define STMMAC_NTMRMD_16SEC 0x8 +#define STMMAC_NTMRMD_32SEC 0x9 +#define STMMAC_NTMRMD_64SEC 0xa + /* Addresses that may be customized by a platform */ struct dwmac4_addrs { u32 dma_chan; -- 2.34.1