From: Eric Auger <eric.auger@linaro.org>
To: eric.auger@st.com, eric.auger@linaro.org,
alex.williamson@redhat.com, b.reynal@virtualopensystems.com,
arnd@arndb.de, linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, patches@linaro.org
Subject: [PATCH 3/4] vfio: platform: add compat in vfio_platform_device
Date: Sun, 18 Oct 2015 18:00:14 +0200 [thread overview]
Message-ID: <1445184015-24414-4-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1445184015-24414-1-git-send-email-eric.auger@linaro.org>
Let's retrieve the compatibility string on probe and store it
in the vfio_platform_device struct
Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
drivers/vfio/platform/vfio_platform_common.c | 15 ++++++++-------
drivers/vfio/platform/vfio_platform_private.h | 1 +
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index d36afc9..31a6a8c 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -38,16 +38,11 @@ static const struct vfio_platform_reset_combo reset_lookup_table[] = {
static void vfio_platform_get_reset(struct vfio_platform_device *vdev,
struct device *dev)
{
- const char *compat;
int (*reset)(struct vfio_platform_device *);
- int ret, i;
-
- ret = device_property_read_string(dev, "compatible", &compat);
- if (ret)
- return;
+ int i;
for (i = 0 ; i < ARRAY_SIZE(reset_lookup_table); i++) {
- if (!strcmp(reset_lookup_table[i].compat, compat)) {
+ if (!strcmp(reset_lookup_table[i].compat, vdev->compat)) {
request_module(reset_lookup_table[i].module_name);
reset = __symbol_get(
reset_lookup_table[i].reset_function_name);
@@ -538,6 +533,12 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev,
struct iommu_group *group;
int ret;
+ ret = device_property_read_string(dev, "compatible", &vdev->compat);
+ if (ret) {
+ pr_err("VFIO: cannot retrieve compat for %s\n", vdev->name);
+ return -EINVAL;
+ }
+
if (!vdev)
return -EINVAL;
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index 17323f0..b274646 100644
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -56,6 +56,7 @@ struct vfio_platform_device {
u32 num_irqs;
int refcnt;
struct mutex igate;
+ const char *compat;
/*
* These fields should be filled by the bus specific binder
--
1.9.1
next prev parent reply other threads:[~2015-10-18 15:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-18 16:00 [PATCH 0/4] VFIO platform reset module rework Eric Auger
2015-10-18 16:00 ` [PATCH 1/4] vfio: platform: add capability to register a reset function Eric Auger
2015-10-19 13:08 ` Arnd Bergmann
2015-10-19 19:45 ` Alex Williamson
2015-10-20 17:48 ` Eric Auger
2015-10-18 16:00 ` [PATCH 2/4] vfio: platform: reset: calxedaxgmac: add reset function registration Eric Auger
2015-10-19 13:04 ` Arnd Bergmann
2015-10-19 13:17 ` Eric Auger
2015-10-19 13:25 ` Arnd Bergmann
2015-10-19 13:34 ` Eric Auger
2015-10-18 16:00 ` Eric Auger [this message]
2015-10-18 16:00 ` [PATCH 4/4] vfio: platform: use list of registered reset function Eric Auger
2015-10-19 13:08 ` [PATCH 0/4] VFIO platform reset module rework Arnd Bergmann
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=1445184015-24414-4-git-send-email-eric.auger@linaro.org \
--to=eric.auger@linaro.org \
--cc=alex.williamson@redhat.com \
--cc=arnd@arndb.de \
--cc=b.reynal@virtualopensystems.com \
--cc=eric.auger@st.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@linaro.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