hw/arm: zynqmp: Add CRF and APU control to support PSCI
Subsystems (2)
v2 cover hw/arm: zynqmp: Add CRF and APU control to support PSCI
From: "Edgar E. Iglesias" <[email protected]>
This adds the necessary modeling to support some of our firmware tests at EL3 implementing PSCI (TBM). These are the test-cases that were previously relying on QEMU's builtin PSCI emulation.
I've only tested this on top of Peter's recent PSCI emulation fixes.
Cheers,
Edgar
ChangeLog:
v1 -> v2:
* crf: Change APU_MAX_CPU to CRF_MAX_CPU
* crf: Remove empty interfaces
* crf: Add include guards
* apu-ctrl: Change NUM_CPUS to APU_MAX_CPU
* apu-ctrl: Fix indentation
* apu-ctrl: Remove empty interfaces
* apu-ctrl: Add include guards
* xlnx-zynqmp: Add comment clarifying SER/DESerializer
Edgar E. Iglesias (6):
hw/arm/xlnx-zynqmp: Add an unimplemented SERDES area target/arm: Make rvbar settable after realize hw/misc: Add a model of the Xilinx ZynqMP CRF hw/arm/xlnx-zynqmp: Connect the ZynqMP CRF hw/misc: Add a model of the Xilinx ZynqMP APU Control hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control
include/hw/arm/xlnx-zynqmp.h | 4 + include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 95 +++++++++ include/hw/misc/xlnx-zynqmp-crf.h | 213 ++++++++++++++++++++ hw/arm/xlnx-zynqmp.c | 46 ++++- hw/misc/xlnx-zynqmp-apu-ctrl.c | 254 +++++++++++++++++++++++ hw/misc/xlnx-zynqmp-crf.c | 267 +++++++++++++++++++++++++ target/arm/cpu.c | 7 +- hw/misc/meson.build | 2 + 8 files changed, 882 insertions(+), 6 deletions(-) create mode 100644 include/hw/misc/xlnx-zynqmp-apu-ctrl.h create mode 100644 include/hw/misc/xlnx-zynqmp-crf.h create mode 100644 hw/misc/xlnx-zynqmp-apu-ctrl.c create mode 100644 hw/misc/xlnx-zynqmp-crf.c
Signature · 1 line
2.25.1
PATCH v2 1/6 hw/arm/xlnx-zynqmp: Add an unimplemented SERDES area
From: "Edgar E. Iglesias" <[email protected]>
Add an unimplemented SERDES (Serializer/Deserializer) area.
--- include/hw/arm/xlnx-zynqmp.h | 2 +- hw/arm/xlnx-zynqmp.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
include/hw/arm/xlnx-zynqmp.h +1 -1
@@ -84,7 +84,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)/* * Unimplemented mmio regions needed to boot some images. */ -#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1 +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2struct XlnxZynqMPState {/*< private >*/
hw/arm/xlnx-zynqmp.c +5 -0
@@ -51,6 +51,10 @@#define QSPI_IRQ 15#define QSPI_DMA_ADDR 0xff0f0800 +/* Serializer/Deserializer. */ +#define SERDES_ADDR 0xfd400000 +#define SERDES_SIZE 0x20000 +#define DP_ADDR 0xfd4a0000#define DP_IRQ 113
@@ -284,6 +288,7 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s)hwaddr size; } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = { { .name = "apu", APU_ADDR, APU_SIZE }, + { .name = "serdes", SERDES_ADDR, SERDES_SIZE }, }; unsigned int nr;
Signature · 1 line
2.25.1
PATCH v2 2/6 target/arm: Make rvbar settable after realize
In reply to Edgar E. IglesiasFrom: "Edgar E. Iglesias" <[email protected]>
Make the rvbar property settable after realize. This is done in preparation to model the ZynqMP's runtime configurable rvbar.
--- target/arm/cpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
target/arm/cpu.c +3 -4
@@ -1128,9 +1128,6 @@ static Property arm_cpu_reset_cbar_property =static Property arm_cpu_reset_hivecs_property =DEFINE_PROP_BOOL ("reset-hivecs" ,ARMCPU , reset_hivecs, false); -static Property arm_cpu_rvbar_property = -DEFINE_PROP_UINT64 ("rvbar" ,ARMCPU , rvbar,0 ); -#ifndef CONFIG_USER_ONLY static Property arm_cpu_has_el2_property =DEFINE_PROP_BOOL ("has_el2" ,ARMCPU , has_el2, true);
@@ -1233,7 +1230,9 @@ void arm_cpu_post_init(Object *obj) }if (arm_feature (&cpu->env,ARM_FEATURE_AARCH64 )) { -qdev_property_add_static (DEVICE (obj), &arm_cpu_rvbar_property); +object_property_add_uint64_ptr (obj,"rvbar" , + &cpu->rvbar, +OBJ_PROP_FLAG_READWRITE ); }#ifndef CONFIG_USER_ONLY
Signature · 1 line
2.25.1
Re: [PATCH v2 2/6] target/arm: Make rvbar settable after realize
Hi Edgar,
Oops I mistakenly answered on v1 :)
Quoted 25 lines · Edgar E. Iglesias
From: "Edgar E. Iglesias" <[email protected]>
Make the rvbar property settable after realize. This is done in preparation to model the ZynqMP's runtime configurable rvbar.
Signed-off-by Edgar E. Iglesias <[email protected]>--- target/arm/cpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)target/arm/cpu.c +0
-3@@ -1128,9 +1128,6 @@ static Property arm_cpu_reset_cbar_property =static Property arm_cpu_reset_hivecs_property =DEFINE_PROP_BOOL ("reset-hivecs" ,ARMCPU , reset_hivecs, false); -static Property arm_cpu_rvbar_property = -DEFINE_PROP_UINT64 ("rvbar" ,ARMCPU , rvbar,0 ); -#ifndef CONFIG_USER_ONLY static Property arm_cpu_has_el2_property =DEFINE_PROP_BOOL ("has_el2" ,ARMCPU , has_el2, true);
target/arm/cpu.c void arm_cpu_post_init(Object *obj) · line 1235
Quoted 7 lines
target/arm/cpu.c +3
-1@@ -1233,7 +1230,9 @@ void arm_cpu_post_init(Object *obj) }if (arm_feature (&cpu->env,ARM_FEATURE_AARCH64 )) { -qdev_property_add_static (DEVICE (obj), &arm_cpu_rvbar_property); +object_property_add_uint64_ptr (obj,"rvbar" , + &cpu->rvbar, +OBJ_PROP_FLAG_READWRITE );
I think you may have a problem here. cpu->rvbar is used to define the reset value of the rvbar_elx registers in register_cp_regs_for_features. This is done at realize time. Changing the rvbar property after realize would fail to update the rvbar_elx register values.
I guess you should also switch to a .readfn instead of a .resetvalue for those registers.
Signature · 1 line
Luc
Quoted 6 lines
target/arm/cpu.c +0
-0}#ifndef CONFIG_USER_ONLY Signature · 1 line
2.25.1
PATCH v2 3/6 hw/misc: Add a model of the Xilinx ZynqMP CRF
In reply to Edgar E. IglesiasFrom: "Edgar E. Iglesias" <[email protected]>
Add a model of the Xilinx ZynqMP CRF. At the moment this is mostly a stub model.
--- include/hw/misc/xlnx-zynqmp-crf.h | 213 ++++++++++++++++++++++++ hw/misc/xlnx-zynqmp-crf.c | 267 ++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 481 insertions(+) create mode 100644 include/hw/misc/xlnx-zynqmp-crf.h create mode 100644 hw/misc/xlnx-zynqmp-crf.c
include/hw/misc/xlnx-zynqmp-crf.h new file +213 -0
@@ -0,0 +1,213 @@ +/* +* QEMU model of the CRF - Clock Reset FPD. +* +* Copyright (c) 2022 Xilinx Inc. +* SPDX-License-Identifier: GPL-2.0-or-later +* Written by Edgar E. Iglesias <[email protected]> +*/ +#ifndef HW_MISC_XLNX_ZYNQMP_CRF_H +#define HW_MISC_XLNX_ZYNQMP_CRF_H + +#include "hw/sysbus.h" +#include "hw/register.h" + +#define TYPE_XLNX_ZYNQMP_CRF "xlnx.zynqmp_crf" + +#define XILINX_CRF (obj) \ + OBJECT_CHECK(XlnxZynqMPCRF, (obj), TYPE_XLNX_ZYNQMP_CRF) + +REG32(ERR_CTRL, 0x0) + FIELD(ERR_CTRL, SLVERR_ENABLE, 0, 1) +REG32(IR_STATUS, 0x4) + FIELD(IR_STATUS, ADDR_DECODE_ERR, 0, 1) +REG32(IR_MASK, 0x8) + FIELD(IR_MASK, ADDR_DECODE_ERR, 0, 1) +REG32(IR_ENABLE, 0xc) + FIELD(IR_ENABLE, ADDR_DECODE_ERR, 0, 1) +REG32(IR_DISABLE, 0x10) + FIELD(IR_DISABLE, ADDR_DECODE_ERR, 0, 1) +REG32(CRF_WPROT, 0x1c) + FIELD(CRF_WPROT, ACTIVE, 0, 1) +REG32(APLL_CTRL, 0x20) + FIELD(APLL_CTRL, POST_SRC, 24, 3) + FIELD(APLL_CTRL, PRE_SRC, 20, 3) + FIELD(APLL_CTRL, CLKOUTDIV, 17, 1) + FIELD(APLL_CTRL, DIV2, 16, 1) + FIELD(APLL_CTRL, FBDIV, 8, 7) + FIELD(APLL_CTRL, BYPASS, 3, 1) + FIELD(APLL_CTRL, RESET, 0, 1) +REG32(APLL_CFG, 0x24) + FIELD(APLL_CFG, LOCK_DLY, 25, 7) + FIELD(APLL_CFG, LOCK_CNT, 13, 10) + FIELD(APLL_CFG, LFHF, 10, 2) + FIELD(APLL_CFG, CP, 5, 4) + FIELD(APLL_CFG, RES, 0, 4) +REG32(APLL_FRAC_CFG, 0x28) + FIELD(APLL_FRAC_CFG, ENABLED, 31, 1) + FIELD(APLL_FRAC_CFG, SEED, 22, 3) + FIELD(APLL_FRAC_CFG, ALGRTHM, 19, 1) + FIELD(APLL_FRAC_CFG, ORDER, 18, 1) + FIELD(APLL_FRAC_CFG, DATA, 0, 16) +REG32(DPLL_CTRL, 0x2c) + FIELD(DPLL_CTRL, POST_SRC, 24, 3) + FIELD(DPLL_CTRL, PRE_SRC, 20, 3) + FIELD(DPLL_CTRL, CLKOUTDIV, 17, 1) + FIELD(DPLL_CTRL, DIV2, 16, 1) + FIELD(DPLL_CTRL, FBDIV, 8, 7) + FIELD(DPLL_CTRL, BYPASS, 3, 1) + FIELD(DPLL_CTRL, RESET, 0, 1) +REG32(DPLL_CFG, 0x30) + FIELD(DPLL_CFG, LOCK_DLY, 25, 7) + FIELD(DPLL_CFG, LOCK_CNT, 13, 10) + FIELD(DPLL_CFG, LFHF, 10, 2) + FIELD(DPLL_CFG, CP, 5, 4) + FIELD(DPLL_CFG, RES, 0, 4) +REG32(DPLL_FRAC_CFG, 0x34) + FIELD(DPLL_FRAC_CFG, ENABLED, 31, 1) + FIELD(DPLL_FRAC_CFG, SEED, 22, 3) + FIELD(DPLL_FRAC_CFG, ALGRTHM, 19, 1) + FIELD(DPLL_FRAC_CFG, ORDER, 18, 1) + FIELD(DPLL_FRAC_CFG, DATA, 0, 16) +REG32(VPLL_CTRL, 0x38) + FIELD(VPLL_CTRL, POST_SRC, 24, 3) + FIELD(VPLL_CTRL, PRE_SRC, 20, 3) + FIELD(VPLL_CTRL, CLKOUTDIV, 17, 1) + FIELD(VPLL_CTRL, DIV2, 16, 1) + FIELD(VPLL_CTRL, FBDIV, 8, 7) + FIELD(VPLL_CTRL, BYPASS, 3, 1) + FIELD(VPLL_CTRL, RESET, 0, 1) +REG32(VPLL_CFG, 0x3c) + FIELD(VPLL_CFG, LOCK_DLY, 25, 7) + FIELD(VPLL_CFG, LOCK_CNT, 13, 10) + FIELD(VPLL_CFG, LFHF, 10, 2) + FIELD(VPLL_CFG, CP, 5, 4) + FIELD(VPLL_CFG, RES, 0, 4) +REG32(VPLL_FRAC_CFG, 0x40) + FIELD(VPLL_FRAC_CFG, ENABLED, 31, 1) + FIELD(VPLL_FRAC_CFG, SEED, 22, 3) + FIELD(VPLL_FRAC_CFG, ALGRTHM, 19, 1) + FIELD(VPLL_FRAC_CFG, ORDER, 18, 1) + FIELD(VPLL_FRAC_CFG, DATA, 0, 16) +REG32(PLL_STATUS, 0x44) + FIELD(PLL_STATUS, VPLL_STABLE, 5, 1) + FIELD(PLL_STATUS, DPLL_STABLE, 4, 1) + FIELD(PLL_STATUS, APLL_STABLE, 3, 1) + FIELD(PLL_STATUS, VPLL_LOCK, 2, 1) + FIELD(PLL_STATUS, DPLL_LOCK, 1, 1) + FIELD(PLL_STATUS, APLL_LOCK, 0, 1) +REG32(APLL_TO_LPD_CTRL, 0x48) + FIELD(APLL_TO_LPD_CTRL, DIVISOR0, 8, 6) +REG32(DPLL_TO_LPD_CTRL, 0x4c) + FIELD(DPLL_TO_LPD_CTRL, DIVISOR0, 8, 6) +REG32(VPLL_TO_LPD_CTRL, 0x50) + FIELD(VPLL_TO_LPD_CTRL, DIVISOR0, 8, 6) +REG32(ACPU_CTRL, 0x60) + FIELD(ACPU_CTRL, CLKACT_HALF, 25, 1) + FIELD(ACPU_CTRL, CLKACT_FULL, 24, 1) + FIELD(ACPU_CTRL, DIVISOR0, 8, 6) + FIELD(ACPU_CTRL, SRCSEL, 0, 3) +REG32(DBG_TRACE_CTRL, 0x64) + FIELD(DBG_TRACE_CTRL, CLKACT, 24, 1) + FIELD(DBG_TRACE_CTRL, DIVISOR0, 8, 6) + FIELD(DBG_TRACE_CTRL, SRCSEL, 0, 3) +REG32(DBG_FPD_CTRL, 0x68) + FIELD(DBG_FPD_CTRL, CLKACT, 24, 1) + FIELD(DBG_FPD_CTRL, DIVISOR0, 8, 6) + FIELD(DBG_FPD_CTRL, SRCSEL, 0, 3) +REG32(DP_VIDEO_REF_CTRL, 0x70) + FIELD(DP_VIDEO_REF_CTRL, CLKACT, 24, 1) + FIELD(DP_VIDEO_REF_CTRL, DIVISOR1, 16, 6) + FIELD(DP_VIDEO_REF_CTRL, DIVISOR0, 8, 6) + FIELD(DP_VIDEO_REF_CTRL, SRCSEL, 0, 3) +REG32(DP_AUDIO_REF_CTRL, 0x74) + FIELD(DP_AUDIO_REF_CTRL, CLKACT, 24, 1) + FIELD(DP_AUDIO_REF_CTRL, DIVISOR1, 16, 6) + FIELD(DP_AUDIO_REF_CTRL, DIVISOR0, 8, 6) + FIELD(DP_AUDIO_REF_CTRL, SRCSEL, 0, 3) +REG32(DP_STC_REF_CTRL, 0x7c) + FIELD(DP_STC_REF_CTRL, CLKACT, 24, 1) + FIELD(DP_STC_REF_CTRL, DIVISOR1, 16, 6) + FIELD(DP_STC_REF_CTRL, DIVISOR0, 8, 6) + FIELD(DP_STC_REF_CTRL, SRCSEL, 0, 3) +REG32(DDR_CTRL, 0x80) + FIELD(DDR_CTRL, CLKACT, 24, 1) + FIELD(DDR_CTRL, DIVISOR0, 8, 6) + FIELD(DDR_CTRL, SRCSEL, 0, 3) +REG32(GPU_REF_CTRL, 0x84) + FIELD(GPU_REF_CTRL, PP1_CLKACT, 26, 1) + FIELD(GPU_REF_CTRL, PP0_CLKACT, 25, 1) + FIELD(GPU_REF_CTRL, CLKACT, 24, 1) + FIELD(GPU_REF_CTRL, DIVISOR0, 8, 6) + FIELD(GPU_REF_CTRL, SRCSEL, 0, 3) +REG32(SATA_REF_CTRL, 0xa0) + FIELD(SATA_REF_CTRL, CLKACT, 24, 1) + FIELD(SATA_REF_CTRL, DIVISOR0, 8, 6) + FIELD(SATA_REF_CTRL, SRCSEL, 0, 3) +REG32(PCIE_REF_CTRL, 0xb4) + FIELD(PCIE_REF_CTRL, CLKACT, 24, 1) + FIELD(PCIE_REF_CTRL, DIVISOR0, 8, 6) + FIELD(PCIE_REF_CTRL, SRCSEL, 0, 3) +REG32(GDMA_REF_CTRL, 0xb8) + FIELD(GDMA_REF_CTRL, CLKACT, 24, 1) + FIELD(GDMA_REF_CTRL, DIVISOR0, 8, 6) + FIELD(GDMA_REF_CTRL, SRCSEL, 0, 3) +REG32(DPDMA_REF_CTRL, 0xbc) + FIELD(DPDMA_REF_CTRL, CLKACT, 24, 1) + FIELD(DPDMA_REF_CTRL, DIVISOR0, 8, 6) + FIELD(DPDMA_REF_CTRL, SRCSEL, 0, 3) +REG32(TOPSW_MAIN_CTRL, 0xc0) + FIELD(TOPSW_MAIN_CTRL, CLKACT, 24, 1) + FIELD(TOPSW_MAIN_CTRL, DIVISOR0, 8, 6) + FIELD(TOPSW_MAIN_CTRL, SRCSEL, 0, 3) +REG32(TOPSW_LSBUS_CTRL, 0xc4) + FIELD(TOPSW_LSBUS_CTRL, CLKACT, 24, 1) + FIELD(TOPSW_LSBUS_CTRL, DIVISOR0, 8, 6) + FIELD(TOPSW_LSBUS_CTRL, SRCSEL, 0, 3) +REG32(DBG_TSTMP_CTRL, 0xf8) + FIELD(DBG_TSTMP_CTRL, DIVISOR0, 8, 6) + FIELD(DBG_TSTMP_CTRL, SRCSEL, 0, 3) +REG32(RST_FPD_TOP, 0x100) + FIELD(RST_FPD_TOP, PCIE_CFG_RESET, 19, 1) + FIELD(RST_FPD_TOP, PCIE_BRIDGE_RESET, 18, 1) + FIELD(RST_FPD_TOP, PCIE_CTRL_RESET, 17, 1) + FIELD(RST_FPD_TOP, DP_RESET, 16, 1) + FIELD(RST_FPD_TOP, SWDT_RESET, 15, 1) + FIELD(RST_FPD_TOP, AFI_FM5_RESET, 12, 1) + FIELD(RST_FPD_TOP, AFI_FM4_RESET, 11, 1) + FIELD(RST_FPD_TOP, AFI_FM3_RESET, 10, 1) + FIELD(RST_FPD_TOP, AFI_FM2_RESET, 9, 1) + FIELD(RST_FPD_TOP, AFI_FM1_RESET, 8, 1) + FIELD(RST_FPD_TOP, AFI_FM0_RESET, 7, 1) + FIELD(RST_FPD_TOP, GDMA_RESET, 6, 1) + FIELD(RST_FPD_TOP, GPU_PP1_RESET, 5, 1) + FIELD(RST_FPD_TOP, GPU_PP0_RESET, 4, 1) + FIELD(RST_FPD_TOP, GPU_RESET, 3, 1) + FIELD(RST_FPD_TOP, GT_RESET, 2, 1) + FIELD(RST_FPD_TOP, SATA_RESET, 1, 1) +REG32(RST_FPD_APU, 0x104) + FIELD(RST_FPD_APU, ACPU3_PWRON_RESET, 13, 1) + FIELD(RST_FPD_APU, ACPU2_PWRON_RESET, 12, 1) + FIELD(RST_FPD_APU, ACPU1_PWRON_RESET, 11, 1) + FIELD(RST_FPD_APU, ACPU0_PWRON_RESET, 10, 1) + FIELD(RST_FPD_APU, APU_L2_RESET, 8, 1) + FIELD(RST_FPD_APU, ACPU3_RESET, 3, 1) + FIELD(RST_FPD_APU, ACPU2_RESET, 2, 1) + FIELD(RST_FPD_APU, ACPU1_RESET, 1, 1) + FIELD(RST_FPD_APU, ACPU0_RESET, 0, 1) +REG32(RST_DDR_SS, 0x108) + FIELD(RST_DDR_SS, DDR_RESET, 3, 1) + FIELD(RST_DDR_SS, APM_RESET, 2, 1) + +#define CRF_R_MAX (R_RST_DDR_SS + 1) + +typedef struct XlnxZynqMPCRF { +SysBusDevice parent_obj; +MemoryRegion iomem; +qemu_irq irq_ir; + +RegisterInfoArray *reg_array; +uint32_t regs[CRF_R_MAX ]; +RegisterInfo regs_info[CRF_R_MAX ]; +}XlnxZynqMPCRF ; + +#endif
hw/misc/xlnx-zynqmp-crf.c new file +267 -0
267 lines not on this page · raw message
hw/misc/meson.build +1 -0
@@ -84,6 +84,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')) softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files( 'xlnx-versal-xramc.c', 'xlnx-versal-pmc-iou-slcr.c',
Signature · 1 line
2.25.1
Re: [PATCH v2 3/6] hw/misc: Add a model of the Xilinx ZynqMP CRF
hw/misc/xlnx-zynqmp-crf.c line 236
Quoted 11 lines · Edgar E. Iglesias
From: "Edgar E. Iglesias" <[email protected]>
Add a model of the Xilinx ZynqMP CRF. At the moment this is mostly a stub model.
hw/misc/xlnx-zynqmp-crf.c new file +5
-0+static const VMStateDescription vmstate_crf = { + .name =TYPE_XLNX_ZYNQMP_CRF , + .version_id =1 , + .minimum_version_id =1 , + .minimum_version_id_old =1 ,
This is still on my to-review list to look at properly, but this setting of .minimum_version_id_old is incorrect. The field is only used if the VMStateDescription sets a non-NULL load_state_old function, which this one does not.
We cleaned this up in commit 17e313406126, and I'm about to send a patch which drops the fields entirely.
thanks
-- PMM
Re: [PATCH v2 3/6] hw/misc: Add a model of the Xilinx ZynqMP CRF
In reply to Edgar E. IglesiasQuoted 11 lines · Edgar E. Iglesias
From: "Edgar E. Iglesias" <[email protected]>
Add a model of the Xilinx ZynqMP CRF. At the moment this is mostly a stub model.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Edgar E. Iglesias <[email protected]>---
include/hw/misc/xlnx-zynqmp-crf.h line 17
Quoted 4 lines
include/hw/misc/xlnx-zynqmp-crf.h new file +4
-0+#define TYPE_XLNX_ZYNQMP_CRF "xlnx.zynqmp_crf" + +#define XILINX_CRF (obj) \ + OBJECT_CHECK(XlnxZynqMPCRF, (obj), TYPE_XLNX_ZYNQMP_CRF)
We prefer the OBJECT_DECLARE_SIMPLE_TYPE rather than directly defining a cast macro these days. (It also provides a typedef for you, among other things.)
Apart from that, and dropping minimum_version_id_old,
thanks
-- PMM
Re: [PATCH v2 3/6] hw/misc: Add a model of the Xilinx ZynqMP CRF
Quoted 21 lines · Peter Maydell
Quoted 11 lines · Edgar E. Iglesias
From: "Edgar E. Iglesias" <[email protected]>
Add a model of the Xilinx ZynqMP CRF. At the moment this is mostly a stub model.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Edgar E. Iglesias <[email protected]>---
include/hw/misc/xlnx-zynqmp-crf.h line 17
Quoted 4 lines
include/hw/misc/xlnx-zynqmp-crf.h new file +4
-0+#define TYPE_XLNX_ZYNQMP_CRF "xlnx.zynqmp_crf" + +#define XILINX_CRF (obj) \ + OBJECT_CHECK(XlnxZynqMPCRF, (obj), TYPE_XLNX_ZYNQMP_CRF)We prefer the
OBJECT_DECLARE_SIMPLE_TYPErather than directly defining a cast macro these days. (It also provides a typedef for you, among other things.)
Quoted 3 lines
Apart from that, and dropping
minimum_version_id_old,Reviewed-by Peter Maydell <[email protected]>
Thanks Peter and Luc for review comments.
Sorry, things have been very busy around here, I'll try to get a new version posted next week addressing all comments I've seen so far.
Best regards,
Edgar
PATCH v2 4/6 hw/arm/xlnx-zynqmp: Connect the ZynqMP CRF
In reply to Edgar E. IglesiasFrom: "Edgar E. Iglesias" <[email protected]>
Connect the ZynqMP CRF - Clock Reset FPD device.
--- include/hw/arm/xlnx-zynqmp.h | 2 ++ hw/arm/xlnx-zynqmp.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+)
include/hw/arm/xlnx-zynqmp.h +2 -0
@@ -38,6 +38,7 @@#include "hw/dma/xlnx_csu_dma.h" #include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-zynqmp-efuse.h" +#include "hw/misc/xlnx-zynqmp-crf.h" #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"OBJECT_DECLARE_SIMPLE_TYPE (XlnxZynqMPState,XLNX_ZYNQMP )
@@ -122,6 +123,7 @@ struct XlnxZynqMPState {XlnxZDMA gdma[XLNX_ZYNQMP_NUM_GDMA_CH ];XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH ];XlnxCSUDMA qspi_dma; +XlnxZynqMPCRF crf;char *boot_cpu;ARMCPU *boot_cpu_ptr;
hw/arm/xlnx-zynqmp.c +16 -0
@@ -51,6 +51,9 @@#define QSPI_IRQ 15#define QSPI_DMA_ADDR 0xff0f0800 +#define CRF_ADDR 0xfd1a0000 +#define CRF_IRQ 120 +/* Serializer/Deserializer. */ #define SERDES_ADDR 0xfd400000#define SERDES_SIZE 0x20000
@@ -280,6 +283,18 @@ static void xlnx_zynqmp_create_efuse(XlnxZynqMPState *s, qemu_irq *gic)sysbus_connect_irq (sbd,0 , gic[EFUSE_IRQ ]); } +static void xlnx_zynqmp_create_crf (XlnxZynqMPState *s,qemu_irq *gic) +{ +SysBusDevice *sbd; + +object_initialize_child (OBJECT (s),"crf" , &s->crf,TYPE_XLNX_ZYNQMP_CRF ); + sbd =SYS_BUS_DEVICE (&s->crf); + +sysbus_realize (sbd, &error_fatal); +sysbus_mmio_map (sbd,0 ,CRF_ADDR ); +sysbus_connect_irq (sbd,0 , gic[CRF_IRQ ]); +} +static void xlnx_zynqmp_create_unimp_mmio (XlnxZynqMPState *s) { static const struct UnimpInfo {
@@ -683,6 +698,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)xlnx_zynqmp_create_bbram (s, gic_spi);xlnx_zynqmp_create_efuse (s, gic_spi); +xlnx_zynqmp_create_crf (s, gic_spi);xlnx_zynqmp_create_unimp_mmio (s);for (i =0 ; i <XLNX_ZYNQMP_NUM_GDMA_CH ; i++) {
Signature · 1 line
2.25.1
PATCH v2 5/6 hw/misc: Add a model of the Xilinx ZynqMP APU Control
In reply to Edgar E. IglesiasFrom: "Edgar E. Iglesias" <[email protected]>
Add a model of the Xilinx ZynqMP APU Control.
--- include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 95 +++++++++ hw/misc/xlnx-zynqmp-apu-ctrl.c | 254 +++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 350 insertions(+) create mode 100644 include/hw/misc/xlnx-zynqmp-apu-ctrl.h create mode 100644 hw/misc/xlnx-zynqmp-apu-ctrl.c
include/hw/misc/xlnx-zynqmp-apu-ctrl.h new file +95 -0
@@ -0,0 +1,95 @@ +/* +* QEMU model of ZynqMP APU Control. +* +* Copyright (c) 2013-2022 Xilinx Inc +* SPDX-License-Identifier: GPL-2.0-or-later +* +* Written by Peter Crosthwaite <[email protected]> and +* Edgar E. Iglesias <[email protected]> +* +*/ +#ifndef HW_MISC_XLNX_ZYNQMP_APU_CTRL_H +#define HW_MISC_XLNX_ZYNQMP_APU_CTRL_H + +#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 APU_MAX_CPU 4 + +typedef struct XlnxZynqMPAPUCtrl { +SysBusDevice busdev; + +ARMCPU *cpus[APU_MAX_CPU ]; +/* 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 ; + +#endif
hw/misc/xlnx-zynqmp-apu-ctrl.c new file +254 -0
254 lines not on this page · raw message
hw/misc/meson.build +1 -0
@@ -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',
Signature · 1 line
2.25.1
Re: [PATCH v2 5/6] hw/misc: Add a model of the Xilinx ZynqMP APU Control
Quoted 5 lines · Edgar E. Iglesias
From: "Edgar E. Iglesias" <[email protected]>
Add a model of the Xilinx ZynqMP APU Control.
Signed-off-by Edgar E. Iglesias <[email protected]>
Quoted 384 lines
--- include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 95 +++++++++ hw/misc/xlnx-zynqmp-apu-ctrl.c | 254 +++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 350 insertions(+) create mode 100644 include/hw/misc/xlnx-zynqmp-apu-ctrl.h create mode 100644 hw/misc/xlnx-zynqmp-apu-ctrl.cinclude/hw/misc/xlnx-zynqmp-apu-ctrl.h new file +95
-0@@ -0,0 +1,95 @@ +/* +* QEMU model of ZynqMP APU Control. +* +* Copyright (c) 2013-2022 Xilinx Inc +* SPDX-License-Identifier: GPL-2.0-or-later +* +* Written by Peter Crosthwaite <[email protected]> and +* Edgar E. Iglesias <[email protected]> +* +*/ +#ifndef HW_MISC_XLNX_ZYNQMP_APU_CTRL_H +#define HW_MISC_XLNX_ZYNQMP_APU_CTRL_H + +#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 APU_MAX_CPU 4 + +typedef struct XlnxZynqMPAPUCtrl { +SysBusDevice busdev; + +ARMCPU *cpus[APU_MAX_CPU ]; +/* 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 ; + +#endif hw/misc/xlnx-zynqmp-apu-ctrl.c new file +254
-0@@ -0,0 +1,254 @@ +/* +* 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 <[email protected]> and +* Edgar E. Iglesias <[email protected]> +*/ + +#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 <APU_MAX_CPU ; 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 <APU_MAX_CPU ; ++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 <APU_MAX_CPU ; 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 < APU_MAX_CPU; ++i) { + g_autofree gchar *prop_name = g_strdup_printf("cpu%d", i); + object_property_add_link(obj, prop_name, TYPE_ARM_CPU, + (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, +}; + +static void zynqmp_apu_register_types(void) +{ + type_register_static(&zynqmp_apu_info); +} + +type_init(zynqmp_apu_register_types)hw/misc/meson.build +1
-0@@ -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',Signature · 1 line
2.25.1
PATCH v2 6/6 hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control
In reply to Edgar E. IglesiasFrom: "Edgar E. Iglesias" <[email protected]>
Connect the ZynqMP APU Control device.
--- include/hw/arm/xlnx-zynqmp.h | 4 +++- hw/arm/xlnx-zynqmp.c | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-)
include/hw/arm/xlnx-zynqmp.h +3 -1
@@ -38,6 +38,7 @@#include "hw/dma/xlnx_csu_dma.h" #include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-zynqmp-efuse.h" +#include "hw/misc/xlnx-zynqmp-apu-ctrl.h" #include "hw/misc/xlnx-zynqmp-crf.h" #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"
@@ -85,7 +86,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)/* * Unimplemented mmio regions needed to boot some images. */ -#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2 +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1struct XlnxZynqMPState {/*< private >*/
@@ -123,6 +124,7 @@ struct XlnxZynqMPState {XlnxZDMA gdma[XLNX_ZYNQMP_NUM_GDMA_CH ];XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH ];XlnxCSUDMA qspi_dma; +XlnxZynqMPAPUCtrl apu_ctrl;XlnxZynqMPCRF crf;char *boot_cpu;
hw/arm/xlnx-zynqmp.c +23 -2
@@ -65,7 +65,7 @@#define DPDMA_IRQ 116#define APU_ADDR 0xfd5c0000 -#define APU_SIZE 0x100 +#define APU_IRQ 153#define IPI_ADDR 0xFF300000#define IPI_IRQ 64
@@ -283,6 +283,27 @@ static void xlnx_zynqmp_create_efuse(XlnxZynqMPState *s, qemu_irq *gic)sysbus_connect_irq (sbd,0 , gic[EFUSE_IRQ ]); } +static void xlnx_zynqmp_create_apu_ctrl (XlnxZynqMPState *s,qemu_irq *gic) +{ +SysBusDevice *sbd; +int i; + +object_initialize_child (OBJECT (s),"apu-ctrl" , &s->apu_ctrl, +TYPE_XLNX_ZYNQMP_APU_CTRL ); + sbd =SYS_BUS_DEVICE (&s->apu_ctrl); + +for (i =0 ; i <XLNX_ZYNQMP_NUM_APU_CPUS ; i++) { + g_autofree gchar *name = g_strdup_printf("cpu%d", i); + +object_property_set_link (OBJECT (&s->apu_ctrl), name, +OBJECT (&s->apu_cpu[i]), &error_abort); + } + +sysbus_realize (sbd, &error_fatal); +sysbus_mmio_map (sbd,0 ,APU_ADDR ); +sysbus_connect_irq (sbd,0 , gic[APU_IRQ ]); +} +static void xlnx_zynqmp_create_crf (XlnxZynqMPState *s,qemu_irq *gic) {SysBusDevice *sbd;
@@ -302,7 +323,6 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s)hwaddr base;hwaddr size; } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = { - { .name = "apu", APU_ADDR, APU_SIZE }, { .name = "serdes", SERDES_ADDR, SERDES_SIZE }, }; unsigned int nr;
@@ -698,6 +718,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)xlnx_zynqmp_create_bbram (s, gic_spi);xlnx_zynqmp_create_efuse (s, gic_spi); +xlnx_zynqmp_create_apu_ctrl (s, gic_spi);xlnx_zynqmp_create_crf (s, gic_spi);xlnx_zynqmp_create_unimp_mmio (s);
Signature · 1 line
2.25.1
Re: [PATCH v2 6/6] hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control
Hi Edgar,
Quoted 3 lines · Edgar E. Iglesias
From: "Edgar E. Iglesias" <[email protected]>
Connect the ZynqMP APU Control device.
Somehow you don't seem to connect the "wfi_in" pins. I guess it's because currently QEMU ARM CPUs do not expose a "wfi_out" pin right?
Quoted 98 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Francisco Iglesias <[email protected]>Signed-off-by Edgar E. Iglesias <[email protected]>--- include/hw/arm/xlnx-zynqmp.h | 4 +++- hw/arm/xlnx-zynqmp.c | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-)include/hw/arm/xlnx-zynqmp.h +3
-1@@ -38,6 +38,7 @@#include "hw/dma/xlnx_csu_dma.h" #include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-zynqmp-efuse.h" +#include "hw/misc/xlnx-zynqmp-apu-ctrl.h" #include "hw/misc/xlnx-zynqmp-crf.h" #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"@@ -85,7 +86,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)/* * Unimplemented mmio regions needed to boot some images. */ -#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2 +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1struct XlnxZynqMPState {/*< private >*/ @@ -123,6 +124,7 @@ struct XlnxZynqMPState {XlnxZDMA gdma[XLNX_ZYNQMP_NUM_GDMA_CH ];XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH ];XlnxCSUDMA qspi_dma; +XlnxZynqMPAPUCtrl apu_ctrl;XlnxZynqMPCRF crf;char *boot_cpu;hw/arm/xlnx-zynqmp.c +23
-2@@ -65,7 +65,7 @@#define DPDMA_IRQ 116#define APU_ADDR 0xfd5c0000 -#define APU_SIZE 0x100 +#define APU_IRQ 153#define IPI_ADDR 0xFF300000#define IPI_IRQ 64@@ -283,6 +283,27 @@ static void xlnx_zynqmp_create_efuse(XlnxZynqMPState *s, qemu_irq *gic)sysbus_connect_irq (sbd,0 , gic[EFUSE_IRQ ]); } +static void xlnx_zynqmp_create_apu_ctrl (XlnxZynqMPState *s,qemu_irq *gic) +{ +SysBusDevice *sbd; +int i; + +object_initialize_child (OBJECT (s),"apu-ctrl" , &s->apu_ctrl, +TYPE_XLNX_ZYNQMP_APU_CTRL ); + sbd =SYS_BUS_DEVICE (&s->apu_ctrl); + +for (i =0 ; i <XLNX_ZYNQMP_NUM_APU_CPUS ; i++) { + g_autofree gchar *name = g_strdup_printf("cpu%d", i); + +object_property_set_link (OBJECT (&s->apu_ctrl), name, +OBJECT (&s->apu_cpu[i]), &error_abort); + } + +sysbus_realize (sbd, &error_fatal); +sysbus_mmio_map (sbd,0 ,APU_ADDR ); +sysbus_connect_irq (sbd,0 , gic[APU_IRQ ]); +} +static void xlnx_zynqmp_create_crf (XlnxZynqMPState *s,qemu_irq *gic) {SysBusDevice *sbd;@@ -302,7 +323,6 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s)hwaddr base;hwaddr size; } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = { - { .name = "apu", APU_ADDR, APU_SIZE }, { .name = "serdes", SERDES_ADDR, SERDES_SIZE }, }; unsigned int nr;@@ -698,6 +718,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)xlnx_zynqmp_create_bbram (s, gic_spi);xlnx_zynqmp_create_efuse (s, gic_spi); +xlnx_zynqmp_create_apu_ctrl (s, gic_spi);xlnx_zynqmp_create_crf (s, gic_spi);xlnx_zynqmp_create_unimp_mmio (s);Signature · 1 line
2.25.1