[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC PATCH v2 11/12] Add uart reset support in zynq_slcr
From: |
Damien Hedde |
Subject: |
[Qemu-arm] [RFC PATCH v2 11/12] Add uart reset support in zynq_slcr |
Date: |
Tue, 4 Jun 2019 18:25:25 +0200 |
Add two gpio outputs to control the uart resets.
Signed-off-by: Damien Hedde <address@hidden>
---
hw/misc/zynq_slcr.c | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index c6d2bba966..6649c93a90 100644
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -96,6 +96,10 @@ REG32(SPI_RST_CTRL, 0x21c)
REG32(CAN_RST_CTRL, 0x220)
REG32(I2C_RST_CTRL, 0x224)
REG32(UART_RST_CTRL, 0x228)
+ FIELD(UART_RST_CTRL, UART0_CPU1X_RST, 0, 1)
+ FIELD(UART_RST_CTRL, UART1_CPU1X_RST, 1, 1)
+ FIELD(UART_RST_CTRL, UART0_REF_RST, 2, 1)
+ FIELD(UART_RST_CTRL, UART1_REF_RST, 3, 1)
REG32(GPIO_RST_CTRL, 0x22c)
REG32(LQSPI_RST_CTRL, 0x230)
REG32(SMC_RST_CTRL, 0x234)
@@ -189,8 +193,14 @@ typedef struct ZynqSLCRState {
MemoryRegion iomem;
uint32_t regs[ZYNQ_SLCR_NUM_REGS];
+
+ qemu_irq uart0_rst;
+ qemu_irq uart1_rst;
} ZynqSLCRState;
+#define ZYNQ_SLCR_REGFIELD_TO_OUT(state, irq, reg, field) \
+ qemu_set_irq((state)->irq, ARRAY_FIELD_EX32((state)->regs, reg, field) !=
0)
+
static void zynq_slcr_reset_init(Object *obj, bool cold)
{
ZynqSLCRState *s = ZYNQ_SLCR(obj);
@@ -292,6 +302,24 @@ static void zynq_slcr_reset_init(Object *obj, bool cold)
s->regs[R_DDRIOB + 12] = 0x00000021;
}
+static void zynq_slcr_compute_uart_reset(ZynqSLCRState *s)
+{
+ ZYNQ_SLCR_REGFIELD_TO_OUT(s, uart0_rst, UART_RST_CTRL, UART0_REF_RST);
+ ZYNQ_SLCR_REGFIELD_TO_OUT(s, uart1_rst, UART_RST_CTRL, UART1_REF_RST);
+}
+
+static void zynq_slcr_reset_hold(Object *obj)
+{
+ ZynqSLCRState *s = ZYNQ_SLCR(obj);
+ ZynqSLCRClass *zc = ZYNQ_SLCR_GET_CLASS(obj);
+
+ if (zc->parent_reset_phases.hold) {
+ zc->parent_reset_phases.hold(obj);
+ }
+
+ zynq_slcr_compute_uart_reset(s);
+}
+
static bool zynq_slcr_check_offset(hwaddr offset, bool rnw)
{
switch (offset) {
@@ -431,6 +459,9 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
}
break;
+ case R_UART_RST_CTRL:
+ zynq_slcr_compute_uart_reset(s);
+ break;
}
}
@@ -447,6 +478,9 @@ static void zynq_slcr_init(Object *obj)
memory_region_init_io(&s->iomem, obj, &slcr_ops, s, "slcr",
ZYNQ_SLCR_MMIO_SIZE);
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
+
+ qdev_init_gpio_out_named(DEVICE(obj), &s->uart0_rst, "uart0_rst", 1);
+ qdev_init_gpio_out_named(DEVICE(obj), &s->uart1_rst, "uart1_rst", 1);
}
static const VMStateDescription vmstate_zynq_slcr = {
@@ -469,7 +503,7 @@ static void zynq_slcr_class_init(ObjectClass *klass, void
*data)
resettable_class_set_parent_reset_phases(rc,
zynq_slcr_reset_init,
- NULL,
+ zynq_slcr_reset_hold,
NULL,
&zc->parent_reset_phases);
}
--
2.21.0
- [Qemu-arm] [RFC PATCH v2 02/12] add device_legacy_reset function to do the transition with device_reset, (continued)
- [Qemu-arm] [RFC PATCH v2 02/12] add device_legacy_reset function to do the transition with device_reset, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 03/12] replace all occurences of device_reset by device_legacy_reset, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 01/12] Create Resettable QOM interface, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 05/12] Add function to control reset with gpio inputs, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 06/12] add vmstate description for device reset state, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 04/12] make Device and Bus Resettable, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 07/12] add doc about Resettable interface, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 09/12] convert cadence_uart to 3-phases reset, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 10/12] Convert zynq's slcr to 3-phases reset, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 08/12] hw/misc/zynq_slcr: use standard register definition, Damien Hedde, 2019/06/04
- [Qemu-arm] [RFC PATCH v2 11/12] Add uart reset support in zynq_slcr,
Damien Hedde <=
- [Qemu-arm] [RFC PATCH v2 12/12] Connect the uart reset gpios in the zynq platform, Damien Hedde, 2019/06/04
- Re: [Qemu-arm] [RFC PATCH v2 00/12] Multi-phase reset, Peter Maydell, 2019/06/18