* [PATCH RFT] mmc: renesas_sdhi: enable WAIT_WHILE_BUSY
@ 2021-04-08 13:34 Wolfram Sang
2021-04-09 5:40 ` Yoshihiro Shimoda
0 siblings, 1 reply; 3+ messages in thread
From: Wolfram Sang @ 2021-04-08 13:34 UTC (permalink / raw)
To: linux-mmc; +Cc: linux-renesas-soc, Yoshihiro Shimoda, Wolfram Sang
Now that we got the timeout handling in the driver correct, we can use
this capability to avoid polling via the MMC core.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
I had this patch applied while developing all the other patches for
TMIO/SDHI for 5.13 and had no regressions. Further testing is
appreciated, but I am optimistic that we can enable this finally.
drivers/mmc/host/renesas_sdhi_internal_dmac.c | 4 ++--
drivers/mmc/host/renesas_sdhi_sys_dmac.c | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index ff97f15e317c..47c795e79c21 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -94,7 +94,7 @@ static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = {
static const struct renesas_sdhi_of_data of_rza2_compatible = {
.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
- TMIO_MMC_HAVE_CBSY,
+ TMIO_MMC_HAVE_CBSY | MMC_CAP_WAIT_WHILE_BUSY,
.tmio_ocr_mask = MMC_VDD_32_33,
.capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
MMC_CAP_CMD23,
@@ -111,7 +111,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = {
.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,
.capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
- MMC_CAP_CMD23,
+ MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,
.capabilities2 = MMC_CAP2_NO_WRITE_PROTECT | MMC_CAP2_MERGE_CAPABLE,
.bus_shift = 2,
.scc_offset = 0x1000,
diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
index c5f789675302..0a3494fcc5e8 100644
--- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
@@ -31,13 +31,14 @@ static const struct renesas_sdhi_of_data of_default_cfg = {
static const struct renesas_sdhi_of_data of_rz_compatible = {
.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_32BIT_DATA_PORT |
- TMIO_MMC_HAVE_CBSY,
+ TMIO_MMC_HAVE_CBSY | MMC_CAP_WAIT_WHILE_BUSY,
.tmio_ocr_mask = MMC_VDD_32_33,
.capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
};
static const struct renesas_sdhi_of_data of_rcar_gen1_compatible = {
- .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL,
+ .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
+ MMC_CAP_WAIT_WHILE_BUSY,
.capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
.capabilities2 = MMC_CAP2_NO_WRITE_PROTECT,
};
@@ -58,7 +59,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen2_compatible = {
.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,
.capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
- MMC_CAP_CMD23,
+ MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,
.capabilities2 = MMC_CAP2_NO_WRITE_PROTECT,
.dma_buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES,
.dma_rx_offset = 0x2000,
--
2.30.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH RFT] mmc: renesas_sdhi: enable WAIT_WHILE_BUSY
2021-04-08 13:34 [PATCH RFT] mmc: renesas_sdhi: enable WAIT_WHILE_BUSY Wolfram Sang
@ 2021-04-09 5:40 ` Yoshihiro Shimoda
2021-04-09 9:37 ` Wolfram Sang
0 siblings, 1 reply; 3+ messages in thread
From: Yoshihiro Shimoda @ 2021-04-09 5:40 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, linux-mmc
Hi Wolfram-san,
Thank you for the patch!
> From: Wolfram Sang, Sent: Thursday, April 8, 2021 10:34 PM
>
> Now that we got the timeout handling in the driver correct, we can use
> this capability to avoid polling via the MMC core.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>
> I had this patch applied while developing all the other patches for
> TMIO/SDHI for 5.13 and had no regressions. Further testing is
> appreciated, but I am optimistic that we can enable this finally.
>
> drivers/mmc/host/renesas_sdhi_internal_dmac.c | 4 ++--
> drivers/mmc/host/renesas_sdhi_sys_dmac.c | 7 ++++---
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> index ff97f15e317c..47c795e79c21 100644
> --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> @@ -94,7 +94,7 @@ static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = {
>
> static const struct renesas_sdhi_of_data of_rza2_compatible = {
> .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
> - TMIO_MMC_HAVE_CBSY,
> + TMIO_MMC_HAVE_CBSY | MMC_CAP_WAIT_WHILE_BUSY,
We should add MMC_CAP_WAIT_WHILE_BUSY to .capabilities, not .tmio_flags.
> .tmio_ocr_mask = MMC_VDD_32_33,
> .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
> MMC_CAP_CMD23,
> @@ -111,7 +111,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = {
> .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
> TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,
> .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
> - MMC_CAP_CMD23,
> + MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,
> .capabilities2 = MMC_CAP2_NO_WRITE_PROTECT | MMC_CAP2_MERGE_CAPABLE,
> .bus_shift = 2,
> .scc_offset = 0x1000,
> diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> index c5f789675302..0a3494fcc5e8 100644
> --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> @@ -31,13 +31,14 @@ static const struct renesas_sdhi_of_data of_default_cfg = {
>
> static const struct renesas_sdhi_of_data of_rz_compatible = {
> .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_32BIT_DATA_PORT |
> - TMIO_MMC_HAVE_CBSY,
> + TMIO_MMC_HAVE_CBSY | MMC_CAP_WAIT_WHILE_BUSY,
Same here.
> .tmio_ocr_mask = MMC_VDD_32_33,
> .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
> };
>
> static const struct renesas_sdhi_of_data of_rcar_gen1_compatible = {
> - .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL,
> + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
> + MMC_CAP_WAIT_WHILE_BUSY,
Same here.
Best regards,
Yoshihiro Shimoda
> .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
> .capabilities2 = MMC_CAP2_NO_WRITE_PROTECT,
> };
> @@ -58,7 +59,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen2_compatible = {
> .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
> TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,
> .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
> - MMC_CAP_CMD23,
> + MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,
> .capabilities2 = MMC_CAP2_NO_WRITE_PROTECT,
> .dma_buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES,
> .dma_rx_offset = 0x2000,
> --
> 2.30.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RFT] mmc: renesas_sdhi: enable WAIT_WHILE_BUSY
2021-04-09 5:40 ` Yoshihiro Shimoda
@ 2021-04-09 9:37 ` Wolfram Sang
0 siblings, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2021-04-09 9:37 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: linux-renesas-soc, linux-mmc
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]
> > + TMIO_MMC_HAVE_CBSY | MMC_CAP_WAIT_WHILE_BUSY,
>
> We should add MMC_CAP_WAIT_WHILE_BUSY to .capabilities, not .tmio_flags.
Ouch, can I have a brown paper bag, please!
>
> > .tmio_ocr_mask = MMC_VDD_32_33,
> > .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
> > MMC_CAP_CMD23,
> > @@ -111,7 +111,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = {
> > .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
> > TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,
> > .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
> > - MMC_CAP_CMD23,
> > + MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,
At least for the machines I could test, I did it correctly :/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-09 9:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08 13:34 [PATCH RFT] mmc: renesas_sdhi: enable WAIT_WHILE_BUSY Wolfram Sang
2021-04-09 5:40 ` Yoshihiro Shimoda
2021-04-09 9:37 ` Wolfram Sang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.