From: Andrew Baumann Date: Mon, 21 Dec 2015 22:47:48 +0000 (-0800) Subject: sdhci: don't raise a command index error for an unexpected response X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=62d32ec817f985ce1c38868d279d449c80975ff2;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git 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 --- diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index bc39d48ac..dd83e89d5 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) {