From patchwork Mon Mar 31 10:46:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 27417 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 17E1A20341 for ; Mon, 31 Mar 2014 11:49:45 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf21251738pad.11 for ; Mon, 31 Mar 2014 04:49:45 -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=KHvHgakiJU+zmpiUp+SEES/mgxad8h6LrYlqgpssPOE=; b=OF7w0YFAldEpBQT5rFTWOoXBSOszwuUGS/B/lvBIBHBULQpEstMdFwU1+dbNw2bzjR Wpwh1ja/nrgLOBnjBJezQIMGcQ4D3ubqhOn2ea7YnEfppBResqlO9uizbbGTNVtIdjpT WcBWziYH2soGQfgkwiI8/AbCcVVUNIWFolLku8wxCkd5XpY8wNm+m7bqISMPwxh1Ks93 o1rjcD7UJrK94e9meTMNDyPMw0dV4aIgI+075yOsk4RZO1fy73AV4Ia+4gzsatiLd5J7 DZS2vfEzLYILhSEVxYJoF+QDM5+/oe1hrejySJIanKMw7FyOSjaeblabddXzwCSKDYga L4qg== X-Gm-Message-State: ALoCoQlI7s2h4Ykcmb62Vp9pa/kvqpvqXq7bUztRTQoWLrPXfcRNzpVZLd3agbQ3iGyQ+/iQjKme X-Received: by 10.68.201.7 with SMTP id jw7mr9920883pbc.8.1396266585023; Mon, 31 Mar 2014 04:49:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.38 with SMTP id 35ls2468336qgw.77.gmail; Mon, 31 Mar 2014 04:49:44 -0700 (PDT) X-Received: by 10.58.57.67 with SMTP id g3mr22721650veq.3.1396266584899; Mon, 31 Mar 2014 04:49:44 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id oj4si2812691vcb.158.2014.03.31.04.49.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 04:49:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so7840477veb.8 for ; Mon, 31 Mar 2014 04:49:44 -0700 (PDT) X-Received: by 10.52.249.105 with SMTP id yt9mr117272vdc.34.1396266584821; Mon, 31 Mar 2014 04:49:44 -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 v8csp134562vcv; Mon, 31 Mar 2014 04:49:44 -0700 (PDT) X-Received: by 10.194.9.8 with SMTP id v8mr5172020wja.53.1396266583630; Mon, 31 Mar 2014 04:49:43 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id o17si7288821wie.52.2014.03.31.04.49.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Mar 2014 04:49:43 -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 1WUZnl-0007bZ-2Y; Mon, 31 Mar 2014 10:50:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUZmx-0004tP-MD; Mon, 31 Mar 2014 10:49:59 +0000 Received: from mail-pd0-f182.google.com ([209.85.192.182]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUZl9-0004hb-8g for linux-arm-kernel@lists.infradead.org; Mon, 31 Mar 2014 10:48:08 +0000 Received: by mail-pd0-f182.google.com with SMTP id y10so7766763pdj.41 for ; Mon, 31 Mar 2014 03:47:45 -0700 (PDT) X-Received: by 10.66.27.202 with SMTP id v10mr5802812pag.127.1396262865748; Mon, 31 Mar 2014 03:47:45 -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.40 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 03:47:44 -0700 (PDT) From: Anup Patel To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v6 11/12] ARM/ARM64: KVM: Emulate PSCI v0.2 CPU_SUSPEND Date: Mon, 31 Mar 2014 16:16:12 +0530 Message-Id: <1396262773-7723-12-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_064807_427878_6BB95CCC X-CRM114-Status: GOOD ( 12.66 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.182 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.128.177 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 and WAKEUP events for KVM ARM/ARM64. Due to this, we implement CPU_SUSPEND emulation similar to WFI (Wait-for-interrupt) emulation. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar --- arch/arm/kvm/psci.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c index 85bf896..f414fd3 100644 --- a/arch/arm/kvm/psci.c +++ b/arch/arm/kvm/psci.c @@ -52,6 +52,27 @@ 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 + * so for simplicity we make VCPU suspend emulation same-as + * WFI (Wait-for-interrupt) emulation. + * + * To do this we simply update VCPU registers as-per state + * info provided via r1 - r3 (or x1 - x3) and block the + * VCPU for irqs. + */ + if (*vcpu_reg(vcpu, 1) & (0x1UL << 16)) { + /* Update return pc and r0 for power-down state. */ + *vcpu_pc(vcpu) = *vcpu_reg(vcpu, 2); + *vcpu_reg(vcpu, 0) = *vcpu_reg(vcpu, 3); + } + kvm_vcpu_block(vcpu); + + return PSCI_RET_SUCCESS; +} + static void kvm_psci_vcpu_off(struct kvm_vcpu *vcpu) { vcpu->arch.pause = true; @@ -195,6 +216,10 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) */ val = 2; break; + case PSCI_0_2_FN_CPU_SUSPEND: + case PSCI_0_2_FN64_CPU_SUSPEND: + val = kvm_psci_vcpu_suspend(vcpu); + break; case PSCI_0_2_FN_CPU_OFF: kvm_psci_vcpu_off(vcpu); val = PSCI_RET_SUCCESS; @@ -232,10 +257,6 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) val = PSCI_RET_SUCCESS; ret = 0; break; - case PSCI_0_2_FN_CPU_SUSPEND: - case PSCI_0_2_FN64_CPU_SUSPEND: - val = PSCI_RET_NOT_SUPPORTED; - break; default: return -EINVAL; }