From patchwork Wed Feb 7 18:19:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 870584 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="J1LOfxod"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zc8t64QbQz9s4q for ; Thu, 8 Feb 2018 05:26:38 +1100 (AEDT) Received: from localhost ([::1]:42191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejUQW-0007PF-Iz for incoming@patchwork.ozlabs.org; Wed, 07 Feb 2018 13:26:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejUKQ-0002JQ-2o for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejUKM-00057S-Tf for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:18 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:41252) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejUKM-00057C-Oj for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:14 -0500 Received: by mail-qk0-x241.google.com with SMTP id p23so2313721qke.8 for ; Wed, 07 Feb 2018 10:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=RldiyJtXgKSv6aIyDF4Bw2DSLRJ/Lqj5qevxnbkIgfU=; b=J1LOfxodX6ZAroJTv5X14X/2AZkwJn0rGzBaoXSy59xIk9soiarCdQxxcXi/zOeI2/ RnR5w3252IB4UwvI0eke9jfuEp8SMvsaCdAYvuPMVWYEcnOnJVIBCbY6iKumT3C7Oado LMpbgsZ7HcNCQCfHJ8b4RmqPonP0fjBhqRMBJc7BVH52GswbkH8GVz8qULnEmANZP2lf UxSOLWIb3uAfUzQOFuN5cGU6mpm9WRVui1v7hK5WtUf/iozR2g3DGmz2o7c0XxBHsVcu Ozaf7+9QdrOzCp53Mj2yRiPhJtbHHdxJtBUQEffIF9/CEdYmamO+Qxq2gtJvS7LB8nH1 Susg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=RldiyJtXgKSv6aIyDF4Bw2DSLRJ/Lqj5qevxnbkIgfU=; b=MnCeEX1/JOktdlDzm9ssA+Wfon3f/q5o9OKoNFcOnNDtUtBCMXwiIw0glBaZ3IPzH/ 3ejzYZME3IpyEp+aYtfKCKy8z9cr0aihRn/qBGXeJmNk6ILummqFDpiZAjecYcYUvL8N Xc4UGOy3e7DqwI7YY5FEqiJpmP0o6VL0CxYw+Jz9+jlKOYU3EWptrddhHxtz4gRq2fAV lbuIrbVUMyVursiKGFaPZ5URVIlcYOkKk0Dec6tbFQPK+W/rUEutG+KZmG+Ifg/QIJea Q+NCJ+T8h4L9HxDL6+K/IaUPfXeMz/jbvyf0TqBYRk8madKbhzRk8FX6HqrU98jMAKoG 16xQ== X-Gm-Message-State: APf1xPCEn6LrA1PExwPfZGdt76fAQIDimBWLuj7va2qCxN5yVOPJpMOI 4DJU3vePpikv+h3W0xhuOSQ= X-Google-Smtp-Source: AH8x226qD1hrlyiWRHWdjFppDIkxFHkhAv5XYZXF/NP18+/GcBF1oL6ZH5SeLseAzWKplRpiRZKMKw== X-Received: by 10.55.20.24 with SMTP id e24mr9564525qkh.287.1518027614403; Wed, 07 Feb 2018 10:20:14 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id f7sm1426248qtm.21.2018.02.07.10.20.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 10:20:13 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Stefan Hajnoczi , Peter Maydell Date: Wed, 7 Feb 2018 15:19:25 -0300 Message-Id: <20180207181929.8701-13-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207181929.8701-1-f4bug@amsat.org> References: <20180207181929.8701-1-f4bug@amsat.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v10 12/16] sdhci: Fix 64-bit ADMA2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sai Pavan Boddu , "Edgar E . Iglesias" , qemu-devel@nongnu.org, Alistair Francis Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 8d7a1469f7..8962070f24 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -667,8 +667,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; }