[PATCH] spl: atf: Fix clang -Wasm-operand-widths warning

common/spl/spl_atf.c:187:51: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths] __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); ^ common/spl/spl_atf.c:187:34: note: use constraint modifier "w" __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); ^~ %w0
Use %x0 to match what Linux does in <asm/sysreg.h> write_sysreg().
Signed-off-by: Alistair Delva adelva@google.com Cc: Kever Yang kever.yang@rock-chips.com Cc: Michael Walle michael@walle.cc Cc: Simon Glass sjg@chromium.org Cc: Tom Rini trini@konsulko.com Cc: Nick Desaulniers ndesaulniers@google.com --- common/spl/spl_atf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index e1b68dd561..bae5c010c8 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -184,7 +184,7 @@ __weak struct bl_params *bl2_plat_get_bl31_params_v2(uintptr_t bl32_entry,
static inline void raw_write_daif(unsigned int daif) { - __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); + __asm__ __volatile__("msr DAIF, %x0\n\t" : : "r" (daif) : "memory"); }
typedef void (*atf_entry_t)(struct bl31_params *params, void *plat_params);

On Mon, Sep 26, 2022 at 08:47:55PM +0000, Alistair Delva wrote:
common/spl/spl_atf.c:187:51: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths] __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); ^ common/spl/spl_atf.c:187:34: note: use constraint modifier "w" __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); ^~ %w0
Use %x0 to match what Linux does in <asm/sysreg.h> write_sysreg().
Signed-off-by: Alistair Delva adelva@google.com Cc: Kever Yang kever.yang@rock-chips.com Cc: Michael Walle michael@walle.cc Cc: Simon Glass sjg@chromium.org Cc: Tom Rini trini@konsulko.com Cc: Nick Desaulniers ndesaulniers@google.com
Applied to u-boot/master, thanks!
participants (2)
-
Alistair Delva
-
Tom Rini