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 B5F8529B200; Tue, 6 Jan 2026 04:54:46 +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=1767675286; cv=none; b=SP1wHed1gG2mRSP6+RbNmslerXwTCgllowVoK/zz3LsN1xO68lC+NPVRcjRPW84C7L+iu/vMaQ7sUkQklxms8o35KPEG5oe7qWWmG/RzSAMNc+5WI0W25ZM25XhSce1sx+YoccU0Xy2wdEy1iDZXtbycFepGR6uWKszDrTRAfi8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767675286; c=relaxed/simple; bh=GNP3yFTN7VA8s82PjRIvHD/fwrGdyLfRLJc40WOZML0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YYbBsxUk5wxGZZLL3Roc+JwpOkTH/e6DsBu98cGwPSmRdlddE52gUcjHIwDvZSb2bMQfbQNDtBjK0u3DFI2EdLT88zFsB55gVfkq8RVsM4WiUnmJXEzHOu3oEwxXz90xOp3i6Vi2Pk4xPuNDi5cGGsUQ8rT3mNs4hQ+ZnjnsZsE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CeOpJXa5; 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="CeOpJXa5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B3B3C19423; Tue, 6 Jan 2026 04:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767675286; bh=GNP3yFTN7VA8s82PjRIvHD/fwrGdyLfRLJc40WOZML0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CeOpJXa5SJvAaqwrOZq0oWB3kas7z8uCgJ6Xkmm2xqzF1DudYjJ1LQmIWC2e4SWaN Qpt36/SJ92IveZ66VxvOpBYdsx0dBkICWNDDTrNMPCeH8TIDO1B75uQNVUeY1Xwbj2 uaJqBN417eHp8cmPO7A7cj2k6cV3Ek7MM+cHI2ARCxKDIqzgLt+wDDJ3MGH2uzJs3F WltThbqgodxbVpuzOXFbDVtjfn4THNFh1hizjdmr7xrb65CnB+2pWolVNans1iVSYQ yJLCqtJFjnp5ZQ+lBvgElO2l+SosRIKatdSqoTJx2iOJv+zsPk9WAVtZggdX9E8zwW Gq0xqTtUlx5/w== 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)" , Yijun Shen Subject: [PATCH v4 3/5] crypto: ccp - Add an S4 restore flow Date: Mon, 5 Jan 2026 22:54:21 -0600 Message-ID: <20260106045423.55190-4-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260106045423.55190-1-superm1@kernel.org> References: <20260106045423.55190-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The system will have lost power during S4. The ring used for TEE communications needs to be initialized before use. 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/ Tested-by: Yijun Shen Signed-off-by: Mario Limonciello (AMD) --- v4: * Add tag (Yijun) * Remove blank line (Ilpo) * Adjust whitespace in psp_restore() (Ilpo) --- drivers/crypto/ccp/psp-dev.c | 11 +++++++++++ drivers/crypto/ccp/sp-dev.h | 2 ++ drivers/crypto/ccp/sp-pci.c | 24 +++++++++++++++++++++++- drivers/crypto/ccp/tee-dev.c | 5 +++++ drivers/crypto/ccp/tee-dev.h | 1 + 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index 9e21da0e298ad..46072ff84f716 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -351,6 +351,17 @@ struct psp_device *psp_get_master_device(void) return sp ? sp->psp_data : NULL; } +int psp_restore(struct sp_device *sp) +{ + struct psp_device *psp = sp->psp_data; + int ret = 0; + + if (psp->tee_data) + ret = tee_restore(psp); + + return 0; +} + void psp_pci_init(void) { psp_master = psp_get_master_device(); diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h index 1335a83fe052e..0deea1a399e47 100644 --- a/drivers/crypto/ccp/sp-dev.h +++ b/drivers/crypto/ccp/sp-dev.h @@ -174,6 +174,7 @@ int psp_dev_init(struct sp_device *sp); void psp_pci_init(void); void psp_dev_destroy(struct sp_device *sp); void psp_pci_exit(void); +int psp_restore(struct sp_device *sp); #else /* !CONFIG_CRYPTO_DEV_SP_PSP */ @@ -181,6 +182,7 @@ static inline int psp_dev_init(struct sp_device *sp) { return 0; } static inline void psp_pci_init(void) { } static inline void psp_dev_destroy(struct sp_device *sp) { } static inline void psp_pci_exit(void) { } +static inline int psp_restore(struct sp_device *sp) { return 0; } #endif /* CONFIG_CRYPTO_DEV_SP_PSP */ diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index 8891ceee1d7d0..931ec6bf2cec6 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -353,6 +353,21 @@ static int __maybe_unused sp_pci_resume(struct device *dev) return sp_resume(sp); } +static int __maybe_unused sp_pci_restore(struct device *dev) +{ + struct sp_device *sp = dev_get_drvdata(dev); + +#ifdef CONFIG_CRYPTO_DEV_SP_PSP + if (sp->psp_data) { + int ret = psp_restore(sp); + + if (ret) + return ret; + } +#endif + return sp_resume(sp); +} + #ifdef CONFIG_CRYPTO_DEV_SP_PSP static const struct sev_vdata sevv1 = { .cmdresp_reg = 0x10580, /* C2PMSG_32 */ @@ -563,7 +578,14 @@ static const struct pci_device_id sp_pci_table[] = { }; MODULE_DEVICE_TABLE(pci, sp_pci_table); -static SIMPLE_DEV_PM_OPS(sp_pci_pm_ops, sp_pci_suspend, sp_pci_resume); +static const struct dev_pm_ops sp_pci_pm_ops = { + .suspend = pm_sleep_ptr(sp_pci_suspend), + .resume = pm_sleep_ptr(sp_pci_resume), + .freeze = pm_sleep_ptr(sp_pci_suspend), + .thaw = pm_sleep_ptr(sp_pci_resume), + .poweroff = pm_sleep_ptr(sp_pci_suspend), + .restore_early = pm_sleep_ptr(sp_pci_restore), +}; static struct pci_driver sp_pci_driver = { .name = "ccp", diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c index af881daa5855b..11c4b05e2f3a2 100644 --- a/drivers/crypto/ccp/tee-dev.c +++ b/drivers/crypto/ccp/tee-dev.c @@ -366,3 +366,8 @@ int psp_check_tee_status(void) return 0; } EXPORT_SYMBOL(psp_check_tee_status); + +int tee_restore(struct psp_device *psp) +{ + return tee_init_ring(psp->tee_data); +} diff --git a/drivers/crypto/ccp/tee-dev.h b/drivers/crypto/ccp/tee-dev.h index ea9a2b7c05f57..c23416cb7bb37 100644 --- a/drivers/crypto/ccp/tee-dev.h +++ b/drivers/crypto/ccp/tee-dev.h @@ -111,5 +111,6 @@ struct tee_ring_cmd { int tee_dev_init(struct psp_device *psp); void tee_dev_destroy(struct psp_device *psp); +int tee_restore(struct psp_device *psp); #endif /* __TEE_DEV_H__ */ -- 2.43.0