dc26065a72
The issue is introduced in 571864e8ae. The
esp_flash API tries to clear the QE bit when the flash is not working in
quad modes.
However this introduces a regression, compared to earlier versions and
the legacy API. When the chip is not detected, the generic chip driver
is used, which cannot 100% handle the QE bit properly for all flash
vendors. There may be some flash chips (e.g. MXIC) that can be used in
dual modes by legacy API, but output wrong data when the esp_flash API
clears the QE bit in a wrong way.
This commit reverts the QE force clearing behavior, so that it's safer
for the generic chip driver to work under dual modes.
48 lines
1.8 KiB
C
48 lines
1.8 KiB
C
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include <stdlib.h>
|
|
#include "spi_flash_chip_driver.h"
|
|
#include "spi_flash_chip_generic.h"
|
|
#include "spi_flash_chip_issi.h"
|
|
#include "spi_flash_chip_mxic.h"
|
|
#include "spi_flash_chip_gd.h"
|
|
#include "sdkconfig.h"
|
|
|
|
/*
|
|
* Default registered chip drivers. Note these are tested in order and first
|
|
* match is taken, so generic/catchall entries should go last. Note that the
|
|
* esp_flash_registered_flash_ops pointer can be changed to point to a different
|
|
* array of registered ops, if desired.
|
|
*
|
|
* It can be configured to support only available chips in the sdkconfig, to
|
|
* avoid possible issues, and speed up the auto-detecting.
|
|
*/
|
|
static const spi_flash_chip_t *default_registered_chips[] = {
|
|
#ifdef CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP
|
|
&esp_flash_chip_issi,
|
|
#endif
|
|
#ifdef CONFIG_SPI_FLASH_SUPPORT_GD_CHIP
|
|
&esp_flash_chip_gd,
|
|
#endif
|
|
#ifdef CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP
|
|
&esp_flash_chip_mxic,
|
|
#endif
|
|
// Default chip drivers that will accept all chip ID.
|
|
// FM, Winbond and XMC chips are supposed to be supported by this chip driver.
|
|
&esp_flash_chip_generic,
|
|
NULL,
|
|
};
|
|
|
|
const spi_flash_chip_t **esp_flash_registered_chips = default_registered_chips;
|