Skip to content

Commit 004f8ea

Browse files
mkshevetskiymiquelraynal
authored andcommitted
mtd: spinand: try a regular dirmap if creating a dirmap for continuous reading fails
Continuous reading may result in multiple flash pages reading in one operation. Typically only one flash page has read/written (a little bit more than 2-4 Kb), but continuous reading requires the spi controller to read up to 512 Kb in one operation without toggling CS in beetween. Roughly speaking spi controllers can be divided on 2 categories: * spi controllers without dirmap acceleration support * spi controllers with dirmap acceleration support Firt of them will have issues with continuous reading if restriction on the transfer length is implemented in the adjust_op_size() handler. Second group often supports acceleration of single page only reading. Thus enabling of continuous reading can break flash reading. This patch tries to create dirmap for continuous reading first and fallback to regular reading if spi controller refuses to create it. Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
1 parent e4a0cf9 commit 004f8ea

1 file changed

Lines changed: 35 additions & 8 deletions

File tree

drivers/mtd/nand/spi/core.c

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,39 @@ static int spinand_mtd_block_isreserved(struct mtd_info *mtd, loff_t offs)
10931093
return ret;
10941094
}
10951095

1096+
static struct spi_mem_dirmap_desc *spinand_create_rdesc(
1097+
struct spinand_device *spinand,
1098+
struct spi_mem_dirmap_info *info)
1099+
{
1100+
struct nand_device *nand = spinand_to_nand(spinand);
1101+
struct spi_mem_dirmap_desc *desc = NULL;
1102+
1103+
if (spinand->cont_read_possible) {
1104+
/*
1105+
* spi controller may return an error if info->length is
1106+
* too large
1107+
*/
1108+
info->length = nanddev_eraseblock_size(nand);
1109+
desc = devm_spi_mem_dirmap_create(&spinand->spimem->spi->dev,
1110+
spinand->spimem, info);
1111+
}
1112+
1113+
if (IS_ERR_OR_NULL(desc)) {
1114+
/*
1115+
* continuous reading is not supported by flash or
1116+
* its spi controller, use regular reading
1117+
*/
1118+
spinand->cont_read_possible = false;
1119+
1120+
info->length = nanddev_page_size(nand) +
1121+
nanddev_per_page_oobsize(nand);
1122+
desc = devm_spi_mem_dirmap_create(&spinand->spimem->spi->dev,
1123+
spinand->spimem, info);
1124+
}
1125+
1126+
return desc;
1127+
}
1128+
10961129
static int spinand_create_dirmap(struct spinand_device *spinand,
10971130
unsigned int plane)
10981131
{
@@ -1112,11 +1145,8 @@ static int spinand_create_dirmap(struct spinand_device *spinand,
11121145

11131146
spinand->dirmaps[plane].wdesc = desc;
11141147

1115-
if (spinand->cont_read_possible)
1116-
info.length = nanddev_eraseblock_size(nand);
11171148
info.op_tmpl = *spinand->op_templates.read_cache;
1118-
desc = devm_spi_mem_dirmap_create(&spinand->spimem->spi->dev,
1119-
spinand->spimem, &info);
1149+
desc = spinand_create_rdesc(spinand, &info);
11201150
if (IS_ERR(desc))
11211151
return PTR_ERR(desc);
11221152

@@ -1139,12 +1169,9 @@ static int spinand_create_dirmap(struct spinand_device *spinand,
11391169

11401170
spinand->dirmaps[plane].wdesc_ecc = desc;
11411171

1142-
if (spinand->cont_read_possible)
1143-
info.length = nanddev_eraseblock_size(nand);
11441172
info.op_tmpl = *spinand->op_templates.read_cache;
11451173
info.op_tmpl.data.ecc = true;
1146-
desc = devm_spi_mem_dirmap_create(&spinand->spimem->spi->dev,
1147-
spinand->spimem, &info);
1174+
desc = spinand_create_rdesc(spinand, &info);
11481175
if (IS_ERR(desc))
11491176
return PTR_ERR(desc);
11501177

0 commit comments

Comments
 (0)