On Wed, May 03, 2017 at 11:45:43AM +0100, Marc Zyngier wrote: > It is often useful to compare an ESR syndrome reporting the trapping > of a system register with a value matching that system register. > > Since encoding both the sysreg and the ESR version seem to be a bit > overkill, let's add a set of macros that convert an ESR value into > the corresponding sysreg encoding. > > We handle both AArch32 and AArch64, taking advantage of identical > encodings between system registers and CP15 accessors. > > Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> Nice! Acked-by: Mark Rutland <mark.rutland@xxxxxxx> Mark. > --- > arch/arm64/include/asm/esr.h | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h > index ad42e79a5d4d..db8f13137443 100644 > --- a/arch/arm64/include/asm/esr.h > +++ b/arch/arm64/include/asm/esr.h > @@ -19,6 +19,7 @@ > #define __ASM_ESR_H > > #include <asm/memory.h> > +#include <asm/sysreg.h> > > #define ESR_ELx_EC_UNKNOWN (0x00) > #define ESR_ELx_EC_WFx (0x01) > @@ -177,6 +178,30 @@ > > #define ESR_ELx_SYS64_ISS_SYS_CNTVCT (ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 2, 14, 0) | \ > ESR_ELx_SYS64_ISS_DIR_READ) > + > +#define esr_sys64_to_sysreg(e) \ > + sys_reg((((e) & ESR_ELx_SYS64_ISS_OP0_MASK) >> \ > + ESR_ELx_SYS64_ISS_OP0_SHIFT), \ > + (((e) & ESR_ELx_SYS64_ISS_OP1_MASK) >> \ > + ESR_ELx_SYS64_ISS_OP1_SHIFT), \ > + (((e) & ESR_ELx_SYS64_ISS_CRN_MASK) >> \ > + ESR_ELx_SYS64_ISS_CRN_SHIFT), \ > + (((e) & ESR_ELx_SYS64_ISS_CRM_MASK) >> \ > + ESR_ELx_SYS64_ISS_CRM_SHIFT), \ > + (((e) & ESR_ELx_SYS64_ISS_OP2_MASK) >> \ > + ESR_ELx_SYS64_ISS_OP2_SHIFT)) > + > +#define esr_cp15_to_sysreg(e) \ > + sys_reg(3, \ > + (((e) & ESR_ELx_SYS64_ISS_OP1_MASK) >> \ > + ESR_ELx_SYS64_ISS_OP1_SHIFT), \ > + (((e) & ESR_ELx_SYS64_ISS_CRN_MASK) >> \ > + ESR_ELx_SYS64_ISS_CRN_SHIFT), \ > + (((e) & ESR_ELx_SYS64_ISS_CRM_MASK) >> \ > + ESR_ELx_SYS64_ISS_CRM_SHIFT), \ > + (((e) & ESR_ELx_SYS64_ISS_OP2_MASK) >> \ > + ESR_ELx_SYS64_ISS_OP2_SHIFT)) > + > #ifndef __ASSEMBLY__ > #include <asm/types.h> > > -- > 2.11.0 >
