hw/misc/zynq_slcr: use standard register definition

Replace the zynq_slcr registers enum and macros using the
hw/registerfields.h macros.

Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20190729145654.14644-30-damien.hedde@greensocs.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Damien Hedde 2019-08-15 09:46:41 +01:00 committed by Peter Maydell
parent 2bd5f41c00
commit a6b3ed2348
1 changed files with 225 additions and 225 deletions

View File

@ -21,6 +21,7 @@
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/registerfields.h"
#ifndef ZYNQ_SLCR_ERR_DEBUG #ifndef ZYNQ_SLCR_ERR_DEBUG
#define ZYNQ_SLCR_ERR_DEBUG 0 #define ZYNQ_SLCR_ERR_DEBUG 0
@ -36,138 +37,135 @@
#define XILINX_LOCK_KEY 0x767b #define XILINX_LOCK_KEY 0x767b
#define XILINX_UNLOCK_KEY 0xdf0d #define XILINX_UNLOCK_KEY 0xdf0d
#define R_PSS_RST_CTRL_SOFT_RST 0x1 REG32(SCL, 0x000)
REG32(LOCK, 0x004)
REG32(UNLOCK, 0x008)
REG32(LOCKSTA, 0x00c)
enum { REG32(ARM_PLL_CTRL, 0x100)
SCL = 0x000 / 4, REG32(DDR_PLL_CTRL, 0x104)
LOCK, REG32(IO_PLL_CTRL, 0x108)
UNLOCK, REG32(PLL_STATUS, 0x10c)
LOCKSTA, REG32(ARM_PLL_CFG, 0x110)
REG32(DDR_PLL_CFG, 0x114)
REG32(IO_PLL_CFG, 0x118)
ARM_PLL_CTRL = 0x100 / 4, REG32(ARM_CLK_CTRL, 0x120)
DDR_PLL_CTRL, REG32(DDR_CLK_CTRL, 0x124)
IO_PLL_CTRL, REG32(DCI_CLK_CTRL, 0x128)
PLL_STATUS, REG32(APER_CLK_CTRL, 0x12c)
ARM_PLL_CFG, REG32(USB0_CLK_CTRL, 0x130)
DDR_PLL_CFG, REG32(USB1_CLK_CTRL, 0x134)
IO_PLL_CFG, REG32(GEM0_RCLK_CTRL, 0x138)
REG32(GEM1_RCLK_CTRL, 0x13c)
ARM_CLK_CTRL = 0x120 / 4, REG32(GEM0_CLK_CTRL, 0x140)
DDR_CLK_CTRL, REG32(GEM1_CLK_CTRL, 0x144)
DCI_CLK_CTRL, REG32(SMC_CLK_CTRL, 0x148)
APER_CLK_CTRL, REG32(LQSPI_CLK_CTRL, 0x14c)
USB0_CLK_CTRL, REG32(SDIO_CLK_CTRL, 0x150)
USB1_CLK_CTRL, REG32(UART_CLK_CTRL, 0x154)
GEM0_RCLK_CTRL, REG32(SPI_CLK_CTRL, 0x158)
GEM1_RCLK_CTRL, REG32(CAN_CLK_CTRL, 0x15c)
GEM0_CLK_CTRL, REG32(CAN_MIOCLK_CTRL, 0x160)
GEM1_CLK_CTRL, REG32(DBG_CLK_CTRL, 0x164)
SMC_CLK_CTRL, REG32(PCAP_CLK_CTRL, 0x168)
LQSPI_CLK_CTRL, REG32(TOPSW_CLK_CTRL, 0x16c)
SDIO_CLK_CTRL,
UART_CLK_CTRL,
SPI_CLK_CTRL,
CAN_CLK_CTRL,
CAN_MIOCLK_CTRL,
DBG_CLK_CTRL,
PCAP_CLK_CTRL,
TOPSW_CLK_CTRL,
#define FPGA_CTRL_REGS(n, start) \ #define FPGA_CTRL_REGS(n, start) \
FPGA ## n ## _CLK_CTRL = (start) / 4, \ REG32(FPGA ## n ## _CLK_CTRL, (start)) \
FPGA ## n ## _THR_CTRL, \ REG32(FPGA ## n ## _THR_CTRL, (start) + 0x4)\
FPGA ## n ## _THR_CNT, \ REG32(FPGA ## n ## _THR_CNT, (start) + 0x8)\
FPGA ## n ## _THR_STA, REG32(FPGA ## n ## _THR_STA, (start) + 0xc)
FPGA_CTRL_REGS(0, 0x170) FPGA_CTRL_REGS(0, 0x170)
FPGA_CTRL_REGS(1, 0x180) FPGA_CTRL_REGS(1, 0x180)
FPGA_CTRL_REGS(2, 0x190) FPGA_CTRL_REGS(2, 0x190)
FPGA_CTRL_REGS(3, 0x1a0) FPGA_CTRL_REGS(3, 0x1a0)
BANDGAP_TRIP = 0x1b8 / 4, REG32(BANDGAP_TRIP, 0x1b8)
PLL_PREDIVISOR = 0x1c0 / 4, REG32(PLL_PREDIVISOR, 0x1c0)
CLK_621_TRUE, REG32(CLK_621_TRUE, 0x1c4)
PSS_RST_CTRL = 0x200 / 4, REG32(PSS_RST_CTRL, 0x200)
DDR_RST_CTRL, FIELD(PSS_RST_CTRL, SOFT_RST, 0, 1)
TOPSW_RESET_CTRL, REG32(DDR_RST_CTRL, 0x204)
DMAC_RST_CTRL, REG32(TOPSW_RESET_CTRL, 0x208)
USB_RST_CTRL, REG32(DMAC_RST_CTRL, 0x20c)
GEM_RST_CTRL, REG32(USB_RST_CTRL, 0x210)
SDIO_RST_CTRL, REG32(GEM_RST_CTRL, 0x214)
SPI_RST_CTRL, REG32(SDIO_RST_CTRL, 0x218)
CAN_RST_CTRL, REG32(SPI_RST_CTRL, 0x21c)
I2C_RST_CTRL, REG32(CAN_RST_CTRL, 0x220)
UART_RST_CTRL, REG32(I2C_RST_CTRL, 0x224)
GPIO_RST_CTRL, REG32(UART_RST_CTRL, 0x228)
LQSPI_RST_CTRL, REG32(GPIO_RST_CTRL, 0x22c)
SMC_RST_CTRL, REG32(LQSPI_RST_CTRL, 0x230)
OCM_RST_CTRL, REG32(SMC_RST_CTRL, 0x234)
FPGA_RST_CTRL = 0x240 / 4, REG32(OCM_RST_CTRL, 0x238)
A9_CPU_RST_CTRL, REG32(FPGA_RST_CTRL, 0x240)
REG32(A9_CPU_RST_CTRL, 0x244)
RS_AWDT_CTRL = 0x24c / 4, REG32(RS_AWDT_CTRL, 0x24c)
RST_REASON, REG32(RST_REASON, 0x250)
REBOOT_STATUS = 0x258 / 4, REG32(REBOOT_STATUS, 0x258)
BOOT_MODE, REG32(BOOT_MODE, 0x25c)
APU_CTRL = 0x300 / 4, REG32(APU_CTRL, 0x300)
WDT_CLK_SEL, REG32(WDT_CLK_SEL, 0x304)
TZ_DMA_NS = 0x440 / 4, REG32(TZ_DMA_NS, 0x440)
TZ_DMA_IRQ_NS, REG32(TZ_DMA_IRQ_NS, 0x444)
TZ_DMA_PERIPH_NS, REG32(TZ_DMA_PERIPH_NS, 0x448)
PSS_IDCODE = 0x530 / 4, REG32(PSS_IDCODE, 0x530)
DDR_URGENT = 0x600 / 4, REG32(DDR_URGENT, 0x600)
DDR_CAL_START = 0x60c / 4, REG32(DDR_CAL_START, 0x60c)
DDR_REF_START = 0x614 / 4, REG32(DDR_REF_START, 0x614)
DDR_CMD_STA, REG32(DDR_CMD_STA, 0x618)
DDR_URGENT_SEL, REG32(DDR_URGENT_SEL, 0x61c)
DDR_DFI_STATUS, REG32(DDR_DFI_STATUS, 0x620)
MIO = 0x700 / 4, REG32(MIO, 0x700)
#define MIO_LENGTH 54 #define MIO_LENGTH 54
MIO_LOOPBACK = 0x804 / 4, REG32(MIO_LOOPBACK, 0x804)
MIO_MST_TRI0, REG32(MIO_MST_TRI0, 0x808)
MIO_MST_TRI1, REG32(MIO_MST_TRI1, 0x80c)
SD0_WP_CD_SEL = 0x830 / 4, REG32(SD0_WP_CD_SEL, 0x830)
SD1_WP_CD_SEL, REG32(SD1_WP_CD_SEL, 0x834)
LVL_SHFTR_EN = 0x900 / 4, REG32(LVL_SHFTR_EN, 0x900)
OCM_CFG = 0x910 / 4, REG32(OCM_CFG, 0x910)
CPU_RAM = 0xa00 / 4, REG32(CPU_RAM, 0xa00)
IOU = 0xa30 / 4, REG32(IOU, 0xa30)
DMAC_RAM = 0xa50 / 4, REG32(DMAC_RAM, 0xa50)
AFI0 = 0xa60 / 4, REG32(AFI0, 0xa60)
AFI1 = AFI0 + 3, REG32(AFI1, 0xa6c)
AFI2 = AFI1 + 3, REG32(AFI2, 0xa78)
AFI3 = AFI2 + 3, REG32(AFI3, 0xa84)
#define AFI_LENGTH 3 #define AFI_LENGTH 3
OCM = 0xa90 / 4, REG32(OCM, 0xa90)
DEVCI_RAM = 0xaa0 / 4, REG32(DEVCI_RAM, 0xaa0)
CSG_RAM = 0xab0 / 4, REG32(CSG_RAM, 0xab0)
GPIOB_CTRL = 0xb00 / 4, REG32(GPIOB_CTRL, 0xb00)
GPIOB_CFG_CMOS18, REG32(GPIOB_CFG_CMOS18, 0xb04)
GPIOB_CFG_CMOS25, REG32(GPIOB_CFG_CMOS25, 0xb08)
GPIOB_CFG_CMOS33, REG32(GPIOB_CFG_CMOS33, 0xb0c)
GPIOB_CFG_HSTL = 0xb14 / 4, REG32(GPIOB_CFG_HSTL, 0xb14)
GPIOB_DRVR_BIAS_CTRL, REG32(GPIOB_DRVR_BIAS_CTRL, 0xb18)
DDRIOB = 0xb40 / 4, REG32(DDRIOB, 0xb40)
#define DDRIOB_LENGTH 14 #define DDRIOB_LENGTH 14
};
#define ZYNQ_SLCR_MMIO_SIZE 0x1000 #define ZYNQ_SLCR_MMIO_SIZE 0x1000
#define ZYNQ_SLCR_NUM_REGS (ZYNQ_SLCR_MMIO_SIZE / 4) #define ZYNQ_SLCR_NUM_REGS (ZYNQ_SLCR_MMIO_SIZE / 4)
@ -190,150 +188,152 @@ static void zynq_slcr_reset(DeviceState *d)
DB_PRINT("RESET\n"); DB_PRINT("RESET\n");
s->regs[LOCKSTA] = 1; s->regs[R_LOCKSTA] = 1;
/* 0x100 - 0x11C */ /* 0x100 - 0x11C */
s->regs[ARM_PLL_CTRL] = 0x0001A008; s->regs[R_ARM_PLL_CTRL] = 0x0001A008;
s->regs[DDR_PLL_CTRL] = 0x0001A008; s->regs[R_DDR_PLL_CTRL] = 0x0001A008;
s->regs[IO_PLL_CTRL] = 0x0001A008; s->regs[R_IO_PLL_CTRL] = 0x0001A008;
s->regs[PLL_STATUS] = 0x0000003F; s->regs[R_PLL_STATUS] = 0x0000003F;
s->regs[ARM_PLL_CFG] = 0x00014000; s->regs[R_ARM_PLL_CFG] = 0x00014000;
s->regs[DDR_PLL_CFG] = 0x00014000; s->regs[R_DDR_PLL_CFG] = 0x00014000;
s->regs[IO_PLL_CFG] = 0x00014000; s->regs[R_IO_PLL_CFG] = 0x00014000;
/* 0x120 - 0x16C */ /* 0x120 - 0x16C */
s->regs[ARM_CLK_CTRL] = 0x1F000400; s->regs[R_ARM_CLK_CTRL] = 0x1F000400;
s->regs[DDR_CLK_CTRL] = 0x18400003; s->regs[R_DDR_CLK_CTRL] = 0x18400003;
s->regs[DCI_CLK_CTRL] = 0x01E03201; s->regs[R_DCI_CLK_CTRL] = 0x01E03201;
s->regs[APER_CLK_CTRL] = 0x01FFCCCD; s->regs[R_APER_CLK_CTRL] = 0x01FFCCCD;
s->regs[USB0_CLK_CTRL] = s->regs[USB1_CLK_CTRL] = 0x00101941; s->regs[R_USB0_CLK_CTRL] = s->regs[R_USB1_CLK_CTRL] = 0x00101941;
s->regs[GEM0_RCLK_CTRL] = s->regs[GEM1_RCLK_CTRL] = 0x00000001; s->regs[R_GEM0_RCLK_CTRL] = s->regs[R_GEM1_RCLK_CTRL] = 0x00000001;
s->regs[GEM0_CLK_CTRL] = s->regs[GEM1_CLK_CTRL] = 0x00003C01; s->regs[R_GEM0_CLK_CTRL] = s->regs[R_GEM1_CLK_CTRL] = 0x00003C01;
s->regs[SMC_CLK_CTRL] = 0x00003C01; s->regs[R_SMC_CLK_CTRL] = 0x00003C01;
s->regs[LQSPI_CLK_CTRL] = 0x00002821; s->regs[R_LQSPI_CLK_CTRL] = 0x00002821;
s->regs[SDIO_CLK_CTRL] = 0x00001E03; s->regs[R_SDIO_CLK_CTRL] = 0x00001E03;
s->regs[UART_CLK_CTRL] = 0x00003F03; s->regs[R_UART_CLK_CTRL] = 0x00003F03;
s->regs[SPI_CLK_CTRL] = 0x00003F03; s->regs[R_SPI_CLK_CTRL] = 0x00003F03;
s->regs[CAN_CLK_CTRL] = 0x00501903; s->regs[R_CAN_CLK_CTRL] = 0x00501903;
s->regs[DBG_CLK_CTRL] = 0x00000F03; s->regs[R_DBG_CLK_CTRL] = 0x00000F03;
s->regs[PCAP_CLK_CTRL] = 0x00000F01; s->regs[R_PCAP_CLK_CTRL] = 0x00000F01;
/* 0x170 - 0x1AC */ /* 0x170 - 0x1AC */
s->regs[FPGA0_CLK_CTRL] = s->regs[FPGA1_CLK_CTRL] = s->regs[FPGA2_CLK_CTRL] s->regs[R_FPGA0_CLK_CTRL] = s->regs[R_FPGA1_CLK_CTRL]
= s->regs[FPGA3_CLK_CTRL] = 0x00101800; = s->regs[R_FPGA2_CLK_CTRL]
s->regs[FPGA0_THR_STA] = s->regs[FPGA1_THR_STA] = s->regs[FPGA2_THR_STA] = s->regs[R_FPGA3_CLK_CTRL] = 0x00101800;
= s->regs[FPGA3_THR_STA] = 0x00010000; s->regs[R_FPGA0_THR_STA] = s->regs[R_FPGA1_THR_STA]
= s->regs[R_FPGA2_THR_STA]
= s->regs[R_FPGA3_THR_STA] = 0x00010000;
/* 0x1B0 - 0x1D8 */ /* 0x1B0 - 0x1D8 */
s->regs[BANDGAP_TRIP] = 0x0000001F; s->regs[R_BANDGAP_TRIP] = 0x0000001F;
s->regs[PLL_PREDIVISOR] = 0x00000001; s->regs[R_PLL_PREDIVISOR] = 0x00000001;
s->regs[CLK_621_TRUE] = 0x00000001; s->regs[R_CLK_621_TRUE] = 0x00000001;
/* 0x200 - 0x25C */ /* 0x200 - 0x25C */
s->regs[FPGA_RST_CTRL] = 0x01F33F0F; s->regs[R_FPGA_RST_CTRL] = 0x01F33F0F;
s->regs[RST_REASON] = 0x00000040; s->regs[R_RST_REASON] = 0x00000040;
s->regs[BOOT_MODE] = 0x00000001; s->regs[R_BOOT_MODE] = 0x00000001;
/* 0x700 - 0x7D4 */ /* 0x700 - 0x7D4 */
for (i = 0; i < 54; i++) { for (i = 0; i < 54; i++) {
s->regs[MIO + i] = 0x00001601; s->regs[R_MIO + i] = 0x00001601;
} }
for (i = 2; i <= 8; i++) { for (i = 2; i <= 8; i++) {
s->regs[MIO + i] = 0x00000601; s->regs[R_MIO + i] = 0x00000601;
} }
s->regs[MIO_MST_TRI0] = s->regs[MIO_MST_TRI1] = 0xFFFFFFFF; s->regs[R_MIO_MST_TRI0] = s->regs[R_MIO_MST_TRI1] = 0xFFFFFFFF;
s->regs[CPU_RAM + 0] = s->regs[CPU_RAM + 1] = s->regs[CPU_RAM + 3] s->regs[R_CPU_RAM + 0] = s->regs[R_CPU_RAM + 1] = s->regs[R_CPU_RAM + 3]
= s->regs[CPU_RAM + 4] = s->regs[CPU_RAM + 7] = s->regs[R_CPU_RAM + 4] = s->regs[R_CPU_RAM + 7]
= 0x00010101; = 0x00010101;
s->regs[CPU_RAM + 2] = s->regs[CPU_RAM + 5] = 0x01010101; s->regs[R_CPU_RAM + 2] = s->regs[R_CPU_RAM + 5] = 0x01010101;
s->regs[CPU_RAM + 6] = 0x00000001; s->regs[R_CPU_RAM + 6] = 0x00000001;
s->regs[IOU + 0] = s->regs[IOU + 1] = s->regs[IOU + 2] = s->regs[IOU + 3] s->regs[R_IOU + 0] = s->regs[R_IOU + 1] = s->regs[R_IOU + 2]
= 0x09090909; = s->regs[R_IOU + 3] = 0x09090909;
s->regs[IOU + 4] = s->regs[IOU + 5] = 0x00090909; s->regs[R_IOU + 4] = s->regs[R_IOU + 5] = 0x00090909;
s->regs[IOU + 6] = 0x00000909; s->regs[R_IOU + 6] = 0x00000909;
s->regs[DMAC_RAM] = 0x00000009; s->regs[R_DMAC_RAM] = 0x00000009;
s->regs[AFI0 + 0] = s->regs[AFI0 + 1] = 0x09090909; s->regs[R_AFI0 + 0] = s->regs[R_AFI0 + 1] = 0x09090909;
s->regs[AFI1 + 0] = s->regs[AFI1 + 1] = 0x09090909; s->regs[R_AFI1 + 0] = s->regs[R_AFI1 + 1] = 0x09090909;
s->regs[AFI2 + 0] = s->regs[AFI2 + 1] = 0x09090909; s->regs[R_AFI2 + 0] = s->regs[R_AFI2 + 1] = 0x09090909;
s->regs[AFI3 + 0] = s->regs[AFI3 + 1] = 0x09090909; s->regs[R_AFI3 + 0] = s->regs[R_AFI3 + 1] = 0x09090909;
s->regs[AFI0 + 2] = s->regs[AFI1 + 2] = s->regs[AFI2 + 2] s->regs[R_AFI0 + 2] = s->regs[R_AFI1 + 2] = s->regs[R_AFI2 + 2]
= s->regs[AFI3 + 2] = 0x00000909; = s->regs[R_AFI3 + 2] = 0x00000909;
s->regs[OCM + 0] = 0x01010101; s->regs[R_OCM + 0] = 0x01010101;
s->regs[OCM + 1] = s->regs[OCM + 2] = 0x09090909; s->regs[R_OCM + 1] = s->regs[R_OCM + 2] = 0x09090909;
s->regs[DEVCI_RAM] = 0x00000909; s->regs[R_DEVCI_RAM] = 0x00000909;
s->regs[CSG_RAM] = 0x00000001; s->regs[R_CSG_RAM] = 0x00000001;
s->regs[DDRIOB + 0] = s->regs[DDRIOB + 1] = s->regs[DDRIOB + 2] s->regs[R_DDRIOB + 0] = s->regs[R_DDRIOB + 1] = s->regs[R_DDRIOB + 2]
= s->regs[DDRIOB + 3] = 0x00000e00; = s->regs[R_DDRIOB + 3] = 0x00000e00;
s->regs[DDRIOB + 4] = s->regs[DDRIOB + 5] = s->regs[DDRIOB + 6] s->regs[R_DDRIOB + 4] = s->regs[R_DDRIOB + 5] = s->regs[R_DDRIOB + 6]
= 0x00000e00; = 0x00000e00;
s->regs[DDRIOB + 12] = 0x00000021; s->regs[R_DDRIOB + 12] = 0x00000021;
} }
static bool zynq_slcr_check_offset(hwaddr offset, bool rnw) static bool zynq_slcr_check_offset(hwaddr offset, bool rnw)
{ {
switch (offset) { switch (offset) {
case LOCK: case R_LOCK:
case UNLOCK: case R_UNLOCK:
case DDR_CAL_START: case R_DDR_CAL_START:
case DDR_REF_START: case R_DDR_REF_START:
return !rnw; /* Write only */ return !rnw; /* Write only */
case LOCKSTA: case R_LOCKSTA:
case FPGA0_THR_STA: case R_FPGA0_THR_STA:
case FPGA1_THR_STA: case R_FPGA1_THR_STA:
case FPGA2_THR_STA: case R_FPGA2_THR_STA:
case FPGA3_THR_STA: case R_FPGA3_THR_STA:
case BOOT_MODE: case R_BOOT_MODE:
case PSS_IDCODE: case R_PSS_IDCODE:
case DDR_CMD_STA: case R_DDR_CMD_STA:
case DDR_DFI_STATUS: case R_DDR_DFI_STATUS:
case PLL_STATUS: case R_PLL_STATUS:
return rnw;/* read only */ return rnw;/* read only */
case SCL: case R_SCL:
case ARM_PLL_CTRL ... IO_PLL_CTRL: case R_ARM_PLL_CTRL ... R_IO_PLL_CTRL:
case ARM_PLL_CFG ... IO_PLL_CFG: case R_ARM_PLL_CFG ... R_IO_PLL_CFG:
case ARM_CLK_CTRL ... TOPSW_CLK_CTRL: case R_ARM_CLK_CTRL ... R_TOPSW_CLK_CTRL:
case FPGA0_CLK_CTRL ... FPGA0_THR_CNT: case R_FPGA0_CLK_CTRL ... R_FPGA0_THR_CNT:
case FPGA1_CLK_CTRL ... FPGA1_THR_CNT: case R_FPGA1_CLK_CTRL ... R_FPGA1_THR_CNT:
case FPGA2_CLK_CTRL ... FPGA2_THR_CNT: case R_FPGA2_CLK_CTRL ... R_FPGA2_THR_CNT:
case FPGA3_CLK_CTRL ... FPGA3_THR_CNT: case R_FPGA3_CLK_CTRL ... R_FPGA3_THR_CNT:
case BANDGAP_TRIP: case R_BANDGAP_TRIP:
case PLL_PREDIVISOR: case R_PLL_PREDIVISOR:
case CLK_621_TRUE: case R_CLK_621_TRUE:
case PSS_RST_CTRL ... A9_CPU_RST_CTRL: case R_PSS_RST_CTRL ... R_A9_CPU_RST_CTRL:
case RS_AWDT_CTRL: case R_RS_AWDT_CTRL:
case RST_REASON: case R_RST_REASON:
case REBOOT_STATUS: case R_REBOOT_STATUS:
case APU_CTRL: case R_APU_CTRL:
case WDT_CLK_SEL: case R_WDT_CLK_SEL:
case TZ_DMA_NS ... TZ_DMA_PERIPH_NS: case R_TZ_DMA_NS ... R_TZ_DMA_PERIPH_NS:
case DDR_URGENT: case R_DDR_URGENT:
case DDR_URGENT_SEL: case R_DDR_URGENT_SEL:
case MIO ... MIO + MIO_LENGTH - 1: case R_MIO ... R_MIO + MIO_LENGTH - 1:
case MIO_LOOPBACK ... MIO_MST_TRI1: case R_MIO_LOOPBACK ... R_MIO_MST_TRI1:
case SD0_WP_CD_SEL: case R_SD0_WP_CD_SEL:
case SD1_WP_CD_SEL: case R_SD1_WP_CD_SEL:
case LVL_SHFTR_EN: case R_LVL_SHFTR_EN:
case OCM_CFG: case R_OCM_CFG:
case CPU_RAM: case R_CPU_RAM:
case IOU: case R_IOU:
case DMAC_RAM: case R_DMAC_RAM:
case AFI0 ... AFI3 + AFI_LENGTH - 1: case R_AFI0 ... R_AFI3 + AFI_LENGTH - 1:
case OCM: case R_OCM:
case DEVCI_RAM: case R_DEVCI_RAM:
case CSG_RAM: case R_CSG_RAM:
case GPIOB_CTRL ... GPIOB_CFG_CMOS33: case R_GPIOB_CTRL ... R_GPIOB_CFG_CMOS33:
case GPIOB_CFG_HSTL: case R_GPIOB_CFG_HSTL:
case GPIOB_DRVR_BIAS_CTRL: case R_GPIOB_DRVR_BIAS_CTRL:
case DDRIOB ... DDRIOB + DDRIOB_LENGTH - 1: case R_DDRIOB ... R_DDRIOB + DDRIOB_LENGTH - 1:
return true; return true;
default: default:
return false; return false;
@ -371,24 +371,24 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,
} }
switch (offset) { switch (offset) {
case SCL: case R_SCL:
s->regs[SCL] = val & 0x1; s->regs[R_SCL] = val & 0x1;
return; return;
case LOCK: case R_LOCK:
if ((val & 0xFFFF) == XILINX_LOCK_KEY) { if ((val & 0xFFFF) == XILINX_LOCK_KEY) {
DB_PRINT("XILINX LOCK 0xF8000000 + 0x%x <= 0x%x\n", (int)offset, DB_PRINT("XILINX LOCK 0xF8000000 + 0x%x <= 0x%x\n", (int)offset,
(unsigned)val & 0xFFFF); (unsigned)val & 0xFFFF);
s->regs[LOCKSTA] = 1; s->regs[R_LOCKSTA] = 1;
} else { } else {
DB_PRINT("WRONG XILINX LOCK KEY 0xF8000000 + 0x%x <= 0x%x\n", DB_PRINT("WRONG XILINX LOCK KEY 0xF8000000 + 0x%x <= 0x%x\n",
(int)offset, (unsigned)val & 0xFFFF); (int)offset, (unsigned)val & 0xFFFF);
} }
return; return;
case UNLOCK: case R_UNLOCK:
if ((val & 0xFFFF) == XILINX_UNLOCK_KEY) { if ((val & 0xFFFF) == XILINX_UNLOCK_KEY) {
DB_PRINT("XILINX UNLOCK 0xF8000000 + 0x%x <= 0x%x\n", (int)offset, DB_PRINT("XILINX UNLOCK 0xF8000000 + 0x%x <= 0x%x\n", (int)offset,
(unsigned)val & 0xFFFF); (unsigned)val & 0xFFFF);
s->regs[LOCKSTA] = 0; s->regs[R_LOCKSTA] = 0;
} else { } else {
DB_PRINT("WRONG XILINX UNLOCK KEY 0xF8000000 + 0x%x <= 0x%x\n", DB_PRINT("WRONG XILINX UNLOCK KEY 0xF8000000 + 0x%x <= 0x%x\n",
(int)offset, (unsigned)val & 0xFFFF); (int)offset, (unsigned)val & 0xFFFF);
@ -396,7 +396,7 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,
return; return;
} }
if (s->regs[LOCKSTA]) { if (s->regs[R_LOCKSTA]) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"SCLR registers are locked. Unlock them first\n"); "SCLR registers are locked. Unlock them first\n");
return; return;
@ -404,8 +404,8 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,
s->regs[offset] = val; s->regs[offset] = val;
switch (offset) { switch (offset) {
case PSS_RST_CTRL: case R_PSS_RST_CTRL:
if (val & R_PSS_RST_CTRL_SOFT_RST) { if (FIELD_EX32(val, PSS_RST_CTRL, SOFT_RST)) {
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
} }
break; break;