From patchwork Mon Mar 31 10:46:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 27415 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 46D6D20341 for ; Mon, 31 Mar 2014 11:35:16 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id c41sf20272272yho.1 for ; Mon, 31 Mar 2014 04:35:15 -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:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=v+6cX0vVIsW0pFgdW1Ul6KZAfQbEgBL6j6F5KwIDzSs=; b=X+8SrPucQ0u6ldvy1s2CFUuw005W/GrzGP3oTc2omF/gHLI+kUpPTCmXVsMkl7qecJ K1KxTyUJ+ad4pJs29fjfISmn8jiJy8vXiyVGjDfnpSaR2Vwm/rATwgOQg2AlkeVn1bBD 6/K2o19IgRhL+24dRa4mT+XgRaTPYFD2HjUFcayYDOULNC/0YqKjUD26TLguF9YCEugm az848OU3yze5Nb+zOXMYYoDa7gbwmC2yLiFPGQCiFq0fvPZP5EZyg66VoP2db7/Jlg7P FGqVZI7aV32vwOecp84Nmwe52b3liSKufIZvdgk8Mq0QX1b0ALbo0zhbQUwiCEJuvmbY dnLw== X-Gm-Message-State: ALoCoQkEF2bVsR0uMkqyJiaohj5tY0YSiO72Rs8MxzxSuCqHHyh6PtIhyR6zAiRBI8VrZZqoJVT6 X-Received: by 10.58.91.196 with SMTP id cg4mr2899151veb.41.1396265715865; Mon, 31 Mar 2014 04:35:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.230 with SMTP id f93ls2534358qgf.67.gmail; Mon, 31 Mar 2014 04:35:15 -0700 (PDT) X-Received: by 10.59.9.38 with SMTP id dp6mr566266ved.24.1396265715760; Mon, 31 Mar 2014 04:35:15 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id q1si2921738ves.9.2014.03.31.04.35.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 04:35:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id im17so8088066vcb.37 for ; Mon, 31 Mar 2014 04:35:15 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr23027497vcb.0.1396265715670; Mon, 31 Mar 2014 04:35:15 -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.220.12.8 with SMTP id v8csp133750vcv; Mon, 31 Mar 2014 04:35:15 -0700 (PDT) X-Received: by 10.180.38.41 with SMTP id d9mr11664913wik.9.1396265714490; Mon, 31 Mar 2014 04:35:14 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id u18si7270005wiv.33.2014.03.31.04.35.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Mar 2014 04:35:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUZne-0007UA-4d; Mon, 31 Mar 2014 10:50:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUZmm-0004sP-Vx; Mon, 31 Mar 2014 10:49:48 +0000 Received: from mail-pb0-f48.google.com ([209.85.160.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUZl2-0004ga-Nr for linux-arm-kernel@lists.infradead.org; Mon, 31 Mar 2014 10:48:03 +0000 Received: by mail-pb0-f48.google.com with SMTP id md12so8043225pbc.35 for ; Mon, 31 Mar 2014 03:47:39 -0700 (PDT) X-Received: by 10.68.44.71 with SMTP id c7mr24399796pbm.24.1396262859000; Mon, 31 Mar 2014 03:47:39 -0700 (PDT) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id oa3sm42582874pbb.15.2014.03.31.03.47.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 03:47:38 -0700 (PDT) From: Anup Patel To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v6 10/12] ARM/ARM64: KVM: Fix CPU_ON emulation for PSCI v0.2 Date: Mon, 31 Mar 2014 16:16:11 +0530 Message-Id: <1396262773-7723-11-git-send-email-anup.patel@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396262773-7723-1-git-send-email-anup.patel@linaro.org> References: <1396262773-7723-1-git-send-email-anup.patel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140331_064800_965122_88040B67 X-CRM114-Status: GOOD ( 11.76 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.48 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Mark Rutland , Rob Herring , linaro-kernel@lists.linaro.org, Anup Patel , Marc Zyngier , patches@apm.com, linux-arm-kernel@lists.infradead.org, Christoffer Dall , Pranavkumar Sawargaonkar X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anup.patel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 As-per PSCI v0.2, the source CPU provides physical address of "entry point" and "context id" for starting a target CPU. Also, if target CPU is already running then we should return ALREADY_ON. Current emulation of CPU_ON function does not consider physical address of "context id" and returns INVALID_PARAMETERS if target CPU is already running. This patch updates kvm_psci_vcpu_on() such that it works for both PSCI v0.1 and PSCI v0.2. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar Reviewed-by: Christoffer Dall --- arch/arm/kvm/psci.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c index 961c124..85bf896 100644 --- a/arch/arm/kvm/psci.c +++ b/arch/arm/kvm/psci.c @@ -63,6 +63,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) struct kvm_vcpu *vcpu = NULL, *tmp; wait_queue_head_t *wq; unsigned long cpu_id; + unsigned long context_id; unsigned long mpidr; phys_addr_t target_pc; int i; @@ -83,10 +84,17 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) * Make sure the caller requested a valid CPU and that the CPU is * turned off. */ - if (!vcpu || !vcpu->arch.pause) + if (!vcpu) return PSCI_RET_INVALID_PARAMS; + if (!vcpu->arch.pause) { + if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1) + return PSCI_RET_ALREADY_ON; + else + return PSCI_RET_INVALID_PARAMS; + } target_pc = *vcpu_reg(source_vcpu, 2); + context_id = *vcpu_reg(source_vcpu, 3); kvm_reset_vcpu(vcpu); @@ -101,6 +109,8 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) kvm_vcpu_set_be(vcpu); *vcpu_pc(vcpu) = target_pc; + if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1) + *vcpu_reg(vcpu, 0) = context_id; vcpu->arch.pause = false; smp_mb(); /* Make sure the above is visible */