diff options
| author |   James Morse <james.morse@arm.com> | 2020-02-20 16:58:39 +0000 |
|---|---|---|
| committer |   Marc Zyngier <maz@kernel.org> | 2020-02-22 11:01:47 +0000 |
| commit | e43f1331e2ef913b8c566920c9af75e0ccdd1d3f (patch) | |
| tree | a459a778f754cae09f63052babb89d38129a2d1c /arch/arm64/include/asm/io.h | |
| parent | KVM: arm64: Define our own swab32() to avoid a uapi static inline (diff) | |
| download | linux-dev-e43f1331e2ef913b8c566920c9af75e0ccdd1d3f.tar.xz linux-dev-e43f1331e2ef913b8c566920c9af75e0ccdd1d3f.zip | |
arm64: Ask the compiler to __always_inline functions used by KVM at HYP
KVM uses some of the static-inline helpers like icache_is_vipt() from
its HYP code. This assumes the function is inlined so that the code is
mapped to EL2. The compiler may decide not to inline these, and the
out-of-line version may not be in the __hyp_text section.
Add the additional __always_ hint to these static-inlines that are used
by KVM.
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200220165839.256881-4-james.morse@arm.com
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 4e531f57147d..6facd1308e7c 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -34,7 +34,7 @@ static inline void __raw_writew(u16 val, volatile void __iomem *addr) } #define __raw_writel __raw_writel -static inline void __raw_writel(u32 val, volatile void __iomem *addr) +static __always_inline void __raw_writel(u32 val, volatile void __iomem *addr) { asm volatile("str %w0, [%1]" : : "rZ" (val), "r" (addr)); } @@ -69,7 +69,7 @@ static inline u16 __raw_readw(const volatile void __iomem *addr) } #define __raw_readl __raw_readl -static inline u32 __raw_readl(const volatile void __iomem *addr) +static __always_inline u32 __raw_readl(const volatile void __iomem *addr) { u32 val; asm volatile(ALTERNATIVE("ldr %w0, [%1]", |