When the device is runtime-suspended, pm_runtime_forbid() synchronously resumes the device via rpm_resume(), which invokes amdxdna_pm_runtime_resume(). Because amdxdna_pm_runtime_resume() acquires dev_lock, calling amdxdna_pm_fini() inside ops->fini() while holding dev_lock in amdxdna_remove() causes a deadlock.
Move amdxdna_pm_fini() out of ops->fini() and invoke it before acquiring dev_lock in amdxdna_remove() as well as the probe failure unwind path. Also call pm_runtime_dont_use_autosuspend() in amdxdna_pm_fini() to disable autosuspend upon teardown. Signed-off-by: David Zhang <[email protected]> --- drivers/accel/amdxdna/aie2_pci.c | 2 -- drivers/accel/amdxdna/amdxdna_pci_drv.c | 4 ++++ drivers/accel/amdxdna/amdxdna_pm.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c index b70af1923643..0d209b7b6484 100644 --- a/drivers/accel/amdxdna/aie2_pci.c +++ b/drivers/accel/amdxdna/aie2_pci.c @@ -623,7 +623,6 @@ static int aie2_init(struct amdxdna_dev *xdna) release_firmware(fw); aie2_msg_init(ndev); amdxdna_vbnv_init(xdna); - amdxdna_pm_init(xdna); return 0; stop_hw: @@ -638,7 +637,6 @@ static int aie2_init(struct amdxdna_dev *xdna) static void aie2_fini(struct amdxdna_dev *xdna) { - amdxdna_pm_fini(xdna); aie2_hw_stop(xdna); aie2_hwctx_sched_fini(xdna->dev_handle); } diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.c b/drivers/accel/amdxdna/amdxdna_pci_drv.c index 8b6e7283e057..1d0b91e73260 100644 --- a/drivers/accel/amdxdna/amdxdna_pci_drv.c +++ b/drivers/accel/amdxdna/amdxdna_pci_drv.c @@ -413,6 +413,8 @@ static int amdxdna_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto iommu_fini; } + amdxdna_pm_init(xdna); + ret = amdxdna_sysfs_init(xdna); if (ret) { XDNA_ERR(xdna, "Create amdxdna attrs failed: %d", ret); @@ -431,6 +433,7 @@ static int amdxdna_probe(struct pci_dev *pdev, const struct pci_device_id *id) failed_sysfs_fini: amdxdna_sysfs_fini(xdna); failed_dev_fini: + amdxdna_pm_fini(xdna); mutex_lock(&xdna->dev_lock); xdna->dev_info->ops->fini(xdna); mutex_unlock(&xdna->dev_lock); @@ -446,6 +449,7 @@ static void amdxdna_remove(struct pci_dev *pdev) drm_dev_unplug(&xdna->ddev); amdxdna_sysfs_fini(xdna); + amdxdna_pm_fini(xdna); mutex_lock(&xdna->client_lock); mutex_lock(&xdna->dev_lock); diff --git a/drivers/accel/amdxdna/amdxdna_pm.c b/drivers/accel/amdxdna/amdxdna_pm.c index b1fafddd7ad5..9c030b7836fb 100644 --- a/drivers/accel/amdxdna/amdxdna_pm.c +++ b/drivers/accel/amdxdna/amdxdna_pm.c @@ -75,4 +75,5 @@ void amdxdna_pm_fini(struct amdxdna_dev *xdna) pm_runtime_get_noresume(dev); pm_runtime_forbid(dev); + pm_runtime_dont_use_autosuspend(dev); } -- 2.34.1
