From patchwork Thu Apr 10 11:46:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PranavkumarSawargaonkar X-Patchwork-Id: 28160 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CDB2220671 for ; Thu, 10 Apr 2014 11:49:03 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c1sf10195866igq.10 for ; Thu, 10 Apr 2014 04:49:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=fAWnDq2d69cVSTmZuSB7611eKg+8tZWJEguI0o30UOc=; b=atbJU98gEq5eqyZrGxAF3aWhWb1/4zllh/GLv9DBtaaiEOgDoR4vA+DyY+xtges+4c obPgNNnX2LBzaSey/uiyAGUotxq2Y1nf+7gL13Yqz7AcoeNVdHkmcw4TqSlx8M/4lrIe UNTSVAg9qIMexf2aCPcu4emQPz7jF/F/Pa2i0xbP+uX8Sewqpb1oV7keIlBMZE2qJH+p Tetf5/Oc17B9imB9ljtSfZNgNYZYW4glqK7x/h9me37Kzg7dfODEQSt/nnY4N3CfuUX9 8zqnbCFrJq89eqsCVzMghbmieiEP1WFJl4rDUJ0lmu2/upw2BsvgSLoLZVJKB5d0Qc/B BJfw== X-Gm-Message-State: ALoCoQnB53ymgfLMpg9RZBjQUojSr7kk3poC5eb8Hh1jrRhvy+KLOlG2f3Ey+MKy554lkVo1O7EH X-Received: by 10.182.60.37 with SMTP id e5mr7991381obr.30.1397130542965; Thu, 10 Apr 2014 04:49:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.39.100 with SMTP id u91ls963801qgu.74.gmail; Thu, 10 Apr 2014 04:49:02 -0700 (PDT) X-Received: by 10.52.128.231 with SMTP id nr7mr11853338vdb.17.1397130542815; Thu, 10 Apr 2014 04:49:02 -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 z3si598923vcx.196.2014.04.10.04.49.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 04:49:02 -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 ik5so3433304vcb.28 for ; Thu, 10 Apr 2014 04:49:02 -0700 (PDT) X-Received: by 10.221.4.66 with SMTP id ob2mr179420vcb.28.1397130542749; Thu, 10 Apr 2014 04:49:02 -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.221.72 with SMTP id ib8csp52563vcb; Thu, 10 Apr 2014 04:49:02 -0700 (PDT) X-Received: by 10.224.22.65 with SMTP id m1mr1411206qab.103.1397130542250; Thu, 10 Apr 2014 04:49:02 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v6si1744577qas.206.2014.04.10.04.49.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 10 Apr 2014 04:49:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:50415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYDTZ-00040s-SD for patch@linaro.org; Thu, 10 Apr 2014 07:49:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYDSY-0002h5-Kh for qemu-devel@nongnu.org; Thu, 10 Apr 2014 07:48:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYDSS-0002TQ-ND for qemu-devel@nongnu.org; Thu, 10 Apr 2014 07:47:58 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:56280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYDSS-0002TG-HX for qemu-devel@nongnu.org; Thu, 10 Apr 2014 07:47:52 -0400 Received: by mail-pb0-f51.google.com with SMTP id uo5so3833949pbc.24 for ; Thu, 10 Apr 2014 04:47:51 -0700 (PDT) X-Received: by 10.66.180.34 with SMTP id dl2mr19289750pac.124.1397130471874; Thu, 10 Apr 2014 04:47:51 -0700 (PDT) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id kt8sm19638002pab.7.2014.04.10.04.47.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 04:47:50 -0700 (PDT) From: Pranavkumar Sawargaonkar To: qemu-devel@nongnu.org Date: Thu, 10 Apr 2014 17:16:50 +0530 Message-Id: <1397130414-5551-4-git-send-email-pranavkumar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397130414-5551-1-git-send-email-pranavkumar@linaro.org> References: <1397130414-5551-1-git-send-email-pranavkumar@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.51 Cc: peter.maydell@linaro.org, Anup Patel , patches@apm.com, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, Pranavkumar Sawargaonkar Subject: [Qemu-devel] [RFC PATCH V3 3/7] target-arm: Enable KVM_ARM_VCPU_PSCI_0_2 feature when possible X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pranavkumar@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 Latest linux kernel supports in-kernel emulation of PSCI v0.2 but to enable it we need to select KVM_ARM_VCPU_PSCI_0_2 feature using KVM_ARM_VCPU_INIT ioctl. Also, we can use KVM_ARM_VCPU_PSCI_0_2 feature for VCPU only when linux kernel has KVM_CAP_ARM_PSCI_0_2 capability. This patch updates kvm_arch_init_vcpu() to enable KVM_ARM_VCPU_PSCI_0_2 feature for VCPU when KVM ARM/ARM64 has KVM_CAP_ARM_PSCI_0_2 capability. Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel --- target-arm/kvm32.c | 5 ++++- target-arm/kvm64.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/target-arm/kvm32.c b/target-arm/kvm32.c index a4fde07..afeff01 100644 --- a/target-arm/kvm32.c +++ b/target-arm/kvm32.c @@ -181,7 +181,10 @@ int kvm_arch_init_vcpu(CPUState *cs) init.target = cpu->kvm_target; memset(init.features, 0, sizeof(init.features)); if (cpu->start_powered_off) { - init.features[0] = 1 << KVM_ARM_VCPU_POWER_OFF; + init.features[0] |= 1 << KVM_ARM_VCPU_POWER_OFF; + } + if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { + init.features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2; } ret = kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_INIT, &init); if (ret) { diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c index 1b7ca90..02bba45 100644 --- a/target-arm/kvm64.c +++ b/target-arm/kvm64.c @@ -90,7 +90,10 @@ int kvm_arch_init_vcpu(CPUState *cs) init.target = cpu->kvm_target; memset(init.features, 0, sizeof(init.features)); if (cpu->start_powered_off) { - init.features[0] = 1 << KVM_ARM_VCPU_POWER_OFF; + init.features[0] |= 1 << KVM_ARM_VCPU_POWER_OFF; + } + if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { + init.features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2; } ret = kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_INIT, &init);