Message ID | 1468587641-7300-6-git-send-email-drjones@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On 15/07/2016 15:00, Andrew Jones wrote: > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > lib/arm/asm/processor.h | 10 ++++++++++ > lib/arm64/asm/processor.h | 10 ++++++++++ > 2 files changed, 20 insertions(+) > > diff --git a/lib/arm/asm/processor.h b/lib/arm/asm/processor.h > index afc903ca7d4ab..75a8d08b89330 100644 > --- a/lib/arm/asm/processor.h > +++ b/lib/arm/asm/processor.h > @@ -35,6 +35,16 @@ static inline unsigned long current_cpsr(void) > > #define current_mode() (current_cpsr() & MODE_MASK) > > +static inline void local_irq_enable(void) > +{ > + asm volatile("cpsie i" : : : "memory", "cc"); > +} > + > +static inline void local_irq_disable(void) > +{ > + asm volatile("cpsid i" : : : "memory", "cc"); > +} > + > static inline unsigned int get_mpidr(void) > { > unsigned int mpidr; > diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h > index 94f7ce35b65c1..d54a4ed1c1876 100644 > --- a/lib/arm64/asm/processor.h > +++ b/lib/arm64/asm/processor.h > @@ -68,6 +68,16 @@ static inline unsigned long current_level(void) > return el & 0xc; > } > > +static inline void local_irq_enable(void) > +{ > + asm volatile("msr daifclr, #2" : : : "memory"); > +} > + > +static inline void local_irq_disable(void) > +{ > + asm volatile("msr daifset, #2" : : : "memory"); > +} > + > #define DEFINE_GET_SYSREG(reg, type) \ > static inline type get_##reg(void) \ > { \ > Besides the non existing commit msg - looks like the kvm-unit-tests practices are different from kernel ones ;-)-, Reviewed-by: Eric Auger <eric.auger@redhat.com> Eric
diff --git a/lib/arm/asm/processor.h b/lib/arm/asm/processor.h index afc903ca7d4ab..75a8d08b89330 100644 --- a/lib/arm/asm/processor.h +++ b/lib/arm/asm/processor.h @@ -35,6 +35,16 @@ static inline unsigned long current_cpsr(void) #define current_mode() (current_cpsr() & MODE_MASK) +static inline void local_irq_enable(void) +{ + asm volatile("cpsie i" : : : "memory", "cc"); +} + +static inline void local_irq_disable(void) +{ + asm volatile("cpsid i" : : : "memory", "cc"); +} + static inline unsigned int get_mpidr(void) { unsigned int mpidr; diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h index 94f7ce35b65c1..d54a4ed1c1876 100644 --- a/lib/arm64/asm/processor.h +++ b/lib/arm64/asm/processor.h @@ -68,6 +68,16 @@ static inline unsigned long current_level(void) return el & 0xc; } +static inline void local_irq_enable(void) +{ + asm volatile("msr daifclr, #2" : : : "memory"); +} + +static inline void local_irq_disable(void) +{ + asm volatile("msr daifset, #2" : : : "memory"); +} + #define DEFINE_GET_SYSREG(reg, type) \ static inline type get_##reg(void) \ { \