From patchwork Sat Aug 9 14:25:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 35192 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 263542136C for ; Sat, 9 Aug 2014 14:26:29 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g18sf28642407oah.10 for ; Sat, 09 Aug 2014 07:26:28 -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=jkT353TobHDBL3/cGoHwIHFQpJuacUGnY4AYWORFvx4=; b=AN5k1yfKkLyLKMzA/X6Pa8uks+xV/WTQo17jsGk80Lvg/2aaOyorBlyuvggUDcNlZ3 sAO5qs/MaW8og4EeFkdqrcICXTYMRhIknjfDvD3vUGzWu3SKwM+/XwGJhSJkRWK1Yy1E FWiPQCfil/0yvsMJBwrhRj0RR83MoUSkPdVgoaVx33j9KXEiTYzQFcx0EnCBDHgkNDfp Xj6TsMkdiEjzAOwEm2vAvxZu9XSAxmr4eUdHdYS1/nKFdXjsShng2G8h0fbcE9jG31UV JIKa6VonJsrTP/v4vQWNxL/+6A8WQXkbWqoNlpf0kcLf20jWPHK4XbFPDRAYoT9ZWU2O qWow== X-Gm-Message-State: ALoCoQmb0FAG1e1c+ZI02Tg0UdcoyCQZS8Sg1rcK94m51ZR6uPjJXkimOQ/SjUWQk+Zgi/a+6akA X-Received: by 10.50.50.130 with SMTP id c2mr5269417igo.4.1407594388578; Sat, 09 Aug 2014 07:26:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.228 with SMTP id 91ls912142qgr.70.gmail; Sat, 09 Aug 2014 07:26:28 -0700 (PDT) X-Received: by 10.220.144.147 with SMTP id z19mr27058047vcu.26.1407594388479; Sat, 09 Aug 2014 07:26:28 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id fc5si3893462vec.99.2014.08.09.07.26.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Aug 2014 07:26:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so9799624vcb.10 for ; Sat, 09 Aug 2014 07:26:28 -0700 (PDT) X-Received: by 10.52.106.198 with SMTP id gw6mr11165418vdb.23.1407594388405; Sat, 09 Aug 2014 07:26:28 -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.37.5 with SMTP id tc5csp34400vcb; Sat, 9 Aug 2014 07:26:27 -0700 (PDT) X-Received: by 10.194.175.41 with SMTP id bx9mr2300049wjc.123.1407594386949; Sat, 09 Aug 2014 07:26:26 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id vu3si16347455wjc.93.2014.08.09.07.26.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Aug 2014 07:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.178 as permitted sender) client-ip=209.85.212.178; Received: by mail-wi0-f178.google.com with SMTP id hi2so2268858wib.17 for ; Sat, 09 Aug 2014 07:26:26 -0700 (PDT) X-Received: by 10.180.11.135 with SMTP id q7mr3221217wib.67.1407594386466; Sat, 09 Aug 2014 07:26:26 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id f3sm19591736wiz.0.2014.08.09.07.26.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Aug 2014 07:26:25 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, kim.phillips@freescale.com, a.rigo@virtualopensystems.com Cc: eric.auger@linaro.org, will.deacon@arm.com, kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com, Bharat.Bhushan@freescale.com, agraf@suse.de, peter.maydell@linaro.org, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, patches@linaro.org, joel.schopp@amd.com Subject: [PATCH v5 10/10] hw/arm/dyn_sysbus_devtree: enable simple VFIO dynamic instantiation Date: Sat, 9 Aug 2014 15:25:49 +0100 Message-Id: <1407594349-9291-11-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1407594349-9291-1-git-send-email-eric.auger@linaro.org> References: <1407594349-9291-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.179 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: , Generates the device node of VFIO devices, if any are invoked in -device option. In case VFIO devices require more complex node generation, they can be handled before. Signed-off-by: Eric Auger --- hw/arm/dyn_sysbus_devtree.c | 138 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/hw/arm/dyn_sysbus_devtree.c b/hw/arm/dyn_sysbus_devtree.c index 56af62f..ac34f07 100644 --- a/hw/arm/dyn_sysbus_devtree.c +++ b/hw/arm/dyn_sysbus_devtree.c @@ -1,6 +1,139 @@ #include "hw/arm/dyn_sysbus_devtree.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" +#include "hw/vfio/vfio-platform.h" + +static void vfio_fdt_add_device_node(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); + /* + * the total length of the string has to include also the last + * NUL char. + */ + + 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'; + } + + return corrected_compat; +} + +static void wrap_vfio_fdt_add_node(SysBusDevice *sbdev, void *opaque) +{ + 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 compat_str_len = strlen(vdev->compat)+1; + int i; + + corrected_compat = format_compat(vdev->compat); + snprintf(vdev->compat, compat_str_len, "%s", corrected_compat); + g_free(corrected_compat); + + vfio_fdt_add_device_node(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. + */ + if (vdev->irqfd_allowed) { + vfio_setup_irqfd(sbdev, i, irq_number); + } + } +} + +static void vfio_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[2*i] = 1; + reg_attr[2*i+1] = mmio_base; + reg_attr[2*i+2] = 1; + reg_attr[2*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); +} int sysbus_device_create_devtree(Object *obj, void *opaque) { @@ -17,6 +150,11 @@ int sysbus_device_create_devtree(Object *obj, void *opaque) return object_child_foreach(obj, sysbus_device_create_devtree, data); } + if (object_dynamic_cast(obj, TYPE_VFIO_PLATFORM)) { + wrap_vfio_fdt_add_node(sbdev, data); + matched = true; + } + if (!matched) { error_report("Device %s is not supported by this machine yet.", qdev_fw_name(DEVICE(dev)));