From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58449 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqQYA-0005uq-Ox for qemu-devel@nongnu.org; Fri, 18 Feb 2011 08:39:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PqQY9-0005UK-Db for qemu-devel@nongnu.org; Fri, 18 Feb 2011 08:39:10 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:42380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PqQY9-0005Tg-71 for qemu-devel@nongnu.org; Fri, 18 Feb 2011 08:39:09 -0500 From: Peter Maydell Date: Fri, 18 Feb 2011 13:39:00 +0000 Message-Id: <1298036340-11363-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] hw/sd.c: Add missing state change for SD_STATUS, SEND_NUM_WR_BLOCKS List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org The SD_STATUS and SEND_NUM_WR_BLOCKS commands are supposed to cause the card to send data back to the host. However sd.c was missing the state change to sd_sendingdata_state for these commands, with the effect that the Linux driver would either hang indefinitely waiting for nonexistent data (pl181) or read zeroes and provoke a qemu warning message (omap). Signed-off-by: Peter Maydell --- hw/sd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/sd.c b/hw/sd.c index 789ca84..5e29752 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -1168,6 +1168,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd, case 13: /* ACMD13: SD_STATUS */ switch (sd->state) { case sd_transfer_state: + sd->state = sd_sendingdata_state; sd->data_start = 0; sd->data_offset = 0; return sd_r1; @@ -1182,6 +1183,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd, case sd_transfer_state: *(uint32_t *) sd->data = sd->blk_written; + sd->state = sd_sendingdata_state; sd->data_start = 0; sd->data_offset = 0; return sd_r1; -- 1.7.1