From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnsK-0003Bg-Pe for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnsK-0007PD-2a for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:52 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:42482) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnsJ-0007P9-UN for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:52 -0500 Received: by mail-qk0-x243.google.com with SMTP id d202so2654403qkc.9 for ; Wed, 03 Jan 2018 10:34:51 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 3 Jan 2018 15:34:02 -0300 Message-Id: <20180103183418.23730-10-f4bug@amsat.org> In-Reply-To: <20180103183418.23730-1-f4bug@amsat.org> References: <20180103183418.23730-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v4 09/25] sdhci: Fix 64-bit ADMA2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov , =?UTF-8?q?Gr=C3=A9gory=20Estrade?= , Prasad J Pandit Cc: Sai Pavan Boddu , qemu-devel@nongnu.org, Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= From: Sai Pavan Boddu The 64-bit ADMA address is not converted to the cpu endianes correctly. This patch fixes the issue and uses a valid mask for the attribute data. Signed-off-by: Sai Pavan Boddu [AF: Re-write commit message] Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 755bbbecd1..50b483cbf2 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -623,8 +623,8 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) dscr->length = le16_to_cpu(dscr->length); dma_memory_read(&s->dma_as, entry_addr + 4, (uint8_t *)(&dscr->addr), 8); - dscr->attr = le64_to_cpu(dscr->attr); - dscr->attr &= 0xfffffff8; + dscr->addr = le64_to_cpu(dscr->addr); + dscr->attr &= (uint8_t) ~0xC0; dscr->incr = 12; break; } -- 2.15.1