andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused or invalid asm helper functions 

There are a small number of non-EL specific helper functions
which are no longer used, and also some unusable helper
functions for non-existant registers.

This change removes all of these functions.

Change-Id: Idd656cef3b59cf5c46fe2be4029d72288b649c24
This commit is contained in:
Andrew Thoelke 2014-04-28 12:33:52 +01:00
parent 7935d0a59d
commit 228a9f0b44
3 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/lib/aarch64/arch_helpers.h
View File

@ -194,9 +194,7 @@ extern unsigned long read_ttbr0_el1(void);
extern unsigned long read_ttbr0_el2(void);
extern unsigned long read_ttbr0_el3(void);
extern unsigned long read_ttbr1(void);
extern unsigned long read_ttbr1_el1(void);
extern unsigned long read_ttbr1_el2(void);
extern unsigned long read_cptr_el2(void);
extern unsigned long read_cptr_el3(void);
@ -228,12 +226,10 @@ extern void write_esr_el1(unsigned long);
extern void write_esr_el2(unsigned long);
extern void write_esr_el3(unsigned long);
extern void write_afsr0(unsigned long);
extern void write_afsr0_el1(unsigned long);
extern void write_afsr0_el2(unsigned long);
extern void write_afsr0_el3(unsigned long);
extern void write_afsr1(unsigned long);
extern void write_afsr1_el1(unsigned long);
extern void write_afsr1_el2(unsigned long);
extern void write_afsr1_el3(unsigned long);
@ -263,7 +259,6 @@ extern void write_ttbr0_el2(unsigned long);
extern void write_ttbr0_el3(unsigned long);
extern void write_ttbr1_el1(unsigned long);
extern void write_ttbr1_el2(unsigned long);
extern void write_cpuectlr(unsigned long);
extern void write_cptr_el2(unsigned long);

44
lib/aarch64/misc_helpers.S
View File

@ -46,22 +46,18 @@
.globl read_daif
.globl write_daif
.globl read_spsr
.globl read_spsr_el1
.globl read_spsr_el2
.globl read_spsr_el3
.globl write_spsr
.globl write_spsr_el1
.globl write_spsr_el2
.globl write_spsr_el3
.globl read_elr
.globl read_elr_el1
.globl read_elr_el2
.globl read_elr_el3
.globl write_elr
.globl write_elr_el1
.globl write_elr_el2
.globl write_elr_el3
@ -153,16 +149,6 @@ func write_daif
ret
func read_spsr
mrs x0, CurrentEl
cmp x0, #(MODE_EL1 << MODE_EL_SHIFT)
b.eq read_spsr_el1
cmp x0, #(MODE_EL2 << MODE_EL_SHIFT)
b.eq read_spsr_el2
cmp x0, #(MODE_EL3 << MODE_EL_SHIFT)
b.eq read_spsr_el3
func read_spsr_el1
mrs x0, spsr_el1
ret
@ -178,16 +164,6 @@ func read_spsr_el3
ret
func write_spsr
mrs x1, CurrentEl
cmp x1, #(MODE_EL1 << MODE_EL_SHIFT)
b.eq write_spsr_el1
cmp x1, #(MODE_EL2 << MODE_EL_SHIFT)
b.eq write_spsr_el2
cmp x1, #(MODE_EL3 << MODE_EL_SHIFT)
b.eq write_spsr_el3
func write_spsr_el1
msr spsr_el1, x0
ret
@ -203,16 +179,6 @@ func write_spsr_el3
ret
func read_elr
mrs x0, CurrentEl
cmp x0, #(MODE_EL1 << MODE_EL_SHIFT)
b.eq read_elr_el1
cmp x0, #(MODE_EL2 << MODE_EL_SHIFT)
b.eq read_elr_el2
cmp x0, #(MODE_EL3 << MODE_EL_SHIFT)
b.eq read_elr_el3
func read_elr_el1
mrs x0, elr_el1
ret
@ -228,16 +194,6 @@ func read_elr_el3
ret
func write_elr
mrs x1, CurrentEl
cmp x1, #(MODE_EL1 << MODE_EL_SHIFT)
b.eq write_elr_el1
cmp x1, #(MODE_EL2 << MODE_EL_SHIFT)
b.eq write_elr_el2
cmp x1, #(MODE_EL3 << MODE_EL_SHIFT)
b.eq write_elr_el3
func write_elr_el1
msr elr_el1, x0
ret

40
lib/aarch64/sysreg_helpers.S
View File

@ -125,10 +125,7 @@
.globl write_ttbr0_el3
.globl read_ttbr1_el1
.globl read_ttbr1_el2
.globl write_ttbr1
.globl write_ttbr1_el1
.globl write_ttbr1_el2
.globl read_cpacr
.globl write_cpacr
@ -160,8 +157,6 @@
#if SUPPORT_VFP
.globl enable_vfp
.globl read_fpexc
.globl write_fpexc
#endif
@ -577,11 +572,6 @@ func write_tcr_el3
* CPTR accessors
* -----------------------------------------------------
*/
func read_cptr_el1
b read_cptr_el1
ret
func read_cptr_el2
mrs x0, cptr_el2
ret
@ -592,10 +582,6 @@ func read_cptr_el3
ret
func write_cptr_el1
b write_cptr_el1
func write_cptr_el2
msr cptr_el2, x0
ret
@ -649,27 +635,11 @@ func read_ttbr1_el1
ret
func read_ttbr1_el2
b read_ttbr1_el2
func read_ttbr1_el3
b read_ttbr1_el3
func write_ttbr1_el1
msr ttbr1_el1, x0
ret
func write_ttbr1_el2
b write_ttbr1_el2
func write_ttbr1_el3
b write_ttbr1_el3
func read_hcr
mrs x0, hcr_el2
ret
@ -762,14 +732,4 @@ func enable_vfp
isb
ret
func read_fpexc
b read_fpexc
ret
func write_fpexc
b write_fpexc
ret
#endif