boards/xtensa/espressif: Add AES accelerator board support

eren-terzioglu · acassis · commit f7614f640f80 · 2026-03-17T18:45:53.000-03:00
Add AES accelerator board support for esp32[-s2|-s3]

Signed-off-by: Eren Terzioglu &lt;eren.terzioglu@espressif.com&gt;
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/crypto/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/crypto/defconfig
@@ -9,8 +9,6 @@
 # CONFIG_NSH_ARGCAT is not set
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_TESTING_CRYPTO_3DES_CBC is not set
-# CONFIG_TESTING_CRYPTO_AES_CBC is not set
-# CONFIG_TESTING_CRYPTO_AES_CTR is not set
 # CONFIG_TESTING_CRYPTO_AES_XTS is not set
 # CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK is not set
 CONFIG_ALLOW_BSD_COMPONENTS=y
@@ -26,10 +24,12 @@ CONFIG_ARCH_XTENSA=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_CRYPTODEV=y
 CONFIG_CRYPTO_CRYPTODEV_HARDWARE=y
 CONFIG_CRYPTO_RANDOM_POOL=y
 CONFIG_ESP32S2_UART0=y
+CONFIG_ESPRESSIF_AES_ACCELERATOR=y
 CONFIG_ESPRESSIF_SHA_ACCELERATOR=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/crypto/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/crypto/defconfig
@@ -9,8 +9,6 @@
 # CONFIG_NSH_ARGCAT is not set
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_TESTING_CRYPTO_3DES_CBC is not set
-# CONFIG_TESTING_CRYPTO_AES_CBC is not set
-# CONFIG_TESTING_CRYPTO_AES_CTR is not set
 # CONFIG_TESTING_CRYPTO_AES_XTS is not set
 # CONFIG_TESTING_CRYPTO_HASH_HUGE_BLOCK is not set
 CONFIG_ALLOW_BSD_COMPONENTS=y
@@ -27,10 +25,12 @@ CONFIG_ARCH_XTENSA=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_CRYPTODEV=y
 CONFIG_CRYPTO_CRYPTODEV_HARDWARE=y
 CONFIG_CRYPTO_RANDOM_POOL=y
 CONFIG_ESP32S3_UART0=y
+CONFIG_ESPRESSIF_AES_ACCELERATOR=y
 CONFIG_ESPRESSIF_SHA_ACCELERATOR=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
@@ -120,8 +120,8 @@
 #include "esp32s3_board_sdmmc.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR
-#  include "esp32s3_aes.h"
+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR
+#  include "espressif/esp_aes.h"
 #endif
 
 #ifdef CONFIG_ESPRESSIF_ADC
@@ -149,6 +149,10 @@
 #  include "espressif/esp_sha.h"
 #endif
 
+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR
+#  include "espressif/esp_aes.h"
+#endif
+
 #ifdef CONFIG_ESPRESSIF_USE_ULP_RISCV_CORE
 #  include "espressif/esp_ulp.h"
 #  ifdef CONFIG_ESPRESSIF_ULP_USE_TEST_BIN
@@ -247,14 +251,23 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#if defined(CONFIG_ESPRESSIF_SHA_ACCELERATOR) && \
-    !defined(CONFIG_CRYPTO_CRYPTODEV_HARDWARE)
+#if !defined(CONFIG_CRYPTO_CRYPTODEV_HARDWARE)
+#  if defined(CONFIG_ESPRESSIF_SHA_ACCELERATOR)
   ret = esp_sha_init();
   if (ret < 0)
     {
       syslog(LOG_ERR,
              "ERROR: Failed to initialize SHA: %d\n", ret);
     }
+#  endif
+
+#  if defined(CONFIG_ESPRESSIF_AES_ACCELERATOR)
+  ret = esp_aes_init();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to initialize AES: %d\n", ret);
+    }
+#  endif
 #endif
 
 #ifdef CONFIG_FS_PROCFS
@@ -560,16 +573,16 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR
-  ret = esp32s3_aes_init();
+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR
+  ret = esp_aes_init();
   if (ret < 0)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize AES: %d\n", ret);
     }
 #ifdef CONFIG_ESP32S3_AES_ACCELERATOR_TEST
   else
     {
-      esp32s3_aes_test();
+      esp_aes_test();
     }
 #endif
 #endif
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
@@ -110,8 +110,8 @@
 #include "esp32s3_board_sdmmc.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR
-#  include "esp32s3_aes.h"
+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR
+#  include "espressif/esp_aes.h"
 #endif
 
 #ifdef CONFIG_ESP32S3_ADC
@@ -439,16 +439,16 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR
-  ret = esp32s3_aes_init();
+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR
+  ret = esp_aes_init();
   if (ret < 0)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize AES: %d\n", ret);
     }
 #ifdef CONFIG_ESP32S3_AES_ACCELERATOR_TEST
   else
     {
-      esp32s3_aes_test();
+      esp_aes_test();
     }
 #endif
 #endif
diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
@@ -109,8 +109,8 @@
 #include "esp32s3_board_sdmmc.h"
 #endif
 
-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR
-#  include "esp32s3_aes.h"
+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR
+#  include "espressif/esp_aes.h"
 #endif
 
 #ifdef CONFIG_SENSORS_QMI8658
@@ -468,16 +468,16 @@ int esp32s3_bringup(void)
     }
 #endif
 
-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR
-  ret = esp32s3_aes_init();
+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR
+  ret = esp_aes_init();
   if (ret < 0)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize AES: %d\n", ret);
     }
 #ifdef CONFIG_ESP32S3_AES_ACCELERATOR_TEST
   else
     {
-      esp32s3_aes_test();
+      esp_aes_test();
     }
 #endif
 #endif

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,8 @@`
`110`	`110`	`#include "esp32s3_board_sdmmc.h"`
`111`	`111`	`#endif`
`112`	`112`
`113`		`-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR`
`114`		`-# include "esp32s3_aes.h"`
	`113`	`+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR`
	`114`	`+# include "espressif/esp_aes.h"`
`115`	`115`	`#endif`
`116`	`116`
`117`	`117`	`#ifdef CONFIG_ESP32S3_ADC`
`@@ -439,16 +439,16 @@ int esp32s3_bringup(void)`
`439`	`439`	`}`
`440`	`440`	`#endif`
`441`	`441`
`442`		`-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR`
`443`		`- ret = esp32s3_aes_init();`
	`442`	`+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR`
	`443`	`+ ret = esp_aes_init();`
`444`	`444`	`if (ret < 0)`
`445`	`445`	`{`
`446`	`446`	`syslog(LOG_ERR, "ERROR: Failed to initialize AES: %d\n", ret);`
`447`	`447`	`}`
`448`	`448`	`#ifdef CONFIG_ESP32S3_AES_ACCELERATOR_TEST`
`449`	`449`	`else`
`450`	`450`	`{`
`451`		`- esp32s3_aes_test();`
	`451`	`+ esp_aes_test();`
`452`	`452`	`}`
`453`	`453`	`#endif`
`454`	`454`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@`
`109`	`109`	`#include "esp32s3_board_sdmmc.h"`
`110`	`110`	`#endif`
`111`	`111`
`112`		`-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR`
`113`		`-# include "esp32s3_aes.h"`
	`112`	`+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR`
	`113`	`+# include "espressif/esp_aes.h"`
`114`	`114`	`#endif`
`115`	`115`
`116`	`116`	`#ifdef CONFIG_SENSORS_QMI8658`
`@@ -468,16 +468,16 @@ int esp32s3_bringup(void)`
`468`	`468`	`}`
`469`	`469`	`#endif`
`470`	`470`
`471`		`-#ifdef CONFIG_ESP32S3_AES_ACCELERATOR`
`472`		`- ret = esp32s3_aes_init();`
	`471`	`+#ifdef CONFIG_ESPRESSIF_AES_ACCELERATOR`
	`472`	`+ ret = esp_aes_init();`
`473`	`473`	`if (ret < 0)`
`474`	`474`	`{`
`475`	`475`	`syslog(LOG_ERR, "ERROR: Failed to initialize AES: %d\n", ret);`
`476`	`476`	`}`
`477`	`477`	`#ifdef CONFIG_ESP32S3_AES_ACCELERATOR_TEST`
`478`	`478`	`else`
`479`	`479`	`{`
`480`		`- esp32s3_aes_test();`
	`480`	`+ esp_aes_test();`
`481`	`481`	`}`
`482`	`482`	`#endif`
`483`	`483`	`#endif`