Skip to content

Commit

Permalink
vfio: platform: introduce vfio-platform-base module
Browse files Browse the repository at this point in the history
To prepare for vfio platform reset rework let's build
vfio_platform_common.c and vfio_platform_irq.c in a separate
module from vfio-platform and vfio-amba. This makes possible
to have separate module inits and works around a race between
platform driver init and vfio reset module init: that way we
make sure symbols exported by base are available when vfio-platform
driver gets probed.

The open/release being implemented in the base module, the ref
count is applied to the parent module instead.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
  • Loading branch information
Eric Auger authored and awilliam committed Nov 3, 2015
1 parent 1b4bb2e commit 32a2d71
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 4 deletions.
6 changes: 4 additions & 2 deletions drivers/vfio/platform/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@

vfio-platform-y := vfio_platform.o vfio_platform_common.o vfio_platform_irq.o
vfio-platform-base-y := vfio_platform_common.o vfio_platform_irq.o
vfio-platform-y := vfio_platform.o

obj-$(CONFIG_VFIO_PLATFORM) += vfio-platform.o
obj-$(CONFIG_VFIO_PLATFORM) += vfio-platform-base.o
obj-$(CONFIG_VFIO_PLATFORM) += reset/

vfio-amba-y := vfio_amba.o

obj-$(CONFIG_VFIO_AMBA) += vfio-amba.o
obj-$(CONFIG_VFIO_AMBA) += vfio-platform-base.o
obj-$(CONFIG_VFIO_AMBA) += reset/
1 change: 1 addition & 0 deletions drivers/vfio/platform/vfio_amba.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,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->parent_module = THIS_MODULE;

ret = vfio_platform_probe_common(vdev, &adev->dev);
if (ret) {
Expand Down
1 change: 1 addition & 0 deletions drivers/vfio/platform/vfio_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,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->parent_module = THIS_MODULE;

ret = vfio_platform_probe_common(vdev, &pdev->dev);
if (ret)
Expand Down
13 changes: 11 additions & 2 deletions drivers/vfio/platform/vfio_platform_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@

#include "vfio_platform_private.h"

#define DRIVER_VERSION "0.10"
#define DRIVER_AUTHOR "Antonios Motakis <a.motakis@virtualopensystems.com>"
#define DRIVER_DESC "VFIO platform base module"

static DEFINE_MUTEX(driver_lock);

static const struct vfio_platform_reset_combo reset_lookup_table[] = {
Expand Down Expand Up @@ -146,15 +150,15 @@ static void vfio_platform_release(void *device_data)

mutex_unlock(&driver_lock);

module_put(THIS_MODULE);
module_put(vdev->parent_module);
}

static int vfio_platform_open(void *device_data)
{
struct vfio_platform_device *vdev = device_data;
int ret;

if (!try_module_get(THIS_MODULE))
if (!try_module_get(vdev->parent_module))
return -ENODEV;

mutex_lock(&driver_lock);
Expand Down Expand Up @@ -573,3 +577,8 @@ struct vfio_platform_device *vfio_platform_remove_common(struct device *dev)
return vdev;
}
EXPORT_SYMBOL_GPL(vfio_platform_remove_common);

MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
1 change: 1 addition & 0 deletions drivers/vfio/platform/vfio_platform_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ struct vfio_platform_device {
u32 num_irqs;
int refcnt;
struct mutex igate;
struct module *parent_module;

/*
* These fields should be filled by the bus specific binder
Expand Down

0 comments on commit 32a2d71

Please sign in to comment.