From patchwork Fri Feb 5 17:07:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 8237571 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6367FBEEED for ; Fri, 5 Feb 2016 17:07:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8ED0020397 for ; Fri, 5 Feb 2016 17:07:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EA6220383 for ; Fri, 5 Feb 2016 17:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755606AbcBERHq (ORCPT ); Fri, 5 Feb 2016 12:07:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34304 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755596AbcBERHp (ORCPT ); Fri, 5 Feb 2016 12:07:45 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 5883AFB756; Fri, 5 Feb 2016 17:07:45 +0000 (UTC) Received: from apm-mustang-ev3-34.khw.lab.eng.bos.redhat.com (apm-mustang-ev3-34.khw.lab.eng.bos.redhat.com [10.16.184.128]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u15H7aS9017859; Fri, 5 Feb 2016 12:07:44 -0500 From: Wei Huang To: kvmarm@lists.cs.columbia.edu Cc: marc.zyngier@arm.com, christoffer.dall@linaro.org, kvm@vger.kernel.org, hanjun.guo@linaro.org, fu.wei@linaro.org, drjones@redhat.com, wei@redhat.com, al.stone@linaro.org Subject: [PATCH V1 7/7] KVM: GICv3: Add ACPI probing function Date: Fri, 5 Feb 2016 12:07:34 -0500 Message-Id: <1454692054-8984-8-git-send-email-wei@redhat.com> In-Reply-To: <1454692054-8984-1-git-send-email-wei@redhat.com> References: <1454692054-8984-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch implements ACPI probing for GICv3. Signed-off-by: Wei Huang --- virt/kvm/arm/vgic-v3.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/vgic-v3.c b/virt/kvm/arm/vgic-v3.c index 5eca58a..5bfb9cb 100644 --- a/virt/kvm/arm/vgic-v3.c +++ b/virt/kvm/arm/vgic-v3.c @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -260,6 +261,62 @@ out: return ret; } +#ifdef CONFIG_ACPI +static struct acpi_madt_generic_interrupt *vgic_acpi; +static void gic_v3_get_acpi_header(struct acpi_subtable_header *header) +{ + vgic_acpi = (struct acpi_madt_generic_interrupt *)header; +} + +static struct acpi_madt_generic_distributor *dist_acpi; +static void gic_v3_get_dist_header(struct acpi_subtable_header *header) +{ + dist_acpi = (struct acpi_madt_generic_distributor *)header; +} + +static int vgic_v3_acpi_probe(struct vgic_params *vgic) +{ + int irq_mode; + int count = 0; + int ret = 0; + + count = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT, + (acpi_tbl_entry_handler)gic_v3_get_acpi_header, 0); + if (!count) { + ret = -ENODEV; + goto out; + } + + count = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR, + (acpi_tbl_entry_handler)gic_v3_get_dist_header, 0); + if (!count || (dist_acpi->version != ACPI_MADT_GIC_VERSION_V3)) { + ret = -ENODEV; + goto out; + } + + /* IRQ trigger mode */ + irq_mode = (vgic_acpi->flags & ACPI_MADT_VGIC_IRQ_MODE) ? + ACPI_EDGE_SENSITIVE : ACPI_LEVEL_SENSITIVE; + vgic->maint_irq = acpi_register_gsi(NULL, vgic_acpi->vgic_interrupt, + irq_mode, ACPI_ACTIVE_LOW); + if (!vgic->maint_irq) { + kvm_err("failed to get vgic maintenance irq from ACPI\n"); + ret = -ENXIO; + goto out; + } + + vgic->vcpu_phys_base = vgic_acpi->gicv_base_address; + vgic->vcpu_size = SZ_8K; +out: + return ret; +} +#else +static inline int vgic_v3_acpi_probe(struct vgic_params *vgic) +{ + return -ENODEV; +} +#endif /* CONFIG_ACPI */ + /** * vgic_v3_probe - probe for a GICv3 compatible interrupt controller * @ops: address of a pointer to the GICv3 operations @@ -277,8 +334,11 @@ int vgic_v3_probe(const struct vgic_ops **ops, /* DT probing first, then try ACPI probing */ ret = vgic_v3_dt_probe(vgic); - if (ret) - goto out; + if (ret && !acpi_disabled) { + ret = vgic_v3_acpi_probe(vgic); + if (ret) + goto out; + } ich_vtr_el2 = kvm_call_hyp(__vgic_v3_get_ich_vtr_el2);