From patchwork Fri Feb 13 03:37:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 44644 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 62FF321527 for ; Fri, 13 Feb 2015 03:37:35 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id l15sf4660118wiw.0 for ; Thu, 12 Feb 2015 19:37:34 -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=ajCkwWV+xyEMLyxntpJsl8jLcdDrCqTNnIYwI2SPbcQ=; b=IUoiKQcLFXds31cWiRS2LaS8Obf5XD+0Z9PfGxOYt2tJ3Phu9iQRCkG2y1cH1fQkk9 Y3dJCgapbMm3w5kgKQT2xifHJT/LUeMs/nq42TbAMH42TkMvEvfVOeNzrsCgsN4D0zIo NKg9pVmehHDs5S0bmVqVfSkvcIViHo1hlBmH1U44S0afhyKugUGfvZxs5HzaD2JPQJL6 Vb+x1GmUoZN3EfEy9vrYx97R8kYXaVF9Z5x97how0nheROHDPnx7IUfmW8gTBMEPW2Zg DFIFYoa5BGFga+kvAy9XqD4lpyhqSTfiy5M4hYAwNl8qUyih2tvhZP7hu5nI0n4Nh96F dVPg== X-Gm-Message-State: ALoCoQl1emo4p4wjIWDQNPntLi3THarDDNrysfm6G1pXYG4fXqSTDRjw4aqKUD7YPpKhCJZaPTUF X-Received: by 10.180.101.101 with SMTP id ff5mr826686wib.5.1423798654689; Thu, 12 Feb 2015 19:37:34 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.201 with SMTP id e9ls236491lag.67.gmail; Thu, 12 Feb 2015 19:37:34 -0800 (PST) X-Received: by 10.112.85.68 with SMTP id f4mr6098602lbz.106.1423798654533; Thu, 12 Feb 2015 19:37:34 -0800 (PST) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id m1si628655lam.44.2015.02.12.19.37.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Feb 2015 19:37:34 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id u14so13209091lbd.1 for ; Thu, 12 Feb 2015 19:37:34 -0800 (PST) X-Received: by 10.112.26.110 with SMTP id k14mr5943439lbg.29.1423798654419; Thu, 12 Feb 2015 19:37:34 -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.35.133 with SMTP id h5csp820961lbj; Thu, 12 Feb 2015 19:37:34 -0800 (PST) X-Received: by 10.180.98.228 with SMTP id el4mr11852769wib.77.1423798653769; Thu, 12 Feb 2015 19:37:33 -0800 (PST) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com. [209.85.212.169]) by mx.google.com with ESMTPS id fa1si1588606wjd.150.2015.02.12.19.37.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Feb 2015 19:37:33 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.169 as permitted sender) client-ip=209.85.212.169; Received: by mail-wi0-f169.google.com with SMTP id em10so9366385wid.0 for ; Thu, 12 Feb 2015 19:37:33 -0800 (PST) X-Received: by 10.180.149.242 with SMTP id ud18mr2788580wib.94.1423798653136; Thu, 12 Feb 2015 19:37:33 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id a5sm1031181wib.20.2015.02.12.19.37.32 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Feb 2015 19:37:32 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: kvmarm@lists.cs.columbia.edu, patches@linaro.org Subject: [PATCH v3 1/2] linux-headers: update KVM headers from KVM_DEV_ARM_VGIC_GRP_CTRL Date: Fri, 13 Feb 2015 03:37:19 +0000 Message-Id: <1423798640-10499-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1423798640-10499-1-git-send-email-eric.auger@linaro.org> References: <1423798640-10499-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.170 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 3.19 headers. 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))