From nobody Tue Apr 29 23:30:30 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1500295613736875.31772551737;
Mon, 17 Jul 2017 05:46:53 -0700 (PDT)
Received: from localhost ([::1]:50167 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1dX5QK-0000db-3w
for importer@patchew.org; Mon, 17 Jul 2017 08:46:52 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59028)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1dX5Oa-0007qh-S9
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1dX5Oa-0002Ct-16
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:04 -0400
Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37639)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <pm215@archaic.org.uk>)
id 1dX5OZ-00029H-QG
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:03 -0400
Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2)
(envelope-from <pm215@archaic.org.uk>) id 1dX5OY-0003X2-W7
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 13:45:03 +0100
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 17 Jul 2017 13:44:52 +0100
Message-Id: <1500295494-8991-17-git-send-email-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1500295494-8991-1-git-send-email-peter.maydell@linaro.org>
References: <1500295494-8991-1-git-send-email-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: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 2001:8b0:1d0::2
Subject: [Qemu-devel] [PULL 16/18] hw/arm/mps2: Add SCC
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
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: <http://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: RSF_0 Z_629925259 SPT_0
Add the SCC to the MPS2 board models.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Message-id: 1500029487-14822-8-git-send-email-peter.maydell@linaro.org
---
hw/arm/mps2.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index 4121816..80ee79e 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -34,6 +34,7 @@
#include "hw/misc/unimp.h"
#include "hw/char/cmsdk-apb-uart.h"
#include "hw/timer/cmsdk-apb-timer.h"
+#include "hw/misc/mps2-scc.h"
=20
typedef enum MPS2FPGAType {
FPGA_AN385,
@@ -44,6 +45,7 @@ typedef struct {
MachineClass parent;
MPS2FPGAType fpga_type;
const char *cpu_model;
+ uint32_t scc_id;
} MPS2MachineClass;
=20
typedef struct {
@@ -60,6 +62,7 @@ typedef struct {
MemoryRegion blockram_m2;
MemoryRegion blockram_m3;
MemoryRegion sram;
+ MPS2SCC scc;
} MPS2MachineState;
=20
#define TYPE_MPS2_MACHINE "mps2"
@@ -102,7 +105,7 @@ static void mps2_common_init(MachineState *machine)
MPS2MachineState *mms =3D MPS2_MACHINE(machine);
MPS2MachineClass *mmc =3D MPS2_MACHINE_GET_CLASS(machine);
MemoryRegion *system_memory =3D get_system_memory();
- DeviceState *armv7m;
+ DeviceState *armv7m, *sccdev;
=20
if (!machine->cpu_model) {
machine->cpu_model =3D mmc->cpu_model;
@@ -297,6 +300,16 @@ static void mps2_common_init(MachineState *machine)
cmsdk_apb_timer_create(0x40000000, qdev_get_gpio_in(armv7m, 8), SYSCLK=
_FRQ);
cmsdk_apb_timer_create(0x40001000, qdev_get_gpio_in(armv7m, 9), SYSCLK=
_FRQ);
=20
+ object_initialize(&mms->scc, sizeof(mms->scc), TYPE_MPS2_SCC);
+ sccdev =3D DEVICE(&mms->scc);
+ qdev_set_parent_bus(armv7m, sysbus_get_default());
+ qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2);
+ qdev_prop_set_uint32(sccdev, "scc-aid", 0x02000008);
+ qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id);
+ object_property_set_bool(OBJECT(&mms->scc), true, "realized",
+ &error_fatal);
+ sysbus_mmio_map(SYS_BUS_DEVICE(sccdev), 0, 0x4002f000);
+
system_clock_scale =3D NANOSECONDS_PER_SECOND / SYSCLK_FRQ;
=20
armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
@@ -319,6 +332,7 @@ static void mps2_an385_class_init(ObjectClass *oc, void=
*data)
mc->desc =3D "ARM MPS2 with AN385 FPGA image for Cortex-M3";
mmc->fpga_type =3D FPGA_AN385;
mmc->cpu_model =3D "cortex-m3";
+ mmc->scc_id =3D 0x41040000 | (385 << 4);
}
=20
static void mps2_an511_class_init(ObjectClass *oc, void *data)
@@ -329,6 +343,7 @@ static void mps2_an511_class_init(ObjectClass *oc, void=
*data)
mc->desc =3D "ARM MPS2 with AN511 DesignStart FPGA image for Cortex-M3=
";
mmc->fpga_type =3D FPGA_AN511;
mmc->cpu_model =3D "cortex-m3";
+ mmc->scc_id =3D 0x4104000 | (511 << 4);
}
=20
static const TypeInfo mps2_info =3D {
--=20
2.7.4