* [PATCH RFT] mmc: renesas_sdhi: register irqs before registering controller
@ 2023-07-10 14:08 Wolfram Sang
2023-07-10 14:35 ` Biju Das
2023-07-10 14:54 ` Geert Uytterhoeven
0 siblings, 2 replies; 5+ messages in thread
From: Wolfram Sang @ 2023-07-10 14:08 UTC (permalink / raw)
To: linux-renesas-soc, linux-mmc; +Cc: Wolfram Sang, Ulf Hansson, linux-kernel
IRQs should be ready to serve when we call mmc_add_host() via
tmio_mmc_host_probe(). To achieve that, ensure that all irqs are masked
before registering the handlers.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Based on 6.5-rc1 with bf54dec9e953 ("Revert "mmc: Revert "mmc: core:
Allow mmc_start_host() synchronously detect a card") reverted. That base
alone shows the regression. This patch works fine on a Salvator-X with a
M3-W. I'll test more boards. Yet, I send it out so people can tests with
boards I don't have.
drivers/mmc/host/renesas_sdhi_core.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 345934e4f59e..499d043f034f 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -1004,10 +1004,11 @@ int renesas_sdhi_probe(struct platform_device *pdev,
host->ops.start_signal_voltage_switch =
renesas_sdhi_start_signal_voltage_switch;
host->sdcard_irq_setbit_mask = TMIO_STAT_ALWAYS_SET_27;
- host->sdcard_irq_mask_all = TMIO_MASK_ALL_RCAR2;
host->reset = renesas_sdhi_reset;
}
+ host->sdcard_irq_mask_all = TMIO_MMC_MIN_RCAR2 ? TMIO_MASK_ALL_RCAR2 : TMIO_MASK_ALL;
+
/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
if (!host->bus_shift && resource_size(res) > 0x100) /* old way to determine the shift */
host->bus_shift = 1;
@@ -1100,9 +1101,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
host->ops.hs400_complete = renesas_sdhi_hs400_complete;
}
- ret = tmio_mmc_host_probe(host);
- if (ret < 0)
- goto edisclk;
+ sd_ctrl_write32_as_16_and_16(host, CTL_IRQ_MASK, host->sdcard_irq_mask_all);
num_irqs = platform_irq_count(pdev);
if (num_irqs < 0) {
@@ -1129,6 +1128,10 @@ int renesas_sdhi_probe(struct platform_device *pdev,
goto eirq;
}
+ ret = tmio_mmc_host_probe(host);
+ if (ret < 0)
+ goto edisclk;
+
dev_info(&pdev->dev, "%s base at %pa, max clock rate %u MHz\n",
mmc_hostname(host->mmc), &res->start, host->mmc->f_max / 1000000);
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* RE: [PATCH RFT] mmc: renesas_sdhi: register irqs before registering controller
2023-07-10 14:08 [PATCH RFT] mmc: renesas_sdhi: register irqs before registering controller Wolfram Sang
@ 2023-07-10 14:35 ` Biju Das
2023-07-10 14:54 ` Geert Uytterhoeven
1 sibling, 0 replies; 5+ messages in thread
From: Biju Das @ 2023-07-10 14:35 UTC (permalink / raw)
To: Wolfram Sang, linux-renesas-soc@vger.kernel.org,
linux-mmc@vger.kernel.org
Cc: Ulf Hansson, linux-kernel@vger.kernel.org
Hi Wolfram Sang,
Thanks for the patch.
> -----Original Message-----
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Sent: Monday, July 10, 2023 3:08 PM
> To: linux-renesas-soc@vger.kernel.org; linux-mmc@vger.kernel.org
> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>; Ulf Hansson
> <ulf.hansson@linaro.org>; linux-kernel@vger.kernel.org
> Subject: [PATCH RFT] mmc: renesas_sdhi: register irqs before registering
> controller
>
> IRQs should be ready to serve when we call mmc_add_host() via
> tmio_mmc_host_probe(). To achieve that, ensure that all irqs are masked
> before registering the handlers.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
>
> Based on 6.5-rc1 with bf54dec9e953 ("Revert "mmc: Revert "mmc: core:
> Allow mmc_start_host() synchronously detect a card") reverted. That base
> alone shows the regression. This patch works fine on a Salvator-X with a
> M3-W. I'll test more boards. Yet, I send it out so people can tests with
> boards I don't have.
Tested on RZ/V2L SMARC EVK, after Revert "mmc: Revert "mmc: core: Allow mmc_start_host() synchronously detect a card""
Cheers,
Biju
>
> drivers/mmc/host/renesas_sdhi_core.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/renesas_sdhi_core.c
> b/drivers/mmc/host/renesas_sdhi_core.c
> index 345934e4f59e..499d043f034f 100644
> --- a/drivers/mmc/host/renesas_sdhi_core.c
> +++ b/drivers/mmc/host/renesas_sdhi_core.c
> @@ -1004,10 +1004,11 @@ int renesas_sdhi_probe(struct platform_device
> *pdev,
> host->ops.start_signal_voltage_switch =
> renesas_sdhi_start_signal_voltage_switch;
> host->sdcard_irq_setbit_mask = TMIO_STAT_ALWAYS_SET_27;
> - host->sdcard_irq_mask_all = TMIO_MASK_ALL_RCAR2;
> host->reset = renesas_sdhi_reset;
> }
>
> + host->sdcard_irq_mask_all = TMIO_MMC_MIN_RCAR2 ?
> TMIO_MASK_ALL_RCAR2 :
> +TMIO_MASK_ALL;
> +
> /* Orginally registers were 16 bit apart, could be 32 or 64
> nowadays */
> if (!host->bus_shift && resource_size(res) > 0x100) /* old way to
> determine the shift */
> host->bus_shift = 1;
> @@ -1100,9 +1101,7 @@ int renesas_sdhi_probe(struct platform_device
> *pdev,
> host->ops.hs400_complete = renesas_sdhi_hs400_complete;
> }
>
> - ret = tmio_mmc_host_probe(host);
> - if (ret < 0)
> - goto edisclk;
> + sd_ctrl_write32_as_16_and_16(host, CTL_IRQ_MASK,
> +host->sdcard_irq_mask_all);
>
> num_irqs = platform_irq_count(pdev);
> if (num_irqs < 0) {
> @@ -1129,6 +1128,10 @@ int renesas_sdhi_probe(struct platform_device
> *pdev,
> goto eirq;
> }
>
> + ret = tmio_mmc_host_probe(host);
> + if (ret < 0)
> + goto edisclk;
> +
> dev_info(&pdev->dev, "%s base at %pa, max clock rate %u MHz\n",
> mmc_hostname(host->mmc), &res->start, host->mmc->f_max /
> 1000000);
>
> --
> 2.35.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH RFT] mmc: renesas_sdhi: register irqs before registering controller
2023-07-10 14:08 [PATCH RFT] mmc: renesas_sdhi: register irqs before registering controller Wolfram Sang
2023-07-10 14:35 ` Biju Das
@ 2023-07-10 14:54 ` Geert Uytterhoeven
2023-07-11 20:00 ` Geert Uytterhoeven
1 sibling, 1 reply; 5+ messages in thread
From: Geert Uytterhoeven @ 2023-07-10 14:54 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, linux-mmc, Ulf Hansson, linux-kernel
Hi Wolfram,
On Mon, Jul 10, 2023 at 4:10 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> IRQs should be ready to serve when we call mmc_add_host() via
> tmio_mmc_host_probe(). To achieve that, ensure that all irqs are masked
> before registering the handlers.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Thanks for your patch!
> Based on 6.5-rc1 with bf54dec9e953 ("Revert "mmc: Revert "mmc: core:
> Allow mmc_start_host() synchronously detect a card") reverted. That base
> alone shows the regression. This patch works fine on a Salvator-X with a
> M3-W. I'll test more boards. Yet, I send it out so people can tests with
> boards I don't have.
I guess bf54dec9e953 is your local commit that reverts commit
fa700d73494abbd3 ("mmc: Revert "mmc: core: Allow mmc_start_host()
synchronously detect a card"") in v6.5-rc1?
> --- a/drivers/mmc/host/renesas_sdhi_core.c
> +++ b/drivers/mmc/host/renesas_sdhi_core.c
> @@ -1004,10 +1004,11 @@ int renesas_sdhi_probe(struct platform_device *pdev,
> host->ops.start_signal_voltage_switch =
> renesas_sdhi_start_signal_voltage_switch;
> host->sdcard_irq_setbit_mask = TMIO_STAT_ALWAYS_SET_27;
> - host->sdcard_irq_mask_all = TMIO_MASK_ALL_RCAR2;
> host->reset = renesas_sdhi_reset;
> }
>
> + host->sdcard_irq_mask_all = TMIO_MMC_MIN_RCAR2 ? TMIO_MASK_ALL_RCAR2 : TMIO_MASK_ALL;
The condition above is always true. I assume you wanted to test
"mmc_data->flags & TMIO_MMC_MIN_RCAR2" instead?
> +
> /* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
> if (!host->bus_shift && resource_size(res) > 0x100) /* old way to determine the shift */
> host->bus_shift = 1;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH RFT] mmc: renesas_sdhi: register irqs before registering controller
2023-07-10 14:54 ` Geert Uytterhoeven
@ 2023-07-11 20:00 ` Geert Uytterhoeven
2023-07-12 12:26 ` Wolfram Sang
0 siblings, 1 reply; 5+ messages in thread
From: Geert Uytterhoeven @ 2023-07-11 20:00 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, linux-mmc, Ulf Hansson, linux-kernel
Hi Wolfram,
On Mon, Jul 10, 2023 at 4:54 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Mon, Jul 10, 2023 at 4:10 PM Wolfram Sang
> <wsa+renesas@sang-engineering.com> wrote:
> > IRQs should be ready to serve when we call mmc_add_host() via
> > tmio_mmc_host_probe(). To achieve that, ensure that all irqs are masked
> > before registering the handlers.
> >
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> Thanks for your patch!
>
> > Based on 6.5-rc1 with bf54dec9e953 ("Revert "mmc: Revert "mmc: core:
> > Allow mmc_start_host() synchronously detect a card") reverted. That base
> > alone shows the regression. This patch works fine on a Salvator-X with a
> > M3-W. I'll test more boards. Yet, I send it out so people can tests with
> > boards I don't have.
>
> I guess bf54dec9e953 is your local commit that reverts commit
> fa700d73494abbd3 ("mmc: Revert "mmc: core: Allow mmc_start_host()
> synchronously detect a card"") in v6.5-rc1?
>
> > --- a/drivers/mmc/host/renesas_sdhi_core.c
> > +++ b/drivers/mmc/host/renesas_sdhi_core.c
> > @@ -1004,10 +1004,11 @@ int renesas_sdhi_probe(struct platform_device *pdev,
> > host->ops.start_signal_voltage_switch =
> > renesas_sdhi_start_signal_voltage_switch;
> > host->sdcard_irq_setbit_mask = TMIO_STAT_ALWAYS_SET_27;
> > - host->sdcard_irq_mask_all = TMIO_MASK_ALL_RCAR2;
> > host->reset = renesas_sdhi_reset;
> > }
> >
> > + host->sdcard_irq_mask_all = TMIO_MMC_MIN_RCAR2 ? TMIO_MASK_ALL_RCAR2 : TMIO_MASK_ALL;
>
> The condition above is always true. I assume you wanted to test
> "mmc_data->flags & TMIO_MMC_MIN_RCAR2" instead?
No issues seen after reverting fa700d73494abbd3 and applying your patch
(plus the fix below) on top of today's renesas-drivers release.
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -1004,11 +1004,12 @@ int renesas_sdhi_probe(struct platform_device *pdev,
host->ops.start_signal_voltage_switch =
renesas_sdhi_start_signal_voltage_switch;
host->sdcard_irq_setbit_mask = TMIO_STAT_ALWAYS_SET_27;
+ host->sdcard_irq_mask_all = TMIO_MASK_ALL_RCAR2;
host->reset = renesas_sdhi_reset;
+ } else {
+ host->sdcard_irq_mask_all = TMIO_MASK_ALL;
}
- host->sdcard_irq_mask_all = TMIO_MMC_MIN_RCAR2 ?
TMIO_MASK_ALL_RCAR2 : TMIO_MASK_ALL;
-
/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
if (!host->bus_shift && resource_size(res) > 0x100) /* old way
to determine the shift */
host->bus_shift = 1;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-12 12:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-10 14:08 [PATCH RFT] mmc: renesas_sdhi: register irqs before registering controller Wolfram Sang
2023-07-10 14:35 ` Biju Das
2023-07-10 14:54 ` Geert Uytterhoeven
2023-07-11 20:00 ` Geert Uytterhoeven
2023-07-12 12:26 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox