[PATCH v3 05/17] mtd: spinand: Define ctrl_ops for non-page read/write op templates

From: Apurva Nandan
Date: Sat Jan 01 2022 - 02:44:05 EST


'ctrl_ops' are op templates for non-page read/write operations,
which are: reset, get_feature, set_feature, write_enable, block_erase,
page_read and program_execute ops. The 'ctrl_ops' struct contains in it
op templates for each of this op, as well as enum spinand_protocol
denoting protocol of all these ops.

We require these new op templates because of deviation in standard
SPINAND ops by manufacturers and also due to changes when there is a
change in SPI protocol/mode. This prevents the core from live-patching
and vendor-specific adjustments in ops.

Define 'ctrl_ops', add macros to initialize it and add it in
spinand_device.

Signed-off-by: Apurva Nandan <a-nandan@xxxxxx>
---
include/linux/mtd/spinand.h | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)

diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
index 439d8ce40e1d..e5df6220ec1e 100644
--- a/include/linux/mtd/spinand.h
+++ b/include/linux/mtd/spinand.h
@@ -356,6 +356,35 @@ struct spinand_op_variants {
sizeof(struct spi_mem_op), \
}

+struct spinand_ctrl_ops {
+ const struct {
+ struct spi_mem_op reset;
+ struct spi_mem_op get_feature;
+ struct spi_mem_op set_feature;
+ struct spi_mem_op write_enable;
+ struct spi_mem_op block_erase;
+ struct spi_mem_op page_read;
+ struct spi_mem_op program_execute;
+ } ops;
+ const enum spinand_protocol protocol;
+};
+
+#define SPINAND_CTRL_OPS(__protocol, __reset, __get_feature, __set_feature, \
+ __write_enable, __block_erase, __page_read, \
+ __program_execute) \
+ { \
+ .ops = { \
+ .reset = __reset, \
+ .get_feature = __get_feature, \
+ .set_feature = __set_feature, \
+ .write_enable = __write_enable, \
+ .block_erase = __block_erase, \
+ .page_read = __page_read, \
+ .program_execute = __program_execute, \
+ }, \
+ .protocol = __protocol, \
+ }
+
/**
* spinand_ecc_info - description of the on-die ECC implemented by a SPI NAND
* chip
@@ -468,6 +497,8 @@ struct spinand_dirmap {
* @data_ops.read_cache: read cache op template
* @data_ops.write_cache: write cache op template
* @data_ops.update_cache: update cache op template
+ * @ctrl_ops: various SPI mem op templates for handling the flash device, i.e.
+ * non page-read/write ops.
* @select_target: select a specific target/die. Usually called before sending
* a command addressing a page or an eraseblock embedded in
* this die. Only required if your chip exposes several dies
@@ -498,6 +529,8 @@ struct spinand_device {
const struct spi_mem_op *update_cache;
} data_ops;

+ const struct spinand_ctrl_ops *ctrl_ops;
+
struct spinand_dirmap *dirmaps;

int (*select_target)(struct spinand_device *spinand,
--
2.25.1