Merge branch 'bugfix/mac_ext_order_for_c6_h2_v5.1' into 'release/v5.1'

efuse: Fix byte order in MAC_EXT (for C6 and H2) (v5.1) See merge request espressif/esp-idf!23990
espressif · Jun 28, 2023 · cbce221 · cbce221
2 parents c570f67 + e44a688
commit cbce221
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 71 deletions.
diff --git a/components/efuse/esp32c6/esp_efuse_table.c b/components/efuse/esp32c6/esp_efuse_table.c
@@ -9,7 +9,7 @@
 #include <assert.h>
 #include "esp_efuse_table.h"
 
-// md5_digest_table ab312e31f6976fdf923a9809093323fd
+// md5_digest_table 344c54cf227f74643e4d13dce1b1d30f
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -481,7 +481,8 @@ static const esp_efuse_desc_t MAC[] = {
 };
 
 static const esp_efuse_desc_t MAC_EXT[] = {
-    {EFUSE_BLK1, 48, 16}, 	 // [] Stores the extended bits of MAC address,
+    {EFUSE_BLK1, 56, 8}, 	 // [] Stores the extended bits of MAC address,
+    {EFUSE_BLK1, 48, 8}, 	 // [] Stores the extended bits of MAC address,
 };
 
 static const esp_efuse_desc_t WAFER_VERSION_MINOR[] = {
@@ -1142,6 +1143,7 @@ const esp_efuse_desc_t* ESP_EFUSE_MAC[] = {
 
 const esp_efuse_desc_t* ESP_EFUSE_MAC_EXT[] = {
     &MAC_EXT[0],    		// [] Stores the extended bits of MAC address
+    &MAC_EXT[1],    		// [] Stores the extended bits of MAC address
     NULL
 };
 

diff --git a/components/efuse/esp32c6/esp_efuse_table.csv b/components/efuse/esp32c6/esp_efuse_table.csv
@@ -131,7 +131,8 @@ MAC,                                             EFUSE_BLK1,  40,   8, [MAC_FACT
 ,                                                EFUSE_BLK1,  16,   8, [MAC_FACTORY] MAC address
 ,                                                EFUSE_BLK1,   8,   8, [MAC_FACTORY] MAC address
 ,                                                EFUSE_BLK1,   0,   8, [MAC_FACTORY] MAC address
-MAC_EXT,                                         EFUSE_BLK1,  48,  16, [] Stores the extended bits of MAC address
+MAC_EXT,                                         EFUSE_BLK1,  56,   8, [] Stores the extended bits of MAC address
+,                                                EFUSE_BLK1,  48,   8, [] Stores the extended bits of MAC address
 WAFER_VERSION_MINOR,                             EFUSE_BLK1, 114,   4, []
 WAFER_VERSION_MAJOR,                             EFUSE_BLK1, 118,   2, []
 PKG_VERSION,                                     EFUSE_BLK1, 120,   3, [] Package version

diff --git a/components/efuse/esp32c6/include/esp_efuse_table.h b/components/efuse/esp32c6/include/esp_efuse_table.h
@@ -10,7 +10,7 @@ extern "C" {
 
 #include "esp_efuse.h"
 
-// md5_digest_table ab312e31f6976fdf923a9809093323fd
+// md5_digest_table 344c54cf227f74643e4d13dce1b1d30f
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.

diff --git a/components/efuse/esp32h2/esp_efuse_table.c b/components/efuse/esp32h2/esp_efuse_table.c
@@ -9,7 +9,7 @@
 #include <assert.h>
 #include "esp_efuse_table.h"
 
-// md5_digest_table 910e196e9c9c5c052f1c57710fe3977c
+// md5_digest_table 47596a1f76a01780351e34b4785323dd
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -481,7 +481,8 @@ static const esp_efuse_desc_t MAC[] = {
 };
 
 static const esp_efuse_desc_t MAC_EXT[] = {
-    {EFUSE_BLK1, 48, 16}, 	 // [] Stores the extended bits of MAC address,
+    {EFUSE_BLK1, 56, 8}, 	 // [] Stores the extended bits of MAC address,
+    {EFUSE_BLK1, 48, 8}, 	 // [] Stores the extended bits of MAC address,
 };
 
 static const esp_efuse_desc_t WAFER_VERSION_MINOR[] = {
@@ -1150,6 +1151,7 @@ const esp_efuse_desc_t* ESP_EFUSE_MAC[] = {
 
 const esp_efuse_desc_t* ESP_EFUSE_MAC_EXT[] = {
     &MAC_EXT[0],    		// [] Stores the extended bits of MAC address
+    &MAC_EXT[1],    		// [] Stores the extended bits of MAC address
     NULL
 };
 

diff --git a/components/efuse/esp32h2/esp_efuse_table.csv b/components/efuse/esp32h2/esp_efuse_table.csv
@@ -131,7 +131,8 @@ MAC,                                             EFUSE_BLK1,  40,   8, [MAC_FACT
 ,                                                EFUSE_BLK1,  16,   8, [MAC_FACTORY] MAC address
 ,                                                EFUSE_BLK1,   8,   8, [MAC_FACTORY] MAC address
 ,                                                EFUSE_BLK1,   0,   8, [MAC_FACTORY] MAC address
-MAC_EXT,                                         EFUSE_BLK1,  48,  16, [] Stores the extended bits of MAC address
+MAC_EXT,                                         EFUSE_BLK1,  56,   8, [] Stores the extended bits of MAC address
+,                                                EFUSE_BLK1,  48,   8, [] Stores the extended bits of MAC address
 WAFER_VERSION_MINOR,                             EFUSE_BLK1, 114,   3, []
 WAFER_VERSION_MAJOR,                             EFUSE_BLK1, 117,   2, []
 DISABLE_WAFER_VERSION_MAJOR,                     EFUSE_BLK1, 119,   1, [] Disables check of wafer version major

diff --git a/components/efuse/esp32h2/include/esp_efuse_table.h b/components/efuse/esp32h2/include/esp_efuse_table.h
@@ -10,7 +10,7 @@ extern "C" {
 
 #include "esp_efuse.h"
 
-// md5_digest_table 910e196e9c9c5c052f1c57710fe3977c
+// md5_digest_table 47596a1f76a01780351e34b4785323dd
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.

diff --git a/components/esp_hw_support/include/esp_mac.h b/components/esp_hw_support/include/esp_mac.h
@@ -19,14 +19,15 @@ extern "C" {
 #endif
 
 typedef enum {
-    ESP_MAC_WIFI_STA,
-    ESP_MAC_WIFI_SOFTAP,
-    ESP_MAC_BT,
-    ESP_MAC_ETH,
-    ESP_MAC_IEEE802154,
-    ESP_MAC_BASE,
-    ESP_MAC_EFUSE_FACTORY,
-    ESP_MAC_EFUSE_CUSTOM,
+    ESP_MAC_WIFI_STA,      /**< MAC for WiFi Station (6 bytes) */
+    ESP_MAC_WIFI_SOFTAP,   /**< MAC for WiFi Soft-AP (6 bytes) */
+    ESP_MAC_BT,            /**< MAC for Bluetooth (6 bytes) */
+    ESP_MAC_ETH,           /**< MAC for Ethernet (6 bytes) */
+    ESP_MAC_IEEE802154,    /**< if CONFIG_SOC_IEEE802154_SUPPORTED=y, MAC for IEEE802154 (8 bytes) */
+    ESP_MAC_BASE,          /**< Base MAC for that used for other MAC types (6 bytes) */
+    ESP_MAC_EFUSE_FACTORY, /**< MAC_FACTORY eFuse which was burned by Espressif in production (6 bytes) */
+    ESP_MAC_EFUSE_CUSTOM,  /**< MAC_CUSTOM eFuse which was can be burned by customer (6 bytes) */
+    ESP_MAC_EFUSE_EXT,     /**< if CONFIG_SOC_IEEE802154_SUPPORTED=y, MAC_EXT eFuse which is used as an extender for IEEE802154 MAC (2 bytes) */
 } esp_mac_type_t;
 
 /** @cond */
@@ -62,9 +63,8 @@ typedef enum {
   * @note If not using a valid OUI, set the "locally administered" bit
   *       (bit value 0x02 in the first byte) to avoid collisions.
   *
-  * @param  mac base MAC address, length: 6 bytes/8 bytes.
+  * @param  mac base MAC address, length: 6 bytes.
   *         length: 6 bytes for MAC-48
-  *                 8 bytes for EUI-64(used for IEEE 802.15.4)
   *
   * @return ESP_OK on success
   *         ESP_ERR_INVALID_ARG If mac is NULL or is not a unicast MAC
@@ -76,9 +76,8 @@ esp_err_t esp_base_mac_addr_set(const uint8_t *mac);
   *
   * @note If no custom Base MAC has been set, this returns the pre-programmed Espressif base MAC address.
   *
-  * @param  mac base MAC address, length: 6 bytes/8 bytes.
+  * @param  mac base MAC address, length: 6 bytes.
   *         length: 6 bytes for MAC-48
-  *                 8 bytes for EUI-64(used for IEEE 802.15.4)
   *
   * @return ESP_OK on success
   *         ESP_ERR_INVALID_ARG mac is NULL
@@ -100,7 +99,7 @@ esp_err_t esp_base_mac_addr_get(uint8_t *mac);
   *
   * @param  mac base MAC address, length: 6 bytes/8 bytes.
   *         length: 6 bytes for MAC-48
-  *                 8 bytes for EUI-64(used for IEEE 802.15.4)
+  *                 8 bytes for EUI-64(used for IEEE 802.15.4, if CONFIG_SOC_IEEE802154_SUPPORTED=y)
   *
   * @return ESP_OK on success
   *         ESP_ERR_INVALID_ARG mac is NULL
@@ -115,7 +114,7 @@ esp_err_t esp_efuse_mac_get_custom(uint8_t *mac);
   *
   * @param  mac base MAC address, length: 6 bytes/8 bytes.
   *         length: 6 bytes for MAC-48
-  *                 8 bytes for EUI-64(used for IEEE 802.15.4)
+  *                 8 bytes for EUI-64(used for IEEE 802.15.4, if CONFIG_SOC_IEEE802154_SUPPORTED=y)
   *
   * @return ESP_OK on success
   *         ESP_ERR_INVALID_ARG mac is NULL
@@ -133,7 +132,7 @@ esp_err_t esp_efuse_mac_get_default(uint8_t *mac);
   *
   * @param  mac base MAC address, length: 6 bytes/8 bytes.
   *         length: 6 bytes for MAC-48
-  *                 8 bytes for EUI-64(used for IEEE 802.15.4)
+  *                 8 bytes for EUI-64(used for IEEE 802.15.4, if CONFIG_SOC_IEEE802154_SUPPORTED=y)
   * @param  type Type of MAC address to return
   *
   * @return ESP_OK on success
@@ -151,9 +150,8 @@ esp_err_t esp_read_mac(uint8_t *mac, esp_mac_type_t type);
   * address, then the first octet is XORed with 0x4 in order to create a different
   * locally administered MAC address.
   *
-  * @param  local_mac base MAC address, length: 6 bytes/8 bytes.
+  * @param  local_mac base MAC address, length: 6 bytes.
   *         length: 6 bytes for MAC-48
-  *                 8 bytes for EUI-64(used for IEEE 802.15.4)
   * @param  universal_mac  Source universal MAC address, length: 6 bytes.
   *
   * @return ESP_OK on success
@@ -166,7 +164,7 @@ esp_err_t esp_derive_local_mac(uint8_t *local_mac, const uint8_t *universal_mac)
   *
   * @param  mac  MAC address, length: 6 bytes/8 bytes.
   *         length: 6 bytes for MAC-48
-  *                 8 bytes for EUI-64(used for ESP_MAC_IEEE802154 type)
+  *                 8 bytes for EUI-64(used for ESP_MAC_IEEE802154 type, if CONFIG_SOC_IEEE802154_SUPPORTED=y)
   * @param  type  Type of MAC address
   *
   * @return ESP_OK on success
@@ -176,9 +174,11 @@ esp_err_t esp_iface_mac_addr_set(const uint8_t *mac, esp_mac_type_t type);
 /**
   * @brief  Return the size of the MAC type in bytes.
   *
-  * If CONFIG_IEEE802154_ENABLED is set then for these types:
-  * ESP_MAC_IEEE802154, ESP_MAC_BASE, ESP_MAC_EFUSE_FACTORY and ESP_MAC_EFUSE_CUSTOM the MAC size is 8 bytes.
-  * If CONFIG_IEEE802154_ENABLED is not set then for all types it returns 6 bytes.
+  * If CONFIG_SOC_IEEE802154_SUPPORTED is set then for these types:
+  *  - ESP_MAC_IEEE802154 is 8 bytes.
+  *  - ESP_MAC_BASE, ESP_MAC_EFUSE_FACTORY and ESP_MAC_EFUSE_CUSTOM the MAC size is 6 bytes.
+  *  - ESP_MAC_EFUSE_EXT is 2 bytes.
+  * If CONFIG_SOC_IEEE802154_SUPPORTED is not set then for all types it returns 6 bytes.
   *
   * @param  type  Type of MAC address
   *