From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-trivial@nongnu.org,
"Alistair Francis" <alistair@alistair23.me>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Niek Linnenbank" <nieklinnenbank@gmail.com>,
qemu-arm@nongnu.org, "Antony Pavlov" <antonynpavlov@gmail.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Joel Stanley" <joel@jms.id.au>
Subject: [PATCH v2 3/7] hw/arm/xlnx-versal: Versal SoC requires ZDMA
Date: Sun, 31 Jan 2021 11:59:14 +0100 [thread overview]
Message-ID: <20210131105918.228787-4-f4bug@amsat.org> (raw)
In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org>
The Versal SoC instantiates the TYPE_XLNX_ZDMA object in
versal_create_admas(). Introduce the XLNX_ZDMA configuration
and select it to fix:
$ qemu-system-aarch64 -M xlnx-versal-virt ...
qemu-system-aarch64: missing object type 'xlnx.zdma'
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Alistair Francis <alistair@alistair23.me>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
---
hw/arm/Kconfig | 2 ++
hw/dma/Kconfig | 3 +++
hw/dma/meson.build | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 223016bb4e8..09298881f2f 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -354,6 +354,7 @@ config XLNX_ZYNQMP_ARM
select XILINX_AXI
select XILINX_SPIPS
select XLNX_ZYNQMP
+ select XLNX_ZDMA
config XLNX_VERSAL
bool
@@ -362,6 +363,7 @@ config XLNX_VERSAL
select CADENCE
select VIRTIO_MMIO
select UNIMP
+ select XLNX_ZDMA
config NPCM7XX
bool
diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
index d67492d36c1..5d6be1a7a7a 100644
--- a/hw/dma/Kconfig
+++ b/hw/dma/Kconfig
@@ -18,6 +18,9 @@ config ZYNQ_DEVCFG
bool
select REGISTER
+config XLNX_ZDMA
+ bool
+
config STP2000
bool
diff --git a/hw/dma/meson.build b/hw/dma/meson.build
index b991d7698c7..47b4a7cb47b 100644
--- a/hw/dma/meson.build
+++ b/hw/dma/meson.build
@@ -9,7 +9,7 @@
softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.c'))
-softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c'))
softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
--
2.26.2
next parent reply other threads:[~2021-01-31 11:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210131105918.228787-1-f4bug@amsat.org>
2021-01-31 10:59 ` Philippe Mathieu-Daudé [this message]
2021-02-01 15:17 ` [PATCH v2 3/7] hw/arm/xlnx-versal: Versal SoC requires ZDMA Alistair Francis
2021-01-31 10:59 ` [PATCH v2 4/7] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build Philippe Mathieu-Daudé
2021-02-01 15:29 ` Alistair Francis
2021-01-31 10:59 ` [PATCH v2 7/7] hw/arm: Display CPU type in machine description Philippe Mathieu-Daudé
2021-02-01 15:17 ` Alistair Francis
[not found] ` <20210131105918.228787-7-f4bug@amsat.org>
[not found] ` <5cb160b9-f9a4-05af-9a94-ade51bf4beb7@amsat.org>
2021-01-31 15:30 ` [PATCH v2 6/7] hw/arm/xlnx-zcu102: Restrict ZynqMP ZCU102 board to 64-bit build Philippe Mathieu-Daudé
[not found] ` <20210131105918.228787-6-f4bug@amsat.org>
[not found] ` <a741601e-8ad5-99ad-decf-14dc007900b8@amsat.org>
2021-01-31 15:31 ` [PATCH v2 5/7] hw/arm/sbsa-ref: Restrict SBSA-ref " Philippe Mathieu-Daudé
[not found] ` <20210131105918.228787-2-f4bug@amsat.org>
2021-02-01 15:16 ` [PATCH v2 1/7] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Alistair Francis
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=20210131105918.228787-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alistair@alistair23.me \
--cc=antonynpavlov@gmail.com \
--cc=edgar.iglesias@gmail.com \
--cc=joel@jms.id.au \
--cc=laurent@vivier.eu \
--cc=mjt@tls.msk.ru \
--cc=nieklinnenbank@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.