On 4/27/20 8:16 PM, Edgar E. Iglesias wrote:
> From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
>
> hw/arm: versal: Add support for the RTC.
>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
> ---
> hw/arm/xlnx-versal.c | 21 +++++++++++++++++++++
> include/hw/arm/xlnx-versal.h | 8 ++++++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
> index e263bdf77a..321171bcce 100644
> --- a/hw/arm/xlnx-versal.c
> +++ b/hw/arm/xlnx-versal.c
> @@ -240,6 +240,26 @@ static void versal_create_sds(Versal *s, qemu_irq *pic)
> }
> }
>
> +static void versal_create_rtc(Versal *s, qemu_irq *pic)
> +{
> + SysBusDevice *sbd;
> + MemoryRegion *mr;
> +
> + sysbus_init_child_obj(OBJECT(s), "rtc", &s->pmc.rtc, sizeof(s->pmc.rtc),
> + TYPE_XLNX_ZYNQMP_RTC);
> + sbd = SYS_BUS_DEVICE(&s->pmc.rtc);
> + qdev_init_nofail(DEVICE(sbd));
> +
> + mr = sysbus_mmio_get_region(sbd, 0);
> + memory_region_add_subregion(&s->mr_ps, MM_PMC_RTC, mr);
> +
> + /*
> + * TODO: Connect the ALARM and SECONDS interrupts once our RTC model
> + * supports them.
> + */
> + sysbus_connect_irq(sbd, 1, pic[VERSAL_RTC_APB_ERR_IRQ]);
RTC IRQ#1 is 'irq_addr_error_int', OK. Maybe worth later switching to
the qdev gpio API using qdev_init_gpio_out_named() in
hw/rtc/xlnx-zynqmp-rtc.c and then qdev_get_gpio_in_named() here.
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> +}
> +
> /* This takes the board allocated linear DDR memory and creates aliases
> * for each split DDR range/aperture on the Versal address map.
> */
> @@ -323,6 +343,7 @@ static void versal_realize(DeviceState *dev, Error **errp)
> versal_create_gems(s, pic);
> versal_create_admas(s, pic);
> versal_create_sds(s, pic);
> + versal_create_rtc(s, pic);
> versal_map_ddr(s);
> versal_unimp(s);
>
> diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h
> index e11693e29d..9c9f47ba9d 100644
> --- a/include/hw/arm/xlnx-versal.h
> +++ b/include/hw/arm/xlnx-versal.h
> @@ -19,6 +19,7 @@
> #include "hw/char/pl011.h"
> #include "hw/dma/xlnx-zdma.h"
> #include "hw/net/cadence_gem.h"
> +#include "hw/rtc/xlnx-zynqmp-rtc.h"
>
> #define TYPE_XLNX_VERSAL "xlnx-versal"
> #define XLNX_VERSAL(obj) OBJECT_CHECK(Versal, (obj), TYPE_XLNX_VERSAL)
> @@ -65,6 +66,8 @@ typedef struct Versal {
> struct {
> SDHCIState sd[XLNX_VERSAL_NR_SDS];
> } iou;
> +
> + XlnxZynqMPRTC rtc;
> } pmc;
>
> struct {
> @@ -89,7 +92,10 @@ typedef struct Versal {
> #define VERSAL_GEM1_IRQ_0 58
> #define VERSAL_GEM1_WAKE_IRQ_0 59
> #define VERSAL_ADMA_IRQ_0 60
> +#define VERSAL_RTC_APB_ERR_IRQ 121
> #define VERSAL_SD0_IRQ_0 126
> +#define VERSAL_RTC_ALARM_IRQ 142
> +#define VERSAL_RTC_SECONDS_IRQ 143
>
> /* Architecturally reserved IRQs suitable for virtualization. */
> #define VERSAL_RSVD_IRQ_FIRST 111
> @@ -143,4 +149,6 @@ typedef struct Versal {
> #define MM_PMC_SD0_SIZE 0x10000
> #define MM_PMC_CRP 0xf1260000U
> #define MM_PMC_CRP_SIZE 0x10000
> +#define MM_PMC_RTC 0xf12a0000
> +#define MM_PMC_RTC_SIZE 0x10000
> #endif
>
