From patchwork Fri Mar 21 12:53:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26841 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EC1B720143 for ; Fri, 21 Mar 2014 13:34:11 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id lh14sf5538178vcb.2 for ; Fri, 21 Mar 2014 06:34:11 -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=SEKmUKUvH8v3kKjWwpeJDg/HHFTGha0Vrl3aM1mo2oQ=; b=ZgnX9tqg8XQLxPjbepYjo/hIfGnLxBiixqSJl0ac8LFYP4g+G3O23Ukyxbxa42Tvk+ 9SY15VpBzrLIB8Qcn9ISowDzudtkYwAmLrSf/V5spycJyxBrXITIojhzp03JcUsw4sDe /ZG4ehCDIWUQJbh828oIC71zfF59Xsxx/w13AGsil2Ihr4hX4ygOjsiClOIhMiUuk1mP zgNUyIQMt5gz8uMidU5EIOlXUBK+Jo2v+RnvCV+ElEam9qF80qRsmQSmY1TjMCvT3qoa Aez5JCWirFABpsEdtd07z34iVFWb47+ucie0XAGVZGFFG+jLEgEXMuj056R+X+U/hudF rC7g== X-Gm-Message-State: ALoCoQkXTZPAsjIx2znW9zSfH81HwBpWx4eAnv4FMjya7QObGdE/AItY4kGxgAlJBiIQpGSjVpr1 X-Received: by 10.236.113.43 with SMTP id z31mr3807960yhg.33.1395408851665; Fri, 21 Mar 2014 06:34:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.195 with SMTP id 61ls650402qgv.19.gmail; Fri, 21 Mar 2014 06:34:11 -0700 (PDT) X-Received: by 10.221.27.8 with SMTP id ro8mr8017380vcb.30.1395408851535; Fri, 21 Mar 2014 06:34:11 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id tm8si1153498vdc.170.2014.03.21.06.34.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 06:34:11 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id lc6so2528570vcb.7 for ; Fri, 21 Mar 2014 06:34:11 -0700 (PDT) X-Received: by 10.52.163.236 with SMTP id yl12mr6470555vdb.39.1395408851446; Fri, 21 Mar 2014 06:34:11 -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.78.9 with SMTP id i9csp31281vck; Fri, 21 Mar 2014 06:34:10 -0700 (PDT) X-Received: by 10.181.13.112 with SMTP id ex16mr2652456wid.23.1395408850180; Fri, 21 Mar 2014 06:34:10 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id hh7si1116948wib.65.2014.03.21.06.34.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 06:34:10 -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 1WQz0J-0005BS-K8; Fri, 21 Mar 2014 12:56:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyzZ-0004tP-E2; Fri, 21 Mar 2014 12:56:09 +0000 Received: from mail-pb0-f42.google.com ([209.85.160.42]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyyV-0004iF-SH for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:55:08 +0000 Received: by mail-pb0-f42.google.com with SMTP id rr13so2377732pbb.29 for ; Fri, 21 Mar 2014 05:54:41 -0700 (PDT) X-Received: by 10.68.139.2 with SMTP id qu2mr3939979pbb.164.1395406480771; Fri, 21 Mar 2014 05:54:40 -0700 (PDT) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id dk1sm9788981pbc.46.2014.03.21.05.54.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:54:40 -0700 (PDT) From: Anup Patel To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v5 09/11] ARM/ARM64: KVM: Fix CPU_ON emulation for PSCI v0.2 Date: Fri, 21 Mar 2014 18:23:32 +0530 Message-Id: <1395406414-11707-10-git-send-email-anup.patel@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395406414-11707-1-git-send-email-anup.patel@linaro.org> References: <1395406414-11707-1-git-send-email-anup.patel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140321_085504_063536_33367F71 X-CRM114-Status: GOOD ( 12.13 ) 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.42 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 , 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.176 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 ab1d098..1e85452 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 KVM_PSCI_RET_INVAL; + if (!vcpu->arch.pause) { + if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1) + return KVM_PSCI_RET_ALREADY_ON; + else + return KVM_PSCI_RET_INVAL; + } 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 */