The following commit has been merged into the x86/sev branch of tip: Commit-ID: 0563ee35ae2c9cfb0c6a7b2c0ddf7d9372bb8a98 Gitweb: https://git.kernel.org/tip/0563ee35ae2c9cfb0c6a7b2c0ddf7d9372bb8a98 Author: Nikunj A Dadhania <nikunj@xxxxxxx> AuthorDate: Mon, 06 Jan 2025 18:16:33 +05:30 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Thu, 09 Jan 2025 10:21:56 +01:00 x86/sev: Add the Secure TSC feature for SNP guests Now that all the required plumbing is done for enabling Secure TSC, add it to the SNP features present list. Signed-off-by: Nikunj A Dadhania <nikunj@xxxxxxx> Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Reviewed-by: Tom Lendacky <thomas.lendacky@xxxxxxx> Tested-by: Peter Gonda <pgonda@xxxxxxxxxx> Link: https://lore.kernel.org/r/20250106124633.1418972-14-nikunj@xxxxxxx --- arch/x86/boot/compressed/sev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index cd44e12..bb55934 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -401,7 +401,8 @@ finish: * by the guest kernel. As and when a new feature is implemented in the * guest kernel, a corresponding bit should be added to the mask. */ -#define SNP_FEATURES_PRESENT MSR_AMD64_SNP_DEBUG_SWAP +#define SNP_FEATURES_PRESENT (MSR_AMD64_SNP_DEBUG_SWAP | \ + MSR_AMD64_SNP_SECURE_TSC) u64 snp_get_unsupported_features(u64 status) {