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

esp32s3: fixed bug chip v0.0 detected as vX.Y

Browse Source 
A typical value is 2.8.

Previous commit 32ef2b321a doesn't fix the issue cleanly. The MSB of wafer_minor also has this problem.
This commit is contained in:
Michael (XIAO Xufeng) 2022-12-01 01:05:09 +08:00 committed by KonstantinKondrashov
parent 9e87d53fed
commit a5964c442f
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/hal/esp32s3/efuse_hal.c
View File

@ -11,20 +11,34 @@
#include "hal/efuse_hal.h" #include "hal/efuse_hal.h"
#include "hal/efuse_ll.h" #include "hal/efuse_ll.h"
#define ESP_EFUSE_BLOCK_ERROR_BITS(error_reg, block) ((error_reg) & (0x0F << (4 * (block))))
//The wafer_major and MSB of wafer_minor fields was allocated to other purposes when block version is v1.1.
//Luckily only chip v0.0 have this kind of block version and efuse usage.
//This workaround fixes the issue.
static inline bool is_eco0(uint32_t minor_raw)
{
return ((minor_raw & 0x7) == 0 &&
efuse_ll_get_blk_version_major() == 1 && efuse_ll_get_blk_version_minor() == 1);
}
uint32_t efuse_hal_get_major_chip_version(void) uint32_t efuse_hal_get_major_chip_version(void)
{ {
uint32_t ret = efuse_ll_get_chip_wafer_version_major(); uint32_t minor_raw = efuse_ll_get_chip_wafer_version_minor();
//Workaround: The major version field was allocated to other purposes when block version is v1.1.
//Luckily only chip v0.0 have this kind of block version and efuse usage. if (is_eco0(minor_raw)) {
if (efuse_ll_get_chip_wafer_version_minor() == 0 && return 0;
efuse_ll_get_blk_version_major() == 1 &&
efuse_ll_get_blk_version_minor() == 1) {
ret = 0;
} }
return ret; return efuse_ll_get_chip_wafer_version_major();
} }
uint32_t efuse_hal_get_minor_chip_version(void) uint32_t efuse_hal_get_minor_chip_version(void)
{ {
return efuse_ll_get_chip_wafer_version_minor(); uint32_t minor_raw = efuse_ll_get_chip_wafer_version_minor();
if (is_eco0(minor_raw)) {
return 0;
}
return minor_raw;
} }