alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'backport/add_config_to_set_custom_mac_as_base_mac_v5_2' into 'release/v5.2'

Browse Source 
feat(mac): Add a configuration to set custom MAC as base MAC(Backport V5.2)

See merge request espressif/esp-idf!27738
This commit is contained in:
Jiang Jiang Jian 2023-12-07 21:03:51 +08:00
commit 97594d2076
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_hw_support/Kconfig
View File

@ -50,6 +50,13 @@ menu "Hardware Settings"
If you have an invalid MAC CRC (ESP_ERR_INVALID_CRC) problem If you have an invalid MAC CRC (ESP_ERR_INVALID_CRC) problem
and you still want to use this chip, you can enable this option to bypass such an error. and you still want to use this chip, you can enable this option to bypass such an error.
This applies to both MAC_FACTORY and CUSTOM_MAC efuses. This applies to both MAC_FACTORY and CUSTOM_MAC efuses.
config ESP_MAC_USE_CUSTOM_MAC_AS_BASE_MAC
bool "Enable using custom mac as base mac"
default n
help
When this configuration is enabled, the user can invoke `esp_read_mac` to obtain the desired type of
MAC using a custom MAC as the base MAC.
endmenu endmenu
menu "Sleep Config" menu "Sleep Config"

26
components/esp_hw_support/mac_addr.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -63,7 +63,7 @@ static mac_t s_mac_table[] = {
#define ITEMS_IN_MAC_TABLE (sizeof(s_mac_table) / sizeof(mac_t)) #define ITEMS_IN_MAC_TABLE (sizeof(s_mac_table) / sizeof(mac_t))
static esp_err_t generate_mac(uint8_t *mac, uint8_t *base_mac_addr, esp_mac_type_t type); static esp_err_t generate_mac(uint8_t *mac, uint8_t *base_mac_addr, esp_mac_type_t type);
static esp_err_t get_efuse_mac_get_default(uint8_t *mac); static esp_err_t get_efuse_factory_mac(uint8_t *mac);
static esp_err_t get_efuse_mac_custom(uint8_t *mac); static esp_err_t get_efuse_mac_custom(uint8_t *mac);
#if CONFIG_SOC_IEEE802154_SUPPORTED #if CONFIG_SOC_IEEE802154_SUPPORTED
static esp_err_t get_efuse_mac_ext(uint8_t *mac); static esp_err_t get_efuse_mac_ext(uint8_t *mac);
@ -89,11 +89,19 @@ static esp_err_t get_mac_addr_from_mac_table(uint8_t *mac, int idx, bool silent)
esp_mac_type_t type = s_mac_table[idx].type; esp_mac_type_t type = s_mac_table[idx].type;
if (ESP_MAC_BASE <= type && type <= ESP_MAC_EFUSE_EXT) { if (ESP_MAC_BASE <= type && type <= ESP_MAC_EFUSE_EXT) {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
if (type == ESP_MAC_BASE || type == ESP_MAC_EFUSE_FACTORY) { if (type == ESP_MAC_EFUSE_FACTORY
err = get_efuse_mac_get_default(s_mac_table[idx].mac); #ifndef CONFIG_ESP_MAC_USE_CUSTOM_MAC_AS_BASE_MAC
} else if (type == ESP_MAC_EFUSE_CUSTOM) { || type == ESP_MAC_BASE
err = get_efuse_mac_custom(s_mac_table[idx].mac); #endif
} ) {
err = get_efuse_factory_mac(s_mac_table[idx].mac);
} else if (type == ESP_MAC_EFUSE_CUSTOM
#ifdef CONFIG_ESP_MAC_USE_CUSTOM_MAC_AS_BASE_MAC
|| type == ESP_MAC_BASE
#endif
) {
err = get_efuse_mac_custom(s_mac_table[idx].mac);
}
#if CONFIG_SOC_IEEE802154_SUPPORTED #if CONFIG_SOC_IEEE802154_SUPPORTED
else if (type == ESP_MAC_EFUSE_EXT) { else if (type == ESP_MAC_EFUSE_EXT) {
err = get_efuse_mac_ext(s_mac_table[idx].mac); err = get_efuse_mac_ext(s_mac_table[idx].mac);
@ -246,7 +254,7 @@ static esp_err_t get_efuse_mac_custom(uint8_t *mac)
esp_err_t esp_efuse_mac_get_default(uint8_t *mac) esp_err_t esp_efuse_mac_get_default(uint8_t *mac)
{ {
esp_err_t err = get_efuse_mac_get_default(mac); esp_err_t err = get_efuse_factory_mac(mac);
if (err != ESP_OK) { if (err != ESP_OK) {
return err; return err;
} }
@ -257,7 +265,7 @@ esp_err_t esp_efuse_mac_get_default(uint8_t *mac)
#endif #endif
} }
static esp_err_t get_efuse_mac_get_default(uint8_t *mac) static esp_err_t get_efuse_factory_mac(uint8_t *mac)
{ {
size_t size_bits = esp_efuse_get_field_size(ESP_EFUSE_MAC_FACTORY); size_t size_bits = esp_efuse_get_field_size(ESP_EFUSE_MAC_FACTORY);
assert((size_bits % 8) == 0); assert((size_bits % 8) == 0);

1
tools/test_apps/system/build_test/sdkconfig.ci.custom_mac Normal file
View File

@ -0,0 +1 @@
CONFIG_ESP_MAC_USE_CUSTOM_MAC_AS_BASE_MAC=y