Merge branch 'feature/support_efuses_esp32p4_eco5_v5.5' into 'release/v5.5'

feat(efuse): Support efuses for ESP32-P4 ECO5 (v5.5)

See merge request espressif/esp-idf!42651

Author: ginkgm

components/efuse/esp32p4/esp_efuse_table_v3.0.c

@@ -1,11 +1,13 @@
 /*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
 
+#include "sdkconfig.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -63,6 +65,11 @@ typedef enum {
 typedef enum {
     ESP_EFUSE_KEY_PURPOSE_USER = 0,                         /**< User purposes (software-only use) */
     ESP_EFUSE_KEY_PURPOSE_ECDSA_KEY = 1,                    /**< ECDSA private key (Expected in little endian order)*/
+
+#if CONFIG_ESP32P4_REV_MIN_FULL >= 300
+    ESP_EFUSE_KEY_PURPOSE_ECDSA_KEY_P256 = ESP_EFUSE_KEY_PURPOSE_ECDSA_KEY, /**< ECDSA private key (P256) (Expected in little endian order)*/
+#endif
+
     ESP_EFUSE_KEY_PURPOSE_XTS_AES_256_KEY_1 = 2,            /**< XTS_AES_256_KEY_1 (flash/PSRAM encryption) */
     ESP_EFUSE_KEY_PURPOSE_XTS_AES_256_KEY_2 = 3,            /**< XTS_AES_256_KEY_2 (flash/PSRAM encryption) */
     ESP_EFUSE_KEY_PURPOSE_XTS_AES_128_KEY = 4,              /**< XTS_AES_128_KEY (flash/PSRAM encryption) */
@@ -74,7 +81,18 @@ typedef enum {
     ESP_EFUSE_KEY_PURPOSE_SECURE_BOOT_DIGEST1 = 10,         /**< SECURE_BOOT_DIGEST1 (Secure Boot key digest) */
     ESP_EFUSE_KEY_PURPOSE_SECURE_BOOT_DIGEST2 = 11,         /**< SECURE_BOOT_DIGEST2 (Secure Boot key digest) */
     ESP_EFUSE_KEY_PURPOSE_KM_INIT_KEY = 12,                 /**< KM_INIT_KEY */
+
+#if CONFIG_ESP32P4_REV_MIN_FULL >= 300
+    ESP_EFUSE_KEY_PURPOSE_XTS_AES_256_PSRAM_KEY_1 = 13,     /**< PSRAM encryption key (XTS_AES_256_KEY_1) */
+    ESP_EFUSE_KEY_PURPOSE_XTS_AES_256_PSRAM_KEY_2 = 14,     /**< PSRAM encryption key (XTS_AES_256_KEY_2) */
+    ESP_EFUSE_KEY_PURPOSE_XTS_AES_128_PSRAM_KEY = 15,       /**< PSRAM encryption key (XTS_AES_128_KEY) */
+    ESP_EFUSE_KEY_PURPOSE_ECDSA_KEY_P192 = 16,              /**< ECDSA private key (P192) */
+    ESP_EFUSE_KEY_PURPOSE_ECDSA_KEY_P384_L = 17,            /**< ECDSA private key (P384_L) */
+    ESP_EFUSE_KEY_PURPOSE_ECDSA_KEY_P384_H = 18,            /**< ECDSA private key (P384_H) */
+    ESP_EFUSE_KEY_PURPOSE_MAX = 32,                          /**< MAX PURPOSE */
+#else
     ESP_EFUSE_KEY_PURPOSE_MAX = 16,                         /**< MAX PURPOSE */
+#endif
 } esp_efuse_purpose_t;
 
 #ifdef __cplusplus

components/efuse/esp32p4/esp_efuse_table_v3.0.csv

@@ -1,4 +1,15 @@
-set(EFUSE_SOC_SRCS  "esp_efuse_table.c"
-                    "esp_efuse_fields.c"
-                    "esp_efuse_rtc_calib.c"
-                    "esp_efuse_utility.c")
+set(EFUSE_SOC_SRCS
+    "esp_efuse_utility.c"
+    "esp_efuse_fields.c"
+)
+
+if(CONFIG_ESP32P4_REV_MIN_FULL GREATER_EQUAL 300)
+    list(APPEND EFUSE_SOC_SRCS
+        "esp_efuse_table_v3.0.c"
+    )
+else()
+    list(APPEND EFUSE_SOC_SRCS
+        "esp_efuse_table.c"
+        "esp_efuse_rtc_calib.c"
+    )
+endif()

components/efuse/esp32p4/include/esp_efuse_chip.h

@@ -177,7 +177,7 @@ esp_efuse_purpose_t esp_efuse_get_key_purpose(esp_efuse_block_t block)
     }
     unsigned idx = block - EFUSE_BLK_KEY0;
     uint8_t value = 0;
-    esp_err_t err = esp_efuse_read_field_blob(s_table[idx].keypurpose, &value, s_table[idx].keypurpose[0]->bit_count);
+    esp_err_t err = esp_efuse_read_field_blob(s_table[idx].keypurpose, &value, esp_efuse_get_field_size(s_table[idx].keypurpose));
     if (err != ESP_OK) {
         return ESP_EFUSE_KEY_PURPOSE_MAX;
     }
@@ -190,7 +190,7 @@ esp_err_t esp_efuse_set_key_purpose(esp_efuse_block_t block, esp_efuse_purpose_t
         return ESP_ERR_INVALID_ARG;
     }
     unsigned idx = block - EFUSE_BLK_KEY0;
-    return esp_efuse_write_field_blob(s_table[idx].keypurpose, &purpose, s_table[idx].keypurpose[0]->bit_count);
+    return esp_efuse_write_field_blob(s_table[idx].keypurpose, &purpose, esp_efuse_get_field_size(s_table[idx].keypurpose));
 }
 
 bool esp_efuse_get_keypurpose_dis_write(esp_efuse_block_t block)

components/efuse/esp32p4/include/esp_efuse_table.h

@@ -11,6 +11,8 @@
 #include "soc/ecdsa_reg.h"
 #include "soc/hp_sys_clkrst_struct.h"
 #include "soc/soc_caps.h"
+#include "soc/efuse_reg.h"
+#include "soc/efuse_struct.h"
 #include "hal/ecdsa_types.h"
 
 #ifdef __cplusplus
@@ -440,6 +442,41 @@ static inline bool ecdsa_ll_is_deterministic_mode_supported(void)
     return true;
 }
 
+/**
+ * @brief Set the ECDSA key block in eFuse
+ *
+ * @param curve    ECDSA curve type
+ * @param efuse_blk eFuse block number
+ */
+__attribute__((always_inline)) static inline void ecdsa_ll_set_ecdsa_key_blk(ecdsa_curve_t curve, int efuse_blk)
+{
+#ifdef EFUSE_CFG_ECDSA_BLK
+    (void) curve;
+    EFUSE.conf.cfg_ecdsa_blk = efuse_blk;
+#else
+    uint8_t efuse_blk_low = 0;
+    uint8_t efuse_blk_high = 0;
+    switch (curve) {
+        case ECDSA_CURVE_SECP192R1:
+            EFUSE.ecdsa.cfg_ecdsa_p192_blk = efuse_blk;
+            break;
+        case ECDSA_CURVE_SECP256R1:
+            EFUSE.ecdsa.cfg_ecdsa_p256_blk = efuse_blk;
+            break;
+        case ECDSA_CURVE_SECP384R1:
+            // ECDSA-p384 uses two efuse blocks to store the key. These two blocks are stored in a single integer
+            // where the least significant 4 bits store the low key block number and the next 4 more significant bits store the high key block number.
+            HAL_ECDSA_EXTRACT_KEY_BLOCKS(efuse_blk, efuse_blk_high, efuse_blk_low);
+            EFUSE.ecdsa.cfg_ecdsa_p384_h_blk = efuse_blk_high;
+            EFUSE.ecdsa.cfg_ecdsa_p384_l_blk = efuse_blk_low;
+            break;
+        default:
+            HAL_ASSERT(false && "Unsupported curve");
+            break;
+    }
+#endif
+}
+
 /**
  * @brief Check if the ECDSA peripheral uses MPI module's memory
  */

components/efuse/esp32p4/include/esp_efuse_table_v0.0_v2.0.h

@@ -12,6 +12,7 @@
 #include "hal/assert.h"
 #include "rom/efuse.h"
 #include "hal/ecdsa_types.h"
+#include "hal/ecdsa_ll.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -94,8 +95,7 @@ __attribute__((always_inline)) static inline uint32_t efuse_ll_get_chip_ver_pkg(
 
 __attribute__((always_inline)) static inline void efuse_ll_set_ecdsa_key_blk(ecdsa_curve_t curve, int efuse_blk)
 {
-    (void) curve;
-    EFUSE.conf.cfg_ecdsa_blk = efuse_blk;
+    ecdsa_ll_set_ecdsa_key_blk(curve, efuse_blk);
 }
 
 /******************* eFuse control functions *************************/