From patchwork Thu Sep 26 19:56:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 278253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 314BE2C019C for ; Fri, 27 Sep 2013 05:57:04 +1000 (EST) Received: from localhost ([::1]:59721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPHgM-0001zD-4r for incoming@patchwork.ozlabs.org; Thu, 26 Sep 2013 15:57:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPHfm-0001vY-NT for qemu-devel@nongnu.org; Thu, 26 Sep 2013 15:56:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPHfg-00066G-7p for qemu-devel@nongnu.org; Thu, 26 Sep 2013 15:56:26 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:45835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPHfg-000666-1Z for qemu-devel@nongnu.org; Thu, 26 Sep 2013 15:56:20 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz1so1778052pad.16 for ; Thu, 26 Sep 2013 12:56:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ftogvyXQFyiauGsZmsk4Ncc/lMU9muu4rsG3zLUU/To=; b=Me1hyL6I25BG7v6UAivTe/9VBeQJ1vDr2xMe+Idwcao2vcL3zBJtlXtH0hAlcsMXGj tNDi/gFSaKhfQgtcN22J74PzEv4bEl9B8VhuLmzjA/w5OI8FUfqhKgh2cnSs81l0uCgB fZlOT58lOanm1upgmKjAU4YNOc2MI3HlSse0Gq6+3xIV1DJ1sZsZAU2xwBfQ4Pj/5uNh WsPeBrsYjXW0UzzeVJOX1f8YyW72rOBBHd2ruet21vGPxlqfgTkWDWSfCPQOoBLVWHVL Cxg4eEAuU8pSeLI1BInaxKyieaH/jhxEYLekjP2R78o2BANicGeQ42EjuFb+cD6RG9wJ SM3g== X-Gm-Message-State: ALoCoQkRsWI953238yuTmYPDgOlb1tpNdrpGHHaCBxmY/gxsPmfmrIT3fQfhRep07/vp6gePX58P X-Received: by 10.68.216.132 with SMTP id oq4mr3000121pbc.143.1380225379263; Thu, 26 Sep 2013 12:56:19 -0700 (PDT) Received: from localhost.localdomain (c-67-169-181-221.hsd1.ca.comcast.net. [67.169.181.221]) by mx.google.com with ESMTPSA id l8sm4026272pbl.22.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 12:56:18 -0700 (PDT) From: Christoffer Dall To: qemu-devel@nongnu.org Date: Thu, 26 Sep 2013 12:56:10 -0700 Message-Id: <1380225373-22132-2-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1380225373-22132-1-git-send-email-christoffer.dall@linaro.org> References: <1380225373-22132-1-git-send-email-christoffer.dall@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.43 Cc: kvmarm@lists.cs.columbia.edu, Christoffer Dall , patches@linaro.org Subject: [Qemu-devel] [RFC PATCH v2 1/4] kvm: Update headers for device control api 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Update the KVM kernel headers to add support for the device control API on ARM used to create in-kernel devices and set and get attributes on these. This is needed for VGIC save/restore with KVM ARM targets. Headers are included from: git://git.linaro.org/people/cdall/linux-kvm-arm.git vgic-migrate Signed-off-by: Christoffer Dall --- linux-headers/asm-arm/kvm.h | 8 ++++++++ linux-headers/linux/kvm.h | 1 + 2 files changed, 9 insertions(+) diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h index c1ee007..587f1ae 100644 --- a/linux-headers/asm-arm/kvm.h +++ b/linux-headers/asm-arm/kvm.h @@ -142,6 +142,14 @@ struct kvm_arch_memory_slot { #define KVM_REG_ARM_VFP_FPINST 0x1009 #define KVM_REG_ARM_VFP_FPINST2 0x100A +/* 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 diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index c614070..7f66a4f 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -839,6 +839,7 @@ struct kvm_device_attr { #define KVM_DEV_TYPE_FSL_MPIC_20 1 #define KVM_DEV_TYPE_FSL_MPIC_42 2 #define KVM_DEV_TYPE_XICS 3 +#define KVM_DEV_TYPE_ARM_VGIC_V2 4 /* * ioctls for VM fds