Commit 88b0e358 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: spinand: Make use of the operation templates through SPINAND_OP() 



Create a SPINAND_OP() macro to which we give the name of the operation
we want. This macro retrieves the correct operation template based on
the current bus interface (currently only single SDR, will soon be
extended to octal DTR) and fills it with the usual parameters.

This macro makes the transition from calling directly the low-level
macros into using the (bus interface dependent) templates very smooth.
Use it in all places that can be trivially converted. At this stage
there is no functional change expected, until octal DTR support gets
added.

Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 40801502

drivers/mtd/nand/spi/core.c

+97 −13
Original line number Diff line number Diff line
@@ -20,10 +20,94 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/spi-mem.h>



static struct spi_mem_op

spinand_fill_reset_op(struct spinand_device *spinand)

{

	return spinand->op_templates->reset;

}



static struct spi_mem_op

spinand_fill_readid_op(struct spinand_device *spinand,

		       u8 naddr, u8 ndummy, void *buf, unsigned int len)

{

	struct spi_mem_op op = spinand->op_templates->readid;



	op.addr.nbytes = naddr;

	op.dummy.nbytes = ndummy;

	op.data.buf.in = buf;

	op.data.nbytes = len;



	return op;

}



struct spi_mem_op

spinand_fill_wr_en_op(struct spinand_device *spinand)

{

	return spinand->op_templates->wr_en;

}



static __maybe_unused struct spi_mem_op

spinand_fill_wr_dis_op(struct spinand_device *spinand)

{

	return spinand->op_templates->wr_dis;

}



struct spi_mem_op

spinand_fill_set_feature_op(struct spinand_device *spinand, u64 reg, const void *valptr)

{

	struct spi_mem_op op = spinand->op_templates->set_feature;



	op.addr.val = reg;

	op.data.buf.out = valptr;



	return op;

}



struct spi_mem_op

spinand_fill_get_feature_op(struct spinand_device *spinand, u64 reg, void *valptr)

{

	struct spi_mem_op op = spinand->op_templates->get_feature;



	op.addr.val = reg;

	op.data.buf.in = valptr;



	return op;

}



static struct spi_mem_op

spinand_fill_blk_erase_op(struct spinand_device *spinand, u64 addr)

{

	struct spi_mem_op op = spinand->op_templates->blk_erase;



	op.addr.val = addr;



	return op;

}



static struct spi_mem_op

spinand_fill_page_read_op(struct spinand_device *spinand, u64 addr)

{

	struct spi_mem_op op = spinand->op_templates->page_read;



	op.addr.val = addr;



	return op;

}



struct spi_mem_op

spinand_fill_prog_exec_op(struct spinand_device *spinand, u64 addr)

{

	struct spi_mem_op op = spinand->op_templates->prog_exec;



	op.addr.val = addr;



	return op;

}



int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)

{

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(reg,

						      spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_OP(spinand, get_feature,

					  reg, spinand->scratchbuf);

	int ret;



	ret = spi_mem_exec_op(spinand->spimem, &op);
@@ -36,8 +120,8 @@ int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) 


int spinand_write_reg_op(struct spinand_device *spinand, u8 reg, u8 val)

{

	struct spi_mem_op op = SPINAND_SET_FEATURE_1S_1S_1S_OP(reg,

						      spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_OP(spinand, set_feature,

					  reg, spinand->scratchbuf);



	*spinand->scratchbuf = val;

	return spi_mem_exec_op(spinand->spimem, &op);
@@ -362,7 +446,7 @@ static void spinand_ondie_ecc_save_status(struct nand_device *nand, u8 status) 


int spinand_write_enable_op(struct spinand_device *spinand)

{

	struct spi_mem_op op = SPINAND_WR_EN_1S_0_0_OP;

	struct spi_mem_op op = SPINAND_OP(spinand, wr_en);



	return spi_mem_exec_op(spinand->spimem, &op);

}
@@ -372,7 +456,7 @@ static int spinand_load_page_op(struct spinand_device *spinand, 
{

	struct nand_device *nand = spinand_to_nand(spinand);

	unsigned int row = nanddev_pos_to_row(nand, &req->pos);

	struct spi_mem_op op = SPINAND_PAGE_READ_1S_1S_0_OP(row);

	struct spi_mem_op op = SPINAND_OP(spinand, page_read, row);



	return spi_mem_exec_op(spinand->spimem, &op);

}
@@ -527,7 +611,7 @@ static int spinand_program_op(struct spinand_device *spinand, 
{

	struct nand_device *nand = spinand_to_nand(spinand);

	unsigned int row = nanddev_pos_to_row(nand, &req->pos);

	struct spi_mem_op op = SPINAND_PROG_EXEC_1S_1S_0_OP(row);

	struct spi_mem_op op = SPINAND_OP(spinand, prog_exec, row);



	return spi_mem_exec_op(spinand->spimem, &op);

}
@@ -537,7 +621,7 @@ static int spinand_erase_op(struct spinand_device *spinand, 
{

	struct nand_device *nand = spinand_to_nand(spinand);

	unsigned int row = nanddev_pos_to_row(nand, pos);

	struct spi_mem_op op = SPINAND_BLK_ERASE_1S_1S_0_OP(row);

	struct spi_mem_op op = SPINAND_OP(spinand, blk_erase, row);



	return spi_mem_exec_op(spinand->spimem, &op);

}
@@ -557,8 +641,8 @@ static int spinand_erase_op(struct spinand_device *spinand, 
int spinand_wait(struct spinand_device *spinand, unsigned long initial_delay_us,

		 unsigned long poll_delay_us, u8 *s)

{

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(REG_STATUS,

							       spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_OP(spinand, get_feature,

					  REG_STATUS, spinand->scratchbuf);

	u8 status;

	int ret;
@@ -591,7 +675,7 @@ int spinand_wait(struct spinand_device *spinand, unsigned long initial_delay_us, 
static int spinand_read_id_op(struct spinand_device *spinand, u8 naddr,

			      u8 ndummy, u8 *buf)

{

	struct spi_mem_op op = SPINAND_READID_1S_1S_1S_OP(

	struct spi_mem_op op = SPINAND_OP(spinand, readid,

					  naddr, ndummy, spinand->scratchbuf, SPINAND_MAX_ID_LEN);

	int ret;
@@ -604,7 +688,7 @@ static int spinand_read_id_op(struct spinand_device *spinand, u8 naddr, 


static int spinand_reset_op(struct spinand_device *spinand)

{

	struct spi_mem_op op = SPINAND_RESET_1S_0_0_OP;

	struct spi_mem_op op = SPINAND_OP(spinand, reset);

	int ret;



	ret = spi_mem_exec_op(spinand->spimem, &op);

drivers/mtd/nand/spi/esmt.c

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ static int f50l1g41lb_user_otp_info(struct spinand_device *spinand, size_t len, 
static int f50l1g41lb_otp_lock(struct spinand_device *spinand, loff_t from,

			       size_t len)

{

	struct spi_mem_op write_op = SPINAND_WR_EN_1S_0_0_OP;

	struct spi_mem_op exec_op = SPINAND_PROG_EXEC_1S_1S_0_OP(0);

	struct spi_mem_op write_op = SPINAND_OP(spinand, wr_en);

	struct spi_mem_op exec_op = SPINAND_OP(spinand, prog_exec, 0);

	u8 status;

	int ret;

drivers/mtd/nand/spi/gigadevice.c

+4 −4
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ static int gd5fxgq4uexxg_ecc_get_status(struct spinand_device *spinand, 
					u8 status)

{

	u8 status2;

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(GD5FXGQXXEXXG_REG_STATUS2,

						      spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_OP(spinand, get_feature,

					  GD5FXGQXXEXXG_REG_STATUS2, spinand->scratchbuf);

	int ret;



	switch (status & STATUS_ECC_MASK) {
@@ -309,8 +309,8 @@ static int gd5fxgq5xexxg_ecc_get_status(struct spinand_device *spinand, 
					u8 status)

{

	u8 status2;

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(GD5FXGQXXEXXG_REG_STATUS2,

						      spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_OP(spinand, get_feature,

					  GD5FXGQXXEXXG_REG_STATUS2, spinand->scratchbuf);

	int ret;



	switch (status & STATUS_ECC_MASK) {

drivers/mtd/nand/spi/macronix.c

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ static int macronix_set_cont_read(struct spinand_device *spinand, bool enable) 
static int macronix_set_read_retry(struct spinand_device *spinand,

					     unsigned int retry_mode)

{

	struct spi_mem_op op = SPINAND_SET_FEATURE_1S_1S_1S_OP(MACRONIX_FEATURE_ADDR_READ_RETRY,

							       spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_OP(spinand, set_feature,

					  MACRONIX_FEATURE_ADDR_READ_RETRY, spinand->scratchbuf);



	*spinand->scratchbuf = retry_mode;

	return spi_mem_exec_op(spinand->spimem, &op);

drivers/mtd/nand/spi/micron.c

+4 −4
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ static const struct mtd_ooblayout_ops micron_4_ooblayout = { 
static int micron_select_target(struct spinand_device *spinand,

				unsigned int target)

{

	struct spi_mem_op op = SPINAND_SET_FEATURE_1S_1S_1S_OP(MICRON_DIE_SELECT_REG,

						      spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_OP(spinand, set_feature,

					  MICRON_DIE_SELECT_REG, spinand->scratchbuf);



	if (target > 1)

		return -EINVAL;
@@ -251,8 +251,8 @@ static int mt29f2g01abagd_user_otp_info(struct spinand_device *spinand, 
static int mt29f2g01abagd_otp_lock(struct spinand_device *spinand, loff_t from,

				   size_t len)

{

	struct spi_mem_op write_op = SPINAND_WR_EN_1S_0_0_OP;

	struct spi_mem_op exec_op = SPINAND_PROG_EXEC_1S_1S_0_OP(0);

	struct spi_mem_op write_op = SPINAND_OP(spinand, wr_en);

	struct spi_mem_op exec_op = SPINAND_OP(spinand, prog_exec, 0);

	u8 status;

	int ret;