5.15-stable patches

added patches:
	net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch

diff --git a/queue-5.15/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch b/queue-5.15/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch
new file mode 100644 (file)
index 0000000..22e28e4
--- /dev/null
+++ b/queue-5.15/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch
@@ -0,0 +1,50 @@
+From 1ce2654d87e2fb91fea83b288bd9b2641045e42a Mon Sep 17 00:00:00 2001
+From: Furong Xu <0x1207@gmail.com>
+Date: Sat, 3 Feb 2024 13:31:33 +0800
+Subject: net: stmmac: xgmac: fix a typo of register name in DPP safety handling
+
+From: Furong Xu <0x1207@gmail.com>
+
+commit 1ce2654d87e2fb91fea83b288bd9b2641045e42a upstream.
+
+DDPP is copied from Synopsys Data book:
+
+DDPP: Disable Data path Parity Protection.
+    When it is 0x0, Data path Parity Protection is enabled.
+    When it is 0x1, Data path Parity Protection is disabled.
+
+The macro name should be XGMAC_DPP_DISABLE.
+
+Fixes: 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels")
+Signed-off-by: Furong Xu <0x1207@gmail.com>
+Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
+Link: https://lore.kernel.org/r/20240203053133.1129236-1-0x1207@gmail.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h      |    2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
++++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
+@@ -283,7 +283,7 @@
+ #define XGMAC_TXCEIE                  BIT(0)
+ #define XGMAC_MTL_ECC_INT_STATUS      0x000010cc
+ #define XGMAC_MTL_DPP_CONTROL         0x000010e0
+-#define XGMAC_DDPP_DISABLE            BIT(0)
++#define XGMAC_DPP_DISABLE             BIT(0)
+ #define XGMAC_MTL_TXQ_OPMODE(x)               (0x00001100 + (0x80 * (x)))
+ #define XGMAC_TQS                     GENMASK(25, 16)
+ #define XGMAC_TQS_SHIFT                       16
+--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
++++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
+@@ -886,7 +886,7 @@ dwxgmac3_safety_feat_config(void __iomem
+       /* 5. Enable Data Path Parity Protection */
+       value = readl(ioaddr + XGMAC_MTL_DPP_CONTROL);
+       /* already enabled by default, explicit enable it again */
+-      value &= ~XGMAC_DDPP_DISABLE;
++      value &= ~XGMAC_DPP_DISABLE;
+       writel(value, ioaddr + XGMAC_MTL_DPP_CONTROL);
+ 
+       return 0;

diff --git a/queue-5.15/series b/queue-5.15/series
index a6faf208b19b89c1a67629be8079e6d8b6883f3d..3fa3d917c6eb903c0d4ccccd5fb0612f621943df 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -350,3 +350,4 @@ input-atkbd-skip-atkbd_cmd_setleds-when-skipping-atkbd_cmd_getid.patch
 vhost-use-kzalloc-instead-of-kmalloc-followed-by-memset.patch
 clocksource-skip-watchdog-check-for-large-watchdog-intervals.patch
 net-stmmac-xgmac-use-define-for-string-constants.patch
+net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch