[PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit

[PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit

[Jaehoon Chung]

RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel side)
But It doesn't use on u-boot side. Then it's too slow about read/write performance.
This patchset is supported SDMA mode on RPI4 target(32bit).
- I didn't test on RPI4 64bit.

Read/write time about 8MB file
Before
- Read : 1.472 seconds
- Write : 4.690 seconds
After
- Read : 0.359 seconds
- Write : 0.574 seconds

This patch is based on my RFC's patches.RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel side)
But It doesn't use on u-boot side. Then it's too slow about read/write performance.
This patchset is supported SDMA mode on RPI4 target(32bit).
- I didn't test on RPI4 64bit.

Read/write time about 8MB file
Before
- Read : 1.472 seconds
- Write : 4.690 seconds
After
- Read : 0.359 seconds
- Write : 0.574 seconds

This patch is based on my RFC's patches.

Changelog on V2
- Keep printf message instead of debug
- Add Peng's Reviewed-by tag

Jaehoon Chung (3):
  mmc: sdhci: use phys2bus macro when dma address is accessed
  mmc: sdhci: not return error when SDMA is not supported
  configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config

 configs/rpi_4_32b_defconfig |  1 +
 drivers/mmc/sdhci.c         | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

-- 
2.25.0

[PATCH v2 1/3] mmc: sdhci: use phys2bus macro when dma address is accessed

[Jaehoon Chung]

Use phys2bus macro when dma address is accessed.
Some targets need to use pyhs2bus macro. (e.g, RPI4)
After applied it, SDMA mode can be used.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
---
Changelog on V2
- None

 drivers/mmc/sdhci.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 01fa5a9d4d..93c9049c5d 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <sdhci.h>
 #include <dm.h>
+#include <phys2bus.h>
 
 #if defined(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER)
 void *aligned_buffer = (void *)CONFIG_FIXED_SDHCI_ALIGNED_BUFFER;
@@ -164,7 +165,8 @@ static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data,
 		if (data->flags != MMC_DATA_READ)
 			memcpy(aligned_buffer, data->src, trans_bytes);
 #endif
-		sdhci_writel(host, host->start_addr, SDHCI_DMA_ADDRESS);
+		sdhci_writel(host, phys_to_bus((ulong)host->start_addr),
+				SDHCI_DMA_ADDRESS);
 
 	} else if (host->flags & (USE_ADMA | USE_ADMA64)) {
 		sdhci_prepare_adma_table(host, data);
@@ -220,7 +222,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data)
 				start_addr &=
 				~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1);
 				start_addr += SDHCI_DEFAULT_BOUNDARY_SIZE;
-				sdhci_writel(host, start_addr,
+				sdhci_writel(host, phys_to_bus((ulong)start_addr),
 					     SDHCI_DMA_ADDRESS);
 			}
 		}
-- 
2.25.0

[PATCH v2 2/3] mmc: sdhci: not return error when SDMA is not supported

[Jaehoon Chung]

If Host controller doesn't support SDMA, it doesn't need to return
error. Because it can be worked with PIO mode.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
---
Changelog on V2
- Keep printf message instead of debug

 drivers/mmc/sdhci.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 93c9049c5d..40bf2a5b2c 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -729,13 +729,12 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
 	debug("%s, caps: 0x%x\n", __func__, caps);
 
 #ifdef CONFIG_MMC_SDHCI_SDMA
-	if (!(caps & SDHCI_CAN_DO_SDMA)) {
+	if ((caps & SDHCI_CAN_DO_SDMA)) {
+		host->flags |= USE_SDMA;
+	} else {
 		printf("%s: Your controller doesn't support SDMA!!\n",
 		       __func__);
-		return -EINVAL;
 	}
-
-	host->flags |= USE_SDMA;
 #endif
 #if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA)
 	if (!(caps & SDHCI_CAN_DO_ADMA2)) {
-- 
2.25.0

[PATCH v2 3/3] configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config

[Jaehoon Chung]

Enable SDHCI_SDMA configuration.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
---
Changelog on V2
- None

 configs/rpi_4_32b_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
index 72cda5d949..7189914606 100644
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -25,6 +25,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_KEYBOARD=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_DM_ETH=y
 CONFIG_BCMGENET=y
-- 
2.25.0

[PATCH v2 3/3] configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config

[Minkyu Kang]

On 18/02/2020 10:25, Jaehoon Chung wrote:
> Enable SDHCI_SDMA configuration.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> Changelog on V2
> - None
> 
>  configs/rpi_4_32b_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
> index 72cda5d949..7189914606 100644
> --- a/configs/rpi_4_32b_defconfig
> +++ b/configs/rpi_4_32b_defconfig
> @@ -25,6 +25,7 @@ CONFIG_DFU_MMC=y
>  CONFIG_DM_KEYBOARD=y
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_SDMA=y
>  CONFIG_MMC_SDHCI_BCM2835=y
>  CONFIG_DM_ETH=y
>  CONFIG_BCMGENET=y
> 

Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>

Thanks,
Minkyu Kang.

[PATCH v2 2/3] mmc: sdhci: not return error when SDMA is not supported

[Minkyu Kang]

On 18/02/2020 10:25, Jaehoon Chung wrote:
> If Host controller doesn't support SDMA, it doesn't need to return
> error. Because it can be worked with PIO mode.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> Changelog on V2
> - Keep printf message instead of debug
> 
>  drivers/mmc/sdhci.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
> index 93c9049c5d..40bf2a5b2c 100644
> --- a/drivers/mmc/sdhci.c
> +++ b/drivers/mmc/sdhci.c
> @@ -729,13 +729,12 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
>  	debug("%s, caps: 0x%x\n", __func__, caps);
>  
>  #ifdef CONFIG_MMC_SDHCI_SDMA
> -	if (!(caps & SDHCI_CAN_DO_SDMA)) {
> +	if ((caps & SDHCI_CAN_DO_SDMA)) {

seems to redundant braces

> +		host->flags |= USE_SDMA;
> +	} else {
>  		printf("%s: Your controller doesn't support SDMA!!\n",
>  		       __func__);
> -		return -EINVAL;
>  	}
> -
> -	host->flags |= USE_SDMA;
>  #endif
>  #if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA)
>  	if (!(caps & SDHCI_CAN_DO_ADMA2)) {
> 

Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>

Thanks,
Minkyu Kang.

[PATCH v2 1/3] mmc: sdhci: use phys2bus macro when dma address is accessed

[Minkyu Kang]

On 18/02/2020 10:25, Jaehoon Chung wrote:
> Use phys2bus macro when dma address is accessed.
> Some targets need to use pyhs2bus macro. (e.g, RPI4)
> After applied it, SDMA mode can be used.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> Changelog on V2
> - None
> 
>  drivers/mmc/sdhci.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
> index 01fa5a9d4d..93c9049c5d 100644
> --- a/drivers/mmc/sdhci.c
> +++ b/drivers/mmc/sdhci.c
> @@ -15,6 +15,7 @@
>  #include <mmc.h>
>  #include <sdhci.h>
>  #include <dm.h>
> +#include <phys2bus.h>
>  
>  #if defined(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER)
>  void *aligned_buffer = (void *)CONFIG_FIXED_SDHCI_ALIGNED_BUFFER;
> @@ -164,7 +165,8 @@ static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data,
>  		if (data->flags != MMC_DATA_READ)
>  			memcpy(aligned_buffer, data->src, trans_bytes);
>  #endif
> -		sdhci_writel(host, host->start_addr, SDHCI_DMA_ADDRESS);
> +		sdhci_writel(host, phys_to_bus((ulong)host->start_addr),
> +				SDHCI_DMA_ADDRESS);
>  
>  	} else if (host->flags & (USE_ADMA | USE_ADMA64)) {
>  		sdhci_prepare_adma_table(host, data);
> @@ -220,7 +222,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data)
>  				start_addr &=
>  				~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1);
>  				start_addr += SDHCI_DEFAULT_BOUNDARY_SIZE;
> -				sdhci_writel(host, start_addr,
> +				sdhci_writel(host, phys_to_bus((ulong)start_addr),
>  					     SDHCI_DMA_ADDRESS);
>  			}
>  		}
> 

Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>

Thanks,
Minkyu Kang.

[PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit

[Jaehoon Chung]

Hi

Is there any comment or plan to apply?

Best Regards,
Jaehoon Chung

On 2/18/20 10:25 AM, Jaehoon Chung wrote:
> RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel side)
> But It doesn't use on u-boot side. Then it's too slow about read/write performance.
> This patchset is supported SDMA mode on RPI4 target(32bit).
> - I didn't test on RPI4 64bit.
> 
> Read/write time about 8MB file
> Before
> - Read : 1.472 seconds
> - Write : 4.690 seconds
> After
> - Read : 0.359 seconds
> - Write : 0.574 seconds
> 
> This patch is based on my RFC's patches.RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel side)
> But It doesn't use on u-boot side. Then it's too slow about read/write performance.
> This patchset is supported SDMA mode on RPI4 target(32bit).
> - I didn't test on RPI4 64bit.
> 
> Read/write time about 8MB file
> Before
> - Read : 1.472 seconds
> - Write : 4.690 seconds
> After
> - Read : 0.359 seconds
> - Write : 0.574 seconds
> 
> This patch is based on my RFC's patches.
> 
> Changelog on V2
> - Keep printf message instead of debug
> - Add Peng's Reviewed-by tag
> 
> Jaehoon Chung (3):
>   mmc: sdhci: use phys2bus macro when dma address is accessed
>   mmc: sdhci: not return error when SDMA is not supported
>   configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config
> 
>  configs/rpi_4_32b_defconfig |  1 +
>  drivers/mmc/sdhci.c         | 13 +++++++------
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 

[PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit

[Peng Fan]

> Subject: Re: [PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit
> 
> Hi
> 
> Is there any comment or plan to apply?

Sorry, I missed this patchset. Will pick it up.

Thanks,
Peng.

> 
> Best Regards,
> Jaehoon Chung
> 
> On 2/18/20 10:25 AM, Jaehoon Chung wrote:
> > RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel
> > side) But It doesn't use on u-boot side. Then it's too slow about read/write
> performance.
> > This patchset is supported SDMA mode on RPI4 target(32bit).
> > - I didn't test on RPI4 64bit.
> >
> > Read/write time about 8MB file
> > Before
> > - Read : 1.472 seconds
> > - Write : 4.690 seconds
> > After
> > - Read : 0.359 seconds
> > - Write : 0.574 seconds
> >
> > This patch is based on my RFC's patches.RPI4's SDHCI controller is
> > supported SDMA mode. (Checked on kernel side) But It doesn't use on
> u-boot side. Then it's too slow about read/write performance.
> > This patchset is supported SDMA mode on RPI4 target(32bit).
> > - I didn't test on RPI4 64bit.
> >
> > Read/write time about 8MB file
> > Before
> > - Read : 1.472 seconds
> > - Write : 4.690 seconds
> > After
> > - Read : 0.359 seconds
> > - Write : 0.574 seconds
> >
> > This patch is based on my RFC's patches.
> >
> > Changelog on V2
> > - Keep printf message instead of debug
> > - Add Peng's Reviewed-by tag
> >
> > Jaehoon Chung (3):
> >   mmc: sdhci: use phys2bus macro when dma address is accessed
> >   mmc: sdhci: not return error when SDMA is not supported
> >   configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config
> >
> >  configs/rpi_4_32b_defconfig |  1 +
> >  drivers/mmc/sdhci.c         | 13 +++++++------
> >  2 files changed, 8 insertions(+), 6 deletions(-)
> >

[PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit

[Jaehoon Chung]

On 3/18/20 10:00 AM, Peng Fan wrote:
>> Subject: Re: [PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit
>>
>> Hi
>>
>> Is there any comment or plan to apply?
> 
> Sorry, I missed this patchset. Will pick it up.

No problem. :) Thanks!

Best Regards,
Jaehoon Chung

> 
> Thanks,
> Peng.
> 
>>
>> Best Regards,
>> Jaehoon Chung
>>
>> On 2/18/20 10:25 AM, Jaehoon Chung wrote:
>>> RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel
>>> side) But It doesn't use on u-boot side. Then it's too slow about read/write
>> performance.
>>> This patchset is supported SDMA mode on RPI4 target(32bit).
>>> - I didn't test on RPI4 64bit.
>>>
>>> Read/write time about 8MB file
>>> Before
>>> - Read : 1.472 seconds
>>> - Write : 4.690 seconds
>>> After
>>> - Read : 0.359 seconds
>>> - Write : 0.574 seconds
>>>
>>> This patch is based on my RFC's patches.RPI4's SDHCI controller is
>>> supported SDMA mode. (Checked on kernel side) But It doesn't use on
>> u-boot side. Then it's too slow about read/write performance.
>>> This patchset is supported SDMA mode on RPI4 target(32bit).
>>> - I didn't test on RPI4 64bit.
>>>
>>> Read/write time about 8MB file
>>> Before
>>> - Read : 1.472 seconds
>>> - Write : 4.690 seconds
>>> After
>>> - Read : 0.359 seconds
>>> - Write : 0.574 seconds
>>>
>>> This patch is based on my RFC's patches.
>>>
>>> Changelog on V2
>>> - Keep printf message instead of debug
>>> - Add Peng's Reviewed-by tag
>>>
>>> Jaehoon Chung (3):
>>>   mmc: sdhci: use phys2bus macro when dma address is accessed
>>>   mmc: sdhci: not return error when SDMA is not supported
>>>   configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config
>>>
>>>  configs/rpi_4_32b_defconfig |  1 +
>>>  drivers/mmc/sdhci.c         | 13 +++++++------
>>>  2 files changed, 8 insertions(+), 6 deletions(-)
>>>
> 

[PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit

[Peng Fan]

Hi Jaehoon,

> Subject: Re: [PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit
> 
> On 3/18/20 10:00 AM, Peng Fan wrote:
> >> Subject: Re: [PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit
> >>
> >> Hi
> >>
> >> Is there any comment or plan to apply?
> >
> > Sorry, I missed this patchset. Will pick it up.

This patchset could not be applied on master, would you rebase?

Thanks,
Peng.

> 
> No problem. :) Thanks!
> 
> Best Regards,
> Jaehoon Chung
> 
> >
> > Thanks,
> > Peng.
> >
> >>
> >> Best Regards,
> >> Jaehoon Chung
> >>
> >> On 2/18/20 10:25 AM, Jaehoon Chung wrote:
> >>> RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel
> >>> side) But It doesn't use on u-boot side. Then it's too slow about
> >>> read/write
> >> performance.
> >>> This patchset is supported SDMA mode on RPI4 target(32bit).
> >>> - I didn't test on RPI4 64bit.
> >>>
> >>> Read/write time about 8MB file
> >>> Before
> >>> - Read : 1.472 seconds
> >>> - Write : 4.690 seconds
> >>> After
> >>> - Read : 0.359 seconds
> >>> - Write : 0.574 seconds
> >>>
> >>> This patch is based on my RFC's patches.RPI4's SDHCI controller is
> >>> supported SDMA mode. (Checked on kernel side) But It doesn't use on
> >> u-boot side. Then it's too slow about read/write performance.
> >>> This patchset is supported SDMA mode on RPI4 target(32bit).
> >>> - I didn't test on RPI4 64bit.
> >>>
> >>> Read/write time about 8MB file
> >>> Before
> >>> - Read : 1.472 seconds
> >>> - Write : 4.690 seconds
> >>> After
> >>> - Read : 0.359 seconds
> >>> - Write : 0.574 seconds
> >>>
> >>> This patch is based on my RFC's patches.
> >>>
> >>> Changelog on V2
> >>> - Keep printf message instead of debug
> >>> - Add Peng's Reviewed-by tag
> >>>
> >>> Jaehoon Chung (3):
> >>>   mmc: sdhci: use phys2bus macro when dma address is accessed
> >>>   mmc: sdhci: not return error when SDMA is not supported
> >>>   configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config
> >>>
> >>>  configs/rpi_4_32b_defconfig |  1 +
> >>>  drivers/mmc/sdhci.c         | 13 +++++++------
> >>>  2 files changed, 8 insertions(+), 6 deletions(-)
> >>>
> >

[PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit

[Jaehoon Chung]

On 3/23/20 10:14 AM, Peng Fan wrote:
> Hi Jaehoon,
> 
>> Subject: Re: [PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit
>>
>> On 3/18/20 10:00 AM, Peng Fan wrote:
>>>> Subject: Re: [PATCH v2 0/3] Support SDMA mode on RPI4 target - 32bit
>>>>
>>>> Hi
>>>>
>>>> Is there any comment or plan to apply?
>>>
>>> Sorry, I missed this patchset. Will pick it up.
> 
> This patchset could not be applied on master, would you rebase?

Sure, i will resend after rebase on latest. 

Best Regards,
Jaehoon Chung

> 
> Thanks,
> Peng.
> 
>>
>> No problem. :) Thanks!
>>
>> Best Regards,
>> Jaehoon Chung
>>
>>>
>>> Thanks,
>>> Peng.
>>>
>>>>
>>>> Best Regards,
>>>> Jaehoon Chung
>>>>
>>>> On 2/18/20 10:25 AM, Jaehoon Chung wrote:
>>>>> RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel
>>>>> side) But It doesn't use on u-boot side. Then it's too slow about
>>>>> read/write
>>>> performance.
>>>>> This patchset is supported SDMA mode on RPI4 target(32bit).
>>>>> - I didn't test on RPI4 64bit.
>>>>>
>>>>> Read/write time about 8MB file
>>>>> Before
>>>>> - Read : 1.472 seconds
>>>>> - Write : 4.690 seconds
>>>>> After
>>>>> - Read : 0.359 seconds
>>>>> - Write : 0.574 seconds
>>>>>
>>>>> This patch is based on my RFC's patches.RPI4's SDHCI controller is
>>>>> supported SDMA mode. (Checked on kernel side) But It doesn't use on
>>>> u-boot side. Then it's too slow about read/write performance.
>>>>> This patchset is supported SDMA mode on RPI4 target(32bit).
>>>>> - I didn't test on RPI4 64bit.
>>>>>
>>>>> Read/write time about 8MB file
>>>>> Before
>>>>> - Read : 1.472 seconds
>>>>> - Write : 4.690 seconds
>>>>> After
>>>>> - Read : 0.359 seconds
>>>>> - Write : 0.574 seconds
>>>>>
>>>>> This patch is based on my RFC's patches.
>>>>>
>>>>> Changelog on V2
>>>>> - Keep printf message instead of debug
>>>>> - Add Peng's Reviewed-by tag
>>>>>
>>>>> Jaehoon Chung (3):
>>>>>   mmc: sdhci: use phys2bus macro when dma address is accessed
>>>>>   mmc: sdhci: not return error when SDMA is not supported
>>>>>   configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config
>>>>>
>>>>>  configs/rpi_4_32b_defconfig |  1 +
>>>>>  drivers/mmc/sdhci.c         | 13 +++++++------
>>>>>  2 files changed, 8 insertions(+), 6 deletions(-)
>>>>>
>>>
>