From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757222AbbCEPnh (ORCPT ); Thu, 5 Mar 2015 10:43:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51040 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757183AbbCEPne (ORCPT ); Thu, 5 Mar 2015 10:43:34 -0500 Message-ID: <54F87982.5090203@redhat.com> Date: Thu, 05 Mar 2015 16:42:58 +0100 From: Laszlo Ersek User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Mark Rutland CC: kvmarm@lists.cs.columbia.edu, Michal Simek , kvm@vger.kernel.org, Marc Zyngier , Andre Przywara , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] KVM: vgic: add virt-capable compatible strings References: <1425566864-5509-1-git-send-email-mark.rutland@arm.com> In-Reply-To: <1425566864-5509-1-git-send-email-mark.rutland@arm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/05/15 15:47, Mark Rutland wrote: > 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 fucntion data aligned. Side note: there's a typo in "function". Laszlo > > Signed-off-by: Mark Rutland > Cc: Andre Przywara > Cc: Christoffer Dall > Cc: Marc Zyngier > Cc: Michal Simek > --- > 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, }, > {}, > }; > >