From patchwork Tue Sep 9 07:31:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 37035 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 148AC20491 for ; Tue, 9 Sep 2014 07:32:00 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id hn18sf3074894igb.5 for ; Tue, 09 Sep 2014 00:31:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=BhE8lxpm+vRpwHR/uTBJnIlba6xkNfkO1Zp3iiPpNfk=; b=kbdNoImvP+Eo4RtvP01zRsOywaYgGXusjP6FjG04XKJ1mYLIrltFJCyOySrpNp3wZg uA7lIjoe6OL3DISN2fOXCkmEjCU0eU2nKRwiecL0TrF/EobcOC971KMTlbn0P/nfWGOQ UCo4EvmaNA/szVnN0UmaiKLLdiR616/ll7V8b5dY/S4nyC5dR3GllKebn8v+FFBfSczz 06GRAv0ms2WP1k4z3eBECVKtHZsYtWvNmAs+Jcm1WdNUALHzSO8i8TuPOy4mVITMEcoa ww+tajlZY7gfqyIOiKSiDeYo0lLSGoEFsXN6QYF2F2Li+PYZmdy5GEVdGYJ1upkjXJDv 5Ubw== X-Gm-Message-State: ALoCoQnsy/jIQUpgLbaVmny1JVBW304MCGGxEy85D6Sr04GsPlcG2UG0RTn/0XXTlnDMGCo0S/1F X-Received: by 10.42.58.138 with SMTP id i10mr21268978ich.18.1410247919664; Tue, 09 Sep 2014 00:31:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.34 with SMTP id y31ls813112qgd.2.gmail; Tue, 09 Sep 2014 00:31:59 -0700 (PDT) X-Received: by 10.220.46.5 with SMTP id h5mr667796vcf.55.1410247919552; Tue, 09 Sep 2014 00:31:59 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id hf10si3592359vdb.57.2014.09.09.00.31.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id lf12so16631812vcb.34 for ; Tue, 09 Sep 2014 00:31:59 -0700 (PDT) X-Received: by 10.220.112.143 with SMTP id w15mr4605637vcp.41.1410247919473; Tue, 09 Sep 2014 00:31:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp244053vcb; Tue, 9 Sep 2014 00:31:58 -0700 (PDT) X-Received: by 10.194.186.178 with SMTP id fl18mr40501420wjc.8.1410247918563; Tue, 09 Sep 2014 00:31:58 -0700 (PDT) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by mx.google.com with ESMTPS id m9si17011952wiv.5.2014.09.09.00.31.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:58 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.181 as permitted sender) client-ip=209.85.212.181; Received: by mail-wi0-f181.google.com with SMTP id e4so3897660wiv.14 for ; Tue, 09 Sep 2014 00:31:58 -0700 (PDT) X-Received: by 10.180.21.199 with SMTP id x7mr28587942wie.73.1410247918178; Tue, 09 Sep 2014 00:31:58 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id s1sm14513743wiw.6.2014.09.09.00.31.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:57 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, alex.williamson@redhat.com Subject: [PATCH v6 11/16] hw/arm/dyn_sysbus_devtree: enable vfio-calxeda-xgmac dynamic instantiation Date: Tue, 9 Sep 2014 08:31:11 +0100 Message-Id: <1410247876-4967-12-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410247876-4967-1-git-send-email-eric.auger@linaro.org> References: <1410247876-4967-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , vfio-calxeda-xgmac now can be instantiated using the -device option Signed-off-by: Eric Auger --- v2 -> v3: - correct bug of reg_attr[2*i] in vfio_fdt_add_device_node - fix a bug related to compat_str_len computed on original compat instead of corrected compat - wrap_vfio_fdt_add_node take a node creation function: this function needs to be specialized for each VFIO device. wrap function must be called in sysbus_device_create_devtree --- hw/arm/dyn_sysbus_devtree.c | 141 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/hw/arm/dyn_sysbus_devtree.c b/hw/arm/dyn_sysbus_devtree.c index 61e5b5f..3ef9430 100644 --- a/hw/arm/dyn_sysbus_devtree.c +++ b/hw/arm/dyn_sysbus_devtree.c @@ -20,6 +20,141 @@ #include "hw/arm/dyn_sysbus_devtree.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" +#include "hw/vfio/vfio-platform.h" +#include "hw/vfio/vfio-calxeda-xgmac.h" + +typedef void (*vfio_fdt_add_device_node_t)(SysBusDevice *sbdev, void *opaque); + +static char *format_compat(char * compat) +{ + char *str_ptr, *corrected_compat; + /* + * process compatibility property string passed by end-user + * replaces / by , and ; by NUL character + */ + corrected_compat = g_strdup(compat); + + str_ptr = corrected_compat; + while ((str_ptr = strchr(str_ptr, '/')) != NULL) { + *str_ptr = ','; + } + + /* substitute ";" with the NUL char */ + str_ptr = corrected_compat; + while ((str_ptr = strchr(str_ptr, ';')) != NULL) { + *str_ptr = '\0'; + } + + /* + * corrected compat includes a "\0" before or at the same location + * as compat's one + */ + return corrected_compat; +} + +static void wrap_vfio_fdt_add_node(SysBusDevice *sbdev, void *opaque, + vfio_fdt_add_device_node_t add_node_fn) +{ + PlatformDevtreeData *data = opaque; + VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev); + VFIODevice *vbasedev = &vdev->vbasedev; + gchar irq_number_prop[8]; + Object *obj = OBJECT(sbdev); + char *corrected_compat; + uint64_t irq_number; + int corrected_compat_str_len, i; + + corrected_compat = format_compat(vdev->compat); + corrected_compat_str_len = strlen(corrected_compat) + 1; + /* we copy the corrected_compat string + its "\0" */ + snprintf(vdev->compat, corrected_compat_str_len, "%s", corrected_compat); + g_free(corrected_compat); + + add_node_fn(sbdev, opaque); + + for (i = 0; i < vbasedev->num_irqs; i++) { + snprintf(irq_number_prop, sizeof(irq_number_prop), "irq[%d]", i); + irq_number = object_property_get_int(obj, irq_number_prop, NULL) + + data->irq_start; + /* + * for setting irqfd up we must provide the virtual IRQ number + * which is the sum of irq_start and actual platform bus irq + * index. At realize point we do not have this info. + */ + vfio_start_irq_injection(sbdev, i, irq_number); + } +} + +static void vfio_basic_fdt_add_device_node(SysBusDevice *sbdev, + void *opaque) +{ + PlatformDevtreeData *data = opaque; + void *fdt = data->fdt; + const char *parent_node = data->node; + int compat_str_len; + char *nodename; + int i, ret; + uint32_t *irq_attr; + uint64_t *reg_attr; + uint64_t mmio_base; + uint64_t irq_number; + gchar mmio_base_prop[8]; + gchar irq_number_prop[8]; + 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); + + reg_attr = g_new(uint64_t, vbasedev->num_regions*4); + + for (i = 0; i < vbasedev->num_regions; i++) { + snprintf(mmio_base_prop, sizeof(mmio_base_prop), "mmio[%d]", i); + mmio_base = object_property_get_int(obj, mmio_base_prop, NULL); + reg_attr[4*i] = 1; + reg_attr[4*i+1] = mmio_base; + reg_attr[4*i+2] = 1; + reg_attr[4*i+3] = memory_region_size(&vdev->regions[i]->mem); + } + + ret = qemu_fdt_setprop_sized_cells_from_array(fdt, nodename, "reg", + vbasedev->num_regions*2, reg_attr); + if (ret < 0) { + error_report("could not set reg property of node %s", nodename); + } + + irq_attr = g_new(uint32_t, vbasedev->num_irqs*3); + + for (i = 0; i < vbasedev->num_irqs; i++) { + snprintf(irq_number_prop, sizeof(irq_number_prop), "irq[%d]", i); + irq_number = object_property_get_int(obj, irq_number_prop, NULL) + + 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); + } + + ret = qemu_fdt_setprop(fdt, nodename, "interrupts", + irq_attr, vbasedev->num_irqs*3*sizeof(uint32_t)); + if (ret < 0) { + error_report("could not set interrupts property of node %s", + nodename); + } + + g_free(nodename); + g_free(irq_attr); + g_free(reg_attr); +} /** * arm_sysbus_device_create_devtree - create the node of devices @@ -41,6 +176,12 @@ static int arm_sysbus_device_create_devtree(Object *obj, void *opaque) arm_sysbus_device_create_devtree, data); } + if (object_dynamic_cast(obj, TYPE_VFIO_CALXEDA_XGMAC)) { + wrap_vfio_fdt_add_node(sbdev, data, + vfio_basic_fdt_add_device_node); + matched = true; + } + if (!matched) { error_report("Device %s is not supported by this machine yet.", qdev_fw_name(DEVICE(dev)));