From 277e4d5471cc17c3d3fcf4d684695d08fc7d42bc Mon Sep 17 00:00:00 2001 From: "Michael (XIAO Xufeng)" Date: Thu, 1 Dec 2022 01:05:09 +0800 Subject: [PATCH] esp32s3: fixed bug chip v0.0 detected as vX.Y A typical value is 2.8. Previous commit 32ef2b321aac317bdf6d088ec87c809ab8471042 doesn't fix the issue cleanly. The MSB of wafer_minor also has this problem. --- components/hal/esp32s3/efuse_hal.c | 33 +++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/components/hal/esp32s3/efuse_hal.c b/components/hal/esp32s3/efuse_hal.c index 5281ef41b28..5b5a1a7e087 100644 --- a/components/hal/esp32s3/efuse_hal.c +++ b/components/hal/esp32s3/efuse_hal.c @@ -11,25 +11,38 @@ #include "hal/efuse_hal.h" #include "hal/efuse_ll.h" #include "esp32s3/rom/efuse.h" +#include "esp_attr.h" #define ESP_EFUSE_BLOCK_ERROR_BITS(error_reg, block) ((error_reg) & (0x0F << (4 * (block)))) -uint32_t efuse_hal_get_major_chip_version(void) + +//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); +} + +IRAM_ATTR uint32_t efuse_hal_get_major_chip_version(void) { - uint32_t ret = efuse_ll_get_chip_wafer_version_major(); - //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 (efuse_ll_get_chip_wafer_version_minor() == 0 && - efuse_ll_get_blk_version_major() == 1 && - efuse_ll_get_blk_version_minor() == 1) { - ret = 0; + uint32_t minor_raw = efuse_ll_get_chip_wafer_version_minor(); + + if (is_eco0(minor_raw)) { + return 0; } - return ret; + return efuse_ll_get_chip_wafer_version_major(); } 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; } /******************* eFuse control functions *************************/