From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnsF-00036T-78 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnsE-0007LU-Bz for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:47 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:33494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnsE-0007LH-7V for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:46 -0500 Received: by mail-qt0-x241.google.com with SMTP id e2so3238144qti.0 for ; Wed, 03 Jan 2018 10:34:46 -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:00 -0300 Message-Id: <20180103183418.23730-8-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 07/25] sdhci: add a 'dma' shortcut property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Peter Crosthwaite disabling it disables all DMAs at once. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/sd/sdhci.h | 1 + hw/sd/sdhci.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 4a9c3e9175..bac37f9e11 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -101,6 +101,7 @@ typedef struct SDHCIState { bool pending_insert_state; /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ + bool dma; /* shortcut for sdma + adma* */ uint8_t spec_version; struct { /* v1 */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 8692798021..cc1e28fa61 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1178,6 +1178,10 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) } s->version = (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); + if (!s->dma) { + s->cap.sdma = s->cap.adma1 = s->cap.adma2 = false; + } + if (s->capareg == UINT64_MAX) { sdhci_init_capareg(s, errp); } @@ -1312,6 +1316,7 @@ static Property sdhci_properties[] = { * Possible values: 512, 1024, 2048 bytes */ DEFINE_PROP_UINT16("max-block-length", SDHCIState, cap.max_blk_len, 512), /* DMA */ + DEFINE_PROP_BOOL("dma", SDHCIState, dma, true), /* shortcut */ DEFINE_PROP_BOOL("sdma", SDHCIState, cap.sdma, true), DEFINE_PROP_BOOL("adma1", SDHCIState, cap.adma1, false), DEFINE_PROP_BOOL("adma2", SDHCIState, cap.adma2, true), -- 2.15.1