armv7/8 cache:CSSELR should be set before getting cache info

According to the ARMv7a/r/m and ARMv8m architecture manuals
The allowed values are
0 Data or unified cache.
1 Instruction cache.

"One CCSIDR is implemented for each cache that can be accessed by the processor. CSSELR selects which Cache Size ID Register is accessible, see c0, Cache Size Selection Register (CSSELR)."

Signed-off-by: chenrun1 <[email protected]>

Author: crafcat7

arch/arm/src/armv7-a/arm_cache.c

@@ -32,16 +32,16 @@
 #include "l2cc.h"
 
 /****************************************************************************
- * Private Functions
+ * Public Functions
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_ICACHE) || defined(CONFIG_ARCH_DCACHE)
+#ifdef CONFIG_ARCH_ICACHE
 
 /****************************************************************************
- * Name: up_get_cache_linesize
+ * Name: up_get_icache_linesize
  *
  * Description:
- *   Get cache linesize
+ *   Get icache linesize
  *
  * Input Parameters:
  *   None
@@ -51,45 +51,18 @@
  *
  ****************************************************************************/
 
-static size_t up_get_cache_linesize(void)
+size_t up_get_icache_linesize(void)
 {
   static uint32_t clsize;
 
   if (clsize == 0)
     {
-      clsize = MAX(cp15_cache_linesize(), l2cc_get_linesize());
+      clsize = MAX(cp15_icache_linesize(), l2cc_linesize());
     }
 
   return clsize;
 }
 
-#endif
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-#ifdef CONFIG_ARCH_ICACHE
-
-/****************************************************************************
- * Name: up_get_icache_linesize
- *
- * Description:
- *   Get icache linesize
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   Cache line size
- *
- ****************************************************************************/
-
-size_t up_get_icache_linesize(void)
-{
-  return up_get_cache_linesize();
-}
-
 /****************************************************************************
  * Name: up_invalidate_icache_all
  *
@@ -189,7 +162,14 @@ void up_disable_icache(void)
 
 size_t up_get_dcache_linesize(void)
 {
-  return up_get_cache_linesize();
+  static uint32_t clsize;
+
+  if (clsize == 0)
+    {
+      clsize = MAX(cp15_dcache_linesize(), l2cc_linesize());
+    }
+
+  return clsize;
 }
 
 /****************************************************************************
@@ -272,7 +252,7 @@ void up_invalidate_dcache_all(void)
 
 void up_clean_dcache(uintptr_t start, uintptr_t end)
 {
-  if ((end - start) < cp15_cache_size())
+  if ((end - start) < cp15_dcache_size())
     {
       cp15_clean_dcache(start, end);
     }
@@ -336,7 +316,7 @@ void up_clean_dcache_all(void)
 
 void up_flush_dcache(uintptr_t start, uintptr_t end)
 {
-  if ((end - start) < cp15_cache_size())
+  if ((end - start) < cp15_dcache_size())
     {
       cp15_flush_dcache(start, end);
     }

arch/arm/src/armv7-a/arm_l2cc_pl310.c

@@ -397,7 +397,7 @@ void arm_l2ccinitialize(void)
 }
 
 /****************************************************************************
- * Name: l2cc_get_linesize
+ * Name: l2cc_linesize
  *
  * Description:
  *    Get L2CC-P310 L2 cache linesize
@@ -410,7 +410,7 @@ void arm_l2ccinitialize(void)
  *
  ****************************************************************************/
 
-uint32_t l2cc_get_linesize(void)
+uint32_t l2cc_linesize(void)
 {
   return PL310_CACHE_LINE_SIZE;
 }

arch/arm/src/armv7-a/cp15_cacheops.c

@@ -44,9 +44,19 @@ static inline uint32_t ilog2(uint32_t u)
   return i;
 }
 
-static inline uint32_t cp15_cache_get_info(uint32_t *sets, uint32_t *ways)
+static inline uint32_t cp15_cache_get_info(uint32_t *sets, uint32_t *ways,
+                                           bool icache)
 {
-  uint32_t ccsidr = CP15_GET(CCSIDR);
+  uint32_t ccsidr;
+  uint32_t csselr;
+
+  csselr = CP15_GET(CSSELR);
+
+  csselr = (csselr & ~0x01) | (icache & 0x01);
+
+  CP15_SET(CSSELR, csselr);
+
+  ccsidr = CP15_GET(CCSIDR);
 
   if (sets)
     {
@@ -93,7 +103,7 @@ static void cp15_dcache_op_mva(uintptr_t start, uintptr_t end, int op)
 {
   uint32_t line;
 
-  line = cp15_cache_get_info(NULL, NULL);
+  line = cp15_dcache_linesize();
 
   ARM_DSB();
 
@@ -158,7 +168,7 @@ void cp15_dcache_op_level(uint32_t level, int op)
 
   /* Get cache info */
 
-  line = cp15_cache_get_info(&sets, &ways);
+  line = cp15_cache_get_info(&sets, &ways, false);
 
   way_shift = 32 - ilog2(ways);
   set_shift = ilog2(line);
@@ -209,7 +219,7 @@ void cp15_invalidate_icache(uintptr_t start, uintptr_t end)
 {
   uint32_t line;
 
-  line = cp15_cache_get_info(NULL, NULL);
+  line = cp15_icache_linesize();
   start &= ~(line - 1);
 
   ARM_DSB();
@@ -259,18 +269,60 @@ void cp15_flush_dcache_all(void)
   cp15_dcache_op(CP15_CACHE_CLEANINVALIDATE);
 }
 
-uint32_t cp15_cache_size(void)
+uint32_t cp15_icache_size(void)
 {
-  uint32_t sets;
-  uint32_t ways;
-  uint32_t line;
+  static uint32_t csize;
 
-  line = cp15_cache_get_info(&sets, &ways);
+  if (csize == 0)
+    {
+      uint32_t sets;
+      uint32_t ways;
+      uint32_t line;
 
-  return sets * ways * line;
+      line = cp15_cache_get_info(&sets, &ways, true);
+      csize = sets * ways * line;
+    }
+
+  return csize;
 }
 
-uint32_t cp15_cache_linesize(void)
+uint32_t cp15_dcache_size(void)
 {
-  return cp15_cache_get_info(NULL, NULL);
+  static uint32_t csize;
+
+  if (csize == 0)
+    {
+      uint32_t sets;
+      uint32_t ways;
+      uint32_t line;
+
+      line = cp15_cache_get_info(&sets, &ways, false);
+      csize = sets * ways * line;
+    }
+
+  return csize;
+}
+
+uint32_t cp15_icache_linesize(void)
+{
+  static uint32_t clsize;
+
+  if (clsize == 0)
+    {
+      clsize = cp15_cache_get_info(NULL, NULL, true);
+    }
+
+  return clsize;
+}
+
+uint32_t cp15_dcache_linesize(void)
+{
+  static uint32_t clsize;
+
+  if (clsize == 0)
+    {
+      clsize = cp15_cache_get_info(NULL, NULL, false);
+    }
+
+  return clsize;
 }

arch/arm/src/armv7-a/cp15_cacheops.h

@@ -1090,11 +1090,27 @@ void cp15_flush_dcache(uintptr_t start, uintptr_t end);
 
 void cp15_flush_dcache_all(void);
 
+/****************************************************************************
+ * Name: cp15_icache_size
+ *
+ * Description:
+ *   Get cp15 icache size in byte
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   Cache size in byte
+ *
+ ****************************************************************************/
+
+uint32_t cp15_icache_size(void);
+
 /****************************************************************************
  * Name: cp15_cache_size
  *
  * Description:
- *   Get cp15 cache size in byte
+ *   Get cp15 dcache size in byte
  *
  * Input Parameters:
  *   None
@@ -1104,23 +1120,39 @@ void cp15_flush_dcache_all(void);
  *
  ****************************************************************************/
 
-uint32_t cp15_cache_size(void);
+uint32_t cp15_dcache_size(void);
+
+/****************************************************************************
+ * Name: cp15_icache_linesize
+ *
+ * Description:
+ *   Get cp15 icache linesize in byte
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   ICache linesize in byte
+ *
+ ****************************************************************************/
+
+uint32_t cp15_icache_linesize(void);
 
 /****************************************************************************
- * Name: cp15_cache_linesize
+ * Name: cp15_dcache_linesize
  *
  * Description:
- *   Get cp15 cache linesize in byte
+ *   Get cp15 dcache linesize in byte
  *
  * Input Parameters:
  *   None
  *
  * Returned Value:
- *   Cache linesize in byte
+ *   DCache linesize in byte
  *
  ****************************************************************************/
 
-uint32_t cp15_cache_linesize(void);
+uint32_t cp15_dcache_linesize(void);
 
 #undef EXTERN
 #ifdef __cplusplus

arch/arm/src/armv7-a/l2cc.h

@@ -71,7 +71,7 @@ void arm_l2ccinitialize(void);
 #endif
 
 /****************************************************************************
- * Name: l2cc_get_linesize
+ * Name: l2cc_linesize
  *
  * Description:
  *    Get L2 cache linesize
@@ -84,7 +84,7 @@ void arm_l2ccinitialize(void);
  *
  ****************************************************************************/
 
-uint32_t l2cc_get_linesize(void);
+uint32_t l2cc_linesize(void);
 
 /****************************************************************************
  * Name: l2cc_enable
@@ -245,7 +245,7 @@ void l2cc_flush(uint32_t startaddr, uint32_t endaddr);
    * compilation in one place.
    */
 
-#  define l2cc_get_linesize() 0
+#  define l2cc_linesize() 0
 #  define l2cc_enable()
 #  define l2cc_disable()
 #  define l2cc_sync()