From: Marc Zyngier <marc.zyngier@arm.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>
Cc: Michal Simek <monstr@monstr.eu>,
kvm@vger.kernel.org, Andre Przywara <andre.przywara@arm.com>,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu
Subject: [PATCH 01/27] KVM: vgic: add virt-capable compatible strings
Date: Thu, 2 Apr 2015 11:05:05 +0100 [thread overview]
Message-ID: <1427969131-8445-2-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1427969131-8445-1-git-send-email-marc.zyngier@arm.com>
From: Mark Rutland <mark.rutland@arm.com>
Several dts only list "arm,cortex-a7-gic" or "arm,gic-400" in their GIC
compatible list, and while this is correct (and supported by the GIC
driver), KVM will fail to detect that it can support these cases.
This patch adds the missing strings to the VGIC code. The of_device_id
entries are padded to keep the probe function data aligned.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Andre Przywara <andre.przywara@arm.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Michal Simek <monstr@monstr.eu>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
virt/kvm/arm/vgic.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 0cc6ab6..86cec79 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1865,8 +1865,10 @@ static struct notifier_block vgic_cpu_nb = {
};
static const struct of_device_id vgic_ids[] = {
- { .compatible = "arm,cortex-a15-gic", .data = vgic_v2_probe, },
- { .compatible = "arm,gic-v3", .data = vgic_v3_probe, },
+ { .compatible = "arm,cortex-a15-gic", .data = vgic_v2_probe, },
+ { .compatible = "arm,cortex-a7-gic", .data = vgic_v2_probe, },
+ { .compatible = "arm,gic-400", .data = vgic_v2_probe, },
+ { .compatible = "arm,gic-v3", .data = vgic_v3_probe, },
{},
};
--
2.1.4
next prev parent reply other threads:[~2015-04-02 9:57 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 10:05 [GIT PULL] KVM/ARM updates for v4.1 Marc Zyngier
2015-04-02 10:05 ` Marc Zyngier [this message]
2015-04-02 10:05 ` [PATCH 02/27] KVM: arm/arm64: prefer IS_ENABLED to a static variable Marc Zyngier
2015-04-02 10:05 ` [PATCH 03/27] arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER} Marc Zyngier
2015-04-02 10:05 ` [PATCH 04/27] KVM: arm/arm64: unset CONFIG_HAVE_KVM_IRQCHIP Marc Zyngier
2015-04-02 10:05 ` [PATCH 05/27] KVM: introduce kvm_arch_intc_initialized and use it in irqfd Marc Zyngier
2015-04-02 10:05 ` [PATCH 06/27] KVM: arm/arm64: implement kvm_arch_intc_initialized Marc Zyngier
2015-04-02 10:05 ` [PATCH 07/27] KVM: arm/arm64: remove coarse grain dist locking at kvm_vgic_sync_hwstate Marc Zyngier
2015-04-02 10:05 ` [PATCH 08/27] KVM: arm/arm64: add irqfd support Marc Zyngier
2015-04-02 10:05 ` [PATCH 09/27] arm/arm64: KVM: Allow handle_hva_to_gpa to return a value Marc Zyngier
2015-04-02 10:05 ` [PATCH 10/27] arm/arm64: KVM: Implement Stage-2 page aging Marc Zyngier
2015-04-02 10:05 ` [PATCH 11/27] arm/arm64: KVM: Optimize handling of Access Flag faults Marc Zyngier
2015-04-02 10:05 ` [PATCH 12/27] arm/arm64: KVM: export VCPU power state via MP_STATE ioctl Marc Zyngier
2015-04-02 10:05 ` [PATCH 13/27] arm/arm64: KVM: add a common vgic_queue_irq_to_lr fn Marc Zyngier
2015-04-02 10:05 ` [PATCH 14/27] arm/arm64: KVM: support for un-queuing active IRQs Marc Zyngier
2015-04-02 10:05 ` [PATCH 15/27] arm/arm64: KVM: Fix migration race in the arch timer Marc Zyngier
2015-04-02 10:05 ` [PATCH 16/27] KVM: Redesign kvm_io_bus_ API to pass VCPU structure to the callbacks Marc Zyngier
2015-04-02 10:05 ` [PATCH 17/27] KVM: move iodev.h from virt/kvm/ to include/kvm Marc Zyngier
2015-04-02 10:05 ` [PATCH 18/27] KVM: arm/arm64: remove now unneeded include directory from Makefile Marc Zyngier
2015-04-02 10:05 ` [PATCH 19/27] KVM: x86: " Marc Zyngier
2015-04-02 10:05 ` [PATCH 20/27] KVM: arm/arm64: rename struct kvm_mmio_range to vgic_io_range Marc Zyngier
2015-04-02 10:05 ` [PATCH 21/27] KVM: arm/arm64: simplify vgic_find_range() and callers Marc Zyngier
2015-04-02 10:05 ` [PATCH 22/27] KVM: arm/arm64: implement kvm_io_bus MMIO handling for the VGIC Marc Zyngier
2015-04-02 10:05 ` [PATCH 23/27] KVM: arm/arm64: prepare GICv2 emulation to be handled by kvm_io_bus Marc Zyngier
2015-04-02 10:05 ` [PATCH 24/27] KVM: arm/arm64: merge GICv3 RD_base and SGI_base register frames Marc Zyngier
2015-04-02 10:05 ` [PATCH 25/27] KVM: arm/arm64: prepare GICv3 emulation to use kvm_io_bus MMIO handling Marc Zyngier
2015-04-02 10:05 ` [PATCH 26/27] KVM: arm/arm64: rework MMIO abort handling to use KVM MMIO bus Marc Zyngier
2015-04-02 10:05 ` [PATCH 27/27] KVM: arm/arm64: enable KVM_CAP_IOEVENTFD Marc Zyngier
2015-04-02 18:54 ` [GIT PULL] KVM/ARM updates for v4.1 Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427969131-8445-2-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=andre.przywara@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=monstr@monstr.eu \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox