Commit f4659254 authored by Mark Brown's avatar Mark Brown Committed by Will Deacon
Browse files

arm64: mm: Use modern annotations for assembly functions 



In an effort to clarify and simplify the annotation of assembly functions
in the kernel new macros have been introduced. These replace ENTRY and
ENDPROC and also add a new annotation for static functions which previously
had no ENTRY equivalent. Update the annotations in the mm code to the
new macros. Even the functions called from non-standard environments
like idmap have no special requirements on their environments so can be
treated like regular functions.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 3ac0f452

arch/arm64/mm/cache.S

+26 −26
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 *	- start   - virtual start address of region

 *	- end     - virtual end address of region

 */

ENTRY(__flush_icache_range)

SYM_FUNC_START(__flush_icache_range)

	/* FALLTHROUGH */



/*
@@ -37,7 +37,7 @@ ENTRY(__flush_icache_range) 
 *	- start   - virtual start address of region

 *	- end     - virtual end address of region

 */

ENTRY(__flush_cache_user_range)

SYM_FUNC_START(__flush_cache_user_range)

	uaccess_ttbr0_enable x2, x3, x4

alternative_if ARM64_HAS_CACHE_IDC

	dsb	ishst
@@ -66,8 +66,8 @@ alternative_else_nop_endif 
9:

	mov	x0, #-EFAULT

	b	1b

ENDPROC(__flush_icache_range)

ENDPROC(__flush_cache_user_range)

SYM_FUNC_END(__flush_icache_range)

SYM_FUNC_END(__flush_cache_user_range)



/*

 *	invalidate_icache_range(start,end)
@@ -77,7 +77,7 @@ ENDPROC(__flush_cache_user_range) 
 *	- start   - virtual start address of region

 *	- end     - virtual end address of region

 */

ENTRY(invalidate_icache_range)

SYM_FUNC_START(invalidate_icache_range)

alternative_if ARM64_HAS_CACHE_DIC

	mov	x0, xzr

	isb
@@ -94,7 +94,7 @@ alternative_else_nop_endif 
2:

	mov	x0, #-EFAULT

	b	1b

ENDPROC(invalidate_icache_range)

SYM_FUNC_END(invalidate_icache_range)



/*

 *	__flush_dcache_area(kaddr, size)
@@ -105,10 +105,10 @@ ENDPROC(invalidate_icache_range) 
 *	- kaddr   - kernel address

 *	- size    - size in question

 */

ENTRY(__flush_dcache_area)

SYM_FUNC_START_PI(__flush_dcache_area)

	dcache_by_line_op civac, sy, x0, x1, x2, x3

	ret

ENDPIPROC(__flush_dcache_area)

SYM_FUNC_END_PI(__flush_dcache_area)



/*

 *	__clean_dcache_area_pou(kaddr, size)
@@ -119,14 +119,14 @@ ENDPIPROC(__flush_dcache_area) 
 *	- kaddr   - kernel address

 *	- size    - size in question

 */

ENTRY(__clean_dcache_area_pou)

SYM_FUNC_START(__clean_dcache_area_pou)

alternative_if ARM64_HAS_CACHE_IDC

	dsb	ishst

	ret

alternative_else_nop_endif

	dcache_by_line_op cvau, ish, x0, x1, x2, x3

	ret

ENDPROC(__clean_dcache_area_pou)

SYM_FUNC_END(__clean_dcache_area_pou)



/*

 *	__inval_dcache_area(kaddr, size)
@@ -138,7 +138,8 @@ ENDPROC(__clean_dcache_area_pou) 
 *	- kaddr   - kernel address

 *	- size    - size in question

 */

ENTRY(__inval_dcache_area)

SYM_FUNC_START_LOCAL(__dma_inv_area)

SYM_FUNC_START_PI(__inval_dcache_area)

	/* FALLTHROUGH */



/*
@@ -146,7 +147,6 @@ ENTRY(__inval_dcache_area) 
 *	- start   - virtual start address of region

 *	- size    - size in question

 */

__dma_inv_area:

	add	x1, x1, x0

	dcache_line_size x2, x3

	sub	x3, x2, #1
@@ -165,8 +165,8 @@ __dma_inv_area: 
	b.lo	2b

	dsb	sy

	ret

ENDPIPROC(__inval_dcache_area)

ENDPROC(__dma_inv_area)

SYM_FUNC_END_PI(__inval_dcache_area)

SYM_FUNC_END(__dma_inv_area)



/*

 *	__clean_dcache_area_poc(kaddr, size)
@@ -177,7 +177,8 @@ ENDPROC(__dma_inv_area) 
 *	- kaddr   - kernel address

 *	- size    - size in question

 */

ENTRY(__clean_dcache_area_poc)

SYM_FUNC_START_LOCAL(__dma_clean_area)

SYM_FUNC_START_PI(__clean_dcache_area_poc)

	/* FALLTHROUGH */



/*
@@ -185,11 +186,10 @@ ENTRY(__clean_dcache_area_poc) 
 *	- start   - virtual start address of region

 *	- size    - size in question

 */

__dma_clean_area:

	dcache_by_line_op cvac, sy, x0, x1, x2, x3

	ret

ENDPIPROC(__clean_dcache_area_poc)

ENDPROC(__dma_clean_area)

SYM_FUNC_END_PI(__clean_dcache_area_poc)

SYM_FUNC_END(__dma_clean_area)



/*

 *	__clean_dcache_area_pop(kaddr, size)
@@ -200,13 +200,13 @@ ENDPROC(__dma_clean_area) 
 *	- kaddr   - kernel address

 *	- size    - size in question

 */

ENTRY(__clean_dcache_area_pop)

SYM_FUNC_START_PI(__clean_dcache_area_pop)

	alternative_if_not ARM64_HAS_DCPOP

	b	__clean_dcache_area_poc

	alternative_else_nop_endif

	dcache_by_line_op cvap, sy, x0, x1, x2, x3

	ret

ENDPIPROC(__clean_dcache_area_pop)

SYM_FUNC_END_PI(__clean_dcache_area_pop)



/*

 *	__dma_flush_area(start, size)
@@ -216,10 +216,10 @@ ENDPIPROC(__clean_dcache_area_pop) 
 *	- start   - virtual start address of region

 *	- size    - size in question

 */

ENTRY(__dma_flush_area)

SYM_FUNC_START_PI(__dma_flush_area)

	dcache_by_line_op civac, sy, x0, x1, x2, x3

	ret

ENDPIPROC(__dma_flush_area)

SYM_FUNC_END_PI(__dma_flush_area)



/*

 *	__dma_map_area(start, size, dir)
@@ -227,11 +227,11 @@ ENDPIPROC(__dma_flush_area) 
 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(__dma_map_area)

SYM_FUNC_START_PI(__dma_map_area)

	cmp	w2, #DMA_FROM_DEVICE

	b.eq	__dma_inv_area

	b	__dma_clean_area

ENDPIPROC(__dma_map_area)

SYM_FUNC_END_PI(__dma_map_area)



/*

 *	__dma_unmap_area(start, size, dir)
@@ -239,8 +239,8 @@ ENDPIPROC(__dma_map_area) 
 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(__dma_unmap_area)

SYM_FUNC_START_PI(__dma_unmap_area)

	cmp	w2, #DMA_TO_DEVICE

	b.ne	__dma_inv_area

	ret

ENDPIPROC(__dma_unmap_area)
 
SYM_FUNC_END_PI(__dma_unmap_area)

arch/arm64/mm/proc.S

+12 −12
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
 *

 * x0: virtual address of context pointer

 */

ENTRY(cpu_do_suspend)

SYM_FUNC_START(cpu_do_suspend)

	mrs	x2, tpidr_el0

	mrs	x3, tpidrro_el0

	mrs	x4, contextidr_el1
@@ -74,7 +74,7 @@ alternative_endif 
	stp	x10, x11, [x0, #64]

	stp	x12, x13, [x0, #80]

	ret

ENDPROC(cpu_do_suspend)

SYM_FUNC_END(cpu_do_suspend)



/**

 * cpu_do_resume - restore CPU register context
@@ -82,7 +82,7 @@ ENDPROC(cpu_do_suspend) 
 * x0: Address of context pointer

 */

	.pushsection ".idmap.text", "awx"

ENTRY(cpu_do_resume)

SYM_FUNC_START(cpu_do_resume)

	ldp	x2, x3, [x0]

	ldp	x4, x5, [x0, #16]

	ldp	x6, x8, [x0, #32]
@@ -131,7 +131,7 @@ alternative_else_nop_endif 


	isb

	ret

ENDPROC(cpu_do_resume)

SYM_FUNC_END(cpu_do_resume)

	.popsection

#endif
@@ -142,7 +142,7 @@ ENDPROC(cpu_do_resume) 
 *

 *	- pgd_phys - physical address of new TTB

 */

ENTRY(cpu_do_switch_mm)

SYM_FUNC_START(cpu_do_switch_mm)

	mrs	x2, ttbr1_el1

	mmid	x1, x1				// get mm->context.id

	phys_to_ttbr x3, x0
@@ -161,7 +161,7 @@ alternative_else_nop_endif 
	msr	ttbr0_el1, x3			// now update TTBR0

	isb

	b	post_ttbr_update_workaround	// Back to C code...

ENDPROC(cpu_do_switch_mm)

SYM_FUNC_END(cpu_do_switch_mm)



	.pushsection ".idmap.text", "awx"
@@ -182,7 +182,7 @@ ENDPROC(cpu_do_switch_mm) 
 * This is the low-level counterpart to cpu_replace_ttbr1, and should not be

 * called by anything else. It can only be executed from a TTBR0 mapping.

 */

ENTRY(idmap_cpu_replace_ttbr1)

SYM_FUNC_START(idmap_cpu_replace_ttbr1)

	save_and_disable_daif flags=x2



	__idmap_cpu_set_reserved_ttbr1 x1, x3
@@ -194,7 +194,7 @@ ENTRY(idmap_cpu_replace_ttbr1) 
	restore_daif x2



	ret

ENDPROC(idmap_cpu_replace_ttbr1)

SYM_FUNC_END(idmap_cpu_replace_ttbr1)

	.popsection



#ifdef CONFIG_UNMAP_KERNEL_AT_EL0
@@ -222,7 +222,7 @@ ENDPROC(idmap_cpu_replace_ttbr1) 
 */

__idmap_kpti_flag:

	.long	1

ENTRY(idmap_kpti_install_ng_mappings)

SYM_FUNC_START(idmap_kpti_install_ng_mappings)

	cpu		.req	w0

	num_cpus	.req	w1

	swapper_pa	.req	x2
@@ -393,7 +393,7 @@ __idmap_kpti_secondary: 
	.unreq	cur_ptep

	.unreq	end_ptep

	.unreq	pte

ENDPROC(idmap_kpti_install_ng_mappings)

SYM_FUNC_END(idmap_kpti_install_ng_mappings)

	.popsection

#endif
@@ -404,7 +404,7 @@ ENDPROC(idmap_kpti_install_ng_mappings) 
 *	value of the SCTLR_EL1 register.

 */

	.pushsection ".idmap.text", "awx"

ENTRY(__cpu_setup)

SYM_FUNC_START(__cpu_setup)

	tlbi	vmalle1				// Invalidate local TLB

	dsb	nsh
@@ -475,4 +475,4 @@ ENTRY(__cpu_setup) 
#endif	/* CONFIG_ARM64_HW_AFDBM */

	msr	tcr_el1, x10

	ret					// return to head.S

ENDPROC(__cpu_setup)
 
SYM_FUNC_END(__cpu_setup)