From nobody Thu May 8 00:16:18 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1584031890; cv=none;
d=zohomail.com; s=zohoarc;
b=JHlTFYzVmS0k6cKB3OkDOiqETATVVj04J9JlBSsaw+KTk65M68/wyghpPPwZkA4j0r+U52NF3g5GM2itEjv+rhada9GbagSgprqpW4EHr0e/FbNkU53buLGbJffiA3orU/CZKhGKME/29EvQOWpmS66IvzEQrVqeyA01nsALBL4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1584031890;
h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=78jazQtF+RQHW96LIyEOH/mPjBtNV9tWgWuJ9A/+O8o=;
b=SedL+vd7Ed4lN55UZ2Puc6t+Kl2DhAn+TktuQoNwtXmpfwxD2dEGICV0MVZNcBxlAyMVvM78txQgtp5PbyaRO0if64E5bQGdwafF82sHAh8MWxsUzNfFJLAJLuIR8djwbk4JqZI5xO3q48Fox8h4ElFCi96zx7JCuVFL3KXx7Wc=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1584031890079973.4064768524742;
Thu, 12 Mar 2020 09:51:30 -0700 (PDT)
Received: from localhost ([::1]:45490 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1jCR3Q-00066Q-M5
for importer@patchew.org; Thu, 12 Mar 2020 12:51:28 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:35718)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <peter.maydell@linaro.org>) id 1jCQxY-00009Z-7x
for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1jCQxW-0005A1-1d
for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:24 -0400
Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:35241)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1jCQxV-00059m-Py
for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:21 -0400
Received: by mail-wm1-x336.google.com with SMTP id m3so7126356wmi.0
for <qemu-devel@nongnu.org>; Thu, 12 Mar 2020 09:45:21 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j15sm36838640wrp.85.2020.03.12.09.45.19
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 12 Mar 2020 09:45:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=78jazQtF+RQHW96LIyEOH/mPjBtNV9tWgWuJ9A/+O8o=;
b=VL9pFigFD1Wg7GVHt6PNQA4S4jaxUQhyN76sKuOfSCtAOOY7plFmVUmeinnlviFNq5
EnpV7w95KPKAcNiQC8VJS7lxL8E4HyTc8n6XUuunp59d+kFCgf1kEx2/DSKQbGvg8VAA
YKx8DF4ErylOAFO4yeDJVD82amLBhvD4t0wM10LS9Mhc+JveSV8FhuqBdYm/+HmFsx+W
sEpIUX6vSIIrWvqLSvoacPR8WxCpCYC14RhaH+C2C/MNWVq+umjsxSXBwHhhNABAWe7I
WckIrMcUSK6gsv88yvGKhU/wrv/xEmWgz/7SS0CPQRKNkf72ThycPSyEEKjRucUhsGx4
iH9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=78jazQtF+RQHW96LIyEOH/mPjBtNV9tWgWuJ9A/+O8o=;
b=O9ikx9xDjck/kWnTgQ49KEah1cjScSH58AakaZzr3uyEUS9EvxdZyTsxgvgFFVblpV
6diA5K7fDbz+QMZEyPef0D9pPS33E5RMDFUEvqqK5U15/h+HnPw234gINpP217B3qrjL
O6gl5RKL2EE4mE97+kbV5leK+yGxKujeFMolM9FNO29b1R7ztv5g/K0gMyTzWUV+Zs/x
vsKwie5rtMz6umRplzecNO5DGrXXxriIuVJUeu08R1lZsPbucaJ69hGsil8zT559racs
RQRxJdggYDmA0otuAT2tlKiL1pPM63MRSjBrN0aB4Z1QcVY7wVy6wyFfMkXSTd0nneu5
+6HQ==
X-Gm-Message-State: ANhLgQ3G4S9on014lw6YykCTdXqlngO7s4wkUop5TzCAHRSiX7VDsKY9
WvB1m45K8M3iVDqUN0Z/HJVOUoxy3HV1Ew==
X-Google-Smtp-Source:
ADFU+vsP103tZ6OyLNNr/Ii98cblgy1bzVINWUY+GG3lv8kE6/sH1jDcaaZhuaauONXqgSnqpEgO+A==
X-Received: by 2002:a1c:a5c2:: with SMTP id
o185mr5487869wme.173.1584031520264;
Thu, 12 Mar 2020 09:45:20 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 16/36] hw/arm/allwinner-h3: add System Control module
Date: Thu, 12 Mar 2020 16:44:39 +0000
Message-Id: <20200312164459.25924-17-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200312164459.25924-1-peter.maydell@linaro.org>
References: <20200312164459.25924-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::336
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
From: Niek Linnenbank <nieklinnenbank@gmail.com>
The Allwinner H3 System on Chip has an System Control
module that provides system wide generic controls and
device information. This commit adds support for the
Allwinner H3 System Control module.
Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
Reviewed-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
Message-id: 20200311221854.30370-6-nieklinnenbank@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/misc/Makefile.objs | 1 +
include/hw/arm/allwinner-h3.h | 3 +
include/hw/misc/allwinner-h3-sysctrl.h | 67 ++++++++++++
hw/arm/allwinner-h3.c | 9 +-
hw/misc/allwinner-h3-sysctrl.c | 140 +++++++++++++++++++++++++
5 files changed, 219 insertions(+), 1 deletion(-)
create mode 100644 include/hw/misc/allwinner-h3-sysctrl.h
create mode 100644 hw/misc/allwinner-h3-sysctrl.c
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index 5e635b74d5a..63b2e528f98 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -29,6 +29,7 @@ common-obj-$(CONFIG_MACIO) +=3D macio/
common-obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o
=20
common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-ccu.o
+common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-sysctrl.o
common-obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o
common-obj-$(CONFIG_NSERIES) +=3D cbus.o
common-obj-$(CONFIG_ECCMEMCTL) +=3D eccmemctl.o
diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h
index 4f4dcbcd177..43500c42621 100644
--- a/include/hw/arm/allwinner-h3.h
+++ b/include/hw/arm/allwinner-h3.h
@@ -40,6 +40,7 @@
#include "hw/timer/allwinner-a10-pit.h"
#include "hw/intc/arm_gic.h"
#include "hw/misc/allwinner-h3-ccu.h"
+#include "hw/misc/allwinner-h3-sysctrl.h"
#include "target/arm/cpu.h"
=20
/**
@@ -56,6 +57,7 @@ enum {
AW_H3_SRAM_A1,
AW_H3_SRAM_A2,
AW_H3_SRAM_C,
+ AW_H3_SYSCTRL,
AW_H3_EHCI0,
AW_H3_OHCI0,
AW_H3_EHCI1,
@@ -108,6 +110,7 @@ typedef struct AwH3State {
const hwaddr *memmap;
AwA10PITState timer;
AwH3ClockCtlState ccu;
+ AwH3SysCtrlState sysctrl;
GICState gic;
MemoryRegion sram_a1;
MemoryRegion sram_a2;
diff --git a/include/hw/misc/allwinner-h3-sysctrl.h b/include/hw/misc/allwi=
nner-h3-sysctrl.h
new file mode 100644
index 00000000000..af4119e0269
--- /dev/null
+++ b/include/hw/misc/allwinner-h3-sysctrl.h
@@ -0,0 +1,67 @@
+/*
+ * Allwinner H3 System Control emulation
+ *
+ * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@gmail.com>
+ *
+ * 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_SYSCTRL_H
+#define HW_MISC_ALLWINNER_H3_SYSCTRL_H
+
+#include "qom/object.h"
+#include "hw/sysbus.h"
+
+/**
+ * @name Constants
+ * @{
+ */
+
+/** Highest register address used by System Control device */
+#define AW_H3_SYSCTRL_REGS_MAXADDR (0x30)
+
+/** Total number of known registers */
+#define AW_H3_SYSCTRL_REGS_NUM ((AW_H3_SYSCTRL_REGS_MAXADDR / \
+ sizeof(uint32_t)) + 1)
+
+/** @} */
+
+/**
+ * @name Object model
+ * @{
+ */
+
+#define TYPE_AW_H3_SYSCTRL "allwinner-h3-sysctrl"
+#define AW_H3_SYSCTRL(obj) \
+ OBJECT_CHECK(AwH3SysCtrlState, (obj), TYPE_AW_H3_SYSCTRL)
+
+/** @} */
+
+/**
+ * Allwinner H3 System Control object instance state
+ */
+typedef struct AwH3SysCtrlState {
+ /*< private >*/
+ SysBusDevice parent_obj;
+ /*< public >*/
+
+ /** Maps I/O registers in physical memory */
+ MemoryRegion iomem;
+
+ /** Array of hardware registers */
+ uint32_t regs[AW_H3_SYSCTRL_REGS_NUM];
+
+} AwH3SysCtrlState;
+
+#endif /* HW_MISC_ALLWINNER_H3_SYSCTRL_H */
diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index c205f06738a..0aa46712db7 100644
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -37,6 +37,7 @@ const hwaddr allwinner_h3_memmap[] =3D {
[AW_H3_SRAM_A1] =3D 0x00000000,
[AW_H3_SRAM_A2] =3D 0x00044000,
[AW_H3_SRAM_C] =3D 0x00010000,
+ [AW_H3_SYSCTRL] =3D 0x01c00000,
[AW_H3_EHCI0] =3D 0x01c1a000,
[AW_H3_OHCI0] =3D 0x01c1a400,
[AW_H3_EHCI1] =3D 0x01c1b000,
@@ -66,7 +67,6 @@ struct AwH3Unimplemented {
} unimplemented[] =3D {
{ "d-engine", 0x01000000, 4 * MiB },
{ "d-inter", 0x01400000, 128 * KiB },
- { "syscon", 0x01c00000, 4 * KiB },
{ "dma", 0x01c02000, 4 * KiB },
{ "nfdc", 0x01c03000, 4 * KiB },
{ "ts", 0x01c06000, 4 * KiB },
@@ -192,6 +192,9 @@ static void allwinner_h3_init(Object *obj)
=20
sysbus_init_child_obj(obj, "ccu", &s->ccu, sizeof(s->ccu),
TYPE_AW_H3_CCU);
+
+ sysbus_init_child_obj(obj, "sysctrl", &s->sysctrl, sizeof(s->sysctrl),
+ TYPE_AW_H3_SYSCTRL);
}
=20
static void allwinner_h3_realize(DeviceState *dev, Error **errp)
@@ -301,6 +304,10 @@ static void allwinner_h3_realize(DeviceState *dev, Err=
or **errp)
qdev_init_nofail(DEVICE(&s->ccu));
sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccu), 0, s->memmap[AW_H3_CCU]);
=20
+ /* System Control */
+ qdev_init_nofail(DEVICE(&s->sysctrl));
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysctrl), 0, s->memmap[AW_H3_SYSCTR=
L]);
+
/* Universal Serial Bus */
sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0],
qdev_get_gpio_in(DEVICE(&s->gic),
diff --git a/hw/misc/allwinner-h3-sysctrl.c b/hw/misc/allwinner-h3-sysctrl.c
new file mode 100644
index 00000000000..1d07efa880d
--- /dev/null
+++ b/hw/misc/allwinner-h3-sysctrl.c
@@ -0,0 +1,140 @@
+/*
+ * Allwinner H3 System Control emulation
+ *
+ * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@gmail.com>
+ *
+ * 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 "qemu/units.h"
+#include "hw/sysbus.h"
+#include "migration/vmstate.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "hw/misc/allwinner-h3-sysctrl.h"
+
+/* System Control register offsets */
+enum {
+ REG_VER =3D 0x24, /* Version */
+ REG_EMAC_PHY_CLK =3D 0x30, /* EMAC PHY Clock */
+};
+
+#define REG_INDEX(offset) (offset / sizeof(uint32_t))
+
+/* System Control register reset values */
+enum {
+ REG_VER_RST =3D 0x0,
+ REG_EMAC_PHY_CLK_RST =3D 0x58000,
+};
+
+static uint64_t allwinner_h3_sysctrl_read(void *opaque, hwaddr offset,
+ unsigned size)
+{
+ const AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(opaque);
+ const uint32_t idx =3D REG_INDEX(offset);
+
+ if (idx >=3D AW_H3_SYSCTRL_REGS_NUM) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n",
+ __func__, (uint32_t)offset);
+ return 0;
+ }
+
+ return s->regs[idx];
+}
+
+static void allwinner_h3_sysctrl_write(void *opaque, hwaddr offset,
+ uint64_t val, unsigned size)
+{
+ AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(opaque);
+ const uint32_t idx =3D REG_INDEX(offset);
+
+ if (idx >=3D AW_H3_SYSCTRL_REGS_NUM) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n",
+ __func__, (uint32_t)offset);
+ return;
+ }
+
+ switch (offset) {
+ case REG_VER: /* Version */
+ break;
+ default:
+ s->regs[idx] =3D (uint32_t) val;
+ break;
+ }
+}
+
+static const MemoryRegionOps allwinner_h3_sysctrl_ops =3D {
+ .read =3D allwinner_h3_sysctrl_read,
+ .write =3D allwinner_h3_sysctrl_write,
+ .endianness =3D DEVICE_NATIVE_ENDIAN,
+ .valid =3D {
+ .min_access_size =3D 4,
+ .max_access_size =3D 4,
+ },
+ .impl.min_access_size =3D 4,
+};
+
+static void allwinner_h3_sysctrl_reset(DeviceState *dev)
+{
+ AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(dev);
+
+ /* Set default values for registers */
+ s->regs[REG_INDEX(REG_VER)] =3D REG_VER_RST;
+ s->regs[REG_INDEX(REG_EMAC_PHY_CLK)] =3D REG_EMAC_PHY_CLK_RST;
+}
+
+static void allwinner_h3_sysctrl_init(Object *obj)
+{
+ SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj);
+ AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(obj);
+
+ /* Memory mapping */
+ memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_h3_sysctrl_ops,=
s,
+ TYPE_AW_H3_SYSCTRL, 4 * KiB);
+ sysbus_init_mmio(sbd, &s->iomem);
+}
+
+static const VMStateDescription allwinner_h3_sysctrl_vmstate =3D {
+ .name =3D "allwinner-h3-sysctrl",
+ .version_id =3D 1,
+ .minimum_version_id =3D 1,
+ .fields =3D (VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(regs, AwH3SysCtrlState, AW_H3_SYSCTRL_REGS_NU=
M),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void allwinner_h3_sysctrl_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc =3D DEVICE_CLASS(klass);
+
+ dc->reset =3D allwinner_h3_sysctrl_reset;
+ dc->vmsd =3D &allwinner_h3_sysctrl_vmstate;
+}
+
+static const TypeInfo allwinner_h3_sysctrl_info =3D {
+ .name =3D TYPE_AW_H3_SYSCTRL,
+ .parent =3D TYPE_SYS_BUS_DEVICE,
+ .instance_init =3D allwinner_h3_sysctrl_init,
+ .instance_size =3D sizeof(AwH3SysCtrlState),
+ .class_init =3D allwinner_h3_sysctrl_class_init,
+};
+
+static void allwinner_h3_sysctrl_register(void)
+{
+ type_register_static(&allwinner_h3_sysctrl_info);
+}
+
+type_init(allwinner_h3_sysctrl_register)
--=20
2.20.1