From: Sinan Kaya <okaya@codeaurora.org>
To: kvm@vger.kernel.org, timur@codeaurora.org, cov@codeaurora.org,
jcm@redhat.com, eric.auger@linaro.org
Cc: linux-acpi@vger.kernel.org, agross@codeaurora.org,
linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Sinan Kaya <okaya@codeaurora.org>,
Baptiste Reynal <b.reynal@virtualopensystems.com>,
Alex Williamson <alex.williamson@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V6 5/8] vfio: platform: call _RST method when using ACPI
Date: Sat, 28 May 2016 18:01:15 -0400 [thread overview]
Message-ID: <1464472878-27176-6-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1464472878-27176-1-git-send-email-okaya@codeaurora.org>
The device tree code checks for the presence of a reset driver and calls
the of_reset function pointer by looking up the reset driver as a module.
ACPI defines _RST method to perform device level reset. After the _RST
method is executed, the OS can resume using the device. _RST method is
expected to stop DMA transfers and IRQs.
This patch checks the presence of _RST method and calls the _RST
method when reset is requested.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Reviewed-by: Eric Auger <eric.auger@linaro.org>
---
drivers/vfio/platform/vfio_platform_common.c | 51 ++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index e7ce2c2..0ea8c26 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -73,21 +73,66 @@ static int vfio_platform_acpi_probe(struct vfio_platform_device *vdev,
}
return 0;
}
+
+static int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev,
+ const char **extra_dbg)
+{
+ struct device *dev = vdev->device;
+ acpi_handle handle = ACPI_HANDLE(dev);
+ acpi_status acpi_ret;
+ unsigned long long val;
+
+ acpi_ret = acpi_evaluate_integer(handle, "_RST", NULL, &val);
+ if (ACPI_FAILURE(acpi_ret)) {
+ if (extra_dbg)
+ *extra_dbg = acpi_format_exception(acpi_ret);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static bool vfio_platform_acpi_has_reset(struct vfio_platform_device *vdev)
+{
+ struct device *dev = vdev->device;
+ acpi_handle handle = ACPI_HANDLE(dev);
+
+ return acpi_has_method(handle, "_RST");
+}
#else
static inline int vfio_platform_acpi_probe(struct vfio_platform_device *vdev,
struct device *dev)
{
return -ENOENT;
}
+
+static inline
+int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev,
+ const char **extra_dbg)
+{
+ return -ENOENT;
+}
+
+static inline
+bool vfio_platform_acpi_has_reset(struct vfio_platform_device *vdev)
+{
+ return false;
+}
#endif
static bool vfio_platform_has_reset(struct vfio_platform_device *vdev)
{
+ if (vdev->acpihid)
+ return vfio_platform_acpi_has_reset(vdev);
+
return vdev->of_reset ? true : false;
}
static void vfio_platform_get_reset(struct vfio_platform_device *vdev)
{
+ if (vdev->acpihid)
+ return;
+
vdev->of_reset = vfio_platform_lookup_reset(vdev->compat,
&vdev->reset_module);
if (!vdev->of_reset) {
@@ -99,6 +144,9 @@ static void vfio_platform_get_reset(struct vfio_platform_device *vdev)
static void vfio_platform_put_reset(struct vfio_platform_device *vdev)
{
+ if (vdev->acpihid)
+ return;
+
if (vdev->of_reset)
module_put(vdev->reset_module);
}
@@ -177,6 +225,9 @@ static int vfio_platform_call_reset(struct vfio_platform_device *vdev,
if (vdev->of_reset) {
dev_info(vdev->device, "reset\n");
return vdev->of_reset(vdev);
+ } else if (vdev->acpihid) {
+ dev_info(vdev->device, "reset\n");
+ return vfio_platform_acpi_call_reset(vdev, extra_dbg);
}
dev_warn(vdev->device, "no reset function found!\n");
--
1.8.2.1
next prev parent reply other threads:[~2016-05-28 22:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-28 22:01 [PATCH V6 0/8] vfio, platform: add ACPI support Sinan Kaya
2016-05-28 22:01 ` [PATCH V6 1/8] vfio: platform: move reset call to a common function Sinan Kaya
2016-05-28 22:01 ` [PATCH V6 2/8] vfio: platform: determine reset capability Sinan Kaya
2016-05-28 22:01 ` [PATCH V6 3/8] vfio: platform: add support for ACPI probe Sinan Kaya
2016-05-28 22:01 ` [PATCH V6 4/8] vfio: platform: add extra debug info argument to call reset Sinan Kaya
2016-05-28 22:01 ` Sinan Kaya [this message]
2016-06-07 20:14 ` [PATCH V6 5/8] vfio: platform: call _RST method when using ACPI Auger Eric
2016-06-08 22:31 ` Rafael J. Wysocki
2016-06-09 2:33 ` Sinan Kaya
2016-06-13 3:41 ` Sinan Kaya
2016-05-28 22:01 ` [PATCH V6 6/8] vfio, platform: make reset driver a requirement by default Sinan Kaya
2016-06-07 19:59 ` Auger Eric
2016-06-13 2:32 ` Sinan Kaya
2016-05-28 22:01 ` [PATCH V6 7/8] vfio: platform: check reset call return code during open Sinan Kaya
2016-06-07 20:21 ` Auger Eric
2016-06-13 3:12 ` Sinan Kaya
2016-05-28 22:01 ` [PATCH V6 8/8] vfio: platform: check reset call return code during release Sinan Kaya
2016-06-07 20:28 ` Auger Eric
2016-06-07 20:37 ` [PATCH V6 0/8] vfio, platform: add ACPI support Auger Eric
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=1464472878-27176-6-git-send-email-okaya@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=agross@codeaurora.org \
--cc=alex.williamson@redhat.com \
--cc=b.reynal@virtualopensystems.com \
--cc=cov@codeaurora.org \
--cc=eric.auger@linaro.org \
--cc=jcm@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=timur@codeaurora.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).