Commit a719603a authored by Chuanhong Guo's avatar Chuanhong Guo Committed by sanglipeng1
Browse files

mtd: spinand: gigadevice: fix Quad IO for GD5F1GQ5UExxG 

stable inclusion
from stable-v5.10.212
commit 30d84d87c36ef6f3c2c49b2049f8187095eb06f2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAGOP2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=30d84d87c36ef6f3c2c49b2049f8187095eb06f2

--------------------------------

commit a4f9dd55 upstream.

Read From Cache Quad IO (EBH) uses 2 dummy bytes on this chip according
to page 23 of the datasheet[0].

[0]: https://www.gigadevice.com/datasheet/gd5f1gq5xexxg/



Fixes: 469b9924 ("mtd: spinand: gigadevice: Support GD5F1GQ5UExxG")
Signed-off-by: default avatarChuanhong Guo <gch981213@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220320100001.247905-2-gch981213@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 81a271c1

drivers/mtd/nand/spi/gigadevice.c

+9 −1
Original line number Diff line number Diff line
@@ -39,6 +39,14 @@ static SPINAND_OP_VARIANTS(read_cache_variants_f, 
		SPINAND_PAGE_READ_FROM_CACHE_OP_3A(true, 0, 1, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_OP_3A(false, 0, 0, NULL, 0));



static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,

		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));



static SPINAND_OP_VARIANTS(write_cache_variants,

		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

		SPINAND_PROG_LOAD(true, 0, NULL, 0));
@@ -341,7 +349,7 @@ static const struct spinand_info gigadevice_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x51),

		     NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(4, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,