From 6ab894850266948b446f0666c8ba72d7c9cd0d43 Mon Sep 17 00:00:00 2001 From: Xiao Xufeng Date: Tue, 17 Oct 2023 15:16:35 +0800 Subject: [PATCH] doc(spi_flash): hide unsupported optional features --- components/bootloader/Kconfig.projbuild | 3 +- components/bootloader/sdkconfig.rename | 2 - .../include/bootloader_flash_override.h | 2 +- .../bootloader_flash/src/bootloader_flash.c | 2 +- .../src/bootloader_flash_config_esp32s3.c | 2 +- .../spi_flash/spi_flash_optional_feature.rst | 113 +++++++++--------- 6 files changed, 59 insertions(+), 65 deletions(-) diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild index 982b9b2b28..442b2c8f96 100644 --- a/components/bootloader/Kconfig.projbuild +++ b/components/bootloader/Kconfig.projbuild @@ -101,7 +101,6 @@ menu "Bootloader config" config BOOTLOADER_FLASH_XMC_SUPPORT bool "Enable the support for flash chips of XMC (READ DOCS FIRST)" default y - depends on !IDF_ENV_BRINGUP help Perform the startup flow recommended by XMC. Please consult XMC for the details of this flow. XMC chips will be forbidden to be used, when this option is disabled. @@ -119,7 +118,7 @@ menu "Bootloader config" config BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH bool - default y if ESPTOOLPY_OCT_FLASH && SPI_FLASH_32BIT_ADDRESS + default y if ESPTOOLPY_OCT_FLASH && BOOTLOADER_FLASH_32BIT_ADDR default n endmenu diff --git a/components/bootloader/sdkconfig.rename b/components/bootloader/sdkconfig.rename index bbc1846e7a..6aecd1523a 100644 --- a/components/bootloader/sdkconfig.rename +++ b/components/bootloader/sdkconfig.rename @@ -24,6 +24,4 @@ CONFIG_FLASH_ENCRYPTION_UART_BOOTLOADER_ALLOW_CACHE CONFIG_SECURE_FLASH_ # Secure Boot Scheme CONFIG_SECURE_BOOT_ENABLED CONFIG_SECURE_BOOT_V1_ENABLED -CONFIG_SPI_FLASH_32BIT_ADDR_ENABLE CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH -CONFIG_SPI_FLASH_QUAD_32BIT_ADDR_ENABLE CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH CONFIG_SPI_FLASH_OCTAL_32BIT_ADDR_ENABLE CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH diff --git a/components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h b/components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h index 6808fb9d1e..75fcd6e3b9 100644 --- a/components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h +++ b/components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h @@ -109,7 +109,7 @@ extern const bootloader_qio_info_t __attribute__((weak)) bootloader_flash_qe_sup */ esp_err_t __attribute__((weak)) bootloader_flash_unlock(void); -#if CONFIG_SPI_FLASH_OCTAL_32BIT_ADDR_ENABLE +#if CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH /** * @brief Enable 32bits address flash(larger than 16MB) can map to cache. * diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash.c index 70993d78af..92ae69ebdd 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash.c @@ -413,7 +413,7 @@ esp_err_t bootloader_flash_erase_range(uint32_t start_addr, uint32_t size) return spi_to_esp_err(rc); } -#if CONFIG_SPI_FLASH_OCTAL_32BIT_ADDR_ENABLE +#if CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH void bootloader_flash_32bits_address_map_enable(esp_rom_spiflash_read_mode_t flash_mode) { esp_rom_opiflash_spi0rd_t cache_rd = {}; diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c index 0bef6b15b1..03db8c0cb4 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c @@ -272,7 +272,7 @@ esp_err_t bootloader_init_spi_flash(void) bootloader_enable_qio_mode(); } #endif -#if CONFIG_SPI_FLASH_OCTAL_32BIT_ADDR_ENABLE +#if CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH bootloader_flash_32bits_address_map_enable(bootloader_flash_get_spi_mode()); #endif print_flash_info(&bootloader_image_hdr); diff --git a/docs/en/api-reference/peripherals/spi_flash/spi_flash_optional_feature.rst b/docs/en/api-reference/peripherals/spi_flash/spi_flash_optional_feature.rst index 7f94dc7299..e75ab5bd7d 100644 --- a/docs/en/api-reference/peripherals/spi_flash/spi_flash_optional_feature.rst +++ b/docs/en/api-reference/peripherals/spi_flash/spi_flash_optional_feature.rst @@ -28,28 +28,29 @@ Some features are not supported on all ESP chips and Flash chips. You can check Auto Suspend & Resume --------------------- +This feature is only supported on ESP32-C3 for now. + +The support for ESP32-S3, ESP32-C2, ESP32-C6, ESP32-H2 may be added in the future. + .. only:: esp32c3 - You can refer to :ref:`auto-suspend` for more information about this feature. The support list is as follows. + List of Flash chips that support this feature: -ESP Chips List: + 1. XM25QxxC series. -1. ESP32C3 + .. attention:: -Flash Chips List: - -1. XM25QxxC series. + There are multiple limitations about the auto-suspend feature, please do read :ref:`auto-suspend` for more information before you enable this feature. Flash unique ID --------------- +This feature is supported on all Espressif chips. + Unique ID is not flash id, which means flash has 64-Bit unique ID for each device. The instruction to read the unique ID (4Bh) accesses a factory-set read-only 64-bit number that is unique to each flash device. This ID number helps you to recognize each single device. Not all flash vendors support this feature. If you try to read the unique ID on a chip which does not have this feature, the behavior is not determined. The support list is as follows. -ESP Chips Lists: -ALL - -Flash Chips List: +List of Flash chips that support this feature: 1. ISSI 2. GD @@ -64,76 +65,77 @@ Flash Chips List: High performance mode --------------------- -.. note:: +This featuer is only supported on ESP32-S3 for now. - This section is provided for Dual mode (DOUT/DIO) and Quad mode (QIO/QOUT) flash chips. Octal flash used on ESP-chips support High performance mode by default so far, you can refer to the octal flash support list below. +The support for ESP32-S2, ESP32-C3, ESP32-C6, ESP32-H2 may be added in the future. -High performance mode (HPM) means that the SPI1 and flash chip works under high frequency. Usually, when the operating frequency of the flash is greater than 80 MHz, it is considered that the flash works under HPM. +.. only:: esp32s3 -As far as we acknowledged, there are more than three strategies for High Performance Mode (HPM) in typical SPI flash parts. For some flash chips, HPM is controlled by dummy cycle bit in the registers, while for other chips, it can be controlled by other bits (like HPM bit) in the register, or some special command. The difference in strategies requires the driver to explicitly add support for each chip. + .. note:: -.. attention:: + This section is provided for Dual mode (DOUT/DIO) and Quad mode (QIO/QOUT) flash chips. Octal flash used on ESP-chips support High performance mode by default so far, you can refer to the octal flash support list below. - It is hard to create several strategies to cover all situations, so all flash chips using HPM need to be supported explicitly. Therefore, if you try to use a flash not listed in :ref:`hpm_dc_support_list`, it might cause some error. So, when you try to use the flash chip beyond supported list, please test properly. + High performance mode (HPM) means that the SPI1 and flash chip works under high frequency. Usually, when the operating frequency of the flash is greater than 80 MHz, it is considered that the flash works under HPM. -Moreover, when the `Dummy Cycle adjustment` strategy is adopted by the flash chip, the flash remains in a state in which DC is different from the default value after a software reset. The sub mode of HPM that adjusts the dummy cycle to run at higher frequency in the application is called `HPM-DC`. `HPM-DC` feature needs a feature `DC Aware` to be enabled in the bootloader. Otherwise different DC value will forbid the 2nd bootloader from being boot up after reset. + As far as we acknowledged, there are more than three strategies for High Performance Mode (HPM) in typical SPI flash parts. For some flash chips, HPM is controlled by dummy cycle bit in the registers, while for other chips, it can be controlled by other bits (like HPM bit) in the register, or some special command. The difference in strategies requires the driver to explicitly add support for each chip. -To enable High Performance Mode: + .. attention:: -1. De-select :ref:`CONFIG_ESPTOOLPY_OCT_FLASH` and :ref:`CONFIG_ESPTOOLPY_FLASH_MODE_AUTO_DETECT`. HPM is not used for Octal flash, enabling related options may bypass HPM functions. + It is hard to create several strategies to cover all situations, so all flash chips using HPM need to be supported explicitly. Therefore, if you try to use a flash not listed in :ref:`hpm_dc_support_list`, it might cause some error. So, when you try to use the flash chip beyond supported list, please test properly. -2. Enable ``CONFIG_SPI_FLASH_HPM_ENA`` option. + Moreover, when the `Dummy Cycle adjustment` strategy is adopted by the flash chip, the flash remains in a state in which DC is different from the default value after a software reset. The sub mode of HPM that adjusts the dummy cycle to run at higher frequency in the application is called `HPM-DC`. `HPM-DC` feature needs a feature `DC Aware` to be enabled in the bootloader. Otherwise different DC value will forbid the 2nd bootloader from being boot up after reset. -3. Switch Flash frequency to HPM ones. For example, ``CONFIG_ESPTOOLPY_FLASHFREQ_120M``. + To enable High Performance Mode: -4. Make sure the config option for `HPM-DC` feature (under ``CONFIG_SPI_FLASH_HPM_DC`` choices) is selected correctly according to whether the bootloader supports `DC Aware`. + 1. De-select :ref:`CONFIG_ESPTOOLPY_OCT_FLASH` and :ref:`CONFIG_ESPTOOLPY_FLASH_MODE_AUTO_DETECT`. HPM is not used for Octal flash, enabling related options may bypass HPM functions. - - If bootloader supports `DC Aware`, select ``CONFIG_SPI_FLASH_HPM_DC_AUTO``. This allows the usage of flash chips that adopted `Dummy Cycle adjustment` strategy. + 2. Enable ``CONFIG_SPI_FLASH_HPM_ENA`` option. - - If bootloader doesn't support `DC Aware`, select ``CONFIG_SPI_FLASH_HPM_DC_DISABLE``. It avoid consequences caused by running HPM-DC with non-DC-aware bootloaders. But please avoid using flash chips that adopts `Dummy Cycle adjustment` strategy if ``CONFIG_SPI_FLASH_HPM_DC_DISABLE`` is selected. See list of flash models that adpot DC strategy below. + 3. Switch Flash frequency to HPM ones. For example, ``CONFIG_ESPTOOLPY_FLASHFREQ_120M``. -Check whether the bootloader supports `DC Aware` in the following way: + 4. Make sure the config option for `HPM-DC` feature (under ``CONFIG_SPI_FLASH_HPM_DC`` choices) is selected correctly according to whether the bootloader supports `DC Aware`. -- If you are starting a new project, it's suggested to enable `DC Aware` by selecting :ref:`CONFIG_BOOTLOADER_FLASH_DC_AWARE` option in the bootloader menu. Please note that, you won't be able to modify this option via OTA, because the support is in the bootloader. + - If bootloader supports `DC Aware`, select ``CONFIG_SPI_FLASH_HPM_DC_AUTO``. This allows the usage of flash chips that adopted `Dummy Cycle adjustment` strategy. -- If you are working on an existing project and want to update `HPM-DC` config option in the app via OTA, check the sdkconfig file used to build your bootloader: (Upgrading ESP-IDF version may make this file different from the one used by bootloader to build.) + - If bootloader doesn't support `DC Aware`, select ``CONFIG_SPI_FLASH_HPM_DC_DISABLE``. It avoid consequences caused by running HPM-DC with non-DC-aware bootloaders. But please avoid using flash chips that adopts `Dummy Cycle adjustment` strategy if ``CONFIG_SPI_FLASH_HPM_DC_DISABLE`` is selected. See list of flash models that adpot DC strategy below. - - For latest version (ESP-IDF v4.4.7+, v5.0.7+, v5.1.4+, v5.2 and above), if :ref:`CONFIG_BOOTLOADER_FLASH_DC_AWARE` is selected, the bootloader supports `DC Aware`. + Check whether the bootloader supports `DC Aware` in the following way: - - For versions in this range: (v4.4.4-v4.4.6, v5.0-v5.0.6, and v5.1-v5.1.3), if ``CONFIG_ESPTOOLPY_FLASHFREQ_120M`` is selected, the bootloader supports `DC Aware`. In this case, enable :ref:`CONFIG_BOOTLOADER_FLASH_DC_AWARE` to confirm this (though it will not affect bootloader in devices in the field). + - If you are starting a new project, it's suggested to enable `DC Aware` by selecting :ref:`CONFIG_BOOTLOADER_FLASH_DC_AWARE` option in the bootloader menu. Please note that, you won't be able to modify this option via OTA, because the support is in the bootloader. - - For versions below v4.4.4, the bootloader doesn't support `DC Aware`. + - If you are working on an existing project and want to update `HPM-DC` config option in the app via OTA, check the sdkconfig file used to build your bootloader: (Upgrading ESP-IDF version may make this file different from the one used by bootloader to build.) -ESP Chips List: + - For latest version (ESP-IDF v4.4.7+, v5.0.7+, v5.1.4+, v5.2 and above), if :ref:`CONFIG_BOOTLOADER_FLASH_DC_AWARE` is selected, the bootloader supports `DC Aware`. -1. ESP32S3 + - For versions in this range: (v4.4.4-v4.4.6, v5.0-v5.0.6, and v5.1-v5.1.3), if ``CONFIG_ESPTOOLPY_FLASHFREQ_120M`` is selected, the bootloader supports `DC Aware`. In this case, enable :ref:`CONFIG_BOOTLOADER_FLASH_DC_AWARE` to confirm this (though it will not affect bootloader in devices in the field). -(The SW support for other chips haven't been done yet) + - For versions below v4.4.4, the bootloader doesn't support `DC Aware`. -.. _hpm_dc_support_list: + .. _hpm_dc_support_list: -Quad Flash HPM support list -^^^^^^^^^^^^^^^^^^^^^^^^^^^ + Quad Flash HPM support list + ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Flash chips that don't need HPM-DC: + Flash chips that don't need HPM-DC: -1. GD25Q64C (ID: 0xC84017) -2. GD25Q32C (ID: 0xC84016) -3. ZB25VQ32B (ID: 0x5E4016) -4. GD25LQ255E (ID: 0xC86019) + 1. GD25Q64C (ID: 0xC84017) + 2. GD25Q32C (ID: 0xC84016) + 3. ZB25VQ32B (ID: 0x5E4016) -Following flash chips also have HPM feature, but requires the bootloader to support `DC Aware`: + Following flash chips also have HPM feature, but requires the bootloader to support `DC Aware`: -1. GD25Q64E (ID: 0xC84017) -2. GD25Q128E (ID: 0xC84018) -3. XM25QH64C (ID: 0x204017) -4. XM25QH128C (ID: 0x204018) + 1. GD25Q64E (ID: 0xC84017) + 2. GD25Q128E (ID: 0xC84018) + 3. XM25QH64C (ID: 0x204017) + 4. XM25QH128C (ID: 0x204018) .. _oct-flash-doc: OPI flash support ----------------- +This feature is only supporetd on ESP32-S3 for now. + OPI flash means that the flash chip supports octal peripheral interface, which has octal I/O pins. Different octal flash has different configurations and different commands. Hence, it is necessary to carefully check the support list. .. only:: esp32s3 @@ -142,13 +144,10 @@ OPI flash means that the flash chip supports octal peripheral interface, which h To know how to configure menuconfig for a board with different Flash and PSRAM, please refer to the :ref:`SPI Flash and External SPI RAM Configuration ` -ESP Chips List: + List of Flash chips that support this feature: -1. ESP32S3 - -Flash Chips List: - -1. MX25UM25645G + 1. MX25UM25645G + 2. MX25UM12345G .. _32-bit-flash-doc: @@ -156,17 +155,15 @@ Flash Chips List: 32-bit Address Flash Chips -------------------------- +This feature is supported on all Espressif chips (with various restrictions to application). + Most NOR flash chips used by Espressif chips use 24-bits address, which can cover 16 MBytes memory. However, for larger memory (usually equal to or larger than 16 MBytes), flash uses a 32-bits address to address larger memory. Regretfully, 32-bits address chips have vendor-specific commands, so we need to support the chips one by one. -ESP Chips List: - -ALL ESP Chips support this. - -Flash Chips List: +List of Flash chips that support this feature: 1. W25Q256 2. GD25Q256 .. important:: - Over 16 MBytes space on flash mentioned above can be only used for ``data saving``, like file system. If your data/instructions over 16 MBytes spaces need to be mapped to MMU (so as to be accessed by the CPU), please upgrade to ESP-IDF v5.2 and read the latest docs. \ No newline at end of file + Over 16 MBytes space on flash mentioned above can be only used for ``data saving``, like file system. If your data/instructions over 16 MBytes spaces need to be mapped to MMU (so as to be accessed by the CPU), please upgrade to ESP-IDF v5.2 and read the latest docs.