The addition of specific handlers for mmc-spi for SEND_CSD and SEND_CID has broken at least Linux and possibly also u-boot's mmc-spi code.
It looks like when adding the code, it is checking for these commands to not be in sd_standby_state but the check looks to have been accidentally reversed (see below) if (sd->state != sd_standby_state) { return sd_invalid_state_for_cmd(sd, req); } Linux shows the following: [ 0.293983] Waiting for root device /dev/mmcblk0... [ 1.363071] mmc0: error -38 whilst initialising SD card [ 2.418566] mmc0: error -38 whilst initialising SD card Fixes: da954d0e32444f122a4 ("hw/sd/sdcard: Add spi_cmd_SEND_CSD/CID handlers (CMD9 & CMD10)") Signed-off-by: Ben Dooks <ben.do...@codethink.co.uk> --- hw/sd/sd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 49fc79cf8a..e6c1ba7c5d 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1317,7 +1317,7 @@ static sd_rsp_type_t sd_cmd_SEND_IF_COND(SDState *sd, SDRequest req) /* CMD9 */ static sd_rsp_type_t spi_cmd_SEND_CSD(SDState *sd, SDRequest req) { - if (sd->state != sd_standby_state) { + if (sd->state == sd_standby_state) { return sd_invalid_state_for_cmd(sd, req); } return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req), @@ -1336,7 +1336,7 @@ static sd_rsp_type_t sd_cmd_SEND_CSD(SDState *sd, SDRequest req) /* CMD10 */ static sd_rsp_type_t spi_cmd_SEND_CID(SDState *sd, SDRequest req) { - if (sd->state != sd_standby_state) { + if (sd->state == sd_standby_state) { return sd_invalid_state_for_cmd(sd, req); } return sd_cmd_to_sendingdata(sd, req, sd_req_get_address(sd, req), @@ -1345,7 +1345,7 @@ static sd_rsp_type_t spi_cmd_SEND_CID(SDState *sd, SDRequest req) static sd_rsp_type_t sd_cmd_SEND_CID(SDState *sd, SDRequest req) { - if (sd->state != sd_standby_state) { + if (sd->state == sd_standby_state) { return sd_invalid_state_for_cmd(sd, req); } -- 2.37.2.352.g3c44437643