From: Hsin-Yi Wang <hsinyi@chromium.org>
To: Yong Mao <yong.mao@mediatek.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
srv_heupstream@mediatek.com, linux-mmc@vger.kernel.org,
lkml <linux-kernel@vger.kernel.org>,
linux-mediatek@lists.infradead.org,
Chaotian Jing <chaotian.jing@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
"moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH] mmc: mediatek: fix SDIO irq issue
Date: Tue, 21 Jan 2020 15:38:16 +0800 [thread overview]
Message-ID: <CAJMQK-gZcvpQTSqM4kNsnNOXpcOfJw9u-X9uedQDM6W2soF_4w@mail.gmail.com> (raw)
In-Reply-To: <1579591258-30940-2-git-send-email-yong.mao@mediatek.com>
On Tue, Jan 21, 2020 at 7:20 AM Yong Mao <yong.mao@mediatek.com> wrote:
>
> From: yong mao <yong.mao@mediatek.com>
>
> Host controller may lost interrupt in some specail case.
> Add SDIO irq recheck mechanism to make sure all interrupts
> can be processed immediately.
>
> Signed-off-by: Yong Mao <yong.mao@mediatek.com>
> ---
Thanks, mt8173 need this patch for cap-sdio-irq to work.
Tested-by: Hsin-Yi Wang <hsinyi@chromium.org>
> drivers/mmc/host/mtk-sd.c | 38 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
> diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
> index 7726dcf..18a1b86 100644
> --- a/drivers/mmc/host/mtk-sd.c
> +++ b/drivers/mmc/host/mtk-sd.c
> @@ -128,6 +128,7 @@
> #define MSDC_PS_CDSTS (0x1 << 1) /* R */
> #define MSDC_PS_CDDEBOUNCE (0xf << 12) /* RW */
> #define MSDC_PS_DAT (0xff << 16) /* R */
> +#define MSDC_PS_DATA1 (0x1 << 17) /* R */
> #define MSDC_PS_CMD (0x1 << 24) /* R */
> #define MSDC_PS_WP (0x1 << 31) /* R */
>
> @@ -361,6 +362,7 @@ struct msdc_save_para {
>
> struct mtk_mmc_compatible {
> u8 clk_div_bits;
> + bool recheck_sdio_irq;
> bool hs400_tune; /* only used for MT8173 */
> u32 pad_tune_reg;
> bool async_fifo;
> @@ -436,6 +438,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt8135_compat = {
> .clk_div_bits = 8,
> + .recheck_sdio_irq = false,
> .hs400_tune = false,
> .pad_tune_reg = MSDC_PAD_TUNE,
> .async_fifo = false,
> @@ -448,6 +451,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt8173_compat = {
> .clk_div_bits = 8,
> + .recheck_sdio_irq = true,
> .hs400_tune = true,
> .pad_tune_reg = MSDC_PAD_TUNE,
> .async_fifo = false,
> @@ -460,6 +464,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt8183_compat = {
> .clk_div_bits = 12,
> + .recheck_sdio_irq = false,
> .hs400_tune = false,
> .pad_tune_reg = MSDC_PAD_TUNE0,
> .async_fifo = true,
> @@ -472,6 +477,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt2701_compat = {
> .clk_div_bits = 12,
> + .recheck_sdio_irq = false,
> .hs400_tune = false,
> .pad_tune_reg = MSDC_PAD_TUNE0,
> .async_fifo = true,
> @@ -484,6 +490,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt2712_compat = {
> .clk_div_bits = 12,
> + .recheck_sdio_irq = false,
> .hs400_tune = false,
> .pad_tune_reg = MSDC_PAD_TUNE0,
> .async_fifo = true,
> @@ -496,6 +503,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt7622_compat = {
> .clk_div_bits = 12,
> + .recheck_sdio_irq = false,
> .hs400_tune = false,
> .pad_tune_reg = MSDC_PAD_TUNE0,
> .async_fifo = true,
> @@ -508,6 +516,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt8516_compat = {
> .clk_div_bits = 12,
> + .recheck_sdio_irq = false,
> .hs400_tune = false,
> .pad_tune_reg = MSDC_PAD_TUNE0,
> .async_fifo = true,
> @@ -518,6 +527,7 @@ struct msdc_host {
>
> static const struct mtk_mmc_compatible mt7620_compat = {
> .clk_div_bits = 8,
> + .recheck_sdio_irq = false,
> .hs400_tune = false,
> .pad_tune_reg = MSDC_PAD_TUNE,
> .async_fifo = false,
> @@ -1007,6 +1017,30 @@ static int msdc_auto_cmd_done(struct msdc_host *host, int events,
> return cmd->error;
> }
>
> +/**
> + * msdc_recheck_sdio_irq - recheck whether the SDIO irq is lost
> + *
> + * Host controller may lost interrupt in some special case.
> + * Add SDIO irq recheck mechanism to make sure all interrupts
> + * can be processed immediately
> + *
> + */
> +static void msdc_recheck_sdio_irq(struct msdc_host *host)
> +{
> + u32 reg_int, reg_inten, reg_ps;
> +
> + if ((host->mmc->caps & MMC_CAP_SDIO_IRQ)) {
> + reg_inten = readl(host->base + MSDC_INTEN);
> + if (reg_inten & MSDC_INTEN_SDIOIRQ) {
> + reg_int = readl(host->base + MSDC_INT);
> + reg_ps = readl(host->base + MSDC_PS);
> + if (!((reg_int & MSDC_INT_SDIOIRQ) ||
> + (reg_ps & MSDC_PS_DATA1)))
> + sdio_signal_irq(host->mmc);
> + }
> + }
> +}
> +
> static void msdc_track_cmd_data(struct msdc_host *host,
> struct mmc_command *cmd, struct mmc_data *data)
> {
> @@ -1035,6 +1069,8 @@ static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq)
> if (host->error)
> msdc_reset_hw(host);
> mmc_request_done(host->mmc, mrq);
> + if (host->dev_comp->recheck_sdio_irq)
> + msdc_recheck_sdio_irq(host);
> }
>
> /* returns true if command is fully handled; returns false otherwise */
> @@ -1393,6 +1429,8 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)
> if (enb) {
> sdr_set_bits(host->base + MSDC_INTEN, MSDC_INTEN_SDIOIRQ);
> sdr_set_bits(host->base + SDC_CFG, SDC_CFG_SDIOIDE);
> + if (host->dev_comp->recheck_sdio_irq)
> + msdc_recheck_sdio_irq(host);
> } else {
> sdr_clr_bits(host->base + MSDC_INTEN, MSDC_INTEN_SDIOIRQ);
> sdr_clr_bits(host->base + SDC_CFG, SDC_CFG_SDIOIDE);
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2020-01-21 7:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-21 7:20 [PATCH] mmc: mediatek: fix SDIO irq issue Yong Mao
2020-01-21 7:20 ` Yong Mao
2020-01-21 7:38 ` Hsin-Yi Wang [this message]
2020-02-10 4:24 ` Hsin-Yi Wang
2020-02-12 15:29 ` Ulf Hansson
2020-02-26 9:50 ` yong.mao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJMQK-gZcvpQTSqM4kNsnNOXpcOfJw9u-X9uedQDM6W2soF_4w@mail.gmail.com \
--to=hsinyi@chromium.org \
--cc=chaotian.jing@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=srv_heupstream@mediatek.com \
--cc=ulf.hansson@linaro.org \
--cc=yong.mao@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).