Commit 0829a076 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Merge branch 'for-next/asm-annotations' into for-next/core 

* for-next/asm-annotations:
  : Modernise arm64 assembly annotations
  arm64: head: Convert install_el2_stub to SYM_INNER_LABEL
  arm64: Mark call_smc_arch_workaround_1 as __maybe_unused
  arm64: entry-ftrace.S: Fix missing argument for CONFIG_FUNCTION_GRAPH_TRACER=y
  arm64: vdso32: Convert to modern assembler annotations
  arm64: vdso: Convert to modern assembler annotations
  arm64: sdei: Annotate SDEI entry points using new style annotations
  arm64: kvm: Modernize __smccc_workaround_1_smc_start annotations
  arm64: kvm: Modernize annotation for __bp_harden_hyp_vecs
  arm64: kvm: Annotate assembly using modern annoations
  arm64: kernel: Convert to modern annotations for assembly data
  arm64: head: Annotate stext and preserve_boot_args as code
  arm64: head.S: Convert to modern annotations for assembly functions
  arm64: ftrace: Modernise annotation of return_to_handler
  arm64: ftrace: Correct annotation of ftrace_caller assembly
  arm64: entry-ftrace.S: Convert to modern annotations for assembly functions
  arm64: entry: Additional annotation conversions for entry.S
  arm64: entry: Annotate ret_from_fork as code
  arm64: entry: Annotate vector table and handlers as code
  arm64: crypto: Modernize names for AES function macros
  arm64: crypto: Modernize some extra assembly annotations
parents da12d273 d4abd29d

arch/arm64/crypto/aes-ce.S

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>



#define AES_ENTRY(func)		SYM_FUNC_START(ce_ ## func)

#define AES_ENDPROC(func)	SYM_FUNC_END(ce_ ## func)

#define AES_FUNC_START(func)		SYM_FUNC_START(ce_ ## func)

#define AES_FUNC_END(func)		SYM_FUNC_END(ce_ ## func)



	.arch		armv8-a+crypto

arch/arm64/crypto/aes-modes.S

+24 −24
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ SYM_FUNC_END(aes_decrypt_block5x) 
	 *		   int blocks)

	 */



AES_ENTRY(aes_ecb_encrypt)

AES_FUNC_START(aes_ecb_encrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -79,10 +79,10 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
.Lecbencout:

	ldp		x29, x30, [sp], #16

	ret

AES_ENDPROC(aes_ecb_encrypt)

AES_FUNC_END(aes_ecb_encrypt)





AES_ENTRY(aes_ecb_decrypt)

AES_FUNC_START(aes_ecb_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -110,7 +110,7 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
.Lecbdecout:

	ldp		x29, x30, [sp], #16

	ret

AES_ENDPROC(aes_ecb_decrypt)

AES_FUNC_END(aes_ecb_decrypt)





	/*
@@ -126,7 +126,7 @@ AES_ENDPROC(aes_ecb_decrypt) 
	 *			 u32 const rk2[]);

	 */



AES_ENTRY(aes_essiv_cbc_encrypt)

AES_FUNC_START(aes_essiv_cbc_encrypt)

	ld1		{v4.16b}, [x5]			/* get iv */



	mov		w8, #14				/* AES-256: 14 rounds */
@@ -135,7 +135,7 @@ AES_ENTRY(aes_essiv_cbc_encrypt) 
	enc_switch_key	w3, x2, x6

	b		.Lcbcencloop4x



AES_ENTRY(aes_cbc_encrypt)

AES_FUNC_START(aes_cbc_encrypt)

	ld1		{v4.16b}, [x5]			/* get iv */

	enc_prepare	w3, x2, x6
@@ -167,10 +167,10 @@ AES_ENTRY(aes_cbc_encrypt) 
.Lcbcencout:

	st1		{v4.16b}, [x5]			/* return iv */

	ret

AES_ENDPROC(aes_cbc_encrypt)

AES_ENDPROC(aes_essiv_cbc_encrypt)

AES_FUNC_END(aes_cbc_encrypt)

AES_FUNC_END(aes_essiv_cbc_encrypt)



AES_ENTRY(aes_essiv_cbc_decrypt)

AES_FUNC_START(aes_essiv_cbc_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -181,7 +181,7 @@ AES_ENTRY(aes_essiv_cbc_decrypt) 
	encrypt_block	cbciv, w8, x6, x7, w9

	b		.Lessivcbcdecstart



AES_ENTRY(aes_cbc_decrypt)

AES_FUNC_START(aes_cbc_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -238,8 +238,8 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
	st1		{cbciv.16b}, [x5]		/* return iv */

	ldp		x29, x30, [sp], #16

	ret

AES_ENDPROC(aes_cbc_decrypt)

AES_ENDPROC(aes_essiv_cbc_decrypt)

AES_FUNC_END(aes_cbc_decrypt)

AES_FUNC_END(aes_essiv_cbc_decrypt)





	/*
@@ -249,7 +249,7 @@ AES_ENDPROC(aes_essiv_cbc_decrypt) 
	 *		       int rounds, int bytes, u8 const iv[])

	 */



AES_ENTRY(aes_cbc_cts_encrypt)

AES_FUNC_START(aes_cbc_cts_encrypt)

	adr_l		x8, .Lcts_permute_table

	sub		x4, x4, #16

	add		x9, x8, #32
@@ -276,9 +276,9 @@ AES_ENTRY(aes_cbc_cts_encrypt) 
	st1		{v0.16b}, [x4]			/* overlapping stores */

	st1		{v1.16b}, [x0]

	ret

AES_ENDPROC(aes_cbc_cts_encrypt)

AES_FUNC_END(aes_cbc_cts_encrypt)



AES_ENTRY(aes_cbc_cts_decrypt)

AES_FUNC_START(aes_cbc_cts_decrypt)

	adr_l		x8, .Lcts_permute_table

	sub		x4, x4, #16

	add		x9, x8, #32
@@ -305,7 +305,7 @@ AES_ENTRY(aes_cbc_cts_decrypt) 
	st1		{v2.16b}, [x4]			/* overlapping stores */

	st1		{v0.16b}, [x0]

	ret

AES_ENDPROC(aes_cbc_cts_decrypt)

AES_FUNC_END(aes_cbc_cts_decrypt)



	.section	".rodata", "a"

	.align		6
@@ -324,7 +324,7 @@ AES_ENDPROC(aes_cbc_cts_decrypt) 
	 *		   int blocks, u8 ctr[])

	 */



AES_ENTRY(aes_ctr_encrypt)

AES_FUNC_START(aes_ctr_encrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -409,7 +409,7 @@ ST5( st1 {v4.16b}, [x0], #16 ) 
	rev		x7, x7

	ins		vctr.d[0], x7

	b		.Lctrcarrydone

AES_ENDPROC(aes_ctr_encrypt)

AES_FUNC_END(aes_ctr_encrypt)





	/*
@@ -433,7 +433,7 @@ AES_ENDPROC(aes_ctr_encrypt) 
	uzp1		xtsmask.4s, xtsmask.4s, \tmp\().4s

	.endm



AES_ENTRY(aes_xts_encrypt)

AES_FUNC_START(aes_xts_encrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -518,9 +518,9 @@ AES_ENTRY(aes_xts_encrypt) 
	st1		{v2.16b}, [x4]			/* overlapping stores */

	mov		w4, wzr

	b		.Lxtsencctsout

AES_ENDPROC(aes_xts_encrypt)

AES_FUNC_END(aes_xts_encrypt)



AES_ENTRY(aes_xts_decrypt)

AES_FUNC_START(aes_xts_decrypt)

	stp		x29, x30, [sp, #-16]!

	mov		x29, sp
@@ -612,13 +612,13 @@ AES_ENTRY(aes_xts_decrypt) 
	st1		{v2.16b}, [x4]			/* overlapping stores */

	mov		w4, wzr

	b		.Lxtsdecctsout

AES_ENDPROC(aes_xts_decrypt)

AES_FUNC_END(aes_xts_decrypt)



	/*

	 * aes_mac_update(u8 const in[], u32 const rk[], int rounds,

	 *		  int blocks, u8 dg[], int enc_before, int enc_after)

	 */

AES_ENTRY(aes_mac_update)

AES_FUNC_START(aes_mac_update)

	frame_push	6



	mov		x19, x0
@@ -676,4 +676,4 @@ AES_ENTRY(aes_mac_update) 
	ld1		{v0.16b}, [x23]			/* get dg */

	enc_prepare	w21, x20, x0

	b		.Lmacloop4x

AES_ENDPROC(aes_mac_update)
 
AES_FUNC_END(aes_mac_update)

arch/arm64/crypto/aes-neon.S

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>



#define AES_ENTRY(func)		SYM_FUNC_START(neon_ ## func)

#define AES_ENDPROC(func)	SYM_FUNC_END(neon_ ## func)

#define AES_FUNC_START(func)		SYM_FUNC_START(neon_ ## func)

#define AES_FUNC_END(func)		SYM_FUNC_END(neon_ ## func)



	xtsmask		.req	v7

	cbciv		.req	v7

arch/arm64/crypto/ghash-ce-core.S

+8 −8
Original line number Diff line number Diff line
@@ -587,20 +587,20 @@ CPU_LE( rev w8, w8 ) 
	 *			  struct ghash_key const *k, u64 dg[], u8 ctr[],

	 *			  int rounds, u8 tag)

	 */

ENTRY(pmull_gcm_encrypt)

SYM_FUNC_START(pmull_gcm_encrypt)

	pmull_gcm_do_crypt	1

ENDPROC(pmull_gcm_encrypt)

SYM_FUNC_END(pmull_gcm_encrypt)



	/*

	 * void pmull_gcm_decrypt(int blocks, u8 dst[], const u8 src[],

	 *			  struct ghash_key const *k, u64 dg[], u8 ctr[],

	 *			  int rounds, u8 tag)

	 */

ENTRY(pmull_gcm_decrypt)

SYM_FUNC_START(pmull_gcm_decrypt)

	pmull_gcm_do_crypt	0

ENDPROC(pmull_gcm_decrypt)

SYM_FUNC_END(pmull_gcm_decrypt)



pmull_gcm_ghash_4x:

SYM_FUNC_START_LOCAL(pmull_gcm_ghash_4x)

	movi		MASK.16b, #0xe1

	shl		MASK.2d, MASK.2d, #57
@@ -681,9 +681,9 @@ pmull_gcm_ghash_4x: 
	eor		XL.16b, XL.16b, T2.16b



	ret

ENDPROC(pmull_gcm_ghash_4x)

SYM_FUNC_END(pmull_gcm_ghash_4x)



pmull_gcm_enc_4x:

SYM_FUNC_START_LOCAL(pmull_gcm_enc_4x)

	ld1		{KS0.16b}, [x5]			// load upper counter

	sub		w10, w8, #4

	sub		w11, w8, #3
@@ -746,7 +746,7 @@ pmull_gcm_enc_4x: 
	eor		INP3.16b, INP3.16b, KS3.16b



	ret

ENDPROC(pmull_gcm_enc_4x)

SYM_FUNC_END(pmull_gcm_enc_4x)



	.section	".rodata", "a"

	.align		6

arch/arm64/include/asm/kvm_asm.h

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
 */

#define KVM_VECTOR_PREAMBLE	(2 * AARCH64_INSN_SIZE)



#define __SMCCC_WORKAROUND_1_SMC_SZ 36



#ifndef __ASSEMBLY__



#include <linux/mm.h>
@@ -75,6 +77,8 @@ extern void __vgic_v3_init_lrs(void); 


extern u32 __kvm_get_mdcr_el2(void);



extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ];



/* Home-grown __this_cpu_{ptr,read} variants that always work at HYP */

#define __hyp_this_cpu_ptr(sym)						\

	({								\

CRA Git | Maintained and supported by SUSTech CRA and CCSE