mirror of
https://github.com/torvalds/linux.git
synced 2026-03-07 23:04:33 +01:00
1aa82181a3
When an application issues a query IOCTL while auto suspend is running,
a deadlock can occur. The query path holds dev_lock and then calls
pm_runtime_resume_and_get(), which waits for the ongoing suspend to
complete. Meanwhile, the suspend callback attempts to acquire dev_lock
and blocks, resulting in a deadlock.
Fix this by releasing dev_lock before calling pm_runtime_resume_and_get()
and reacquiring it after the call completes. Also acquire dev_lock in the
resume callback to keep the locking consistent.
Fixes: 063db45183 ("accel/amdxdna: Enhance runtime power management")
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Link: https://patch.msgid.link/20260211204644.722758-1-lizhi.hou@amd.com
78 lines
1.6 KiB
C
78 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) 2025, Advanced Micro Devices, Inc.
|
|
*/
|
|
|
|
#include <drm/amdxdna_accel.h>
|
|
#include <drm/drm_drv.h>
|
|
#include <linux/pm_runtime.h>
|
|
|
|
#include "amdxdna_pm.h"
|
|
|
|
#define AMDXDNA_AUTOSUSPEND_DELAY 5000 /* milliseconds */
|
|
|
|
int amdxdna_pm_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->suspend)
|
|
ret = xdna->dev_info->ops->suspend(xdna);
|
|
|
|
XDNA_DBG(xdna, "Suspend done ret %d", ret);
|
|
return ret;
|
|
}
|
|
|
|
int amdxdna_pm_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->resume)
|
|
ret = xdna->dev_info->ops->resume(xdna);
|
|
|
|
XDNA_DBG(xdna, "Resume done ret %d", ret);
|
|
return ret;
|
|
}
|
|
|
|
int amdxdna_pm_resume_get(struct amdxdna_dev *xdna)
|
|
{
|
|
struct device *dev = xdna->ddev.dev;
|
|
int ret;
|
|
|
|
ret = pm_runtime_resume_and_get(dev);
|
|
if (ret) {
|
|
XDNA_ERR(xdna, "Resume failed: %d", ret);
|
|
pm_runtime_set_suspended(dev);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void amdxdna_pm_suspend_put(struct amdxdna_dev *xdna)
|
|
{
|
|
struct device *dev = xdna->ddev.dev;
|
|
|
|
pm_runtime_put_autosuspend(dev);
|
|
}
|
|
|
|
void amdxdna_pm_init(struct amdxdna_dev *xdna)
|
|
{
|
|
struct device *dev = xdna->ddev.dev;
|
|
|
|
pm_runtime_set_active(dev);
|
|
pm_runtime_set_autosuspend_delay(dev, AMDXDNA_AUTOSUSPEND_DELAY);
|
|
pm_runtime_use_autosuspend(dev);
|
|
pm_runtime_allow(dev);
|
|
pm_runtime_put_autosuspend(dev);
|
|
}
|
|
|
|
void amdxdna_pm_fini(struct amdxdna_dev *xdna)
|
|
{
|
|
struct device *dev = xdna->ddev.dev;
|
|
|
|
pm_runtime_get_noresume(dev);
|
|
pm_runtime_forbid(dev);
|
|
}
|