From patchwork Tue Feb 4 09:37:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 24084 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6492E20445 for ; Tue, 4 Feb 2014 09:37:47 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id h16sf36504195oag.8 for ; Tue, 04 Feb 2014 01:37:46 -0800 (PST) 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:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=f+7/mra92+qVuyKQBuJ5gAEk9J26991adpvfU9hZsks=; b=hU10GXSAsoSihYMJ01vEdKDjvXAJ7DjjMXn3s7J2t0f5ueeGr/chun4qb6g5WJwNZo 8E64QHTiPehNizJiD7zf4DuVEuo9HguX9H3ID75otHTJgc3lf979SkIpQUNF+/seDcj4 F2gpDeOkU1aE7JRslOhEnZKKgOoTm4stG6b5xYA/EcQLP0zZNBoKsPuZEfRg2MDlVjOa uqkaBDFSziZ5Iy4PrU6BkEI4lSN+E203Le7kjIdfQuX5JP5LdbtFl+EsuIFgDuiKGUpW eT/WUUALqUx73Ulr5bnnA+mUgaM1FDnTdMtG0SFUpgChABL1d/MK0kTGTm4hDkBjK6w/ oc0w== X-Gm-Message-State: ALoCoQk778ijXMnpKHTCvXiUuAvuXecS5TqFULcrxdZVK9B2hne3tKQQXNll0kSkVBuHN2EWnuKY X-Received: by 10.50.33.47 with SMTP id o15mr7830432igi.0.1391506666460; Tue, 04 Feb 2014 01:37:46 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.195 with SMTP id 61ls2126461qgv.19.gmail; Tue, 04 Feb 2014 01:37:46 -0800 (PST) X-Received: by 10.52.95.233 with SMTP id dn9mr26922417vdb.3.1391506666389; Tue, 04 Feb 2014 01:37:46 -0800 (PST) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id o6si892265vcn.21.2014.02.04.01.37.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 01:37:46 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.175 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.175; Received: by mail-ve0-f175.google.com with SMTP id c14so5697014vea.6 for ; Tue, 04 Feb 2014 01:37:46 -0800 (PST) X-Received: by 10.53.1.231 with SMTP id bj7mr20453vdd.55.1391506666318; Tue, 04 Feb 2014 01:37:46 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp220928vcz; Tue, 4 Feb 2014 01:37:45 -0800 (PST) X-Received: by 10.66.136.131 with SMTP id qa3mr42195401pab.77.1391506665193; Tue, 04 Feb 2014 01:37:45 -0800 (PST) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by mx.google.com with ESMTPS id of8si11126936pbc.313.2014.02.04.01.37.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 01:37:45 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.170 is neither permitted nor denied by best guess record for domain of anup.patel@linaro.org) client-ip=209.85.192.170; Received: by mail-pd0-f170.google.com with SMTP id p10so8017866pdj.29 for ; Tue, 04 Feb 2014 01:37:44 -0800 (PST) X-Received: by 10.66.25.101 with SMTP id b5mr43019099pag.101.1391506664583; Tue, 04 Feb 2014 01:37:44 -0800 (PST) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id z10sm166478088pas.6.2014.02.04.01.37.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 01:37:43 -0800 (PST) From: Anup Patel To: kvmarm@lists.cs.columbia.edu Cc: linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, patches@apm.com, Marc Zyngier , Christoffer Dall , Anup Patel , Pranavkumar Sawargaonkar Subject: [PATCH] ARM64: KVM: Fix VGIC compile error for Linux-3.14-rc1 Date: Tue, 4 Feb 2014 15:07:20 +0530 Message-Id: <1391506640-1901-1-git-send-email-anup.patel@linaro.org> X-Mailer: git-send-email 1.7.9.5 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.175 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch fixes VGIC compilation for Linux-3.14-rc1 ARM64 kernel. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar --- arch/arm64/include/uapi/asm/kvm.h | 9 +++++++++ virt/kvm/arm/vgic.c | 1 + 2 files changed, 10 insertions(+) diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 31c2f54..cadc318 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -149,6 +149,15 @@ struct kvm_arch_memory_slot { #define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2) #define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2) +/* Device Control API: ARM VGIC */ +#define KVM_DEV_ARM_VGIC_GRP_ADDR 0 +#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 +#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS 2 +#define KVM_DEV_ARM_VGIC_CPUID_SHIFT 32 +#define KVM_DEV_ARM_VGIC_CPUID_MASK (0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT) +#define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0 +#define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT) + /* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24 #define KVM_ARM_IRQ_TYPE_MASK 0xff diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index be456ce..55b0609 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include