From patchwork Mon Mar 19 18:34:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 132079 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp3057054ljb; Mon, 19 Mar 2018 11:42:33 -0700 (PDT) X-Google-Smtp-Source: AG47ELutPN0vT5BWw05FGGxsy97pdvmyDsz1Lr0xxnIrrJniT1qCmx1r+p/G2DrQaMTCYMGSvZd7 X-Received: by 10.55.164.136 with SMTP id n130mr19202135qke.13.1521484952928; Mon, 19 Mar 2018 11:42:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521484952; cv=none; d=google.com; s=arc-20160816; b=i2VKYh8gOCM2S6DzKR6tZxdrZKVJ7WJ4i+oEG2U73E6viZHyCEHiOaor3ttyyGo8Iq g5esFqCwYXPSm+JnvYpDgiWJyp0r2HBEAeOETukwfGQ0Ig6Yxlabkq0ASrQn1tr9lwbc XxDYIHoCYtSvXy6Y/ALs602eBDyavON1JWjz1cAqkWq17bgeru5g33g1xWG3SXaMmmqw /FVgOyKsUEdLPnUwG0v2auCuu3MlNVofUgXEWF8mpZPHQJ2vM1PcfBeQ9bk9Y91/QB6z yG7lyB7RjBcyEDT9yTGQlkXYcDeheSiKe69sd+1wfCFbV0xiJ9P6hGGDIOdSmfH5UpQ4 wn4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=h+dUmkA1hv1t11JeVE4detdh5mLiMfEcVOD7WWjmMn4=; b=AoB8QIzRIPZrVtLfY7KKofJCtE4beq3Ijd62AfmuLzLQ/Z/Y8n8SoC0hyGEgSJgll7 W5IkkNvJqAXVkosbO3zdH4ho98GyNp2+a72LSy64Q40kLxRiukcGvtWxphr7C9IFUInK 7r74fxf9wbfKX5VJvmcBJbQtUlD2BwWtiNi+v1YTI5HUP+HnlRHw3Z8FBbL4AH0nGs7k XVkigZjBGitxX2mUPvhy3EOXTxjDyXWAB1CTTFLyBoDO3zNsTmbhVIP/3nfysn+ckXKC ZGOdRdqm3yXxrtCcIU19zLKBDdrACLpCZFecwh9ccjDqkHlPc2k7acwohBNTWMHRQZH1 7Ucw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o18si671143qtk.140.2018.03.19.11.42.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 19 Mar 2018 11:42:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exzjs-0008RK-8g for patch@linaro.org; Mon, 19 Mar 2018 14:42:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ) id 1exzc1-00033f-Hg for qemu-devel@nongnu.org; Mon, 19 Mar 2018 18:34:25 +0000 From: Peter Maydell 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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Andrew Baumann Reviewed-by: Philippe Mathieu-Daudé Message-id: 20180313153458.26822-8-peter.maydell@linaro.org --- hw/arm/bcm2836.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.16.2 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 @@ struct BCM283XInfo { const char *name; + int clusterid; }; static const BCM283XInfo bcm283x_socs[] = { { .name = TYPE_BCM2836, + .clusterid = 0xf, }, { .name = TYPE_BCM2837, + .clusterid = 0x0, }, }; @@ -58,6 +61,8 @@ static void bcm2836_init(Object *obj) static void bcm2836_realize(DeviceState *dev, Error **errp) { BCM283XState *s = BCM283X(dev); + BCM283XClass *bc = BCM283X_GET_CLASS(dev); + const BCM283XInfo *info = bc->info; Object *obj; Error *err = 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)); for (n = 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 = 0xF00 | n; + /* TODO: this should be converted to a property of ARM_CPU */ + s->cpus[n].mp_affinity = (info->clusterid << 8) | n; /* set periphbase/CBAR value for CPU-local registers */ object_property_set_int(OBJECT(&s->cpus[n]),