From 6e74698920448f5158f0afeb1ba329b8863cef78 Mon Sep 17 00:00:00 2001 From: "harshal.patil" Date: Tue, 14 Oct 2025 10:05:47 +0530 Subject: [PATCH] feat(flash_encryption): Remove mspi reset when switching the XTS-AES key source --- .../src/esp32c5/flash_encryption_secure_features.c | 3 +-- .../src/esp32p4/flash_encryption_secure_features.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/bootloader_support/src/esp32c5/flash_encryption_secure_features.c b/components/bootloader_support/src/esp32c5/flash_encryption_secure_features.c index 683b9f7cf5b..750352efbf6 100644 --- a/components/bootloader_support/src/esp32c5/flash_encryption_secure_features.c +++ b/components/bootloader_support/src/esp32c5/flash_encryption_secure_features.c @@ -79,8 +79,7 @@ esp_err_t esp_flash_encryption_enable_key_mgr(void) }; // Force Key Manager to use eFuse key for XTS-AES operation - key_mgr_ll_set_key_usage(ESP_KEY_MGR_XTS_AES_128_KEY, ESP_KEY_MGR_USE_EFUSE_KEY); - _mspi_timing_ll_reset_mspi(); + key_mgr_hal_set_key_usage(ESP_KEY_MGR_XTS_AES_128_KEY, ESP_KEY_MGR_USE_EFUSE_KEY); return ESP_OK; } diff --git a/components/bootloader_support/src/esp32p4/flash_encryption_secure_features.c b/components/bootloader_support/src/esp32p4/flash_encryption_secure_features.c index 264188e0c27..bb62fbf7e7d 100644 --- a/components/bootloader_support/src/esp32p4/flash_encryption_secure_features.c +++ b/components/bootloader_support/src/esp32p4/flash_encryption_secure_features.c @@ -61,8 +61,7 @@ esp_err_t esp_flash_encryption_enable_key_mgr(void) }; // Force Key Manager to use eFuse key for XTS-AES operation - key_mgr_ll_set_key_usage(ESP_KEY_MGR_XTS_AES_128_KEY, ESP_KEY_MGR_USE_EFUSE_KEY); - _mspi_timing_ll_reset_mspi(); + key_mgr_hal_set_key_usage(ESP_KEY_MGR_XTS_AES_128_KEY, ESP_KEY_MGR_USE_EFUSE_KEY); return ESP_OK; }