From nobody Wed May 7 10:49:01 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;
dmarc=fail(p=none dis=none) header.from=linaro.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 1521484775670143.23267317946477;
Mon, 19 Mar 2018 11:39:35 -0700 (PDT)
Received: from localhost ([::1]:43378 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1exzgy-00069H-KY
for importer@patchew.org; Mon, 19 Mar 2018 14:39:32 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49781)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1exzc3-0002Oh-DE
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1exzc2-0007ju-8Q
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:27 -0400
Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:40462)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <pm215@archaic.org.uk>)
id 1exzc1-0007hw-Vw
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:26 -0400
Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89)
(envelope-from <pm215@archaic.org.uk>) id 1exzc0-000330-P3
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 18:34:24 +0000
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 19 Mar 2018 18:34:12 +0000
Message-Id: <20180319183415.1976-11-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.16.2
In-Reply-To: <20180319183415.1976-1-peter.maydell@linaro.org>
References: <20180319183415.1976-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: 2001:8b0:1d0::2
Subject: [Qemu-devel] [PULL 10/13] hw/arm/bcm2836: Create proper bcm2837
device
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
The bcm2837 is pretty similar to the bcm2836, but it does have
some differences. Notably, the MPIDR affinity aff1 values it
sets for the CPUs are 0x0, rather than the 0xf that the bcm2836
uses, and if this is wrong Linux will not boot.
Rather than trying to have one device with properties that
configure it differently for the two cases, create two
separate QOM devices for the two SoCs. We use the same approach
as hw/arm/aspeed_soc.c and share code and have a data table
that might differ per-SoC. For the moment the two types don't
actually have different behaviour.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Message-id: 20180313153458.26822-7-peter.maydell@linaro.org
---
include/hw/arm/bcm2836.h | 19 +++++++++++++++++++
hw/arm/bcm2836.c | 37 ++++++++++++++++++++++++++++++++-----
hw/arm/raspi.c | 3 ++-
3 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h
index 9a10a76631..93248399ba 100644
--- a/include/hw/arm/bcm2836.h
+++ b/include/hw/arm/bcm2836.h
@@ -20,6 +20,13 @@
=20
#define BCM283X_NCPUS 4
=20
+/* These type names are for specific SoCs; other than instantiating
+ * them, code using these devices should always handle them via the
+ * BCM283x base class, so they have no BCM2836(obj) etc macros.
+ */
+#define TYPE_BCM2836 "bcm2836"
+#define TYPE_BCM2837 "bcm2837"
+
typedef struct BCM283XState {
/*< private >*/
DeviceState parent_obj;
@@ -33,4 +40,16 @@ typedef struct BCM283XState {
BCM2835PeripheralState peripherals;
} BCM283XState;
=20
+typedef struct BCM283XInfo BCM283XInfo;
+
+typedef struct BCM283XClass {
+ DeviceClass parent_class;
+ const BCM283XInfo *info;
+} BCM283XClass;
+
+#define BCM283X_CLASS(klass) \
+ OBJECT_CLASS_CHECK(BCM283XClass, (klass), TYPE_BCM283X)
+#define BCM283X_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X)
+
#endif /* BCM2836_H */
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 1d1908654b..07d2705f96 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -23,6 +23,19 @@
/* "QA7" (Pi2) interrupt controller and mailboxes etc. */
#define BCM2836_CONTROL_BASE 0x40000000
=20
+struct BCM283XInfo {
+ const char *name;
+};
+
+static const BCM283XInfo bcm283x_socs[] =3D {
+ {
+ .name =3D TYPE_BCM2836,
+ },
+ {
+ .name =3D TYPE_BCM2837,
+ },
+};
+
static void bcm2836_init(Object *obj)
{
BCM283XState *s =3D BCM283X(obj);
@@ -156,25 +169,39 @@ static Property bcm2836_props[] =3D {
DEFINE_PROP_END_OF_LIST()
};
=20
-static void bcm2836_class_init(ObjectClass *oc, void *data)
+static void bcm283x_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc =3D DEVICE_CLASS(oc);
+ BCM283XClass *bc =3D BCM283X_CLASS(oc);
=20
- dc->props =3D bcm2836_props;
+ bc->info =3D data;
dc->realize =3D bcm2836_realize;
+ dc->props =3D bcm2836_props;
}
=20
-static const TypeInfo bcm2836_type_info =3D {
+static const TypeInfo bcm283x_type_info =3D {
.name =3D TYPE_BCM283X,
.parent =3D TYPE_DEVICE,
.instance_size =3D sizeof(BCM283XState),
.instance_init =3D bcm2836_init,
- .class_init =3D bcm2836_class_init,
+ .class_size =3D sizeof(BCM283XClass),
+ .abstract =3D true,
};
=20
static void bcm2836_register_types(void)
{
- type_register_static(&bcm2836_type_info);
+ int i;
+
+ type_register_static(&bcm283x_type_info);
+ for (i =3D 0; i < ARRAY_SIZE(bcm283x_socs); i++) {
+ TypeInfo ti =3D {
+ .name =3D bcm283x_socs[i].name,
+ .parent =3D TYPE_BCM283X,
+ .class_init =3D bcm283x_class_init,
+ .class_data =3D (void *) &bcm283x_socs[i],
+ };
+ type_register(&ti);
+ }
}
=20
type_init(bcm2836_register_types)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 58c6e80a17..f588720138 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -136,7 +136,8 @@ static void raspi_init(MachineState *machine, int versi=
on)
BusState *bus;
DeviceState *carddev;
=20
- object_initialize(&s->soc, sizeof(s->soc), TYPE_BCM283X);
+ object_initialize(&s->soc, sizeof(s->soc),
+ version =3D=3D 3 ? TYPE_BCM2837 : TYPE_BCM2836);
object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),
&error_abort);
=20
--=20
2.16.2