From patchwork Wed Dec 17 11:14:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 5506721 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 732F59F456 for ; Wed, 17 Dec 2014 11:14:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86E2F20A25 for ; Wed, 17 Dec 2014 11:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C5A820A28 for ; Wed, 17 Dec 2014 11:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbaLQLOs (ORCPT ); Wed, 17 Dec 2014 06:14:48 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:45507 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751520AbaLQLOo (ORCPT ); Wed, 17 Dec 2014 06:14:44 -0500 Received: from e106785-lin.cambridge.arm.com ([10.1.203.45]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id sBHBEawr026488; Wed, 17 Dec 2014 11:14:37 GMT From: Andre Przywara To: will.deacon@arm.com, penberg@kernel.org Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH v2 3/5] kvmtool: ARM: allow level interrupts in device tree Date: Wed, 17 Dec 2014 11:14:45 +0000 Message-Id: <1418814887-3523-4-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1418814887-3523-1-git-send-email-andre.przywara@arm.com> References: <1418814887-3523-1-git-send-email-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Currently we describe every interrupt for each device in the FDT as being edge triggered. Add a parameter to the irq property generation to allow devices to specify their interrupts as level triggered if needed. Signed-off-by: Andre Przywara --- tools/kvm/arm/fdt.c | 6 +++--- tools/kvm/hw/serial.c | 5 +++-- tools/kvm/include/kvm/ioport.h | 4 +++- tools/kvm/ioport.c | 6 ++++-- tools/kvm/virtio/mmio.c | 5 +++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/kvm/arm/fdt.c b/tools/kvm/arm/fdt.c index 24f030f..918d89f 100644 --- a/tools/kvm/arm/fdt.c +++ b/tools/kvm/arm/fdt.c @@ -74,12 +74,12 @@ static void generate_cpu_nodes(void *fdt, struct kvm *kvm) _FDT(fdt_end_node(fdt)); } -static void generate_irq_prop(void *fdt, u8 irq) +static void generate_irq_prop(void *fdt, u8 irq, u32 irq_type) { u32 irq_prop[] = { cpu_to_fdt32(GIC_FDT_IRQ_TYPE_SPI), cpu_to_fdt32(irq - GIC_SPI_IRQ_BASE), - cpu_to_fdt32(IRQ_TYPE_EDGE_RISING), + cpu_to_fdt32(irq_type) }; _FDT(fdt_property(fdt, "interrupts", irq_prop, sizeof(irq_prop))); @@ -127,7 +127,7 @@ static int setup_fdt(struct kvm *kvm) void *fdt_dest = guest_flat_to_host(kvm, kvm->arch.dtb_guest_start); void (*generate_mmio_fdt_nodes)(void *, struct device_header *, - void (*)(void *, u8)); + void (*)(void *, u8, u32)); void (*generate_cpu_peripheral_fdt_nodes)(void *, struct kvm *, u32) = kvm->cpus[0]->generate_fdt_nodes; diff --git a/tools/kvm/hw/serial.c b/tools/kvm/hw/serial.c index 60147de..37bcd28 100644 --- a/tools/kvm/hw/serial.c +++ b/tools/kvm/hw/serial.c @@ -369,7 +369,8 @@ static bool serial8250_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, #define DEVICE_NAME_MAX_LEN 32 static void serial8250_generate_fdt_node(struct ioport *ioport, void *fdt, void (*generate_irq_prop)(void *fdt, - u8 irq)) + u8 irq, + u32 type)) { char dev_name[DEVICE_NAME_MAX_LEN]; struct serial8250_device *dev = ioport->priv; @@ -384,7 +385,7 @@ static void serial8250_generate_fdt_node(struct ioport *ioport, void *fdt, _FDT(fdt_begin_node(fdt, dev_name)); _FDT(fdt_property_string(fdt, "compatible", "ns16550a")); _FDT(fdt_property(fdt, "reg", reg_prop, sizeof(reg_prop))); - generate_irq_prop(fdt, dev->irq); + generate_irq_prop(fdt, dev->irq, IRQ_TYPE_EDGE_RISING); _FDT(fdt_property_cell(fdt, "clock-frequency", 1843200)); _FDT(fdt_end_node(fdt)); } diff --git a/tools/kvm/include/kvm/ioport.h b/tools/kvm/include/kvm/ioport.h index 18da47c..ffd938d 100644 --- a/tools/kvm/include/kvm/ioport.h +++ b/tools/kvm/include/kvm/ioport.h @@ -31,7 +31,9 @@ struct ioport_operations { bool (*io_in)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); bool (*io_out)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); void (*generate_fdt_node)(struct ioport *ioport, void *fdt, - void (*generate_irq_prop)(void *fdt, u8 irq)); + void (*generate_irq_prop)(void *fdt, + u8 irq, + u32 irq_type)); }; void ioport__setup_arch(struct kvm *kvm); diff --git a/tools/kvm/ioport.c b/tools/kvm/ioport.c index 5bfb7e2..b507cab 100644 --- a/tools/kvm/ioport.c +++ b/tools/kvm/ioport.c @@ -59,7 +59,8 @@ static void ioport_remove(struct rb_root *root, struct ioport *data) static void generate_ioport_fdt_node(void *fdt, struct device_header *dev_hdr, void (*generate_irq_prop)(void *fdt, - u8 irq)) + u8 irq, + u32 irq_type)) { struct ioport *ioport = container_of(dev_hdr, struct ioport, dev_hdr); struct ioport_operations *ops = ioport->ops; @@ -71,7 +72,8 @@ static void generate_ioport_fdt_node(void *fdt, static void generate_ioport_fdt_node(void *fdt, struct device_header *dev_hdr, void (*generate_irq_prop)(void *fdt, - u8 irq)) + u8 irq, + u32 irq_type)) { die("Unable to generate device tree nodes without libfdt\n"); } diff --git a/tools/kvm/virtio/mmio.c b/tools/kvm/virtio/mmio.c index 3a2bd62..1b2fa25 100644 --- a/tools/kvm/virtio/mmio.c +++ b/tools/kvm/virtio/mmio.c @@ -233,7 +233,8 @@ static void virtio_mmio_mmio_callback(struct kvm_cpu *vcpu, static void generate_virtio_mmio_fdt_node(void *fdt, struct device_header *dev_hdr, void (*generate_irq_prop)(void *fdt, - u8 irq)) + u8 irq, + u32 type)) { char dev_name[DEVICE_NAME_MAX_LEN]; struct virtio_mmio *vmmio = container_of(dev_hdr, @@ -250,7 +251,7 @@ static void generate_virtio_mmio_fdt_node(void *fdt, _FDT(fdt_begin_node(fdt, dev_name)); _FDT(fdt_property_string(fdt, "compatible", "virtio,mmio")); _FDT(fdt_property(fdt, "reg", reg_prop, sizeof(reg_prop))); - generate_irq_prop(fdt, vmmio->irq); + generate_irq_prop(fdt, vmmio->irq, IRQ_TYPE_EDGE_RISING); _FDT(fdt_end_node(fdt)); } #else