From e41d7018f5731baa15b41a4c283cfde15133939e Mon Sep 17 00:00:00 2001 From: Andrew Baumann Date: Mon, 21 Dec 2015 14:47:48 -0800 Subject: sdhci: don't raise a command index error for an unexpected response This deletes a block of code that raised a command index error if a command returned response data, but the guest did not set the appropriate bits in the response register to handle such a response. I cannot find any documentation that suggests the controller should behave in this way, the error code doesn't make sense (command index error is defined for the case where the index in a response does not match that of the issued command), and in at least one case (CMD23 issued by UEFI on Raspberry Pi 2), actual hardware does not do this. Signed-off-by: Andrew Baumann Reviewed-by: Peter Crosthwaite Message-id: 1450738069-18664-3-git-send-email-Andrew.Baumann@microsoft.com Signed-off-by: Stefan Hajnoczi --- hw/sd/sdhci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index bc39d48..dd83e89 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -243,9 +243,6 @@ static void sdhci_send_command(SDHCIState *s) (s->cmdreg & SDHC_CMD_RESPONSE) == SDHC_CMD_RSP_WITH_BUSY) { s->norintsts |= SDHC_NIS_TRSCMP; } - } else if (rlen != 0 && (s->errintstsen & SDHC_EISEN_CMDIDX)) { - s->errintsts |= SDHC_EIS_CMDIDX; - s->norintsts |= SDHC_NIS_ERR; } if (s->norintstsen & SDHC_NISEN_CMDCMP) { -- cgit v1.1