[PULL 0/1] tricore queue

[PULL 0/1] tricore queue

[Bastian Koppelmann]

The following changes since commit 1214d55d1c41fbab3a9973a05085b8760647e411:

  Merge remote-tracking branch 'remotes/nvme/tags/nvme-next-pull-request' into staging (2021-02-09 13:24:37 +0000)

are available in the Git repository at:

  https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20210210

for you to fetch changes up to 52be63523e80bc92b8192a1e445fe499650085ac:

  tricore: added triboard with tc27x_soc (2021-02-10 10:26:38 +0100)

----------------------------------------------------------------
added triboard with tc27x_soc

----------------------------------------------------------------
Andreas Konopik (1):
      tricore: added triboard with tc27x_soc

 default-configs/devices/tricore-softmmu.mak |   2 +-
 hw/tricore/Kconfig                          |   8 +
 hw/tricore/meson.build                      |   2 +
 hw/tricore/tc27x_soc.c                      | 246 ++++++++++++++++++++++++++++
 hw/tricore/triboard.c                       |  98 +++++++++++
 include/hw/tricore/tc27x_soc.h              | 129 +++++++++++++++
 include/hw/tricore/triboard.h               |  50 ++++++
 7 files changed, 534 insertions(+), 1 deletion(-)
 create mode 100644 hw/tricore/tc27x_soc.c
 create mode 100644 hw/tricore/triboard.c
 create mode 100644 include/hw/tricore/tc27x_soc.h
 create mode 100644 include/hw/tricore/triboard.h

[PULL 1/1] tricore: added triboard with tc27x_soc

[Bastian Koppelmann]

From: Andreas Konopik <andreas.konopik@efs-auto.de>

Signed-off-by: Andreas Konopik <andreas.konopik@efs-auto.de>
Signed-off-by: David Brenken <david.brenken@efs-auto.de>
Signed-off-by: Georg Hofstetter <georg.hofstetter@efs-auto.de>
Signed-off-by: Robert Rasche <robert.rasche@efs-auto.de>
Signed-off-by: Lars Biermanski <lars.biermanski@efs-auto.de>
Message-Id: <20201109165055.10508-2-david.brenken@efs-auto.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
 default-configs/devices/tricore-softmmu.mak |   2 +-
 hw/tricore/Kconfig                          |   8 +
 hw/tricore/meson.build                      |   2 +
 hw/tricore/tc27x_soc.c                      | 246 ++++++++++++++++++++
 hw/tricore/triboard.c                       |  98 ++++++++
 include/hw/tricore/tc27x_soc.h              | 129 ++++++++++
 include/hw/tricore/triboard.h               |  50 ++++
 7 files changed, 534 insertions(+), 1 deletion(-)
 create mode 100644 hw/tricore/tc27x_soc.c
 create mode 100644 hw/tricore/triboard.c
 create mode 100644 include/hw/tricore/tc27x_soc.h
 create mode 100644 include/hw/tricore/triboard.h

diff --git a/default-configs/devices/tricore-softmmu.mak b/default-configs/devices/tricore-softmmu.mak
index c397cff38a..5cc91cebce 100644
--- a/default-configs/devices/tricore-softmmu.mak
+++ b/default-configs/devices/tricore-softmmu.mak
@@ -1 +1 @@
-CONFIG_TRICORE=y
+CONFIG_TRIBOARD=y
diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig
index 9313409309..506e6183c1 100644
--- a/hw/tricore/Kconfig
+++ b/hw/tricore/Kconfig
@@ -1,2 +1,10 @@
 config TRICORE
     bool
+
+config TRIBOARD
+    bool
+    select TRICORE
+    select TC27X_SOC
+
+config TC27X_SOC
+    bool
diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build
index 579aa13c78..77ff6fd137 100644
--- a/hw/tricore/meson.build
+++ b/hw/tricore/meson.build
@@ -1,4 +1,6 @@
 tricore_ss = ss.source_set()
 tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.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'))
 
 hw_arch += {'tricore': tricore_ss}
diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c
new file mode 100644
index 0000000000..8af079e6b2
--- /dev/null
+++ b/hw/tricore/tc27x_soc.c
@@ -0,0 +1,246 @@
+/*
+ * Infineon tc27x SoC System emulation.
+ *
+ * Copyright (c) 2020 Andreas Konopik <andreas.konopik@efs-auto.de>
+ * Copyright (c) 2020 David Brenken <david.brenken@efs-auto.de>
+ *
+ * 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 "qapi/error.h"
+#include "hw/sysbus.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
+#include "qemu/units.h"
+#include "hw/misc/unimp.h"
+#include "exec/address-spaces.h"
+#include "qemu/log.h"
+#include "cpu.h"
+
+#include "hw/tricore/tc27x_soc.h"
+#include "hw/tricore/triboard.h"
+
+const MemmapEntry tc27x_soc_memmap[] = {
+    [TC27XD_DSPR2]     = { 0x50000000,            120 * KiB },
+    [TC27XD_DCACHE2]   = { 0x5001E000,              8 * KiB },
+    [TC27XD_DTAG2]     = { 0x500C0000,                0xC00 },
+    [TC27XD_PSPR2]     = { 0x50100000,             32 * KiB },
+    [TC27XD_PCACHE2]   = { 0x50108000,             16 * KiB },
+    [TC27XD_PTAG2]     = { 0x501C0000,               0x1800 },
+    [TC27XD_DSPR1]     = { 0x60000000,            120 * KiB },
+    [TC27XD_DCACHE1]   = { 0x6001E000,              8 * KiB },
+    [TC27XD_DTAG1]     = { 0x600C0000,                0xC00 },
+    [TC27XD_PSPR1]     = { 0x60100000,             32 * KiB },
+    [TC27XD_PCACHE1]   = { 0x60108000,             16 * KiB },
+    [TC27XD_PTAG1]     = { 0x601C0000,               0x1800 },
+    [TC27XD_DSPR0]     = { 0x70000000,            112 * KiB },
+    [TC27XD_PSPR0]     = { 0x70100000,             24 * KiB },
+    [TC27XD_PCACHE0]   = { 0x70106000,              8 * KiB },
+    [TC27XD_PTAG0]     = { 0x701C0000,                0xC00 },
+    [TC27XD_PFLASH0_C] = { 0x80000000,              2 * MiB },
+    [TC27XD_PFLASH1_C] = { 0x80200000,              2 * MiB },
+    [TC27XD_OLDA_C]    = { 0x8FE70000,             32 * KiB },
+    [TC27XD_BROM_C]    = { 0x8FFF8000,             32 * KiB },
+    [TC27XD_LMURAM_C]  = { 0x90000000,             32 * KiB },
+    [TC27XD_EMEM_C]    = { 0x9F000000,              1 * MiB },
+    [TC27XD_PFLASH0_U] = { 0xA0000000,                  0x0 },
+    [TC27XD_PFLASH1_U] = { 0xA0200000,                  0x0 },
+    [TC27XD_DFLASH0]   = { 0xAF000000,   1 * MiB + 16 * KiB },
+    [TC27XD_DFLASH1]   = { 0xAF110000,             64 * KiB },
+    [TC27XD_OLDA_U]    = { 0xAFE70000,                  0x0 },
+    [TC27XD_BROM_U]    = { 0xAFFF8000,                  0x0 },
+    [TC27XD_LMURAM_U]  = { 0xB0000000,                  0x0 },
+    [TC27XD_EMEM_U]    = { 0xBF000000,                  0x0 },
+    [TC27XD_PSPRX]     = { 0xC0000000,                  0x0 },
+    [TC27XD_DSPRX]     = { 0xD0000000,                  0x0 },
+};
+
+/*
+ * Initialize the auxiliary ROM region @mr and map it into
+ * the memory map at @base.
+ */
+static void make_rom(MemoryRegion *mr, const char *name,
+                     hwaddr base, hwaddr size)
+{
+    memory_region_init_rom(mr, NULL, name, size, &error_fatal);
+    memory_region_add_subregion(get_system_memory(), base, mr);
+}
+
+/*
+ * Initialize the auxiliary RAM region @mr and map it into
+ * the memory map at @base.
+ */
+static void make_ram(MemoryRegion *mr, const char *name,
+                     hwaddr base, hwaddr size)
+{
+    memory_region_init_ram(mr, NULL, name, size, &error_fatal);
+    memory_region_add_subregion(get_system_memory(), base, mr);
+}
+
+/*
+ * Create an alias of an entire original MemoryRegion @orig
+ * located at @base in the memory map.
+ */
+static void make_alias(MemoryRegion *mr, const char *name,
+                           MemoryRegion *orig, hwaddr base)
+{
+    memory_region_init_alias(mr, NULL, name, orig, 0,
+                             memory_region_size(orig));
+    memory_region_add_subregion(get_system_memory(), base, mr);
+}
+
+static void tc27x_soc_init_memory_mapping(DeviceState *dev_soc)
+{
+    TC27XSoCState *s = TC27X_SOC(dev_soc);
+    TC27XSoCClass *sc = TC27X_SOC_GET_CLASS(s);
+
+    make_ram(&s->cpu0mem.dspr, "CPU0.DSPR",
+        sc->memmap[TC27XD_DSPR0].base, sc->memmap[TC27XD_DSPR0].size);
+    make_ram(&s->cpu0mem.pspr, "CPU0.PSPR",
+        sc->memmap[TC27XD_PSPR0].base, sc->memmap[TC27XD_PSPR0].size);
+    make_ram(&s->cpu1mem.dspr, "CPU1.DSPR",
+        sc->memmap[TC27XD_DSPR1].base, sc->memmap[TC27XD_DSPR1].size);
+    make_ram(&s->cpu1mem.pspr, "CPU1.PSPR",
+        sc->memmap[TC27XD_PSPR1].base, sc->memmap[TC27XD_PSPR1].size);
+    make_ram(&s->cpu2mem.dspr, "CPU2.DSPR",
+        sc->memmap[TC27XD_DSPR2].base, sc->memmap[TC27XD_DSPR2].size);
+    make_ram(&s->cpu2mem.pspr, "CPU2.PSPR",
+        sc->memmap[TC27XD_PSPR2].base, sc->memmap[TC27XD_PSPR2].size);
+
+    /* TODO: Control Cache mapping with Memory Test Unit (MTU) */
+    make_ram(&s->cpu2mem.dcache, "CPU2.DCACHE",
+        sc->memmap[TC27XD_DCACHE2].base, sc->memmap[TC27XD_DCACHE2].size);
+    make_ram(&s->cpu2mem.dtag,   "CPU2.DTAG",
+        sc->memmap[TC27XD_DTAG2].base, sc->memmap[TC27XD_DTAG2].size);
+    make_ram(&s->cpu2mem.pcache, "CPU2.PCACHE",
+        sc->memmap[TC27XD_PCACHE2].base, sc->memmap[TC27XD_PCACHE2].size);
+    make_ram(&s->cpu2mem.ptag,   "CPU2.PTAG",
+        sc->memmap[TC27XD_PTAG2].base, sc->memmap[TC27XD_PTAG2].size);
+
+    make_ram(&s->cpu1mem.dcache, "CPU1.DCACHE",
+        sc->memmap[TC27XD_DCACHE1].base, sc->memmap[TC27XD_DCACHE1].size);
+    make_ram(&s->cpu1mem.dtag,   "CPU1.DTAG",
+        sc->memmap[TC27XD_DTAG1].base, sc->memmap[TC27XD_DTAG1].size);
+    make_ram(&s->cpu1mem.pcache, "CPU1.PCACHE",
+        sc->memmap[TC27XD_PCACHE1].base, sc->memmap[TC27XD_PCACHE1].size);
+    make_ram(&s->cpu1mem.ptag,   "CPU1.PTAG",
+        sc->memmap[TC27XD_PTAG1].base, sc->memmap[TC27XD_PTAG1].size);
+
+    make_ram(&s->cpu0mem.pcache, "CPU0.PCACHE",
+        sc->memmap[TC27XD_PCACHE0].base, sc->memmap[TC27XD_PCACHE0].size);
+    make_ram(&s->cpu0mem.ptag,   "CPU0.PTAG",
+        sc->memmap[TC27XD_PTAG0].base, sc->memmap[TC27XD_PTAG0].size);
+
+    /*
+     * TriCore QEMU executes CPU0 only, thus it is sufficient to map
+     * LOCAL.PSPR/LOCAL.DSPR exclusively onto PSPR0/DSPR0.
+     */
+    make_alias(&s->psprX, "LOCAL.PSPR", &s->cpu0mem.pspr,
+        sc->memmap[TC27XD_PSPRX].base);
+    make_alias(&s->dsprX, "LOCAL.DSPR", &s->cpu0mem.dspr,
+        sc->memmap[TC27XD_DSPRX].base);
+
+    make_ram(&s->flashmem.pflash0_c, "PF0",
+        sc->memmap[TC27XD_PFLASH0_C].base, sc->memmap[TC27XD_PFLASH0_C].size);
+    make_ram(&s->flashmem.pflash1_c, "PF1",
+        sc->memmap[TC27XD_PFLASH1_C].base, sc->memmap[TC27XD_PFLASH1_C].size);
+    make_ram(&s->flashmem.dflash0,   "DF0",
+        sc->memmap[TC27XD_DFLASH0].base, sc->memmap[TC27XD_DFLASH0].size);
+    make_ram(&s->flashmem.dflash1,   "DF1",
+        sc->memmap[TC27XD_DFLASH1].base, sc->memmap[TC27XD_DFLASH1].size);
+    make_ram(&s->flashmem.olda_c,    "OLDA",
+        sc->memmap[TC27XD_OLDA_C].base, sc->memmap[TC27XD_OLDA_C].size);
+    make_rom(&s->flashmem.brom_c,    "BROM",
+        sc->memmap[TC27XD_BROM_C].base, sc->memmap[TC27XD_BROM_C].size);
+    make_ram(&s->flashmem.lmuram_c,  "LMURAM",
+        sc->memmap[TC27XD_LMURAM_C].base, sc->memmap[TC27XD_LMURAM_C].size);
+    make_ram(&s->flashmem.emem_c,    "EMEM",
+        sc->memmap[TC27XD_EMEM_C].base, sc->memmap[TC27XD_EMEM_C].size);
+
+    make_alias(&s->flashmem.pflash0_u, "PF0.U",    &s->flashmem.pflash0_c,
+        sc->memmap[TC27XD_PFLASH0_U].base);
+    make_alias(&s->flashmem.pflash1_u, "PF1.U",    &s->flashmem.pflash1_c,
+        sc->memmap[TC27XD_PFLASH1_U].base);
+    make_alias(&s->flashmem.olda_u,    "OLDA.U",   &s->flashmem.olda_c,
+        sc->memmap[TC27XD_OLDA_U].base);
+    make_alias(&s->flashmem.brom_u,    "BROM.U",   &s->flashmem.brom_c,
+        sc->memmap[TC27XD_BROM_U].base);
+    make_alias(&s->flashmem.lmuram_u,  "LMURAM.U", &s->flashmem.lmuram_c,
+        sc->memmap[TC27XD_LMURAM_U].base);
+    make_alias(&s->flashmem.emem_u,    "EMEM.U",   &s->flashmem.emem_c,
+        sc->memmap[TC27XD_EMEM_U].base);
+}
+
+static void tc27x_soc_realize(DeviceState *dev_soc, Error **errp)
+{
+    TC27XSoCState *s = TC27X_SOC(dev_soc);
+    Error *err = NULL;
+
+    qdev_realize(DEVICE(&s->cpu), NULL, &err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
+    }
+
+    tc27x_soc_init_memory_mapping(dev_soc);
+}
+
+static void tc27x_soc_init(Object *obj)
+{
+    TC27XSoCState *s = TC27X_SOC(obj);
+    TC27XSoCClass *sc = TC27X_SOC_GET_CLASS(s);
+
+    object_initialize_child(obj, "tc27x", &s->cpu, sc->cpu_type);
+}
+
+static Property tc27x_soc_properties[] = {
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void tc27x_soc_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->realize = tc27x_soc_realize;
+    device_class_set_props(dc, tc27x_soc_properties);
+}
+
+static void tc277d_soc_class_init(ObjectClass *oc, void *data)
+{
+    TC27XSoCClass *sc = TC27X_SOC_CLASS(oc);
+
+    sc->name         = "tc277d-soc";
+    sc->cpu_type     = TRICORE_CPU_TYPE_NAME("tc27x");
+    sc->memmap       = tc27x_soc_memmap;
+    sc->num_cpus     = 1;
+}
+
+static const TypeInfo tc27x_soc_types[] = {
+    {
+        .name          = "tc277d-soc",
+        .parent        = TYPE_TC27X_SOC,
+        .class_init    = tc277d_soc_class_init,
+    }, {
+        .name          = TYPE_TC27X_SOC,
+        .parent        = TYPE_SYS_BUS_DEVICE,
+        .instance_size = sizeof(TC27XSoCState),
+        .instance_init = tc27x_soc_init,
+        .class_size    = sizeof(TC27XSoCClass),
+        .class_init    = tc27x_soc_class_init,
+        .abstract      = true,
+    },
+};
+
+DEFINE_TYPES(tc27x_soc_types)
diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c
new file mode 100644
index 0000000000..16e2fd7e27
--- /dev/null
+++ b/hw/tricore/triboard.c
@@ -0,0 +1,98 @@
+/*
+ * Infineon TriBoard System emulation.
+ *
+ * Copyright (c) 2020 Andreas Konopik <andreas.konopik@efs-auto.de>
+ * Copyright (c) 2020 David Brenken <david.brenken@efs-auto.de>
+ *
+ * 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 "qemu/units.h"
+#include "qapi/error.h"
+#include "hw/qdev-properties.h"
+#include "cpu.h"
+#include "net/net.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
+#include "exec/address-spaces.h"
+#include "elf.h"
+#include "hw/tricore/tricore.h"
+#include "qemu/error-report.h"
+
+#include "hw/tricore/triboard.h"
+#include "hw/tricore/tc27x_soc.h"
+
+static void tricore_load_kernel(const char *kernel_filename)
+{
+    uint64_t entry;
+    long kernel_size;
+    TriCoreCPU *cpu;
+    CPUTriCoreState *env;
+
+    kernel_size = load_elf(kernel_filename, NULL,
+                           NULL, NULL, &entry, NULL,
+                           NULL, NULL, 0,
+                           EM_TRICORE, 1, 0);
+    if (kernel_size <= 0) {
+        error_report("no kernel file '%s'", kernel_filename);
+        exit(1);
+    }
+    cpu = TRICORE_CPU(first_cpu);
+    env = &cpu->env;
+    env->PC = entry;
+}
+
+
+static void triboard_machine_init(MachineState *machine)
+{
+    TriBoardMachineState *ms = TRIBOARD_MACHINE(machine);
+    TriBoardMachineClass *amc = TRIBOARD_MACHINE_GET_CLASS(machine);
+
+    object_initialize_child(OBJECT(machine), "soc", &ms->tc27x_soc,
+            amc->soc_name);
+    sysbus_realize(SYS_BUS_DEVICE(&ms->tc27x_soc), &error_fatal);
+
+    if (machine->kernel_filename) {
+        tricore_load_kernel(machine->kernel_filename);
+    }
+}
+
+static void triboard_machine_tc277d_class_init(ObjectClass *oc,
+        void *data)
+{
+    MachineClass *mc = MACHINE_CLASS(oc);
+    TriBoardMachineClass *amc = TRIBOARD_MACHINE_CLASS(oc);
+
+    mc->init        = triboard_machine_init;
+    mc->desc        = "Infineon AURIX TriBoard TC277 (D-Step)";
+    mc->max_cpus    = 1;
+    amc->soc_name   = "tc277d-soc";
+};
+
+static const TypeInfo triboard_machine_types[] = {
+    {
+        .name           = MACHINE_TYPE_NAME("KIT_AURIX_TC277_TRB"),
+        .parent         = TYPE_TRIBOARD_MACHINE,
+        .class_init     = triboard_machine_tc277d_class_init,
+    }, {
+        .name           = TYPE_TRIBOARD_MACHINE,
+        .parent         = TYPE_MACHINE,
+        .instance_size  = sizeof(TriBoardMachineState),
+        .class_size     = sizeof(TriBoardMachineClass),
+        .abstract       = true,
+    },
+};
+
+DEFINE_TYPES(triboard_machine_types)
diff --git a/include/hw/tricore/tc27x_soc.h b/include/hw/tricore/tc27x_soc.h
new file mode 100644
index 0000000000..6a7e5b54f5
--- /dev/null
+++ b/include/hw/tricore/tc27x_soc.h
@@ -0,0 +1,129 @@
+/*
+ * Infineon tc27x SoC System emulation.
+ *
+ * Copyright (c) 2020 Andreas Konopik <andreas.konopik@efs-auto.de>
+ * Copyright (c) 2020 David Brenken <david.brenken@efs-auto.de>
+ *
+ * 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 TC27X_SoC_H
+#define TC27X_SoC_H
+
+#include "hw/sysbus.h"
+#include "target/tricore/cpu.h"
+#include "qom/object.h"
+
+#define TYPE_TC27X_SOC ("tc27x-soc")
+OBJECT_DECLARE_TYPE(TC27XSoCState, TC27XSoCClass, TC27X_SOC)
+
+typedef struct TC27XSoCCPUMemState {
+
+    MemoryRegion dspr;
+    MemoryRegion pspr;
+
+    MemoryRegion dcache;
+    MemoryRegion dtag;
+    MemoryRegion pcache;
+    MemoryRegion ptag;
+
+} TC27XSoCCPUMemState;
+
+typedef struct TC27XSoCFlashMemState {
+
+    MemoryRegion pflash0_c;
+    MemoryRegion pflash1_c;
+    MemoryRegion pflash0_u;
+    MemoryRegion pflash1_u;
+    MemoryRegion dflash0;
+    MemoryRegion dflash1;
+    MemoryRegion olda_c;
+    MemoryRegion olda_u;
+    MemoryRegion brom_c;
+    MemoryRegion brom_u;
+    MemoryRegion lmuram_c;
+    MemoryRegion lmuram_u;
+    MemoryRegion emem_c;
+    MemoryRegion emem_u;
+
+} TC27XSoCFlashMemState;
+
+typedef struct TC27XSoCState {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    TriCoreCPU cpu;
+
+    MemoryRegion dsprX;
+    MemoryRegion psprX;
+
+    TC27XSoCCPUMemState cpu0mem;
+    TC27XSoCCPUMemState cpu1mem;
+    TC27XSoCCPUMemState cpu2mem;
+
+    TC27XSoCFlashMemState flashmem;
+
+} TC27XSoCState;
+
+typedef struct MemmapEntry {
+    hwaddr base;
+    hwaddr size;
+} MemmapEntry;
+
+typedef struct TC27XSoCClass {
+    DeviceClass parent_class;
+
+    const char *name;
+    const char *cpu_type;
+    const MemmapEntry *memmap;
+    uint32_t num_cpus;
+} TC27XSoCClass;
+
+enum {
+    TC27XD_DSPR2,
+    TC27XD_DCACHE2,
+    TC27XD_DTAG2,
+    TC27XD_PSPR2,
+    TC27XD_PCACHE2,
+    TC27XD_PTAG2,
+    TC27XD_DSPR1,
+    TC27XD_DCACHE1,
+    TC27XD_DTAG1,
+    TC27XD_PSPR1,
+    TC27XD_PCACHE1,
+    TC27XD_PTAG1,
+    TC27XD_DSPR0,
+    TC27XD_PSPR0,
+    TC27XD_PCACHE0,
+    TC27XD_PTAG0,
+    TC27XD_PFLASH0_C,
+    TC27XD_PFLASH1_C,
+    TC27XD_OLDA_C,
+    TC27XD_BROM_C,
+    TC27XD_LMURAM_C,
+    TC27XD_EMEM_C,
+    TC27XD_PFLASH0_U,
+    TC27XD_PFLASH1_U,
+    TC27XD_DFLASH0,
+    TC27XD_DFLASH1,
+    TC27XD_OLDA_U,
+    TC27XD_BROM_U,
+    TC27XD_LMURAM_U,
+    TC27XD_EMEM_U,
+    TC27XD_PSPRX,
+    TC27XD_DSPRX,
+};
+
+#endif
diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h
new file mode 100644
index 0000000000..f3844be447
--- /dev/null
+++ b/include/hw/tricore/triboard.h
@@ -0,0 +1,50 @@
+/*
+ * Infineon TriBoard System emulation.
+ *
+ * Copyright (c) 2020 Andreas Konopik <andreas.konopik@efs-auto.de>
+ * Copyright (c) 2020 David Brenken <david.brenken@efs-auto.de>
+ *
+ * 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 "qapi/error.h"
+#include "hw/boards.h"
+#include "hw/arm/boot.h"
+#include "sysemu/sysemu.h"
+#include "exec/address-spaces.h"
+#include "qom/object.h"
+
+#include "hw/tricore/tc27x_soc.h"
+
+#define TYPE_TRIBOARD_MACHINE MACHINE_TYPE_NAME("triboard")
+typedef struct TriBoardMachineState TriBoardMachineState;
+typedef struct TriBoardMachineClass TriBoardMachineClass;
+DECLARE_OBJ_CHECKERS(TriBoardMachineState, TriBoardMachineClass,
+                     TRIBOARD_MACHINE, TYPE_TRIBOARD_MACHINE)
+
+
+struct TriBoardMachineState {
+    MachineState parent;
+
+    TC27XSoCState tc27x_soc;
+};
+
+struct TriBoardMachineClass {
+    MachineClass parent_obj;
+
+    const char *name;
+    const char *desc;
+    const char *soc_name;
+};
-- 
2.30.0

Re: [PULL 0/1] tricore queue

[Philippe Mathieu-Daudé]

Hi Bastian,

On 2/10/21 10:29 AM, Bastian Koppelmann wrote:
> The following changes since commit 1214d55d1c41fbab3a9973a05085b8760647e411:
> 
>   Merge remote-tracking branch 'remotes/nvme/tags/nvme-next-pull-request' into staging (2021-02-09 13:24:37 +0000)
> 
> are available in the Git repository at:
> 
>   https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20210210
> 
> for you to fetch changes up to 52be63523e80bc92b8192a1e445fe499650085ac:
> 
>   tricore: added triboard with tc27x_soc (2021-02-10 10:26:38 +0100)
> 
> ----------------------------------------------------------------
> added triboard with tc27x_soc

What about this series?

https://www.mail-archive.com/qemu-devel@nongnu.org/msg776774.html

> 
> ----------------------------------------------------------------
> Andreas Konopik (1):
>       tricore: added triboard with tc27x_soc
> 
>  default-configs/devices/tricore-softmmu.mak |   2 +-
>  hw/tricore/Kconfig                          |   8 +
>  hw/tricore/meson.build                      |   2 +
>  hw/tricore/tc27x_soc.c                      | 246 ++++++++++++++++++++++++++++
>  hw/tricore/triboard.c                       |  98 +++++++++++
>  include/hw/tricore/tc27x_soc.h              | 129 +++++++++++++++
>  include/hw/tricore/triboard.h               |  50 ++++++
>  7 files changed, 534 insertions(+), 1 deletion(-)
>  create mode 100644 hw/tricore/tc27x_soc.c
>  create mode 100644 hw/tricore/triboard.c
>  create mode 100644 include/hw/tricore/tc27x_soc.h
>  create mode 100644 include/hw/tricore/triboard.h
> 

Re: [PULL 0/1] tricore queue

[Bastian Koppelmann]

Hi Peter,

On Wed, Feb 10, 2021 at 12:18:57PM +0100, Philippe Mathieu-Daudé wrote:
> Hi Bastian,
> 
> On 2/10/21 10:29 AM, Bastian Koppelmann wrote:
> > The following changes since commit 1214d55d1c41fbab3a9973a05085b8760647e411:
> > 
> >   Merge remote-tracking branch 'remotes/nvme/tags/nvme-next-pull-request' into staging (2021-02-09 13:24:37 +0000)
> > 
> > are available in the Git repository at:
> > 
> >   https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20210210
> > 
> > for you to fetch changes up to 52be63523e80bc92b8192a1e445fe499650085ac:
> > 
> >   tricore: added triboard with tc27x_soc (2021-02-10 10:26:38 +0100)
> > 
> > ----------------------------------------------------------------
> > added triboard with tc27x_soc
> 
> What about this series?
> 
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg776774.html

The patch of this PR was in my queue for a long time so this was the first thing I did. 
I missed Philippes series and just reviewed it now. I also saw 
https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg03467.html. I'll review
that as well and then respin.

Thanks,
Bastian

Re: [PULL 0/1] tricore queue

[Philippe Mathieu-Daudé]

On 2/10/21 1:18 PM, Bastian Koppelmann wrote:
> Hi Peter,
> 
> On Wed, Feb 10, 2021 at 12:18:57PM +0100, Philippe Mathieu-Daudé wrote:
>> Hi Bastian,
>>
>> On 2/10/21 10:29 AM, Bastian Koppelmann wrote:
>>> The following changes since commit 1214d55d1c41fbab3a9973a05085b8760647e411:
>>>
>>>   Merge remote-tracking branch 'remotes/nvme/tags/nvme-next-pull-request' into staging (2021-02-09 13:24:37 +0000)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20210210
>>>
>>> for you to fetch changes up to 52be63523e80bc92b8192a1e445fe499650085ac:
>>>
>>>   tricore: added triboard with tc27x_soc (2021-02-10 10:26:38 +0100)
>>>
>>> ----------------------------------------------------------------
>>> added triboard with tc27x_soc
>>
>> What about this series?
>>
>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg776774.html
> 
> The patch of this PR was in my queue for a long time so this was the first thing I did. 
> I missed Philippes series and just reviewed it now. I also saw 
> https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg03467.html. I'll review
> that as well and then respin.

Thank you Bastian!

RE: [PULL 0/1] tricore queue

[Konopik, Andreas (EFS-GH2)]

Hi Bastian,

sorry for the late reply.

On Wed, 2 Sep 2020 at 14:56, Bastian Koppelmann
<kbastian@mail.uni-paderborn.de> wrote:
> On Tue, Sep 01, 2020 at 03:18:40PM +0100, Peter Maydell wrote:
> > On Tue, 1 Sep 2020 at 10:59, Bastian Koppelmann
> > <kbastian@mail.uni-paderborn.de> wrote:
> > >
> > > The following changes since commit
> 2f4c51c0f384d7888a04b4815861e6d5fd244d75:
> > >
> > >   Merge remote-tracking branch
> > > 'remotes/kraxel/tags/usb-20200831-pull-request' into staging
> > > (2020-08-31 19:39:13 +0100)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20200901
> > >
> > > for you to fetch changes up to
> 2c15af48abb71b3cddadd63c5bb416b250f53fef:
> > >
> > >   tricore: added triboard with tc27x_soc (2020-09-01 11:54:11 +0200)
> > >
> > > ----------------------------------------------------------------
> > > Add the Infineon Aurix D-Step board
> > >
> > > ----------------------------------------------------------------
> > > Andreas Konopik (1):
> > >       tricore: added triboard with tc27x_soc
> >
> > This fails "make check" (all platforms):
> >
> > OSX fails like this:
> >
> > MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
> > QTEST_QEMU_IMG=./qemu-img
> > G_TEST_DBUS_DAEMON=/Users/pm215/src/qemu-for-merges/tests/dbus-
> vmstate
> > -daemon.sh QTEST_QEMU_BINARY=./qemu-system-tricore
> > tests/qtest/device-introspect-test --tap -k PASS 1 qtest-tricore:
> > device-introspect-test /tricore/device/introspect/list PASS 2
> > qtest-tricore: device-introspect-test
> > /tricore/device/introspect/list-fields
> > PASS 3 qtest-tricore: device-introspect-test
> > /tricore/device/introspect/none PASS 4 qtest-tricore:
> > device-introspect-test /tricore/device/introspect/abstract
> > PASS 5 qtest-tricore: device-introspect-test
> > /tricore/device/introspect/abstract-interfaces
> > RAMBlock "CPU0.DSPR" already registered, abort!
> > Broken pipe
> > ../../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from
> > signal 6 (Abort trap: 6) ERROR qtest-tricore: device-introspect-test -
> > too few tests run (expected 6, got 5)
> > make: *** [Makefile.mtest:1429: check-qtest] Error 1
> 
> This patch seems to fix this problem.
> 
> diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c index
> 4f28e39c8c..2c7aa8e901 100644
> --- a/hw/tricore/tc27x_soc.c
> +++ b/hw/tricore/tc27x_soc.c
> @@ -100,9 +100,9 @@ static void make_alias(MemoryRegion *mr, const char
> *name,
>      memory_region_add_subregion(get_system_memory(), base, mr);  }
> 
> -static void tc27x_soc_init_memory_mapping(Object *obj)
> +static void tc27x_soc_init_memory_mapping(DeviceState *dev_soc)
>  {
> -    TC27XSoCState *s = TC27X_SOC(obj);
> +    TC27XSoCState *s = TC27X_SOC(dev_soc);
>      TC27XSoCClass *sc = TC27X_SOC_GET_CLASS(s);
> 
>      make_ram(&s->cpu0mem.dspr, "CPU0.DSPR", @@ -192,6 +192,7 @@ static
> void tc27x_soc_realize(DeviceState *dev_soc, Error **errp)
>          error_propagate(errp, err);
>          return;
>      }
> +    tc27x_soc_init_memory_mapping(dev_soc);
>  }
> 
>  static void tc27x_soc_init(Object *obj) @@ -201,7 +202,6 @@ static void
> tc27x_soc_init(Object *obj)
> 
>      object_initialize_child(obj, "tc27x", &s->cpu, sc->cpu_type);
> 
> -    tc27x_soc_init_memory_mapping(obj);
>  }
> 
> However, it just leads to the next one:
> 
> Running test qtest-tricore: device-introspect-test Running test qtest-tricore:
> machine-none-test Running test qtest-tricore: qmp-test Running test qtest-
> tricore: qmp-cmd-test Running test qtest-tricore: qom-test Bad address
> qemu-system-tricore: no kernel file '(null)'
> Broken pipe
> ../tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but
> encountered exit status 1 (expected 0) ERROR qtest-tricore: qom-test - too few
> tests run (expected 3, got 1)
> 
> Andreas, can you look into this?

I looked multiple times into this problem. With trial and error I found a working
patch today. I also included Thomas Huths suggestions regarding KConfig and
meson.build
(https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg00867.html),
so feel free to modify. I will send the patch as soon as possible.
 
> Thanks,
> Bastian

Kind regards,

Andreas

Re: [PULL 0/1] tricore queue

[Bastian Koppelmann]

On Tue, Sep 01, 2020 at 03:18:40PM +0100, Peter Maydell wrote:
> On Tue, 1 Sep 2020 at 10:59, Bastian Koppelmann
> <kbastian@mail.uni-paderborn.de> wrote:
> >
> > The following changes since commit 2f4c51c0f384d7888a04b4815861e6d5fd244d75:
> >
> >   Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200831-pull-request' into staging (2020-08-31 19:39:13 +0100)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20200901
> >
> > for you to fetch changes up to 2c15af48abb71b3cddadd63c5bb416b250f53fef:
> >
> >   tricore: added triboard with tc27x_soc (2020-09-01 11:54:11 +0200)
> >
> > ----------------------------------------------------------------
> > Add the Infineon Aurix D-Step board
> >
> > ----------------------------------------------------------------
> > Andreas Konopik (1):
> >       tricore: added triboard with tc27x_soc
> 
> This fails "make check" (all platforms):
> 
> OSX fails like this:
> 
> MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
> QTEST_QEMU_IMG=./qemu-img
> G_TEST_DBUS_DAEMON=/Users/pm215/src/qemu-for-merges/tests/dbus-vmstate-daemon.sh
> QTEST_QEMU_BINARY=./qemu-system-tricore
> tests/qtest/device-introspect-test --tap -k
> PASS 1 qtest-tricore: device-introspect-test /tricore/device/introspect/list
> PASS 2 qtest-tricore: device-introspect-test
> /tricore/device/introspect/list-fields
> PASS 3 qtest-tricore: device-introspect-test /tricore/device/introspect/none
> PASS 4 qtest-tricore: device-introspect-test /tricore/device/introspect/abstract
> PASS 5 qtest-tricore: device-introspect-test
> /tricore/device/introspect/abstract-interfaces
> RAMBlock "CPU0.DSPR" already registered, abort!
> Broken pipe
> ../../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from
> signal 6 (Abort trap: 6)
> ERROR qtest-tricore: device-introspect-test - too few tests run
> (expected 6, got 5)
> make: *** [Makefile.mtest:1429: check-qtest] Error 1

This patch seems to fix this problem. 

diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c
index 4f28e39c8c..2c7aa8e901 100644
--- a/hw/tricore/tc27x_soc.c
+++ b/hw/tricore/tc27x_soc.c
@@ -100,9 +100,9 @@ static void make_alias(MemoryRegion *mr, const char *name,
     memory_region_add_subregion(get_system_memory(), base, mr);
 }
 
-static void tc27x_soc_init_memory_mapping(Object *obj)
+static void tc27x_soc_init_memory_mapping(DeviceState *dev_soc)
 {
-    TC27XSoCState *s = TC27X_SOC(obj);
+    TC27XSoCState *s = TC27X_SOC(dev_soc);
     TC27XSoCClass *sc = TC27X_SOC_GET_CLASS(s);
 
     make_ram(&s->cpu0mem.dspr, "CPU0.DSPR",
@@ -192,6 +192,7 @@ static void tc27x_soc_realize(DeviceState *dev_soc, Error **errp)
         error_propagate(errp, err);
         return;
     }
+    tc27x_soc_init_memory_mapping(dev_soc);
 }
 
 static void tc27x_soc_init(Object *obj)
@@ -201,7 +202,6 @@ static void tc27x_soc_init(Object *obj)
 
     object_initialize_child(obj, "tc27x", &s->cpu, sc->cpu_type);
 
-    tc27x_soc_init_memory_mapping(obj);
 }

However, it just leads to the next one:

Running test qtest-tricore: device-introspect-test
Running test qtest-tricore: machine-none-test
Running test qtest-tricore: qmp-test
Running test qtest-tricore: qmp-cmd-test
Running test qtest-tricore: qom-test
Bad address
qemu-system-tricore: no kernel file '(null)'
Broken pipe
../tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR qtest-tricore: qom-test - too few tests run (expected 3, got 1)

Andreas, can you look into this?

Thanks,
Bastian

Re: [PULL 0/1] tricore queue

[Peter Maydell]

On Tue, 1 Sep 2020 at 10:59, Bastian Koppelmann
<kbastian@mail.uni-paderborn.de> wrote:
>
> The following changes since commit 2f4c51c0f384d7888a04b4815861e6d5fd244d75:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200831-pull-request' into staging (2020-08-31 19:39:13 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20200901
>
> for you to fetch changes up to 2c15af48abb71b3cddadd63c5bb416b250f53fef:
>
>   tricore: added triboard with tc27x_soc (2020-09-01 11:54:11 +0200)
>
> ----------------------------------------------------------------
> Add the Infineon Aurix D-Step board
>
> ----------------------------------------------------------------
> Andreas Konopik (1):
>       tricore: added triboard with tc27x_soc

This fails "make check" (all platforms):

OSX fails like this:

MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_IMG=./qemu-img
G_TEST_DBUS_DAEMON=/Users/pm215/src/qemu-for-merges/tests/dbus-vmstate-daemon.sh
QTEST_QEMU_BINARY=./qemu-system-tricore
tests/qtest/device-introspect-test --tap -k
PASS 1 qtest-tricore: device-introspect-test /tricore/device/introspect/list
PASS 2 qtest-tricore: device-introspect-test
/tricore/device/introspect/list-fields
PASS 3 qtest-tricore: device-introspect-test /tricore/device/introspect/none
PASS 4 qtest-tricore: device-introspect-test /tricore/device/introspect/abstract
PASS 5 qtest-tricore: device-introspect-test
/tricore/device/introspect/abstract-interfaces
RAMBlock "CPU0.DSPR" already registered, abort!
Broken pipe
../../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from
signal 6 (Abort trap: 6)
ERROR qtest-tricore: device-introspect-test - too few tests run
(expected 6, got 5)
make: *** [Makefile.mtest:1429: check-qtest] Error 1

others like this:

MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_IMG=./qemu-img
G_TEST_DBUS_DAEMON=/home/pm/qemu/tests/dbus-vmstate-daemon.sh
QTEST_QEMU_BINARY=./qemu-system-tricore
tests/qtest/device-introspect-test --tap -k
PASS 1 qtest-tricore: device-introspect-test /tricore/device/introspect/list
PASS 2 qtest-tricore: device-introspect-test
/tricore/device/introspect/list-fields
PASS 3 qtest-tricore: device-introspect-test /tricore/device/introspect/none
PASS 4 qtest-tricore: device-introspect-test /tricore/device/introspect/abstract
PASS 5 qtest-tricore: device-introspect-test
/tricore/device/introspect/abstract-interfaces
Broken pipe
../../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from
signal 11 (Segmentation fault)
Aborted
ERROR qtest-tricore: device-introspect-test - too few tests run
(expected 6, got 5)

thanks
-- PMM

[PULL 0/1] tricore queue

[Bastian Koppelmann]

The following changes since commit 2f4c51c0f384d7888a04b4815861e6d5fd244d75:

  Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200831-pull-request' into staging (2020-08-31 19:39:13 +0100)

are available in the Git repository at:

  https://github.com/bkoppelmann/qemu.git tags/pull-tricore-20200901

for you to fetch changes up to 2c15af48abb71b3cddadd63c5bb416b250f53fef:

  tricore: added triboard with tc27x_soc (2020-09-01 11:54:11 +0200)

----------------------------------------------------------------
Add the Infineon Aurix D-Step board

----------------------------------------------------------------
Andreas Konopik (1):
      tricore: added triboard with tc27x_soc

 hw/tricore/Kconfig             |   8 ++
 hw/tricore/meson.build         |   2 +
 hw/tricore/tc27x_soc.c         | 246 +++++++++++++++++++++++++++++++++++++++++
 hw/tricore/triboard.c          | 102 +++++++++++++++++
 include/hw/tricore/tc27x_soc.h | 139 +++++++++++++++++++++++
 include/hw/tricore/triboard.h  |  53 +++++++++
 6 files changed, 550 insertions(+)
 create mode 100644 hw/tricore/tc27x_soc.c
 create mode 100644 hw/tricore/triboard.c
 create mode 100644 include/hw/tricore/tc27x_soc.h
 create mode 100644 include/hw/tricore/triboard.h