From: David Zhang <yidong.zhang@amd.com>
To: <quic_jhugo@quicinc.com>, <karol.wachowski@linux.intel.com>,
<max.zhen@amd.com>, <lizhi.hou@amd.com>, <ogabbay@kernel.org>,
<dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>
Cc: David Zhang <yidong.zhang@amd.com>, <sonal.santan@amd.com>,
<mario.limonciello@amd.com>
Subject: [PATCH V0 20/21] accel/amdxdna: Implement runtime suspend and resume support
Date: Fri, 25 Sep 2026 18:34:47 -0700 [thread overview]
Message-ID: <20260926013448.3840921-21-yidong.zhang@amd.com> (raw)
In-Reply-To: <20260926013448.3840921-1-yidong.zhang@amd.com>
Add .runtime_suspend and .runtime_resume callbacks to amdxdna_dev_ops
and wire them into RUNTIME_PM_OPS in the PCI driver.
Wake and acquire an RPM reference across amdxdna_sriov_configure()
via amdxdna_pm_resume_get_locked() and amdxdna_pm_suspend_put() so that
SR-IOV management commands execute with the device active. As part of
this, amdxdna_sriov_configure() now returns -EOPNOTSUPP instead of
-ENOENT when ops->sriov_configure is unset.
Update amdxdna_pm.c to implement amdxdna_pm_runtime_suspend() and
amdxdna_pm_runtime_resume(), update autosuspend timestamps using
pm_runtime_mark_last_busy(), and check pm_runtime_enabled().
Implement AIE4 runtime suspend and resume operations:
- For Physical Functions (PF), verify with aie4_vfs_alive() that no VFs
are assigned to virtual machines or actively busy before suspending.
- For Virtual Functions (VF), perform hardware stop independently during
runtime suspend (aie4_vf_runtime_suspend) and restore contexts upon
runtime resume.
- For Classic devices, reuse the existing suspend and resume routines
for runtime power management.
- Update AIE2 dev_ops to hook into runtime suspend and resume.
Signed-off-by: David Zhang <yidong.zhang@amd.com>
---
drivers/accel/amdxdna/aie2_pci.c | 2 ++
drivers/accel/amdxdna/aie4_pci.c | 31 ++++++++++++++++++++++
drivers/accel/amdxdna/aie4_pci.h | 8 ++++++
drivers/accel/amdxdna/aie4_sriov.c | 26 +++++++++++++++++++
drivers/accel/amdxdna/amdxdna_pci_drv.c | 15 ++++++++---
drivers/accel/amdxdna/amdxdna_pci_drv.h | 2 ++
drivers/accel/amdxdna/amdxdna_pm.c | 34 +++++++++++++++++++++++++
drivers/accel/amdxdna/amdxdna_pm.h | 4 ++-
8 files changed, 118 insertions(+), 4 deletions(-)
diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c
index 0d209b7b6484..f90435e1f65e 100644
--- a/drivers/accel/amdxdna/aie2_pci.c
+++ b/drivers/accel/amdxdna/aie2_pci.c
@@ -1207,6 +1207,8 @@ const struct amdxdna_dev_ops aie2_ops = {
.fini = aie2_fini,
.resume = aie2_hw_resume,
.suspend = aie2_hw_suspend,
+ .runtime_resume = aie2_hw_resume,
+ .runtime_suspend = aie2_hw_suspend,
.get_aie_info = aie2_get_info,
.set_aie_state = aie2_set_state,
.hwctx_init = aie2_hwctx_init,
diff --git a/drivers/accel/amdxdna/aie4_pci.c b/drivers/accel/amdxdna/aie4_pci.c
index 3c190003865a..28ac7940b200 100644
--- a/drivers/accel/amdxdna/aie4_pci.c
+++ b/drivers/accel/amdxdna/aie4_pci.c
@@ -1191,6 +1191,17 @@ static int aie4_pf_suspend(struct amdxdna_dev *xdna)
return 0;
}
+static int aie4_pf_runtime_suspend(struct amdxdna_dev *xdna)
+{
+ int ret;
+
+ ret = aie4_vfs_alive(xdna);
+ if (ret)
+ return ret;
+
+ return aie4_pf_suspend(xdna);
+}
+
static int aie4_pf_resume(struct amdxdna_dev *xdna)
{
struct amdxdna_dev_hdl *ndev = xdna->dev_handle;
@@ -1243,6 +1254,20 @@ static int aie4_vf_suspend(struct amdxdna_dev *xdna)
return 0;
}
+static int aie4_vf_runtime_suspend(struct amdxdna_dev *xdna)
+{
+ struct amdxdna_dev_hdl *ndev = xdna->dev_handle;
+ struct pci_dev *pdev = to_pci_dev(xdna->ddev.dev);
+
+ drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));
+ aie4_hwctx_suspend_all(ndev, false);
+ aie4_vf_hw_stop(ndev);
+ pci_disable_device(pdev);
+
+ XDNA_DBG(xdna, "vf runtime suspend done");
+ return 0;
+}
+
static int aie4_vf_resume(struct amdxdna_dev *xdna)
{
struct amdxdna_dev_hdl *ndev = xdna->dev_handle;
@@ -1339,6 +1364,8 @@ const struct amdxdna_dev_ops aie4_pf_ops = {
.sriov_configure = aie4_sriov_configure,
.resume = aie4_pf_resume,
.suspend = aie4_pf_suspend,
+ .runtime_resume = aie4_pf_resume,
+ .runtime_suspend = aie4_pf_runtime_suspend,
};
const struct amdxdna_dev_ops aie4_vf_ops = {
@@ -1353,6 +1380,8 @@ const struct amdxdna_dev_ops aie4_vf_ops = {
.set_aie_state = aie4_set_state,
.resume = aie4_vf_resume,
.suspend = aie4_vf_suspend,
+ .runtime_resume = aie4_vf_resume,
+ .runtime_suspend = aie4_vf_runtime_suspend,
};
const struct amdxdna_dev_ops aie4_classic_ops = {
@@ -1367,4 +1396,6 @@ const struct amdxdna_dev_ops aie4_classic_ops = {
.set_aie_state = aie4_set_state,
.resume = aie4_classic_resume,
.suspend = aie4_classic_suspend,
+ .runtime_resume = aie4_classic_resume,
+ .runtime_suspend = aie4_classic_suspend,
};
diff --git a/drivers/accel/amdxdna/aie4_pci.h b/drivers/accel/amdxdna/aie4_pci.h
index df15c63317b1..062275be7ee7 100644
--- a/drivers/accel/amdxdna/aie4_pci.h
+++ b/drivers/accel/amdxdna/aie4_pci.h
@@ -198,16 +198,24 @@ void aie4_free_notification(struct cert_comp *comp);
int aie4_create_vfs(struct amdxdna_dev_hdl *ndev, int num_vfs);
int aie4_sriov_configure(struct amdxdna_dev *xdna, int num_vfs);
int aie4_sriov_stop(struct amdxdna_dev_hdl *ndev);
+int aie4_vfs_alive(struct amdxdna_dev *xdna);
#else
static inline int aie4_create_vfs(struct amdxdna_dev_hdl *ndev, int num_vfs)
{
return 0;
}
+
#define aie4_sriov_configure NULL
+
static inline int aie4_sriov_stop(struct amdxdna_dev_hdl *ndev)
{
return 0;
}
+
+static inline int aie4_vfs_alive(struct amdxdna_dev *xdna)
+{
+ return 0;
+}
#endif
extern const struct amdxdna_dev_ops aie4_pf_ops;
diff --git a/drivers/accel/amdxdna/aie4_sriov.c b/drivers/accel/amdxdna/aie4_sriov.c
index bfea6ff00ec0..10c8a2648e23 100644
--- a/drivers/accel/amdxdna/aie4_sriov.c
+++ b/drivers/accel/amdxdna/aie4_sriov.c
@@ -6,6 +6,7 @@
#include <drm/amdxdna_accel.h>
#include <drm/drm_print.h>
#include <linux/pci.h>
+#include <linux/pm_runtime.h>
#include "aie.h"
#include "aie4_msg_priv.h"
@@ -120,6 +121,31 @@ static int aie4_link_vf(struct amdxdna_dev *xdna, struct pci_dev *pdev_vf)
return 0;
}
+static int aie4_check_vf_alive(struct amdxdna_dev *xdna, struct pci_dev *pdev_vf)
+{
+ struct device_driver *drv = READ_ONCE(pdev_vf->dev.driver);
+
+ if (drv && drv->owner != THIS_MODULE) {
+ XDNA_WARN(xdna, "VF:%s is in passthrough", pci_name(pdev_vf));
+ return -EBUSY;
+ }
+
+ if (!pm_runtime_suspended(&pdev_vf->dev)) {
+ XDNA_WARN(xdna, "VF:%s is busy", pci_name(pdev_vf));
+ return -EBUSY;
+ }
+ return 0;
+}
+
+int aie4_vfs_alive(struct amdxdna_dev *xdna)
+{
+ if (pci_vfs_assigned(to_pci_dev(xdna->ddev.dev))) {
+ XDNA_WARN(xdna, "VF devices are being used in VMs, cannot suspend");
+ return -EBUSY;
+ }
+ return aie4_for_each_vfs(xdna, aie4_check_vf_alive);
+}
+
static int aie4_link_vfs(struct amdxdna_dev *xdna)
{
return aie4_for_each_vfs(xdna, aie4_link_vf);
diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.c b/drivers/accel/amdxdna/amdxdna_pci_drv.c
index 1d0b91e73260..4933962844f9 100644
--- a/drivers/accel/amdxdna/amdxdna_pci_drv.c
+++ b/drivers/accel/amdxdna/amdxdna_pci_drv.c
@@ -467,18 +467,27 @@ static void amdxdna_remove(struct pci_dev *pdev)
static const struct dev_pm_ops amdxdna_pm_ops = {
SYSTEM_SLEEP_PM_OPS(amdxdna_pm_suspend, amdxdna_pm_resume)
- RUNTIME_PM_OPS(amdxdna_pm_suspend, amdxdna_pm_resume, NULL)
+ RUNTIME_PM_OPS(amdxdna_pm_runtime_suspend, amdxdna_pm_runtime_resume, NULL)
};
static int amdxdna_sriov_configure(struct pci_dev *pdev, int num_vfs)
{
struct amdxdna_dev *xdna = pci_get_drvdata(pdev);
+ int ret;
guard(mutex)(&xdna->dev_lock);
+
+ ret = amdxdna_pm_resume_get_locked(xdna);
+ if (ret)
+ return ret;
+
if (xdna->dev_info->ops->sriov_configure)
- return xdna->dev_info->ops->sriov_configure(xdna, num_vfs);
+ ret = xdna->dev_info->ops->sriov_configure(xdna, num_vfs);
+ else
+ ret = -EOPNOTSUPP;
- return -ENOENT;
+ amdxdna_pm_suspend_put(xdna);
+ return ret;
}
static struct pci_driver amdxdna_pci_driver = {
diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.h b/drivers/accel/amdxdna/amdxdna_pci_drv.h
index 45170c945d71..8c735f184f00 100644
--- a/drivers/accel/amdxdna/amdxdna_pci_drv.h
+++ b/drivers/accel/amdxdna/amdxdna_pci_drv.h
@@ -57,6 +57,8 @@ struct amdxdna_dev_ops {
void (*debugfs_init)(struct amdxdna_dev *xdna);
int (*resume)(struct amdxdna_dev *xdna);
int (*suspend)(struct amdxdna_dev *xdna);
+ int (*runtime_resume)(struct amdxdna_dev *xdna);
+ int (*runtime_suspend)(struct amdxdna_dev *xdna);
int (*sriov_configure)(struct amdxdna_dev *xdna, int num_vfs);
int (*hwctx_init)(struct amdxdna_hwctx *hwctx);
void (*hwctx_fini)(struct amdxdna_hwctx *hwctx);
diff --git a/drivers/accel/amdxdna/amdxdna_pm.c b/drivers/accel/amdxdna/amdxdna_pm.c
index 9c030b7836fb..2b4ce301bb96 100644
--- a/drivers/accel/amdxdna/amdxdna_pm.c
+++ b/drivers/accel/amdxdna/amdxdna_pm.c
@@ -37,11 +37,40 @@ int amdxdna_pm_resume(struct device *dev)
return ret;
}
+int amdxdna_pm_runtime_suspend(struct device *dev)
+{
+ struct amdxdna_dev *xdna = to_xdna_dev(dev_get_drvdata(dev));
+ int ret = -EOPNOTSUPP;
+
+ guard(mutex)(&xdna->dev_lock);
+ if (xdna->dev_info->ops->runtime_suspend)
+ ret = xdna->dev_info->ops->runtime_suspend(xdna);
+
+ XDNA_DBG(xdna, "Runtime suspend done ret %d", ret);
+ return ret;
+}
+
+int amdxdna_pm_runtime_resume(struct device *dev)
+{
+ struct amdxdna_dev *xdna = to_xdna_dev(dev_get_drvdata(dev));
+ int ret = -EOPNOTSUPP;
+
+ guard(mutex)(&xdna->dev_lock);
+ if (xdna->dev_info->ops->runtime_resume)
+ ret = xdna->dev_info->ops->runtime_resume(xdna);
+
+ XDNA_DBG(xdna, "Runtime resume done ret %d", ret);
+ return ret;
+}
+
int amdxdna_pm_resume_get(struct amdxdna_dev *xdna)
{
struct device *dev = xdna->ddev.dev;
int ret;
+ if (!pm_runtime_enabled(dev))
+ return 0;
+
ret = pm_runtime_resume_and_get(dev);
if (ret) {
XDNA_ERR(xdna, "Resume failed: %d", ret);
@@ -55,6 +84,10 @@ void amdxdna_pm_suspend_put(struct amdxdna_dev *xdna)
{
struct device *dev = xdna->ddev.dev;
+ if (!pm_runtime_enabled(dev))
+ return;
+
+ pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev);
}
@@ -66,6 +99,7 @@ void amdxdna_pm_init(struct amdxdna_dev *xdna)
pm_runtime_set_autosuspend_delay(dev, AMDXDNA_AUTOSUSPEND_DELAY);
pm_runtime_use_autosuspend(dev);
pm_runtime_allow(dev);
+ pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev);
}
diff --git a/drivers/accel/amdxdna/amdxdna_pm.h b/drivers/accel/amdxdna/amdxdna_pm.h
index 3d26b973e0e3..26df3d50d8ea 100644
--- a/drivers/accel/amdxdna/amdxdna_pm.h
+++ b/drivers/accel/amdxdna/amdxdna_pm.h
@@ -9,7 +9,9 @@
#include "amdxdna_pci_drv.h"
int amdxdna_pm_suspend(struct device *dev);
-int amdxdna_pm_resume(struct device *dev);
+int amdxdna_pm_resume(struct device *dev);
+int amdxdna_pm_runtime_suspend(struct device *dev);
+int amdxdna_pm_runtime_resume(struct device *dev);
int amdxdna_pm_resume_get(struct amdxdna_dev *xdna);
void amdxdna_pm_suspend_put(struct amdxdna_dev *xdna);
void amdxdna_pm_init(struct amdxdna_dev *xdna);
--
2.34.1
next prev parent reply other threads:[~2026-09-26 1:35 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-26 1:34 [PATCH V0 00/21] accel/amdxdna: Kernel submission and PM for AIE4 David Zhang
2026-09-26 1:34 ` [PATCH V0 01/21] accel/amdxdna: Rename NPU3 firmware files David Zhang
2026-09-26 1:34 ` [PATCH V0 02/21] accel/amdxdna: Remove mmap for doorbell David Zhang
2026-09-26 1:34 ` [PATCH V0 03/21] accel/amdxdna: Add CERT firmware version support David Zhang
2026-09-26 1:34 ` [PATCH V0 04/21] accel/amdxdna: Upgrade firmware version to 6.0 David Zhang
2026-09-28 17:08 ` Lizhi Hou
2026-09-26 1:34 ` [PATCH V0 05/21] accel/amdxdna: Add NPU3 classic device support David Zhang
2026-09-26 1:34 ` [PATCH V0 06/21] accel/amdxdna: Add AIE version query to aie4_get_info David Zhang
2026-09-26 1:34 ` [PATCH V0 07/21] accel/amdxdna: Add get and set power_mode for AIE4 David Zhang
2026-09-28 18:39 ` Lizhi Hou
2026-09-26 1:34 ` [PATCH V0 08/21] accel/amdxdna: Restore power mode override on AIE4 hardware start David Zhang
2026-09-28 18:48 ` Lizhi Hou
2026-09-26 1:34 ` [PATCH V0 09/21] accel/amdxdna: Add clock, DPM frequency, and resource info queries for AIE4 David Zhang
2026-09-26 1:34 ` [PATCH V0 10/21] accel/amdxdna: Add context switch hysteresis with debugfs control David Zhang
2026-09-26 1:34 ` [PATCH V0 11/21] accel/amdxdna: Refactor AIE4 hardware initialization sequence David Zhang
2026-09-26 1:34 ` [PATCH V0 12/21] accel/amdxdna: Decouple AIE4 doorbell and MSI-X notification transport hooks David Zhang
2026-09-28 20:16 ` Lizhi Hou
2026-09-26 1:34 ` [PATCH V0 13/21] accel/amdxdna: Implement AIE4 kernel queue lifecycle and memory layout David Zhang
2026-09-26 1:34 ` [PATCH V0 14/21] accel/amdxdna: Fix fence timeline name and context allocation David Zhang
2026-09-28 21:06 ` Lizhi Hou
2026-09-30 0:20 ` Zhang, Yidong (David)
2026-09-26 1:34 ` [PATCH V0 15/21] accel/amdxdna: Prepare for AIE4 command submission David Zhang
2026-09-26 1:34 ` [PATCH V0 16/21] accel/amdxdna: Implement AIE4 command packet building and submission David Zhang
2026-09-26 1:34 ` [PATCH V0 17/21] accel/amdxdna: Finalize runtime PM before acquiring dev_lock on removal David Zhang
2026-09-26 1:34 ` [PATCH V0 18/21] accel/amdxdna: Implement AIE4 suspend and resume David Zhang
2026-09-26 1:34 ` [PATCH V0 19/21] accel/amdxdna: Link SR-IOV VFs for power management sequencing David Zhang
2026-09-26 1:34 ` David Zhang [this message]
2026-09-26 1:34 ` [PATCH V0 21/21] accel/amdxdna: Add stub hwctx_config for AIE4 David Zhang
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=20260926013448.3840921-21-yidong.zhang@amd.com \
--to=yidong.zhang@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=karol.wachowski@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizhi.hou@amd.com \
--cc=mario.limonciello@amd.com \
--cc=max.zhen@amd.com \
--cc=ogabbay@kernel.org \
--cc=quic_jhugo@quicinc.com \
--cc=sonal.santan@amd.com \
/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
all inboxes | Powered by JetHome®