LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ulf Hansson <ulf.hansson@linaro.org>
To: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>, kernel <kernel@axis.com>,
	linux-mmc <linux-mmc@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mmc: dw_mmc: Only inject fault before done/error
Date: Mon, 6 Sep 2021 19:09:08 +0200	[thread overview]
Message-ID: <CAPDyKFoF1ghyRb+GsAcuHnCWVZx_TW7+XD4cSJ8GYPLffQqkmA@mail.gmail.com> (raw)
In-Reply-To: <20210825114213.7429-1-vincent.whitchurch@axis.com>

On Wed, 25 Aug 2021 at 13:42, Vincent Whitchurch
<vincent.whitchurch@axis.com> wrote:
>
> The fault injection function can set EVENT_DATA_ERROR but skip the
> setting of ->data_status to an error status if it hits just after a data
> over interrupt.  This confuses the tasklet which can later end up
> triggering the WARN_ON(host->cmd || ..) in dw_mci_request_end() since
> dw_mci_data_complete() would return success.
>
> Prevent the fault injection function from doing this since this is not a
> real case, and ensure that the fault injection doesn't race with a real
> error either.
>
> Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>

Applied for fixes and by adding a fixes tag, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/dw_mmc.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 6578cc64ae9e..380f9aa56eb2 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -1802,10 +1802,15 @@ static enum hrtimer_restart dw_mci_fault_timer(struct hrtimer *t)
>
>         spin_lock_irqsave(&host->irq_lock, flags);
>
> -       if (!host->data_status)
> +       /*
> +        * Only inject an error if we haven't already got an error or data over
> +        * interrupt.
> +        */
> +       if (!host->data_status) {
>                 host->data_status = SDMMC_INT_DCRC;
> -       set_bit(EVENT_DATA_ERROR, &host->pending_events);
> -       tasklet_schedule(&host->tasklet);
> +               set_bit(EVENT_DATA_ERROR, &host->pending_events);
> +               tasklet_schedule(&host->tasklet);
> +       }
>
>         spin_unlock_irqrestore(&host->irq_lock, flags);
>
> @@ -2721,12 +2726,16 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
>                 }
>
>                 if (pending & DW_MCI_DATA_ERROR_FLAGS) {
> +                       spin_lock(&host->irq_lock);
> +
>                         /* if there is an error report DATA_ERROR */
>                         mci_writel(host, RINTSTS, DW_MCI_DATA_ERROR_FLAGS);
>                         host->data_status = pending;
>                         smp_wmb(); /* drain writebuffer */
>                         set_bit(EVENT_DATA_ERROR, &host->pending_events);
>                         tasklet_schedule(&host->tasklet);
> +
> +                       spin_unlock(&host->irq_lock);
>                 }
>
>                 if (pending & SDMMC_INT_DATA_OVER) {
> --
> 2.28.0
>

      parent reply	other threads:[~2021-09-06 17:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20210825114239epcas1p30b69652c975c001082e729fc27ef04c1@epcas1p3.samsung.com>
2021-08-25 11:42 ` Vincent Whitchurch
2021-08-25 22:51   ` Jaehoon Chung
2021-09-06 17:09   ` Ulf Hansson [this message]

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=CAPDyKFoF1ghyRb+GsAcuHnCWVZx_TW7+XD4cSJ8GYPLffQqkmA@mail.gmail.com \
    --to=ulf.hansson@linaro.org \
    --cc=jh80.chung@samsung.com \
    --cc=kernel@axis.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=vincent.whitchurch@axis.com \
    --subject='Re: [PATCH] mmc: dw_mmc: Only inject fault before done/error' \
    /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

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