From: Alistair Francis <alistair23@gmail.com>
To: Tong Ho <tong.ho@xilinx.com>
Cc: Edgar Iglesias <edgar.iglesias@gmail.com>,
qemu-arm <qemu-arm@nongnu.org>,
"qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>,
Alistair Francis <alistair@alistair23.me>,
Peter Maydell <peter.maydell@linaro.org>
Subject: Re: [Patch 2/2] hw/arm/xlnx-zynqmp: Add unimplemented APU mmio
Date: Thu, 19 Aug 2021 16:32:47 +1000 [thread overview]
Message-ID: <CAKmqyKOy_64vEeanV5Wk-XprF83QN3=k_ZBS8AJ+KbOgSGcgxA@mail.gmail.com> (raw)
In-Reply-To: <20210819031525.653995-3-tong.ho@xilinx.com>
On Thu, Aug 19, 2021 at 1:22 PM Tong Ho <tong.ho@xilinx.com> wrote:
>
> Add unimplemented APU mmio region to xlnx-zynqmp for booting
> bare-metal guests built with standalone bsp published at:
> https://github.com/Xilinx/embeddedsw/tree/master/lib/bsp/standalone/src/arm/ARMv8/64bit
>
> Signed-off-by: Tong Ho <tong.ho@xilinx.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/arm/xlnx-zynqmp.c | 32 ++++++++++++++++++++++++++++++++
> include/hw/arm/xlnx-zynqmp.h | 7 +++++++
> 2 files changed, 39 insertions(+)
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index 3597e8db4d..790df2b6f1 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -20,6 +20,7 @@
> #include "qemu/module.h"
> #include "hw/arm/xlnx-zynqmp.h"
> #include "hw/intc/arm_gic_common.h"
> +#include "hw/misc/unimp.h"
> #include "hw/boards.h"
> #include "sysemu/kvm.h"
> #include "sysemu/sysemu.h"
> @@ -56,6 +57,9 @@
> #define DPDMA_ADDR 0xfd4c0000
> #define DPDMA_IRQ 116
>
> +#define APU_ADDR 0xfd5c0000
> +#define APU_SIZE 0x100
> +
> #define IPI_ADDR 0xFF300000
> #define IPI_IRQ 64
>
> @@ -222,6 +226,32 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s,
> qdev_realize(DEVICE(&s->rpu_cluster), NULL, &error_fatal);
> }
>
> +static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s)
> +{
> + static const struct UnimpInfo {
> + const char *name;
> + hwaddr base;
> + hwaddr size;
> + } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = {
> + { .name = "apu", APU_ADDR, APU_SIZE },
> + };
> +
> + unsigned nr;
> +
> + for (nr = 0; nr < ARRAY_SIZE(unimp_areas); nr++) {
> + const struct UnimpInfo *info = &unimp_areas[nr];
> + DeviceState *dev = qdev_new(TYPE_UNIMPLEMENTED_DEVICE);
> + SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> +
> + qdev_prop_set_string(dev, "name", info->name);
> + qdev_prop_set_uint64(dev, "size", info->size);
> + object_property_add_child(OBJECT(s), info->name, OBJECT(dev));
> +
> + sysbus_realize_and_unref(sbd, &error_fatal);
> + sysbus_mmio_map(sbd, 0, info->base);
> + }
> +}
> +
> static void xlnx_zynqmp_init(Object *obj)
> {
> MachineState *ms = MACHINE(qdev_get_machine());
> @@ -616,6 +646,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
> sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, RTC_ADDR);
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0, gic_spi[RTC_IRQ]);
>
> + xlnx_zynqmp_create_unimp_mmio(s);
> +
> for (i = 0; i < XLNX_ZYNQMP_NUM_GDMA_CH; i++) {
> if (!object_property_set_uint(OBJECT(&s->gdma[i]), "bus-width", 128,
> errp)) {
> diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
> index d3e2ef97f6..c84fe15996 100644
> --- a/include/hw/arm/xlnx-zynqmp.h
> +++ b/include/hw/arm/xlnx-zynqmp.h
> @@ -79,6 +79,11 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)
> #define XLNX_ZYNQMP_MAX_RAM_SIZE (XLNX_ZYNQMP_MAX_LOW_RAM_SIZE + \
> XLNX_ZYNQMP_MAX_HIGH_RAM_SIZE)
>
> +/*
> + * Unimplemented mmio regions needed to boot some images.
> + */
> +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1
> +
> struct XlnxZynqMPState {
> /*< private >*/
> DeviceState parent_obj;
> @@ -96,6 +101,8 @@ struct XlnxZynqMPState {
> MemoryRegion *ddr_ram;
> MemoryRegion ddr_ram_low, ddr_ram_high;
>
> + MemoryRegion mr_unimp[XLNX_ZYNQMP_NUM_UNIMP_AREAS];
> +
> CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS];
> CadenceUARTState uart[XLNX_ZYNQMP_NUM_UARTS];
> XlnxZynqMPCANState can[XLNX_ZYNQMP_NUM_CAN];
> --
> 2.25.1
>
>
next prev parent reply other threads:[~2021-08-19 6:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 3:15 [Patch 0/2] hw/arm/xlnx-versal: hw/arm/xlnx-zynqmp: Add unimplemented mmio Tong Ho
2021-08-19 3:15 ` [Patch 1/2] hw/arm/xlnx-versal: Add unimplemented APU mmio Tong Ho
2021-08-19 6:30 ` Alistair Francis
2021-08-20 12:13 ` Edgar E. Iglesias
2021-08-20 13:12 ` Philippe Mathieu-Daudé
2021-08-19 3:15 ` [Patch 2/2] hw/arm/xlnx-zynqmp: " Tong Ho
2021-08-19 6:32 ` Alistair Francis [this message]
2021-08-20 12:19 ` Edgar E. Iglesias
2021-08-20 13:14 ` 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='CAKmqyKOy_64vEeanV5Wk-XprF83QN3=k_ZBS8AJ+KbOgSGcgxA@mail.gmail.com' \
--to=alistair23@gmail.com \
--cc=alistair@alistair23.me \
--cc=edgar.iglesias@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=tong.ho@xilinx.com \
/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.