soc: bflb: Enable xtheadcmo cache management for bl61x

Enables usage of the xuantie,xtheacmo driver on bl61x

Signed-off-by: Camille BAUD <[email protected]>

Author: VynDragon

soc/bflb/bl61x/Kconfig

@@ -3,12 +3,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_BL61X
+	select CACHE_MANAGEMENT
 	select CLOCK_CONTROL
 	select CODE_DATA_RELOCATION
 	select CPU_HAS_FPU
+	select CPU_HAS_ICACHE
+	select CPU_HAS_DCACHE
+	select DCACHE
 	select FLOAT_HARD
 	select FPU
 	select GEN_IRQ_VECTOR_TABLE
+	select ICACHE
 	select INCLUDE_RESET_VECTOR
 	select RISCV
 	select RISCV_HAS_CLIC

soc/bflb/bl61x/soc.c

@@ -13,6 +13,7 @@
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/irq.h>
+#include <zephyr/drivers/cache.h>
 
 #include <bflb_soc.h>
 #include <glb_reg.h>
@@ -107,29 +108,7 @@ void system_BOD_init(void)
 	sys_write32(tmp, HBN_BASE + HBN_BOR_CFG_OFFSET);
 }
 
-static void clean_dcache(void)
-{
-	__asm__ volatile (
-		"fence\n"
-		/* th.dcache.call*/
-		".insn 0x10000B\n"
-		"fence\n"
-	);
-}
-
-static void clean_icache(void)
-{
-	__asm__ volatile (
-		"fence\n"
-		"fence.i\n"
-		/* th.icache.iall */
-		".insn 0x100000B\n"
-		"fence\n"
-		"fence.i\n"
-	);
-}
-
-static void enable_icache(void)
+void cache_instr_enable(void)
 {
 	uint32_t tmp;
 
@@ -153,7 +132,7 @@ static void enable_icache(void)
 	);
 }
 
-static void enable_dcache(void)
+void cache_data_enable(void)
 {
 	uint32_t tmp;
 
@@ -250,6 +229,18 @@ static void disable_interrupt_autostacking(void)
 }
 
 
+void arch_cache_init(void)
+{
+	enable_thead_isa_ext();
+	set_thead_enforce_aligned(false);
+	cache_data_enable();
+	enable_branchpred(true);
+	cache_instr_enable();
+	disable_interrupt_autostacking();
+	cache_data_flush_and_invd_all();
+	cache_instr_invd_all();
+}
+
 void soc_early_init_hook(void)
 {
 	uint32_t key;
@@ -263,18 +254,6 @@ void soc_early_init_hook(void)
 	sys_write32((1 << 5), PDS_BASE + PDS_USB_CTL_OFFSET);
 	sys_write32(0, PDS_BASE + PDS_USB_PHY_CTRL_OFFSET);
 
-	enable_thead_isa_ext();
-	set_thead_enforce_aligned(false);
-	enable_dcache();
-	/* branch prediction can cause major slowdowns (250ms -> 2 seconds)
-	 * in some applications
-	 */
-	enable_branchpred(true);
-	enable_icache();
-	disable_interrupt_autostacking();
-	clean_dcache();
-	clean_icache();
-
 	/* reset uart signals */
 	sys_write32(0xffffffffU, GLB_BASE + GLB_UART_CFG1_OFFSET);
 	sys_write32(0x0000ffffU, GLB_BASE + GLB_UART_CFG2_OFFSET);