mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-03-03 18:28:01 +01:00
7b85137caf
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: f892a21f51 ("crypto: ccp - use generic power management")
Reported-by: Lars Francke <lars.francke@gmail.com>
Closes: https://lore.kernel.org/platform-driver-x86/CAD-Ua_gfJnQSo8ucS_7ZwzuhoBRJ14zXP7s8b-zX3ZcxcyWePw@mail.gmail.com/
Tested-by: Yijun Shen <Yijun.Shen@Dell.com>
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Acked-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://patch.msgid.link/20260116041132.153674-6-superm1@kernel.org
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
31 lines
771 B
C
31 lines
771 B
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
|
|
#ifndef __PSP_H
|
|
#define __PSP_H
|
|
|
|
#ifdef CONFIG_X86
|
|
#include <linux/mem_encrypt.h>
|
|
|
|
#define __psp_pa(x) __sme_pa(x)
|
|
#else
|
|
#define __psp_pa(x) __pa(x)
|
|
#endif
|
|
|
|
/*
|
|
* Fields and bits used by most PSP mailboxes
|
|
*
|
|
* Note: Some mailboxes (such as SEV) have extra bits or different meanings
|
|
* and should include an appropriate local definition in their source file.
|
|
*/
|
|
#define PSP_CMDRESP_STS GENMASK(15, 0)
|
|
#define PSP_TEE_STS_RING_BUSY 0x0000000d /* Ring already initialized */
|
|
#define PSP_CMDRESP_CMD GENMASK(23, 16)
|
|
#define PSP_CMDRESP_RESERVED GENMASK(29, 24)
|
|
#define PSP_CMDRESP_RECOVERY BIT(30)
|
|
#define PSP_CMDRESP_RESP BIT(31)
|
|
|
|
#define PSP_DRBL_MSG PSP_CMDRESP_CMD
|
|
#define PSP_DRBL_RING BIT(0)
|
|
|
|
#endif /* __PSP_H */
|