From patchwork Thu Jan 15 13:05:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 43171 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DAD6B20D60 for ; Thu, 15 Jan 2015 13:05:25 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf8089862eek.1 for ; Thu, 15 Jan 2015 05:05:25 -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:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sNYIGuJ6B7db+hr/CTBFaYUVsnqx3sVgLD8LRSIL+EA=; b=M+whDmsf37sPpseoAOAxg7QaebX2kBI8eK8kQtUxCWyOKnBaA9GKelGKN4Nxr7a2gu 3ctNpSwR2MlTlUyKQL550aCLczRKceJKm4HNU8fknagzRMkQphHYbmwCZ6VSspAhhT8M TeOxK0b+8vOOFp7GF2S2AKgdnA8eXJyAJIa37Nmvzpl+lzYHtP3bbMk0Pjo/hsTo0G0T spoOc2a5U45hYB8j6oJ0MxFE1a7o0KXm0B4gPIJRljKERqzQim/Z48LzZDdi8LKTt13J Enm4DqN+VpORoxwncxIi4hXgKltXwLwR+hSkaY504MOWom0Vk1VuRG4cos6Y0IX6Cyuh 3CCA== X-Gm-Message-State: ALoCoQnkOqKvllRBFV3GUJqZMVQm1rp1/Qs/ynvteCCQ0o82lv86XP/oCDlXao12o5D+sjuOtflY X-Received: by 10.112.137.70 with SMTP id qg6mr236347lbb.14.1421327124763; Thu, 15 Jan 2015 05:05:24 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.131 with SMTP id t3ls225479lag.44.gmail; Thu, 15 Jan 2015 05:05:24 -0800 (PST) X-Received: by 10.112.27.133 with SMTP id t5mr9610960lbg.45.1421327124625; Thu, 15 Jan 2015 05:05:24 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id s3si1321634lbl.128.2015.01.15.05.05.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:05:24 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so13148144lbv.7 for ; Thu, 15 Jan 2015 05:05:24 -0800 (PST) X-Received: by 10.112.64.35 with SMTP id l3mr9546031lbs.82.1421327124507; Thu, 15 Jan 2015 05:05:24 -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.112.9.200 with SMTP id c8csp2026647lbb; Thu, 15 Jan 2015 05:05:24 -0800 (PST) X-Received: by 10.194.75.195 with SMTP id e3mr18309461wjw.44.1421327123857; Thu, 15 Jan 2015 05:05:23 -0800 (PST) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com. [74.125.82.52]) by mx.google.com with ESMTPS id ev12si2692705wjc.67.2015.01.15.05.05.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:05:23 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.52 as permitted sender) client-ip=74.125.82.52; Received: by mail-wg0-f52.google.com with SMTP id x12so14748644wgg.11 for ; Thu, 15 Jan 2015 05:05:23 -0800 (PST) X-Received: by 10.194.2.75 with SMTP id 11mr18576321wjs.78.1421327123589; Thu, 15 Jan 2015 05:05:23 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id w3sm2036665wjf.3.2015.01.15.05.05.22 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:05:22 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, marc.zyngier@arm.com, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org Subject: [RFC v2 1/2] linux-headers: update KVM headers from KVM_DEV_ARM_VGIC_GRP_CTRL Date: Thu, 15 Jan 2015 13:05:10 +0000 Message-Id: <1421327111-1563-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1421327111-1563-1-git-send-email-eric.auger@linaro.org> References: <1421327111-1563-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) 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: , Add a new group/attribute in VGIC KVM device enabling to force vgic init: KVM_DEV_ARM_VGIC_GRP_CTRL/KVM_DEV_ARM_VGIC_CTRL_INIT Update according to headers found in http://git.linaro.org/people/eric.auger/linux.git branch irqfd_v6_integrated_official_release Signed-off-by: Eric Auger --- linux-headers/asm-arm/kvm.h | 5 +++++ linux-headers/asm-arm64/kvm.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h index 09ee408..2499867 100644 --- a/linux-headers/asm-arm/kvm.h +++ b/linux-headers/asm-arm/kvm.h @@ -175,6 +175,8 @@ struct kvm_arch_memory_slot { #define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0 #define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT) #define KVM_DEV_ARM_VGIC_GRP_NR_IRQS 3 +#define KVM_DEV_ARM_VGIC_GRP_CTRL 4 +#define KVM_DEV_ARM_VGIC_CTRL_INIT 0 /* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24 @@ -196,6 +198,9 @@ struct kvm_arch_memory_slot { /* Highest supported SPI, from VGIC_NR_IRQS */ #define KVM_ARM_IRQ_GIC_MAX 127 +/* One single KVM irqchip, ie. the VGIC */ +#define KVM_NR_IRQCHIPS 1 + /* PSCI interface */ #define KVM_PSCI_FN_BASE 0x95c1ba5e #define KVM_PSCI_FN(n) (KVM_PSCI_FN_BASE + (n)) diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h index 8e38878..b35c95a 100644 --- a/linux-headers/asm-arm64/kvm.h +++ b/linux-headers/asm-arm64/kvm.h @@ -161,6 +161,8 @@ struct kvm_arch_memory_slot { #define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0 #define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT) #define KVM_DEV_ARM_VGIC_GRP_NR_IRQS 3 +#define KVM_DEV_ARM_VGIC_GRP_CTRL 4 +#define KVM_DEV_ARM_VGIC_CTRL_INIT 0 /* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24 @@ -182,6 +184,9 @@ struct kvm_arch_memory_slot { /* Highest supported SPI, from VGIC_NR_IRQS */ #define KVM_ARM_IRQ_GIC_MAX 127 +/* One single KVM irqchip, ie. the VGIC */ +#define KVM_NR_IRQCHIPS 1 + /* PSCI interface */ #define KVM_PSCI_FN_BASE 0x95c1ba5e #define KVM_PSCI_FN(n) (KVM_PSCI_FN_BASE + (n))