From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BN8PR05CU002.outbound.protection.outlook.com (mail-eastus2azon11011066.outbound.protection.outlook.com [52.101.57.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCD83503BD0 for ; Fri, 9 Oct 2026 22:54:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.57.66 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791586457; cv=fail; b=lgT7NEd9FYXZV0CYl2XYm/zl8bqQylDXYhxX2sCUOH5qNSpysz3HhCkPulQe3CWj0KZ3zU+WsHoKWA9ioJ5xdZxm7ikav3tByH0jku1wPovroEjBVdiKeNljIb3JANRSyGxVD7zTUbTEfdmO8yng2x5DdoWIJACDNvLww4TVRuY= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791586457; c=relaxed/simple; bh=jziPxpAJrRfBIVeoU7Hh0rT/AEPLXBWgkqO9oT3wrqE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=thhCTZzLLXMbNtZ/AEgAgf2jqbsRDDHbXFTwbhPWX/fxZBdl0TTqq1II7/jHAj2NHXYG49VlFMiDPZTEewIs9BqifUK2Mqj64GJSPL+cwWK1i0aNHYpUfe+FgHqtdMIJzNeCuydwypO/CUebFTygNtUN+3ApfT5PIedqvtX41Qg= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=S3JDa3ob; arc=fail smtp.client-ip=52.101.57.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="S3JDa3ob" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KX0WH8PgXl8i7kYIUiJh/lmNX94oe+yT5c13C9QGQC6gK/RI15hBR4rBbhLT6WAWaTl3GKC10ZUVObqxlGCh/gyi5XVNDU6z9YB3YTDrM4tc4PISDC+pMl1dQPfwUjQ7QYWsjxBw0L2q+7rxhPIqcHXPBjBaQ2IpACVR5L0n66ELc2twMGw+thgJFnCpi3FZdr0Rlvf48XP6MXJTqqGNaPnv3AXkrIFWvRHSjD8XOtjf5W2mGVM6JJuMTKRND6Bw8pU8ZlcivgWT5xIEdTRMYHuQOUJ96Qu10RIa+P4P67qCDBST7qQ9KV1vGj18H/oIRN3TfFbnUCY9O3lf/2bTcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GSXzSlrOTW/+DOP+ppTTZYgzuEdtxZgTyPPGDZA//qY=; b=eRPTR6ziOUbhpqiKl5lFNFltW0O+0tx86ysv9TxO80sAtKBcC98KdiplFhkCQUQ7Tyn8vTaCaEuEB6lkEOl5rgz7fwZssdvqosYDrQnPzW93s2bicZrN8qoQcCaaaq85Sa3D2ws+fzX6nSmrU4n5n+PlPHZwrdd3PJWh9euWuZQEYK2XFRifs95Zb4i7G4cG26UoCdIXWV6XpOonxkDmcMtvnIo/yuN2gM8PBITohv9zsGhHaMQLv7dOe3Y2+M8gFOhq2Xhj9Dqi4NLzchlfnHM70KB9qx0bvueTfGTpVuQtzuEvfw1zJrKh3g55ud3PVrMY/D3CXXNf94CzDX7+3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=quicinc.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GSXzSlrOTW/+DOP+ppTTZYgzuEdtxZgTyPPGDZA//qY=; b=S3JDa3obUhFb3f7Z71oMRCaLnHQ0EzR/PUqUe/YYTh+a+PNa7dEUWJkQoKS+b25OUI74695OI26MFuktuHAX12oNdycXKOnej2pF2phVcQG+gNDPt5bZu7336KpzyEaNJgG85wnxZnxLb3e3Vc4wpQrIp8eXtrXgjWjdVQ3i5lk= Received: from BN9PR03CA0440.namprd03.prod.outlook.com (2603:10b6:408:113::25) by MW4PR12MB7032.namprd12.prod.outlook.com (2603:10b6:303:1e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.496.15; Fri, 9 Oct 2026 22:54:09 +0000 Received: from BN2PEPF000055DF.namprd21.prod.outlook.com (2603:10b6:408:113:cafe::2a) by BN9PR03CA0440.outlook.office365.com (2603:10b6:408:113::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.496.5 via Frontend Transport; Fri, 9 Oct 2026 22:54:08 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN2PEPF000055DF.mail.protection.outlook.com (10.167.245.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.0 via Frontend Transport; Fri, 9 Oct 2026 22:54:08 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.49; Fri, 9 Oct 2026 17:54:01 -0500 Received: from xsjdavidzha51.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.49 via Frontend Transport; Fri, 9 Oct 2026 17:54:01 -0500 From: David Zhang To: , , , , , , CC: David Zhang , , Subject: [PATCH V4 19/19] accel/amdxdna: Implement runtime suspend and resume support Date: Fri, 9 Oct 2026 15:53:43 -0700 Message-ID: <20261009225343.3079074-20-yidong.zhang@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261009225343.3079074-1-yidong.zhang@amd.com> References: <20261009225343.3079074-1-yidong.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DF:EE_|MW4PR12MB7032:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e5665a3-8553-4884-ff88-08df26583a40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|82310400026|376014|23010399003|56012099006|10067099003|11063799006|4143699003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: rh7Ujunfsrsf9yc9xqXc4N0HRcu7IqtJAXl6tYCYmEVTQLyDCI0MRgMuukv1F/JK/+IriwuFh3ppII7R6qE90JVSAHKiUWexBRrzKn1uw0o2WXC1LFJiAlIghnjw1uCVrcKAocTTACTc1ZYdkVvH22XeRXXfarT6StAGztaYijwn5Qkx8ElYZ/Bf1qwSK9n1SIw3gXzuChFi/H5xXleVdz4U1LwgikO3pXOjzSqUqfc5zzFtm0ZCqb90OEJTN2OPbT9NvmHy/UKLK3iHYWBKDYhykcxNpFfKU0S0LhPgFjzU9DhTrze1fY77i7RdxofzFDlS5wTs9lDUX/ifq07F9WD1nDl0FmDCkxFY76PoVEgtm9OyliMD4GFd6mZq/NHvyDLpVtX5VNFfD2ckuiOSZXiQ5sip70icDPrYZY76Qp5GabtV3DgxjF/ou2vsx5Cx+VAx74mjoxiLUPk6CGsWSMpvXUyiZTrVygiDVea2YGyg9SZ5EDTuVtl+G2Rtt4H8JC0aIZ5lc5ijFXT9k49fkW+7fIl0sGlzxHve9wYq4t4m5zmRc8hDD/llNQoaN4o0SmSrKfP4NXFy30Ga21T/OX7lUu+Ex8jfttIypogHez8iTjEOLGEw4dJk6IIBTZ5mR1JpMMNlLskkDMKVksKjd+YXSBw1fBdZ8q5UjMpg7oopVBS/c0I+QZeLaeqOt9AZgMvZzXM5VLmdc3NIpm9yIA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700016)(82310400026)(376014)(23010399003)(56012099006)(10067099003)(11063799006)(4143699003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yYKpwEPSXmnMWfEXhl596aCnG7gq7olkr4cXkQYGsHLgsx1blN0bx7SBZ+rrPYO2cWB9RbOOeQJQgQWuBTNZvsAY9yLFxSD4WfKicxBFaWD8hlQ7OS6wx2Bzu0gmq727W+Z98Rs5ZetPvaBHvbWWKdYwE0Ah3+BPST5c60CTMgJQETx1SezpILFs5gtpJ9kaEWM7Na0gH4VIrZAhRVSbnhLtQWwSrDlLfIN7seukItmPQETuq4sTUwfvr0R7ngw4zJyV0caOiiynzTqaEllf9YsygttQJDHYyu1D9vEeZITRR3GYeBFBJH5A9yEUVJtkUz5Sa5oHOu5ud/cTSHcM1/gRYAUf960bS5D7LmkxCP3YRKDp6n8hx54tbGWrsnKlvqCzE2u5WnsQa7JwLc1KmdWNL8xHJ+F6xS6XtF2xaRmK29FXLYXhwBQ992agggW7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2026 22:54:08.5750 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e5665a3-8553-4884-ff88-08df26583a40 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000055DF.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7032 Add runtime suspend/resume for the AIE4 classic device by using its system suspend/resume handlers. Runtime suspend returns -EBUSY for a device without runtime_suspend, so the PM core keeps it active instead of entering an error state. A context suspended by runtime PM makes the command wait return -EAGAIN. Resume the device in the wait ioctl and wait again, so a command wait does not fail because of power management. Wrap .driver.pm and the AIE4 PM callbacks with pm_ptr(), so they are discarded when CONFIG_PM is disabled. Signed-off-by: David Zhang --- drivers/accel/amdxdna/aie2_pci.c | 2 ++ drivers/accel/amdxdna/aie4_ctx.c | 10 +++++- drivers/accel/amdxdna/aie4_pci.c | 4 +++ drivers/accel/amdxdna/amdxdna_ctx.c | 47 ++++++++++++++++++------- drivers/accel/amdxdna/amdxdna_pci_drv.c | 4 +-- drivers/accel/amdxdna/amdxdna_pci_drv.h | 2 ++ drivers/accel/amdxdna/amdxdna_pm.c | 34 ++++++++++++++++++ drivers/accel/amdxdna/amdxdna_pm.h | 2 ++ 8 files changed, 90 insertions(+), 15 deletions(-) diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c index 690ad035463c..a3866e8933e6 100644 --- a/drivers/accel/amdxdna/aie2_pci.c +++ b/drivers/accel/amdxdna/aie2_pci.c @@ -1221,6 +1221,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_ctx.c b/drivers/accel/amdxdna/aie4_ctx.c index a2b6b0fa2934..a3f0a69b93b7 100644 --- a/drivers/accel/amdxdna/aie4_ctx.c +++ b/drivers/accel/amdxdna/aie4_ctx.c @@ -22,6 +22,7 @@ #include "amdxdna_mailbox.h" #include "amdxdna_mailbox_helper.h" #include "amdxdna_pci_drv.h" +#include "amdxdna_pm.h" #define CTX_INVALID_ID (~0U) #define CTX_INVALID_DOORBELL AMDXDNA_INVALID_DOORBELL_OFFSET @@ -377,10 +378,14 @@ int aie4_hwctx_init(struct amdxdna_hwctx *hwctx) if (ret) goto destroy_lock; - ret = aie4_hwctx_create(hwctx); + ret = amdxdna_pm_resume_get_locked(xdna); if (ret) goto umq_fini; + ret = aie4_hwctx_create(hwctx); + if (ret) + goto suspend_put; + priv->job_work_q = alloc_ordered_workqueue("aie4_job_%d_%d", 0, client->pid, hwctx->fw_ctx_id); if (!priv->job_work_q) { @@ -388,12 +393,15 @@ int aie4_hwctx_init(struct amdxdna_hwctx *hwctx) ret = -ENOMEM; goto destroy_ctx; } + amdxdna_pm_suspend_put(xdna); XDNA_DBG(xdna, "hwctx %d.%d init completed", client->pid, hwctx->fw_ctx_id); return 0; destroy_ctx: aie4_hwctx_destroy(hwctx, AIE4_HWCTX_NORMAL); +suspend_put: + amdxdna_pm_suspend_put(xdna); umq_fini: aie4_hwctx_umq_fini(hwctx); destroy_lock: diff --git a/drivers/accel/amdxdna/aie4_pci.c b/drivers/accel/amdxdna/aie4_pci.c index 70a052ab5f77..60140c3927a2 100644 --- a/drivers/accel/amdxdna/aie4_pci.c +++ b/drivers/accel/amdxdna/aie4_pci.c @@ -1041,6 +1041,7 @@ static int aie4_classic_init(struct amdxdna_dev *xdna) if (ret) goto free_work_buf; + amdxdna_pm_init(xdna); return 0; free_work_buf: @@ -1064,6 +1065,7 @@ static void aie4_vf_fini(struct amdxdna_dev *xdna) static void aie4_classic_fini(struct amdxdna_dev *xdna) { + amdxdna_pm_fini(xdna); aie4_classic_hw_stop(xdna->dev_handle); aie4_free_fw_log_buffer(xdna->dev_handle); aie4_free_work_buffer(xdna->dev_handle); @@ -1408,4 +1410,6 @@ const struct amdxdna_dev_ops aie4_classic_ops = { .set_aie_state = aie4_set_state, .resume = pm_ptr(aie4_classic_resume), .suspend = pm_ptr(aie4_classic_suspend), + .runtime_resume = pm_ptr(aie4_classic_resume), + .runtime_suspend = pm_ptr(aie4_classic_suspend), }; diff --git a/drivers/accel/amdxdna/amdxdna_ctx.c b/drivers/accel/amdxdna/amdxdna_ctx.c index 608b86fe8f6b..f4004630dc1b 100644 --- a/drivers/accel/amdxdna/amdxdna_ctx.c +++ b/drivers/accel/amdxdna/amdxdna_ctx.c @@ -761,13 +761,32 @@ int amdxdna_drm_submit_cmd_ioctl(struct drm_device *dev, void *data, struct drm_ return -EINVAL; } +static int amdxdna_hwctx_wait_cmd(struct amdxdna_client *client, + struct amdxdna_drm_wait_cmd *args) +{ + struct amdxdna_dev *xdna = client->xdna; + struct amdxdna_hwctx *hwctx; + int ret, idx; + + idx = srcu_read_lock(&client->hwctx_srcu); + hwctx = xa_load(&client->hwctx_xa, args->hwctx); + if (!hwctx) { + XDNA_DBG(xdna, "PID %d failed to get ctx %d", client->pid, args->hwctx); + ret = -EINVAL; + } else { + ret = xdna->dev_info->ops->cmd_wait(hwctx, args->seq, args->timeout); + } + srcu_read_unlock(&client->hwctx_srcu, idx); + + return ret; +} + int amdxdna_drm_wait_cmd_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) { struct amdxdna_client *client = filp->driver_priv; struct amdxdna_dev *xdna = to_xdna_dev(dev); struct amdxdna_drm_wait_cmd *args = data; - struct amdxdna_hwctx *hwctx; - int ret, idx; + int ret; XDNA_DBG(xdna, "PID %d ctx %d timeout set %d ms for cmd %llu", client->pid, args->hwctx, args->timeout, args->seq); @@ -775,22 +794,26 @@ int amdxdna_drm_wait_cmd_ioctl(struct drm_device *dev, void *data, struct drm_fi if (!xdna->dev_info->ops->cmd_wait) return -EOPNOTSUPP; - idx = srcu_read_lock(&client->hwctx_srcu); - hwctx = xa_load(&client->hwctx_xa, args->hwctx); - if (!hwctx) { - XDNA_DBG(xdna, "PID %d failed to get ctx %d", client->pid, args->hwctx); - ret = -EINVAL; - goto unlock_ctx_srcu; + ret = amdxdna_hwctx_wait_cmd(client, args); + if (ret == -EAGAIN) { + /* + * Suspended by power management before the command completed. + * Resume the device, which reconnects the context, and wait + * again. Take the PM reference outside hwctx_srcu: runtime + * resume takes dev_lock, which hwctx destroy holds across + * synchronize_srcu(). + */ + ret = amdxdna_pm_resume_get(xdna); + if (ret) + return ret; + ret = amdxdna_hwctx_wait_cmd(client, args); + amdxdna_pm_suspend_put(xdna); } - ret = xdna->dev_info->ops->cmd_wait(hwctx, args->seq, args->timeout); - XDNA_DBG(xdna, "PID %d ctx %d cmd %lld wait finished, ret %d", client->pid, args->hwctx, args->seq, ret); trace_amdxdna_debug_point(current->comm, args->seq, "job returned to user"); -unlock_ctx_srcu: - srcu_read_unlock(&client->hwctx_srcu, idx); return ret; } diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.c b/drivers/accel/amdxdna/amdxdna_pci_drv.c index f5f7831c4e80..cb78f145ffa1 100644 --- a/drivers/accel/amdxdna/amdxdna_pci_drv.c +++ b/drivers/accel/amdxdna/amdxdna_pci_drv.c @@ -465,7 +465,7 @@ 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) @@ -484,7 +484,7 @@ static struct pci_driver amdxdna_pci_driver = { .id_table = pci_ids, .probe = amdxdna_probe, .remove = amdxdna_remove, - .driver.pm = &amdxdna_pm_ops, + .driver.pm = pm_ptr(&amdxdna_pm_ops), .sriov_configure = amdxdna_sriov_configure, }; diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.h b/drivers/accel/amdxdna/amdxdna_pci_drv.h index 505477b4a292..4d047cf3d981 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_stop)(struct amdxdna_hwctx *hwctx); diff --git a/drivers/accel/amdxdna/amdxdna_pm.c b/drivers/accel/amdxdna/amdxdna_pm.c index b1fafddd7ad5..7d7bc965342d 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 = -EBUSY; + + 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..02beef6448f1 100644 --- a/drivers/accel/amdxdna/amdxdna_pm.h +++ b/drivers/accel/amdxdna/amdxdna_pm.h @@ -10,6 +10,8 @@ int amdxdna_pm_suspend(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