From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXSsd-0005ip-7M for qemu-devel@nongnu.org; Sat, 19 Oct 2013 05:31:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VXSsV-0006nE-A0 for qemu-devel@nongnu.org; Sat, 19 Oct 2013 05:31:31 -0400 Received: from 2.mo5.mail-out.ovh.net ([178.33.109.111]:40951 helo=mo5.mail-out.ovh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXSsV-0006kP-4W for qemu-devel@nongnu.org; Sat, 19 Oct 2013 05:31:23 -0400 Received: from mail31.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo5.mail-out.ovh.net (Postfix) with SMTP id 9A998FF8CB4 for ; Sat, 19 Oct 2013 11:31:37 +0200 (CEST) From: Jean-Christophe PLAGNIOL-VILLARD Date: Sat, 19 Oct 2013 11:33:03 +0200 Message-Id: <1382175183-27090-1-git-send-email-plagnioj@jcrosoft.com> Subject: [Qemu-devel] [PATCH 1/1] sd: pl181: fix fifo count read support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jean-Christophe PLAGNIOL-VILLARD as it's depend on current direction Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- hw/sd/pl181.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 03875bf..91adbbd 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -344,7 +344,11 @@ static uint64_t pl181_read(void *opaque, hwaddr offset, data engine. DataCnt is decremented after each byte is transferred between the serial engine and the card. We don't emulate this level of detail, so both can be the same. */ - tmp = (s->datacnt + 3) >> 2; + if (s->datactrl & PL181_DATA_DIRECTION) + tmp = s->fifo_len; + else + tmp = s->datacnt; + tmp = (tmp + 3) >> 2; if (s->linux_hack) { s->linux_hack = 0; pl181_fifo_run(s); -- 1.8.4.rc3