From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBm3S-0000rt-Qw for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:09:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBm3O-0001HB-QI for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:09:50 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:48948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBm3O-0001Gu-Ih for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:09:46 -0500 Received: by mail-wi0-f170.google.com with SMTP id z2so3096147wiv.1 for ; Thu, 15 Jan 2015 07:09:46 -0800 (PST) Message-ID: <54B7D7D3.2080409@linaro.org> Date: Thu, 15 Jan 2015 16:08:03 +0100 From: Eric Auger MIME-Version: 1.0 References: <1419265427-24238-1-git-send-email-b.reynal@virtualopensystems.com> <1419265427-24238-3-git-send-email-b.reynal@virtualopensystems.com> In-Reply-To: <1419265427-24238-3-git-send-email-b.reynal@virtualopensystems.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH v2 2/3] hw/vfio: amba device support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Baptiste Reynal , kvmarm@lists.cs.columbia.edu, qemu-devel@nongnu.org Cc: a.motakis@virtualopensystems.com, Alex Williamson , tech@virtualopensystems.com Baptiste, On 12/22/2014 05:23 PM, Baptiste Reynal wrote: > Add VFIO_DEVICE_TYPE_AMBA. > Differentiate amba and platform devices according to compatible string. > > Signed-off-by: Baptiste Reynal > --- > hw/vfio/platform.c | 15 ++++++++++++--- > include/hw/vfio/vfio-common.h | 1 + > 2 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c > index 39eef08..0a96178 100644 > --- a/hw/vfio/platform.c > +++ b/hw/vfio/platform.c > @@ -563,8 +563,13 @@ static int vfio_base_device_init(VFIODevice *vbasedev) > } > > /* Check that the host device exists */ > - snprintf(path, sizeof(path), "/sys/bus/platform/devices/%s/", > - vbasedev->name); > + if (vbasedev->type == VFIO_DEVICE_TYPE_AMBA) { > + snprintf(path, sizeof(path), "/sys/bus/amba/devices/%s/", > + vbasedev->name); > + } else { > + snprintf(path, sizeof(path), "/sys/bus/platform/devices/%s/", > + vbasedev->name); > + } > > if (stat(path, &st) < 0) { > error_report("vfio: error: no such host device: %s", path); > @@ -661,7 +666,11 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp) > VFIODevice *vbasedev = &vdev->vbasedev; > int i, ret; > > - vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM; > + if (strstr(vdev->compat, "arm,primecell")) { > + vbasedev->type = VFIO_DEVICE_TYPE_AMBA; > + } else { > + vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM; > + } > vbasedev->ops = &vfio_platform_ops; > > #ifdef CONFIG_KVM > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 58fd786..2f1b09c 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -49,6 +49,7 @@ extern int vfio_kvm_device_fd; > enum { > VFIO_DEVICE_TYPE_PCI = 0, > VFIO_DEVICE_TYPE_PLATFORM = 1, > + VFIO_DEVICE_TYPE_AMBA = 2, > }; > > typedef struct VFIORegion { > With last version I added a check of the flags in vfio_populate_device following Alex advice. You will need to check AMBA too. Best Regards Eric