Merge branch 'feat/mmu_configurable_page_size_s31' into 'master'

mmu: supported configurable page size on s31

See merge request espressif/esp-idf!47193

components/soc/Kconfig

@@ -3,35 +3,15 @@ menu "SoC Settings"
     visible if 0
 
     menu "MMU Config"
-        # This Config is used for configure the MMU.
-        # Be configured based on flash size selection.
-        # Invisible to users.
-
-        config MMU_PAGE_SIZE_8KB
-            bool
-            depends on SOC_MMU_PAGE_SIZE_8KB_SUPPORTED
-            default n
-
-        config MMU_PAGE_SIZE_16KB
-            bool
-            default y if SOC_MMU_PAGE_SIZE_CONFIGURABLE && ESPTOOLPY_FLASHSIZE_1MB
-            default n
-
-        config MMU_PAGE_SIZE_32KB
-            bool
-            default y if SOC_MMU_PAGE_SIZE_CONFIGURABLE && ESPTOOLPY_FLASHSIZE_2MB
-            default n
-
-        config MMU_PAGE_SIZE_64KB
-            bool
-            default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB
-            default n
+        orsource "$IDF_TARGET/Kconfig.mmu"
 
         config MMU_PAGE_MODE
             string
             default "8KB" if MMU_PAGE_SIZE_8KB
             default "16KB" if MMU_PAGE_SIZE_16KB
             default "32KB" if MMU_PAGE_SIZE_32KB
+            default "128KB" if MMU_PAGE_SIZE_128KB
+            default "256KB" if MMU_PAGE_SIZE_256KB
             default "64KB" if MMU_PAGE_SIZE_64KB
 
         config MMU_PAGE_SIZE
@@ -45,6 +25,8 @@ menu "SoC Settings"
             default 0x4000 if MMU_PAGE_SIZE_16KB
             default 0x8000 if MMU_PAGE_SIZE_32KB
             default 0x10000 if MMU_PAGE_SIZE_64KB
+            default 0x20000 if MMU_PAGE_SIZE_128KB
+            default 0x40000 if MMU_PAGE_SIZE_256KB
     endmenu
 
 endmenu

components/soc/esp32/Kconfig.mmu

@@ -0,0 +1,7 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y

components/soc/esp32c2/Kconfig.mmu

@@ -0,0 +1,18 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_16KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_1MB
+    default n
+
+config MMU_PAGE_SIZE_32KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_2MB
+    default n
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB
+    default n

components/soc/esp32c3/Kconfig.mmu

@@ -0,0 +1,7 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y

components/soc/esp32c5/Kconfig.mmu

@@ -0,0 +1,7 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y

components/soc/esp32c6/Kconfig.mmu

@@ -0,0 +1,22 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_8KB
+    bool
+    default n
+
+config MMU_PAGE_SIZE_16KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_1MB
+    default n
+
+config MMU_PAGE_SIZE_32KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_2MB
+    default n
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB && !MMU_PAGE_SIZE_8KB
+    default n

components/soc/esp32c6/include/soc/Kconfig.soc_caps.in

@@ -687,10 +687,6 @@ config SOC_MMU_PAGE_SIZE_CONFIGURABLE
     bool
     default y
 
-config SOC_MMU_PAGE_SIZE_8KB_SUPPORTED
-    bool
-    default y
-
 config SOC_MMU_PERIPH_NUM
     int
     default 1

components/soc/esp32c6/include/soc/soc_caps.h

@@ -281,7 +281,6 @@
 
 /*-------------------------- MMU CAPS ----------------------------------------*/
 #define SOC_MMU_PAGE_SIZE_CONFIGURABLE        (1)
-#define SOC_MMU_PAGE_SIZE_8KB_SUPPORTED       (1)
 #define SOC_MMU_PERIPH_NUM                    (1U)
 #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM     (1U)
 #define SOC_MMU_DI_VADDR_SHARED               (1) /*!< D/I vaddr are shared */

components/soc/esp32c61/Kconfig.mmu

@@ -0,0 +1,22 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_8KB
+    bool
+    default n
+
+config MMU_PAGE_SIZE_16KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_1MB
+    default n
+
+config MMU_PAGE_SIZE_32KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_2MB
+    default n
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB && !MMU_PAGE_SIZE_8KB
+    default n

components/soc/esp32c61/include/soc/Kconfig.soc_caps.in

@@ -635,10 +635,6 @@ config SOC_MMU_PAGE_SIZE_CONFIGURABLE
     bool
     default y
 
-config SOC_MMU_PAGE_SIZE_8KB_SUPPORTED
-    bool
-    default y
-
 config SOC_MMU_PERIPH_NUM
     int
     default 1

components/soc/esp32c61/include/soc/soc_caps.h

@@ -260,7 +260,6 @@
 
 /*-------------------------- MMU CAPS ----------------------------------------*/
 #define SOC_MMU_PAGE_SIZE_CONFIGURABLE        (1)
-#define SOC_MMU_PAGE_SIZE_8KB_SUPPORTED       (1)
 #define SOC_MMU_PERIPH_NUM                    (1U)
 #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM     (1U)
 #define SOC_MMU_DI_VADDR_SHARED               (1) /*!< D/I vaddr are shared */

components/soc/esp32h2/Kconfig.mmu

@@ -0,0 +1,22 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_8KB
+    bool
+    default n
+
+config MMU_PAGE_SIZE_16KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_1MB
+    default n
+
+config MMU_PAGE_SIZE_32KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_2MB
+    default n
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB && !MMU_PAGE_SIZE_8KB
+    default n

components/soc/esp32h2/include/soc/Kconfig.soc_caps.in

@@ -451,10 +451,6 @@ config SOC_MMU_PAGE_SIZE_CONFIGURABLE
     bool
     default y
 
-config SOC_MMU_PAGE_SIZE_8KB_SUPPORTED
-    bool
-    default y
-
 config SOC_MMU_PERIPH_NUM
     int
     default 1

components/soc/esp32h2/include/soc/soc_caps.h

@@ -189,7 +189,6 @@
 
 /*-------------------------- MMU CAPS ----------------------------------------*/
 #define SOC_MMU_PAGE_SIZE_CONFIGURABLE        (1)
-#define SOC_MMU_PAGE_SIZE_8KB_SUPPORTED       (1)
 #define SOC_MMU_PERIPH_NUM                    (1U)
 #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM     (1U)
 #define SOC_MMU_DI_VADDR_SHARED               (1) /*!< D/I vaddr are shared */

components/soc/esp32h21/Kconfig.mmu

@@ -0,0 +1,22 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_8KB
+    bool
+    default n
+
+config MMU_PAGE_SIZE_16KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_1MB
+    default n
+
+config MMU_PAGE_SIZE_32KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_2MB
+    default n
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB && !MMU_PAGE_SIZE_8KB
+    default n

components/soc/esp32h21/include/soc/Kconfig.soc_caps.in

@@ -355,10 +355,6 @@ config SOC_MMU_PAGE_SIZE_CONFIGURABLE
     bool
     default y
 
-config SOC_MMU_PAGE_SIZE_8KB_SUPPORTED
-    bool
-    default y
-
 config SOC_MMU_PERIPH_NUM
     int
     default 1

components/soc/esp32h21/include/soc/soc_caps.h

@@ -171,7 +171,6 @@
 
 /*-------------------------- MMU CAPS ----------------------------------------*/
 #define SOC_MMU_PAGE_SIZE_CONFIGURABLE        (1)
-#define SOC_MMU_PAGE_SIZE_8KB_SUPPORTED       (1)
 #define SOC_MMU_PERIPH_NUM                    (1U)
 #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM     (1U)
 #define SOC_MMU_DI_VADDR_SHARED               (1) /*!< D/I vaddr are shared */

components/soc/esp32h4/Kconfig.mmu

@@ -0,0 +1,22 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_8KB
+    bool
+    default n
+
+config MMU_PAGE_SIZE_16KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_1MB
+    default n
+
+config MMU_PAGE_SIZE_32KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_2MB
+    default n
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB && !MMU_PAGE_SIZE_8KB
+    default n

components/soc/esp32h4/include/soc/Kconfig.soc_caps.in

@@ -663,10 +663,6 @@ config SOC_MMU_PAGE_SIZE_CONFIGURABLE
     bool
     default y
 
-config SOC_MMU_PAGE_SIZE_8KB_SUPPORTED
-    bool
-    default y
-
 config SOC_MMU_PERIPH_NUM
     int
     default 1

components/soc/esp32h4/include/soc/soc_caps.h

@@ -291,7 +291,6 @@
 
 /*-------------------------- MMU CAPS ----------------------------------------*/
 #define SOC_MMU_PAGE_SIZE_CONFIGURABLE        (1)
-#define SOC_MMU_PAGE_SIZE_8KB_SUPPORTED       (1)
 #define SOC_MMU_PERIPH_NUM                    (1U)
 #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM     (1U)
 #define SOC_MMU_DI_VADDR_SHARED               (1) /*!< D/I vaddr are shared */

components/soc/esp32p4/Kconfig.mmu

@@ -0,0 +1,7 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y

components/soc/esp32s2/Kconfig.mmu

@@ -0,0 +1,7 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y

components/soc/esp32s3/Kconfig.mmu

@@ -0,0 +1,7 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y

components/soc/esp32s31/Kconfig.mmu

@@ -0,0 +1,26 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_16KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_1MB
+    default n
+
+config MMU_PAGE_SIZE_32KB
+    bool
+    default y if ESPTOOLPY_FLASHSIZE_2MB
+    default n
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y if !MMU_PAGE_SIZE_32KB && !MMU_PAGE_SIZE_16KB
+    default n
+
+config MMU_PAGE_SIZE_128KB
+    bool "128KB page size"
+    default n
+
+config MMU_PAGE_SIZE_256KB
+    bool "256KB page size"
+    default n

components/soc/esp32s31/include/soc/Kconfig.soc_caps.in

@@ -547,6 +547,10 @@ config SOC_I2C_SUPPORT_SLEEP_RETENTION
     bool
     default y
 
+config SOC_MMU_PAGE_SIZE_CONFIGURABLE
+    bool
+    default y
+
 config SOC_MMU_PERIPH_NUM
     int
     default 2

components/soc/esp32s31/include/soc/ext_mem_defs.h

@@ -32,13 +32,13 @@ extern "C" {
 #define SOC_DRAM0_CACHE_ADDRESS_HIGH                 SOC_IRAM0_CACHE_ADDRESS_HIGH               //I/D share the same vaddr range
 
 #define SOC_IRAM_FLASH_ADDRESS_LOW                   0x40000000
-#define SOC_IRAM_FLASH_ADDRESS_HIGH                  0x44000000
+#define SOC_IRAM_FLASH_ADDRESS_HIGH                  (SOC_IRAM_FLASH_ADDRESS_LOW + ((SOC_MMU_PAGE_SIZE) * SOC_MMU_ENTRY_NUM))  //max 0x44000000 for nor, 0x50000000 for nand
 
 #define SOC_DRAM_FLASH_ADDRESS_LOW                   SOC_IRAM_FLASH_ADDRESS_LOW
 #define SOC_DRAM_FLASH_ADDRESS_HIGH                  SOC_IRAM_FLASH_ADDRESS_HIGH
 
 #define SOC_IRAM_PSRAM_ADDRESS_LOW                   0x50000000
-#define SOC_IRAM_PSRAM_ADDRESS_HIGH                  0x54000000
+#define SOC_IRAM_PSRAM_ADDRESS_HIGH                  (SOC_IRAM_PSRAM_ADDRESS_LOW + ((SOC_MMU_PAGE_SIZE) * SOC_MMU_ENTRY_NUM))  //max 0x54000000 for psram
 
 #define SOC_DRAM_PSRAM_ADDRESS_LOW                   SOC_IRAM_PSRAM_ADDRESS_LOW
 #define SOC_DRAM_PSRAM_ADDRESS_HIGH                  SOC_IRAM_PSRAM_ADDRESS_HIGH

components/soc/esp32s31/include/soc/soc_caps.h

@@ -256,6 +256,7 @@
 #define SOC_I2C_SUPPORT_SLEEP_RETENTION         (1)
 
 /*-------------------------- MMU CAPS ----------------------------------------*/
+#define SOC_MMU_PAGE_SIZE_CONFIGURABLE        (1)
 #define SOC_MMU_PERIPH_NUM                    (2U)
 #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM     (2U)
 #define SOC_MMU_DI_VADDR_SHARED               (1) /*!< D/I vaddr are shared */

components/soc/linux/Kconfig.mmu

@@ -0,0 +1,7 @@
+# This Config is used for configure the MMU.
+# Be configured based on flash size selection.
+# Invisible to users.
+
+config MMU_PAGE_SIZE_64KB
+    bool
+    default y