Commit 4dc49062 authored by Yaliang Wang's avatar Yaliang Wang Committed by Tudor Ambarus

mtd: spi-nor: gigadevice: gd25q256: replace gd25q256_default_init with gd25q256_post_bfpt

When utilizing PARSE_SFDP to initialize the flash parameter, the
deprecated initializing method spi_nor_init_params_deprecated() and the
function spi_nor_manufacturer_init_params() within it will never be
executed, which results in the default_init hook function will also never
be executed.

This is okay for 'D' generation of GD25Q256, because 'D' generation is
implementing the JESD216B standards, it has QER field defined in BFPT,
parsing the SFDP can properly set the quad_enable function. The 'E'
generation also implements the JESD216B standards, and it has the same
status register definitions as 'D' generation, parsing the SFDP to set
the quad_enable function should also work for 'E' generation.

However, the same thing can't apply to 'C' generation. 'C' generation
'GD25Q256C' implements the JESD216 standards, and it doesn't have the
QER field defined in BFPT, since it does have QE bit in status register
1, the quad_enable hook needs to be tweaked to properly set the
quad_enable function, this can be done in post_bfpt fixup hook.

Fixes: 047275f7 ("mtd: spi-nor: gigadevice: gd25q256: Init flash based on SFDP")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarYaliang Wang <Yaliang.Wang@windriver.com>
[tudor.ambarus@microchip.com: Update comment in gd25q256_post_bfpt]
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221016171901.1483542-2-yaliang.wang@windriver.com
parent 270450a1
...@@ -8,19 +8,29 @@ ...@@ -8,19 +8,29 @@
#include "core.h" #include "core.h"
static void gd25q256_default_init(struct spi_nor *nor) static int
gd25q256_post_bfpt(struct spi_nor *nor,
const struct sfdp_parameter_header *bfpt_header,
const struct sfdp_bfpt *bfpt)
{ {
/* /*
* Some manufacturer like GigaDevice may use different * GD25Q256C supports the first version of JESD216 which does not define
* bit to set QE on different memories, so the MFR can't * the Quad Enable methods. Overwrite the default Quad Enable method.
* indicate the quad_enable method for this case, we need *
* to set it in the default_init fixup hook. * GD25Q256 GENERATION | SFDP MAJOR VERSION | SFDP MINOR VERSION
* GD25Q256C | SFDP_JESD216_MAJOR | SFDP_JESD216_MINOR
* GD25Q256D | SFDP_JESD216_MAJOR | SFDP_JESD216B_MINOR
* GD25Q256E | SFDP_JESD216_MAJOR | SFDP_JESD216B_MINOR
*/ */
nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable; if (bfpt_header->major == SFDP_JESD216_MAJOR &&
bfpt_header->minor == SFDP_JESD216_MINOR)
nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable;
return 0;
} }
static const struct spi_nor_fixups gd25q256_fixups = { static const struct spi_nor_fixups gd25q256_fixups = {
.default_init = gd25q256_default_init, .post_bfpt = gd25q256_post_bfpt,
}; };
static const struct flash_info gigadevice_nor_parts[] = { static const struct flash_info gigadevice_nor_parts[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment