From: eric.auger@linaro.org (Eric Auger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] VFIO: platform: populate reset function according to compat
Date: Thu, 7 May 2015 16:27:22 +0200 [thread overview]
Message-ID: <1431008843-28411-5-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1431008843-28411-1-git-send-email-eric.auger@linaro.org>
Add the reset function lookup according to the device compat
string. This lookup is added at different places:
- on VFIO_DEVICE_GET_INFO
- on VFIO_DEVICE_RESET
- on device release
A reference to the module implementing the reset function is taken
on first reset function lookup and released on vfio platform device
release.
Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
drivers/vfio/platform/vfio_platform_common.c | 50 ++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index 0d10018..bd7e44c 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -28,6 +28,52 @@ LIST_HEAD(reset_list);
static DEFINE_MUTEX(driver_lock);
+static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat)
+{
+ struct vfio_platform_reset_node *iter;
+
+ list_for_each_entry(iter, &reset_list, link) {
+ if (!strcmp(iter->compat, compat) &&
+ try_module_get(iter->owner))
+ return iter->reset;
+ }
+
+ return ERR_PTR(-ENODEV);
+}
+
+static vfio_platform_reset_fn_t vfio_platform_get_reset(
+ struct vfio_platform_device *vdev)
+{
+ struct device *dev = vdev->get_device(vdev);
+ const char *compat_str_array[2];
+ vfio_platform_reset_fn_t reset;
+ int ret;
+
+ if (!IS_ERR_OR_NULL(vdev->reset))
+ return vdev->reset;
+
+ ret = device_property_read_string_array(dev, "compatible",
+ compat_str_array, 2);
+ if (!ret)
+ return ERR_PTR(ret);
+
+ reset = vfio_platform_lookup_reset(compat_str_array[0]);
+ return reset;
+}
+
+static void vfio_platform_put_reset(struct vfio_platform_device *vdev)
+{
+ struct vfio_platform_reset_node *iter;
+
+ list_for_each_entry(iter, &reset_list, link) {
+ if (iter->reset == vdev->reset) {
+ module_put(iter->owner);
+ vdev->reset = NULL;
+ return;
+ }
+ }
+}
+
static int vfio_platform_regions_init(struct vfio_platform_device *vdev)
{
int cnt = 0, i;
@@ -103,10 +149,12 @@ static void vfio_platform_release(void *device_data)
mutex_lock(&driver_lock);
if (!(--vdev->refcnt)) {
+ vdev->reset = vfio_platform_get_reset(vdev);
if (!IS_ERR_OR_NULL(vdev->reset))
vdev->reset(vdev);
vfio_platform_regions_cleanup(vdev);
vfio_platform_irq_cleanup(vdev);
+ vfio_platform_put_reset(vdev);
}
mutex_unlock(&driver_lock);
@@ -164,6 +212,7 @@ static long vfio_platform_ioctl(void *device_data,
if (info.argsz < minsz)
return -EINVAL;
+ vdev->reset = vfio_platform_get_reset(vdev);
if (!IS_ERR_OR_NULL(vdev->reset))
vdev->flags |= VFIO_DEVICE_FLAGS_RESET;
info.flags = vdev->flags;
@@ -260,6 +309,7 @@ static long vfio_platform_ioctl(void *device_data,
return ret;
} else if (cmd == VFIO_DEVICE_RESET) {
+ vdev->reset = vfio_platform_get_reset(vdev);
if (!IS_ERR_OR_NULL(vdev->reset))
return vdev->reset(vdev);
else
--
1.9.1
next prev parent reply other threads:[~2015-05-07 14:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 14:27 [PATCH 0/5] VFIO platform reset Eric Auger
2015-05-07 14:27 ` [PATCH 1/5] VFIO: platform: add reset_list and register/unregister functions Eric Auger
2015-05-13 18:32 ` Alex Williamson
2015-05-14 8:25 ` Eric Auger
2015-05-14 15:42 ` Alex Williamson
2015-05-07 14:27 ` [PATCH 2/5] VFIO: platform: add get_device callback Eric Auger
2015-05-13 18:32 ` Alex Williamson
2015-05-14 8:28 ` Eric Auger
2015-05-07 14:27 ` [PATCH 3/5] VFIO: platform: add reset callback Eric Auger
2015-05-13 18:32 ` Alex Williamson
2015-05-14 8:39 ` Eric Auger
2015-05-07 14:27 ` Eric Auger [this message]
2015-05-13 18:33 ` [PATCH 4/5] VFIO: platform: populate reset function according to compat Alex Williamson
2015-05-14 8:57 ` Eric Auger
2015-05-14 15:30 ` Alex Williamson
2015-05-07 14:27 ` [PATCH 5/5] VFIO: platform: VFIO platform Calxeda xgmac reset module Eric Auger
2015-05-13 18:33 ` Alex Williamson
2015-05-14 9:06 ` Eric Auger
2015-05-14 15:14 ` Alex Williamson
2015-05-15 13:35 ` Eric Auger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431008843-28411-5-git-send-email-eric.auger@linaro.org \
--to=eric.auger@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).