From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNgSV-0005YQ-V3 for qemu-devel@nongnu.org; Tue, 17 Feb 2015 06:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNgSS-0007kh-KF for qemu-devel@nongnu.org; Tue, 17 Feb 2015 06:36:55 -0500 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:40878 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNgSS-0007ka-Au for qemu-devel@nongnu.org; Tue, 17 Feb 2015 06:36:52 -0500 References: <1423799232-10816-1-git-send-email-eric.auger@linaro.org> <1423799232-10816-7-git-send-email-eric.auger@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1423799232-10816-7-git-send-email-eric.auger@linaro.org> Date: Tue, 17 Feb 2015 11:36:49 +0000 Message-ID: <87bnkszs4u.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v10 6/7] hw/arm/sysbus-fdt: enable vfio-calxeda-xgmac dynamic instantiation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Auger Cc: peter.maydell@linaro.org, eric.auger@st.com, patches@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, alex.williamson@redhat.com, pbonzini@redhat.com, b.reynal@virtualopensystems.com, feng.wu@intel.com, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org Eric Auger writes: > vfio-calxeda-xgmac now can be instantiated using the -device option. > The node creation function generates a very basic dt node composed > of the compat, reg and interrupts properties > > Signed-off-by: Eric Auger > > --- > v8 -> v9: > - properly free resources in case of errors in > add_calxeda_midway_xgmac_fdt_node > > v7 -> v8: > - move the add_fdt_node_functions array declaration between the device > specific code and the generic code to avoid forward declarations of > decice specific functions > - rename add_basic_vfio_fdt_node into > add_calxeda_midway_xgmac_fdt_node > > v6 -> v7: > - compat string re-formatting removed since compat string is not exposed > anymore as a user option > - VFIO IRQ kick-off removed from sysbus-fdt and moved to VFIO platform > device > --- > hw/arm/sysbus-fdt.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 83 insertions(+) > > diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c > index 3038b94..d4f97f5 100644 > --- a/hw/arm/sysbus-fdt.c > +++ b/hw/arm/sysbus-fdt.c > @@ -26,6 +26,8 @@ > #include "sysemu/device_tree.h" > #include "hw/platform-bus.h" > #include "sysemu/sysemu.h" > +#include "hw/vfio/vfio-platform.h" > +#include "hw/vfio/vfio-calxeda-xgmac.h" > > /* > * internal struct that contains the information to create dynamic > @@ -53,11 +55,92 @@ typedef struct NodeCreationPair { > int (*add_fdt_node_fn)(SysBusDevice *sbdev, void *opaque); > } NodeCreationPair; > > +/* Device Specific Code */ > + > +/** > + * add_calxeda_midway_xgmac_fdt_node > + * > + * Generates a very simple node with following properties: > + * compatible string, regs, interrupts > + */ > +static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) > +{ > + 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; > + 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++) { > + mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, i); > + 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); Could we use qemu_fdt_setprop_sized_cells() like everyone else to hide the uglyness of the _from_array? > + if (ret) { > + error_report("could not set reg property of node %s", nodename); > + goto fail_reg; > + } > + > + irq_attr = g_new(uint32_t, vbasedev->num_irqs*3); > + > + 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); > + } > + > + ret = qemu_fdt_setprop(fdt, nodename, "interrupts", > + irq_attr, > vbasedev->num_irqs*3*sizeof(uint32_t)); Ditto. > + if (ret) { > + error_report("could not set interrupts property of node %s", > + nodename); > + } > + > + g_free(irq_attr); > +fail_reg: > + g_free(reg_attr); > + g_free(nodename); > + return ret; > +} > + > /* list of supported dynamic sysbus devices */ > static const NodeCreationPair add_fdt_node_functions[] = { > + {TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node}, > {"", NULL}, /* last element */ > }; > > +/* Generic Code */ > + > /** > * add_fdt_node - add the device tree node of a dynamic sysbus device > * -- Alex Bennée