From patchwork Wed Apr 2 10:42:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 27609 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 8035E20341 for ; Wed, 2 Apr 2014 10:51:00 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf38753iec.3 for ; Wed, 02 Apr 2014 03:50:59 -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=jsShO2YCEg21ml1jBeTLCrM24uxG/ebC6fpGY88IafY=; b=mJRmNb0W0+iuuU54Cq9d3EJDvkdIfLyj6qQR8rr2qBxTWgCdI7dvr/a6mj/A8YQhm/ j/cW0JD7oLdVceasslUiewqyko7F+RXP3Utf/cCivvIEyUgBeRPOsXslcVfze6qSC7BN TJusdaFzjrsIuckc6TbkaAbRiCbt73wyjmM+UbVR9uUo0VJBrox4KxsWuHXuNRWoNI54 PFv79MkMPzGORoI505xzHT0suAG3t/UivPbbMg+n3Ww/zxlZnyGX/tbo9oRB77vwVCFU lESxReMHXEFsem5d3As/UnhjdUOctlJ+juu/eBJUJoU8FwgE68J7bHEJUEBeCdQ4fl1+ IjMQ== X-Gm-Message-State: ALoCoQkHauilRhgA1GIE6tyD5bWQ6OJUklOdtgEFKa7R+NHN77s/Emhfh24NDaOiyQbrmaoZhBKU X-Received: by 10.182.158.4 with SMTP id wq4mr16690320obb.18.1396435859833; Wed, 02 Apr 2014 03:50:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.21 with SMTP id t21ls289934qge.1.gmail; Wed, 02 Apr 2014 03:50:59 -0700 (PDT) X-Received: by 10.52.142.10 with SMTP id rs10mr30316719vdb.3.1396435859741; Wed, 02 Apr 2014 03:50:59 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id vd8si438290vdc.106.2014.04.02.03.50.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Apr 2014 03:50:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 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.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so6206vcb.28 for ; Wed, 02 Apr 2014 03:50:59 -0700 (PDT) X-Received: by 10.52.65.132 with SMTP id x4mr7475048vds.36.1396435859647; Wed, 02 Apr 2014 03:50:59 -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 v8csp311685vcv; Wed, 2 Apr 2014 03:50:59 -0700 (PDT) X-Received: by 10.180.189.139 with SMTP id gi11mr27687664wic.53.1396435858525; Wed, 02 Apr 2014 03:50:58 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id p14si11594388wie.124.2014.04.02.03.50.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Apr 2014 03:50:58 -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 1WVIfS-0008EG-Hf; Wed, 02 Apr 2014 10:45:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVIee-0007fH-4b; Wed, 02 Apr 2014 10:44:24 +0000 Received: from mail-pb0-f52.google.com ([209.85.160.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVIeU-0007ag-95 for linux-arm-kernel@lists.infradead.org; Wed, 02 Apr 2014 10:44:17 +0000 Received: by mail-pb0-f52.google.com with SMTP id rr13so11324552pbb.39 for ; Wed, 02 Apr 2014 03:43:51 -0700 (PDT) X-Received: by 10.66.218.234 with SMTP id pj10mr7805244pac.156.1396435431725; Wed, 02 Apr 2014 03:43:51 -0700 (PDT) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id tk5sm3573403pbc.63.2014.04.02.03.43.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Apr 2014 03:43:50 -0700 (PDT) From: Anup Patel To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v7 10/12] ARM/ARM64: KVM: Fix CPU_ON emulation for PSCI v0.2 Date: Wed, 2 Apr 2014 16:12:25 +0530 Message-Id: <1396435347-20056-11-git-send-email-anup.patel@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396435347-20056-1-git-send-email-anup.patel@linaro.org> References: <1396435347-20056-1-git-send-email-anup.patel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140402_064414_436110_4584CF4B X-CRM114-Status: GOOD ( 12.37 ) 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.52 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, Ashwin Chaugule , 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.169 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 d8335da..fdbd829 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 */