From: Greg Kroah-Hartman Date: Wed, 14 Feb 2024 14:22:47 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v6.1.78~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e878a82f74971b06f1523b50660fe1d1ceb6a098;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch --- diff --git a/queue-5.10/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch b/queue-5.10/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch new file mode 100644 index 00000000000..71f10bbbac4 --- /dev/null +++ b/queue-5.10/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 +Link: https://lore.kernel.org/r/20240203053133.1129236-1-0x1207@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -883,7 +883,7 @@ static int dwxgmac3_safety_feat_config(v + /* 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.10/series b/queue-5.10/series index a66ab3b1baf..f1fc6edb246 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -282,3 +282,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