From patchwork Fri Mar 21 12:53:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26842 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1F4D620143 for ; Fri, 21 Mar 2014 13:35:34 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id hl1sf2299278igb.0 for ; Fri, 21 Mar 2014 06:35:33 -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=MpA6Ur6Fhpek//nQLPI/Xg4itocQKPa0cn6nGjiQIh8=; b=Ylz9O2zYjzeuRKqNzxaok/P2tY/d/+25v6wk88k2wABPkRVDhFWM5V52cGAxb8avJ2 zpXU0kvqHopT/6NPgqBDEj1ALbcCzb74LpBrS71Q1VlkgCLi/B3ZexG9N2vtwNFJjkbR qbHub+Yoaaq6lr8OhSIz0jlDqNAzzpl+MMJnnvb3Lif/QXR531F2uDigC3FarmVL+piO FvP7JeoyMmKaCKE3Y+YCswJu6S6C8EL/IemGpkcqUPaBtVnXOxCnlWdW8No8Umdp3CS2 az4s10STeZu31t7P/mpURmOtkQypoHWPjpNzOW8XaShqAlhaLpt8g1+qSLxOIhYAwp1Y GhYA== X-Gm-Message-State: ALoCoQllkJ9tpoNgfh+zDdzEa2TQ8YVsgdZHOofg0F4QU6EToqtNrMExfZ7mkuackgpxwHMFn1Qo X-Received: by 10.182.153.68 with SMTP id ve4mr6181977obb.39.1395408933602; Fri, 21 Mar 2014 06:35:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.233 with SMTP id l96ls703029qgl.90.gmail; Fri, 21 Mar 2014 06:35:33 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr37559263vcb.6.1395408933441; Fri, 21 Mar 2014 06:35:33 -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 ph6si1129150veb.161.2014.03.21.06.35.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 06:35:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 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.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so2614767vcb.29 for ; Fri, 21 Mar 2014 06:35:33 -0700 (PDT) X-Received: by 10.52.61.133 with SMTP id p5mr31700506vdr.4.1395408933333; Fri, 21 Mar 2014 06:35:33 -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 i9csp31381vck; Fri, 21 Mar 2014 06:35:32 -0700 (PDT) X-Received: by 10.180.98.232 with SMTP id el8mr2178440wib.27.1395408931985; Fri, 21 Mar 2014 06:35:31 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id cj10si1124826wib.11.2014.03.21.06.35.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 06:35:31 -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 1WQz0V-0005HX-H7; Fri, 21 Mar 2014 12:57:09 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyzi-0004u2-Te; Fri, 21 Mar 2014 12:56:18 +0000 Received: from mail-pb0-f54.google.com ([209.85.160.54]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyyZ-0004jl-Li for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:55:12 +0000 Received: by mail-pb0-f54.google.com with SMTP id ma3so2393268pbc.27 for ; Fri, 21 Mar 2014 05:54:46 -0700 (PDT) X-Received: by 10.66.240.4 with SMTP id vw4mr53620833pac.26.1395406486041; Fri, 21 Mar 2014 05:54:46 -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.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:54:45 -0700 (PDT) From: Anup Patel To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v5 10/11] ARM/ARM64: KVM: Emulate PSCI v0.2 CPU_SUSPEND Date: Fri, 21 Mar 2014 18:23:33 +0530 Message-Id: <1395406414-11707-11-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_085507_851621_964A07A6 X-CRM114-Status: GOOD ( 12.39 ) 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.54 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.170 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 This patch adds emulation of PSCI v0.2 CPU_SUSPEND function call for KVM ARM/ARM64. This is a CPU-level function call which can suspend current CPU or current CPU cluster. We don't have VCPU clusters in KVM so for KVM we simply suspend the current VCPU. The CPU_SUSPEND emulation is not tested much because currently there is no CPUIDLE driver in Linux kernel that uses PSCI CPU_SUSPEND. The PSCI CPU_SUSPEND implementation in ARM64 kernel was tested using a Simple CPUIDLE driver which is not published due to unstable DT-bindings for PSCI. (For more info, http://lwn.net/Articles/574950/) Even if we had stable DT-bindings for PSCI and CPUIDLE driver that uses PSCI CPU_SUSPEND then still we need to define SUSPEND states for KVM ARM/ARM64. Due to this, the CPU_SUSPEND emulation added by this patch only pause current VCPU and to wakeup a suspended VCPU we need to explicity call PSCI CPU_ON from Guest. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar --- arch/arm/kvm/psci.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c index 1e85452..e32ad10 100644 --- a/arch/arm/kvm/psci.c +++ b/arch/arm/kvm/psci.c @@ -52,6 +52,22 @@ static unsigned long psci_affinity_mask(unsigned long affinity_level) return affinity_mask; } +static unsigned long kvm_psci_vcpu_suspend(struct kvm_vcpu *vcpu) +{ + /* + * NOTE: Currently, we don't have any wakeup events for KVM + * hence VCPU suspend turns-out to be same as VCPU off request. + * This means to suspend a VCPU we simply set the pause flag + * and update VCPU registers as-per wakeup parameters provided + * via r2 & r3 (or x2 & x3). + */ + vcpu->arch.pause = true; + *vcpu_pc(vcpu) = *vcpu_reg(vcpu, 2); + *vcpu_reg(vcpu, 0) = *vcpu_reg(vcpu, 3); + + return KVM_PSCI_RET_SUCCESS; +} + static void kvm_psci_vcpu_off(struct kvm_vcpu *vcpu) { vcpu->arch.pause = true; @@ -195,6 +211,10 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) */ val = 2; break; + case KVM_PSCI_0_2_FN_CPU_SUSPEND: + case KVM_PSCI_0_2_FN64_CPU_SUSPEND: + val = kvm_psci_vcpu_suspend(vcpu); + break; case KVM_PSCI_0_2_FN_CPU_OFF: kvm_psci_vcpu_off(vcpu); val = KVM_PSCI_RET_SUCCESS; @@ -232,10 +252,6 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) val = KVM_PSCI_RET_SUCCESS; ret = 0; break; - case KVM_PSCI_0_2_FN_CPU_SUSPEND: - case KVM_PSCI_0_2_FN64_CPU_SUSPEND: - val = KVM_PSCI_RET_NI; - break; default: return -EINVAL; }