| Message ID | 1392149085-14366-6-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Accepted |
| Commit | 9d073bf65c8b70d23de7e4b8d67182f18131499e |
| Headers | show |
On Tue, 2014-02-11 at 20:04 +0000, Julien Grall wrote: > Theses headers are not in the right directory and are not used anymore. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> Acked-by: Ian Campbell <ian.campbell@citrix.com> Although perhaps proc-v7-c.c ought to be using some of these? e.g. ACTLR_CA15_SMP instead of ACTLR_V7_SMP, which now looks to be badly named to me...
Hi Ian, On 02/19/2014 12:19 PM, Ian Campbell wrote: > On Tue, 2014-02-11 at 20:04 +0000, Julien Grall wrote: >> Theses headers are not in the right directory and are not used anymore. >> >> Signed-off-by: Julien Grall <julien.grall@linaro.org> > > Acked-by: Ian Campbell <ian.campbell@citrix.com> > > Although perhaps proc-v7-c.c ought to be using some of these? e.g. > ACTLR_CA15_SMP instead of ACTLR_V7_SMP, which now looks to be badly > named to me... The name ACTLR_CA15_SMP gives the impression that it's only for Cortex A15, rather than A7. ACTLR_CORTEX_SMP is not better because we may have other cortex in future that do not have the SMP bit in the future. What about hardcoding the bit, as it will be only use here? Cheers,
On Thu, 2014-02-20 at 16:49 +0000, Julien Grall wrote: > Hi Ian, > > On 02/19/2014 12:19 PM, Ian Campbell wrote: > > On Tue, 2014-02-11 at 20:04 +0000, Julien Grall wrote: > >> Theses headers are not in the right directory and are not used anymore. > >> > >> Signed-off-by: Julien Grall <julien.grall@linaro.org> > > > > Acked-by: Ian Campbell <ian.campbell@citrix.com> > > > > Although perhaps proc-v7-c.c ought to be using some of these? e.g. > > ACTLR_CA15_SMP instead of ACTLR_V7_SMP, which now looks to be badly > > named to me... > > The name ACTLR_CA15_SMP gives the impression that it's only for Cortex > A15, rather than A7. > > ACTLR_CORTEX_SMP is not better because we may have other cortex in > future that do not have the SMP bit in the future. > > What about hardcoding the bit, as it will be only use here? Along with a suitable comment I suppose that would be OK in this instance. Ian.
diff --git a/xen/include/asm-arm/processor-ca15.h b/xen/include/asm-arm/processor-ca15.h deleted file mode 100644 index f65f40a..0000000 --- a/xen/include/asm-arm/processor-ca15.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef __ASM_ARM_PROCESSOR_CA15_H -#define __ASM_ARM_PROCESSOR_CA15_H - -/* ACTLR Auxiliary Control Register, Cortex A15 */ -#define ACTLR_CA15_SNOOP_DELAYED (1<<31) -#define ACTLR_CA15_MAIN_CLOCK (1<<30) -#define ACTLR_CA15_NEON_CLOCK (1<<29) -#define ACTLR_CA15_NONCACHE (1<<24) -#define ACTLR_CA15_INORDER_REQ (1<<23) -#define ACTLR_CA15_INORDER_LOAD (1<<22) -#define ACTLR_CA15_L2_TLB_PREFETCH (1<<21) -#define ACTLR_CA15_L2_IPA_PA_CACHE (1<<20) -#define ACTLR_CA15_L2_CACHE (1<<19) -#define ACTLR_CA15_L2_PA_CACHE (1<<18) -#define ACTLR_CA15_TLB (1<<17) -#define ACTLR_CA15_STRONGY_ORDERED (1<<16) -#define ACTLR_CA15_INORDER (1<<15) -#define ACTLR_CA15_FORCE_LIM (1<<14) -#define ACTLR_CA15_CP_FLUSH (1<<13) -#define ACTLR_CA15_CP_PUSH (1<<12) -#define ACTLR_CA15_LIM (1<<11) -#define ACTLR_CA15_SER (1<<10) -#define ACTLR_CA15_OPT (1<<9) -#define ACTLR_CA15_WFI (1<<8) -#define ACTLR_CA15_WFE (1<<7) -#define ACTLR_CA15_SMP (1<<6) -#define ACTLR_CA15_PLD (1<<5) -#define ACTLR_CA15_IP (1<<4) -#define ACTLR_CA15_MICRO_BTB (1<<3) -#define ACTLR_CA15_LOOP_ONE (1<<2) -#define ACTLR_CA15_LOOP_DISABLE (1<<1) -#define ACTLR_CA15_BTB (1<<0) - -#endif /* __ASM_ARM_PROCESSOR_CA15_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/processor-ca7.h b/xen/include/asm-arm/processor-ca7.h deleted file mode 100644 index 5048a95..0000000 --- a/xen/include/asm-arm/processor-ca7.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __ASM_ARM_PROCESSOR_CA7_H -#define __ASM_ARM_PROCESSOR_CA7_H - -/* ACTLR Auxiliary Control Register, Cortex A7 */ -#define ACTLR_CA7_DDI (1<<28) -#define ACTLR_CA7_DDVM (1<<15) -#define ACTLR_CA7_L1RADIS (1<<12) -#define ACTLR_CA7_L2RADIS (1<<11) -#define ACTLR_CA7_DODMBS (1<<10) -#define ACTLR_CA7_SMP (1<<6) - -#endif /* __ASM_ARM_PROCESSOR_CA7_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */
Theses headers are not in the right directory and are not used anymore. Signed-off-by: Julien Grall <julien.grall@linaro.org> --- xen/include/asm-arm/processor-ca15.h | 42 ---------------------------------- xen/include/asm-arm/processor-ca7.h | 20 ---------------- 2 files changed, 62 deletions(-) delete mode 100644 xen/include/asm-arm/processor-ca15.h delete mode 100644 xen/include/asm-arm/processor-ca7.h