]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
accel/amdxdna: Fix suspend failure after enabling turbo mode
authorLizhi Hou <lizhi.hou@amd.com>
Wed, 11 Feb 2026 20:47:16 +0000 (12:47 -0800)
committerLizhi Hou <lizhi.hou@amd.com>
Mon, 23 Feb 2026 17:24:19 +0000 (09:24 -0800)
Enabling turbo mode disables hardware clock gating. Suspend requires
hardware clock gating to be re-enabled, otherwise suspend will fail.
Fix this by calling aie2_runtime_cfg() from aie2_hw_stop() to
re-enable clock gating during suspend. Also ensure that firmware is
initialized in aie2_hw_start() before modifying clock-gating
settings during resume.

Fixes: f4d7b8a6bc8c ("accel/amdxdna: Enhance power management settings")
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Link: https://patch.msgid.link/20260211204716.722788-1-lizhi.hou@amd.com
drivers/accel/amdxdna/aie2_pci.c

index 07e3695078189e67d9c8e4e3d18be58af6ef0235..4b3e6bb97bd2be934f830f1b01c99b4c1856785f 100644 (file)
@@ -323,6 +323,7 @@ static void aie2_hw_stop(struct amdxdna_dev *xdna)
                return;
        }
 
+       aie2_runtime_cfg(ndev, AIE2_RT_CFG_CLK_GATING, NULL);
        aie2_mgmt_fw_fini(ndev);
        xdna_mailbox_stop_channel(ndev->mgmt_chann);
        xdna_mailbox_destroy_channel(ndev->mgmt_chann);
@@ -406,15 +407,15 @@ static int aie2_hw_start(struct amdxdna_dev *xdna)
                goto stop_psp;
        }
 
-       ret = aie2_pm_init(ndev);
+       ret = aie2_mgmt_fw_init(ndev);
        if (ret) {
-               XDNA_ERR(xdna, "failed to init pm, ret %d", ret);
+               XDNA_ERR(xdna, "initial mgmt firmware failed, ret %d", ret);
                goto destroy_mgmt_chann;
        }
 
-       ret = aie2_mgmt_fw_init(ndev);
+       ret = aie2_pm_init(ndev);
        if (ret) {
-               XDNA_ERR(xdna, "initial mgmt firmware failed, ret %d", ret);
+               XDNA_ERR(xdna, "failed to init pm, ret %d", ret);
                goto destroy_mgmt_chann;
        }