diff mbox

[RFC,01/12] hw/tricore: Add testdevice for tests in tests/tcg/

Message ID 20180501142222.19154-2-kbastian@mail.uni-paderborn.de (mailing list archive)
State New, archived
Headers show

Commit Message

Bastian Koppelmann May 1, 2018, 2:22 p.m. UTC 
this device is used to verify the correctness of regression tests by
allowing guests to write their exit status to this device. This is then
used by qemu to exit using the written status.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
 hw/tricore/Makefile.objs                |  1 +
 hw/tricore/tricore_testboard.c          |  8 ++++
 hw/tricore/tricore_testdevice.c         | 81 +++++++++++++++++++++++++++++++++
 include/hw/tricore/tricore_testdevice.h | 38 ++++++++++++++++
 4 files changed, 128 insertions(+)
 create mode 100644 hw/tricore/tricore_testdevice.c
 create mode 100644 include/hw/tricore/tricore_testdevice.h

Comments

Alex Bennée May 25, 2018, 4:14 p.m. UTC | #1 
Bastian Koppelmann <kbastian@mail.uni-paderborn.de> writes:

> this device is used to verify the correctness of regression tests by
> allowing guests to write their exit status to this device. This is then
> used by qemu to exit using the written status.

My initial thoughts are this replicates the functionality of
virtio-console for chr-testdev used by kvm-unit-tests
(chardev/testdev.c). But on closer inspection it seems this is a
per-arch thing anyway.

>
> Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  hw/tricore/Makefile.objs                |  1 +
>  hw/tricore/tricore_testboard.c          |  8 ++++
>  hw/tricore/tricore_testdevice.c         | 81 +++++++++++++++++++++++++++++++++
>  include/hw/tricore/tricore_testdevice.h | 38 ++++++++++++++++
>  4 files changed, 128 insertions(+)
>  create mode 100644 hw/tricore/tricore_testdevice.c
>  create mode 100644 include/hw/tricore/tricore_testdevice.h
>
> diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs
> index 435e095cff..9e871a01e2 100644
> --- a/hw/tricore/Makefile.objs
> +++ b/hw/tricore/Makefile.objs
> @@ -1 +1,2 @@
>  obj-y += tricore_testboard.o
> +obj-y += tricore_testdevice.o
> diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
> index 8e61dfc3e6..ee0a332e12 100644
> --- a/hw/tricore/tricore_testboard.c
> +++ b/hw/tricore/tricore_testboard.c
> @@ -31,6 +31,7 @@
>  #include "exec/address-spaces.h"
>  #include "elf.h"
>  #include "hw/tricore/tricore.h"
> +#include "hw/tricore/tricore_testdevice.h"
>  #include "qemu/error-report.h"
>
>
> @@ -60,6 +61,7 @@ static void tricore_testboard_init(MachineState *machine, int board_id)
>  {
>      TriCoreCPU *cpu;
>      CPUTriCoreState *env;
> +    TriCoreTestDeviceState *test_dev;
>
>      MemoryRegion *sysmem = get_system_memory();
>      MemoryRegion *ext_cram = g_new(MemoryRegion, 1);
> @@ -91,6 +93,12 @@ static void tricore_testboard_init(MachineState *machine, int board_id)
>      memory_region_add_subregion(sysmem, 0xf0050000, pcp_data);
>      memory_region_add_subregion(sysmem, 0xf0060000, pcp_text);
>
> +    /* test device */
> +    test_dev = g_new(TriCoreTestDeviceState, 1);
> +    object_initialize(test_dev, sizeof(TriCoreTestDeviceState),
> +                      TYPE_TRICORE_TESTDEVICE);
> +    memory_region_add_subregion(sysmem, 0xf0000000, &test_dev->iomem);
> +
>      tricoretb_binfo.ram_size = machine->ram_size;
>      tricoretb_binfo.kernel_filename = machine->kernel_filename;
>
> diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevice.c
> new file mode 100644
> index 0000000000..ce4c67fcae
> --- /dev/null
> +++ b/hw/tricore/tricore_testdevice.c
> @@ -0,0 +1,81 @@
> +/*
> + *  Copyright (c) 2018 Bastian Koppelmann Paderborn University
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library 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
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/sysbus.h"
> +#include "hw/tricore/tricore_testdevice.h"
> +
> +static void tricore_testdevice_write(void *opaque, hwaddr offset,
> +                                      uint64_t value, unsigned size)
> +{
> +    exit(value);
> +}
> +
> +static uint64_t tricore_testdevice_read(void *opaque, hwaddr offset,
> +                                         unsigned size)
> +{
> +    return 0xdeadbeef;
> +}
> +
> +static void tricore_testdevice_reset(DeviceState *dev)
> +{
> +}
> +
> +static const MemoryRegionOps tricore_testdevice_ops = {
> +    .read = tricore_testdevice_read,
> +    .write = tricore_testdevice_write,
> +    .valid = {
> +        .min_access_size = 4,
> +        .max_access_size = 4,
> +    },
> +    .endianness = DEVICE_NATIVE_ENDIAN,
> +};
> +
> +static void tricore_testdevice_init(Object *obj)
> +{
> +    TriCoreTestDeviceState *s = TRICORE_TESTDEVICE(obj);
> +   /* map memory */
> +    memory_region_init_io(&s->iomem, OBJECT(s), &tricore_testdevice_ops, s,
> +                          "tricore_testdevice", 0x4);
> +}
> +
> +static Property tricore_testdevice_properties[] = {
> +    DEFINE_PROP_END_OF_LIST()
> +};
> +
> +static void tricore_testdevice_class_init(ObjectClass *klass, void *data)
> +{
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +
> +    dc->props = tricore_testdevice_properties;
> +    dc->reset = tricore_testdevice_reset;
> +}
> +
> +static const TypeInfo tricore_testdevice_info = {
> +    .name          = TYPE_TRICORE_TESTDEVICE,
> +    .parent        = TYPE_SYS_BUS_DEVICE,
> +    .instance_size = sizeof(TriCoreTestDeviceState),
> +    .instance_init = tricore_testdevice_init,
> +    .class_init    = tricore_testdevice_class_init,
> +};
> +
> +static void tricore_testdevice_register_types(void)
> +{
> +    type_register_static(&tricore_testdevice_info);
> +}
> +
> +type_init(tricore_testdevice_register_types)
> diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h
> new file mode 100644
> index 0000000000..5b2df219e3
> --- /dev/null
> +++ b/include/hw/tricore/tricore_testdevice.h
> @@ -0,0 +1,38 @@
> +/*
> + *  Copyright (c) 2018  Bastian Koppelmann Paderborn University
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library 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
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +
> +#ifndef HW_TRICORE_TESTDEV_H
> +#define HW_TRICORE_TESTDEV_H
> +
> +#include "hw/sysbus.h"
> +#include "hw/hw.h"
> +
> +#define TYPE_TRICORE_TESTDEVICE "tricore_testdevice"
> +#define TRICORE_TESTDEVICE(obj) \
> +    OBJECT_CHECK(TriCoreTestDeviceState, (obj), TYPE_TRICORE_TESTDEVICE)
> +
> +typedef struct {
> +    /* <private> */
> +    SysBusDevice parent_obj;
> +
> +    /* <public> */
> +    MemoryRegion iomem;
> +
> +} TriCoreTestDeviceState;
> +
> +#endif


--
Alex Bennée
diff mbox

Patch

diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs
index 435e095cff..9e871a01e2 100644
--- a/hw/tricore/Makefile.objs
+++ b/hw/tricore/Makefile.objs
@@ -1 +1,2 @@ 
 obj-y += tricore_testboard.o
+obj-y += tricore_testdevice.o
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 8e61dfc3e6..ee0a332e12 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -31,6 +31,7 @@ 
 #include "exec/address-spaces.h"
 #include "elf.h"
 #include "hw/tricore/tricore.h"
+#include "hw/tricore/tricore_testdevice.h"
 #include "qemu/error-report.h"
 
 
@@ -60,6 +61,7 @@  static void tricore_testboard_init(MachineState *machine, int board_id)
 {
     TriCoreCPU *cpu;
     CPUTriCoreState *env;
+    TriCoreTestDeviceState *test_dev;
 
     MemoryRegion *sysmem = get_system_memory();
     MemoryRegion *ext_cram = g_new(MemoryRegion, 1);
@@ -91,6 +93,12 @@  static void tricore_testboard_init(MachineState *machine, int board_id)
     memory_region_add_subregion(sysmem, 0xf0050000, pcp_data);
     memory_region_add_subregion(sysmem, 0xf0060000, pcp_text);
 
+    /* test device */
+    test_dev = g_new(TriCoreTestDeviceState, 1);
+    object_initialize(test_dev, sizeof(TriCoreTestDeviceState),
+                      TYPE_TRICORE_TESTDEVICE);
+    memory_region_add_subregion(sysmem, 0xf0000000, &test_dev->iomem);
+
     tricoretb_binfo.ram_size = machine->ram_size;
     tricoretb_binfo.kernel_filename = machine->kernel_filename;
 
diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevice.c
new file mode 100644
index 0000000000..ce4c67fcae
--- /dev/null
+++ b/hw/tricore/tricore_testdevice.c
@@ -0,0 +1,81 @@ 
+/*
+ *  Copyright (c) 2018 Bastian Koppelmann Paderborn University
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/sysbus.h"
+#include "hw/tricore/tricore_testdevice.h"
+
+static void tricore_testdevice_write(void *opaque, hwaddr offset,
+                                      uint64_t value, unsigned size)
+{
+    exit(value);
+}
+
+static uint64_t tricore_testdevice_read(void *opaque, hwaddr offset,
+                                         unsigned size)
+{
+    return 0xdeadbeef;
+}
+
+static void tricore_testdevice_reset(DeviceState *dev)
+{
+}
+
+static const MemoryRegionOps tricore_testdevice_ops = {
+    .read = tricore_testdevice_read,
+    .write = tricore_testdevice_write,
+    .valid = {
+        .min_access_size = 4,
+        .max_access_size = 4,
+    },
+    .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static void tricore_testdevice_init(Object *obj)
+{
+    TriCoreTestDeviceState *s = TRICORE_TESTDEVICE(obj);
+   /* map memory */
+    memory_region_init_io(&s->iomem, OBJECT(s), &tricore_testdevice_ops, s,
+                          "tricore_testdevice", 0x4);
+}
+
+static Property tricore_testdevice_properties[] = {
+    DEFINE_PROP_END_OF_LIST()
+};
+
+static void tricore_testdevice_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->props = tricore_testdevice_properties;
+    dc->reset = tricore_testdevice_reset;
+}
+
+static const TypeInfo tricore_testdevice_info = {
+    .name          = TYPE_TRICORE_TESTDEVICE,
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(TriCoreTestDeviceState),
+    .instance_init = tricore_testdevice_init,
+    .class_init    = tricore_testdevice_class_init,
+};
+
+static void tricore_testdevice_register_types(void)
+{
+    type_register_static(&tricore_testdevice_info);
+}
+
+type_init(tricore_testdevice_register_types)
diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h
new file mode 100644
index 0000000000..5b2df219e3
--- /dev/null
+++ b/include/hw/tricore/tricore_testdevice.h
@@ -0,0 +1,38 @@ 
+/*
+ *  Copyright (c) 2018  Bastian Koppelmann Paderborn University
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef HW_TRICORE_TESTDEV_H
+#define HW_TRICORE_TESTDEV_H
+
+#include "hw/sysbus.h"
+#include "hw/hw.h"
+
+#define TYPE_TRICORE_TESTDEVICE "tricore_testdevice"
+#define TRICORE_TESTDEVICE(obj) \
+    OBJECT_CHECK(TriCoreTestDeviceState, (obj), TYPE_TRICORE_TESTDEVICE)
+
+typedef struct {
+    /* <private> */
+    SysBusDevice parent_obj;
+
+    /* <public> */
+    MemoryRegion iomem;
+
+} TriCoreTestDeviceState;
+
+#endif