Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dbac48e authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

x86/boot: Annotate local functions 



[ Upstream commit deff8a24e1021fb39dddf5f6bc5832e0e3a632ea ]

.Lrelocated, .Lpaging_enabled, .Lno_longmode, and .Lin_pm32 are
self-standing local functions, annotate them as such and preserve "no
alignment".

The annotations do not generate anything yet.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Cao jin <caoj.fnst@cn.fujitsu.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: linux-arch@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Huang <wei@redhat.com>
Cc: x86-ml <x86@kernel.org>
Cc: Xiaoyao Li <xiaoyao.li@linux.intel.com>
Link: https://lkml.kernel.org/r/20191011115108.12392-8-jslaby@suse.cz


Stable-dep-of: 264b82fdb498 ("x86/decompressor: Don't rely on upper 32 bits of GPRs being preserved")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c418814f

arch/x86/boot/compressed/head_32.S

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ ENDPROC(efi32_stub_entry) 
#endif



	.text

.Lrelocated:

SYM_FUNC_START_LOCAL_NOALIGN(.Lrelocated)



/*

 * Clear BSS (stack is currently empty)
@@ -261,6 +261,7 @@ ENDPROC(efi32_stub_entry) 
 */

	xorl	%ebx, %ebx

	jmp	*%eax

SYM_FUNC_END(.Lrelocated)



#ifdef CONFIG_EFI_STUB

	.data

arch/x86/boot/compressed/head_64.S

+6 −3
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ ENDPROC(efi64_stub_entry) 
#endif



	.text

.Lrelocated:

SYM_FUNC_START_LOCAL_NOALIGN(.Lrelocated)



/*

 * Clear BSS (stack is currently empty)
@@ -546,6 +546,7 @@ ENDPROC(efi64_stub_entry) 
 * Jump to the decompressed kernel.

 */

	jmp	*%rax

SYM_FUNC_END(.Lrelocated)



/*

 * Adjust the global offset table
@@ -641,9 +642,10 @@ ENTRY(trampoline_32bit_src) 
	lret



	.code64

.Lpaging_enabled:

SYM_FUNC_START_LOCAL_NOALIGN(.Lpaging_enabled)

	/* Return from the trampoline */

	jmp	*%rdi

SYM_FUNC_END(.Lpaging_enabled)



	/*

         * The trampoline code has a size limit.
@@ -653,11 +655,12 @@ ENTRY(trampoline_32bit_src) 
	.org	trampoline_32bit_src + TRAMPOLINE_32BIT_CODE_SIZE



	.code32

.Lno_longmode:

SYM_FUNC_START_LOCAL_NOALIGN(.Lno_longmode)

	/* This isn't an x86-64 CPU, so hang intentionally, we cannot continue */

1:

	hlt

	jmp     1b

SYM_FUNC_END(.Lno_longmode)



#include "../../kernel/verify_cpu.S"

arch/x86/boot/pmjump.S

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ ENDPROC(protected_mode_jump) 


	.code32

	.section ".text32","ax"

.Lin_pm32:

SYM_FUNC_START_LOCAL_NOALIGN(.Lin_pm32)

	# Set up data segments for flat 32-bit mode

	movl	%ecx, %ds

	movl	%ecx, %es
@@ -72,4 +72,4 @@ ENDPROC(protected_mode_jump) 
	lldt	%cx



	jmpl	*%eax			# Jump to the 32-bit entrypoint

ENDPROC(.Lin_pm32)
 
SYM_FUNC_END(.Lin_pm32)