arm64: irqflags: Fix clang build warnings

Julien Thierry · ctmarinas · commit a80554fc36ba · 2019-02-12T11:33:57.000Z
Clang complains when passing asm operands that are smaller than the
registers they are mapped to:

arch/arm64/include/asm/irqflags.h:50:10: warning: value size does not
	match register size specified by the constraint and modifier
	[-Wasm-operand-widths]
                : "r" (GIC_PRIO_IRQON)

Fix it by casting the affected input operands to a type of the correct
size.

Reported-by: Nathan Chancellor &lt;natechancellor@gmail.com&gt;
Tested-by: Nathan Chancellor &lt;natechancellor@gmail.com&gt;
Signed-off-by: Julien Thierry &lt;julien.thierry@arm.com&gt;
Signed-off-by: Catalin Marinas &lt;catalin.marinas@arm.com&gt;
diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h
@@ -47,7 +47,7 @@ static inline void arch_local_irq_enable(void)
 		"dsb	sy",
 		ARM64_HAS_IRQ_PRIO_MASKING)
 		:
-		: "r" (GIC_PRIO_IRQON)
+		: "r" ((unsigned long) GIC_PRIO_IRQON)
 		: "memory");
 }
 
@@ -58,7 +58,7 @@ static inline void arch_local_irq_disable(void)
 		"msr_s  " __stringify(SYS_ICC_PMR_EL1) ", %0",
 		ARM64_HAS_IRQ_PRIO_MASKING)
 		:
-		: "r" (GIC_PRIO_IRQOFF)
+		: "r" ((unsigned long) GIC_PRIO_IRQOFF)
 		: "memory");
 }
 
@@ -91,7 +91,7 @@ static inline unsigned long arch_local_save_flags(void)
 			"csel	%0, %0, %2, eq",
 			ARM64_HAS_IRQ_PRIO_MASKING)
 		: "=&r" (flags), "+r" (daif_bits)
-		: "r" (GIC_PRIO_IRQOFF)
+		: "r" ((unsigned long) GIC_PRIO_IRQOFF)
 		: "memory");
 
 	return flags;

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static inline void arch_local_irq_enable(void)`
`47`	`47`	`"dsb sy",`
`48`	`48`	`ARM64_HAS_IRQ_PRIO_MASKING)`
`49`	`49`	`:`
`50`		`- : "r" (GIC_PRIO_IRQON)`
	`50`	`+ : "r" ((unsigned long) GIC_PRIO_IRQON)`
`51`	`51`	`: "memory");`
`52`	`52`	`}`
`53`	`53`
`@@ -58,7 +58,7 @@ static inline void arch_local_irq_disable(void)`
`58`	`58`	`"msr_s " __stringify(SYS_ICC_PMR_EL1) ", %0",`
`59`	`59`	`ARM64_HAS_IRQ_PRIO_MASKING)`
`60`	`60`	`:`
`61`		`- : "r" (GIC_PRIO_IRQOFF)`
	`61`	`+ : "r" ((unsigned long) GIC_PRIO_IRQOFF)`
`62`	`62`	`: "memory");`
`63`	`63`	`}`
`64`	`64`
`@@ -91,7 +91,7 @@ static inline unsigned long arch_local_save_flags(void)`
`91`	`91`	`"csel %0, %0, %2, eq",`
`92`	`92`	`ARM64_HAS_IRQ_PRIO_MASKING)`
`93`	`93`	`: "=&r" (flags), "+r" (daif_bits)`
`94`		`- : "r" (GIC_PRIO_IRQOFF)`
	`94`	`+ : "r" ((unsigned long) GIC_PRIO_IRQOFF)`
`95`	`95`	`: "memory");`
`96`	`96`
`97`	`97`	`return flags;`