From 661b5cf84d31097773bd462f14a55bda705c0f6e Mon Sep 17 00:00:00 2001
From: Glauber Maroto Ferreira <glauber.ferreira@espressif.com>
Date: Mon, 8 Nov 2021 17:18:31 -0300
Subject: [PATCH] soc: xtensa: esp32s2: add data cache initialization

during esp32s2 boot.

Signed-off-by: Glauber Maroto Ferreira <glauber.ferreira@espressif.com>
---
 soc/xtensa/esp32s2/Kconfig.soc | 12 +++++++++++
 soc/xtensa/esp32s2/soc.c       | 39 ++++++++++++++++++++++++++++++++++
 soc/xtensa/esp32s2/soc.h       | 10 +++++++++
 3 files changed, 61 insertions(+)

diff --git a/soc/xtensa/esp32s2/Kconfig.soc b/soc/xtensa/esp32s2/Kconfig.soc
index db38c6edab8..f9ef732ba24 100644
--- a/soc/xtensa/esp32s2/Kconfig.soc
+++ b/soc/xtensa/esp32s2/Kconfig.soc
@@ -58,6 +58,18 @@ choice
 
 endchoice
 
+choice
+	prompt "Data cache line size"
+	default ESP32S2_DATA_CACHE_LINE_32B
+
+	config ESP32S2_DATA_CACHE_LINE_16B
+		bool "16 Bytes"
+
+	config ESP32S2_DATA_CACHE_LINE_32B
+		bool "32 Bytes"
+
+endchoice
+
 config ESP32S2_INSTRUCTION_CACHE_SIZE
 	hex
 	default 0x4000 if ESP32S2_INSTRUCTION_CACHE_16KB
diff --git a/soc/xtensa/esp32s2/soc.c b/soc/xtensa/esp32s2/soc.c
index 1b0cd0b37e4..9023c4fb703 100644
--- a/soc/xtensa/esp32s2/soc.c
+++ b/soc/xtensa/esp32s2/soc.c
@@ -80,6 +80,45 @@ void __attribute__((section(".iram1"))) __start(void)
 	esp_rom_Cache_Invalidate_ICache_All();
 	esp_rom_Cache_Resume_ICache(0);
 
+	/*
+	 * If we need use SPIRAM, we should use data cache, or if we want to
+	 * access rodata, we also should use data cache.
+	 * Configure the mode of data : cache size, cache associated ways, cache
+	 * line size.
+	 * Enable data cache, so if we don't use SPIRAM, it just works.
+	 */
+#if CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB
+#if CONFIG_ESP32S2_DATA_CACHE_8KB
+	esp_rom_Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_DCACHE_LOW,
+			CACHE_MEMORY_INVALID, CACHE_MEMORY_INVALID);
+	cache_size = CACHE_SIZE_8KB;
+#else
+	esp_rom_Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_DCACHE_LOW,
+			CACHE_MEMORY_DCACHE_HIGH, CACHE_MEMORY_INVALID);
+	cache_size = CACHE_SIZE_16KB;
+#endif
+#else
+#if CONFIG_ESP32S2_DATA_CACHE_8KB
+	esp_rom_Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_ICACHE_HIGH,
+			CACHE_MEMORY_DCACHE_LOW, CACHE_MEMORY_INVALID);
+	cache_size = CACHE_SIZE_8KB;
+#else
+	esp_rom_Cache_Allocate_SRAM(CACHE_MEMORY_ICACHE_LOW, CACHE_MEMORY_ICACHE_HIGH,
+			CACHE_MEMORY_DCACHE_LOW, CACHE_MEMORY_DCACHE_HIGH);
+	cache_size = CACHE_SIZE_16KB;
+#endif
+#endif
+
+	cache_ways = CACHE_4WAYS_ASSOC;
+#if CONFIG_ESP32S2_DATA_CACHE_LINE_16B
+	cache_line_size = CACHE_LINE_SIZE_16B;
+#else
+	cache_line_size = CACHE_LINE_SIZE_32B;
+#endif
+	esp_rom_Cache_Set_DCache_Mode(cache_size, cache_ways, cache_line_size);
+	esp_rom_Cache_Invalidate_DCache_All();
+	esp_rom_Cache_Enable_DCache(0);
+
 #if !CONFIG_BOOTLOADER_ESP_IDF
 	/* The watchdog timer is enabled in the 1st stage (ROM) bootloader.
 	 * We're done booting, so disable it.
diff --git a/soc/xtensa/esp32s2/soc.h b/soc/xtensa/esp32s2/soc.h
index ae1d3622207..a90388056fd 100644
--- a/soc/xtensa/esp32s2/soc.h
+++ b/soc/xtensa/esp32s2/soc.h
@@ -45,6 +45,16 @@ extern void esp_rom_Cache_Invalidate_ICache_All(void);
 extern void esp_rom_Cache_Resume_ICache(uint32_t autoload);
 extern int esp_rom_Cache_Invalidate_Addr(uint32_t addr, uint32_t size);
 
+/* data-cache related rom functions */
+extern void esp_rom_Cache_Set_DCache_Mode(cache_size_t cache_size, cache_ways_t ways,
+					cache_line_size_t cache_line_size);
+
+extern void esp_rom_Cache_Invalidate_DCache_All(void);
+extern void esp_rom_Cache_Enable_DCache(uint32_t autoload);
+
+extern void esp_rom_Cache_Set_DCache_Mode(cache_size_t cache_size, cache_ways_t ways,
+					cache_line_size_t cache_line_size);
+
 /* ROM information related to SPI Flash chip timing and device */
 extern esp_rom_spiflash_chip_t g_rom_flashchip;
 extern uint8_t g_rom_spiflash_dummy_len_plus[];