[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v3 31/33] Convert zynq's slcr to 3-phases reset
From: |
Damien Hedde |
Subject: |
[Qemu-arm] [PATCH v3 31/33] Convert zynq's slcr to 3-phases reset |
Date: |
Mon, 29 Jul 2019 16:56:52 +0200 |
Change the legacy reset function into the init phase and test the
resetting flag in register accesses.
Signed-off-by: Damien Hedde <address@hidden>
---
hw/misc/zynq_slcr.c | 39 +++++++++++++++++++++++++++++++++++----
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index dd766a6779..6fcdbce4f0 100644
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -172,6 +172,17 @@ REG32(DDRIOB, 0xb40)
#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr"
#define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR)
+#define ZYNQ_SLCR_CLASS(class) \
+ OBJECT_CLASS_CHECK(ZynqSLCRClass, (class), TYPE_ZYNQ_SLCR)
+#define ZYNQ_SLCR_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(ZynqSLCRClass, (obj), TYPE_ZYNQ_SLCR)
+
+typedef struct ZynqSLCRClass {
+ /*< private >*/
+ SysBusDeviceClass parent_class;
+
+ struct ResettablePhases parent_reset_phases;
+} ZynqSLCRClass;
typedef struct ZynqSLCRState {
SysBusDevice parent_obj;
@@ -181,13 +192,18 @@ typedef struct ZynqSLCRState {
uint32_t regs[ZYNQ_SLCR_NUM_REGS];
} ZynqSLCRState;
-static void zynq_slcr_reset(DeviceState *d)
+static void zynq_slcr_reset_init(Object *obj)
{
- ZynqSLCRState *s = ZYNQ_SLCR(d);
+ ZynqSLCRState *s = ZYNQ_SLCR(obj);
+ ZynqSLCRClass *zc = ZYNQ_SLCR_GET_CLASS(obj);
int i;
DB_PRINT("RESET\n");
+ if (zc->parent_reset_phases.init) {
+ zc->parent_reset_phases.init(obj);
+ }
+
s->regs[R_LOCKSTA] = 1;
/* 0x100 - 0x11C */
s->regs[R_ARM_PLL_CTRL] = 0x0001A008;
@@ -277,7 +293,6 @@ static void zynq_slcr_reset(DeviceState *d)
s->regs[R_DDRIOB + 12] = 0x00000021;
}
-
static bool zynq_slcr_check_offset(hwaddr offset, bool rnw)
{
switch (offset) {
@@ -347,6 +362,10 @@ static uint64_t zynq_slcr_read(void *opaque, hwaddr offset,
offset /= 4;
uint32_t ret = s->regs[offset];
+ if (device_is_resetting((DeviceState *) opaque)) {
+ return 0;
+ }
+
if (!zynq_slcr_check_offset(offset, true)) {
qemu_log_mask(LOG_GUEST_ERROR, "zynq_slcr: Invalid read access to "
" addr %" HWADDR_PRIx "\n", offset * 4);
@@ -362,6 +381,10 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,
ZynqSLCRState *s = (ZynqSLCRState *)opaque;
offset /= 4;
+ if (device_is_resetting((DeviceState *) opaque)) {
+ return;
+ }
+
DB_PRINT("addr: %08" HWADDR_PRIx " data: %08" PRIx64 "\n", offset * 4,
val);
if (!zynq_slcr_check_offset(offset, false)) {
@@ -440,9 +463,16 @@ static const VMStateDescription vmstate_zynq_slcr = {
static void zynq_slcr_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
+ ZynqSLCRClass *zc = ZYNQ_SLCR_CLASS(klass);
dc->vmsd = &vmstate_zynq_slcr;
- dc->reset = zynq_slcr_reset;
+
+ resettable_class_set_parent_reset_phases(rc,
+ zynq_slcr_reset_init,
+ NULL,
+ NULL,
+ &zc->parent_reset_phases);
}
static const TypeInfo zynq_slcr_info = {
@@ -451,6 +481,7 @@ static const TypeInfo zynq_slcr_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ZynqSLCRState),
.instance_init = zynq_slcr_init,
+ .class_size = sizeof(ZynqSLCRClass),
};
static void zynq_slcr_register_types(void)
--
2.22.0
- [Qemu-arm] [PATCH v3 16/33] hw/input/adb.c: remove qdev_reset_all call, (continued)
- [Qemu-arm] [PATCH v3 16/33] hw/input/adb.c: remove qdev_reset_all call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 17/33] hw/usb/dev-uas.c: remove qdev_reset_all call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 13/33] hw/scsi/: remove qdev/qbus_reset_all call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 24/33] hw/ppc/spapr: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 23/33] hw/scsi/vmw_pvscsi.c: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 25/33] hw/i386/pc.c: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 26/33] hw/s390x/s390-pci-inst.c: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 22/33] hw/ppc/pnv_psi.c: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 30/33] convert cadence_uart to 3-phases reset, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 20/33] hw/hyperv/hyperv.c: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 31/33] Convert zynq's slcr to 3-phases reset,
Damien Hedde <=
- [Qemu-arm] [PATCH v3 29/33] hw/misc/zynq_slcr: use standard register definition, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 28/33] qdev: Remove unused deprecated reset functions, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 27/33] hw/ide/microdrive.c: remove device_legacy_reset calls, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 32/33] Add uart reset support in zynq_slcr, Damien Hedde, 2019/07/29
- [Qemu-arm] [PATCH v3 33/33] Connect the uart reset gpios in the zynq platform, Damien Hedde, 2019/07/29
- Re: [Qemu-arm] [PATCH v3 00/33] Multi-phase reset mechanism, Cornelia Huck, 2019/07/30