From patchwork Mon Feb 24 22:14:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 25218 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 624BC2066E for ; Mon, 24 Feb 2014 22:16:00 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id to1sf24982196ieb.7 for ; Mon, 24 Feb 2014 14:15:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=CAZIblNJQ6sQmYMEupUNtLXaeTvqcvSkE51re/EL/RU=; b=OMUbOY9S0vDusp7OqxDppQr7Su8NX2hyWpwaR1lJ4YTUgu9Go18Dhj9ftZBAY9j4yC naS9xwEju75mV3+hQeqsyIPNPLM2s1Xjx70esFH/yg/mOXYiHWBsaGo0Gv7ROfixq9eo 79WWCY+n8KtUAd5nmsDl9ZE/ixPymV9xbH7k4M2AjKCCvOMbPmCgJDUll9O8s8JgpmuB rUfNCTcQpZwrtbEKKKqx8JXANmq7PRvs6Q4AL7zSXrRlIHqDbaaAf7cO7j/JvdOY7ppB 7jMupvsmEVbWG+hDFST/z0I4nuDYhZQYsou5rUlaXqVgNEzX+m/HK8PgvGb5q4n59VaR BFTw== X-Gm-Message-State: ALoCoQnupZSJf7RltCzCXt2E1C/9wyOlJh/iVTHqccvrm085E/tmnZsNcSSAGpvoZ+NrR5wc3QiZ X-Received: by 10.43.96.73 with SMTP id cf9mr10364456icc.22.1393280159835; Mon, 24 Feb 2014 14:15:59 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.133 with SMTP id n5ls2157689qgd.64.gmail; Mon, 24 Feb 2014 14:15:59 -0800 (PST) X-Received: by 10.220.192.71 with SMTP id dp7mr2279182vcb.45.1393280159685; Mon, 24 Feb 2014 14:15:59 -0800 (PST) Received: from mail-ve0-x229.google.com (mail-ve0-x229.google.com [2607:f8b0:400c:c01::229]) by mx.google.com with ESMTPS id uw4si6265323vdc.14.2014.02.24.14.15.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 14:15:59 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::229; Received: by mail-ve0-f169.google.com with SMTP id c14so3071559vea.14 for ; Mon, 24 Feb 2014 14:15:59 -0800 (PST) X-Received: by 10.52.135.65 with SMTP id pq1mr12022111vdb.13.1393280159617; Mon, 24 Feb 2014 14:15:59 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp92618vcz; Mon, 24 Feb 2014 14:15:59 -0800 (PST) X-Received: by 10.224.68.10 with SMTP id t10mr33845257qai.87.1393280159274; Mon, 24 Feb 2014 14:15:59 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d2si10244589qag.96.2014.02.24.14.15.59 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 24 Feb 2014 14:15:59 -0800 (PST) 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; Received: from localhost ([::1]:59973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WI3oc-0007yB-Qh for patch@linaro.org; Mon, 24 Feb 2014 17:15:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WI3nr-00073C-5C for qemu-devel@nongnu.org; Mon, 24 Feb 2014 17:15:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WI3nk-0006el-Jw for qemu-devel@nongnu.org; Mon, 24 Feb 2014 17:15:11 -0500 Received: from mail-oa0-x236.google.com ([2607:f8b0:4003:c02::236]:62210) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WI3nk-0006dW-BP for qemu-devel@nongnu.org; Mon, 24 Feb 2014 17:15:04 -0500 Received: by mail-oa0-f54.google.com with SMTP id m1so1981915oag.13 for ; Mon, 24 Feb 2014 14:15:03 -0800 (PST) X-Received: by 10.60.55.227 with SMTP id v3mr23084250oep.67.1393280103888; Mon, 24 Feb 2014 14:15:03 -0800 (PST) Received: from localhost.localdomain (65-36-73-129.dyn.grandenetworks.net. [65.36.73.129]) by mx.google.com with ESMTPSA id ii8sm37444778obb.11.2014.02.24.14.15.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 14:15:03 -0800 (PST) From: Rob Herring To: Peter Maydell Date: Mon, 24 Feb 2014 16:14:46 -0600 Message-Id: <1393280086-19431-2-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393280086-19431-1-git-send-email-robherring2@gmail.com> References: <1393280086-19431-1-git-send-email-robherring2@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::236 Cc: Rob Herring , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] arm: highbank: setup custom MPIDR value X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org X-Original-Sender: robherring2@gmail.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=fail header.i=@gmail.com; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Rob Herring Calxeda highbank platform uses a cluster id of 9 which makes MPIDR register be 0x8000090n where n is the core number. This causes problems on current kernels expecting the MPIDR to match DT cpu reg property. Midway is "normal" and has a cluster id of 0, so it does not need this override. Signed-off-by: Rob Herring --- hw/arm/highbank.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index d76a1d1..e73d86f 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -241,6 +241,15 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine) error_report("%s", error_get_pretty(err)); exit(1); } + + if (machine == CALXEDA_HIGHBANK) { + object_property_set_int(OBJECT(cpu), 0x80000900 | n, "mpidr", + &err); + if (err) { + error_report("%s", error_get_pretty(err)); + exit(1); + } + } object_property_set_bool(OBJECT(cpu), true, "realized", &err); if (err) { error_report("%s", error_get_pretty(err));