mmc: dw_mmc: Avoid hung state if GEN_CMD transfer fails

If we get a data error during a block transfer command, a stop command
(CMD12) is normally initiated. But this does not work for the general
command (CMD56), but instead the action is ignored and an uninitialized
command struct is used for the stop action, with unexpected result.

Fix this by adding a check for GEN_CMD when preparing stop transmission.

Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com>
Link: https://lore.kernel.org/r/20211103182716.28419-1-marten.lindahl@axis.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index d977f34f6b55587cbeeb4a1e0d520ca5ab5a2ed5..439080fbd87d883e6d58e6e77439b9ac1bd72eaa 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -335,7 +335,8 @@ static u32 dw_mci_prep_stop_abort(struct dw_mci *host, struct mmc_command *cmd)
            cmdr == MMC_WRITE_BLOCK ||
            cmdr == MMC_WRITE_MULTIPLE_BLOCK ||
            cmdr == MMC_SEND_TUNING_BLOCK ||
-           cmdr == MMC_SEND_TUNING_BLOCK_HS200) {
+           cmdr == MMC_SEND_TUNING_BLOCK_HS200 ||
+           cmdr == MMC_GEN_CMD) {
                stop->opcode = MMC_STOP_TRANSMISSION;
                stop->arg = 0;
                stop->flags = MMC_RSP_R1B | MMC_CMD_AC;