mmc: sdhci: Fix host->cmd is null
authorWenchao Chen <wenchao.chen@unisoc.com>
Wed, 7 Sep 2022 03:58:47 +0000 (11:58 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 14 Sep 2022 10:03:32 +0000 (12:03 +0200)
When data crc occurs, the kernel will panic because host->cmd is null.

Signed-off-by: Wenchao Chen <wenchao.chen@unisoc.com>
Fixes: efe8f5c9b5e1 ("mmc: sdhci: Capture eMMC and SD card errors")
Cc: stable@vger.kernel.org
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20220907035847.13783-1-wenchao.chen666@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci.c

index 7689ffe..2511728 100644 (file)
@@ -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;