From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Alistair Francis <alistair.francis@xilinx.com>,
"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>,
Peter Maydell <peter.maydell@linaro.org>,
Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org,
"Peter Crosthwaite" <crosthwaite.peter@gmail.com>
Subject: [Qemu-devel] [PATCH v4 07/25] sdhci: add a 'dma' shortcut property
Date: Wed, 3 Jan 2018 15:34:00 -0300 [thread overview]
Message-ID: <20180103183418.23730-8-f4bug@amsat.org> (raw)
In-Reply-To: <20180103183418.23730-1-f4bug@amsat.org>
disabling it disables all DMAs at once.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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
next prev parent reply other threads:[~2018-01-03 18:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 18:33 [Qemu-devel] [PATCH v4 00/25] SDHCI: add qtests and fix few issues Philippe Mathieu-Daudé
2018-01-03 18:33 ` [Qemu-devel] [PATCH v4 01/25] sdhci: add a spec_version property Philippe Mathieu-Daudé
2018-01-04 17:51 ` Alistair Francis
2018-01-04 19:36 ` Philippe Mathieu-Daudé
2018-01-03 18:33 ` [Qemu-devel] [PATCH v4 02/25] sdhci: add basic Spec v1 capabilities Philippe Mathieu-Daudé
2018-01-03 18:33 ` [Qemu-devel] [PATCH v4 03/25] sdhci: add max-block-length capability (Spec v1) Philippe Mathieu-Daudé
2018-01-03 18:33 ` [Qemu-devel] [PATCH v4 05/25] sdhci: add DMA and 64-bit capabilities (Spec v2) Philippe Mathieu-Daudé
2018-01-03 18:33 ` [Qemu-devel] [PATCH v4 06/25] sdhci: default to Spec v2 Philippe Mathieu-Daudé
2018-01-03 18:34 ` Philippe Mathieu-Daudé [this message]
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 09/25] sdhci: Fix 64-bit ADMA2 Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 10/25] hw/arm/exynos4210: implement SDHCI Spec v2 Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 11/25] hw/arm/xilinx_zynq: " Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 12/25] sdhci: add qtest to check the SD Spec version Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 13/25] sdhci: check Spec v2 capabilities qtest Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 15/25] sdhci: rename the hostctl1 register Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 16/25] hw/arm/bcm2835_peripherals: implement SDHCI Spec v3 Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 17/25] hw/arm/fsl-imx6: " Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 18/25] hw/arm/xilinx_zynqmp: " Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 19/25] sdhci: check Spec v3 capabilities qtest Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 20/25] sdhci: remove the deprecated 'capareg' property Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 21/25] sdhci: add check_capab_readonly() qtest Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 22/25] sdhci: add a check_capab_baseclock() qtest Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 23/25] sdhci: add a check_capab_sdma() qtest Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 24/25] sdhci: add a check_capab_v3() qtest Philippe Mathieu-Daudé
2018-01-03 18:34 ` [Qemu-devel] [PATCH v4 25/25] sdhci: add Spec v4.2 register definitions Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180103183418.23730-8-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alistair.francis@xilinx.com \
--cc=andrew.smirnov@gmail.com \
--cc=crosthwaite.peter@gmail.com \
--cc=edgar.iglesias@xilinx.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).