From patchwork Wed Feb 11 16:22:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Reynal X-Patchwork-Id: 438876 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0C88F14029D for ; Thu, 12 Feb 2015 03:23:50 +1100 (AEDT) Received: from localhost ([::1]:45785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLa4q-0006qP-5j for incoming@patchwork.ozlabs.org; Wed, 11 Feb 2015 11:23:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLa46-0005cx-CN for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:23:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLa41-0002pF-MI for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:23:02 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:35951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLa41-0002p9-EG for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:22:57 -0500 Received: by mail-wi0-f179.google.com with SMTP id hi2so6258481wib.0 for ; Wed, 11 Feb 2015 08:22:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qrpq5iM3BFtFtaWc+vW4/N9BXuCx26apEbDyjVYblOY=; b=ieQLZUeHvXVHvC5cjPsrWWagSGH0FR+/1Bf2+aeaK1hIDYyMvhYOLasINOGSoD2vnL GwnTZaup4IqEFTu6tJGycXxfn6XAocRm0nakb+7HaJW+MFpC+eRGz/GwYuK2OTLm/2f0 QWGhUnIYfqugP8uSaVZzFmLaZEGwfsZVvcW2kEU9kGpGGIl8VCOeTqq1B5KmZIxsxrTc EF1i/JACr1xPZ47p1RTkUTlDPNVIxFdfhP0RCoT1igUnGoT1rTyU/iZL1zufds/bNBXV LdlnuwhMKDg/ZaTqK8ddxoAAwFRCldVqJFHHUlQtgYyPzJRVPG5489o9aQP7fC9rDEKr V31A== X-Gm-Message-State: ALoCoQlLeTAf+KGKOUQOYTLdTW5TtErfeSUcj3rqfSUAPfkboosy19BvBrhMIZnx/O0yPSZ7EgwK X-Received: by 10.180.73.40 with SMTP id i8mr56523959wiv.4.1423671776733; Wed, 11 Feb 2015 08:22:56 -0800 (PST) Received: from localhost (LPuteaux-656-1-278-113.w80-15.abo.wanadoo.fr. [80.15.154.113]) by mx.google.com with ESMTPSA id dj5sm1897925wjb.28.2015.02.11.08.22.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 08:22:55 -0800 (PST) From: Baptiste Reynal To: kvmarm@lists.cs.columbia.edu, qemu-devel@nongnu.org Date: Wed, 11 Feb 2015 17:22:01 +0100 Message-Id: <1423671724-13167-2-git-send-email-b.reynal@virtualopensystems.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1423671724-13167-1-git-send-email-b.reynal@virtualopensystems.com> References: <1423671724-13167-1-git-send-email-b.reynal@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.179 Cc: Peter Maydell , tech@virtualopensystems.com, Baptiste Reynal Subject: [Qemu-devel] [RFC PATCH v3 1/3] hw/vfio/sysbus-fdt: helper routines to create fdt nodes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Creates set_interrupts_fdt_node and set_regions_fdt_node for code reusability. Signed-off-by: Baptiste Reynal --- v2 -> v3: handle intermediate ret values in set_regions_fdt_node and set_interrupts_fdt_node --- hw/arm/sysbus-fdt.c | 129 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 91 insertions(+), 38 deletions(-) diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index d4f97f5..bc0944c 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -58,39 +58,59 @@ typedef struct NodeCreationPair { /* Device Specific Code */ /** - * add_calxeda_midway_xgmac_fdt_node + * set_interrupts_fdt_node * - * Generates a very simple node with following properties: - * compatible string, regs, interrupts + * Helper function, generate interrupts property for a given node */ -static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) +static int set_interrupts_fdt_node(char *nodename, SysBusDevice *sbdev, + void *opaque, int type, int flags) { PlatformBusFDTData *data = opaque; PlatformBusDevice *pbus = data->pbus; void *fdt = data->fdt; - const char *parent_node = data->pbus_node_name; - int compat_str_len; - char *nodename; - int i, ret = -1; uint32_t *irq_attr; - uint64_t *reg_attr; - uint64_t mmio_base; uint64_t irq_number; + int i, ret; VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev); VFIODevice *vbasedev = &vdev->vbasedev; - Object *obj = OBJECT(sbdev); - mmio_base = object_property_get_int(obj, "mmio[0]", NULL); + irq_attr = g_new(uint32_t, vbasedev->num_irqs*3); - nodename = g_strdup_printf("%s/%s@%" PRIx64, parent_node, - vbasedev->name, - mmio_base); + for (i = 0; i < vbasedev->num_irqs; i++) { + irq_number = platform_bus_get_irqn(pbus, sbdev , i) + + data->irq_start; + irq_attr[3*i] = cpu_to_be32(type); + irq_attr[3*i+1] = cpu_to_be32(irq_number); + irq_attr[3*i+2] = cpu_to_be32(flags); + } - qemu_fdt_add_subnode(fdt, nodename); + ret = qemu_fdt_setprop(fdt, nodename, "interrupts", + irq_attr, vbasedev->num_irqs*3*sizeof(uint32_t)); - compat_str_len = strlen(vdev->compat) + 1; - qemu_fdt_setprop(fdt, nodename, "compatible", - vdev->compat, compat_str_len); + if (ret < 0) { + error_report("could not set interrupts property of node %s", nodename); + } + g_free(irq_attr); + + return ret; +} + +/** + * set_regions_fdt_node + * + * Helper function, generate reg property for a given node + */ +static int set_regions_fdt_node(char *nodename, SysBusDevice *sbdev, + void *opaque) +{ + PlatformBusFDTData *data = opaque; + PlatformBusDevice *pbus = data->pbus; + void *fdt = data->fdt; + uint64_t *reg_attr; + uint64_t mmio_base; + int i, ret; + VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev); + VFIODevice *vbasedev = &vdev->vbasedev; reg_attr = g_new(uint64_t, vbasedev->num_regions*4); @@ -103,34 +123,67 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) } ret = qemu_fdt_setprop_sized_cells_from_array(fdt, nodename, "reg", - vbasedev->num_regions*2, reg_attr); - if (ret) { + vbasedev->num_regions*2, reg_attr); + + if (ret < 0) { error_report("could not set reg property of node %s", nodename); - goto fail_reg; } + g_free(reg_attr); - irq_attr = g_new(uint32_t, vbasedev->num_irqs*3); + return ret; +} - for (i = 0; i < vbasedev->num_irqs; i++) { - irq_number = platform_bus_get_irqn(pbus, sbdev , i) - + data->irq_start; - irq_attr[3*i] = cpu_to_be32(0); - irq_attr[3*i+1] = cpu_to_be32(irq_number); - irq_attr[3*i+2] = cpu_to_be32(0x4); +/** + * add_calxeda_midway_xgmac_fdt_node + * + * Generates a very simple node with the following properties: + * compatible string, regs, interrupts + */ +static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) +{ + PlatformBusFDTData *data = opaque; + void *fdt = data->fdt; + const char *parent_node = data->pbus_node_name; + int compat_str_len; + char *nodename; + int ret; + uint64_t mmio_base; + VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev); + VFIODevice *vbasedev = &vdev->vbasedev; + Object *obj = OBJECT(sbdev); + + mmio_base = object_property_get_int(obj, "mmio[0]", NULL); + + nodename = g_strdup_printf("%s/%s@%" PRIx64, parent_node, + vbasedev->name, + mmio_base); + + qemu_fdt_add_subnode(fdt, nodename); + + compat_str_len = strlen(vdev->compat) + 1; + qemu_fdt_setprop(fdt, nodename, "compatible", + vdev->compat, compat_str_len); + + ret = set_regions_fdt_node(nodename, sbdev, opaque); + + if (ret < 0) { + goto fail; } - ret = qemu_fdt_setprop(fdt, nodename, "interrupts", - irq_attr, vbasedev->num_irqs*3*sizeof(uint32_t)); - if (ret) { - error_report("could not set interrupts property of node %s", - nodename); + ret = set_interrupts_fdt_node(nodename, sbdev, opaque, 0, 0x4); + + if (ret < 0) { + goto fail; } - g_free(irq_attr); -fail_reg: - g_free(reg_attr); g_free(nodename); - return ret; + + return 0; + +fail: + error_report("could not initialize node %s", nodename); + g_free(nodename); + return -1; } /* list of supported dynamic sysbus devices */