[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 5/6] hw/misc: Add a model of the Xilinx ZynqMP APU Control
|
From: |
Francisco Iglesias |
|
Subject: |
Re: [PATCH v1 5/6] hw/misc: Add a model of the Xilinx ZynqMP APU Control |
|
Date: |
Mon, 31 Jan 2022 15:46:27 +0000 |
|
User-agent: |
NeoMutt/20170113 (1.7.2) |
Hi Edgar,
Some minor comments again, otherwise it looks good to me!
On Mon, Jan 31, 2022 at 12:12:05AM +0100, Edgar E. Iglesias wrote:
> From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
>
> Add a model of the Xilinx ZynqMP APU Control.
>
> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> ---
> include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 91 +++++++++
> hw/misc/xlnx-zynqmp-apu-ctrl.c | 257 +++++++++++++++++++++++++
> hw/misc/meson.build | 1 +
> 3 files changed, 349 insertions(+)
> create mode 100644 include/hw/misc/xlnx-zynqmp-apu-ctrl.h
> create mode 100644 hw/misc/xlnx-zynqmp-apu-ctrl.c
>
> diff --git a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h
> b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h
> new file mode 100644
> index 0000000000..44bf264cef
> --- /dev/null
> +++ b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h
> @@ -0,0 +1,91 @@
> +/*
> + * QEMU model of ZynqMP APU Control.
> + *
> + * Copyright (c) 2013-2022 Xilinx Inc
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + *
> + * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com> and
> + * Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> + *
> + */
> +
Include guards are missing here again.
> +#include "hw/sysbus.h"
> +#include "hw/register.h"
> +#include "target/arm/cpu.h"
> +
> +#define TYPE_XLNX_ZYNQMP_APU_CTRL "xlnx.apu-ctrl"
> +
> +#define XLNX_ZYNQMP_APU(obj) \
> + OBJECT_CHECK(XlnxZynqMPAPUCtrl, (obj), TYPE_XLNX_ZYNQMP_APU_CTRL)
> +
> +REG32(APU_ERR_CTRL, 0x0)
> + FIELD(APU_ERR_CTRL, PSLVERR, 0, 1)
> +REG32(ISR, 0x10)
> + FIELD(ISR, INV_APB, 0, 1)
> +REG32(IMR, 0x14)
> + FIELD(IMR, INV_APB, 0, 1)
> +REG32(IEN, 0x18)
> + FIELD(IEN, INV_APB, 0, 1)
> +REG32(IDS, 0x1c)
> + FIELD(IDS, INV_APB, 0, 1)
> +REG32(CONFIG_0, 0x20)
> + FIELD(CONFIG_0, CFGTE, 24, 4)
> + FIELD(CONFIG_0, CFGEND, 16, 4)
> + FIELD(CONFIG_0, VINITHI, 8, 4)
> + FIELD(CONFIG_0, AA64NAA32, 0, 4)
> +REG32(CONFIG_1, 0x24)
> + FIELD(CONFIG_1, L2RSTDISABLE, 29, 1)
> + FIELD(CONFIG_1, L1RSTDISABLE, 28, 1)
> + FIELD(CONFIG_1, CP15DISABLE, 0, 4)
> +REG32(RVBARADDR0L, 0x40)
> + FIELD(RVBARADDR0L, ADDR, 2, 30)
> +REG32(RVBARADDR0H, 0x44)
> + FIELD(RVBARADDR0H, ADDR, 0, 8)
> +REG32(RVBARADDR1L, 0x48)
> + FIELD(RVBARADDR1L, ADDR, 2, 30)
> +REG32(RVBARADDR1H, 0x4c)
> + FIELD(RVBARADDR1H, ADDR, 0, 8)
> +REG32(RVBARADDR2L, 0x50)
> + FIELD(RVBARADDR2L, ADDR, 2, 30)
> +REG32(RVBARADDR2H, 0x54)
> + FIELD(RVBARADDR2H, ADDR, 0, 8)
> +REG32(RVBARADDR3L, 0x58)
> + FIELD(RVBARADDR3L, ADDR, 2, 30)
> +REG32(RVBARADDR3H, 0x5c)
> + FIELD(RVBARADDR3H, ADDR, 0, 8)
> +REG32(ACE_CTRL, 0x60)
> + FIELD(ACE_CTRL, AWQOS, 16, 4)
> + FIELD(ACE_CTRL, ARQOS, 0, 4)
> +REG32(SNOOP_CTRL, 0x80)
> + FIELD(SNOOP_CTRL, ACE_INACT, 4, 1)
> + FIELD(SNOOP_CTRL, ACP_INACT, 0, 1)
> +REG32(PWRCTL, 0x90)
> + FIELD(PWRCTL, CLREXMONREQ, 17, 1)
> + FIELD(PWRCTL, L2FLUSHREQ, 16, 1)
> + FIELD(PWRCTL, CPUPWRDWNREQ, 0, 4)
> +REG32(PWRSTAT, 0x94)
> + FIELD(PWRSTAT, CLREXMONACK, 17, 1)
> + FIELD(PWRSTAT, L2FLUSHDONE, 16, 1)
> + FIELD(PWRSTAT, DBGNOPWRDWN, 0, 4)
> +
> +#define APU_R_MAX ((R_PWRSTAT) + 1)
> +
> +#define NUM_CPUS 4
> +
> +typedef struct XlnxZynqMPAPUCtrl {
> + SysBusDevice busdev;
> +
> + ARMCPU *cpus[NUM_CPUS];
> + /* WFIs towards PMU. */
> + qemu_irq wfi_out[4];
> + /* CPU Power status towards INTC Redirect. */
> + qemu_irq cpu_power_status[4];
> + qemu_irq irq_imr;
> +
> + uint8_t cpu_pwrdwn_req;
> + uint8_t cpu_in_wfi;
> +
> + RegisterInfoArray *reg_array;
> + uint32_t regs[APU_R_MAX];
> + RegisterInfo regs_info[APU_R_MAX];
> +} XlnxZynqMPAPUCtrl;
> diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c
> new file mode 100644
> index 0000000000..c27b8b9253
> --- /dev/null
> +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c
> @@ -0,0 +1,257 @@
> +/*
> + * QEMU model of the ZynqMP APU Control.
> + *
> + * Copyright (c) 2013-2022 Xilinx Inc
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + *
> + * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com> and
> + * Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qemu/log.h"
> +#include "migration/vmstate.h"
> +#include "hw/qdev-properties.h"
> +#include "hw/sysbus.h"
> +#include "hw/irq.h"
> +#include "hw/register.h"
> +
> +#include "qemu/bitops.h"
> +#include "qapi/qmp/qerror.h"
> +
> +#include "hw/misc/xlnx-zynqmp-apu-ctrl.h"
> +
> +#ifndef XILINX_ZYNQMP_APU_ERR_DEBUG
> +#define XILINX_ZYNQMP_APU_ERR_DEBUG 1
> +#endif
> +
> +static void update_wfi_out(void *opaque)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(opaque);
> + unsigned int i, wfi_pending;
> +
> + wfi_pending = s->cpu_pwrdwn_req & s->cpu_in_wfi;
> + for (i = 0; i < NUM_CPUS; i++) {
> + qemu_set_irq(s->wfi_out[i], !!(wfi_pending & (1 << i)));
> + }
> +}
> +
> +static void zynqmp_apu_rvbar_post_write(RegisterInfo *reg, uint64_t val)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(reg->opaque);
> + int i;
> +
> + for (i = 0; i < NUM_CPUS; ++i) {
> + uint64_t rvbar = s->regs[R_RVBARADDR0L + 2 * i] +
> + ((uint64_t)s->regs[R_RVBARADDR0H + 2 * i] << 32);
> + if (s->cpus[i]) {
> + object_property_set_int(OBJECT(s->cpus[i]), "rvbar", rvbar,
> + &error_abort);
> + }
> + }
> +}
> +
> +static void zynqmp_apu_pwrctl_post_write(RegisterInfo *reg, uint64_t val)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(reg->opaque);
> + unsigned int i, new;
> +
> + for (i = 0; i < NUM_CPUS; i++) {
> + new = val & (1 << i);
> + /* Check if CPU's CPUPWRDNREQ has changed. If yes, update GPIOs. */
> + if (new != (s->cpu_pwrdwn_req & (1 << i))) {
> + qemu_set_irq(s->cpu_power_status[i], !!new);
> + }
> + s->cpu_pwrdwn_req &= ~(1 << i);
> + s->cpu_pwrdwn_req |= new;
> + }
> + update_wfi_out(s);
> +}
> +
> +static void imr_update_irq(XlnxZynqMPAPUCtrl *s)
> +{
> + bool pending = s->regs[R_ISR] & ~s->regs[R_IMR];
> + qemu_set_irq(s->irq_imr, pending);
> +}
> +
> +static void isr_postw(RegisterInfo *reg, uint64_t val64)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(reg->opaque);
> + imr_update_irq(s);
> +}
> +
> +static uint64_t ien_prew(RegisterInfo *reg, uint64_t val64)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(reg->opaque);
> + uint32_t val = val64;
> +
> + s->regs[R_IMR] &= ~val;
> + imr_update_irq(s);
> + return 0;
> +}
> +
> +static uint64_t ids_prew(RegisterInfo *reg, uint64_t val64)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(reg->opaque);
> + uint32_t val = val64;
> +
> + s->regs[R_IMR] |= val;
> + imr_update_irq(s);
> + return 0;
> +}
> +
> +static const RegisterAccessInfo zynqmp_apu_regs_info[] = {
> +#define RVBAR_REGDEF(n) \
> + { .name = "RVBAR CPU " #n " Low", .addr = A_RVBARADDR ## n ## L, \
> + .reset = 0xffff0000ul, \
> + .post_write = zynqmp_apu_rvbar_post_write, \
> + },{ .name = "RVBAR CPU " #n " High", .addr = A_RVBARADDR ## n ## H, \
> + .post_write = zynqmp_apu_rvbar_post_write, \
> + }
> + { .name = "ERR_CTRL", .addr = A_APU_ERR_CTRL,
> + },{ .name = "ISR", .addr = A_ISR,
> + .w1c = 0x1,
> + .post_write = isr_postw,
> + },{ .name = "IMR", .addr = A_IMR,
> + .reset = 0x1,
> + .ro = 0x1,
> + },{ .name = "IEN", .addr = A_IEN,
> + .pre_write = ien_prew,
> + },{ .name = "IDS", .addr = A_IDS,
> + .pre_write = ids_prew,
> + },{ .name = "CONFIG_0", .addr = A_CONFIG_0,
> + .reset = 0xf0f,
> + },{ .name = "CONFIG_1", .addr = A_CONFIG_1,
> + },
> + RVBAR_REGDEF(0),
> + RVBAR_REGDEF(1),
> + RVBAR_REGDEF(2),
> + RVBAR_REGDEF(3),
> + { .name = "ACE_CTRL", .addr = A_ACE_CTRL,
> + .reset = 0xf000f,
> + },{ .name = "SNOOP_CTRL", .addr = A_SNOOP_CTRL,
> + },{ .name = "PWRCTL", .addr = A_PWRCTL,
> + .post_write = zynqmp_apu_pwrctl_post_write,
> + },{ .name = "PWRSTAT", .addr = A_PWRSTAT,
> + .ro = 0x3000f,
> + }
> +};
> +
> +static void zynqmp_apu_reset_enter(Object *obj, ResetType type)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(obj);
> + int i;
> +
> + for (i = 0; i < APU_R_MAX; ++i) {
> + register_reset(&s->regs_info[i]);
> + }
> +
> + s->cpu_pwrdwn_req = 0;
> + s->cpu_in_wfi = 0;
> +}
> +
> +static void zynqmp_apu_reset_hold(Object *obj)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(obj);
> +
> + update_wfi_out(s);
> + imr_update_irq(s);
> +}
> +
> +static const MemoryRegionOps zynqmp_apu_ops = {
> + .read = register_read_memory,
> + .write = register_write_memory,
> + .endianness = DEVICE_LITTLE_ENDIAN,
> + .valid = {
> + .min_access_size = 4,
> + .max_access_size = 4,
> + }
> +};
> +
> +static void zynqmp_apu_handle_wfi(void *opaque, int irq, int level)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(opaque);
> +
> + s->cpu_in_wfi = deposit32(s->cpu_in_wfi, irq, 1, level);
> + update_wfi_out(s);
> +}
> +
> +static void zynqmp_apu_init(Object *obj)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(obj);
> + int i;
> +
> + s->reg_array =
> + register_init_block32(DEVICE(obj), zynqmp_apu_regs_info,
> + ARRAY_SIZE(zynqmp_apu_regs_info),
> + s->regs_info, s->regs,
> + &zynqmp_apu_ops,
> + XILINX_ZYNQMP_APU_ERR_DEBUG,
> + APU_R_MAX * 4);
> + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->reg_array->mem);
> + sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq_imr);
> +
> + for (i = 0; i < NUM_CPUS; ++i) {
> + g_autofree gchar *prop_name = g_strdup_printf("cpu%d", i);
> + object_property_add_link(obj, prop_name, TYPE_ARM_CPU,
Indentation needs a minor correction on the lines below.
> + (Object **)&s->cpus[i],
> + qdev_prop_allow_set_link_before_realize,
> + OBJ_PROP_LINK_STRONG);
> + }
> +
> + /* wfi_out is used to connect to PMU GPIs. */
> + qdev_init_gpio_out_named(DEVICE(obj), s->wfi_out, "wfi_out", 4);
> + /* CPU_POWER_STATUS is used to connect to INTC redirect. */
> + qdev_init_gpio_out_named(DEVICE(obj), s->cpu_power_status,
> + "CPU_POWER_STATUS", 4);
> + /* wfi_in is used as input from CPUs as wfi request. */
> + qdev_init_gpio_in_named(DEVICE(obj), zynqmp_apu_handle_wfi, "wfi_in", 4);
> +}
> +
> +static void zynqmp_apu_finalize(Object *obj)
> +{
> + XlnxZynqMPAPUCtrl *s = XLNX_ZYNQMP_APU(obj);
> + register_finalize_block(s->reg_array);
> +}
> +
> +static const VMStateDescription vmstate_zynqmp_apu = {
> + .name = TYPE_XLNX_ZYNQMP_APU_CTRL,
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT32_ARRAY(regs, XlnxZynqMPAPUCtrl, APU_R_MAX),
> + VMSTATE_END_OF_LIST(),
> + }
> +};
> +
> +static void zynqmp_apu_class_init(ObjectClass *klass, void *data)
> +{
> + ResettableClass *rc = RESETTABLE_CLASS(klass);
> + DeviceClass *dc = DEVICE_CLASS(klass);
> +
> + dc->vmsd = &vmstate_zynqmp_apu;
> +
> + rc->phases.enter = zynqmp_apu_reset_enter;
> + rc->phases.hold = zynqmp_apu_reset_hold;
> +}
> +
> +static const TypeInfo zynqmp_apu_info = {
> + .name = TYPE_XLNX_ZYNQMP_APU_CTRL,
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(XlnxZynqMPAPUCtrl),
> + .class_init = zynqmp_apu_class_init,
> + .instance_init = zynqmp_apu_init,
> + .instance_finalize = zynqmp_apu_finalize,
> + .interfaces = (InterfaceInfo[]) {
> + { }
Interfaces can be removed above.
Best regards,
Francisco Iglesias
> + },
> +};
> +
> +static void zynqmp_apu_register_types(void)
> +{
> + type_register_static(&zynqmp_apu_info);
> +}
> +
> +type_init(zynqmp_apu_register_types)
> diff --git a/hw/misc/meson.build b/hw/misc/meson.build
> index 1927f13a5e..cf9d4cc618 100644
> --- a/hw/misc/meson.build
> +++ b/hw/misc/meson.build
> @@ -85,6 +85,7 @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(
> softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))
> softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c'))
> specific_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true:
> files('xlnx-zynqmp-crf.c'))
> +specific_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true:
> files('xlnx-zynqmp-apu-ctrl.c'))
> softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files(
> 'xlnx-versal-xramc.c',
> 'xlnx-versal-pmc-iou-slcr.c',
> --
> 2.25.1
>