From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0F8CB165F1A; Sun, 14 Dec 2025 19:12:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765739550; cv=none; b=kYAyKY9bz2atOV5ZmoHsfwms5CKGwcJZDf0KnbyTCSpXue8LhNmcukhemIci+U2syztoqF1Q5y3a/jCsyNCYkBTyZTPAuwEjI5ighRlYMY0/d7KPixCcIG7p+CPK1MrbMbGQ0P2JC/vgAbG3XuoeiEbsb7fbVDhHZrJu8cuBS08= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765739550; c=relaxed/simple; bh=DuEosKzXgyd2W8Nv/kNx7HLj/KUQ34kWA5PTB0JM2wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B/zb0HsW14q6ATH91pyASsUZvxmX8JomkKNm3SLctdSHxCpF8nZBKTMcjdu4TcQx++2GCgsoP1yJjj8BJnAl6vxvnmGIjxPK5FTtmfk1GrleNC5/ezVb0x8yDVvFPqRVLzgW5RKhbZk6lwsxT279buwiV0B9JuAc7oSqltLl9LI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h2ZPpe2H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="h2ZPpe2H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B943DC4CEF1; Sun, 14 Dec 2025 19:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765739549; bh=DuEosKzXgyd2W8Nv/kNx7HLj/KUQ34kWA5PTB0JM2wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h2ZPpe2HxDcQ5LtNwWfe1zlbm7LbFjTsQRObHXE92v2oYMk2LC3P5ZhN/RtQWmgLq LK9BocaIHzgo8cjofFmd71F/zbdeVqErEv+vxA9SqHGYuEAKY8ezsuZTb90aQod5ex XpVuDqx+rPM1hEBliakZXHnJl5KK2HJQZf4flt7x8RUwDNtopeEITMNmnIDdywWyxt lHFpxKM5inYp7itbMtUiTnxl+A1Ax0QSqgGLUupV+jOuVQldNJNzF6/7VNiu1l3CdS uxs4Y/W9leLwqRLcsOpqPcjpnrh8rrUTM1WcfEpAhah8yJYFUOjTfwTCIUby8Llb2C wTUVVqsvja2ew== From: "Mario Limonciello (AMD)" To: Tom Lendacky , Herbert Xu , Shyam Sundar S K , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Rijo Thomas Cc: John Allen , "David S . Miller" , Hans de Goede , linux-crypto@vger.kernel.org (open list:AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER), platform-driver-x86@vger.kernel.org (open list:AMD PMF DRIVER), Lars Francke , Yijun Shen , "Mario Limonciello (AMD)" Subject: [PATCH v3 5/5] crypto: ccp - Send PSP_CMD_TEE_RING_DESTROY when PSP_CMD_TEE_RING_INIT fails Date: Sun, 14 Dec 2025 13:12:13 -0600 Message-ID: <20251214191213.154021-6-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251214191213.154021-1-superm1@kernel.org> References: <20251214191213.154021-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The hibernate resume sequence involves loading a resume kernel that is just used for loading the hibernate image before shifting back to the existing kernel. During that hibernate resume sequence the resume kernel may have loaded the ccp driver. If this happens the resume kernel will also have called PSP_CMD_TEE_RING_INIT but it will never have called PSP_CMD_TEE_RING_DESTROY. This is problematic because the existing kernel needs to re-initialize the ring. One could argue that the existing kernel should call destroy as part of restore() but there is no guarantee that the resume kernel did or didn't load the ccp driver. There is also no callback opportunity for the resume kernel to destroy before handing back control to the existing kernel. Similar problems could potentially exist with the use of kdump and crash handling. I actually reproduced this issue like this: 1) rmmod ccp 2) hibernate the system 3) resume the system 4) modprobe ccp The resume kernel will have loaded ccp but never destroyed and then when I try to modprobe it fails. Because of these possible cases add a flow that checks the error code from the PSP_CMD_TEE_RING_INIT call and tries to call PSP_CMD_TEE_RING_DESTROY if it failed. If this succeeds then call PSP_CMD_TEE_RING_INIT again. Fixes: f892a21f51162 ("crypto: ccp - use generic power management") Reported-by: Lars Francke Closes: https://lore.kernel.org/platform-driver-x86/CAD-Ua_gfJnQSo8ucS_7ZwzuhoBRJ14zXP7s8b-zX3ZcxcyWePw@mail.gmail.com/ Signed-off-by: Mario Limonciello (AMD) --- v3: * Add a comment (Tom) * Add a define for busy condition (Shyam) * Rename label (Shyam) * Upgrade message to info (Shyam) * Use a helper that validates result for destroy command (Shyam) --- drivers/crypto/ccp/tee-dev.c | 12 ++++++++++++ include/linux/psp.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c index ef1430f86ad62..9edb220abbc1a 100644 --- a/drivers/crypto/ccp/tee-dev.c +++ b/drivers/crypto/ccp/tee-dev.c @@ -113,6 +113,7 @@ static int tee_init_ring(struct psp_tee_device *tee) { int ring_size = MAX_RING_BUFFER_ENTRIES * sizeof(struct tee_ring_cmd); struct tee_init_ring_cmd *cmd; + bool retry = false; unsigned int reg; int ret; @@ -135,6 +136,7 @@ static int tee_init_ring(struct psp_tee_device *tee) /* Send command buffer details to Trusted OS by writing to * CPU-PSP message registers */ +retry_init: ret = psp_mailbox_command(tee->psp, PSP_CMD_TEE_RING_INIT, cmd, TEE_DEFAULT_CMD_TIMEOUT, ®); if (ret) { @@ -145,6 +147,16 @@ static int tee_init_ring(struct psp_tee_device *tee) } if (FIELD_GET(PSP_CMDRESP_STS, reg)) { + /* + * During the hibernate resume sequence driver may have gotten loaded + * but the ring not properly destroyed. If the ring doesn't work, try + * to destroy and re-init once. + */ + if (!retry && FIELD_GET(PSP_CMDRESP_STS, reg) == PSP_TEE_STATUS_RING_BUSY) { + dev_info(tee->dev, "tee: ring init command failed with busy status, retrying\n"); + if (tee_send_destroy_cmd(tee)) + goto retry_init; + } dev_err(tee->dev, "tee: ring init command failed (%#010lx)\n", FIELD_GET(PSP_CMDRESP_STS, reg)); tee_free_ring(tee); diff --git a/include/linux/psp.h b/include/linux/psp.h index 92e60aeef21e1..a329148e3684b 100644 --- a/include/linux/psp.h +++ b/include/linux/psp.h @@ -23,6 +23,8 @@ #define PSP_CMDRESP_RECOVERY BIT(30) #define PSP_CMDRESP_RESP BIT(31) +#define PSP_TEE_STATUS_RING_BUSY 0x0000000d /* Ring already initialized */ + #define PSP_DRBL_MSG PSP_CMDRESP_CMD #define PSP_DRBL_RING BIT(0) -- 2.43.0