Commit 6e1bf55d authored by Pratyush Yadav's avatar Pratyush Yadav Committed by Vignesh Raghavendra
Browse files

mtd: spi-nor: add spi_nor_controller_ops_{read_reg, write_reg, erase}() 



They are thin wrappers around
nor->controller_ops->{read_reg,write_reg,erase}(). In a future commit
DTR support will be added. These ops can not be supported by the
controller_ops hooks and these helpers will make it easier to reject
those calls.

Signed-off-by: default avatarPratyush Yadav <p.yadav@ti.com>
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20201005153138.6437-3-p.yadav@ti.com
parent 39bdfb78

drivers/mtd/spi-nor/core.c

+53 −34
Original line number Diff line number Diff line
@@ -82,6 +82,23 @@ static int spi_nor_spimem_exec_op(struct spi_nor *nor, struct spi_mem_op *op) 
	return spi_mem_exec_op(nor->spimem, op);

}



static int spi_nor_controller_ops_read_reg(struct spi_nor *nor, u8 opcode,

					   u8 *buf, size_t len)

{

	return nor->controller_ops->read_reg(nor, opcode, buf, len);

}



static int spi_nor_controller_ops_write_reg(struct spi_nor *nor, u8 opcode,

					    const u8 *buf, size_t len)

{

	return nor->controller_ops->write_reg(nor, opcode, buf, len);

}



static int spi_nor_controller_ops_erase(struct spi_nor *nor, loff_t offs)

{

	return nor->controller_ops->erase(nor, offs);

}



/**

 * spi_nor_spimem_read_data() - read data from flash's memory region via

 *                              spi-mem
@@ -229,7 +246,7 @@ int spi_nor_write_enable(struct spi_nor *nor) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_WREN,

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_WREN,

						       NULL, 0);

	}
@@ -258,7 +275,7 @@ int spi_nor_write_disable(struct spi_nor *nor) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_WRDI,

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_WRDI,

						       NULL, 0);

	}
@@ -289,8 +306,8 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr) 


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

	} else {

		ret = nor->controller_ops->read_reg(nor, SPINOR_OP_RDSR,

						    sr, 1);

		ret = spi_nor_controller_ops_read_reg(nor, SPINOR_OP_RDSR, sr,

						      1);

	}



	if (ret)
@@ -320,8 +337,8 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr) 


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

	} else {

		ret = nor->controller_ops->read_reg(nor, SPINOR_OP_RDFSR,

						    fsr, 1);

		ret = spi_nor_controller_ops_read_reg(nor, SPINOR_OP_RDFSR, fsr,

						      1);

	}



	if (ret)
@@ -352,7 +369,8 @@ static int spi_nor_read_cr(struct spi_nor *nor, u8 *cr) 


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

	} else {

		ret = nor->controller_ops->read_reg(nor, SPINOR_OP_RDCR, cr, 1);

		ret = spi_nor_controller_ops_read_reg(nor, SPINOR_OP_RDCR, cr,

						      1);

	}



	if (ret)
@@ -385,7 +403,7 @@ int spi_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor,

		ret = spi_nor_controller_ops_write_reg(nor,

						       enable ? SPINOR_OP_EN4B :

								SPINOR_OP_EX4B,

						       NULL, 0);
@@ -421,7 +439,7 @@ static int spansion_set_4byte_addr_mode(struct spi_nor *nor, bool enable) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_BRWR,

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_BRWR,

						       nor->bouncebuf, 1);

	}
@@ -453,7 +471,7 @@ int spi_nor_write_ear(struct spi_nor *nor, u8 ear) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_WREAR,

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_WREAR,

						       nor->bouncebuf, 1);

	}
@@ -484,8 +502,8 @@ int spi_nor_xread_sr(struct spi_nor *nor, u8 *sr) 


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

	} else {

		ret = nor->controller_ops->read_reg(nor, SPINOR_OP_XRDSR,

						    sr, 1);

		ret = spi_nor_controller_ops_read_reg(nor, SPINOR_OP_XRDSR, sr,

						      1);

	}



	if (ret)
@@ -529,7 +547,7 @@ static void spi_nor_clear_sr(struct spi_nor *nor) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_CLSR,

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_CLSR,

						       NULL, 0);

	}
@@ -593,7 +611,7 @@ static void spi_nor_clear_fsr(struct spi_nor *nor) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_CLFSR,

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_CLFSR,

						       NULL, 0);

	}
@@ -737,8 +755,8 @@ static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_WRSR,

						     sr, len);

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_WRSR, sr,

						       len);

	}



	if (ret) {
@@ -939,7 +957,7 @@ static int spi_nor_write_sr2(struct spi_nor *nor, const u8 *sr2) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_WRSR2,

		ret = spi_nor_controller_ops_write_reg(nor, SPINOR_OP_WRSR2,

						       sr2, 1);

	}
@@ -973,8 +991,8 @@ static int spi_nor_read_sr2(struct spi_nor *nor, u8 *sr2) 


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

	} else {

		ret = nor->controller_ops->read_reg(nor, SPINOR_OP_RDSR2,

						    sr2, 1);

		ret = spi_nor_controller_ops_read_reg(nor, SPINOR_OP_RDSR2, sr2,

						      1);

	}



	if (ret)
@@ -1004,7 +1022,8 @@ static int spi_nor_erase_chip(struct spi_nor *nor) 


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

	} else {

		ret = nor->controller_ops->write_reg(nor, SPINOR_OP_CHIP_ERASE,

		ret = spi_nor_controller_ops_write_reg(nor,

						       SPINOR_OP_CHIP_ERASE,

						       NULL, 0);

	}
@@ -1146,7 +1165,7 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr) 


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

	} else if (nor->controller_ops->erase) {

		return nor->controller_ops->erase(nor, addr);

		return spi_nor_controller_ops_erase(nor, addr);

	}



	/*
@@ -1158,7 +1177,7 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr) 
		addr >>= 8;

	}



	return nor->controller_ops->write_reg(nor, nor->erase_opcode,

	return spi_nor_controller_ops_write_reg(nor, nor->erase_opcode,

						nor->bouncebuf, nor->addr_width);

}