[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 04/21] hw/mips/cps: create GCR block inside CPS
From: |
Leon Alrae |
Subject: |
[Qemu-devel] [PULL v2 04/21] hw/mips/cps: create GCR block inside CPS |
Date: |
Wed, 30 Mar 2016 09:49:45 +0100 |
Signed-off-by: Leon Alrae <address@hidden>
---
hw/mips/cps.c | 23 +++++++++++++++++++++++
include/hw/mips/cps.h | 2 ++
2 files changed, 25 insertions(+)
diff --git a/hw/mips/cps.c b/hw/mips/cps.c
index a74df46..e77b1da 100644
--- a/hw/mips/cps.c
+++ b/hw/mips/cps.c
@@ -62,6 +62,8 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
CPUMIPSState *env;
MIPSCPU *cpu;
int i;
+ Error *err = NULL;
+ target_ulong gcr_base;
for (i = 0; i < s->num_vp; i++) {
cpu = cpu_mips_init(s->cpu_model);
@@ -76,6 +78,27 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
cpu_mips_clock_init(env);
qemu_register_reset(main_cpu_reset, cpu);
}
+
+ cpu = MIPS_CPU(first_cpu);
+ env = &cpu->env;
+
+ /* Global Configuration Registers */
+ gcr_base = env->CP0_CMGCRBase << 4;
+
+ object_initialize(&s->gcr, sizeof(s->gcr), TYPE_MIPS_GCR);
+ qdev_set_parent_bus(DEVICE(&s->gcr), sysbus_get_default());
+
+ object_property_set_int(OBJECT(&s->gcr), s->num_vp, "num-vp", &err);
+ object_property_set_int(OBJECT(&s->gcr), 0x800, "gcr-rev", &err);
+ object_property_set_int(OBJECT(&s->gcr), gcr_base, "gcr-base", &err);
+ object_property_set_bool(OBJECT(&s->gcr), true, "realized", &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ memory_region_add_subregion(&s->container, gcr_base,
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gcr),
0));
}
static Property mips_cps_properties[] = {
diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h
index fb3528a..1b200d6 100644
--- a/include/hw/mips/cps.h
+++ b/include/hw/mips/cps.h
@@ -21,6 +21,7 @@
#define MIPS_CPS_H
#include "hw/sysbus.h"
+#include "hw/misc/mips_cmgcr.h"
#define TYPE_MIPS_CPS "mips-cps"
#define MIPS_CPS(obj) OBJECT_CHECK(MIPSCPSState, (obj), TYPE_MIPS_CPS)
@@ -33,6 +34,7 @@ typedef struct MIPSCPSState {
char *cpu_model;
MemoryRegion container;
+ MIPSGCRState gcr;
} MIPSCPSState;
qemu_irq get_cps_irq(MIPSCPSState *cps, int pin_number);
--
2.1.0
- [Qemu-devel] [PULL v2 00/21] target-mips queue for 2.6, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 02/21] target-mips: add CMGCRBase register, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 05/21] hw/mips: add initial Cluster Power Controller support, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 10/21] hw/mips_malta: add CPS to Malta board, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 04/21] hw/mips/cps: create GCR block inside CPS,
Leon Alrae <=
- [Qemu-devel] [PULL v2 13/21] hw/mips: implement ITC Storage - Control View, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 01/21] hw/mips: implement generic MIPS Coherent Processing System container, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 03/21] hw/mips: add initial Global Config Register support, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 06/21] hw/mips/cps: create CPC block inside CPS, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 09/21] hw/mips_malta: move CPU creation to a separate function, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 16/21] hw/mips: implement ITC Storage - Bypass View, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 11/21] target-mips: enable CM GCR in MIPS64R6-generic CPU, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 12/21] hw/mips: implement ITC Configuration Tags and Storage Cells, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 19/21] hw/mips/cps: enable ITU for multithreading processors, Leon Alrae, 2016/03/30
- [Qemu-devel] [PULL v2 20/21] target-mips: use CP0_CHECK for gen_m{f|t}hc0, Leon Alrae, 2016/03/30