From patchwork Thu Jan 15 13:18:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 43179 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 47ED320D60 for ; Thu, 15 Jan 2015 13:18:56 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id x12sf7905020wgg.0 for ; Thu, 15 Jan 2015 05:18:55 -0800 (PST) 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=kxS0cZKUwhq3FHsnHxDDPAUBqCDP0h6TmAZo7wvy3tc=; b=QFBRAuOoAjb+0wfi9TrCG+uONff1/p4eoF7Aq0Z4WYfVunbg3UQ5ZToXOunA8ATwsq Lluwvzt3PPo5T0czRA6tK1IBQ/tkGbjKCc5RmRcmLbmcLgdpWrShNbOqw6mx7cgyTKk+ eHcP775/prPMTyWlIbuZIhWtFNHL83yhX1xcKRC/TsNeHDKx/F9KGdxclRepR5Q5tk47 gX6DgD5OJVv9rxsKYSpQeIpzPraOwdbj/1y+yA/33bvxW/oX0DZ41qdTTem9Xas7o3Z0 ApR3O2YacB+RaHEYBMX8UzyJ4h9uZMbltW8H9/l67+nqrqBj8qVdK966ggEyFiNsbwW/ jy2w== X-Gm-Message-State: ALoCoQldCqjIef/YYBQu2ILV31gk63OLvVQeulhL+TUT5yvaCm9yCq3HW90DVa9ewRmnDX45KnSj X-Received: by 10.112.141.232 with SMTP id rr8mr1261268lbb.0.1421327935531; Thu, 15 Jan 2015 05:18:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.130 with SMTP id b2ls200020laa.27.gmail; Thu, 15 Jan 2015 05:18:55 -0800 (PST) X-Received: by 10.112.12.134 with SMTP id y6mr9816872lbb.34.1421327935388; Thu, 15 Jan 2015 05:18:55 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id oq1si1371386lbb.98.2015.01.15.05.18.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:18:55 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id gd6so13576499lab.1 for ; Thu, 15 Jan 2015 05:18:55 -0800 (PST) X-Received: by 10.112.125.41 with SMTP id mn9mr9637467lbb.80.1421327935287; Thu, 15 Jan 2015 05:18:55 -0800 (PST) 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.112.9.200 with SMTP id c8csp2030738lbb; Thu, 15 Jan 2015 05:18:54 -0800 (PST) X-Received: by 10.180.20.177 with SMTP id o17mr12469606wie.64.1421327930283; Thu, 15 Jan 2015 05:18:50 -0800 (PST) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com. [74.125.82.44]) by mx.google.com with ESMTPS id dt7si32106890wib.35.2015.01.15.05.18.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:18:50 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.44 as permitted sender) client-ip=74.125.82.44; Received: by mail-wg0-f44.google.com with SMTP id y19so14845801wgg.3 for ; Thu, 15 Jan 2015 05:18:50 -0800 (PST) X-Received: by 10.180.24.138 with SMTP id u10mr18557518wif.80.1421327929828; Thu, 15 Jan 2015 05:18:49 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id o2sm7456332wiy.11.2015.01.15.05.18.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 05:18:49 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, kim.phillips@freescale.com, alex.williamson@redhat.com, agraf@suse.de, peter.maydell@linaro.org Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, Bharat.Bhushan@freescale.com, b.reynal@virtualopensystems.com, a.rigo@virtualopensystems.com, a.motakis@virtualopensystems.com, pbonzini@redhat.com, afaerber@suse.de Subject: [PATCH v9 5/7] hw/vfio: calxeda xgmac device Date: Thu, 15 Jan 2015 13:18:15 +0000 Message-Id: <1421327897-1698-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1421327897-1698-1-git-send-email-eric.auger@linaro.org> References: <1421327897-1698-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.215.42 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: , The platform device class has become abstract. This patch introduces a calxeda xgmac device that can be be instantiated on command line using such option. -device vfio-calxeda-xgmac,host="fff51000.ethernet" Signed-off-by: Eric Auger --- v8 -> v9: - renamed calxeda_xgmac.c into calxeda-xgmac.c v7 -> v8: - add a comment in the header about the MMIO regions and IRQ which are exposed by the device v5 -> v6 - back again following Alex Graf advises - fix a bug related to compat override v4 -> v5: removed since device tree was moved to hw/arm/dyn_sysbus_devtree.c v4: creation for device tree specialization --- hw/arm/virt.c | 15 +++++++--- hw/vfio/Makefile.objs | 1 + hw/vfio/calxeda-xgmac.c | 54 ++++++++++++++++++++++++++++++++++++ include/hw/vfio/vfio-calxeda-xgmac.h | 46 ++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 hw/vfio/calxeda-xgmac.c create mode 100644 include/hw/vfio/vfio-calxeda-xgmac.h diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9d65406..d2ada3b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -44,6 +44,7 @@ #include "qemu/error-report.h" #include "hw/arm/sysbus-fdt.h" #include "hw/platform-bus.h" +#include "hw/vfio/vfio-platform.h" #define NUM_VIRTIO_TRANSPORTS 32 @@ -342,7 +343,7 @@ static void fdt_add_gic_node(const VirtBoardInfo *vbi) qemu_fdt_setprop_cell(vbi->fdt, "/intc", "phandle", gic_phandle); } -static void create_gic(const VirtBoardInfo *vbi, qemu_irq *pic) +static DeviceState *create_gic(const VirtBoardInfo *vbi, qemu_irq *pic) { /* We create a standalone GIC v2 */ DeviceState *gicdev; @@ -390,6 +391,7 @@ static void create_gic(const VirtBoardInfo *vbi, qemu_irq *pic) } fdt_add_gic_node(vbi); + return gicdev; } static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) @@ -565,7 +567,8 @@ static void create_fw_cfg(const VirtBoardInfo *vbi) g_free(nodename); } -static void create_platform_bus(VirtBoardInfo *vbi, qemu_irq *pic) +static void create_platform_bus(VirtBoardInfo *vbi, qemu_irq *pic, + DeviceState *gic) { DeviceState *dev; SysBusDevice *s; @@ -604,6 +607,9 @@ static void create_platform_bus(VirtBoardInfo *vbi, qemu_irq *pic) memory_region_add_subregion(sysmem, platform_bus_params.platform_bus_base, sysbus_mmio_get_region(s, 0)); + + /* setup VFIO signaling/IRQFD for all VFIO platform sysbus devices */ + qemu_register_reset(vfio_kick_irqs, gic); } static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) @@ -623,6 +629,7 @@ static void machvirt_init(MachineState *machine) MemoryRegion *ram = g_new(MemoryRegion, 1); const char *cpu_model = machine->cpu_model; VirtBoardInfo *vbi; + DeviceState *gic; if (!cpu_model) { cpu_model = "cortex-a15"; @@ -684,7 +691,7 @@ static void machvirt_init(MachineState *machine) create_flash(vbi); - create_gic(vbi, pic); + gic = create_gic(vbi, pic); create_uart(vbi, pic); @@ -715,7 +722,7 @@ static void machvirt_init(MachineState *machine) * another notifier is registered which adds platform bus nodes. * Notifiers are executed in registration reverse order. */ - create_platform_bus(vbi, pic); + create_platform_bus(vbi, pic, gic); } static bool virt_get_secure(Object *obj, Error **errp) diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index c5c76fe..d540c9d 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -2,4 +2,5 @@ ifeq ($(CONFIG_LINUX), y) obj-$(CONFIG_SOFTMMU) += common.o obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_SOFTMMU) += platform.o +obj-$(CONFIG_SOFTMMU) += calxeda-xgmac.o endif diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c new file mode 100644 index 0000000..199e076 --- /dev/null +++ b/hw/vfio/calxeda-xgmac.c @@ -0,0 +1,54 @@ +/* + * calxeda xgmac example VFIO device + * + * Copyright Linaro Limited, 2014 + * + * Authors: + * Eric Auger + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "hw/vfio/vfio-calxeda-xgmac.h" + +static void calxeda_xgmac_realize(DeviceState *dev, Error **errp) +{ + VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev); + VFIOCalxedaXgmacDeviceClass *k = VFIO_CALXEDA_XGMAC_DEVICE_GET_CLASS(dev); + + vdev->compat = g_strdup("calxeda,hb-xgmac"); + + k->parent_realize(dev, errp); +} + +static const VMStateDescription vfio_platform_vmstate = { + .name = TYPE_VFIO_CALXEDA_XGMAC, + .unmigratable = 1, +}; + +static void vfio_calxeda_xgmac_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VFIOCalxedaXgmacDeviceClass *vcxc = + VFIO_CALXEDA_XGMAC_DEVICE_CLASS(klass); + vcxc->parent_realize = dc->realize; + dc->realize = calxeda_xgmac_realize; + dc->desc = "VFIO Calxeda XGMAC"; +} + +static const TypeInfo vfio_calxeda_xgmac_dev_info = { + .name = TYPE_VFIO_CALXEDA_XGMAC, + .parent = TYPE_VFIO_PLATFORM, + .instance_size = sizeof(VFIOCalxedaXgmacDevice), + .class_init = vfio_calxeda_xgmac_class_init, + .class_size = sizeof(VFIOCalxedaXgmacDeviceClass), +}; + +static void register_calxeda_xgmac_dev_type(void) +{ + type_register_static(&vfio_calxeda_xgmac_dev_info); +} + +type_init(register_calxeda_xgmac_dev_type) diff --git a/include/hw/vfio/vfio-calxeda-xgmac.h b/include/hw/vfio/vfio-calxeda-xgmac.h new file mode 100644 index 0000000..f994775 --- /dev/null +++ b/include/hw/vfio/vfio-calxeda-xgmac.h @@ -0,0 +1,46 @@ +/* + * VFIO calxeda xgmac device + * + * Copyright Linaro Limited, 2014 + * + * Authors: + * Eric Auger + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#ifndef HW_VFIO_VFIO_CALXEDA_XGMAC_H +#define HW_VFIO_VFIO_CALXEDA_XGMAC_H + +#include "hw/vfio/vfio-platform.h" + +#define TYPE_VFIO_CALXEDA_XGMAC "vfio-calxeda-xgmac" + +/** + * This device exposes: + * - a single MMIO region corresponding to its register space + * - 3 IRQS (main and 2 power related IRQs) + */ +typedef struct VFIOCalxedaXgmacDevice { + VFIOPlatformDevice vdev; +} VFIOCalxedaXgmacDevice; + +typedef struct VFIOCalxedaXgmacDeviceClass { + /*< private >*/ + VFIOPlatformDeviceClass parent_class; + /*< public >*/ + DeviceRealize parent_realize; +} VFIOCalxedaXgmacDeviceClass; + +#define VFIO_CALXEDA_XGMAC_DEVICE(obj) \ + OBJECT_CHECK(VFIOCalxedaXgmacDevice, (obj), TYPE_VFIO_CALXEDA_XGMAC) +#define VFIO_CALXEDA_XGMAC_DEVICE_CLASS(klass) \ + OBJECT_CLASS_CHECK(VFIOCalxedaXgmacDeviceClass, (klass), \ + TYPE_VFIO_CALXEDA_XGMAC) +#define VFIO_CALXEDA_XGMAC_DEVICE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(VFIOCalxedaXgmacDeviceClass, (obj), \ + TYPE_VFIO_CALXEDA_XGMAC) + +#endif