Skip to contentSkip to conversation

mmc: Kconfig: Correct dependencies SDHCI ADMA options

PATCH Applied Tom Rini 5 participants 6 messages Jan 15, 2025 – Jun 11, 2025 MMC, SD and SDIO

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 mmc: Kconfig: Correct dependencies SDHCI ADMA options

The option MMC_SDHCI_ADMA_FORCE_32BIT is only tested or used when MMC_SDHCI_ADMA or SPL_MMC_SDHCI_ADMA is enabled. And for MMC_SDHCI_ADMA_64BIT the same is true except we also require MMC_SDHCI_ADMA_FORCE_32BIT to be disabled.

---
Cc: Peng Fan <[email protected]>
Cc: Jaehoon Chung <[email protected]>

---
 drivers/mmc/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
drivers/mmc/Kconfig +2 -0
index f4fdf15242ce..6dc8d3bf9fe2 100644
@@ -527,6 +527,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
 	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
@@ -536,6 +537,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_FORCE_32BIT
 	default y if DMA_ADDR_T_64BIT
 	help
Signature · 1 line
2.43.0
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines

Subject: [PATCH] mmc: Kconfig: Correct dependencies SDHCI ADMA options

The option MMC_SDHCI_ADMA_FORCE_32BIT is only tested or used when MMC_SDHCI_ADMA or SPL_MMC_SDHCI_ADMA is enabled. And for MMC_SDHCI_ADMA_64BIT the same is true except we also require MMC_SDHCI_ADMA_FORCE_32BIT to be disabled.

Quoted 4 lines

---
Cc: Peng Fan <[email protected]>
Cc: Jaehoon Chung <[email protected]>

Reviewed-by on v1 1/1
#2 lore raw
In reply to Tom Rini
Quoted 6 lines

-----Original Message-----
From: Tom Rini <[email protected]>
Sent: Wednesday, January 15, 2025 11:08 AM

Quoted 6 lines

The option MMC_SDHCI_ADMA_FORCE_32BIT is only tested or used when MMC_SDHCI_ADMA or SPL_MMC_SDHCI_ADMA is enabled. And for MMC_SDHCI_ADMA_64BIT the same is true except we also require MMC_SDHCI_ADMA_FORCE_32BIT to be disabled.

Best Regards,
Jaehoon Chung

Quoted 29 lines

---
Cc: Peng Fan <[email protected]>
Cc: Jaehoon Chung <[email protected]>

---
 drivers/mmc/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
drivers/mmc/Kconfig +2 -1
index f4fdf15242ce..6dc8d3bf9fe2 100644
@@ -527,6 +527,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
 	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
@@ -536,6 +537,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_FORCE_32BIT
 	default y if DMA_ADDR_T_64BIT
 	help
--

2.43.0

#3 lore raw
In reply to Tom Rini

From: Peng Fan <[email protected]>

Quoted 6 lines · Tom Rini

The option MMC_SDHCI_ADMA_FORCE_32BIT is only tested or used when MMC_SDHCI_ADMA or SPL_MMC_SDHCI_ADMA is enabled. And for MMC_SDHCI_ADMA_64BIT the same is true except we also require MMC_SDHCI_ADMA_FORCE_32BIT to be disabled.

Applied, thanks!

[1/1] mmc: Kconfig: Correct dependencies SDHCI ADMA options

      commit: 53bb8fdea12a346ceda1ac109ebb05d2c9625e5d

Best regards,

Signature · 1 line
Peng Fan <[email protected]>
#4 lore raw

Hi Peng, Hi Tom,

I figured out that this commit introduces problems on the kontron sl28 board (kontron_sl28_defconfig). Since this commit accessing SD card does not work anymore. I see that the freescale
has CONFIG_FSL_ESDHC_SUPPORT_ADMA2 support but now we need in addition MMC_SDHCI_ADMA or SPL_MMC_SDHCI_ADMA to get MMC_SDHCI_ADMA_64BIT. Is this intentional?

Am Fr., 11. Apr. 2025 um 04:46 Uhr schrieb Peng Fan (OSS) < [email protected]>:

Quoted 11 lines

From: Peng Fan <[email protected]>

Quoted 6 lines · Tom Rini

The option MMC_SDHCI_ADMA_FORCE_32BIT is only tested or used when MMC_SDHCI_ADMA or SPL_MMC_SDHCI_ADMA is enabled. And for MMC_SDHCI_ADMA_64BIT the same is true except we also require MMC_SDHCI_ADMA_FORCE_32BIT to be disabled.

Quoted 9 lines

Applied, thanks!

[1/1] mmc: Kconfig: Correct dependencies SDHCI ADMA options

      commit: 53bb8fdea12a346ceda1ac109ebb05d2c9625e5d

Best regards,
--
Peng Fan <[email protected]>

BR,
Heiko

author
#5 lore raw
Quoted 8 lines · Heiko Thiery

Hi Peng, Hi Tom,

I figured out that this commit introduces problems on the kontron sl28 board (kontron_sl28_defconfig). Since this commit accessing SD card does not work anymore. I see that the freescale
has CONFIG_FSL_ESDHC_SUPPORT_ADMA2 support but now we need in addition MMC_SDHCI_ADMA or SPL_MMC_SDHCI_ADMA to get MMC_SDHCI_ADMA_64BIT. Is this intentional?

Hi Heiko,

This is in fact a bug and I'll post a fix shortly, thanks for the report!

Signature · 1 line
Tom