Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-starfive.git] / arch / arm / include / asm / arch_gicv3.h

diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
index bdc8770..d15b8c9 100644 (file)
--- a/arch/arm/include/asm/arch_gicv3.h
+++ b/arch/arm/include/asm/arch_gicv3.h
@@ -34,6 +34,7 @@
 #define ICC_SRE                                __ACCESS_CP15(c12, 0, c12, 5)
 #define ICC_IGRPEN1                    __ACCESS_CP15(c12, 0, c12, 7)
 #define ICC_BPR1                       __ACCESS_CP15(c12, 0, c12, 3)
+#define ICC_RPR                                __ACCESS_CP15(c12, 0, c11, 3)
 
 #define __ICC_AP0Rx(x)                 __ACCESS_CP15(c12, 0, c8, 4 | x)
 #define ICC_AP0R0                      __ICC_AP0Rx(0)
@@ -245,6 +246,21 @@ static inline void gic_write_bpr1(u32 val)
        write_sysreg(val, ICC_BPR1);
 }
 
+static inline u32 gic_read_pmr(void)
+{
+       return read_sysreg(ICC_PMR);
+}
+
+static inline void gic_write_pmr(u32 val)
+{
+       write_sysreg(val, ICC_PMR);
+}
+
+static inline u32 gic_read_rpr(void)
+{
+       return read_sysreg(ICC_RPR);
+}
+
 /*
  * Even in 32bit systems that use LPAE, there is no guarantee that the I/O
  * interface provides true 64bit atomic accesses, so using strd/ldrd doesn't
@@ -347,5 +363,22 @@ static inline void gits_write_vpendbaser(u64 val, void * __iomem addr)
 
 #define gits_read_vpendbaser(c)                __gic_readq_nonatomic(c)
 
+static inline bool gic_prio_masking_enabled(void)
+{
+       return false;
+}
+
+static inline void gic_pmr_mask_irqs(void)
+{
+       /* Should not get called. */
+       WARN_ON_ONCE(true);
+}
+
+static inline void gic_arch_enable_irqs(void)
+{
+       /* Should not get called. */
+       WARN_ON_ONCE(true);
+}
+
 #endif /* !__ASSEMBLY__ */
 #endif /* !__ASM_ARCH_GICV3_H */