Message ID | 1420632260-8798-4-git-send-email-mark.rutland@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Jan 07, 2015 at 12:04:16PM +0000, Mark Rutland wrote: > Now that all users have been moved over to the common ESR_ELx_* macros, > remove the redundant ESR_EL1 macros. > > There should be no functional change as a result of this patch. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Christoffer Dall <christoffer.dall@linaro.org> > Cc: Marc Zyngier <marc.zyngier@arm.com> > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Will Deacon <will.deacon@arm.com> FYI: This breaks bisectability with KVM, so we should probably move the existing KVM references to the common definitions as part of this patch? -Christoffer
On Sun, Jan 11, 2015 at 06:08:05PM +0000, Christoffer Dall wrote: > On Wed, Jan 07, 2015 at 12:04:16PM +0000, Mark Rutland wrote: > > Now that all users have been moved over to the common ESR_ELx_* macros, > > remove the redundant ESR_EL1 macros. > > > > There should be no functional change as a result of this patch. > > > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > > Cc: Catalin Marinas <catalin.marinas@arm.com> > > Cc: Christoffer Dall <christoffer.dall@linaro.org> > > Cc: Marc Zyngier <marc.zyngier@arm.com> > > Cc: Peter Maydell <peter.maydell@linaro.org> > > Cc: Will Deacon <will.deacon@arm.com> > > FYI: This breaks bisectability with KVM, so we should probably move the > existing KVM references to the common definitions as part of this patch? Sorry about that, evidently I forgot the KVM code referred to some ESR_EL1_* definitions when I reorganised the series. Are you happy if I just move this patch after the KVM changes? That should keep everything bisectable and leaves the KVM changes confined to a single patch. Thanks, Mark.
On Mon, Jan 12, 2015 at 11:27:37AM +0000, Mark Rutland wrote: > On Sun, Jan 11, 2015 at 06:08:05PM +0000, Christoffer Dall wrote: > > On Wed, Jan 07, 2015 at 12:04:16PM +0000, Mark Rutland wrote: > > > Now that all users have been moved over to the common ESR_ELx_* macros, > > > remove the redundant ESR_EL1 macros. > > > > > > There should be no functional change as a result of this patch. > > > > > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > > > Cc: Catalin Marinas <catalin.marinas@arm.com> > > > Cc: Christoffer Dall <christoffer.dall@linaro.org> > > > Cc: Marc Zyngier <marc.zyngier@arm.com> > > > Cc: Peter Maydell <peter.maydell@linaro.org> > > > Cc: Will Deacon <will.deacon@arm.com> > > > > FYI: This breaks bisectability with KVM, so we should probably move the > > existing KVM references to the common definitions as part of this patch? > > Sorry about that, evidently I forgot the KVM code referred to some > ESR_EL1_* definitions when I reorganised the series. > > Are you happy if I just move this patch after the KVM changes? That > should keep everything bisectable and leaves the KVM changes confined to > a single patch. > sounds fine. -Christoffer
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index eaee379..19492e1 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -18,42 +18,6 @@ #ifndef __ASM_ESR_H #define __ASM_ESR_H -#define ESR_EL1_WRITE (1 << 6) -#define ESR_EL1_CM (1 << 8) -#define ESR_EL1_IL (1 << 25) - -#define ESR_EL1_EC_SHIFT (26) -#define ESR_EL1_EC_UNKNOWN (0x00) -#define ESR_EL1_EC_WFI (0x01) -#define ESR_EL1_EC_CP15_32 (0x03) -#define ESR_EL1_EC_CP15_64 (0x04) -#define ESR_EL1_EC_CP14_MR (0x05) -#define ESR_EL1_EC_CP14_LS (0x06) -#define ESR_EL1_EC_FP_ASIMD (0x07) -#define ESR_EL1_EC_CP10_ID (0x08) -#define ESR_EL1_EC_CP14_64 (0x0C) -#define ESR_EL1_EC_ILL_ISS (0x0E) -#define ESR_EL1_EC_SVC32 (0x11) -#define ESR_EL1_EC_SVC64 (0x15) -#define ESR_EL1_EC_SYS64 (0x18) -#define ESR_EL1_EC_IABT_EL0 (0x20) -#define ESR_EL1_EC_IABT_EL1 (0x21) -#define ESR_EL1_EC_PC_ALIGN (0x22) -#define ESR_EL1_EC_DABT_EL0 (0x24) -#define ESR_EL1_EC_DABT_EL1 (0x25) -#define ESR_EL1_EC_SP_ALIGN (0x26) -#define ESR_EL1_EC_FP_EXC32 (0x28) -#define ESR_EL1_EC_FP_EXC64 (0x2C) -#define ESR_EL1_EC_SERROR (0x2F) -#define ESR_EL1_EC_BREAKPT_EL0 (0x30) -#define ESR_EL1_EC_BREAKPT_EL1 (0x31) -#define ESR_EL1_EC_SOFTSTP_EL0 (0x32) -#define ESR_EL1_EC_SOFTSTP_EL1 (0x33) -#define ESR_EL1_EC_WATCHPT_EL0 (0x34) -#define ESR_EL1_EC_WATCHPT_EL1 (0x35) -#define ESR_EL1_EC_BKPT32 (0x38) -#define ESR_EL1_EC_BRK64 (0x3C) - #define ESR_ELx_EC_UNKNOWN (0x00) #define ESR_ELx_EC_WFx (0x01) /* Unallocated EC: 0x02 */
Now that all users have been moved over to the common ESR_ELx_* macros, remove the redundant ESR_EL1 macros. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christoffer Dall <christoffer.dall@linaro.org> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Will Deacon <will.deacon@arm.com> --- arch/arm64/include/asm/esr.h | 36 ------------------------------------ 1 file changed, 36 deletions(-)