mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-29 18:27:20 +02:00
Merge branch 'feat/new_xmc_id_v5.3' into 'release/v5.3'
feat(spi_flash): Add new xmc chip id(backport v5.3) See merge request espressif/esp-idf!34283
This commit is contained in:
morris
@ -697,7 +697,7 @@ void bootloader_spi_flash_reset(void)
|
||||
******************************************************************************/
|
||||
|
||||
#define XMC_SUPPORT CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT
|
||||
#define XMC_VENDOR_ID 0x20
|
||||
#define XMC_VENDOR_ID_1 0x20
|
||||
|
||||
#if BOOTLOADER_BUILD
|
||||
#define BOOTLOADER_FLASH_LOG(level, ...) ESP_EARLY_LOG##level(TAG, ##__VA_ARGS__)
|
||||
@ -714,7 +714,7 @@ static IRAM_ATTR bool is_xmc_chip_strict(uint32_t rdid)
|
||||
uint32_t mfid = BYTESHIFT(rdid, 1);
|
||||
uint32_t cpid = BYTESHIFT(rdid, 0);
|
||||
|
||||
if (vendor_id != XMC_VENDOR_ID) {
|
||||
if (vendor_id != XMC_VENDOR_ID_1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -747,7 +747,7 @@ esp_err_t IRAM_ATTR bootloader_flash_xmc_startup(void)
|
||||
// Check the Manufacturer ID in SFDP registers (JEDEC standard). If not XMC chip, no need to run the flow
|
||||
const int sfdp_mfid_addr = 0x10;
|
||||
uint8_t mf_id = (bootloader_flash_read_sfdp(sfdp_mfid_addr, 1) & 0xff);
|
||||
if (mf_id != XMC_VENDOR_ID) {
|
||||
if (mf_id != XMC_VENDOR_ID_1) {
|
||||
BOOTLOADER_FLASH_LOG(D, "non-XMC chip detected by SFDP Read (%02X), skip.", mf_id);
|
||||
return ESP_OK;
|
||||
}
|
||||
@ -779,7 +779,7 @@ esp_err_t IRAM_ATTR bootloader_flash_xmc_startup(void)
|
||||
static IRAM_ATTR bool is_xmc_chip(uint32_t rdid)
|
||||
{
|
||||
uint32_t vendor_id = (rdid >> 16) & 0xFF;
|
||||
return (vendor_id == XMC_VENDOR_ID);
|
||||
return (vendor_id == XMC_VENDOR_ID_1);
|
||||
}
|
||||
|
||||
esp_err_t IRAM_ATTR bootloader_flash_xmc_startup(void)
|
||||
|
||||
@ -40,7 +40,7 @@ menu "Main Flash configuration"
|
||||
default SPI_FLASH_HPM_AUTO
|
||||
help
|
||||
Whether the High Performance Mode of Flash is enabled. As an optional feature, user needs to manually
|
||||
enable this option as a confirmation. To be back-compatible with earlier IDF versionn, this option is
|
||||
enable this option as a confirmation. To be back-compatible with earlier IDF version, this option is
|
||||
automatically enabled with warning when Flash running > 80Mhz.
|
||||
|
||||
config SPI_FLASH_HPM_ENA
|
||||
@ -116,6 +116,17 @@ menu "Main Flash configuration"
|
||||
This config is used for setting Tsus parameter. Tsus means CS# high to next command after
|
||||
suspend. You can refer to the chapter of AC CHARACTERISTICS of flash datasheet.
|
||||
|
||||
config SPI_FLASH_FORCE_ENABLE_XMC_C_SUSPEND
|
||||
bool "Enable XMC-C series flash chip suspend feature anyway"
|
||||
default n
|
||||
help
|
||||
XMC-C series is regarded as not qualified for the Suspend feature, since its specification
|
||||
has a tRS >= 1ms restriction. We strongly do not suggest using it for the Suspend feature.
|
||||
However, if your product in field has enabled this feature, you may still enable this
|
||||
config option to keep the legacy behavior.
|
||||
|
||||
For new users, DO NOT enable this config.
|
||||
|
||||
endmenu
|
||||
endmenu
|
||||
|
||||
@ -250,7 +261,7 @@ menu "SPI Flash driver"
|
||||
Please use this configuration together with ``SPI_FLASH_ERASE_YIELD_DURATION_MS`` and
|
||||
``SPI_FLASH_ERASE_YIELD_TICKS`` after carefully checking flash datasheet to avoid a
|
||||
watchdog timeout.
|
||||
For more information, please check `SPI Flash API` reference documenation
|
||||
For more information, please check `SPI Flash API` reference documentation
|
||||
under section `OS Function`.
|
||||
|
||||
config SPI_FLASH_ERASE_YIELD_DURATION_MS
|
||||
@ -352,7 +363,7 @@ menu "SPI Flash driver"
|
||||
|
||||
config SPI_FLASH_SUPPORT_BOYA_CHIP
|
||||
bool "BOYA"
|
||||
# ESP32 doens't usually use this chip, default n to save iram.
|
||||
# ESP32 doesn't usually use this chip, default n to save iram.
|
||||
default y if SPI_FLASH_VENDOR_BOYA_SUPPORTED
|
||||
default n
|
||||
help
|
||||
@ -362,7 +373,7 @@ menu "SPI Flash driver"
|
||||
|
||||
config SPI_FLASH_SUPPORT_TH_CHIP
|
||||
bool "TH"
|
||||
# ESP32 doens't usually use this chip, default n to save iram.
|
||||
# ESP32 doesn't usually use this chip, default n to save iram.
|
||||
default y if SPI_FLASH_VENDOR_TH_SUPPORTED
|
||||
default n
|
||||
help
|
||||
|
||||
@ -53,6 +53,8 @@
|
||||
#define CMD_RST_EN 0x66
|
||||
#define CMD_RST_DEV 0x99
|
||||
|
||||
#define CMD_RDSFDP 0x5A /* Read the SFDP of the flash */
|
||||
|
||||
#define SPI_FLASH_DIO_ADDR_BITLEN 24
|
||||
#define SPI_FLASH_DIO_DUMMY_BITLEN 4
|
||||
#define SPI_FLASH_QIO_ADDR_BITLEN 24
|
||||
|
||||
@ -510,7 +510,7 @@ esp_err_t spi_flash_chip_generic_write_encrypted(esp_flash_t *chip, const void *
|
||||
return ESP_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
/* Check if the buffer and length can qualify the requirments */
|
||||
/* Check if the buffer and length can qualify the requirements */
|
||||
if (esp_flash_encryption->flash_encryption_check(address, length) != true) {
|
||||
return ESP_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
@ -599,10 +599,36 @@ spi_flash_caps_t spi_flash_chip_generic_get_caps(esp_flash_t *chip)
|
||||
// 32M-bits address support
|
||||
|
||||
// flash suspend support
|
||||
// XMC support suspend
|
||||
// XMC-D support suspend
|
||||
if (chip->chip_id >> 16 == 0x46) {
|
||||
caps_flags |= SPI_FLASH_CHIP_CAP_SUSPEND;
|
||||
}
|
||||
|
||||
// XMC-D support suspend (some D series flash chip begin with 0x20, difference checked by SFDP)
|
||||
if (chip->chip_id >> 16 == 0x20) {
|
||||
uint8_t data = 0;
|
||||
spi_flash_trans_t t = {
|
||||
.command = CMD_RDSFDP,
|
||||
.address_bitlen = 24,
|
||||
.address = 0x32,
|
||||
.mosi_len = 0,
|
||||
.mosi_data = 0,
|
||||
.miso_len = 1,
|
||||
.miso_data = &data,
|
||||
.dummy_bitlen = 8,
|
||||
};
|
||||
chip->host->driver->common_command(chip->host, &t);
|
||||
if((data & 0x8) == 0x8) {
|
||||
caps_flags |= SPI_FLASH_CHIP_CAP_SUSPEND;
|
||||
}
|
||||
}
|
||||
|
||||
#if CONFIG_SPI_FLASH_FORCE_ENABLE_XMC_C_SUSPEND
|
||||
// XMC-C suspend has big risk. But can enable this anyway.
|
||||
if (chip->chip_id >> 16 == 0x20) {
|
||||
caps_flags |= SPI_FLASH_CHIP_CAP_SUSPEND;
|
||||
}
|
||||
#endif
|
||||
|
||||
// FM support suspend
|
||||
if (chip->chip_id >> 16 == 0xa1) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
@ -115,7 +115,7 @@ static void spi_flash_enable_high_performance_send_cmd(void)
|
||||
{
|
||||
uint32_t dummy = 24;
|
||||
bootloader_flash_execute_command_common(CMD_HPMEN, 0, 0, dummy, 0, 0, 0);
|
||||
// Delay for T(HPM) refering to datasheet.
|
||||
// Delay for T(HPM) referring to datasheet.
|
||||
esp_rom_delay_us(20);
|
||||
}
|
||||
|
||||
@ -150,6 +150,8 @@ static esp_err_t spi_flash_hpm_probe_chip_with_dummy(uint32_t flash_id)
|
||||
// XMC chips.
|
||||
case 0x204017:
|
||||
case 0x204018:
|
||||
case 0x464017:
|
||||
case 0x464018:
|
||||
break;
|
||||
// GD chips.
|
||||
case 0xC84017:
|
||||
@ -431,7 +433,7 @@ bool spi_flash_hpm_dummy_adjust(void)
|
||||
//-----------------------generic functions-------------------------------------//
|
||||
|
||||
/**
|
||||
* @brief Default dummy for almost all flash chips. If your flash does't need to reconfigure dummy,
|
||||
* @brief Default dummy for almost all flash chips. If your flash doesn't need to reconfigure dummy,
|
||||
* just call this function.
|
||||
*/
|
||||
void __attribute__((weak)) spi_flash_hpm_get_dummy_generic(spi_flash_hpm_dummy_conf_t *dummy_conf)
|
||||
|
||||
@ -16,3 +16,8 @@ APIs with `esp_vfs_dev_uart_` prefix are all deprecated, replaced with new APIs
|
||||
- ``esp_vfs_dev_uart_use_driver`` has been renamed to ``uart_vfs_dev_use_driver``
|
||||
|
||||
For compatibility, `vfs` component still registers `esp_driver_uart` as its private dependency. In other words, you do not need to modify the CMake file of an existing project.
|
||||
|
||||
SPI Flash Driver
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
XMC-C series flash suspend support has been removed. According to feedback from the flash manufacturer, in some situations the XMC-C flash would require a 1ms interval between resume and next command. This is too long for a software request. Based on the above reason, in order to use suspend safely, we decide to remove flash suspend support from XMC-C series. But you can still force enable it via `CONFIG_SPI_FLASH_FORCE_ENABLE_XMC_C_SUSPEND`. If you have any questions, please contact espressif business support.
|
||||
|
||||
@ -16,3 +16,9 @@ VFS 操作符的 UART 具体实现函数从 `vfs` 组件挪到了 `esp_driver_ua
|
||||
- ``esp_vfs_dev_uart_use_driver`` 更名为 ``uart_vfs_dev_use_driver``
|
||||
|
||||
为了兼容性，`vfs` 组件依旧将 `esp_driver_uart` 注册成了其私有依赖。换句话说，你无需修改既有项目的 CMake 文件。
|
||||
|
||||
|
||||
SPI flash 驱动
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
XMC-C 系列闪存 suspend 功能的支持已被移除。根据闪存制造商的反馈，在某些情况下，XMC-C 闪存需要在 resume 和下一条命令之间间隔 1 毫秒。这对于软件请求来说时间太长。基于上述原因，为了安全使用 suspend 功能，我们决定取消对 XMC-C 系列闪存挂起的支持。但是你依旧可以通过打开 `CONFIG_SPI_FLASH_FORCE_ENABLE_XMC_C_SUSPEND` 来强行使能这个功能。如果您有任何疑问，请联系 espressif 商务支持。
|
||||
|
||||
Reference in New Issue
Block a user