From: Peter Maydell <peter.maydell@linaro.org>
Date: Sun, 18 Dec 2011 20:38:00 +0000 (+0100)
Subject: hw/sd.c: Clear status bits when read via response r6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fcfa9351c57985ebb54fe6aacd06a270880a561f;p=qemu-xen-4.3-testing.git

hw/sd.c: Clear status bits when read via response r6

Response format r6 includes a subset of the status bits;
clear the clear-on-read bits which are read by an r6 response.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
---

diff --git a/hw/sd.c b/hw/sd.c
index 6614cbf60..2b8ebe4d8 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -371,6 +371,7 @@ static void sd_response_r6_make(SDState *sd, uint8_t *response)
     status = ((sd->card_status >> 8) & 0xc000) |
              ((sd->card_status >> 6) & 0x2000) |
               (sd->card_status & 0x1fff);
+    sd->card_status &= ~(CARD_STATUS_C & 0xc81fff);
 
     response[0] = (arg >> 8) & 0xff;
     response[1] = arg & 0xff;