Message ID | 0ecd5644773477442fbaa0f4bcadb58bbe488c78.1515523657.git.alistair.francis@xilinx.com |
---|---|
State | New |
Headers | show |
Series | [v1,1/3] xlnx-zynqmp-rtc: Initial commit | expand |
On 01/09/2018 03:50 PM, Alistair Francis wrote: > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > --- > > hw/arm/xlnx-zynqmp.c | 14 ++++++++++++++ > include/hw/arm/xlnx-zynqmp.h | 2 ++ > 2 files changed, 16 insertions(+) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 325642058b..deef583c2a 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -50,6 +50,9 @@ > #define DPDMA_ADDR 0xfd4c0000 > #define DPDMA_IRQ 116 > > +#define RTC_ADDR 0xffa60000 > +#define RTC_IRQ 26 > + > static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { > 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, > }; > @@ -183,6 +186,9 @@ static void xlnx_zynqmp_init(Object *obj) > > object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA); > qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); > + > + object_initialize(&s->rtc, sizeof(s->rtc), TYPE_XLNX_ZYNQMP_RTC); While here: object_property_add_child(obj, "rtc", OBJECT(&s->rtc), NULL); Anyway: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > + qdev_set_parent_bus(DEVICE(&s->rtc), sysbus_get_default()); > } > > static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > @@ -454,6 +460,14 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > &error_abort); > sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR); > sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]); > + > + object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, RTC_ADDR); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0, gic_spi[RTC_IRQ]); > } > > static Property xlnx_zynqmp_props[] = { > diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h > index 3e6fb9b7bd..9e8c9e18dd 100644 > --- a/include/hw/arm/xlnx-zynqmp.h > +++ b/include/hw/arm/xlnx-zynqmp.h > @@ -28,6 +28,7 @@ > #include "hw/ssi/xilinx_spips.h" > #include "hw/dma/xlnx_dpdma.h" > #include "hw/display/xlnx_dp.h" > +#include "hw/timer/xlnx-zynqmp-rtc.h" > > #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" > #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ > @@ -90,6 +91,7 @@ typedef struct XlnxZynqMPState { > XlnxZynqMPQSPIPS qspi; > XlnxDPState dp; > XlnxDPDMAState dpdma; > + XlnxZynqMPRTC rtc; > > char *boot_cpu; > ARMCPU *boot_cpu_ptr; >
On Thu, Jan 11, 2018 at 10:36 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > On 01/09/2018 03:50 PM, Alistair Francis wrote: >> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> >> --- >> >> hw/arm/xlnx-zynqmp.c | 14 ++++++++++++++ >> include/hw/arm/xlnx-zynqmp.h | 2 ++ >> 2 files changed, 16 insertions(+) >> >> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c >> index 325642058b..deef583c2a 100644 >> --- a/hw/arm/xlnx-zynqmp.c >> +++ b/hw/arm/xlnx-zynqmp.c >> @@ -50,6 +50,9 @@ >> #define DPDMA_ADDR 0xfd4c0000 >> #define DPDMA_IRQ 116 >> >> +#define RTC_ADDR 0xffa60000 >> +#define RTC_IRQ 26 >> + >> static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { >> 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, >> }; >> @@ -183,6 +186,9 @@ static void xlnx_zynqmp_init(Object *obj) >> >> object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA); >> qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); >> + >> + object_initialize(&s->rtc, sizeof(s->rtc), TYPE_XLNX_ZYNQMP_RTC); > > While here: > > object_property_add_child(obj, "rtc", OBJECT(&s->rtc), NULL); I don't understand why this is needed? Alistair > > Anyway: > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > >> + qdev_set_parent_bus(DEVICE(&s->rtc), sysbus_get_default()); >> } >> >> static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) >> @@ -454,6 +460,14 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) >> &error_abort); >> sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR); >> sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]); >> + >> + object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err); >> + if (err) { >> + error_propagate(errp, err); >> + return; >> + } >> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, RTC_ADDR); >> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0, gic_spi[RTC_IRQ]); >> } >> >> static Property xlnx_zynqmp_props[] = { >> diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h >> index 3e6fb9b7bd..9e8c9e18dd 100644 >> --- a/include/hw/arm/xlnx-zynqmp.h >> +++ b/include/hw/arm/xlnx-zynqmp.h >> @@ -28,6 +28,7 @@ >> #include "hw/ssi/xilinx_spips.h" >> #include "hw/dma/xlnx_dpdma.h" >> #include "hw/display/xlnx_dp.h" >> +#include "hw/timer/xlnx-zynqmp-rtc.h" >> >> #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" >> #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ >> @@ -90,6 +91,7 @@ typedef struct XlnxZynqMPState { >> XlnxZynqMPQSPIPS qspi; >> XlnxDPState dp; >> XlnxDPDMAState dpdma; >> + XlnxZynqMPRTC rtc; >> >> char *boot_cpu; >> ARMCPU *boot_cpu_ptr; >>
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 325642058b..deef583c2a 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -50,6 +50,9 @@ #define DPDMA_ADDR 0xfd4c0000 #define DPDMA_IRQ 116 +#define RTC_ADDR 0xffa60000 +#define RTC_IRQ 26 + static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, }; @@ -183,6 +186,9 @@ static void xlnx_zynqmp_init(Object *obj) object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA); qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); + + object_initialize(&s->rtc, sizeof(s->rtc), TYPE_XLNX_ZYNQMP_RTC); + qdev_set_parent_bus(DEVICE(&s->rtc), sysbus_get_default()); } static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) @@ -454,6 +460,14 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) &error_abort); sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]); + + object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, RTC_ADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0, gic_spi[RTC_IRQ]); } static Property xlnx_zynqmp_props[] = { diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 3e6fb9b7bd..9e8c9e18dd 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -28,6 +28,7 @@ #include "hw/ssi/xilinx_spips.h" #include "hw/dma/xlnx_dpdma.h" #include "hw/display/xlnx_dp.h" +#include "hw/timer/xlnx-zynqmp-rtc.h" #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ @@ -90,6 +91,7 @@ typedef struct XlnxZynqMPState { XlnxZynqMPQSPIPS qspi; XlnxDPState dp; XlnxDPDMAState dpdma; + XlnxZynqMPRTC rtc; char *boot_cpu; ARMCPU *boot_cpu_ptr;
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> --- hw/arm/xlnx-zynqmp.c | 14 ++++++++++++++ include/hw/arm/xlnx-zynqmp.h | 2 ++ 2 files changed, 16 insertions(+)