Commit 3e705066 authored Jan 06, 2020 by Mark Brown Committed by Greg Kroah-Hartman Nov 10, 2020

arm64: asm: Add new-style position independent function annotations



commit 35e61c77ef386555f3df1bc2057098c6997ca10b upstream.

As part of an effort to make the annotations in assembly code clearer and
more consistent new macros have been introduced, including replacements
for ENTRY() and ENDPROC().

On arm64 we have ENDPIPROC(), a custom version of ENDPROC() which is
used for code that will need to run in position independent environments
like EFI, it creates an alias for the function with the prefix __pi_ and
then emits the standard ENDPROC. Add new-style macros to replace this
which expand to the standard SYM_FUNC_*() and SYM_FUNC_ALIAS_*(),
resulting in the same object code. These are added in linkage.h for
consistency with where the generic assembler code has its macros.

Signed-off-by: Mark Brown <broonie@kernel.org>
[will: Rename 'WEAK' macro, use ';' instead of ASM_NL, deprecate ENDPIPROC]
Signed-off-by: Will Deacon <will@kernel.org>
Cc: Jian Cai <jiancai@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 840d8c9b

arch/arm64/include/asm/assembler.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -462,6 +462,7 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU
		.endm

		/*
		* Deprecated! Use SYM_FUNC_{START,START_WEAK,END}_PI instead.
		* Annotate a function as position independent, i.e., safe to be called before
		* the kernel virtual mapping is activated.
		*/

arch/arm64/include/asm/linkage.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -4,4 +4,20 @@
		#define __ALIGN .align 2
		#define __ALIGN_STR ".align 2"

		/*
		* Annotate a function as position independent, i.e., safe to be called before
		* the kernel virtual mapping is activated.
		*/
		#define SYM_FUNC_START_PI(x) \
		SYM_FUNC_START_ALIAS(__pi_##x); \
		SYM_FUNC_START(x)

		#define SYM_FUNC_START_WEAK_PI(x) \
		SYM_FUNC_START_ALIAS(__pi_##x); \
		SYM_FUNC_START_WEAK(x)

		#define SYM_FUNC_END_PI(x) \
		SYM_FUNC_END(x); \
		SYM_FUNC_END_ALIAS(__pi_##x)

		#endif