mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-04 01:53:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm: use correct argument size of special registers

Browse Source 
Compiling with clang on ARMv8 shows errors like:

./arch/arm/include/asm/system.h:162:32: note: use constraint modifier "w"
                asm volatile("msr sctlr_el1, %0" : : "r" (val) : "cc");
                                             ^~
                                             %w0

These errors are due to using an incorrect size for the variables used
for writing to and reading from special registers which have 64 bits on
ARMv8.

Mask off reserved bits when reading the exception level.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2020-05-27 20:04:24 +02:00 committed by Tom Rini
parent b87d8d6a0e
commit 22a4e006be
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/include/asm/system.h
View File

@ -133,14 +133,16 @@ enum dcache_option {
static inline unsigned int current_el(void)
{
unsigned int el;
unsigned long el;
asm volatile("mrs %0, CurrentEL" : "=r" (el) : : "cc");
return el >> 2;
return 3 & (el >> 2);
}
static inline unsigned int get_sctlr(void)
{
unsigned int el, val;
unsigned int el;
unsigned long val;
el = current_el();
if (el == 1)
@ -153,7 +155,7 @@ static inline unsigned int get_sctlr(void)
return val;
}
static inline void set_sctlr(unsigned int val)
static inline void set_sctlr(unsigned long val)
{
unsigned int el;