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

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

[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.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index f4fdf15242ce..6dc8d3bf9fe2 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -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

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

[Peng Fan]

> 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.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>

Acked-by: Peng Fan <peng.fan@nxp.com>

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

[Jaehoon Chung]

> -----Original Message-----
> From: Tom Rini <trini@konsulko.com>
> Sent: Wednesday, January 15, 2025 11:08 AM
>
> 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.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung

> ---
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> ---
>  drivers/mmc/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index f4fdf15242ce..6dc8d3bf9fe2 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -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

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

[Peng Fan (OSS)]

From: Peng Fan <peng.fan@nxp.com>


On Tue, 14 Jan 2025 20:07:36 -0600, Tom Rini wrote:
> 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,
-- 
Peng Fan <peng.fan@nxp.com>

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

[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?



Am Fr., 11. Apr. 2025 um 04:46 Uhr schrieb Peng Fan (OSS) <
peng.fan@oss.nxp.com>:

> From: Peng Fan <peng.fan@nxp.com>
>
>
> On Tue, 14 Jan 2025 20:07:36 -0600, Tom Rini wrote:
> > 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,
> --
> Peng Fan <peng.fan@nxp.com>
>


BR,
Heiko

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

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

On Wed, Jun 11, 2025 at 11:58:42AM +0200, Heiko Thiery wrote:

> 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!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]