From patchwork Fri Mar 21 12:53:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26831 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E27D120143 for ; Fri, 21 Mar 2014 12:58:40 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id x10sf5368828pdj.6 for ; Fri, 21 Mar 2014 05:58:40 -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=2AHnjkl43TuSrpWro7/Y6CIBBcnxQfmbDiBzkQxJxEg=; b=FscbQoWq1Xtp9LzRxK9MRFbLUEjsyW8OMdVbo3jN6pzqFfVTGvJgOYvOr0LquA0kBH d6uRlEZhW5w7al5ihpGwlkXMi0fJxLUXW23ArmNJj8Dt5eat9YjSR3axBTYiasMRDChl HEAeV9PVfENjhoXkRZvH10WmVf/89zzUQ909Cfa1677kr4G+J+/CoFXfDXZ9rVaaL251 Y32OGFqLQ0yEl7eL2/Nyq00Icn2fwSXLp39ocX2f4ll/Nu8uIkg29Gt4fdeSzuOIveqg Vdff8tM3UvgwniMz3rkGYIPzQo+VpNL0WoWaQjssmirgGtkBFnAlH7Vtkaea/ZQDyUTW okKA== X-Gm-Message-State: ALoCoQmsWpuc24odOBbkuotZ992NH0XgfzS+JcVBLOaVeTJGu8g5K1an9Ie0AkqMpeZlkmBVhH0K X-Received: by 10.68.253.66 with SMTP id zy2mr19798390pbc.1.1395406720158; Fri, 21 Mar 2014 05:58:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.105.100 with SMTP id b91ls647526qgf.26.gmail; Fri, 21 Mar 2014 05:58:40 -0700 (PDT) X-Received: by 10.58.229.167 with SMTP id sr7mr36111444vec.7.1395406719978; Fri, 21 Mar 2014 05:58:39 -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 of4si1091775vcb.175.2014.03.21.05.58.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:58:39 -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 ik5so2561107vcb.14 for ; Fri, 21 Mar 2014 05:58:39 -0700 (PDT) X-Received: by 10.58.162.168 with SMTP id yb8mr16721145veb.9.1395406719892; Fri, 21 Mar 2014 05:58:39 -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 i9csp28631vck; Fri, 21 Mar 2014 05:58:39 -0700 (PDT) X-Received: by 10.194.19.161 with SMTP id g1mr37742493wje.20.1395406716501; Fri, 21 Mar 2014 05:58:36 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id lr5si3588915wjb.138.2014.03.21.05.58.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 05:58:36 -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 1WQyza-0004mF-S5; Fri, 21 Mar 2014 12:56:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyz4-0004rS-GF; Fri, 21 Mar 2014 12:55:38 +0000 Received: from mail-pd0-f175.google.com ([209.85.192.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyyD-0004fa-8Z for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:54:46 +0000 Received: by mail-pd0-f175.google.com with SMTP id x10so2313164pdj.20 for ; Fri, 21 Mar 2014 05:54:24 -0700 (PDT) X-Received: by 10.68.191.200 with SMTP id ha8mr53233383pbc.66.1395406464135; Fri, 21 Mar 2014 05:54:24 -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.20 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:54:23 -0700 (PDT) From: Anup Patel To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v5 06/11] ARM/ARM64: KVM: Emulate PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET Date: Fri, 21 Mar 2014 18:23:29 +0530 Message-Id: <1395406414-11707-7-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_085445_359883_EA3AE4CE X-CRM114-Status: GOOD ( 10.67 ) 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.175 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.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 The PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET functions are system-level functions hence cannot be fully emulated by in-kernel PSCI emulation code. To tackle this, we forward PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET function calls from vcpu to user space (i.e. QEMU or KVMTOOL) via kvm_run structure using KVM_EXIT_SYSTEM_EVENT exit reasons. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar --- arch/arm/kvm/psci.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c index 252acd0..1f1720a 100644 --- a/arch/arm/kvm/psci.c +++ b/arch/arm/kvm/psci.c @@ -85,6 +85,23 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) return KVM_PSCI_RET_SUCCESS; } +static inline void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type) +{ + memset(&vcpu->run->system_event, 0, sizeof(vcpu->run->system_event)); + vcpu->run->system_event.type = type; + vcpu->run->exit_reason = KVM_EXIT_SYSTEM_EVENT; +} + +static void kvm_psci_system_off(struct kvm_vcpu *vcpu) +{ + kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_SHUTDOWN); +} + +static void kvm_psci_system_reset(struct kvm_vcpu *vcpu) +{ + kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_RESET); +} + int kvm_psci_version(struct kvm_vcpu *vcpu) { if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) @@ -95,6 +112,7 @@ int kvm_psci_version(struct kvm_vcpu *vcpu) static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) { + int ret = 1; unsigned long psci_fn = *vcpu_reg(vcpu, 0) & ~((u32) 0); unsigned long val; @@ -114,13 +132,21 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) case KVM_PSCI_0_2_FN64_CPU_ON: val = kvm_psci_vcpu_on(vcpu); break; + case KVM_PSCI_0_2_FN_SYSTEM_OFF: + kvm_psci_system_off(vcpu); + val = KVM_PSCI_RET_SUCCESS; + ret = 0; + break; + case KVM_PSCI_0_2_FN_SYSTEM_RESET: + kvm_psci_system_reset(vcpu); + val = KVM_PSCI_RET_SUCCESS; + ret = 0; + break; case KVM_PSCI_0_2_FN_CPU_SUSPEND: case KVM_PSCI_0_2_FN_AFFINITY_INFO: case KVM_PSCI_0_2_FN_MIGRATE: case KVM_PSCI_0_2_FN_MIGRATE_INFO_TYPE: case KVM_PSCI_0_2_FN_MIGRATE_INFO_UP_CPU: - case KVM_PSCI_0_2_FN_SYSTEM_OFF: - case KVM_PSCI_0_2_FN_SYSTEM_RESET: case KVM_PSCI_0_2_FN64_CPU_SUSPEND: case KVM_PSCI_0_2_FN64_AFFINITY_INFO: case KVM_PSCI_0_2_FN64_MIGRATE: @@ -132,7 +158,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) } *vcpu_reg(vcpu, 0) = val; - return 1; + return ret; } static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu)