On Tue, 12 Oct 2021 02:16:10 +0530 Apurva Nandan <a-nandan@xxxxxx> wrote: > Manufacturers might use a variation of standard SPI NAND flash > instructions, e.g. Winbond W35N01JW changes the dummy cycle length for > read register commands when in Octal DTR mode. > > Add new function in manufacturer_ops: adjust_op(), which can be called > to correct the spi_mem op for any alteration in the instruction made by > the manufacturers. And hence, this function can also be used for > incorporating variations of SPI instructions in Octal DTR mode. Okay, so now we have reg accesses differing between vendors in DTR. Looks like we should have an OP-table for non-IO commands too (similar to the op_variants mechanism we have for IO commands), at least when operating in DTR. The reg access path would just end up doing: struct spi_mem_op op = spinand->templates[spinand->protocol][cmd]; This way you get rid of all this live-patching/vendor-specific adjustment (which is likely to get more and more complex since flash vendors have a tendency of diverging from the common behavior), and everything gets initialized at probe time. > > Datasheet: https://www.winbond.com/export/sites/winbond/datasheet/W35N01JW_Datasheet_Brief.pdf > > Signed-off-by: Apurva Nandan <a-nandan@xxxxxx> > --- > drivers/mtd/nand/spi/core.c | 3 +++ > include/linux/mtd/spinand.h | 4 ++++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c > index 4da794ae728d..8e6cf7941a0f 100644 > --- a/drivers/mtd/nand/spi/core.c > +++ b/drivers/mtd/nand/spi/core.c > @@ -61,6 +61,9 @@ static void spinand_patch_op(const struct spinand_device *spinand, > op->data.buswidth = op_buswidth; > op->data.dtr = op_is_dtr; > } > + > + if (spinand->manufacturer->ops->adjust_op) > + spinand->manufacturer->ops->adjust_op(op, spinand->reg_proto); > } > > static void spinand_patch_reg_op(const struct spinand_device *spinand, > diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h > index f6093cd98d7b..ebb19b2cec84 100644 > --- a/include/linux/mtd/spinand.h > +++ b/include/linux/mtd/spinand.h > @@ -257,6 +257,8 @@ struct spinand_devid { > /** > * struct manufacurer_ops - SPI NAND manufacturer specific operations > * @init: initialize a SPI NAND device > + * @adjust_op: modify the ops for any variation in their cmd, address, dummy or > + * data phase by the manufacturer > * @cleanup: cleanup a SPI NAND device > * > * Each SPI NAND manufacturer driver should implement this interface so that > @@ -264,6 +266,8 @@ struct spinand_devid { > */ > struct spinand_manufacturer_ops { > int (*init)(struct spinand_device *spinand); > + void (*adjust_op)(struct spi_mem_op *op, > + const enum spinand_proto reg_proto); > void (*cleanup)(struct spinand_device *spinand); > }; >