From nobody Wed May 7 15:56:27 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 1521484922701865.3279700172894;
Mon, 19 Mar 2018 11:42:02 -0700 (PDT)
Received: from localhost ([::1]:43397 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1exzjH-0008RK-Sv
for importer@patchew.org; Mon, 19 Mar 2018 14:41:55 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49785)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1exzc3-0002Ov-K7
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-0007kt-Mu
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:27 -0400
Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:40464)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <pm215@archaic.org.uk>)
id 1exzc2-0007jV-GY
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 1exzc1-00033f-Hg
for qemu-devel@nongnu.org; Mon, 19 Mar 2018 18:34:25 +0000
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 19 Mar 2018 18:34:13 +0000
Message-Id: <20180319183415.1976-12-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 11/13] hw/arm/bcm2836: Use correct affinity
values for BCM2837
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 sets the Aff1 field of the MPIDR affinity values for the
CPUs to 0, whereas the BCM2836 uses 0xf. Set this correctly, as it
is required for Linux to boot.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Message-id: 20180313153458.26822-8-peter.maydell@linaro.org
---
hw/arm/bcm2836.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 07d2705f96..d775a33969 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -25,14 +25,17 @@
=20
struct BCM283XInfo {
const char *name;
+ int clusterid;
};
=20
static const BCM283XInfo bcm283x_socs[] =3D {
{
.name =3D TYPE_BCM2836,
+ .clusterid =3D 0xf,
},
{
.name =3D TYPE_BCM2837,
+ .clusterid =3D 0x0,
},
};
=20
@@ -58,6 +61,8 @@ static void bcm2836_init(Object *obj)
static void bcm2836_realize(DeviceState *dev, Error **errp)
{
BCM283XState *s =3D BCM283X(dev);
+ BCM283XClass *bc =3D BCM283X_GET_CLASS(dev);
+ const BCM283XInfo *info =3D bc->info;
Object *obj;
Error *err =3D NULL;
int n;
@@ -116,10 +121,8 @@ static void bcm2836_realize(DeviceState *dev, Error **=
errp)
qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-fiq", 0));
=20
for (n =3D 0; n < BCM283X_NCPUS; n++) {
- /* Mirror bcm2836, which has clusterid set to 0xf
- * TODO: this should be converted to a property of ARM_CPU
- */
- s->cpus[n].mp_affinity =3D 0xF00 | n;
+ /* TODO: this should be converted to a property of ARM_CPU */
+ s->cpus[n].mp_affinity =3D (info->clusterid << 8) | n;
=20
/* set periphbase/CBAR value for CPU-local registers */
object_property_set_int(OBJECT(&s->cpus[n]),
--=20
2.16.2