Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220907035847.13783-1-wenchao.chen666@gmail.com>
In-Reply-To: <20220907035847.13783-1-wenchao.chen666@gmail.com>
From:   Ulf Hansson <ulf.hansson@linaro.org>
Date:   Wed, 14 Sep 2022 16:00:54 +0200
Message-ID: <CAPDyKFpZN7=K2pTS2b0jsDp=uTVjTsQV+27e=rkGs_gMHfb97w@mail.gmail.com>
Subject: Re: [PATCH Vx 5/5] mmc: sdhci: Fix host->cmd is null
To:     Wenchao Chen <wenchao.chen666@gmail.com>
Cc:     adrian.hunter@intel.com, linux-mmc@vger.kernel.org,
        linux-kernel@vger.kernel.org, zhang.lyra@gmail.com,
        lzx.stg@gmail.com
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, 7 Sept 2022 at 06:00, Wenchao Chen <wenchao.chen666@gmail.com> wrote:
>
> From: Wenchao Chen <wenchao.chen@unisoc.com>
>
> When data crc occurs, the kernel will panic because host->cmd is null.
>
> Signed-off-by: Wenchao Chen <wenchao.chen@unisoc.com>

Applied for fixes, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 7689ffe..2511728 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -3928,7 +3928,7 @@ bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error,
>
>         if (intmask & (SDHCI_INT_INDEX | SDHCI_INT_END_BIT | SDHCI_INT_CRC)) {
>                 *cmd_error = -EILSEQ;
> -               if (!mmc_op_tuning(host->cmd->opcode))
> +               if (!mmc_op_tuning(SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND))))
>                         sdhci_err_stats_inc(host, CMD_CRC);
>         } else if (intmask & SDHCI_INT_TIMEOUT) {
>                 *cmd_error = -ETIMEDOUT;
> @@ -3938,7 +3938,7 @@ bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error,
>
>         if (intmask & (SDHCI_INT_DATA_END_BIT | SDHCI_INT_DATA_CRC)) {
>                 *data_error = -EILSEQ;
> -               if (!mmc_op_tuning(host->cmd->opcode))
> +               if (!mmc_op_tuning(SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND))))
>                         sdhci_err_stats_inc(host, DAT_CRC);
>         } else if (intmask & SDHCI_INT_DATA_TIMEOUT) {
>                 *data_error = -ETIMEDOUT;
> --
> 2.7.4
>