Add and connect the PMU IOModule devices
v2 cover Add and connect the PMU IOModule devices
V2:
- Add the GPO and GPI devices as well
Alistair Francis (5):
timer: Initial commit of xlnx-pmu-iomod-pit device
xlnx-zynqmp-pmu: Connect the PMU IOMOD PIT devices hw/gpio: Add the xlnx-pmu-iomod-gpo device hw/gpio: Add support for the xlnx-pmu-iomod-gpi device
xlnx-zynqmp-pmu: Connect the IOMOD GPI/GPO devices
include/hw/gpio/xlnx-pmu-iomod-gp.h | 57 ++++++++ include/hw/timer/xlnx-pmu-iomod-pit.h | 58 ++++++++ hw/gpio/xlnx-pmu-iomod-gp.c | 203 ++++++++++++++++++++++++++++ hw/microblaze/xlnx-zynqmp-pmu.c | 108 +++++++++++++++ hw/timer/xlnx-pmu-iomod-pit.c | 241 ++++++++++++++++++++++++++++++++++ hw/gpio/Makefile.objs | 2 + hw/timer/Makefile.objs | 2 + 7 files changed, 671 insertions(+) create mode 100644 include/hw/gpio/xlnx-pmu-iomod-gp.h create mode 100644 include/hw/timer/xlnx-pmu-iomod-pit.h create mode 100644 hw/gpio/xlnx-pmu-iomod-gp.c create mode 100644 hw/timer/xlnx-pmu-iomod-pit.c
Signature · 1 line
2.14.1
PATCH v2 1/5 timer: Initial commit of xlnx-pmu-iomod-pit device
---
V2:
- Use UINT32_MAX and uint64_t in xlnx_iomod_pit_ctr_pr()
- Name frequency varaible frequency_hz
- Shorten R_MAX #define
include/hw/timer/xlnx-pmu-iomod-pit.h | 58 ++++++++ hw/timer/xlnx-pmu-iomod-pit.c | 241 ++++++++++++++++++++++++++++++++++ hw/timer/Makefile.objs | 2 + 3 files changed, 301 insertions(+) create mode 100644 include/hw/timer/xlnx-pmu-iomod-pit.h create mode 100644 hw/timer/xlnx-pmu-iomod-pit.c
include/hw/timer/xlnx-pmu-iomod-pit.h new file +58 -0
@@ -0,0 +1,58 @@ +/* +* QEMU model of Xilinx I/O Module PIT +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "hw/ptimer.h" + +#define TYPE_XLNX_ZYNQMP_IOMODULE_PIT "xlnx.pmu_iomodule_pit" + +#define XLNX_ZYNQMP_IOMODULE_PIT (obj) \ + OBJECT_CHECK(XlnxPMUPIT, (obj), TYPE_XLNX_ZYNQMP_IOMODULE_PIT) + +#define XLNX_ZYNQMP_IOMOD_PIT_R_MAX (0x08 + 1) + +typedef struct XlnxPMUPIT { +SysBusDevice parent_obj; +MemoryRegion iomem; + +QEMUBH *bh; +ptimer_state *ptimer; + +qemu_irq irq; +/* IRQ to pulse out when present timer hits zero */ +qemu_irq hit_out; + +/* Counter in Pre-Scalar(ps) Mode */ +uint32_t ps_counter; +/* ps_mode irq-in to enable/disable pre-scalar */ +bool ps_enable; +/* State var to remember hit_in level */ +bool ps_level; + +uint32_t frequency_hz; + +uint32_t regs[XLNX_ZYNQMP_IOMOD_PIT_R_MAX ]; +RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_PIT_R_MAX ]; +}XlnxPMUPIT ;
hw/timer/xlnx-pmu-iomod-pit.c new file +241 -0
241 lines not on this page · raw message
hw/timer/Makefile.objs +2 -0
@@ -43,3 +43,5 @@ common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o common-obj-$(CONFIG_MSF2) += mss-timer.o + +common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-pit.o
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v2 1/5] timer: Initial commit of xlnx-pmu-iomod-pit device
Quoted 44 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>---
V2:
- UseUINT32_MAXanduint64_tinxlnx_iomod_pit_ctr_pr()
- Name frequency varaiblefrequency_hz
- ShortenR_MAX#defineinclude/hw/timer/xlnx-pmu-iomod-pit.h | 58 ++++++++ hw/timer/xlnx-pmu-iomod-pit.c | 241 ++++++++++++++++++++++++++++++++++ hw/timer/Makefile.objs | 2 + 3 files changed, 301 insertions(+) create mode 100644 include/hw/timer/xlnx-pmu-iomod-pit.h create mode 100644 hw/timer/xlnx-pmu-iomod-pit.cinclude/hw/timer/xlnx-pmu-iomod-pit.h new file +24
-0@@ -0,0 +1,58 @@ +/* +* QEMU model of Xilinx I/O Module PIT +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/
include/hw/timer/xlnx-pmu-iomod-pit.h line 34
Quoted 10 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +10
-0+ +#include "qemu/osdep.h" +#include "hw/ptimer.h" + +#define TYPE_XLNX_ZYNQMP_IOMODULE_PIT "xlnx.pmu_iomodule_pit" + +#define XLNX_ZYNQMP_IOMODULE_PIT (obj) \ + OBJECT_CHECK(XlnxPMUPIT, (obj), TYPE_XLNX_ZYNQMP_IOMODULE_PIT) + +#define XLNX_ZYNQMP_IOMOD_PIT_R_MAX (0x08 + 1)
0x04?
Quoted 92 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +24
-0+ +typedef struct XlnxPMUPIT { +SysBusDevice parent_obj; +MemoryRegion iomem; + +QEMUBH *bh; +ptimer_state *ptimer; + +qemu_irq irq; +/* IRQ to pulse out when present timer hits zero */ +qemu_irq hit_out; + +/* Counter in Pre-Scalar(ps) Mode */ +uint32_t ps_counter; +/* ps_mode irq-in to enable/disable pre-scalar */ +bool ps_enable; +/* State var to remember hit_in level */ +bool ps_level; + +uint32_t frequency_hz; + +uint32_t regs[XLNX_ZYNQMP_IOMOD_PIT_R_MAX ]; +RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_PIT_R_MAX ]; +}XlnxPMUPIT ;hw/timer/xlnx-pmu-iomod-pit.c new file +62
-0@@ -0,0 +1,241 @@ +/* +* QEMU model of Xilinx I/O Module PIT +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/ptimer.h" +#include "hw/register.h" +#include "qemu/main-loop.h" +#include "qemu/log.h" +#include "qapi/error.h" +#include "hw/timer/xlnx-pmu-iomod-pit.h" + +#ifndef XLNX_ZYNQMP_IOMODULE_PIT_ERR_DEBUG +#define XLNX_ZYNQMP_IOMODULE_PIT_ERR_DEBUG 0 +#endif + +REG32(PIT_PRELOAD, 0x00) +REG32(PIT_COUNTER, 0x04) +REG32(PIT_CONTROL, 0x08) + FIELD(PIT_CONTROL, PRELOAD, 1, 1) + FIELD(PIT_CONTROL, EN, 0, 1) + +static uint64_t xlnx_iomod_pit_ctr_pr (RegisterInfo *reg,uint64_t val) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (reg->opaque); +uint64_t ret; + +if (s->ps_enable) { + ret = s->ps_counter; + }else { + ret =ptimer_get_count (s->ptimer); + } + +return ret &UINT32_MAX ; +} + +static void xlnx_iomod_pit_control_pw (RegisterInfo *reg,uint64_t val) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (reg->opaque); +
hw/timer/xlnx-pmu-iomod-pit.c line 72
Quoted 10 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +10
-0+ptimer_stop (s->ptimer); + +if (val &R_PIT_CONTROL_EN_MASK ) { +if (s->ps_enable) { +/* pre-scalar mode do-Nothing here */ + s->ps_counter = s->regs[R_PIT_PRELOAD ]; + }else { +ptimer_set_limit (s->ptimer, s->regs[R_PIT_PRELOAD ],1 ); +ptimer_run (s->ptimer, !(val &R_PIT_CONTROL_PRELOAD_MASK )); +
blank line
hw/timer/xlnx-pmu-iomod-pit.c line 79
Quoted 7 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +7
-0+ } + } +} + +static const RegisterAccessInfo xlnx_iomod_pit_regs_info[] = { + { .name ="PIT_PRELOAD" , .addr =A_PIT_PRELOAD , + .ro =0xffffffff ,
Or UINT32_MAX
hw/timer/xlnx-pmu-iomod-pit.c line 84
Quoted 5 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +5
-0+ },{ .name = "PIT_COUNTER", .addr = A_PIT_COUNTER, + .ro = 0xffffffff, + .post_read = xlnx_iomod_pit_ctr_pr, + },{ .name = "PIT_CONTROL", .addr = A_PIT_CONTROL, + .rsvd = 0xfffffffc,
Or = ~(R_PIT_CONTROL_PRELOAD_MASK | R_PIT_CONTROL_EN_MASK),
and I always forgot this is mostly generated.
Quoted 31 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +31
-0+ .post_write = xlnx_iomod_pit_control_pw, + } +}; + +static void xlnx_iomod_pit_timer_hit (void *opaque) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (opaque); + +qemu_irq_pulse (s->irq); + +/* hit_out to make another pit move it's counter in pre-scalar mode. */ +qemu_irq_pulse (s->hit_out); +} + +static void xlnx_iomod_pit_ps_config (void *opaque,int n,int level) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (opaque); + + s->ps_enable = level; +} + +static void xlnx_iomod_pit_ps_hit_in (void *opaque,int n,int level) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (opaque); + +if (!ARRAY_FIELD_EX32 (s->regs,PIT_CONTROL ,EN )) { +/* PIT disabled */ +return ; + } + +/* Count only on positive edge */
hw/timer/xlnx-pmu-iomod-pit.c line 125
Quoted 10 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +10
-0+if (!s->ps_level && level) { +if (s->ps_counter) { + s->ps_counter--; + } + s->ps_level = level; + }else { +/* Not on positive edge */ + s->ps_level = level; +return ; + }
Inverting this
if (C) {A} else {B return}
as
if (!C) {B return}
A
is a bit easier to read.
Quoted 4 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +4
-0+ +/* If timer expires, try to preload or stop */ +if (s->ps_counter ==0 ) { +xlnx_iomod_pit_timer_hit (opaque);
hw/timer/xlnx-pmu-iomod-pit.c line 139
Quoted 10 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +10
-0+ +/* Check for pit preload/one-shot mode */ +if (ARRAY_FIELD_EX32 (s->regs,PIT_CONTROL ,PRELOAD )) { +/* Preload Mode, Reload the ps_counter */ + s->ps_counter = s->regs[R_PIT_PRELOAD ]; + }else { +/* One-Shot mode, turn off the timer */ + s->regs[R_PIT_CONTROL ] &= ~R_PIT_CONTROL_PRELOAD_MASK ; + } + }
Ditto, if (!s->ps_counter) return;
Anyway this is fine,
Quoted 113 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +102
-0+} + +static void xlnx_iomod_pit_reset (DeviceState *dev) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (dev); +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (s->regs_info); ++i) { +register_reset (&s->regs_info[i]); + } + + s->ps_level = false; +} + +static const MemoryRegionOps xlnx_iomod_pit_ops = { + .read = register_read_memory, + .write = register_write_memory, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =4 , + }, +}; + +static void xlnx_iomod_pit_realize (DeviceState *dev,Error **errp) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (dev); + + s->bh =qemu_bh_new (xlnx_iomod_pit_timer_hit, s); + s->ptimer =ptimer_init (s->bh,PTIMER_POLICY_DEFAULT ); +ptimer_set_freq (s->ptimer, s->frequency_hz); + +/* IRQ out to pulse when present timer expires/reloads */ +qdev_init_gpio_out_named (dev, &s->hit_out,"ps_hit_out" ,1 ); + +/* IRQ in to enable pre-scalar mode. Routed from gpo1 */ +qdev_init_gpio_in_named (dev, xlnx_iomod_pit_ps_config,"ps_config" ,1 ); + +/* hit_out of neighbouring PIT is received as hit_in */ +qdev_init_gpio_in_named (dev, xlnx_iomod_pit_ps_hit_in,"ps_hit_in" ,1 ); +} + +static void xlnx_iomod_pit_init (Object *obj) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (obj); +SysBusDevice *sbd =SYS_BUS_DEVICE (obj); +RegisterInfoArray *reg_array; + +memory_region_init (&s->iomem, obj,TYPE_XLNX_ZYNQMP_IOMODULE_PIT , +XLNX_ZYNQMP_IOMOD_PIT_R_MAX *4 ); + reg_array = +register_init_block32 (DEVICE (obj), xlnx_iomod_pit_regs_info, +ARRAY_SIZE (xlnx_iomod_pit_regs_info), + s->regs_info, s->regs, + &xlnx_iomod_pit_ops, +XLNX_ZYNQMP_IOMODULE_PIT_ERR_DEBUG , +XLNX_ZYNQMP_IOMOD_PIT_R_MAX *4 ); +memory_region_add_subregion (&s->iomem, +0x0 , + ®_array->mem); +sysbus_init_mmio (sbd, &s->iomem); +sysbus_init_irq (sbd, &s->irq); +} + +static const VMStateDescription vmstate_xlnx_iomod_pit = { + .name =TYPE_XLNX_ZYNQMP_IOMODULE_PIT , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_END_OF_LIST (), + } +}; + +static Property xlnx_iomod_pit_properties[] = { +DEFINE_PROP_UINT32 ("frequency" , XlnxPMUPIT, frequency_hz,66000000 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void xlnx_iomod_pit_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = xlnx_iomod_pit_reset; + dc->realize = xlnx_iomod_pit_realize; + dc->props = xlnx_iomod_pit_properties; + dc->vmsd = &vmstate_xlnx_iomod_pit; +} + +static const TypeInfo xlnx_iomod_pit_info = { + .name =TYPE_XLNX_ZYNQMP_IOMODULE_PIT , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (XlnxPMUPIT), + .class_init = xlnx_iomod_pit_class_init, + .instance_init = xlnx_iomod_pit_init, +}; + +static void xlnx_iomod_pit_register_types (void ) +{ +type_register_static (&xlnx_iomod_pit_info); +} + +type_init (xlnx_iomod_pit_register_types)hw/timer/Makefile.objs +2
-0@@ -43,3 +43,5 @@ common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o common-obj-$(CONFIG_MSF2) += mss-timer.o + +common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-pit.o
Re: [Qemu-devel] [PATCH v2 1/5] timer: Initial commit of xlnx-pmu-iomod-pit device
Quoted 10 lines · Philippe Mathieu-Daudé
Quoted 9 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>---
V2:
- UseUINT32_MAXanduint64_tinxlnx_iomod_pit_ctr_pr()
- Name frequency varaiblefrequency_hz
- ShortenR_MAX#defineinclude/hw/timer/xlnx-pmu-iomod-pit.h | 58 ++++++++ hw/timer/xlnx-pmu-iomod-pit.c | 241
++++++++++++++++++++++++++++++++++
Quoted 6 lines
Review
Quoted 6 lines
hw/timer/Makefile.objs | 2 + 3 files changed, 301 insertions(+) create mode 100644 include/hw/timer/xlnx-pmu-iomod-pit.h create mode 100644 hw/timer/xlnx-pmu-iomod-pit.c(quoted diff) +0
-0
b/include/hw/timer/xlnx-pmu-iomod-pit.h
Quoted 4 lines
Quoted 4 lines
new file mode 100644
index 0000000000..75cac6beddinclude/hw/timer/xlnx-pmu-iomod-pit.h new file +0
-0
Quoted 8 lines
include/hw/timer/xlnx-pmu-iomod-pit.h line 7
Quoted 8 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +7
-0@@ -0,0 +1,58 @@ +/* +* QEMU model of Xilinx I/O Module PIT +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person
obtaining a copy
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 8
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* of this software and associated documentation files (the
"Software"), to deal
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 9
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* in the Software without restriction, including without limitation
the rights
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 10
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 11
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* copies of the Software, and to permit persons to whom the Software
is
Quoted 3 lines
include/hw/timer/xlnx-pmu-iomod-pit.h
Quoted 3 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +3
-0+* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be
included in
Quoted 3 lines
include/hw/timer/xlnx-pmu-iomod-pit.h
Quoted 3 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +3
-0+* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 18
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 19
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 20
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 21
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h line 22
Quoted 1 line
include/hw/timer/xlnx-pmu-iomod-pit.h new file +1
-0+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
Quoted 6 lines
Quoted 6 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +6
-0+* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "hw/ptimer.h" +
Quoted 8 lines
include/hw/timer/xlnx-pmu-iomod-pit.h line 34
Quoted 6 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +6
-0+#define TYPE_XLNX_ZYNQMP_IOMODULE_PIT "xlnx.pmu_iomodule_pit" + +#define XLNX_ZYNQMP_IOMODULE_PIT (obj) \ + OBJECT_CHECK(XlnxPMUPIT, (obj), TYPE_XLNX_ZYNQMP_IOMODULE_PIT) + +#define XLNX_ZYNQMP_IOMOD_PIT_R_MAX (0x08 + 1)
0x04?
No, 0x08 is right.
Quoted 17 lines
Quoted 17 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +17
-0+ +typedef struct XlnxPMUPIT { + SysBusDevice parent_obj; + MemoryRegion iomem; + + QEMUBH *bh; + ptimer_state *ptimer; + + qemu_irq irq; + /* IRQ to pulse out when present timer hits zero */ + qemu_irq hit_out; + + /* Counter in Pre-Scalar(ps) Mode */ + uint32_t ps_counter; + /* ps_mode irq-in to enable/disable pre-scalar */ + bool ps_enable; + /* State var to remember hit_in level */
Quoted 8 lines
Review
Quoted 8 lines
include/hw/timer/xlnx-pmu-iomod-pit.h new file +7
-0+bool ps_level; + +uint32_t frequency_hz; + +uint32_t regs[XLNX_ZYNQMP_IOMOD_PIT_R_MAX ]; +RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_PIT_R_MAX ]; +} XlnxPMUPIT;(quoted diff) +0
-0
b/hw/timer/xlnx-pmu-iomod-pit.c
Quoted 4 lines
Quoted 4 lines
new file mode 100644
index 0000000000..a6bdc5211dhw/timer/xlnx-pmu-iomod-pit.c new file +0
-0
Quoted 8 lines
hw/timer/xlnx-pmu-iomod-pit.c line 7
Quoted 8 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +7
-0@@ -0,0 +1,241 @@ +/* +* QEMU model of Xilinx I/O Module PIT +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person
obtaining a copy
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 8
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* of this software and associated documentation files (the
"Software"), to deal
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 9
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* in the Software without restriction, including without limitation
the rights
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 10
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 11
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* copies of the Software, and to permit persons to whom the Software
is
Quoted 3 lines
hw/timer/xlnx-pmu-iomod-pit.c line 14
Quoted 3 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +3
-0+* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be
included in
Quoted 3 lines
hw/timer/xlnx-pmu-iomod-pit.c line 17
Quoted 3 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +3
-0+* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 18
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 19
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 20
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 21
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c line 22
Quoted 1 line
hw/timer/xlnx-pmu-iomod-pit.c new file +1
-0+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
Quoted 44 lines
Quoted 44 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +44
-0+* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/ptimer.h" +#include "hw/register.h" +#include "qemu/main-loop.h" +#include "qemu/log.h" +#include "qapi/error.h" +#include "hw/timer/xlnx-pmu-iomod-pit.h" + +#ifndef XLNX_ZYNQMP_IOMODULE_PIT_ERR_DEBUG +#define XLNX_ZYNQMP_IOMODULE_PIT_ERR_DEBUG 0 +#endif + +REG32(PIT_PRELOAD, 0x00) +REG32(PIT_COUNTER, 0x04) +REG32(PIT_CONTROL, 0x08) + FIELD(PIT_CONTROL, PRELOAD, 1, 1) + FIELD(PIT_CONTROL, EN, 0, 1) + +static uint64_t xlnx_iomod_pit_ctr_pr (RegisterInfo *reg,uint64_t val) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (reg->opaque); +uint64_t ret; + +if (s->ps_enable) { + ret = s->ps_counter; + }else { + ret =ptimer_get_count (s->ptimer); + } + +return ret &UINT32_MAX ; +} + +static void xlnx_iomod_pit_control_pw (RegisterInfo *reg,uint64_t val) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (reg->opaque); + +ptimer_stop (s->ptimer); + +if (val &R_PIT_CONTROL_EN_MASK ) { +if (s->ps_enable) {
Quoted 8 lines
hw/timer/xlnx-pmu-iomod-pit.c line 72
Quoted 6 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +6
-0+/* pre-scalar mode do-Nothing here */ + s->ps_counter = s->regs[R_PIT_PRELOAD ]; + }else { +ptimer_set_limit (s->ptimer, s->regs[R_PIT_PRELOAD ],1 ); +ptimer_run (s->ptimer, !(val &R_PIT_CONTROL_PRELOAD_MASK )); +blank line
Fixed.
Quoted 9 lines
hw/timer/xlnx-pmu-iomod-pit.c line 79
Quoted 7 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +7
-0+ } + } +} + +static const RegisterAccessInfo xlnx_iomod_pit_regs_info[] = { + { .name ="PIT_PRELOAD" , .addr =A_PIT_PRELOAD , + .ro =0xffffffff ,Or
UINT32_MAX
Fixed.
Quoted 7 lines
hw/timer/xlnx-pmu-iomod-pit.c line 84
Quoted 5 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +5
-0+ },{ .name = "PIT_COUNTER", .addr = A_PIT_COUNTER, + .ro = 0xffffffff, + .post_read = xlnx_iomod_pit_ctr_pr, + },{ .name = "PIT_CONTROL", .addr = A_PIT_CONTROL, + .rsvd = 0xfffffffc,Or = ~(R_PIT_CONTROL_PRELOAD_MASK |
R_PIT_CONTROL_EN_MASK),
Fixed.
Quoted 13 lines
and I always forgot this is mostly generated.
hw/timer/xlnx-pmu-iomod-pit.c
Quoted 11 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +11
-0+ .post_write = xlnx_iomod_pit_control_pw, + } +}; + +static void xlnx_iomod_pit_timer_hit (void *opaque) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (opaque); + +qemu_irq_pulse (s->irq); + +/* hit_out to make another pit move it's counter in pre-scalar
mode. */
Quoted 33 lines
Quoted 20 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +20
-0+qemu_irq_pulse (s->hit_out); +} + +static void xlnx_iomod_pit_ps_config (void *opaque,int n,int level) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (opaque); + + s->ps_enable = level; +} + +static void xlnx_iomod_pit_ps_hit_in (void *opaque,int n,int level) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (opaque); + +if (!ARRAY_FIELD_EX32 (s->regs,PIT_CONTROL ,EN )) { +/* PIT disabled */ +return ; + } + +/* Count only on positive edge */ hw/timer/xlnx-pmu-iomod-pit.c line 125
Quoted 10 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +10
-0+if (!s->ps_level && level) { +if (s->ps_counter) { + s->ps_counter--; + } + s->ps_level = level; + }else { +/* Not on positive edge */ + s->ps_level = level; +return ; + }Inverting this
Quoted 8 lines
if (C) {A} else {B return}
as
if (!C) {B return}
Ais a bit easier to read.
Fixed.
Quoted 17 lines
Quoted 4 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +4
-0+ +/* If timer expires, try to preload or stop */ +if (s->ps_counter ==0 ) { +xlnx_iomod_pit_timer_hit (opaque);hw/timer/xlnx-pmu-iomod-pit.c line 139
Quoted 10 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +10
-0+ +/* Check for pit preload/one-shot mode */ +if (ARRAY_FIELD_EX32 (s->regs,PIT_CONTROL ,PRELOAD )) { +/* Preload Mode, Reload the ps_counter */ + s->ps_counter = s->regs[R_PIT_PRELOAD ]; + }else { +/* One-Shot mode, turn off the timer */ + s->regs[R_PIT_CONTROL ] &= ~R_PIT_CONTROL_PRELOAD_MASK ; + } + }Ditto, if (!s->ps_counter) return;
Quoted 2 lines
Anyway this is fine,
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks :)
Alistair
Quoted 29 lines
Quoted 29 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +29
-0+} + +static void xlnx_iomod_pit_reset (DeviceState *dev) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (dev); +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (s->regs_info); ++i) { +register_reset (&s->regs_info[i]); + } + + s->ps_level = false; +} + +static const MemoryRegionOps xlnx_iomod_pit_ops = { + .read = register_read_memory, + .write = register_write_memory, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =4 , + }, +}; + +static void xlnx_iomod_pit_realize (DeviceState *dev,Error **errp) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (dev); + + s->bh =qemu_bh_new (xlnx_iomod_pit_timer_hit, s);
Quoted 8 lines
hw/timer/xlnx-pmu-iomod-pit.c
Quoted 8 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +8
-0+ s->ptimer =ptimer_init (s->bh,PTIMER_POLICY_DEFAULT ); +ptimer_set_freq (s->ptimer, s->frequency_hz); + +/* IRQ out to pulse when present timer expires/reloads */ +qdev_init_gpio_out_named (dev, &s->hit_out,"ps_hit_out" ,1 ); + +/* IRQ in to enable pre-scalar mode. Routed from gpo1 */ + qdev_init_gpio_in_named(dev, xlnx_iomod_pit_ps_config,
"ps_config", 1);
Quoted 3 lines
hw/timer/xlnx-pmu-iomod-pit.c
Quoted 3 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +3
-0+ +/* hit_out of neighbouring PIT is received as hit_in */ + qdev_init_gpio_in_named(dev, xlnx_iomod_pit_ps_hit_in,
"ps_hit_in", 1);
Quoted 27 lines
Quoted 27 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +27
-0+} + +static void xlnx_iomod_pit_init (Object *obj) +{ +XlnxPMUPIT *s =XLNX_ZYNQMP_IOMODULE_PIT (obj); +SysBusDevice *sbd =SYS_BUS_DEVICE (obj); +RegisterInfoArray *reg_array; + +memory_region_init (&s->iomem, obj,TYPE_XLNX_ZYNQMP_IOMODULE_PIT , +XLNX_ZYNQMP_IOMOD_PIT_R_MAX *4 ); + reg_array = +register_init_block32 (DEVICE (obj), xlnx_iomod_pit_regs_info, +ARRAY_SIZE (xlnx_iomod_pit_regs_info), + s->regs_info, s->regs, + &xlnx_iomod_pit_ops, +XLNX_ZYNQMP_IOMODULE_PIT_ERR_DEBUG , +XLNX_ZYNQMP_IOMOD_PIT_R_MAX *4 ); +memory_region_add_subregion (&s->iomem, +0x0 , + ®_array->mem); +sysbus_init_mmio (sbd, &s->iomem); +sysbus_init_irq (sbd, &s->irq); +} + +static const VMStateDescription vmstate_xlnx_iomod_pit = { + .name =TYPE_XLNX_ZYNQMP_IOMODULE_PIT , + .version_id =1 ,
Quoted 8 lines
hw/timer/xlnx-pmu-iomod-pit.c
Quoted 8 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +8
-0+ .minimum_version_id = 1, + .fields = (VMStateField []) { +VMSTATE_END_OF_LIST (), + } +}; + +static Property xlnx_iomod_pit_properties[] = { + DEFINE_PROP_UINT32("frequency", XlnxPMUPIT, frequency_hz,
66000000),
Quoted 38 lines
Quoted 38 lines
hw/timer/xlnx-pmu-iomod-pit.c new file +27
-0+ DEFINE_PROP_END_OF_LIST(), +}; + +static void xlnx_iomod_pit_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = xlnx_iomod_pit_reset; + dc->realize = xlnx_iomod_pit_realize; + dc->props = xlnx_iomod_pit_properties; + dc->vmsd = &vmstate_xlnx_iomod_pit; +} + +static const TypeInfo xlnx_iomod_pit_info = { + .name =TYPE_XLNX_ZYNQMP_IOMODULE_PIT , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (XlnxPMUPIT), + .class_init = xlnx_iomod_pit_class_init, + .instance_init = xlnx_iomod_pit_init, +}; + +static void xlnx_iomod_pit_register_types (void ) +{ +type_register_static (&xlnx_iomod_pit_info); +} + +type_init (xlnx_iomod_pit_register_types)hw/timer/Makefile.objs +2
-0@@ -43,3 +43,5 @@ common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o common-obj-$(CONFIG_MSF2) += mss-timer.o + +common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-pit.o
PATCH v2 2/5 xlnx-zynqmp-pmu: Connect the PMU IOMOD PIT devices
In reply to Alistair Francis---
hw/microblaze/xlnx-zynqmp-pmu.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
hw/microblaze/xlnx-zynqmp-pmu.c +35 -0
@@ -26,6 +26,7 @@#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" +#include "hw/timer/xlnx-pmu-iomod-pit.h" /* Define the PMU device */
@@ -40,6 +41,7 @@#define XLNX_ZYNQMP_PMU_INTC_ADDR 0xFFD40000#define XLNX_ZYNQMP_PMU_NUM_IPIS 4 +#define XLNX_ZYNQMP_PMU_NUM_PITS 4static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS ] = {0xFF340000 ,0xFF350000 ,0xFF360000 ,0xFF370000 ,
@@ -48,6 +50,13 @@ static const uint64_t ipi_irq[XLNX_ZYNQMP_PMU_NUM_IPIS] = { 19, 20, 21, 22, }; +static const uint64_t pit_addr[XLNX_ZYNQMP_PMU_NUM_PITS ] = { +0xFFD40040 ,0xFFD40050 ,0xFFD40060 ,0xFFD40070 , +}; +static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS ] = { +3 ,4 ,5 ,6 , +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj;
@@ -147,7 +156,9 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)MemoryRegion *pmu_rom =g_new (MemoryRegion,1 );MemoryRegion *pmu_ram =g_new (MemoryRegion,1 );XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS ]; +XlnxPMUPIT *pit[XLNX_ZYNQMP_PMU_NUM_PITS ];qemu_irq irq[32 ]; +qemu_irq tmp_irq;int i;/* Create the ROM */
@@ -186,6 +197,30 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (ipi[i]),0 , irq[ipi_irq[i]]); } +/* Create and connect the IOMOD PIT devices */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_PITS ; i++) { + pit[i] =g_new0 (XlnxPMUPIT,1 ); +object_initialize (pit[i],sizeof (XlnxPMUPIT),TYPE_XLNX_ZYNQMP_IOMODULE_PIT ); +qdev_set_parent_bus (DEVICE (pit[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_PITS ; i++) { +object_property_set_bool (OBJECT (pit[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (pit[i]),0 , pit_addr[i]); +sysbus_connect_irq (SYS_BUS_DEVICE (pit[i]),0 , irq[pit_irq[i]]); + } + +/* PIT1 hits into PIT0 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[0 ]),"ps_hit_in" ,0 ); +qdev_connect_gpio_out_named (DEVICE (pit[1 ]),"ps_hit_out" ,0 , tmp_irq); + +/* PIT3 hits into PIT2 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_hit_in" ,0 ); +qdev_connect_gpio_out_named (DEVICE (pit[3 ]),"ps_hit_out" ,0 , tmp_irq); + +/* TODO: PIT0 and PIT2 "ps_config" GPIO goes to The GPO1 device. */ +/* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, machine->ram_size,
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v2 2/5] xlnx-zynqmp-pmu: Connect the PMU IOMOD PIT devices
Quoted 1 line · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>
Quoted 81 lines
---
hw/microblaze/xlnx-zynqmp-pmu.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)hw/microblaze/xlnx-zynqmp-pmu.c +35
-0@@ -26,6 +26,7 @@#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" +#include "hw/timer/xlnx-pmu-iomod-pit.h" /* Define the PMU device */ @@ -40,6 +41,7 @@#define XLNX_ZYNQMP_PMU_INTC_ADDR 0xFFD40000#define XLNX_ZYNQMP_PMU_NUM_IPIS 4 +#define XLNX_ZYNQMP_PMU_NUM_PITS 4static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS ] = {0xFF340000 ,0xFF350000 ,0xFF360000 ,0xFF370000 ,@@ -48,6 +50,13 @@ static const uint64_t ipi_irq[XLNX_ZYNQMP_PMU_NUM_IPIS] = { 19, 20, 21, 22, }; +static const uint64_t pit_addr[XLNX_ZYNQMP_PMU_NUM_PITS ] = { +0xFFD40040 ,0xFFD40050 ,0xFFD40060 ,0xFFD40070 , +}; +static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS ] = { +3 ,4 ,5 ,6 , +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj;@@ -147,7 +156,9 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)MemoryRegion *pmu_rom =g_new (MemoryRegion,1 );MemoryRegion *pmu_ram =g_new (MemoryRegion,1 );XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS ]; +XlnxPMUPIT *pit[XLNX_ZYNQMP_PMU_NUM_PITS ];qemu_irq irq[32 ]; +qemu_irq tmp_irq;int i;/* Create the ROM */ @@ -186,6 +197,30 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (ipi[i]),0 , irq[ipi_irq[i]]); } +/* Create and connect the IOMOD PIT devices */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_PITS ; i++) { + pit[i] =g_new0 (XlnxPMUPIT,1 ); +object_initialize (pit[i],sizeof (XlnxPMUPIT),TYPE_XLNX_ZYNQMP_IOMODULE_PIT ); +qdev_set_parent_bus (DEVICE (pit[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_PITS ; i++) { +object_property_set_bool (OBJECT (pit[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (pit[i]),0 , pit_addr[i]); +sysbus_connect_irq (SYS_BUS_DEVICE (pit[i]),0 , irq[pit_irq[i]]); + } + +/* PIT1 hits into PIT0 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[0 ]),"ps_hit_in" ,0 ); +qdev_connect_gpio_out_named (DEVICE (pit[1 ]),"ps_hit_out" ,0 , tmp_irq); + +/* PIT3 hits into PIT2 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_hit_in" ,0 ); +qdev_connect_gpio_out_named (DEVICE (pit[3 ]),"ps_hit_out" ,0 , tmp_irq); + +/* TODO: PIT0 and PIT2 "ps_config" GPIO goes to The GPO1 device. */ +/* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, machine->ram_size,
PATCH v2 3/5 hw/gpio: Add the xlnx-pmu-iomod-gpo device
In reply to Alistair Francis---
include/hw/gpio/xlnx-pmu-iomod-gp.h | 52 +++++++++++++ hw/gpio/xlnx-pmu-iomod-gp.c | 150 ++++++++++++++++++++++++++++++++++++ hw/gpio/Makefile.objs | 2 + 3 files changed, 204 insertions(+) create mode 100644 include/hw/gpio/xlnx-pmu-iomod-gp.h create mode 100644 hw/gpio/xlnx-pmu-iomod-gp.c
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +52 -0
@@ -0,0 +1,52 @@ +/* +* QEMU model of Xilinx I/O Module GPO +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_XLNX_ZYNQMP_IOMOD_GPIO_H +#define HW_XLNX_ZYNQMP_IOMOD_GPIO_H + +#include "qemu/osdep.h" + +#define TYPE_XLNX_ZYNQMP_IOMOD_GPIO "xlnx.pmu_iomodule_gpio" + +#define XLNX_ZYNQMP_IOMOD_GPIO (obj) \ + OBJECT_CHECK(XlnxPMUIOGPIO, (obj), TYPE_XLNX_ZYNQMP_IOMOD_GPIO) + +#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x00 + 1) + +typedef struct XlnxPMUIOGPIO { +SysBusDevice parent_obj; +MemoryRegion iomem; + +uint32_t size; + +/* GPO */ +uint32_t init; +qemu_irq outputs[32 ]; + +uint32_t regs[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ]; +RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ]; +}XlnxPMUIOGPIO ; + +#endif /* HW_XLNX_ZYNQMP_IOMOD_GPIO_H */
hw/gpio/xlnx-pmu-iomod-gp.c new file +150 -0
150 lines not on this page · raw message
hw/gpio/Makefile.objs +2 -0
@@ -8,3 +8,5 @@ common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o obj-$(CONFIG_OMAP) += omap_gpio.o obj-$(CONFIG_IMX) += imx_gpio.o obj-$(CONFIG_RASPI) += bcm2835_gpio.o + +obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-gp.o
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v2 3/5] hw/gpio: Add the xlnx-pmu-iomod-gpo device
Hi Alistair,
Quoted 33 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>---
include/hw/gpio/xlnx-pmu-iomod-gp.h | 52 +++++++++++++ hw/gpio/xlnx-pmu-iomod-gp.c | 150 ++++++++++++++++++++++++++++++++++++ hw/gpio/Makefile.objs | 2 + 3 files changed, 204 insertions(+) create mode 100644 include/hw/gpio/xlnx-pmu-iomod-gp.h create mode 100644 hw/gpio/xlnx-pmu-iomod-gp.cinclude/hw/gpio/xlnx-pmu-iomod-gp.h new file +17
-0@@ -0,0 +1,52 @@ +/* +* QEMU model of Xilinx I/O Module GPO +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
include/hw/gpio/xlnx-pmu-iomod-gp.h line 27
Quoted 10 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +10
-0+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_XLNX_ZYNQMP_IOMOD_GPIO_H +#define HW_XLNX_ZYNQMP_IOMOD_GPIO_H
Maybe HW_XLNX_IOMOD_GPIO_H is enough (removing ZYNQMP), or HW_XLNX_PMU_IOMOD_GPIO_H is a better naming (using PMU). (comment valid for the whole file).
Quoted 9 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +9
-0+ +#include "qemu/osdep.h" + +#define TYPE_XLNX_ZYNQMP_IOMOD_GPIO "xlnx.pmu_iomodule_gpio" + +#define XLNX_ZYNQMP_IOMOD_GPIO (obj) \ + OBJECT_CHECK(XlnxPMUIOGPIO, (obj), TYPE_XLNX_ZYNQMP_IOMOD_GPIO) + +#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x00 + 1)
include/hw/gpio/xlnx-pmu-iomod-gp.h line 46
Quoted 10 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +10
-0+ +typedef struct XlnxPMUIOGPIO { + SysBusDevice parent_obj; + MemoryRegion iomem; + + uint32_t size; + + /* GPO */ + uint32_t init; + qemu_irq outputs[32];
Can you add a definition such XLNX_(PMU_)IOMOD_GPIO_COUNT?
Quoted 47 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +6
-0+ +uint32_t regs[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ]; + RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX]; +} XlnxPMUIOGPIO; + +#endif /* HW_XLNX_ZYNQMP_IOMOD_GPIO_H */ hw/gpio/xlnx-pmu-iomod-gp.c new file +35
-0@@ -0,0 +1,150 @@ +/* +* QEMU model of Xilinx I/O Module GPO +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" +#include "qemu/log.h" +#include "hw/gpio/xlnx-pmu-iomod-gp.h" + +#ifndef XLNX_ZYNQMP_IOMOD_GPIO_DEBUG +#define XLNX_ZYNQMP_IOMOD_GPIO_DEBUG 0 +#endif +
hw/gpio/xlnx-pmu-iomod-gp.c line 45
Quoted 10 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +10
-0+REG32(GPO0, 0x00) + +static void xlnx_iomod_gpio_gpo0_prew (RegisterInfo *reg,uint64_t value) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (reg->opaque); +unsigned int i; + +for (i =0 ; i < s->size; i++) { +bool flag = !!(value & (1 << i)); +qemu_set_irq (s->outputs[i], flag);
I thought this was available: qemu_set_irqs(s->outputs, value, s->size);
Maybe shorter:
qemu_set_irq(s->outputs[i], extract64(flag, i, 1);
Quoted 32 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +32
-0+ } +} + +static uint64_t xlnx_iomod_gpio_gpo0_postr (RegisterInfo *reg,uint64_t value) +{ +return 0 ; +} + +static const RegisterAccessInfo xlnx_iomod_gpio_regs_info[] = { + { .name ="GPO0" , .addr =A_GPO0 , + .post_write = xlnx_iomod_gpio_gpo0_prew, + .post_read = xlnx_iomod_gpio_gpo0_postr, + } +}; + +static void xlnx_iomod_gpio_reset (DeviceState *dev) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (dev); +int i; + +for (i =0 ; i <ARRAY_SIZE (s->regs_info); ++i) { +register_reset (&s->regs_info[i]); + } + +xlnx_iomod_gpio_gpo0_prew (&s->regs_info[R_GPO0 ], s->init); +} + +static const MemoryRegionOps xlnx_iomod_gpio_ops = { + .read = register_read_memory, + .write = register_write_memory, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = {
hw/gpio/xlnx-pmu-iomod-gp.c line 87
Quoted 10 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +10
-0+ .min_access_size = 4, + .max_access_size = 4, + }, +}; + +static void xlnx_iomod_gpio_realize (DeviceState *dev,Error **errp) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (dev); + +assert (s->size <=32 );
XLNX_(PMU_)IOMOD_GPIO_COUNT?
Quoted 69 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +63
-0+qdev_init_gpio_out (dev, s->outputs, s->size); +} + +static void xlnx_iomod_gpio_init (Object *obj) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (obj); +SysBusDevice *sbd =SYS_BUS_DEVICE (obj); +RegisterInfoArray *reg_array; + +memory_region_init (&s->iomem, obj,TYPE_XLNX_ZYNQMP_IOMOD_GPIO , +XLNX_ZYNQMP_IOMOD_GPIO_R_MAX *4 ); + reg_array = +register_init_block32 (DEVICE (obj), xlnx_iomod_gpio_regs_info, +ARRAY_SIZE (xlnx_iomod_gpio_regs_info), + s->regs_info, s->regs, + &xlnx_iomod_gpio_ops, +XLNX_ZYNQMP_IOMOD_GPIO_DEBUG , +XLNX_ZYNQMP_IOMOD_GPIO_R_MAX *4 ); +memory_region_add_subregion (&s->iomem, +0x0 , + ®_array->mem); +sysbus_init_mmio (sbd, &s->iomem); +} + +static const VMStateDescription vmstate_xlnx_iomod_gpio = { + .name =TYPE_XLNX_ZYNQMP_IOMOD_GPIO , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_END_OF_LIST (), + } +}; + +static Property xlnx_iomod_gpio_properties[] = { +DEFINE_PROP_UINT32 ("size" , XlnxPMUIOGPIO, size,0 ), +DEFINE_PROP_UINT32 ("gpo-init" , XlnxPMUIOGPIO, init,0 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void xlnx_iomod_gpio_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = xlnx_iomod_gpio_reset; + dc->realize = xlnx_iomod_gpio_realize; + dc->props = xlnx_iomod_gpio_properties; + dc->vmsd = &vmstate_xlnx_iomod_gpio; +} + +static const TypeInfo xlnx_iomod_gpio_info = { + .name =TYPE_XLNX_ZYNQMP_IOMOD_GPIO , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (XlnxPMUIOGPIO), + .class_init = xlnx_iomod_gpio_class_init, + .instance_init = xlnx_iomod_gpio_init, +}; + +static void xlnx_iomod_gpio_register_types (void ) +{ +type_register_static (&xlnx_iomod_gpio_info); +} + +type_init (xlnx_iomod_gpio_register_types)hw/gpio/Makefile.objs +0
-0
hw/gpio/Makefile.objs common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o · line 12
Quoted 5 lines
hw/gpio/Makefile.objs +2
-0@@ -8,3 +8,5 @@ common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o obj-$(CONFIG_OMAP) += omap_gpio.o obj-$(CONFIG_IMX) += imx_gpio.o obj-$(CONFIG_RASPI) += bcm2835_gpio.o + +obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-gp.o
Re: [Qemu-devel] [PATCH v2 3/5] hw/gpio: Add the xlnx-pmu-iomod-gpo device
Quoted 8 lines · Philippe Mathieu-Daudé
Hi Alistair,
Quoted 5 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>---
include/hw/gpio/xlnx-pmu-iomod-gp.h | 52 +++++++++++++ hw/gpio/xlnx-pmu-iomod-gp.c | 150
++++++++++++++++++++++++++++++++++++
Quoted 6 lines
Review
Quoted 6 lines
hw/gpio/Makefile.objs | 2 + 3 files changed, 204 insertions(+) create mode 100644 include/hw/gpio/xlnx-pmu-iomod-gp.h create mode 100644 hw/gpio/xlnx-pmu-iomod-gp.c(quoted diff) +0
-0
b/include/hw/gpio/xlnx-pmu-iomod-gp.h
Quoted 4 lines
Quoted 4 lines
new file mode 100644
index 0000000000..0ee162829binclude/hw/gpio/xlnx-pmu-iomod-gp.h new file +0
-0
Quoted 8 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h line 7
Quoted 8 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +7
-0@@ -0,0 +1,52 @@ +/* +* QEMU model of Xilinx I/O Module GPO +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person
obtaining a copy
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 8
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* of this software and associated documentation files (the
"Software"), to deal
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 9
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* in the Software without restriction, including without limitation
the rights
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 10
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 11
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* copies of the Software, and to permit persons to whom the Software
is
Quoted 3 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h
Quoted 3 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +3
-0+* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be
included in
Quoted 3 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h
Quoted 3 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +3
-0+* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 18
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 19
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 20
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 21
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h line 22
Quoted 1 line
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +1
-0+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
Quoted 9 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h line 27
Quoted 5 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +5
-0+* THE SOFTWARE. +*/ + +#ifndef HW_XLNX_ZYNQMP_IOMOD_GPIO_H +#define HW_XLNX_ZYNQMP_IOMOD_GPIO_H Maybe
HW_XLNX_IOMOD_GPIO_His enough (removing ZYNQMP), orHW_XLNX_PMU_IOMOD_GPIO_His a better naming (using PMU). (comment valid for the whole file).
That opens up a possibility of future conflicts. I think the ZynqMP should stay in there.
Quoted 13 lines
Quoted 13 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +13
-0+ +#include "qemu/osdep.h" + +#define TYPE_XLNX_ZYNQMP_IOMOD_GPIO "xlnx.pmu_iomodule_gpio" + +#define XLNX_ZYNQMP_IOMOD_GPIO (obj) \ + OBJECT_CHECK(XlnxPMUIOGPIO, (obj), TYPE_XLNX_ZYNQMP_IOMOD_GPIO) + +#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x00 + 1) + +typedef struct XlnxPMUIOGPIO { + SysBusDevice parent_obj; + MemoryRegion iomem;
Quoted 8 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h line 46
Quoted 6 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +6
-0+ +uint32_t size; + +/* GPO */ +uint32_t init; +qemu_irq outputs[32 ];Can you add a definition such XLNX_(PMU_)IOMOD_GPIO_COUNT?
Done.
Quoted 11 lines
Quoted 11 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h new file +6
-0+ +uint32_t regs[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ]; + RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX]; +} XlnxPMUIOGPIO; + +#endif /* HW_XLNX_ZYNQMP_IOMOD_GPIO_H */ hw/gpio/xlnx-pmu-iomod-gp.c new file +0
-0
Quoted 8 lines
hw/gpio/xlnx-pmu-iomod-gp.c line 7
Quoted 8 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +7
-0@@ -0,0 +1,150 @@ +/* +* QEMU model of Xilinx I/O Module GPO +* +* Copyright (c) 2013 Xilinx Inc +* Written by Edgar E. Iglesias <[email protected]> +* +* Permission is hereby granted, free of charge, to any person
obtaining a copy
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 8
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* of this software and associated documentation files (the
"Software"), to deal
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 9
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* in the Software without restriction, including without limitation
the rights
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 10
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 11
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* copies of the Software, and to permit persons to whom the Software
is
Quoted 3 lines
hw/gpio/xlnx-pmu-iomod-gp.c line 14
Quoted 3 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +3
-0+* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be
included in
Quoted 3 lines
hw/gpio/xlnx-pmu-iomod-gp.c line 17
Quoted 3 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +3
-0+* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 18
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 19
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 20
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 21
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c line 22
Quoted 1 line
hw/gpio/xlnx-pmu-iomod-gp.c new file +1
-0+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
Quoted 8 lines
Quoted 8 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +8
-0+* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" +#include "qemu/log.h" +#include "hw/gpio/xlnx-pmu-iomod-gp.h"
Quoted 8 lines
hw/gpio/xlnx-pmu-iomod-gp.c
Quoted 8 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +8
-0+ +#ifndef XLNX_ZYNQMP_IOMOD_GPIO_DEBUG +#define XLNX_ZYNQMP_IOMOD_GPIO_DEBUG 0 +#endif + +REG32(GPO0, 0x00) + +static void xlnx_iomod_gpio_gpo0_prew(RegisterInfo *reg, uint64_t
value)
Quoted 9 lines
hw/gpio/xlnx-pmu-iomod-gp.c line 45
Quoted 7 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +7
-0+{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (reg->opaque); +unsigned int i; + +for (i =0 ; i < s->size; i++) { +bool flag = !!(value & (1 << i)); +qemu_set_irq (s->outputs[i], flag);I thought this was available:
qemu_set_irqs(s->outputs, value, s->size);
I don't see anything called that.
Quoted 3 lines
Maybe shorter:
qemu_set_irq(s->outputs[i], extract64(flag, i, 1);
I like the variable, it makes adding debug statements easier :)
Alistair
Quoted 4 lines
hw/gpio/xlnx-pmu-iomod-gp.c
Quoted 4 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +4
-0+ } +} + +static uint64_t xlnx_iomod_gpio_gpo0_postr(RegisterInfo *reg, uint64_t
value)
Quoted 117 lines
Quoted 28 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +28
-0+{ +return 0 ; +} + +static const RegisterAccessInfo xlnx_iomod_gpio_regs_info[] = { + { .name ="GPO0" , .addr =A_GPO0 , + .post_write = xlnx_iomod_gpio_gpo0_prew, + .post_read = xlnx_iomod_gpio_gpo0_postr, + } +}; + +static void xlnx_iomod_gpio_reset (DeviceState *dev) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (dev); +int i; + +for (i =0 ; i <ARRAY_SIZE (s->regs_info); ++i) { +register_reset (&s->regs_info[i]); + } + +xlnx_iomod_gpio_gpo0_prew (&s->regs_info[R_GPO0 ], s->init); +} + +static const MemoryRegionOps xlnx_iomod_gpio_ops = { + .read = register_read_memory, + .write = register_write_memory, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = {hw/gpio/xlnx-pmu-iomod-gp.c line 87
Quoted 10 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +10
-0+ .min_access_size = 4, + .max_access_size = 4, + }, +}; + +static void xlnx_iomod_gpio_realize (DeviceState *dev,Error **errp) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (dev); + +assert (s->size <=32 );XLNX_(PMU_)IOMOD_GPIO_COUNT?
Quoted 69 lines
hw/gpio/xlnx-pmu-iomod-gp.c new file +63
-0+qdev_init_gpio_out (dev, s->outputs, s->size); +} + +static void xlnx_iomod_gpio_init (Object *obj) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (obj); +SysBusDevice *sbd =SYS_BUS_DEVICE (obj); +RegisterInfoArray *reg_array; + +memory_region_init (&s->iomem, obj,TYPE_XLNX_ZYNQMP_IOMOD_GPIO , +XLNX_ZYNQMP_IOMOD_GPIO_R_MAX *4 ); + reg_array = +register_init_block32 (DEVICE (obj), xlnx_iomod_gpio_regs_info, +ARRAY_SIZE (xlnx_iomod_gpio_regs_info), + s->regs_info, s->regs, + &xlnx_iomod_gpio_ops, +XLNX_ZYNQMP_IOMOD_GPIO_DEBUG , +XLNX_ZYNQMP_IOMOD_GPIO_R_MAX *4 ); +memory_region_add_subregion (&s->iomem, +0x0 , + ®_array->mem); +sysbus_init_mmio (sbd, &s->iomem); +} + +static const VMStateDescription vmstate_xlnx_iomod_gpio = { + .name =TYPE_XLNX_ZYNQMP_IOMOD_GPIO , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_END_OF_LIST (), + } +}; + +static Property xlnx_iomod_gpio_properties[] = { +DEFINE_PROP_UINT32 ("size" , XlnxPMUIOGPIO, size,0 ), +DEFINE_PROP_UINT32 ("gpo-init" , XlnxPMUIOGPIO, init,0 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void xlnx_iomod_gpio_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = xlnx_iomod_gpio_reset; + dc->realize = xlnx_iomod_gpio_realize; + dc->props = xlnx_iomod_gpio_properties; + dc->vmsd = &vmstate_xlnx_iomod_gpio; +} + +static const TypeInfo xlnx_iomod_gpio_info = { + .name =TYPE_XLNX_ZYNQMP_IOMOD_GPIO , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (XlnxPMUIOGPIO), + .class_init = xlnx_iomod_gpio_class_init, + .instance_init = xlnx_iomod_gpio_init, +}; + +static void xlnx_iomod_gpio_register_types (void ) +{ +type_register_static (&xlnx_iomod_gpio_info); +} + +type_init (xlnx_iomod_gpio_register_types)hw/gpio/Makefile.objs +0
-0hw/gpio/Makefile.objs common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o · line 12
Quoted 5 lines
hw/gpio/Makefile.objs +2
-0@@ -8,3 +8,5 @@ common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o obj-$(CONFIG_OMAP) += omap_gpio.o obj-$(CONFIG_IMX) += imx_gpio.o obj-$(CONFIG_RASPI) += bcm2835_gpio.o + +obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-gp.oReviewed-by Philippe Mathieu-Daudé <[email protected]>
PATCH v2 4/5 hw/gpio: Add support for the xlnx-pmu-iomod-gpi device
In reply to Alistair FrancisAdd support for setting the device and either input or output.
---
include/hw/gpio/xlnx-pmu-iomod-gp.h | 7 ++++- hw/gpio/xlnx-pmu-iomod-gp.c | 55 ++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 2 deletions(-)
include/hw/gpio/xlnx-pmu-iomod-gp.h +6 -1
@@ -33,18 +33,23 @@#define XLNX_ZYNQMP_IOMOD_GPIO (obj) \ OBJECT_CHECK(XlnxPMUIOGPIO, (obj), TYPE_XLNX_ZYNQMP_IOMOD_GPIO) -#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x00 + 1) +#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x20 + 1)typedef struct XlnxPMUIOGPIO {SysBusDevice parent_obj;MemoryRegion iomem; +bool input;uint32_t size;/* GPO */ uint32_t init;qemu_irq outputs[32 ]; +/* GPI */ +uint32_t ien; +qemu_irq parent_irq; +uint32_t regs[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ];RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ]; }XlnxPMUIOGPIO ;
hw/gpio/xlnx-pmu-iomod-gp.c +54 -1
105 lines not on this page · raw message
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v2 4/5] hw/gpio: Add support for the xlnx-pmu-iomod-gpi device
Hi Alistair,
Quoted 15 lines · Alistair Francis
Add support for setting the device and either input or output.
Signed-off-by Alistair Francis <[email protected]>---
include/hw/gpio/xlnx-pmu-iomod-gp.h | 7 ++++- hw/gpio/xlnx-pmu-iomod-gp.c | 55 ++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 2 deletions(-)include/hw/gpio/xlnx-pmu-iomod-gp.h +0
-0@@ -33,18 +33,23 @@#define XLNX_ZYNQMP_IOMOD_GPIO (obj) \
include/hw/gpio/xlnx-pmu-iomod-gp.h line 42
Quoted 10 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h +2
-1OBJECT_CHECK(XlnxPMUIOGPIO, (obj), TYPE_XLNX_ZYNQMP_IOMOD_GPIO) -#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x00 + 1) +#define XLNX_ZYNQMP_IOMOD_GPIO_R_MAX (0x20 + 1) typedef struct XlnxPMUIOGPIO { SysBusDevice parent_obj; MemoryRegion iomem; + bool input;
Maybe rename as 'is_input'.
Quoted 26 lines
include/hw/gpio/xlnx-pmu-iomod-gp.h +4
-0uint32_t size;/* GPO */ uint32_t init;qemu_irq outputs[32 ]; +/* GPI */ +uint32_t ien; +qemu_irq parent_irq; +uint32_t regs[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ];RegisterInfo regs_info[XLNX_ZYNQMP_IOMOD_GPIO_R_MAX ]; } XlnxPMUIOGPIO;hw/gpio/xlnx-pmu-iomod-gp.c +1
-1@@ -1,5 +1,5 @@/* -* QEMU model of Xilinx I/O Module GPO +* QEMU model of Xilinx I/O Module GPO and GPI * * Copyright (c) 2013 Xilinx Inc * Written by Edgar E. Iglesias <[email protected]> @@ -34,12 +34,17 @@#endif
hw/gpio/xlnx-pmu-iomod-gp.c line 44
Quoted 10 lines
hw/gpio/xlnx-pmu-iomod-gp.c +2
-0REG32(GPO0, 0x00) +REG32(GPI0, 0x20)static void xlnx_iomod_gpio_gpo0_prew (RegisterInfo *reg,uint64_t value) {XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (reg->opaque);unsigned int i; +if (s->input) {
Shouldn't we log something here? GUEST_ERROR probably.
Quoted 7 lines
hw/gpio/xlnx-pmu-iomod-gp.c +3
-0+return ; + } +for (i =0 ; i < s->size; i++) {bool flag = !!(value & (1 << i));qemu_set_irq (s->outputs[i], flag);
hw/gpio/xlnx-pmu-iomod-gp.c static uint64_t xlnx_iomod_gpio_gpo0_postr(RegisterInfo *reg, uint64_t value) · line 64
Quoted 9 lines
hw/gpio/xlnx-pmu-iomod-gp.c +6
-0@@ -51,10 +56,50 @@ static uint64_t xlnx_iomod_gpio_gpo0_postr(RegisterInfo *reg, uint64_t value)return 0 ; } +static void xlnx_iomod_gpio_irq_handler (void *opaque,int irq,int level) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (opaque); +uint32_t old = s->regs[R_GPI0 ]; + +if (!s->input) {
Ditto.
Quoted 12 lines
hw/gpio/xlnx-pmu-iomod-gp.c +12
-0+return ; + } + +/* If enable is set for @irq pin, update @irq pin in GPI and +* trigger interrupt if transition is 0 -> 1. +*/ +if (s->ien & (1 << irq)) { + s->regs[R_GPI0 ] &= ~(1 << irq); + s->regs[R_GPI0 ] |= level << irq; +/* On input pin transition 0->1 trigger interrupt. */ +if ((old != s->regs[R_GPI0 ]) && level) { +qemu_irq_pulse (s->parent_irq);
hw/gpio/xlnx-pmu-iomod-gp.c static uint64_t xlnx_iomod_gpio_gpo0_postr(RegisterInfo *reg, uint64_t value) · line 86
Quoted 10 lines
hw/gpio/xlnx-pmu-iomod-gp.c +10
-0+ } + } +} + +/* Called when someone writes into LOCAL GPIx_ENABLE */ +static void xlnx_iomod_gpio_ien_handler (void *opaque,int n,int level) +{ +XlnxPMUIOGPIO *s =XLNX_ZYNQMP_IOMOD_GPIO (opaque); + +if (!s->input) {
Ditto.
Quoted 6 lines
hw/gpio/xlnx-pmu-iomod-gp.c +6
-0+return ; + } + + s->ien = level; + +/* Clear all GPIs that got disabled */
hw/gpio/xlnx-pmu-iomod-gp.c static uint64_t xlnx_iomod_gpio_gpo0_postr(RegisterInfo *reg, uint64_t value) · line 102
Quoted 10 lines
hw/gpio/xlnx-pmu-iomod-gp.c +6
-0+ s->regs[R_GPI0 ] &= s->ien; +} +static const RegisterAccessInfo xlnx_iomod_gpio_regs_info[] = { { .name ="GPO0" , .addr =A_GPO0 , .post_write = xlnx_iomod_gpio_gpo0_prew, .post_read = xlnx_iomod_gpio_gpo0_postr, + },{ .name ="GPI0" , .addr =A_GPI0 , + .rsvd =0x300030 , + .ro =0xffcfffcf ,
or
.ro = ~0x300030,
Quoted 14 lines
hw/gpio/xlnx-pmu-iomod-gp.c +3
-0} };@@ -68,6 +113,9 @@ static void xlnx_iomod_gpio_reset(DeviceState *dev) }xlnx_iomod_gpio_gpo0_prew (&s->regs_info[R_GPO0 ], s->init); + +/* Disable all interrupts initially. */ + s->ien =0 ; }static const MemoryRegionOps xlnx_iomod_gpio_ops = {
hw/gpio/xlnx-pmu-iomod-gp.c static void xlnx_iomod_gpio_realize(DeviceState *dev, Error **errp) · line 139
Quoted 6 lines
hw/gpio/xlnx-pmu-iomod-gp.c +3
-0@@ -86,6 +134,9 @@ static void xlnx_iomod_gpio_realize(DeviceState *dev, Error **errp)assert (s->size <=32 );qdev_init_gpio_out (dev, s->outputs, s->size); + +qdev_init_gpio_in_named (dev, xlnx_iomod_gpio_irq_handler,"GPI" ,32 ); +qdev_init_gpio_in_named (dev, xlnx_iomod_gpio_ien_handler,"IEN" ,32 );
eventually 32 -> XLNX_(PMU_)IOMOD_GPIO_COUNT.
Quoted 13 lines
hw/gpio/xlnx-pmu-iomod-gp.c +1
-0}static void xlnx_iomod_gpio_init (Object *obj)@@ -107,6 +158,7 @@ static void xlnx_iomod_gpio_init(Object *obj)0x0 , ®_array->mem);sysbus_init_mmio (sbd, &s->iomem); +sysbus_init_irq (sbd, &s->parent_irq); }static const VMStateDescription vmstate_xlnx_iomod_gpio = {
hw/gpio/xlnx-pmu-iomod-gp.c static const VMStateDescription vmstate_xlnx_iomod_gpio = { · line 177
Quoted 7 lines
hw/gpio/xlnx-pmu-iomod-gp.c +1
-0@@ -119,6 +171,7 @@ static const VMStateDescription vmstate_xlnx_iomod_gpio = { };static Property xlnx_iomod_gpio_properties[] = { +DEFINE_PROP_BOOL ("input" , XlnxPMUIOGPIO, input, false),DEFINE_PROP_UINT32 ("size" , XlnxPMUIOGPIO, size,0 ),DEFINE_PROP_UINT32 ("gpo-init" , XlnxPMUIOGPIO, init,0 ),DEFINE_PROP_END_OF_LIST (),
PATCH v2 5/5 xlnx-zynqmp-pmu: Connect the IOMOD GPI/GPO devices
In reply to Alistair Francis---
hw/microblaze/xlnx-zynqmp-pmu.c | 77 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-)
hw/microblaze/xlnx-zynqmp-pmu.c +75 -2
@@ -27,6 +27,7 @@#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #include "hw/timer/xlnx-pmu-iomod-pit.h" +#include "hw/gpio/xlnx-pmu-iomod-gp.h" /* Define the PMU device */
@@ -43,6 +44,9 @@#define XLNX_ZYNQMP_PMU_NUM_IPIS 4#define XLNX_ZYNQMP_PMU_NUM_PITS 4 +#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS 4 +#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS 4 +static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS ] = {0xFF340000 ,0xFF350000 ,0xFF360000 ,0xFF370000 , };
@@ -57,6 +61,17 @@ static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS] = { 3, 4, 5, 6, }; +static const uint64_t iomod_gpi_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ] = { +0xFFD40020 ,0xFFD40024 ,0xFFD40028 ,0xFFD4002C , +}; +static const uint64_t iomod_gpi_irq[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ] = { +11 ,12 ,13 ,14 , +}; + +static const uint64_t iomod_gpo_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ] = { +0xFFD40010 ,0xFFD40014 ,0xFFD40018 ,0xFFD4001C , +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj;
@@ -156,6 +171,8 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)MemoryRegion *pmu_rom =g_new (MemoryRegion,1 );MemoryRegion *pmu_ram =g_new (MemoryRegion,1 );XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS ]; +XlnxPMUIOGPIO *iomod_gpi[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ]; +XlnxPMUIOGPIO *iomod_gpo[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ];XlnxPMUPIT *pit[XLNX_ZYNQMP_PMU_NUM_PITS ];qemu_irq irq[32 ];qemu_irq tmp_irq;
@@ -197,10 +214,60 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (ipi[i]),0 , irq[ipi_irq[i]]); } +/* Create and connect the IOMOD GPI device */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { + iomod_gpi[i] =g_new0 (XlnxPMUIOGPIO,1 ); +object_initialize (iomod_gpi[i],sizeof (XlnxPMUIOGPIO), +TYPE_XLNX_ZYNQMP_IOMOD_GPIO ); +qdev_set_parent_bus (DEVICE (iomod_gpi[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { +object_property_set_bool (OBJECT (iomod_gpi[i]), true,"input" , + &error_abort); +object_property_set_uint (OBJECT (iomod_gpi[i]),0x20 ,"size" , + &error_abort); +object_property_set_bool (OBJECT (iomod_gpi[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (iomod_gpi[i]),0 , iomod_gpi_addr[i]); +sysbus_connect_irq (SYS_BUS_DEVICE (iomod_gpi[i]),0 , + irq[iomod_gpi_irq[i]]); +/* The other GPIO lines connect to the ARM side of the SoC. When we +* have a way to model MicroBlaze QEMU and ARM QEMU together we can +* connect the GPIO lines. +*/ + } + +/* Create and connect the IOMOD GPO device */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ; i++) { + iomod_gpo[i] =g_new0 (XlnxPMUIOGPIO,1 ); +object_initialize (iomod_gpo[i],sizeof (XlnxPMUIOGPIO), +TYPE_XLNX_ZYNQMP_IOMOD_GPIO ); +qdev_set_parent_bus (DEVICE (iomod_gpo[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ; i++) { +object_property_set_bool (OBJECT (iomod_gpo[i]), false,"input" , + &error_abort); +if (i) { +object_property_set_uint (OBJECT (iomod_gpo[i]),0x20 ,"size" , + &error_abort); + }else { +object_property_set_uint (OBJECT (iomod_gpo[i]),0x09 ,"size" , + &error_abort); + } +object_property_set_uint (OBJECT (iomod_gpo[i]),0x00 ,"gpo-init" , + &error_abort); +object_property_set_bool (OBJECT (iomod_gpo[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (iomod_gpo[i]),0 , iomod_gpo_addr[i]); + } +/* Create and connect the IOMOD PIT devices */ for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_PITS ; i++) { pit[i] =g_new0 (XlnxPMUPIT,1 ); -object_initialize (pit[i],sizeof (XlnxPMUPIT),TYPE_XLNX_ZYNQMP_IOMODULE_PIT ); +object_initialize (pit[i],sizeof (XlnxPMUPIT), +TYPE_XLNX_ZYNQMP_IOMODULE_PIT );qdev_set_parent_bus (DEVICE (pit[i]),sysbus_get_default ()); }
@@ -219,7 +286,13 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_hit_in" ,0 );qdev_connect_gpio_out_named (DEVICE (pit[3 ]),"ps_hit_out" ,0 , tmp_irq); -/* TODO: PIT0 and PIT2 "ps_config" GPIO goes to The GPO1 device. */ +/* GP01 goes into PIT0 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[0 ]),"ps_config" ,0 ); +qdev_connect_gpio_out (DEVICE (iomod_gpo[1 ]),2 , tmp_irq); + +/* GP01 goes into PIT2 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_config" ,0 ); +qdev_connect_gpio_out (DEVICE (iomod_gpo[1 ]),6 , tmp_irq);/* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v2 5/5] xlnx-zynqmp-pmu: Connect the IOMOD GPI/GPO devices
Quoted 92 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>---
hw/microblaze/xlnx-zynqmp-pmu.c | 77 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-)hw/microblaze/xlnx-zynqmp-pmu.c +50
-0@@ -27,6 +27,7 @@#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #include "hw/timer/xlnx-pmu-iomod-pit.h" +#include "hw/gpio/xlnx-pmu-iomod-gp.h" /* Define the PMU device */ @@ -43,6 +44,9 @@#define XLNX_ZYNQMP_PMU_NUM_IPIS 4#define XLNX_ZYNQMP_PMU_NUM_PITS 4 +#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS 4 +#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS 4 +static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS ] = {0xFF340000 ,0xFF350000 ,0xFF360000 ,0xFF370000 , };@@ -57,6 +61,17 @@ static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS] = { 3, 4, 5, 6, }; +static const uint64_t iomod_gpi_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ] = { +0xFFD40020 ,0xFFD40024 ,0xFFD40028 ,0xFFD4002C , +}; +static const uint64_t iomod_gpi_irq[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ] = { +11 ,12 ,13 ,14 , +}; + +static const uint64_t iomod_gpo_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ] = { +0xFFD40010 ,0xFFD40014 ,0xFFD40018 ,0xFFD4001C , +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj;@@ -156,6 +171,8 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)MemoryRegion *pmu_rom =g_new (MemoryRegion,1 );MemoryRegion *pmu_ram =g_new (MemoryRegion,1 );XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS ]; +XlnxPMUIOGPIO *iomod_gpi[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ]; +XlnxPMUIOGPIO *iomod_gpo[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ];XlnxPMUPIT *pit[XLNX_ZYNQMP_PMU_NUM_PITS ];qemu_irq irq[32 ];qemu_irq tmp_irq;@@ -197,10 +214,60 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (ipi[i]),0 , irq[ipi_irq[i]]); } +/* Create and connect the IOMOD GPI device */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { + iomod_gpi[i] =g_new0 (XlnxPMUIOGPIO,1 ); +object_initialize (iomod_gpi[i],sizeof (XlnxPMUIOGPIO), +TYPE_XLNX_ZYNQMP_IOMOD_GPIO ); +qdev_set_parent_bus (DEVICE (iomod_gpi[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { +object_property_set_bool (OBJECT (iomod_gpi[i]), true,"input" , + &error_abort); +object_property_set_uint (OBJECT (iomod_gpi[i]),0x20 ,"size" , + &error_abort); +object_property_set_bool (OBJECT (iomod_gpi[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (iomod_gpi[i]),0 , iomod_gpi_addr[i]); +sysbus_connect_irq (SYS_BUS_DEVICE (iomod_gpi[i]),0 , + irq[iomod_gpi_irq[i]]); +/* The other GPIO lines connect to the ARM side of the SoC. When we +* have a way to model MicroBlaze QEMU and ARM QEMU together we can +* connect the GPIO lines. +*/ + } + +/* Create and connect the IOMOD GPO device */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ; i++) { + iomod_gpo[i] =g_new0 (XlnxPMUIOGPIO,1 ); +object_initialize (iomod_gpo[i],sizeof (XlnxPMUIOGPIO), +TYPE_XLNX_ZYNQMP_IOMOD_GPIO ); +qdev_set_parent_bus (DEVICE (iomod_gpo[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ; i++) {
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState *machine) · line 259
Quoted 10 lines
hw/microblaze/xlnx-zynqmp-pmu.c +10
-0+object_property_set_bool (OBJECT (iomod_gpo[i]), false,"input" , + &error_abort); +if (i) { +object_property_set_uint (OBJECT (iomod_gpo[i]),0x20 ,"size" , + &error_abort); + }else { +object_property_set_uint (OBJECT (iomod_gpo[i]),0x09 ,"size" , + &error_abort); + } + object_property_set_uint(OBJECT(iomod_gpo[i]), 0x00, "gpo-init",
mis-indented :)
Quoted 21 lines
hw/microblaze/xlnx-zynqmp-pmu.c +8
-2+ &error_abort); +object_property_set_bool (OBJECT (iomod_gpo[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (iomod_gpo[i]),0 , iomod_gpo_addr[i]); + } +/* Create and connect the IOMOD PIT devices */ for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_PITS ; i++) { pit[i] =g_new0 (XlnxPMUPIT,1 ); -object_initialize (pit[i],sizeof (XlnxPMUPIT),TYPE_XLNX_ZYNQMP_IOMODULE_PIT ); +object_initialize (pit[i],sizeof (XlnxPMUPIT), +TYPE_XLNX_ZYNQMP_IOMODULE_PIT );qdev_set_parent_bus (DEVICE (pit[i]),sysbus_get_default ()); }@@ -219,7 +286,13 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_hit_in" ,0 );qdev_connect_gpio_out_named (DEVICE (pit[3 ]),"ps_hit_out" ,0 , tmp_irq); -/* TODO: PIT0 and PIT2 "ps_config" GPIO goes to The GPO1 device. */
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState *machine) · line 298
Quoted 10 lines
hw/microblaze/xlnx-zynqmp-pmu.c +7
-0+/* GP01 goes into PIT0 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[0 ]),"ps_config" ,0 ); +qdev_connect_gpio_out (DEVICE (iomod_gpo[1 ]),2 , tmp_irq); + +/* GP01 goes into PIT2 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_config" ,0 ); +qdev_connect_gpio_out (DEVICE (iomod_gpo[1 ]),6 , tmp_irq);/* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,
Re: [Qemu-devel] [PATCH v2 5/5] xlnx-zynqmp-pmu: Connect the IOMOD GPI/GPO devices
In reply to Alistair FrancisQuoted 62 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>---
hw/microblaze/xlnx-zynqmp-pmu.c | 77 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-)hw/microblaze/xlnx-zynqmp-pmu.c +20
-0@@ -27,6 +27,7 @@#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #include "hw/timer/xlnx-pmu-iomod-pit.h" +#include "hw/gpio/xlnx-pmu-iomod-gp.h" /* Define the PMU device */ @@ -43,6 +44,9 @@#define XLNX_ZYNQMP_PMU_NUM_IPIS 4#define XLNX_ZYNQMP_PMU_NUM_PITS 4 +#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS 4 +#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS 4 +static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS ] = {0xFF340000 ,0xFF350000 ,0xFF360000 ,0xFF370000 , };@@ -57,6 +61,17 @@ static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS] = { 3, 4, 5, 6, }; +static const uint64_t iomod_gpi_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ] = { +0xFFD40020 ,0xFFD40024 ,0xFFD40028 ,0xFFD4002C , +}; +static const uint64_t iomod_gpi_irq[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ] = { +11 ,12 ,13 ,14 , +}; + +static const uint64_t iomod_gpo_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ] = { +0xFFD40010 ,0xFFD40014 ,0xFFD40018 ,0xFFD4001C , +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj;@@ -156,6 +171,8 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)MemoryRegion *pmu_rom =g_new (MemoryRegion,1 );MemoryRegion *pmu_ram =g_new (MemoryRegion,1 );XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS ]; +XlnxPMUIOGPIO *iomod_gpi[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ]; +XlnxPMUIOGPIO *iomod_gpo[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ];XlnxPMUPIT *pit[XLNX_ZYNQMP_PMU_NUM_PITS ];qemu_irq irq[32 ];qemu_irq tmp_irq;@@ -197,10 +214,60 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (ipi[i]),0 , irq[ipi_irq[i]]); } +/* Create and connect the IOMOD GPI device */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { + iomod_gpi[i] =g_new0 (XlnxPMUIOGPIO,1 );
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState *machine) · line 229
Quoted 10 lines
hw/microblaze/xlnx-zynqmp-pmu.c +10
-0+object_initialize (iomod_gpi[i],sizeof (XlnxPMUIOGPIO), +TYPE_XLNX_ZYNQMP_IOMOD_GPIO ); +qdev_set_parent_bus (DEVICE (iomod_gpi[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { +object_property_set_bool (OBJECT (iomod_gpi[i]), true,"input" , + &error_abort); +object_property_set_uint (OBJECT (iomod_gpi[i]),0x20 ,"size" , + &error_abort);
I previously misread this, you are initializing the 4 GPIs as GPI0, it may be cleaner to add an index property to select the correct GPI RegisterAccessInfo, or add a 'reserved' bitmask property and use a generic GPI.
In particular GPI3 is read-only.
Quoted 21 lines
hw/microblaze/xlnx-zynqmp-pmu.c +21
-0+object_property_set_bool (OBJECT (iomod_gpi[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (iomod_gpi[i]),0 , iomod_gpi_addr[i]); +sysbus_connect_irq (SYS_BUS_DEVICE (iomod_gpi[i]),0 , + irq[iomod_gpi_irq[i]]); +/* The other GPIO lines connect to the ARM side of the SoC. When we +* have a way to model MicroBlaze QEMU and ARM QEMU together we can +* connect the GPIO lines. +*/ + } + +/* Create and connect the IOMOD GPO device */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ; i++) { + iomod_gpo[i] =g_new0 (XlnxPMUIOGPIO,1 ); +object_initialize (iomod_gpo[i],sizeof (XlnxPMUIOGPIO), +TYPE_XLNX_ZYNQMP_IOMOD_GPIO ); +qdev_set_parent_bus (DEVICE (iomod_gpo[i]),sysbus_get_default ()); + } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ; i++) { + object_property_set_bool(OBJECT(iomod_gpo[i]), false, "input",
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState *machine) · line 260
Quoted 10 lines
hw/microblaze/xlnx-zynqmp-pmu.c +10
-0+ &error_abort); +if (i) { +object_property_set_uint (OBJECT (iomod_gpo[i]),0x20 ,"size" , + &error_abort); + }else { +object_property_set_uint (OBJECT (iomod_gpo[i]),0x09 ,"size" , + &error_abort); + } +object_property_set_uint (OBJECT (iomod_gpo[i]),0x00 ,"gpo-init" , + &error_abort);
Ditto, the 4 GPOs are initialized as GPO0 (and GPO3 is write-only, we could use GUEST_ERROR reports).
Quoted 30 lines
hw/microblaze/xlnx-zynqmp-pmu.c +14
-2+object_property_set_bool (OBJECT (iomod_gpo[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (iomod_gpo[i]),0 , iomod_gpo_addr[i]); + } +/* Create and connect the IOMOD PIT devices */ for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_PITS ; i++) { pit[i] =g_new0 (XlnxPMUPIT,1 ); -object_initialize (pit[i],sizeof (XlnxPMUPIT),TYPE_XLNX_ZYNQMP_IOMODULE_PIT ); +object_initialize (pit[i],sizeof (XlnxPMUPIT), +TYPE_XLNX_ZYNQMP_IOMODULE_PIT );qdev_set_parent_bus (DEVICE (pit[i]),sysbus_get_default ()); }@@ -219,7 +286,13 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_hit_in" ,0 );qdev_connect_gpio_out_named (DEVICE (pit[3 ]),"ps_hit_out" ,0 , tmp_irq); -/* TODO: PIT0 and PIT2 "ps_config" GPIO goes to The GPO1 device. */ +/* GP01 goes into PIT0 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[0 ]),"ps_config" ,0 ); +qdev_connect_gpio_out (DEVICE (iomod_gpo[1 ]),2 , tmp_irq); + +/* GP01 goes into PIT2 */ + tmp_irq =qdev_get_gpio_in_named (DEVICE (pit[2 ]),"ps_config" ,0 ); +qdev_connect_gpio_out (DEVICE (iomod_gpo[1 ]),6 , tmp_irq);/* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,
Re: [Qemu-devel] [PATCH v2 5/5] xlnx-zynqmp-pmu: Connect the IOMOD GPI/GPO devices
Quoted 5 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>---
hw/microblaze/xlnx-zynqmp-pmu.c | 77
+++++++++++++++++++++++++++++++++++++++--
Quoted 3 lines
Review
Quoted 3 lines
1 file changed, 75 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/hw/microblaze/xlnx-zynqmp-pmu.c
Quoted 15 lines
Quoted 15 lines
index
35a2314ffb..fa5f0bfcf1100644hw/microblaze/xlnx-zynqmp-pmu.c +1
-0@@ -27,6 +27,7 @@#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #include "hw/timer/xlnx-pmu-iomod-pit.h" +#include "hw/gpio/xlnx-pmu-iomod-gp.h" /* Define the PMU device */ @@ -43,6 +44,9 @@#define XLNX_ZYNQMP_PMU_NUM_IPIS 4#define XLNX_ZYNQMP_PMU_NUM_PITS 4
Quoted 7 lines
hw/microblaze/xlnx-zynqmp-pmu.c static const uint64_t
Quoted 7 lines
hw/microblaze/xlnx-zynqmp-pmu.c +3
-0+#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS 4 +#define XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS 4 +static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS ] = {0xFF340000 ,0xFF350000 ,0xFF360000 ,0xFF370000 , };@@ -57,6 +61,17 @@ static const uint64_t
pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS] = {
Quoted 4 lines
hw/microblaze/xlnx-zynqmp-pmu.c static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS] = {
Quoted 4 lines
hw/microblaze/xlnx-zynqmp-pmu.c +1
-03, 4, 5, 6, }; +static const uint64_t iomod_gpi_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS] =
{
Quoted 7 lines
hw/microblaze/xlnx-zynqmp-pmu.c static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS] = {
Quoted 7 lines
hw/microblaze/xlnx-zynqmp-pmu.c +7
-0+ 0xFFD40020, 0xFFD40024, 0xFFD40028, 0xFFD4002C, +}; +static const uint64_t iomod_gpi_irq[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ] = { +11 ,12 ,13 ,14 , +}; + +static const uint64_t iomod_gpo_addr[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS] =
{
Quoted 7 lines
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState
Quoted 7 lines
hw/microblaze/xlnx-zynqmp-pmu.c +3
-0+ 0xFFD40010, 0xFFD40014, 0xFFD40018, 0xFFD4001C, +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj;@@ -156,6 +171,8 @@ static void xlnx_zynqmp_pmu_init(MachineState
*machine)
Quoted 9 lines
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState
Quoted 9 lines
hw/microblaze/xlnx-zynqmp-pmu.c +2
-0MemoryRegion *pmu_rom =g_new (MemoryRegion,1 );MemoryRegion *pmu_ram =g_new (MemoryRegion,1 );XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS ]; +XlnxPMUIOGPIO *iomod_gpi[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ]; +XlnxPMUIOGPIO *iomod_gpo[XLNX_ZYNQMP_PMU_NUM_IOMOD_GPOS ];XlnxPMUPIT *pit[XLNX_ZYNQMP_PMU_NUM_PITS ];qemu_irq irq[32 ];qemu_irq tmp_irq;@@ -197,10 +214,60 @@ static void xlnx_zynqmp_pmu_init(MachineState
*machine)
Quoted 9 lines
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState *machine)
Quoted 9 lines
hw/microblaze/xlnx-zynqmp-pmu.c +6
-0sysbus_connect_irq (SYS_BUS_DEVICE (ipi[i]),0 , irq[ipi_irq[i]]); } +/* Create and connect the IOMOD GPI device */ +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { + iomod_gpi[i] =g_new0 (XlnxPMUIOGPIO,1 ); +object_initialize (iomod_gpi[i],sizeof (XlnxPMUIOGPIO), +TYPE_XLNX_ZYNQMP_IOMOD_GPIO ); + qdev_set_parent_bus(DEVICE(iomod_gpi[i]),
sysbus_get_default());
Quoted 8 lines
hw/microblaze/xlnx-zynqmp-pmu.c static void xlnx_zynqmp_pmu_init(MachineState *machine) · line 229
Quoted 7 lines
hw/microblaze/xlnx-zynqmp-pmu.c +7
-0+ } + +for (i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IOMOD_GPIS ; i++) { +object_property_set_bool (OBJECT (iomod_gpi[i]), true,"input" , + &error_abort); +object_property_set_uint (OBJECT (iomod_gpi[i]),0x20 ,"size" , + &error_abort);
Quoted 5 lines
I previously misread this, you are initializing the 4 GPIs as GPI0, it may be cleaner to add an index property to select the correct GPI RegisterAccessInfo, or add a 'reserved' bitmask property and use a generic GPI.
In particular GPI3 is read-only.
I'm not sure what you mean here.
Alistair