qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org
Subject: [PULL 09/29] hw/tricore: Add testdevice for tests in tests/tcg/
Date: Mon, 17 May 2021 17:10:02 +0100	[thread overview]
Message-ID: <20210517161022.13984-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210517161022.13984-1-alex.bennee@linaro.org>

From: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>

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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210305170045.869437-4-kbastian@mail.uni-paderborn.de>
Message-Id: <20210512102051.12134-14-alex.bennee@linaro.org>

diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h
new file mode 100644
index 0000000000..2c56c51bcb
--- /dev/null
+++ b/include/hw/tricore/tricore_testdevice.h
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2018-2021  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
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 51658d9e37..b6810e3be0 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -27,6 +27,7 @@
 #include "hw/loader.h"
 #include "elf.h"
 #include "hw/tricore/tricore.h"
+#include "hw/tricore/tricore_testdevice.h"
 #include "qemu/error-report.h"
 
 
@@ -56,6 +57,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);
@@ -87,6 +89,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_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..a1563aa568
--- /dev/null
+++ b/hw/tricore/tricore_testdevice.c
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2018-2021 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/qdev-properties.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);
+
+    device_class_set_props(dc, 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/hw/tricore/meson.build b/hw/tricore/meson.build
index 77ff6fd137..47e36bb077 100644
--- a/hw/tricore/meson.build
+++ b/hw/tricore/meson.build
@@ -1,5 +1,6 @@
 tricore_ss = ss.source_set()
 tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c'))
+tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testdevice.c'))
 tricore_ss.add(when: 'CONFIG_TRIBOARD', if_true: files('triboard.c'))
 tricore_ss.add(when: 'CONFIG_TC27X_SOC', if_true: files('tc27x_soc.c'))
 
-- 
2.20.1



  parent reply	other threads:[~2021-05-17 16:12 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17 16:09 [PULL 00/29] testing and plugin updates Alex Bennée
2021-05-17 16:09 ` [PULL 01/29] tests/docker: fix copying of executable in "update" Alex Bennée
2021-05-17 16:09 ` [PULL 02/29] tests/docker: make executable an optional argument to "update" Alex Bennée
2021-05-17 16:09 ` [PULL 03/29] tests/docker: allow "update" to add the current user Alex Bennée
2021-05-17 16:09 ` [PULL 04/29] tests/docker: add "fetch" sub-command Alex Bennée
2021-05-17 16:09 ` [PULL 05/29] docker: Add Hexagon image Alex Bennée
2021-05-17 16:09 ` [PULL 06/29] tests/tcg: Use Hexagon Docker image Alex Bennée
2021-05-17 16:10 ` [PULL 07/29] tests/docker: Added libbpf library to the docker files Alex Bennée
2021-05-17 16:10 ` [PULL 08/29] tests/tcg: Run timeout cmds using --foreground Alex Bennée
2021-05-17 16:10 ` Alex Bennée [this message]
2021-05-17 16:10 ` [PULL 10/29] tests/tcg/tricore: Add build infrastructure Alex Bennée
2021-05-17 16:10 ` [PULL 11/29] configure: Emit HOST_CC to config-host.mak Alex Bennée
2021-05-17 16:10 ` [PULL 12/29] tests/tcg/tricore: Add macros to create tests and first test 'abs' Alex Bennée
2021-05-17 16:10 ` [PULL 13/29] tests/tcg/tricore: Add bmerge test Alex Bennée
2021-05-17 16:10 ` [PULL 14/29] tests/tcg/tricore: Add clz test Alex Bennée
2021-05-17 16:10 ` [PULL 15/29] tests/tcg/tricore: Add dvstep test Alex Bennée
2021-05-17 16:10 ` [PULL 16/29] tests/tcg/tricore: Add fadd test Alex Bennée
2021-05-17 16:10 ` [PULL 17/29] tests/tcg/tricore: Add fmul test Alex Bennée
2021-05-17 16:10 ` [PULL 18/29] tests/tcg/tricore: Add ftoi test Alex Bennée
2021-05-17 16:10 ` [PULL 19/29] tests/tcg/tricore: Add madd test Alex Bennée
2021-05-17 16:10 ` [PULL 20/29] tests/tcg/tricore: Add msub test Alex Bennée
2021-05-17 16:10 ` [PULL 21/29] tests/tcg/tricore: Add muls test Alex Bennée
2021-05-17 16:10 ` [PULL 22/29] tests/tcg/ppc64le: tests for brh/brw/brd Alex Bennée
2021-05-17 16:10 ` [PULL 23/29] tests/tcg: fix missing return Alex Bennée
2021-05-17 16:10 ` [PULL 24/29] tests/tcg: don't allow clang as a cross compiler Alex Bennée
2021-05-17 16:10 ` [PULL 25/29] configure: use cc, not host_cc to set cross_cc for build arch Alex Bennée
2021-05-17 16:10 ` [PULL 26/29] plugins: Update qemu-plugins.symbols to match qemu-plugins.h Alex Bennée
2021-05-17 16:10 ` [PULL 27/29] plugins: Move all typedef and type declaration to the front of the qemu-plugin.h Alex Bennée
2021-05-17 16:10 ` [PULL 28/29] plugins/hotblocks: Properly freed the hash table values Alex Bennée
2021-05-17 16:10 ` [PULL 29/29] plugins/hotpages: " Alex Bennée
2021-05-17 17:09 ` [PULL 00/29] testing and plugin updates no-reply
2021-05-17 17:37 ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210517161022.13984-10-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=kbastian@mail.uni-paderborn.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).