From patchwork Tue Jun 9 15:55:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 49662 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4AA5D21419 for ; Tue, 9 Jun 2015 15:56:47 +0000 (UTC) Received: by wifx6 with SMTP id x6sf5633117wif.1 for ; Tue, 09 Jun 2015 08:56:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=UPiDRS2JhUrxHcBACPbAPL5Q1Bh7PWjD2W6KZ5HLmJw=; b=lF/KoIhpRpGVyucuKLUuOAQCv5FeZKZs5c6v5Tt0tg+lR4uRQ3pVL/euYjUe8Uubxg 9sCELIUmGvIHxvYtehaBPCTf60mjZu8VFIQzDSCmwlb1JuhcUvzQZhC4Ts3b6t28/sk3 fzV4Qn+d0Q0pkiq318vIvTu+e4YT7hIyzAD3arGYExUNyGpWrRPXo1m4matel1YqFhCr aylN14Egr60TJYpLh8ntffD0m5AZnMYA9sZJuroElwUN5kbHImjoGndcrQ2gRC5TkaTl 9FVyLZtQ0tsTh6OPQv8IoPmdh+4n2WwrC0W49uQqTRz2aExRw40yFaiwB5XtAyiRjdIE uyQw== X-Gm-Message-State: ALoCoQm4wtKD6D9T8LaWjvh6osDTTaFbUVKaQ9lZSdslwt6P2zYFI4HQ8dwkvEty1+1F91FfTCox X-Received: by 10.112.122.13 with SMTP id lo13mr22350090lbb.5.1433865406576; Tue, 09 Jun 2015 08:56:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.37 with SMTP id w5ls86845laa.77.gmail; Tue, 09 Jun 2015 08:56:46 -0700 (PDT) X-Received: by 10.152.3.97 with SMTP id b1mr23554171lab.54.1433865406401; Tue, 09 Jun 2015 08:56:46 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id t11si6101442lbf.65.2015.06.09.08.56.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2015 08:56:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbcue7 with SMTP id ue7so13698291lbc.0 for ; Tue, 09 Jun 2015 08:56:46 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr22702355lac.41.1433865406280; Tue, 09 Jun 2015 08:56:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2706081lbb; Tue, 9 Jun 2015 08:56:44 -0700 (PDT) X-Received: by 10.140.41.9 with SMTP id y9mr26701565qgy.28.1433865404219; Tue, 09 Jun 2015 08:56:44 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b98si5786919qkh.101.2015.06.09.08.56.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 09 Jun 2015 08:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2LtL-00083V-8s for patch@linaro.org; Tue, 09 Jun 2015 11:56:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2LsN-0007Bp-Kr for qemu-devel@nongnu.org; Tue, 09 Jun 2015 11:55:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2Ls8-0006m2-0b for qemu-devel@nongnu.org; Tue, 09 Jun 2015 11:55:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2Ls7-0006lQ-Nl for qemu-devel@nongnu.org; Tue, 09 Jun 2015 11:55:27 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3231D19CBA6; Tue, 9 Jun 2015 15:55:27 +0000 (UTC) Received: from gimli.home (ovpn-113-195.phx2.redhat.com [10.3.113.195]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t59FtQM3009991; Tue, 9 Jun 2015 11:55:26 -0400 From: Alex Williamson To: qemu-devel@nongnu.org Date: Tue, 09 Jun 2015 09:55:26 -0600 Message-ID: <20150609155526.21713.22371.stgit@gimli.home> In-Reply-To: <20150609155320.21713.63776.stgit@gimli.home> References: <20150609155320.21713.63776.stgit@gimli.home> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: alex.williamson@redhat.com, eric.auger@linaro.org Subject: [Qemu-devel] [PULL v2 3/3] hw/vfio/platform: calxeda xgmac device 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.williamson@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Eric Auger The platform device class has become abstract. This patch introduces a calxeda xgmac device that derives from it. Signed-off-by: Eric Auger Reviewed-by: Alex Bennée Signed-off-by: Alex Williamson --- hw/vfio/Makefile.objs | 1 + hw/vfio/calxeda-xgmac.c | 55 ++++++++++++++++++++++++++++++++++ include/hw/vfio/vfio-calxeda-xgmac.h | 46 ++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 hw/vfio/calxeda-xgmac.c create mode 100644 include/hw/vfio/vfio-calxeda-xgmac.h 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..eb914f0 --- /dev/null +++ b/hw/vfio/calxeda-xgmac.c @@ -0,0 +1,55 @@ +/* + * calxeda xgmac 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_calxeda_xgmac_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"; + dc->vmsd = &vfio_platform_calxeda_xgmac_vmstate; +} + +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