[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/10] arm: allwinner-h3: add CPU Configuration module
|
From: |
Niek Linnenbank |
|
Subject: |
[PATCH 07/10] arm: allwinner-h3: add CPU Configuration module |
|
Date: |
Mon, 2 Dec 2019 22:09:44 +0100 |
The Allwinner H3 System on Chip design contains four ARM Cortex A7
processors that can be configured and reset using the CPU Configuration
module interface. This commit adds support for the CPU configuration
interface which emulates the following features:
* CPU reset
* Shared 64-bit timer
Signed-off-by: Niek Linnenbank <address@hidden>
---
hw/arm/allwinner-h3.c | 11 +
hw/misc/Makefile.objs | 1 +
hw/misc/allwinner-h3-cpucfg.c | 280 ++++++++++++++++++++++++++
include/hw/arm/allwinner-h3.h | 2 +
include/hw/misc/allwinner-h3-cpucfg.h | 44 ++++
5 files changed, 338 insertions(+)
create mode 100644 hw/misc/allwinner-h3-cpucfg.c
create mode 100644 include/hw/misc/allwinner-h3-cpucfg.h
diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index ebd8fde412..44aba1de6a 100644
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -44,6 +44,9 @@ static void aw_h3_init(Object *obj)
sysbus_init_child_obj(obj, "syscon", &s->syscon, sizeof(s->syscon),
TYPE_AW_H3_SYSCON);
+
+ sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, sizeof(s->cpucfg),
+ TYPE_AW_H3_CPUCFG);
}
static void aw_h3_realize(DeviceState *dev, Error **errp)
@@ -195,6 +198,14 @@ static void aw_h3_realize(DeviceState *dev, Error **errp)
}
sysbus_mmio_map(SYS_BUS_DEVICE(&s->syscon), 0, AW_H3_SYSCON_BASE);
+ /* CPU Configuration */
+ object_property_set_bool(OBJECT(&s->cpucfg), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, AW_H3_CPUCFG_BASE);
+
/* Universal Serial Bus */
sysbus_create_simple(TYPE_AW_H3_EHCI, AW_H3_EHCI0_BASE,
s->irq[AW_H3_GIC_SPI_EHCI0]);
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index b234aefba5..c4ca2ed689 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -29,6 +29,7 @@ common-obj-$(CONFIG_MACIO) += macio/
common-obj-$(CONFIG_IVSHMEM_DEVICE) += ivshmem.o
common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-clk.o
+obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-cpucfg.o
common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-syscon.o
common-obj-$(CONFIG_REALVIEW) += arm_sysctl.o
common-obj-$(CONFIG_NSERIES) += cbus.o
diff --git a/hw/misc/allwinner-h3-cpucfg.c b/hw/misc/allwinner-h3-cpucfg.c
new file mode 100644
index 0000000000..b47feebd73
--- /dev/null
+++ b/hw/misc/allwinner-h3-cpucfg.c
@@ -0,0 +1,280 @@
+/*
+ * Allwinner H3 CPU Configuration Module emulation
+ *
+ * Copyright (C) 2019 Niek Linnenbank <address@hidden>
+ *
+ * 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/>.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/sysbus.h"
+#include "migration/vmstate.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "qemu/error-report.h"
+#include "qemu/timer.h"
+#include "hw/core/cpu.h"
+#include "arm-powerctl.h"
+#include "hw/misc/allwinner-h3-cpucfg.h"
+#include "trace.h"
+
+/* CPUCFG register offsets */
+#define REG_CPUS_RST_CTRL (0x0000) /* CPUs Reset Control */
+#define REG_CPU0_RST_CTRL (0x0040) /* CPU#0 Reset Control */
+#define REG_CPU0_CTRL (0x0044) /* CPU#0 Control */
+#define REG_CPU0_STATUS (0x0048) /* CPU#0 Status */
+#define REG_CPU1_RST_CTRL (0x0080) /* CPU#1 Reset Control */
+#define REG_CPU1_CTRL (0x0084) /* CPU#1 Control */
+#define REG_CPU1_STATUS (0x0088) /* CPU#1 Status */
+#define REG_CPU2_RST_CTRL (0x00C0) /* CPU#2 Reset Control */
+#define REG_CPU2_CTRL (0x00C4) /* CPU#2 Control */
+#define REG_CPU2_STATUS (0x00C8) /* CPU#2 Status */
+#define REG_CPU3_RST_CTRL (0x0100) /* CPU#3 Reset Control */
+#define REG_CPU3_CTRL (0x0104) /* CPU#3 Control */
+#define REG_CPU3_STATUS (0x0108) /* CPU#3 Status */
+#define REG_CPU_SYS_RST (0x0140) /* CPU System Reset */
+#define REG_CLK_GATING (0x0144) /* CPU Clock Gating */
+#define REG_GEN_CTRL (0x0184) /* General Control */
+#define REG_SUPER_STANDBY (0x01A0) /* Super Standby Flag */
+#define REG_ENTRY_ADDR (0x01A4) /* Reset Entry Address */
+#define REG_DBG_EXTERN (0x01E4) /* Debug External */
+#define REG_CNT64_CTRL (0x0280) /* 64-bit Counter Control */
+#define REG_CNT64_LOW (0x0284) /* 64-bit Counter Low */
+#define REG_CNT64_HIGH (0x0288) /* 64-bit Counter High */
+
+/* CPUCFG register flags */
+#define CPUX_RESET_RELEASED ((1 << 1) | (1 << 0))
+#define CPUX_STATUS_SMP (1 << 0)
+#define CPU_SYS_RESET_RELEASED (1 << 0)
+#define CLK_GATING_ENABLE ((1 << 8) | 0xF)
+
+/* CPUCFG register reset values */
+#define REG_CLK_GATING_RST (0x0000010F)
+#define REG_GEN_CTRL_RST (0x00000020)
+#define REG_SUPER_STANDBY_RST (0x0)
+#define REG_CNT64_CTRL_RST (0x0)
+
+static void allwinner_h3_cpucfg_cpu_reset(AwH3CpuCfgState *s, uint8_t cpu_id)
+{
+ int ret;
+
+ trace_allwinner_h3_cpucfg_cpu_reset(cpu_id, s->entry_addr);
+
+ ret = arm_set_cpu_on(cpu_id, s->entry_addr, 0, 3, false);
+ if (ret != QEMU_ARM_POWERCTL_RET_SUCCESS) {
+ error_report("%s: failed to bring up CPU %d: err %d",
+ __func__, cpu_id, ret);
+ return;
+ }
+}
+
+static uint64_t allwinner_h3_cpucfg_read(void *opaque, hwaddr offset,
+ unsigned size)
+{
+ const AwH3CpuCfgState *s = (AwH3CpuCfgState *)opaque;
+ uint64_t val = 0;
+
+ switch (offset) {
+ case REG_CPUS_RST_CTRL: /* CPUs Reset Control */
+ case REG_CPU_SYS_RST: /* CPU System Reset */
+ val = CPU_SYS_RESET_RELEASED;
+ break;
+ case REG_CPU0_RST_CTRL: /* CPU#0 Reset Control */
+ case REG_CPU1_RST_CTRL: /* CPU#1 Reset Control */
+ case REG_CPU2_RST_CTRL: /* CPU#2 Reset Control */
+ case REG_CPU3_RST_CTRL: /* CPU#3 Reset Control */
+ val = CPUX_RESET_RELEASED;
+ break;
+ case REG_CPU0_CTRL: /* CPU#0 Control */
+ case REG_CPU1_CTRL: /* CPU#1 Control */
+ case REG_CPU2_CTRL: /* CPU#2 Control */
+ case REG_CPU3_CTRL: /* CPU#3 Control */
+ val = 0;
+ break;
+ case REG_CPU0_STATUS: /* CPU#0 Status */
+ case REG_CPU1_STATUS: /* CPU#1 Status */
+ case REG_CPU2_STATUS: /* CPU#2 Status */
+ case REG_CPU3_STATUS: /* CPU#3 Status */
+ val = CPUX_STATUS_SMP;
+ break;
+ case REG_CLK_GATING: /* CPU Clock Gating */
+ val = CLK_GATING_ENABLE;
+ break;
+ case REG_GEN_CTRL: /* General Control */
+ val = s->gen_ctrl;
+ break;
+ case REG_SUPER_STANDBY: /* Super Standby Flag */
+ val = s->super_standby;
+ break;
+ case REG_ENTRY_ADDR: /* Reset Entry Address */
+ val = s->entry_addr;
+ break;
+ case REG_DBG_EXTERN: /* Debug External */
+ break;
+ case REG_CNT64_CTRL: /* 64-bit Counter Control */
+ val = s->counter_ctrl;
+ break;
+ case REG_CNT64_LOW: /* 64-bit Counter Low */
+ val = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) & 0xffffffff;
+ break;
+ case REG_CNT64_HIGH: /* 64-bit Counter High */
+ val = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 32;
+ break;
+ default:
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: bad read offset 0x%04x\n",
+ __func__, (uint32_t)offset);
+ return 0;
+ }
+
+ trace_allwinner_h3_cpucfg_read(offset, val, size);
+
+ return val;
+}
+
+static void allwinner_h3_cpucfg_write(void *opaque, hwaddr offset,
+ uint64_t val, unsigned size)
+{
+ AwH3CpuCfgState *s = (AwH3CpuCfgState *)opaque;
+
+ trace_allwinner_h3_cpucfg_write(offset, val, size);
+
+ switch (offset) {
+ case REG_CPUS_RST_CTRL: /* CPUs Reset Control */
+ case REG_CPU_SYS_RST: /* CPU System Reset */
+ break;
+ case REG_CPU0_RST_CTRL: /* CPU#0 Reset Control */
+ if (val) {
+ allwinner_h3_cpucfg_cpu_reset(s, 0);
+ }
+ break;
+ case REG_CPU1_RST_CTRL: /* CPU#1 Reset Control */
+ if (val) {
+ allwinner_h3_cpucfg_cpu_reset(s, 1);
+ }
+ break;
+ case REG_CPU2_RST_CTRL: /* CPU#2 Reset Control */
+ if (val) {
+ allwinner_h3_cpucfg_cpu_reset(s, 2);
+ }
+ break;
+ case REG_CPU3_RST_CTRL: /* CPU#3 Reset Control */
+ if (val) {
+ allwinner_h3_cpucfg_cpu_reset(s, 3);
+ }
+ break;
+ case REG_CPU0_CTRL: /* CPU#0 Control */
+ case REG_CPU1_CTRL: /* CPU#1 Control */
+ case REG_CPU2_CTRL: /* CPU#2 Control */
+ case REG_CPU3_CTRL: /* CPU#3 Control */
+ case REG_CPU0_STATUS: /* CPU#0 Status */
+ case REG_CPU1_STATUS: /* CPU#1 Status */
+ case REG_CPU2_STATUS: /* CPU#2 Status */
+ case REG_CPU3_STATUS: /* CPU#3 Status */
+ case REG_CLK_GATING: /* CPU Clock Gating */
+ case REG_GEN_CTRL: /* General Control */
+ s->gen_ctrl = val;
+ break;
+ case REG_SUPER_STANDBY: /* Super Standby Flag */
+ s->super_standby = val;
+ break;
+ case REG_ENTRY_ADDR: /* Reset Entry Address */
+ s->entry_addr = val;
+ break;
+ case REG_DBG_EXTERN: /* Debug External */
+ break;
+ case REG_CNT64_CTRL: /* 64-bit Counter Control */
+ s->counter_ctrl = val;
+ break;
+ case REG_CNT64_LOW: /* 64-bit Counter Low */
+ case REG_CNT64_HIGH: /* 64-bit Counter High */
+ break;
+ default:
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: bad write offset 0x%04x\n",
+ __func__, (uint32_t)offset);
+ return;
+ }
+}
+
+static const MemoryRegionOps allwinner_h3_cpucfg_ops = {
+ .read = allwinner_h3_cpucfg_read,
+ .write = allwinner_h3_cpucfg_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ .unaligned = false
+ }
+};
+
+static void allwinner_h3_cpucfg_reset(DeviceState *dev)
+{
+ AwH3CpuCfgState *s = AW_H3_CPUCFG(dev);
+
+ /* Set default values for registers */
+ s->gen_ctrl = REG_GEN_CTRL_RST;
+ s->super_standby = REG_SUPER_STANDBY_RST;
+ s->entry_addr = 0;
+ s->counter_ctrl = REG_CNT64_CTRL_RST;
+}
+
+static void allwinner_h3_cpucfg_realize(DeviceState *dev, Error **errp)
+{
+}
+
+static void allwinner_h3_cpucfg_init(Object *obj)
+{
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+ AwH3CpuCfgState *s = AW_H3_CPUCFG(obj);
+
+ /* Memory mapping */
+ memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_h3_cpucfg_ops, s,
+ TYPE_AW_H3_CPUCFG, AW_H3_CPUCFG_REGS_MEM_SIZE);
+ sysbus_init_mmio(sbd, &s->iomem);
+}
+
+static const VMStateDescription allwinner_h3_cpucfg_vmstate = {
+ .name = TYPE_AW_H3_CPUCFG,
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(gen_ctrl, AwH3CpuCfgState),
+ VMSTATE_UINT32(super_standby, AwH3CpuCfgState),
+ VMSTATE_UINT32(counter_ctrl, AwH3CpuCfgState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void allwinner_h3_cpucfg_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->reset = allwinner_h3_cpucfg_reset;
+ dc->realize = allwinner_h3_cpucfg_realize;
+ dc->vmsd = &allwinner_h3_cpucfg_vmstate;
+}
+
+static const TypeInfo allwinner_h3_cpucfg_info = {
+ .name = TYPE_AW_H3_CPUCFG,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_init = allwinner_h3_cpucfg_init,
+ .instance_size = sizeof(AwH3CpuCfgState),
+ .class_init = allwinner_h3_cpucfg_class_init,
+};
+
+static void allwinner_h3_cpucfg_register(void)
+{
+ type_register_static(&allwinner_h3_cpucfg_info);
+}
+
+type_init(allwinner_h3_cpucfg_register)
diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h
index 2bc526b77b..374061b550 100644
--- a/include/hw/arm/allwinner-h3.h
+++ b/include/hw/arm/allwinner-h3.h
@@ -27,6 +27,7 @@
#include "hw/timer/allwinner-a10-pit.h"
#include "hw/intc/arm_gic.h"
#include "hw/misc/allwinner-h3-clk.h"
+#include "hw/misc/allwinner-h3-cpucfg.h"
#include "hw/misc/allwinner-h3-syscon.h"
#include "target/arm/cpu.h"
@@ -112,6 +113,7 @@ typedef struct AwH3State {
qemu_irq irq[AW_H3_GIC_NUM_SPI];
AwA10PITState timer;
AwH3ClockState ccu;
+ AwH3CpuCfgState cpucfg;
AwH3SysconState syscon;
GICState gic;
MemoryRegion sram_a1;
diff --git a/include/hw/misc/allwinner-h3-cpucfg.h
b/include/hw/misc/allwinner-h3-cpucfg.h
new file mode 100644
index 0000000000..808aaa90f6
--- /dev/null
+++ b/include/hw/misc/allwinner-h3-cpucfg.h
@@ -0,0 +1,44 @@
+/*
+ * Allwinner H3 CPU Configuration Module emulation
+ *
+ * Copyright (C) 2019 Niek Linnenbank <address@hidden>
+ *
+ * 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_MISC_ALLWINNER_H3_CPUCFG_H
+#define HW_MISC_ALLWINNER_H3_CPUCFG_H
+
+#include "hw/sysbus.h"
+
+#define AW_H3_CPUCFG_REGS_MEM_SIZE (1024)
+
+#define TYPE_AW_H3_CPUCFG "allwinner-h3-cpucfg"
+#define AW_H3_CPUCFG(obj) OBJECT_CHECK(AwH3CpuCfgState, (obj), \
+ TYPE_AW_H3_CPUCFG)
+
+typedef struct AwH3CpuCfgState {
+ /*< private >*/
+ SysBusDevice parent_obj;
+ /*< public >*/
+
+ MemoryRegion iomem;
+ uint32_t gen_ctrl;
+ uint32_t super_standby;
+ uint32_t entry_addr;
+ uint32_t counter_ctrl;
+
+} AwH3CpuCfgState;
+
+#endif
--
2.17.1