feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/fix_key_manager_clock_changes' into 'master'

Browse Source 
fix(hal): Fix Key Manager clock changes

See merge request espressif/esp-idf!28890
This commit is contained in:
Mahavir Jain
2024-02-29 21:38:18 +08:00
parent d62f7aa643 4636ef946b
commit 7adbc9cf4b
3 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
components/esp_hw_support/esp_key_mgr.c
View File

@@ -59,30 +59,42 @@ static void esp_key_mgr_release_key_lock(esp_key_mgr_key_type_t key_type)
{ {
switch (key_type) { switch (key_type) {
case ESP_KEY_MGR_ECDSA_KEY: case ESP_KEY_MGR_ECDSA_KEY:
_lock_release(&s_key_mgr_xts_aes_key_lock); _lock_release(&s_key_mgr_ecdsa_key_lock);
break; break;
case ESP_KEY_MGR_XTS_AES_128_KEY: case ESP_KEY_MGR_XTS_AES_128_KEY:
case ESP_KEY_MGR_XTS_AES_256_KEY: case ESP_KEY_MGR_XTS_AES_256_KEY:
_lock_release(&s_key_mgr_ecdsa_key_lock); _lock_release(&s_key_mgr_xts_aes_key_lock);
break; break;
} }
} }
static void esp_key_mgr_acquire_hardware(void) static void esp_key_mgr_acquire_hardware(bool deployment_mode)
{ {
esp_crypto_key_manager_lock_acquire(); if (deployment_mode) {
// We only need explicit locks in the deployment mode
esp_crypto_ecc_lock_acquire();
esp_crypto_sha_aes_lock_acquire();
esp_crypto_key_manager_lock_acquire();
}
// Reset the Key Manager Clock // Reset the Key Manager Clock
KEY_MANAGER_RCC_ATOMIC() { KEY_MANAGER_RCC_ATOMIC() {
key_mgr_ll_enable_bus_clock(true); key_mgr_ll_enable_bus_clock(true);
key_mgr_ll_enable_peripheral_clock(true);
key_mgr_ll_reset_register(); key_mgr_ll_reset_register();
} }
} }
static void esp_key_mgr_release_hardware(void) static void esp_key_mgr_release_hardware(bool deployment_mode)
{ {
esp_crypto_key_manager_lock_release(); if (deployment_mode) {
esp_crypto_ecc_lock_release();
esp_crypto_sha_aes_lock_release();
esp_crypto_key_manager_lock_release();
}
// Reset the Key Manager Clock // Reset the Key Manager Clock
KEY_MANAGER_RCC_ATOMIC() { KEY_MANAGER_RCC_ATOMIC() {
key_mgr_ll_enable_peripheral_clock(false);
key_mgr_ll_enable_bus_clock(false); key_mgr_ll_enable_bus_clock(false);
key_mgr_ll_reset_register(); key_mgr_ll_reset_register();
} }
@@ -301,7 +313,7 @@ esp_err_t esp_key_mgr_deploy_key_in_aes_mode(const esp_key_mgr_aes_key_config_t
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
esp_key_mgr_acquire_hardware(); esp_key_mgr_acquire_hardware(true);
esp_err_t esp_ret = key_mgr_deploy_key_aes_mode(&aes_deploy_config); esp_err_t esp_ret = key_mgr_deploy_key_aes_mode(&aes_deploy_config);
if (esp_ret != ESP_OK) { if (esp_ret != ESP_OK) {
@@ -320,10 +332,7 @@ esp_err_t esp_key_mgr_deploy_key_in_aes_mode(const esp_key_mgr_aes_key_config_t
// Set the Key Manager Static Register to use own key for the respective key type // Set the Key Manager Static Register to use own key for the respective key type
key_mgr_hal_set_key_usage(key_type, ESP_KEY_MGR_USE_OWN_KEY); key_mgr_hal_set_key_usage(key_type, ESP_KEY_MGR_USE_OWN_KEY);
KEY_MANAGER_RCC_ATOMIC() { esp_key_mgr_release_hardware(true);
key_mgr_ll_enable_bus_clock(false);
key_mgr_ll_reset_register();
}
return esp_ret; return esp_ret;
} }
@@ -420,7 +429,7 @@ esp_err_t esp_key_mgr_activate_key(esp_key_mgr_key_recovery_info_t *key_recovery
key_recovery_config.key_recovery_info = key_recovery_info; key_recovery_config.key_recovery_info = key_recovery_info;
key_recovery_config.key_purpose = key_purpose; key_recovery_config.key_purpose = key_purpose;
esp_key_mgr_acquire_hardware(); esp_key_mgr_acquire_hardware(false);
esp_ret = key_mgr_recover_key(&key_recovery_config); esp_ret = key_mgr_recover_key(&key_recovery_config);
if (esp_ret != ESP_OK) { if (esp_ret != ESP_OK) {
@@ -439,18 +448,17 @@ esp_err_t esp_key_mgr_activate_key(esp_key_mgr_key_recovery_info_t *key_recovery
// Set the Key Manager Static Register to use own key for the respective key type // Set the Key Manager Static Register to use own key for the respective key type
key_mgr_hal_set_key_usage(key_recovery_info->key_type, ESP_KEY_MGR_USE_OWN_KEY); key_mgr_hal_set_key_usage(key_recovery_info->key_type, ESP_KEY_MGR_USE_OWN_KEY);
return ESP_OK;
cleanup: cleanup:
esp_key_mgr_release_hardware(false);
esp_key_mgr_release_hardware();
return esp_ret; return esp_ret;
} }
esp_err_t esp_key_mgr_deactivate_key(esp_key_mgr_key_type_t key_type) esp_err_t esp_key_mgr_deactivate_key(esp_key_mgr_key_type_t key_type)
{ {
esp_key_mgr_release_key_lock(key_type); esp_key_mgr_release_key_lock(key_type);
esp_key_mgr_acquire_hardware(); esp_key_mgr_release_hardware(false);
esp_key_mgr_release_hardware();
return ESP_OK; return ESP_OK;
} }
@@ -564,7 +572,7 @@ esp_err_t esp_key_mgr_deploy_key_in_ecdh0_mode(const esp_key_mgr_ecdh0_key_confi
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
esp_key_mgr_acquire_hardware(); esp_key_mgr_acquire_hardware(true);
esp_err_t esp_ret = key_mgr_deploy_key_ecdh0_mode(&ecdh0_deploy_config); esp_err_t esp_ret = key_mgr_deploy_key_ecdh0_mode(&ecdh0_deploy_config);
if (esp_ret != ESP_OK) { if (esp_ret != ESP_OK) {
@@ -584,8 +592,7 @@ esp_err_t esp_key_mgr_deploy_key_in_ecdh0_mode(const esp_key_mgr_ecdh0_key_confi
// Set the Key Manager Static Register to use own key for the respective key type // Set the Key Manager Static Register to use own key for the respective key type
key_mgr_hal_set_key_usage(key_type, ESP_KEY_MGR_USE_OWN_KEY); key_mgr_hal_set_key_usage(key_type, ESP_KEY_MGR_USE_OWN_KEY);
esp_key_mgr_release_hardware(); esp_key_mgr_release_hardware(true);
return ESP_OK; return ESP_OK;
} }
@@ -661,7 +668,6 @@ static esp_err_t key_mgr_deploy_key_random_mode(random_deploy_config_t *config)
config->key_info->key_info[0].crc = esp_rom_crc32_le(0, key_recovery_info, KEY_MGR_KEY_RECOVERY_INFO_SIZE); config->key_info->key_info[0].crc = esp_rom_crc32_le(0, key_recovery_info, KEY_MGR_KEY_RECOVERY_INFO_SIZE);
} }
heap_caps_free(key_recovery_info); heap_caps_free(key_recovery_info);
return ESP_OK; return ESP_OK;
} }
@@ -685,7 +691,7 @@ esp_err_t esp_key_mgr_deploy_key_in_random_mode(const esp_key_mgr_random_key_con
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
esp_key_mgr_acquire_hardware(); esp_key_mgr_acquire_hardware(true);
esp_err_t esp_ret = key_mgr_deploy_key_random_mode(&random_deploy_config); esp_err_t esp_ret = key_mgr_deploy_key_random_mode(&random_deploy_config);
if (esp_ret != ESP_OK) { if (esp_ret != ESP_OK) {
@@ -705,7 +711,6 @@ esp_err_t esp_key_mgr_deploy_key_in_random_mode(const esp_key_mgr_random_key_con
// Set the Key Manager Static Register to use own key for the respective key type // Set the Key Manager Static Register to use own key for the respective key type
key_mgr_hal_set_key_usage(key_config->key_type, ESP_KEY_MGR_USE_OWN_KEY); key_mgr_hal_set_key_usage(key_config->key_type, ESP_KEY_MGR_USE_OWN_KEY);
esp_key_mgr_release_hardware(); esp_key_mgr_release_hardware(true);
return esp_ret; return esp_ret;
} }

4
components/esp_hw_support/port/esp32p4/esp_crypto_lock.c
View File

@@ -112,13 +112,9 @@ void esp_crypto_ecdsa_lock_release(void)
void esp_crypto_key_manager_lock_acquire(void) void esp_crypto_key_manager_lock_acquire(void)
{ {
_lock_acquire(&s_crypto_key_manager_lock); _lock_acquire(&s_crypto_key_manager_lock);
esp_crypto_ecc_lock_acquire();
esp_crypto_sha_aes_lock_acquire();
} }
void esp_crypto_key_manager_lock_release(void) void esp_crypto_key_manager_lock_release(void)
{ {
esp_crypto_sha_aes_lock_release();
esp_crypto_ecc_lock_release();
_lock_release(&s_crypto_key_manager_lock); _lock_release(&s_crypto_key_manager_lock);
} }

18
components/hal/esp32p4/include/hal/key_mgr_ll.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -41,12 +41,24 @@ static inline void key_mgr_ll_enable_bus_clock(bool enable)
/// the critical section needs to declare the __DECLARE_RCC_ATOMIC_ENV variable in advance /// the critical section needs to declare the __DECLARE_RCC_ATOMIC_ENV variable in advance
#define key_mgr_ll_enable_bus_clock(...) (void)__DECLARE_RCC_ATOMIC_ENV; key_mgr_ll_enable_bus_clock(__VA_ARGS__) #define key_mgr_ll_enable_bus_clock(...) (void)__DECLARE_RCC_ATOMIC_ENV; key_mgr_ll_enable_bus_clock(__VA_ARGS__)
/**
* @brief Enable the peripheral clock for Key Manager
*
* @param true to enable, false to disable
*/
static inline void key_mgr_ll_enable_peripheral_clock(bool enable)
{
HP_SYS_CLKRST.peri_clk_ctrl25.reg_crypto_km_clk_en = enable;
}
#define key_mgr_ll_enable_peripheral_clock(...) (void)__DECLARE_RCC_ATOMIC_ENV; key_mgr_ll_enable_bus_clock(__VA_ARGS__)
/** /**
* @brief Reset the Key Manager peripheral */ * @brief Reset the Key Manager peripheral */
static inline void key_mgr_ll_reset_register(void) static inline void key_mgr_ll_reset_register(void)
{ {
HP_SYS_CLKRST.peri_clk_ctrl25.reg_crypto_km_clk_en = 1; HP_SYS_CLKRST.hp_rst_en2.reg_rst_en_km = 1;
HP_SYS_CLKRST.peri_clk_ctrl25.reg_crypto_km_clk_en = 0; HP_SYS_CLKRST.hp_rst_en2.reg_rst_en_km = 0;
HP_SYS_CLKRST.hp_rst_en2.reg_rst_en_crypto = 1; HP_SYS_CLKRST.hp_rst_en2.reg_rst_en_crypto = 1;
HP_SYS_CLKRST.hp_rst_en2.reg_rst_en_crypto = 0; HP_SYS_CLKRST.hp_rst_en2.reg_rst_en_crypto = 0;
} }