Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/efuse_get_coding_scheme_and_ut' into 'master'

Browse source 
efuse: Fix get_coding_scheme() using ESP_EARLY_LOG* instead of ESP_LOG*

Closes IDFGH-2799

See merge request espressif/esp-idf!7946
This commit is contained in:
Angus Gratton 2020-03-19 11:18:09 +08:00
commit aec558eea4
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/efuse/src/esp32/esp_efuse_api.c
View file

@ -64,6 +64,6 @@ esp_efuse_coding_scheme_t esp_efuse_get_coding_scheme(esp_efuse_block_t blk)
scheme = EFUSE_CODING_SCHEME_REPEAT; scheme = EFUSE_CODING_SCHEME_REPEAT;
} }
} }
ESP_LOGD(TAG, "coding scheme %d", scheme); ESP_EARLY_LOGD(TAG, "coding scheme %d", scheme);
return scheme; return scheme;
} }

2
components/efuse/src/esp32s2/esp_efuse_api.c
View file

@ -78,6 +78,6 @@ esp_efuse_coding_scheme_t esp_efuse_get_coding_scheme(esp_efuse_block_t blk)
} else { } else {
scheme = EFUSE_CODING_SCHEME_RS; scheme = EFUSE_CODING_SCHEME_RS;
} }
ESP_LOGD(TAG, "coding scheme %d", scheme); ESP_EARLY_LOGD(TAG, "coding scheme %d", scheme);
return scheme; return scheme;
} }

13
components/efuse/test/test_efuse.c
View file

@ -18,7 +18,6 @@
#include "test_utils.h" #include "test_utils.h"
#include "sdkconfig.h" #include "sdkconfig.h"
//#define MANUAL_FPGA_TEST
static const char* TAG = "efuse_test"; static const char* TAG = "efuse_test";
static void test_read_blob(void) static void test_read_blob(void)
@ -34,7 +33,7 @@ static void test_read_blob(void)
TEST_ASSERT_EQUAL_INT(sizeof(mac) * 8, esp_efuse_get_field_size(ESP_EFUSE_MAC_FACTORY)); TEST_ASSERT_EQUAL_INT(sizeof(mac) * 8, esp_efuse_get_field_size(ESP_EFUSE_MAC_FACTORY));
ESP_LOGI(TAG, "MAC: %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ESP_LOGI(TAG, "MAC: %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2) #ifdef CONFIG_IDF_TARGET_ESP32
ESP_LOGI(TAG, "2. Check CRC by MAC"); ESP_LOGI(TAG, "2. Check CRC by MAC");
uint8_t crc; uint8_t crc;
TEST_ESP_OK(esp_efuse_read_field_blob(ESP_EFUSE_MAC_FACTORY_CRC, &crc, 8)); TEST_ESP_OK(esp_efuse_read_field_blob(ESP_EFUSE_MAC_FACTORY_CRC, &crc, 8));
@ -761,8 +760,7 @@ TEST_CASE("Test a write/read protection", "[efuse]")
#endif // #ifdef CONFIG_EFUSE_VIRTUAL #endif // #ifdef CONFIG_EFUSE_VIRTUAL
#if defined(MANUAL_FPGA_TEST) && !defined(CONFIG_EFUSE_VIRTUAL) #ifdef CONFIG_IDF_ENV_FPGA
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32)
TEST_CASE("Test a real write (FPGA)", "[efuse]") TEST_CASE("Test a real write (FPGA)", "[efuse]")
{ {
ESP_LOGI(TAG, "1. Write MAC address"); ESP_LOGI(TAG, "1. Write MAC address");
@ -784,7 +782,7 @@ TEST_CASE("Test a real write (FPGA)", "[efuse]")
TEST_ASSERT_EQUAL_HEX8_ARRAY(new_mac, mac, sizeof(new_mac)); TEST_ASSERT_EQUAL_HEX8_ARRAY(new_mac, mac, sizeof(new_mac));
esp_efuse_utility_debug_dump_blocks(); esp_efuse_utility_debug_dump_blocks();
} }
#ifdef CONFIG_IDF_TARGET_ESP32S2
ESP_LOGI(TAG, "2. Write KEY3"); ESP_LOGI(TAG, "2. Write KEY3");
uint8_t key[32] = {0}; uint8_t key[32] = {0};
TEST_ESP_OK(esp_efuse_read_field_blob(ESP_EFUSE_KEY3, &key, 256)); TEST_ESP_OK(esp_efuse_read_field_blob(ESP_EFUSE_KEY3, &key, 256));
@ -807,7 +805,7 @@ TEST_CASE("Test a real write (FPGA)", "[efuse]")
TEST_ASSERT_EQUAL_INT(0, key[i]); TEST_ASSERT_EQUAL_INT(0, key[i]);
} }
esp_efuse_utility_debug_dump_blocks(); esp_efuse_utility_debug_dump_blocks();
#endif // CONFIG_IDF_TARGET_ESP32S2
ESP_LOGI(TAG, "4. Write SECURE_VERSION"); ESP_LOGI(TAG, "4. Write SECURE_VERSION");
int max_bits = esp_efuse_get_field_size(ESP_EFUSE_SECURE_VERSION); int max_bits = esp_efuse_get_field_size(ESP_EFUSE_SECURE_VERSION);
size_t read_sec_version; size_t read_sec_version;
@ -820,5 +818,4 @@ TEST_CASE("Test a real write (FPGA)", "[efuse]")
TEST_ASSERT_EQUAL_INT(i + 1, read_sec_version); TEST_ASSERT_EQUAL_INT(i + 1, read_sec_version);
} }
} }
#endif // DISABLED_FOR_TARGETS(ESP32) #endif // CONFIG_IDF_ENV_FPGA
#endif // FPGA_TEST

4
components/efuse/test/test_efuse_coding_scheme.c
View file

@ -6,12 +6,12 @@
#include "unity.h" #include "unity.h"
#include "bootloader_random.h" #include "bootloader_random.h"
#ifdef CONFIG_IDF_TARGET_ESP32
typedef struct { typedef struct {
uint8_t unencoded[24]; uint8_t unencoded[24];
uint32_t encoded[8]; uint32_t encoded[8];
} coding_scheme_test_t; } coding_scheme_test_t;
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
/* Randomly generated byte strings, encoded and written to ESP32 /* Randomly generated byte strings, encoded and written to ESP32
using espefuse algorithm, then verified to have no encoding errors using espefuse algorithm, then verified to have no encoding errors
and correct readback. and correct readback.
@ -204,4 +204,4 @@ TEST_CASE("Test data does not match the coding scheme", "[efuse]")
esp_efuse_utility_reset(); esp_efuse_utility_reset();
} }
#endif #endif // CONFIG_IDF_TARGET_ESP32