mmc: Kconfig: Really correct dependencies SDHCI ADMA options
PATCH 1/1 mmc: Kconfig: Really correct dependencies SDHCI ADMA options
When doing the investigation for commit 53bb8fdea12a ("mmc: Kconfig:
Correct dependencies SDHCI ADMA options") I missed the implications of MMC_SDHCI_ADMA_HELPERS. The problem is that FSL_ESDHC via the FSL_ESDHC_SUPPORT_ADMA2 option will also enable these helper functions. This in turn means the correct dependency here is MMC_SDHCI_ADMA_HELPERS and not *MMC_SDHCI_ADMA.
---
This is a regression vs v2025.04 and so I want to get this in for this release. Should I apply it directly or will there be an MMC PR for it? Thanks!
--- drivers/mmc/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/Kconfig +2 -2
@@ -528,7 +528,7 @@ config SPL_MMC_SDHCI_ADMA config MMC_SDHCI_ADMA_FORCE_32BIT bool "Force 32 bit mode for ADMA on 64 bit platforms" - depends on MMC_SDHCI_ADMA || SPL_MMC_SDHCI_ADMA + depends on MMC_SDHCI_ADMA_HELPERS help This forces SDHCI ADMA to be built for 32 bit descriptors, even on a 64 bit platform where they would otherwise be assumed to
@@ -538,7 +538,7 @@ config MMC_SDHCI_ADMA_FORCE_32BIT config MMC_SDHCI_ADMA_64BIT bool "Use SHDCI ADMA with 64 bit descriptors" - depends on MMC_SDHCI_ADMA || SPL_MMC_SDHCI_ADMA + depends on MMC_SDHCI_ADMA_HELPERS depends on !MMC_SDHCI_ADMA_FORCE_32BIT default y if DMA_ADDR_T_64BIT help
Signature · 1 line
2.43.0
Hi Tom,
Quoted 2 lines
Subject: [PATCH] mmc:
Kconfig: Really correct dependencies SDHCI ADMA options
Thanks for fixing this.
Quoted 11 lines
When doing the investigation for commit
53bb8fdea12a("mmc:Kconfig:
Correct dependencies SDHCI ADMA options") I missed the implications ofMMC_SDHCI_ADMA_HELPERS. The problem is thatFSL_ESDHCvia theFSL_ESDHC_SUPPORT_ADMA2option will also enable these helper functions.
This in turn means the correct dependency here isMMC_SDHCI_ADMA_HELPERSand not*MMC_SDHCI_ADMA.
Quoted 6 lines
Reported-by Heiko Thiery <[email protected]>Signed-off-by Tom Rini <[email protected]>---
This is a regression vs v2025.04 and so I want to get this in for this release. Should I apply it directly or will there be an MMC PR for it? Thanks!
Please pick it up directly.
Thanks,
Peng.
Quoted 32 lines
Cc Peng Fan <[email protected]>Cc Jaehoon Chung <[email protected]>--- drivers/mmc/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/mmc/Kconfig index renamed from drivers/mmc/Kconfig +0
-0
38867f30a7eb..1c9b6898bff4100644drivers/mmc/Kconfig +1
-1@@ -528,7 +528,7 @@ config SPL_MMC_SDHCI_ADMA config MMC_SDHCI_ADMA_FORCE_32BIT bool "Force 32 bit mode for ADMA on 64 bit platforms" - depends on MMC_SDHCI_ADMA || SPL_MMC_SDHCI_ADMA + depends on MMC_SDHCI_ADMA_HELPERS help This forces SDHCI ADMA to be built for 32 bit descriptors,even
on a 64 bit platform where they would otherwise be assumed
to @@ -538,7 +538,7 @@ configMMC_SDHCI_ADMA_FORCE_32BITconfig
MMC_SDHCI_ADMA_64BITdrivers/mmc/Kconfig +1
-2bool "Use SHDCI ADMA with 64 bit descriptors" - depends on MMC_SDHCI_ADMA || SPL_MMC_SDHCI_ADMA + depends on MMC_SDHCI_ADMA_HELPERS depends on !MMC_SDHCI_ADMA_FORCE_32BIT default y if DMA_ADDR_T_64BIT help --2.43.0
Quoted 8 lines · Tom Rini
When doing the investigation for commit
53bb8fdea12a("mmc:Kconfig:
Correct dependencies SDHCI ADMA options") I missed the implications ofMMC_SDHCI_ADMA_HELPERS. The problem is thatFSL_ESDHCvia theFSL_ESDHC_SUPPORT_ADMA2option will also enable these helper functions. This in turn means the correct dependency here isMMC_SDHCI_ADMA_HELPERSand not*MMC_SDHCI_ADMA.[...]
Applied to u-boot/master, thanks!
[1/1] mmc: Kconfig: Really correct dependencies SDHCI ADMA options
commit: b62e422d6e6878e9bca1d20fe372ffdd7db294fa
Signature · 1 line
Tom
Hi Tom,
Am Do., 12. Juni 2025 um 02:29 Uhr schrieb Tom Rini <[email protected]>:
Quoted 9 lines · Tom Rini
Quoted 8 lines
When doing the investigation for commit
53bb8fdea12a("mmc:Kconfig:
Correct dependencies SDHCI ADMA options") I missed the implications ofMMC_SDHCI_ADMA_HELPERS. The problem is thatFSL_ESDHCvia theFSL_ESDHC_SUPPORT_ADMA2option will also enable these helper functions. This in turn means the correct dependency here isMMC_SDHCI_ADMA_HELPERSand not*MMC_SDHCI_ADMA.
Quoted 4 lines
Quoted 1 line
[...]
Applied to u-boot/master, thanks!
Just tested the latest master. Looks good.
Thank you for the quick fix.
Quoted 8 lines
[1/1] mmc:
Kconfig: Really correct dependencies SDHCI ADMA optionscommit: b62e422d6e6878e9bca1d20fe372ffdd7db294fa--
Tom
--
Heiko