From patchwork Tue Oct 20 16:19:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 55315 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f69.google.com (mail-lf0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id D20C223024 for ; Tue, 20 Oct 2015 16:20:51 +0000 (UTC) Received: by lffv3 with SMTP id v3sf7316771lff.1 for ; Tue, 20 Oct 2015 09:20:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=gVXmH97fIMw14eWwxJ4h6b4Yy78xWPSlEth+Qrt/uaM=; b=Yu4+8g7qYHD5Uw1z5NJMq9NL2tU/JrTEL9DN7uHruAuChqXowSD3wNvw7rOUGps0Av /A4z/MFXLZuRue6pTHnHpfkAOVrJkCjUaGzk3O6I+XjGiX2W+FGC/poiMeCqCRwfmVid uZecSfrvFZyQt83rPzppyCWU6y839VHZ/XX7z38pFoKIuFhv/itrAeRwZk3+VKLaq2cF wEvJ3QFG3ojv0GiT0LP2XVu+KtOXPAaBLAf8ap/2JC41qWcClzi3Yj2bGtA1WWweExC1 JxrqRpPItrlJVH6IqKBZ0Ke6m/vRNimTjPiClvnHJ3GPQ23hydU+5lrFlQ4VfbgGL/yV J2cw== X-Gm-Message-State: ALoCoQlnWpcT8ltBgebEicTet1y0KEfjJ2Van9RY/BL1MeHT0fGOdyt07sN0BR0a0pDhRFf0fXGK X-Received: by 10.112.198.33 with SMTP id iz1mr848499lbc.8.1445358050787; Tue, 20 Oct 2015 09:20:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.91.205 with SMTP id p196ls86185lfb.28.gmail; Tue, 20 Oct 2015 09:20:50 -0700 (PDT) X-Received: by 10.25.165.84 with SMTP id o81mr1620120lfe.80.1445358050637; Tue, 20 Oct 2015 09:20:50 -0700 (PDT) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id be4si2854823lbc.131.2015.10.20.09.20.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 09:20:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lfaz124 with SMTP id z124so8466547lfa.1 for ; Tue, 20 Oct 2015 09:20:50 -0700 (PDT) X-Received: by 10.25.40.130 with SMTP id o124mr1530652lfo.41.1445358050351; Tue, 20 Oct 2015 09:20:50 -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.112.59.35 with SMTP id w3csp2179366lbq; Tue, 20 Oct 2015 09:20:49 -0700 (PDT) X-Received: by 10.202.58.196 with SMTP id h187mr2520226oia.69.1445358049183; Tue, 20 Oct 2015 09:20:49 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id fh4si2372520obb.73.2015.10.20.09.20.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 09:20:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZoZdT-00015m-FS; Tue, 20 Oct 2015 16:19:39 +0000 Received: from mail-lf0-f47.google.com ([209.85.215.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZoZcs-0000Wr-Gx for linux-arm-kernel@lists.infradead.org; Tue, 20 Oct 2015 16:19:03 +0000 Received: by lffz202 with SMTP id z202so8460478lff.3 for ; Tue, 20 Oct 2015 09:18:40 -0700 (PDT) X-Received: by 10.25.144.78 with SMTP id s75mr1619362lfd.116.1445357920385; Tue, 20 Oct 2015 09:18:40 -0700 (PDT) Received: from localhost.localdomain (0187900153.0.fullrate.dk. [2.110.55.193]) by smtp.gmail.com with ESMTPSA id t188sm644170lfe.33.2015.10.20.09.18.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 09:18:39 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [GIT PULL 3/6] KVM: arm: use GIC support unconditionally Date: Tue, 20 Oct 2015 18:19:04 +0200 Message-Id: <1445357947-6022-4-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1445357947-6022-1-git-send-email-christoffer.dall@linaro.org> References: <1445357947-6022-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151020_091902_925545_BECB2E0C X-CRM114-Status: GOOD ( 14.26 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.47 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.47 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , Arnd Bergmann MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@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.215.51 as permitted sender) smtp.mailfrom=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 From: Arnd Bergmann The vgic code on ARM is built for all configurations that enable KVM, but the parent_data field that it references is only present when CONFIG_IRQ_DOMAIN_HIERARCHY is set: virt/kvm/arm/vgic.c: In function 'kvm_vgic_map_phys_irq': virt/kvm/arm/vgic.c:1781:13: error: 'struct irq_data' has no member named 'parent_data' This flag is implied by the GIC driver, and indeed the VGIC code only makes sense if a GIC is present. This changes the CONFIG_KVM symbol to always select GIC, which avoids the issue. Fixes: 662d9715840 ("arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER}") Signed-off-by: Arnd Bergmann Acked-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/kvm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 210ecca..356970f 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -21,6 +21,7 @@ config KVM depends on MMU && OF select PREEMPT_NOTIFIERS select ANON_INODES + select ARM_GIC select HAVE_KVM_CPU_RELAX_INTERCEPT select HAVE_KVM_ARCH_TLB_FLUSH_ALL select KVM_MMIO