Skip to contentSkip to conversation

hw/arm/bcm2835_peripherals: add bcm283x sp804-alike timer

PATCH Superseded Mark 2 participants 2 messages Feb 9, 2019 – Feb 10, 2019

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Mark

author
#0 lore raw

PATCH v2 1/1 hw/arm/bcm2835_peripherals: add bcm283x sp804-alike timer

---
 hw/arm/bcm2835_peripherals.c         |  17 ++
 hw/timer/Makefile.objs               |   2 +
 hw/timer/bcm283x_timer.c             | 299 +++++++++++++++++++++++++++
 include/hw/arm/bcm2835_peripherals.h |   2 +
 include/hw/timer/bcm283x_timer.h     |  38 ++++
 5 files changed, 358 insertions(+)
 create mode 100644 hw/timer/bcm283x_timer.c
 create mode 100644 include/hw/timer/bcm283x_timer.h
hw/arm/bcm2835_peripherals.c +17 -0
index 6be7660e8c..fccdb9509b 100644
@@ -117,6 +117,13 @@ static void bcm2835_peripherals_init(Object *obj)
                                    OBJECT(&s->sdhci.sdbus), &error_abort);
     object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost",
                                    OBJECT(&s->sdhost.sdbus), &error_abort);
+
+    /* SP804-alike ARM Timer */
+    object_initialize(&s->bcm283xsp804, sizeof(s->bcm283xsp804),
+            TYPE_BCM283xSP804);
+    object_property_add_child(obj, "bcm283xsp804", OBJECT(&s->bcm283xsp804),
+            NULL);
+    qdev_set_parent_bus(DEVICE(&s->bcm283xsp804), sysbus_get_default());
 }
 
 static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
@@ -334,6 +341,16 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
         error_propagate(errp, err);
         return;
     }
+
+    /* SP804-alike ARM Timer */
+    object_property_set_bool(OBJECT(&s->bcm283xsp804), true, "realized", &err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
+    }
+
+    memory_region_add_subregion(&s->peri_mr, ARMCTRL_TIMER0_1_OFFSET,
+                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->bcm283xsp804), 0));
 }
 
 static void bcm2835_peripherals_class_init(ObjectClass *oc, void *data)
hw/timer/Makefile.objs +2 -0
index 0e9a4530f8..09a3706701 100644
@@ -47,3 +47,5 @@ common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
 common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o
 common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o
 common-obj-$(CONFIG_MSF2) += mss-timer.o
+
+common-obj-$(CONFIG_RASPI) += bcm283x_timer.o
hw/timer/bcm283x_timer.c new file +299 -0

299 lines not on this page · raw message

include/hw/arm/bcm2835_peripherals.h +2 -0
index f5b193f670..d13aad43cb 100644
@@ -23,6 +23,7 @@
 #include "hw/sd/sdhci.h"
 #include "hw/sd/bcm2835_sdhost.h"
 #include "hw/gpio/bcm2835_gpio.h"
+#include "hw/timer/bcm283x_timer.h"
 
 #define TYPE_BCM2835_PERIPHERALS "bcm2835-peripherals"
 #define BCM2835_PERIPHERALS(obj) \
@@ -48,6 +49,7 @@ typedef struct BCM2835PeripheralState {
     SDHCIState sdhci;
     BCM2835SDHostState sdhost;
     BCM2835GpioState gpio;
+    BCM283xSP804State bcm283xsp804;
 } BCM2835PeripheralState;
 
 #endif /* BCM2835_PERIPHERALS_H */
include/hw/timer/bcm283x_timer.h new file +38 -0
new file mode 100644
index 0000000000..f5e8dcddfc
@@ -0,0 +1,38 @@
+/*
+ * Broadcom BCM283x ARM timer variant based on ARM SP804
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef HW_TIMER_BCM2835_TIMER_H
+#define HW_TIMER_BCM2835_TIMER_H
+
+#include "hw/sysbus.h"
+
+#define TYPE_BCM283xSP804 "bcm283xsp804"
+#define BCM283xSP804(obj)
+    OBJECT_CHECK(BCM283xSP804State, (obj), TYPE_BCM283xSP804)
+
+typedef struct bcm283x_timer_state bcm283x_timer_state;
+
+typedef struct {
+    SysBusDevice parent_obj;
+
+    MemoryRegion iomem;
+    bcm283x_timer_state *timer;
+    uint32_t freq0;
+    int level;
+    qemu_irq irq;
+} BCM283xSP804State;
+
+#endif

--
2.20.1

#1 lore raw
Patchew URL: https://patchew.org/QEMU/20190209144918.GA14036@nyan/

Patchew URL: https://patchew.org/QEMU/20190209144918.GA14036@nyan/

Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===

                 from /tmp/qemu-test/src/include/hw/qdev.h:4,
                 from /tmp/qemu-test/src/include/hw/sysbus.h:6,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:2:
/tmp/qemu-test/src/include/qom/object.h:518:12: error: expected ')' before '*' token
     ((type *)object_dynamic_cast_assert(OBJECT(obj), (name), \
            ^
/tmp/qemu-test/src/include/hw/timer/bcm283x_timer.h:24:5: note: in expansion of macro 'OBJECT_CHECK'
     OBJECT_CHECK(BCM283xSP804State, (obj), TYPE_BCM283xSP804)
     ^~~~~~~~~~~~
/tmp/qemu-test/src/include/qom/object.h:518:14: error: expected ')' before 'object_dynamic_cast_assert'
     ((type *)object_dynamic_cast_assert(OBJECT(obj), (name), \
              ^~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/include/hw/timer/bcm283x_timer.h:24:5: note: in expansion of macro 'OBJECT_CHECK'
     OBJECT_CHECK(BCM283xSP804State, (obj), TYPE_BCM283xSP804)
     ^~~~~~~~~~~~
In file included from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:7:
/tmp/qemu-test/src/include/hw/timer/bcm283x_timer.h:32:5: error: unknown type name 'bcm283x_timer_state'
     bcm283x_timer_state *timer;
     ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:33:34: error: unknown type name 'bcm283x_timer_state'; did you mean 'ptimer_state'?
 static void bcm283x_timer_update(bcm283x_timer_state *s)
                                  ^~~~~~~~~~~~~~~~~~~
                                  ptimer_state
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c: In function 'bcm283x_timer_read':
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:44:5: error: unknown type name 'bcm283x_timer_state'; use 'struct' keyword to refer to the type
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
     ^~~~~~~~~~~~~~~~~~~
     struct 
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:44:31: error: 'bcm283x_timer_state' undeclared (first use in this function)
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
                               ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:44:31: note: each undeclared identifier is reported only once for each function it appears in
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:44:52: error: expected expression before ')' token
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
                                                    ^
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:49:17: error: request for member 'limit' in something not a structure or union
         return s->limit;
                 ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:51:34: error: request for member 'timer' in something not a structure or union
         return ptimer_get_count(s->timer);
                                  ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:53:17: error: request for member 'control' in something not a structure or union
         return s->control;
                 ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:61:17: error: request for member 'int_level' in something not a structure or union
         return s->int_level;
                 ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:63:15: error: request for member 'control' in something not a structure or union
         if ((s->control & TIMER_CTRL_IE) == 0) {
               ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:66:17: error: request for member 'int_level' in something not a structure or union
         return s->int_level;
                 ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c: At top level:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:74:39: error: unknown type name 'bcm283x_timer_state'; did you mean 'ptimer_state'?
 static void bcm283x_timer_recalibrate(bcm283x_timer_state *s, int reload)
                                       ^~~~~~~~~~~~~~~~~~~
                                       ptimer_state
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c: In function 'bcm283x_timer_write':
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:86:5: error: unknown type name 'bcm283x_timer_state'; use 'struct' keyword to refer to the type
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
     ^~~~~~~~~~~~~~~~~~~
     struct 
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:86:31: error: 'bcm283x_timer_state' undeclared (first use in this function)
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
                               ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:86:52: error: expected expression before ')' token
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
                                                    ^
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:91:10: error: request for member 'limit' in something not a structure or union
         s->limit = value;
          ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:92:9: error: implicit declaration of function 'bcm283x_timer_recalibrate'; did you mean 'bcm283x_timer_write'? [-Werror=implicit-function-declaration]
         bcm283x_timer_recalibrate(s, 1);
         ^~~~~~~~~~~~~~~~~~~~~~~~~
         bcm283x_timer_write
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:92:9: error: nested extern declaration of 'bcm283x_timer_recalibrate' [-Werror=nested-externs]
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:98:14: error: request for member 'control' in something not a structure or union
         if (s->control & TIMER_CTRL_ENABLE) {
              ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:99:26: error: request for member 'timer' in something not a structure or union
             ptimer_stop(s->timer);
                          ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:102:10: error: request for member 'control' in something not a structure or union
         s->control = value;
          ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:103:17: error: request for member 'freq' in something not a structure or union
         freq = s->freq;
                 ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:115:39: error: request for member 'control' in something not a structure or union
         bcm283x_timer_recalibrate(s, s->control & TIMER_CTRL_ENABLE);
                                       ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:116:26: error: request for member 'timer' in something not a structure or union
         ptimer_set_freq(s->timer, freq);
                          ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:117:14: error: request for member 'control' in something not a structure or union
         if (s->control & TIMER_CTRL_ENABLE) {
              ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:118:25: error: request for member 'timer' in something not a structure or union
             ptimer_run(s->timer, 0);
                         ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:122:10: error: request for member 'int_level' in something not a structure or union
         s->int_level = 0;
          ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:125:10: error: request for member 'limit' in something not a structure or union
         s->limit = value;
          ^~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:134:5: error: implicit declaration of function 'bcm283x_timer_update'; did you mean 'bcm283x_timer_write'? [-Werror=implicit-function-declaration]
     bcm283x_timer_update(s);
     ^~~~~~~~~~~~~~~~~~~~
     bcm283x_timer_write
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:134:5: error: nested extern declaration of 'bcm283x_timer_update' [-Werror=nested-externs]
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c: In function 'bcm283x_timer_tick':
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:139:5: error: unknown type name 'bcm283x_timer_state'; use 'struct' keyword to refer to the type
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
     ^~~~~~~~~~~~~~~~~~~
     struct 
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:139:31: error: 'bcm283x_timer_state' undeclared (first use in this function)
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
                               ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:139:52: error: expected expression before ')' token
     bcm283x_timer_state *s = (bcm283x_timer_state *) opaque;
                                                    ^
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:140:6: error: request for member 'int_level' in something not a structure or union
     s->int_level = 1;
      ^~
In file included from /usr/lib/gcc/x86_64-w64-mingw32/8.2.0/include/stddef.h:1,
---
                 from /tmp/qemu-test/src/include/qemu/osdep.h:103,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:1:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c: At top level:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:149:33: error: unknown type name 'bcm283x_timer_state'
         VMSTATE_UINT32(control, bcm283x_timer_state),
                                 ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/include/migration/vmstate.h:282:21: note: in expansion of macro 'vmstate_offset_value'
---
         ^~~~~~~~~~~~~~
In file included from /tmp/qemu-test/src/include/qemu/osdep.h:51,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:1:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:149:33: error: 'bcm283x_timer_state' undeclared here (not in a function)
         VMSTATE_UINT32(control, bcm283x_timer_state),
                                 ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/include/qemu/compiler.h:74:38: note: in definition of macro 'type_check'
---
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:149:9: note: in expansion of macro 'VMSTATE_UINT32'
         VMSTATE_UINT32(control, bcm283x_timer_state),
         ^~~~~~~~~~~~~~
/tmp/qemu-test/src/include/qemu/compiler.h:73:50: error: expected expression before ')' token
 #define typeof_field(type, field) typeof(((type *)0)->field)
                                                  ^
/tmp/qemu-test/src/include/qemu/compiler.h:74:38: note: in definition of macro 'type_check'
---
                 from /usr/x86_64-w64-mingw32/sys-root/mingw/include/inttypes.h:14,
                 from /tmp/qemu-test/src/include/qemu/osdep.h:103,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:1:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:150:31: error: expected specifier-qualifier-list before 'bcm283x_timer_state'
         VMSTATE_UINT32(limit, bcm283x_timer_state),
                               ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/include/migration/vmstate.h:282:21: note: in expansion of macro 'vmstate_offset_value'
---
         ^~~~~~~~~~~~~~
In file included from /tmp/qemu-test/src/include/qemu/osdep.h:51,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:1:
/tmp/qemu-test/src/include/qemu/compiler.h:73:50: error: expected expression before ')' token
 #define typeof_field(type, field) typeof(((type *)0)->field)
                                                  ^
/tmp/qemu-test/src/include/qemu/compiler.h:74:38: note: in definition of macro 'type_check'
---
                 from /usr/x86_64-w64-mingw32/sys-root/mingw/include/inttypes.h:14,
                 from /tmp/qemu-test/src/include/qemu/osdep.h:103,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:1:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:151:34: error: expected specifier-qualifier-list before 'bcm283x_timer_state'
         VMSTATE_INT32(int_level, bcm283x_timer_state),
                                  ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/include/migration/vmstate.h:282:21: note: in expansion of macro 'vmstate_offset_value'
---
         ^~~~~~~~~~~~~
In file included from /tmp/qemu-test/src/include/qemu/osdep.h:51,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:1:
/tmp/qemu-test/src/include/qemu/compiler.h:73:50: error: expected expression before ')' token
 #define typeof_field(type, field) typeof(((type *)0)->field)
                                                  ^
/tmp/qemu-test/src/include/qemu/compiler.h:74:38: note: in definition of macro 'type_check'
---
                 from /usr/x86_64-w64-mingw32/sys-root/mingw/include/inttypes.h:14,
                 from /tmp/qemu-test/src/include/qemu/osdep.h:103,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:1:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:152:31: error: expected specifier-qualifier-list before 'bcm283x_timer_state'
         VMSTATE_PTIMER(timer, bcm283x_timer_state),
                               ^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/include/migration/vmstate.h:449:21: note: in expansion of macro 'vmstate_offset_pointer'
---
                 from /tmp/qemu-test/src/include/hw/qdev.h:4,
                 from /tmp/qemu-test/src/include/hw/sysbus.h:6,
                 from /tmp/qemu-test/src/hw/timer/bcm283x_timer.c:2:
/tmp/qemu-test/src/include/qemu/compiler.h:73:50: error: expected expression before ')' token
 #define typeof_field(type, field) typeof(((type *)0)->field)
                                                  ^
/tmp/qemu-test/src/include/migration/vmstate.h:231:47: note: in definition of macro 'type_check_pointer'
---
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:152:9: note: in expansion of macro 'VMSTATE_PTIMER'
         VMSTATE_PTIMER(timer, bcm283x_timer_state),
         ^~~~~~~~~~~~~~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:157:28: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token
 static bcm283x_timer_state *bcm283x_timer_init(uint32_t freq)
                            ^
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c: In function 'bcm283xsp804_init':
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:254:45: error: expected expression before ';' token
     BCM283xSP804State *s = BCM283xSP804(obj);
                                             ^
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c: In function 'bcm283xsp804_realize':
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:266:45: error: expected expression before ';' token
     BCM283xSP804State *s = BCM283xSP804(dev);
                                             ^
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:268:16: error: implicit declaration of function 'bcm283x_timer_init'; did you mean 'bcm283x_timer_write'? [-Werror=implicit-function-declaration]
     s->timer = bcm283x_timer_init(s->freq0);
                ^~~~~~~~~~~~~~~~~~
                bcm283x_timer_write
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:268:16: error: nested extern declaration of 'bcm283x_timer_init' [-Werror=nested-externs]
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:268:14: error: assignment to 'int *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
     s->timer = bcm283x_timer_init(s->freq0);
              ^
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:269:13: error: request for member 'irq' in something not a structure or union
     s->timer->irq = qemu_allocate_irq(bcm283xsp804_set_irq, s, 0);
             ^~
At top level:
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:144:33: error: 'vmstate_bcm283x_timer' defined but not used [-Werror=unused-const-variable=]
 static const VMStateDescription vmstate_bcm283x_timer = {
                                 ^~~~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/hw/timer/bcm283x_timer.c:137:13: error: 'bcm283x_timer_tick' defined but not used [-Werror=unused-function]
 static void bcm283x_timer_tick(void *opaque)
             ^~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

The full log is available at
http://patchew.org/logs/20190209144918.GA14036@nyan/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]