From patchwork Mon Jul 14 16:21:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33614 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BF65620CAD for ; Mon, 14 Jul 2014 16:23:29 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lf10sf8941677pab.1 for ; Mon, 14 Jul 2014 09:23:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=0ObQA41cC99qTKPQQywbws/m1SysaTf+fTkDHl4CvXw=; b=F6zI4kr/rUO5vGNBoMW4LOrPdU+f+rMCS3FxHxPnRaLU0rWPrXaAtrnthjUhfvNmuH /U8udMBv6mc42WqsYzuirJLWYLdyhQY/sY+zF4v9tFzgpYNNUUnXx1+cAGKVt94KGgIR b+EWK1SifRgvDbd5zB/ITNkd7PFC2ok9IdXydUA44ZDmF3n2HUHmEETKkD3BJ46OdFPY 3sAvXB3Gl9X4vM4qhaLSPNk4oarMnKRKmJaJ9ihb32lfjDBGdd6V4tneSGv7m0VSJEwJ JSPh2GlCu/LcFAJ4uMcpDoaZRZhY/S9BampX4cWmLaNCGeHiq9+KRiEoWkbr6xedsT2Y NnjQ== X-Gm-Message-State: ALoCoQn2IKg+gyaM5VvIQiGk3I4NME8xczcxMC1pMRxz2So1dpH2FS9ukbXF+auOkET7n/Hn/k1t X-Received: by 10.68.236.129 with SMTP id uu1mr8251530pbc.1.1405355008846; Mon, 14 Jul 2014 09:23:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.101 with SMTP id c92ls1064150qge.90.gmail; Mon, 14 Jul 2014 09:23:28 -0700 (PDT) X-Received: by 10.58.178.226 with SMTP id db2mr353275vec.76.1405355008736; Mon, 14 Jul 2014 09:23:28 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id 16si5506351vdd.92.2014.07.14.09.23.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jul 2014 09:23:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so3830218vcb.15 for ; Mon, 14 Jul 2014 09:23:28 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr1083597vca.45.1405355008664; Mon, 14 Jul 2014 09:23:28 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp147489vcb; Mon, 14 Jul 2014 09:23:28 -0700 (PDT) X-Received: by 10.50.142.97 with SMTP id rv1mr27267371igb.13.1405355006868; Mon, 14 Jul 2014 09:23:26 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id z4si3411813igf.20.2014.07.14.09.23.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 14 Jul 2014 09:23:26 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6j0k-0005Vf-40; Mon, 14 Jul 2014 16:21:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6j0i-0005VB-QD for xen-devel@lists.xen.org; Mon, 14 Jul 2014 16:21:52 +0000 Received: from [193.109.254.147:46046] by server-5.bemta-14.messagelabs.com id FD/8D-05821-0A304C35; Mon, 14 Jul 2014 16:21:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1405354909!17388283!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12720 invoked from network); 14 Jul 2014 16:21:51 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 14 Jul 2014 16:21:51 -0000 X-IronPort-AV: E=Sophos;i="5.01,659,1400025600"; d="scan'208";a="152687739" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jul 2014 16:21:49 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Mon, 14 Jul 2014 12:21:48 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1X6j0d-0008AH-SE; Mon, 14 Jul 2014 17:21:48 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Mon, 14 Jul 2014 17:21:47 +0100 From: Ian Campbell To: Date: Mon, 14 Jul 2014 17:21:47 +0100 Message-ID: <1405354907-3743-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH] xen: arm: use physical processor ID (MPIDR) when calling psci CPU_ON X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Xen's logical CPU map can differ from the underlying layout. Also add an emacs magic block to this file. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/psci.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 25a8697..b6360d5 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -54,7 +54,8 @@ static uint32_t psci_cpu_on_nr; int call_psci_cpu_on(int cpu) { - return __invoke_psci_fn_smc(psci_cpu_on_nr, cpu, __pa(init_secondary), 0); + return __invoke_psci_fn_smc(psci_cpu_on_nr, + cpu_logical_map(cpu), __pa(init_secondary), 0); } int __init psci_init(void) @@ -96,3 +97,12 @@ int __init psci_init(void) return 0; } + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */