hw/arm: zynqmp: Add CRF and APU control to support PSCI
Subsystems (2)
v3 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.
Cheers,
Edgar
ChangeLog:
v2 -> v3:
* Make RVBAR_ELx register reflect updated rvbar
* Sample rvbar prop at reset
* Remove setting of minimum_version_id_old
* Use OBJECT_DECLARE_SIMPLE_TYPE
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 | 93 +++++++++ include/hw/misc/xlnx-zynqmp-crf.h | 211 ++++++++++++++++++++ target/arm/cpu.h | 3 +- hw/arm/xlnx-zynqmp.c | 46 ++++- hw/misc/xlnx-zynqmp-apu-ctrl.c | 253 +++++++++++++++++++++++ hw/misc/xlnx-zynqmp-crf.c | 266 +++++++++++++++++++++++++ target/arm/cpu.c | 12 +- target/arm/helper.c | 10 +- hw/misc/meson.build | 2 + 10 files changed, 889 insertions(+), 11 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 v3 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
@@ -85,7 +85,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
@@ -52,6 +52,10 @@#define QSPI_DMA_ADDR 0xff0f0800#define NUM_QSPI_IRQ_LINES 2 +/* 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 v3 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.h | 3 ++- target/arm/cpu.c | 12 +++++++----- target/arm/helper.c | 10 +++++++--- 3 files changed, 16 insertions(+), 9 deletions(-)
target/arm/cpu.h +2 -1
@@ -447,6 +447,7 @@ typedef struct CPUArchState {uint64_t vbar_el[4 ]; };uint32_t mvbar;/* (monitor) vector base address register */ +uint64_t rvbar;/* rvbar sampled from rvbar property at reset */ struct {/* FCSE PID. */ uint32_t fcseidr_ns;uint32_t fcseidr_s;
@@ -985,7 +986,7 @@ struct ArchCPU {/* DCZ blocksize, in log_2(words), ie low 4 bits of DCZID_EL0 */ uint32_t dcz_blocksize; -uint64_t rvbar; +uint64_t rvbar_prop;/* Property/input signals. */ /* Configurable aspects of GIC cpu interface (which is part of the CPU) */ int gic_num_lrs;/* number of list registers */
target/arm/cpu.c +7 -5
@@ -235,7 +235,10 @@ static void arm_cpu_reset(DeviceState *dev) } else { env->pstate = PSTATE_MODE_EL1h; } - env->pc = cpu->rvbar; + +/* Sample rvbar at reset. */ + env->cp15.rvbar = cpu->rvbar_prop; + env->pc = env->cp15.rvbar;#endif }else {#if defined(CONFIG_USER_ONLY )
@@ -1130,9 +1133,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);
@@ -1235,7 +1235,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_prop, +OBJ_PROP_FLAG_READWRITE ); }#ifndef CONFIG_USER_ONLY
target/arm/helper.c +7 -3
@@ -7967,7 +7967,8 @@ void register_cp_regs_for_features(ARMCPU *cpu)ARMCPRegInfo rvbar = { .name ="RVBAR_EL1" , .state =ARM_CP_STATE_AA64 , .opc0 =3 , .opc1 =0 , .crn =12 , .crm =0 , .opc2 =1 , - .type =ARM_CP_CONST , .access =PL1_R , .resetvalue = cpu->rvbar + .access =PL1_R , + .fieldoffset = offsetof(CPUARMState, cp15.rvbar), };define_one_arm_cp_reg (cpu, &rvbar); }
@@ -8011,7 +8012,8 @@ void register_cp_regs_for_features(ARMCPU *cpu)ARMCPRegInfo rvbar = { .name ="RVBAR_EL2" , .state =ARM_CP_STATE_AA64 , .opc0 =3 , .opc1 =4 , .crn =12 , .crm =0 , .opc2 =1 , - .type =ARM_CP_CONST , .access =PL2_R , .resetvalue = cpu->rvbar + .access =PL2_R , + .fieldoffset = offsetof(CPUARMState, cp15.rvbar), };define_one_arm_cp_reg (cpu, &rvbar); }
@@ -8048,7 +8050,9 @@ void register_cp_regs_for_features(ARMCPU *cpu)ARMCPRegInfo el3_regs[] = { { .name ="RVBAR_EL3" , .state =ARM_CP_STATE_AA64 , .opc0 =3 , .opc1 =6 , .crn =12 , .crm =0 , .opc2 =1 , - .type =ARM_CP_CONST , .access =PL3_R , .resetvalue = cpu->rvbar }, + .access =PL3_R , + .fieldoffset = offsetof(CPUARMState, cp15.rvbar), + }, { .name ="SCTLR_EL3" , .state =ARM_CP_STATE_AA64 , .opc0 =3 , .opc1 =6 , .crn =1 , .crm =0 , .opc2 =0 , .access =PL3_RW ,
Signature · 1 line
2.25.1
PATCH v3 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 | 211 ++++++++++++++++++++++++ hw/misc/xlnx-zynqmp-crf.c | 266 ++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 478 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 +211 -0
@@ -0,0 +1,211 @@ +/* +* 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" +OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPCRF, 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) + +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 ]; +}; + +#endif
hw/misc/xlnx-zynqmp-crf.c new file +266 -0
266 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
PATCH v3 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
@@ -39,6 +39,7 @@#include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-zynqmp-efuse.h" #include "hw/or-irq.h" +#include "hw/misc/xlnx-zynqmp-crf.h" #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"OBJECT_DECLARE_SIMPLE_TYPE (XlnxZynqMPState,XLNX_ZYNQMP )
@@ -124,6 +125,7 @@ struct XlnxZynqMPState {XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH ];XlnxCSUDMA qspi_dma;qemu_or_irq qspi_irq_orgate; +XlnxZynqMPCRF crf;char *boot_cpu;ARMCPU *boot_cpu_ptr;
hw/arm/xlnx-zynqmp.c +16 -0
@@ -52,6 +52,9 @@#define QSPI_DMA_ADDR 0xff0f0800#define NUM_QSPI_IRQ_LINES 2 +#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 {
@@ -684,6 +699,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 v3 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 | 93 +++++++++ hw/misc/xlnx-zynqmp-apu-ctrl.c | 253 +++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 347 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 +93 -0
@@ -0,0 +1,93 @@ +/* +* 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" +OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPAPUCtrl, 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 + +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 ]; +}; + +#endif
hw/misc/xlnx-zynqmp-apu-ctrl.c new file +253 -0
253 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
PATCH v3 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
@@ -39,6 +39,7 @@#include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-zynqmp-efuse.h" #include "hw/or-irq.h" +#include "hw/misc/xlnx-zynqmp-apu-ctrl.h" #include "hw/misc/xlnx-zynqmp-crf.h" #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"
@@ -86,7 +87,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 >*/
@@ -125,6 +126,7 @@ struct XlnxZynqMPState {XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH ];XlnxCSUDMA qspi_dma;qemu_or_irq qspi_irq_orgate; +XlnxZynqMPAPUCtrl apu_ctrl;XlnxZynqMPCRF crf;char *boot_cpu;
hw/arm/xlnx-zynqmp.c +23 -2
@@ -66,7 +66,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;
@@ -699,6 +719,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
Quoted 6 lines · Edgar E. Iglesias
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 wouldn't usually take patches new devices after softfreeze, but on the other hand this is addressing a regression, and it only affects the xilinx boards. Do you have a view on whether we should put this into 7.0 or defer to 7.1 ?
thanks
-- PMM
Quoted 5 lines · Peter Maydell
Quoted 3 lines · Edgar E. Iglesias
From: "Edgar E. Iglesias" <[email protected]>
Quoted 10 lines
Quoted 3 lines
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 wouldn't usually take patches new devices after softfreeze, but on the other hand this is addressing a regression, and it only affects the xilinx boards. Do you have a view on whether we should put this into 7.0 or defer to 7.1 ?
Hi Peter,
I'd lean slightly towards 7.0 (to allow our tests to pass cleanly on 7.0) but it's not of huge importance.
Thanks,
Edgar
Quoted 12 lines · Edgar E. Iglesias
Quoted 10 lines · Peter Maydell
Quoted 6 lines · Edgar E. Iglesias
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.
Quoted 7 lines
Quoted 4 lines
I wouldn't usually take patches new devices after softfreeze, but on the other hand this is addressing a regression, and it only affects the xilinx boards. Do you have a view on whether we should put this into 7.0 or defer to 7.1 ?
I'd lean slightly towards 7.0 (to allow our tests to pass cleanly on 7.0) but it's not of huge importance.
Yeah, I agree -- I'll queue this into target-arm.next for 7.0.
thanks
-- PMM