[v5,2/8] linux-generic: separate MIPS ODP_CACHE_LINE_SIZE to its arch file

Message ID 1456946992-19251-3-git-send-email-mike.holmes@linaro.org
State New
Headers show

Commit Message

Mike Holmes March 2, 2016, 7:29 p.m.
From: Hongbo Zhang <hongbo.zhang@linaro.org>

Currently all ODP_CACHE_LINE_SIZE macros for different architectures are
held in one header file, they should be moved to their own arch file.
This patch moves ODP_CACHE_LINE_SIZE for MIPS.

Signed-off-by: Hongbo Zhang <hongbo.zhang@linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org>
---
 platform/linux-generic/arch/mips64/odp/cpu_arch.h | 12 ++++++++++++
 platform/linux-generic/include/odp/align.h        |  4 ----
 2 files changed, 12 insertions(+), 4 deletions(-)

Patch

diff --git a/platform/linux-generic/arch/mips64/odp/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/cpu_arch.h
index 3bfa0dc..7b5bfd2 100644
--- a/platform/linux-generic/arch/mips64/odp/cpu_arch.h
+++ b/platform/linux-generic/arch/mips64/odp/cpu_arch.h
@@ -11,6 +11,18 @@ 
 extern "C" {
 #endif
 
+/** @ingroup odp_compiler_optim
+ *  @{
+ */
+
+#if defined __OCTEON__
+#define ODP_CACHE_LINE_SIZE 128
+#endif
+
+/**
+ * @}
+ */
+
 static inline void odp_cpu_pause(void)
 {
 	__asm__ __volatile__ ("nop");
diff --git a/platform/linux-generic/include/odp/align.h b/platform/linux-generic/include/odp/align.h
index 161a302..0f11569 100644
--- a/platform/linux-generic/include/odp/align.h
+++ b/platform/linux-generic/include/odp/align.h
@@ -35,10 +35,6 @@  extern "C" {
 
 #define ODP_CACHE_LINE_SIZE 64
 
-#elif defined __OCTEON__
-
-#define ODP_CACHE_LINE_SIZE 128
-
 #elif defined __powerpc__
 
 #define ODP_CACHE_LINE_SIZE 64