Commit 5d4456fc authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/boot/compressed: Merge the local pgtable.h include into <asm/boot.h> 



Merge the local include "pgtable.h" -which declares the API of the
5-level paging trampoline- into <asm/boot.h> so that its implementation
in la57toggle.S as well as the calling code can be decoupled from the
traditional decompressor.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250401133416.1436741-9-ardb+git@google.com
parent 0ee07a07

arch/x86/boot/compressed/head_64.S

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <asm/bootparam.h>

#include <asm/desc_defs.h>

#include <asm/trapnr.h>

#include "pgtable.h"



/*

 * Fix alignment at 16 bytes. Following CONFIG_FUNCTION_ALIGNMENT will result

arch/x86/boot/compressed/la57toggle.S

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <asm/boot.h>

#include <asm/msr.h>

#include <asm/processor-flags.h>

#include "pgtable.h"



/*

 * This is the 32-bit trampoline that will be copied over to low memory. It

arch/x86/boot/compressed/misc.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include "misc.h"

#include "error.h"

#include "pgtable.h"

#include "../string.h"

#include "../voffset.h"

#include <asm/bootparam_utils.h>

arch/x86/boot/compressed/pgtable.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
#ifndef BOOT_COMPRESSED_PAGETABLE_H

#define BOOT_COMPRESSED_PAGETABLE_H



#define TRAMPOLINE_32BIT_SIZE		(2 * PAGE_SIZE)



#define TRAMPOLINE_32BIT_CODE_OFFSET	PAGE_SIZE

#define TRAMPOLINE_32BIT_CODE_SIZE	0xA0



#ifndef __ASSEMBLER__



extern unsigned long *trampoline_32bit;



extern void trampoline_32bit_src(void *trampoline, bool enable_5lvl);



extern const u16 trampoline_ljmp_imm_offset;



#endif /* __ASSEMBLER__ */

#endif /* BOOT_COMPRESSED_PAGETABLE_H */

arch/x86/boot/compressed/pgtable_64.c

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <asm/bootparam_utils.h>

#include <asm/e820/types.h>

#include <asm/processor.h>

#include "pgtable.h"

#include "../string.h"

#include "efi.h"