From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752683AbbEGOae (ORCPT ); Thu, 7 May 2015 10:30:34 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:37530 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752381AbbEGOaT (ORCPT ); Thu, 7 May 2015 10:30:19 -0400 From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, alex.williamson@redhat.com, b.reynal@virtualopensystems.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org, agraf@suse.de, Bharat.Bhushan@freescale.com Subject: [PATCH 2/5] VFIO: platform: add get_device callback Date: Thu, 7 May 2015 16:27:20 +0200 Message-Id: <1431008843-28411-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> References: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is needed to introduce a new callback enabling to retrieve the struct device* from the vfio_platform_device. Implementation depends on the underlying device, platform or amba. This will be used to retrieve the compatibility string of the device. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_amba.c | 9 +++++++++ drivers/vfio/platform/vfio_platform.c | 10 ++++++++++ drivers/vfio/platform/vfio_platform_private.h | 1 + 3 files changed, 20 insertions(+) diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c index ff0331f..fd68115 100644 --- a/drivers/vfio/platform/vfio_amba.c +++ b/drivers/vfio/platform/vfio_amba.c @@ -48,6 +48,14 @@ static int get_amba_irq(struct vfio_platform_device *vdev, int i) return ret ? ret : -ENXIO; } +static struct device *vfio_amba_get_device(struct vfio_platform_device *vdev) +{ + struct amba_device *pdev = (struct amba_device *) vdev->opaque; + struct device *dev = &pdev->dev; + + return dev; +} + static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) { struct vfio_platform_device *vdev; @@ -67,6 +75,7 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) vdev->flags = VFIO_DEVICE_FLAGS_AMBA; vdev->get_resource = get_amba_resource; vdev->get_irq = get_amba_irq; + vdev->get_device = vfio_amba_get_device; ret = vfio_platform_probe_common(vdev, &adev->dev); if (ret) { diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c index cef645c..c025d76 100644 --- a/drivers/vfio/platform/vfio_platform.c +++ b/drivers/vfio/platform/vfio_platform.c @@ -51,6 +51,15 @@ static int get_platform_irq(struct vfio_platform_device *vdev, int i) return platform_get_irq(pdev, i); } +static struct device *vfio_platform_get_device( + struct vfio_platform_device *vdev) +{ + struct platform_device *pdev = (struct platform_device *) vdev->opaque; + struct device *dev = &pdev->dev; + + return dev; +} + static int vfio_platform_probe(struct platform_device *pdev) { struct vfio_platform_device *vdev; @@ -65,6 +74,7 @@ static int vfio_platform_probe(struct platform_device *pdev) vdev->flags = VFIO_DEVICE_FLAGS_PLATFORM; vdev->get_resource = get_platform_resource; vdev->get_irq = get_platform_irq; + vdev->get_device = vfio_platform_get_device; ret = vfio_platform_probe_common(vdev, &pdev->dev); if (ret) diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index da2d60b..68909a4 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -67,6 +67,7 @@ struct vfio_platform_device { struct resource* (*get_resource)(struct vfio_platform_device *vdev, int i); int (*get_irq)(struct vfio_platform_device *vdev, int i); + struct device *(*get_device)(struct vfio_platform_device *vdev); }; typedef int (*vfio_platform_reset_fn_t)(struct vfio_platform_device *vdev); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric.auger@linaro.org (Eric Auger) Date: Thu, 7 May 2015 16:27:20 +0200 Subject: [PATCH 2/5] VFIO: platform: add get_device callback In-Reply-To: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> References: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> Message-ID: <1431008843-28411-3-git-send-email-eric.auger@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org It is needed to introduce a new callback enabling to retrieve the struct device* from the vfio_platform_device. Implementation depends on the underlying device, platform or amba. This will be used to retrieve the compatibility string of the device. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_amba.c | 9 +++++++++ drivers/vfio/platform/vfio_platform.c | 10 ++++++++++ drivers/vfio/platform/vfio_platform_private.h | 1 + 3 files changed, 20 insertions(+) diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c index ff0331f..fd68115 100644 --- a/drivers/vfio/platform/vfio_amba.c +++ b/drivers/vfio/platform/vfio_amba.c @@ -48,6 +48,14 @@ static int get_amba_irq(struct vfio_platform_device *vdev, int i) return ret ? ret : -ENXIO; } +static struct device *vfio_amba_get_device(struct vfio_platform_device *vdev) +{ + struct amba_device *pdev = (struct amba_device *) vdev->opaque; + struct device *dev = &pdev->dev; + + return dev; +} + static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) { struct vfio_platform_device *vdev; @@ -67,6 +75,7 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) vdev->flags = VFIO_DEVICE_FLAGS_AMBA; vdev->get_resource = get_amba_resource; vdev->get_irq = get_amba_irq; + vdev->get_device = vfio_amba_get_device; ret = vfio_platform_probe_common(vdev, &adev->dev); if (ret) { diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c index cef645c..c025d76 100644 --- a/drivers/vfio/platform/vfio_platform.c +++ b/drivers/vfio/platform/vfio_platform.c @@ -51,6 +51,15 @@ static int get_platform_irq(struct vfio_platform_device *vdev, int i) return platform_get_irq(pdev, i); } +static struct device *vfio_platform_get_device( + struct vfio_platform_device *vdev) +{ + struct platform_device *pdev = (struct platform_device *) vdev->opaque; + struct device *dev = &pdev->dev; + + return dev; +} + static int vfio_platform_probe(struct platform_device *pdev) { struct vfio_platform_device *vdev; @@ -65,6 +74,7 @@ static int vfio_platform_probe(struct platform_device *pdev) vdev->flags = VFIO_DEVICE_FLAGS_PLATFORM; vdev->get_resource = get_platform_resource; vdev->get_irq = get_platform_irq; + vdev->get_device = vfio_platform_get_device; ret = vfio_platform_probe_common(vdev, &pdev->dev); if (ret) diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index da2d60b..68909a4 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -67,6 +67,7 @@ struct vfio_platform_device { struct resource* (*get_resource)(struct vfio_platform_device *vdev, int i); int (*get_irq)(struct vfio_platform_device *vdev, int i); + struct device *(*get_device)(struct vfio_platform_device *vdev); }; typedef int (*vfio_platform_reset_fn_t)(struct vfio_platform_device *vdev); -- 1.9.1