FAILED: patch "[PATCH] mmc: sdhci-of-dwcmshc: Prevent illegal clock reduction in" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 3009738a855cf938bbfc9078bec725031ae623a4
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026012749-barrier-oppressor-3ac6@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3009738a855cf938bbfc9078bec725031ae623a4 Mon Sep 17 00:00:00 2001
From: Shawn Lin <[email protected]>
Date: Mon, 22 Dec 2025 15:11:25 +0800
Subject: [PATCH] mmc: sdhci-of-dwcmshc: Prevent illegal clock reduction in
HS200/HS400 mode
When operating in HS200 or HS400 timing modes, reducing the clock frequency below 52MHz will lead to link broken as the Rockchip DWC MSHC controller requires maintaining a minimum clock of 52MHz in these modes.
Add a check to prevent illegal clock reduction through debugfs:
root@debian:/# echo 50000000 > /sys/kernel/debug/mmc0/clock root@debian:/# [ 30.090146] mmc0: running CQE recovery mmc0: cqhci: Failed to halt mmc0: cqhci: spurious TCN for tag 0 WARNING: drivers/mmc/host/cqhci-core.c:797 at cqhci_irq+0x254/0x818, CPU#1: kworker/1:0H/24 Modules linked in: CPU: 1 UID: 0 PID: 24 Comm: kworker/1:0H Not tainted 6.19.0-rc1-00001-g09db0998649d-dirty #204 PREEMPT Hardware name: Rockchip RK3588 EVB1 V10 Board (DT) Workqueue: kblockd blk_mq_run_work_fn pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : cqhci_irq+0x254/0x818 lr : cqhci_irq+0x254/0x818 ...
drivers/mmc/host/sdhci-of-dwcmshc.c +7 -0
@@ -739,6 +739,13 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clocksdhci_writel (host, extra, reg);if (clock <=52000000 ) { +if (host->mmc->ios.timing ==MMC_TIMING_MMC_HS200 || + host->mmc->ios.timing ==MMC_TIMING_MMC_HS400 ) { +dev_err (mmc_dev (host->mmc), +"Can't reduce the clock below 52MHz in HS200/HS400 mode" ); +return ; + } +/* * Disable DLL and reset both of sample and drive clock. * The bypass bit and start bit need to be set if DLL is not locked.
Sasha Levin
maintainerPATCH 1/2 mmc: sdhci-of-dwcmshc: Update DLL and pre-change delay for rockchip platform
From: Shawn Lin <[email protected]>
[ Upstream commit b75a52b0dda353aeefb4830a320589a363f49579 ]
For Rockchip platform, DLL bypass bit and start bit need to be set if DLL is not locked. And adjust pre-change delay to 0x3 for better signal test result.
Stable-dep-of: 3009738a855c ("mmc: sdhci-of-dwcmshc: Prevent illegal clock reduction in HS200/HS400 mode")
--- drivers/mmc/host/sdhci-of-dwcmshc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-of-dwcmshc.c +9 -4
@@ -48,6 +48,7 @@#define DWCMSHC_EMMC_DLL_RXCLK_SRCSEL 29#define DWCMSHC_EMMC_DLL_START_POINT 16#define DWCMSHC_EMMC_DLL_INC 8 +#define DWCMSHC_EMMC_DLL_BYPASS BIT(24)#define DWCMSHC_EMMC_DLL_DLYENA BIT(27)#define DLL_TXCLK_TAPNUM_DEFAULT 0x10#define DLL_TXCLK_TAPNUM_90_DEGREES 0xA
@@ -60,6 +61,7 @@#define DLL_RXCLK_NO_INVERTER 1#define DLL_RXCLK_INVERTER 0#define DLL_CMDOUT_TAPNUM_90_DEGREES 0x8 +#define DLL_RXCLK_ORI_GATE BIT(31)#define DLL_CMDOUT_TAPNUM_FROM_SW BIT(24)#define DLL_CMDOUT_SRC_CLK_NEG BIT(28)#define DLL_CMDOUT_EN_SRC_CLK_NEG BIT(29)
@@ -234,9 +236,12 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clocksdhci_writel (host, extra, reg);if (clock <=52000000 ) { -/* Disable DLL and reset both of sample and drive clock */ -sdhci_writel (host,0 ,DWCMSHC_EMMC_DLL_CTRL ); -sdhci_writel (host,0 ,DWCMSHC_EMMC_DLL_RXCLK ); +/* +* Disable DLL and reset both of sample and drive clock. +* The bypass bit and start bit need to be set if DLL is not locked. +*/ +sdhci_writel (host,DWCMSHC_EMMC_DLL_BYPASS |DWCMSHC_EMMC_DLL_START ,DWCMSHC_EMMC_DLL_CTRL ); +sdhci_writel (host,DLL_RXCLK_ORI_GATE ,DWCMSHC_EMMC_DLL_RXCLK );sdhci_writel (host,0 ,DWCMSHC_EMMC_DLL_TXCLK );sdhci_writel (host,0 ,DECMSHC_EMMC_DLL_CMDOUT );/*
@@ -279,7 +284,7 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock } extra =0x1 <<16 |/* tune clock stop en */ -0x2 <<17 |/* pre-change delay */ +0x3 <<17 |/* pre-change delay */ 0x3 <<19 ;/* post-change delay */ sdhci_writel (host, extra, dwc_priv->vendor_specific_area1 +DWCMSHC_EMMC_ATCTRL );
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/2 mmc: sdhci-of-dwcmshc: Prevent illegal clock reduction in HS200/HS400 mode
From: Shawn Lin <[email protected]>
[ Upstream commit 3009738a855cf938bbfc9078bec725031ae623a4 ]
When operating in HS200 or HS400 timing modes, reducing the clock frequency below 52MHz will lead to link broken as the Rockchip DWC MSHC controller requires maintaining a minimum clock of 52MHz in these modes.
Add a check to prevent illegal clock reduction through debugfs:
root@debian:/# echo 50000000 > /sys/kernel/debug/mmc0/clock root@debian:/# [ 30.090146] mmc0: running CQE recovery mmc0: cqhci: Failed to halt mmc0: cqhci: spurious TCN for tag 0 WARNING: drivers/mmc/host/cqhci-core.c:797 at cqhci_irq+0x254/0x818, CPU#1: kworker/1:0H/24 Modules linked in: CPU: 1 UID: 0 PID: 24 Comm: kworker/1:0H Not tainted 6.19.0-rc1-00001-g09db0998649d-dirty #204 PREEMPT Hardware name: Rockchip RK3588 EVB1 V10 Board (DT) Workqueue: kblockd blk_mq_run_work_fn pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : cqhci_irq+0x254/0x818 lr : cqhci_irq+0x254/0x818 ...
--- drivers/mmc/host/sdhci-of-dwcmshc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/host/sdhci-of-dwcmshc.c +7 -0
@@ -236,6 +236,13 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clocksdhci_writel (host, extra, reg);if (clock <=52000000 ) { +if (host->mmc->ios.timing ==MMC_TIMING_MMC_HS200 || + host->mmc->ios.timing ==MMC_TIMING_MMC_HS400 ) { +dev_err (mmc_dev (host->mmc), +"Can't reduce the clock below 52MHz in HS200/HS400 mode" ); +return ; + } +/* * Disable DLL and reset both of sample and drive clock. * The bypass bit and start bit need to be set if DLL is not locked.
Signature · 1 line
2.51.0