From patchwork Tue Apr 1 11:53:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PranavkumarSawargaonkar X-Patchwork-Id: 27533 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 424A320341 for ; Tue, 1 Apr 2014 11:55:45 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f10sf24308186yha.3 for ; Tue, 01 Apr 2014 04:55:44 -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=VCqaYbPTiqKYXeXzb/gAT/zqBtLQga5XO3SBWswmBTtwd8yjE8lHbvRVKh8F6tubas HO6qRrjz2a5/OPdw6NwF0obpnNZAdegahglWzEiytbPpV/QExlaiBYnkdAtcyAtj8hdr d/OizH7/R3Y189phW6VZ0iK42jsvmU947nPu5TQ4QIlYF7y4IWkC2UUAOxXZYaJLoly/ b+EeAQPezRu4McJTOxH1hgc41veQi9mx7aIY4sCob0X5A3ZuVbgNJwoLzSfX4FhLvIzv kSgHpuqXM1ZOXu8+k7zPxw8Qjebsd9/uRExE4JYxW/Sm+pNCUxTP6TQBaOQJMnqHuPTK mG5w== X-Gm-Message-State: ALoCoQkrwp5vhEoV4j6FXBNm7puBjKUQnKVfezwwy7wBQqSieyKPqvqaPwL/9CgmZo6Ejg+WDSb4 X-Received: by 10.236.87.73 with SMTP id x49mr10343971yhe.30.1396353344919; Tue, 01 Apr 2014 04:55:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.169 with SMTP id o38ls2929272qge.37.gmail; Tue, 01 Apr 2014 04:55:44 -0700 (PDT) X-Received: by 10.52.173.165 with SMTP id bl5mr23632119vdc.13.1396353344804; Tue, 01 Apr 2014 04:55:44 -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 sj4si3560024vdc.84.2014.04.01.04.55.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 04:55:44 -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 ik5so9933085vcb.28 for ; Tue, 01 Apr 2014 04:55:44 -0700 (PDT) X-Received: by 10.220.167.2 with SMTP id o2mr28263785vcy.8.1396353344725; Tue, 01 Apr 2014 04:55: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 v8csp229854vcv; Tue, 1 Apr 2014 04:55:44 -0700 (PDT) X-Received: by 10.229.198.2 with SMTP id em2mr1972501qcb.21.1396353344298; Tue, 01 Apr 2014 04:55:44 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h59si3110822qge.67.2014.04.01.04.55.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 01 Apr 2014 04:55:44 -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]:59746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUxI7-0008VR-MC for patch@linaro.org; Tue, 01 Apr 2014 07:55:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUxGw-0006wW-E0 for qemu-devel@nongnu.org; Tue, 01 Apr 2014 07:54:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUxGq-0007YD-Gw for qemu-devel@nongnu.org; Tue, 01 Apr 2014 07:54:30 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:47009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUxGq-0007XH-Bi for qemu-devel@nongnu.org; Tue, 01 Apr 2014 07:54:24 -0400 Received: by mail-pa0-f44.google.com with SMTP id bj1so9724949pad.17 for ; Tue, 01 Apr 2014 04:54:23 -0700 (PDT) X-Received: by 10.66.145.166 with SMTP id sv6mr31262542pab.31.1396353263632; Tue, 01 Apr 2014 04:54:23 -0700 (PDT) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id ix2sm49532958pbc.45.2014.04.01.04.54.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 04:54:22 -0700 (PDT) From: Pranavkumar Sawargaonkar To: qemu-devel@nongnu.org Date: Tue, 1 Apr 2014 17:23:49 +0530 Message-Id: <1396353232-3835-4-git-send-email-pranavkumar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396353232-3835-1-git-send-email-pranavkumar@linaro.org> References: <1396353232-3835-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.220.44 Cc: peter.maydell@linaro.org, Anup Patel , patches@apm.com, kvmarm@list.cs.columbia.edu, christoffer.dall@linaro.org, Pranavkumar Sawargaonkar Subject: [Qemu-devel] [RFC PATCH V2 3/6] 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);