[tip: x86/cleanups] x86/boot/compressed/head_64.S: Cleanup SEV-related comments

From: tip-bot2 for Borislav Petkov (AMD)

Date: Thu Jul 09 2026 - 20:30:48 EST


The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: cb6417b360a7ad215cde42aa2cf56a2076cac560
Gitweb: https://git.kernel.org/tip/cb6417b360a7ad215cde42aa2cf56a2076cac560
Author: Borislav Petkov (AMD) <bp@xxxxxxxxx>
AuthorDate: Fri, 19 Jun 2026 21:37:57 -07:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Thu, 09 Jul 2026 16:16:32 -07:00

x86/boot/compressed/head_64.S: Cleanup SEV-related comments

Move the comment about setting the encryption mask above the line which
does that and, especially, inside the ifdeffery, where it belongs.

Move comments ontop of the code lines they refer to and not on the
side, which impairs readability.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Reviewed-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
Link: https://patch.msgid.link/20260620043757.347076-1-bp@xxxxxxxxxx
---
arch/x86/boot/compressed/head_64.S | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index d9dab94..1aca513 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -172,19 +172,23 @@ SYM_FUNC_START(startup_32)
/*
* Build early 4G boot pagetable
*/
- /*
- * If SEV is active then set the encryption mask in the page tables.
- * This will ensure that when the kernel is copied and decompressed
- * it will be done so encrypted.
- */
xorl %edx, %edx
#ifdef CONFIG_AMD_MEM_ENCRYPT
call get_sev_encryption_bit
xorl %edx, %edx
testl %eax, %eax
jz 1f
- subl $32, %eax /* Encryption bit is always above bit 31 */
- bts %eax, %edx /* Set encryption mask for page tables */
+
+ /* Encryption bit is always above bit 31 */
+ subl $32, %eax
+
+ /*
+ * If SEV is active then set the encryption mask in the page tables.
+ * This will ensure that when the kernel is copied and decompressed it
+ * will be done so encrypted.
+ */
+ bts %eax, %edx
+
/*
* Set MSR_AMD64_SEV_ENABLED_BIT in sev_status so that
* startup32_check_sev_cbit() will do a check. sev_enable() will