Commit e0160cd4 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: Hide the chip->data_interface indirection 



As a preparation for allocating the data interface structure
dynamically (and rename it), let's avoid accessing
chip->data_interface directly.

Instead, we introduce a helper, nand_get_interface_config(), and use
it to retrieve the current data interface configuration out of a
nand_chip object.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Link: https://lore.kernel.org/linux-mtd/20200529111322.7184-19-miquel.raynal@bootlin.com
parent d1bfe1e3

drivers/mtd/nand/raw/marvell_nand.c

+6 −3
Original line number Diff line number Diff line
@@ -1096,6 +1096,8 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip, 
						const u8 *oob_buf, bool raw,

						int page)

{

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(nand_get_interface_config(chip));

	struct marvell_nand_chip *marvell_nand = to_marvell_nand(chip);

	struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);

	const struct marvell_hw_ecc_layout *lt = to_marvell_nand(chip)->layout;
@@ -1141,7 +1143,7 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip, 
		return ret;



	ret = marvell_nfc_wait_op(chip,

				  PSEC_TO_MSEC(chip->data_interface.timings.sdr.tPROG_max));

				  PSEC_TO_MSEC(sdr->tPROG_max));

	return ret;

}
@@ -1562,6 +1564,8 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct nand_chip *chip, 
					     const u8 *buf,

					     int oob_required, int page)

{

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(nand_get_interface_config(chip));

	struct mtd_info *mtd = nand_to_mtd(chip);

	const struct marvell_hw_ecc_layout *lt = to_marvell_nand(chip)->layout;

	const u8 *data = buf;
@@ -1598,8 +1602,7 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct nand_chip *chip, 
		marvell_nfc_wait_ndrun(chip);

	}



	ret = marvell_nfc_wait_op(chip,

				  PSEC_TO_MSEC(chip->data_interface.timings.sdr.tPROG_max));

	ret = marvell_nfc_wait_op(chip, PSEC_TO_MSEC(sdr->tPROG_max));



	marvell_nfc_disable_hw_ecc(chip);

drivers/mtd/nand/raw/meson_nand.c

+4 −4
Original line number Diff line number Diff line
@@ -573,10 +573,10 @@ static int meson_nfc_write_buf(struct nand_chip *nand, u8 *buf, int len) 
static int meson_nfc_rw_cmd_prepare_and_execute(struct nand_chip *nand,

						int page, bool in)

{

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(nand_get_interface_config(nand));

	struct mtd_info *mtd = nand_to_mtd(nand);

	struct meson_nfc *nfc = nand_get_controller_data(nand);

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(&nand->data_interface);

	u32 *addrs = nfc->cmdfifo.rw.addrs;

	u32 cs = nfc->param.chip_select;

	u32 cmd0, cmd_num, row_start;
@@ -626,9 +626,9 @@ static int meson_nfc_rw_cmd_prepare_and_execute(struct nand_chip *nand, 
static int meson_nfc_write_page_sub(struct nand_chip *nand,

				    int page, int raw)

{

	struct mtd_info *mtd = nand_to_mtd(nand);

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(&nand->data_interface);

		nand_get_sdr_timings(nand_get_interface_config(nand));

	struct mtd_info *mtd = nand_to_mtd(nand);

	struct meson_nfc_nand_chip *meson_chip = to_meson_nand(nand);

	struct meson_nfc *nfc = nand_get_controller_data(nand);

	int data_len, info_len;

drivers/mtd/nand/raw/nand_base.c

+17 −17
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ int nand_soft_waitrdy(struct nand_chip *chip, unsigned long timeout_ms) 
		return -ENOTSUPP;



	/* Wait tWB before polling the STATUS reg. */

	timings = nand_get_sdr_timings(&chip->data_interface);

	timings = nand_get_sdr_timings(nand_get_interface_config(chip));

	ndelay(PSEC_TO_NSEC(timings->tWB_max));



	ret = nand_status_op(chip, NULL);
@@ -1119,9 +1119,9 @@ static int nand_sp_exec_read_page_op(struct nand_chip *chip, unsigned int page, 
				     unsigned int offset_in_page, void *buf,

				     unsigned int len)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(&chip->data_interface);

		nand_get_sdr_timings(nand_get_interface_config(chip));

	struct mtd_info *mtd = nand_to_mtd(chip);

	u8 addrs[4];

	struct nand_op_instr instrs[] = {

		NAND_OP_CMD(NAND_CMD_READ0, 0),
@@ -1163,7 +1163,7 @@ static int nand_lp_exec_read_page_op(struct nand_chip *chip, unsigned int page, 
				     unsigned int len)

{

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(&chip->data_interface);

		nand_get_sdr_timings(nand_get_interface_config(chip));

	u8 addrs[5];

	struct nand_op_instr instrs[] = {

		NAND_OP_CMD(NAND_CMD_READ0, 0),
@@ -1260,7 +1260,7 @@ int nand_read_param_page_op(struct nand_chip *chip, u8 page, void *buf, 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_PARAM, 0),

			NAND_OP_ADDR(1, &page, PSEC_TO_NSEC(sdr->tWB_max)),
@@ -1315,7 +1315,7 @@ int nand_change_read_column_op(struct nand_chip *chip, 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		u8 addrs[2] = {};

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_RNDOUT, 0),
@@ -1389,9 +1389,9 @@ static int nand_exec_prog_page_op(struct nand_chip *chip, unsigned int page, 
				  unsigned int offset_in_page, const void *buf,

				  unsigned int len, bool prog)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(&chip->data_interface);

		nand_get_sdr_timings(nand_get_interface_config(chip));

	struct mtd_info *mtd = nand_to_mtd(chip);

	u8 addrs[5] = {};

	struct nand_op_instr instrs[] = {

		/*
@@ -1514,7 +1514,7 @@ int nand_prog_page_end_op(struct nand_chip *chip) 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_PAGEPROG,

				    PSEC_TO_NSEC(sdr->tWB_max)),
@@ -1621,7 +1621,7 @@ int nand_change_write_column_op(struct nand_chip *chip, 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		u8 addrs[2];

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_RNDIN, 0),
@@ -1676,7 +1676,7 @@ int nand_readid_op(struct nand_chip *chip, u8 addr, void *buf, 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_READID, 0),

			NAND_OP_ADDR(1, &addr, PSEC_TO_NSEC(sdr->tADL_min)),
@@ -1715,7 +1715,7 @@ int nand_status_op(struct nand_chip *chip, u8 *status) 
{

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_STATUS,

				    PSEC_TO_NSEC(sdr->tADL_min)),
@@ -1784,7 +1784,7 @@ int nand_erase_op(struct nand_chip *chip, unsigned int eraseblock) 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		u8 addrs[3] = {	page, page >> 8, page >> 16 };

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_ERASE1, 0),
@@ -1843,7 +1843,7 @@ static int nand_set_features_op(struct nand_chip *chip, u8 feature, 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_SET_FEATURES, 0),

			NAND_OP_ADDR(1, &feature, PSEC_TO_NSEC(sdr->tADL_min)),
@@ -1890,7 +1890,7 @@ static int nand_get_features_op(struct nand_chip *chip, u8 feature, 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_GET_FEATURES, 0),

			NAND_OP_ADDR(1, &feature, PSEC_TO_NSEC(sdr->tWB_max)),
@@ -1947,7 +1947,7 @@ int nand_reset_op(struct nand_chip *chip) 
{

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_RESET, PSEC_TO_NSEC(sdr->tWB_max)),

			NAND_OP_WAIT_RDY(PSEC_TO_MSEC(sdr->tRST_max), 0),
@@ -3226,7 +3226,7 @@ static void nand_wait_readrdy(struct nand_chip *chip) 
	if (!(chip->options & NAND_NEED_READRDY))

		return;



	sdr = nand_get_sdr_timings(&chip->data_interface);

	sdr = nand_get_sdr_timings(nand_get_interface_config(chip));

	WARN_ON(nand_wait_rdy_op(chip, PSEC_TO_MSEC(sdr->tR_max), 0));

}

drivers/mtd/nand/raw/nand_legacy.c

+4 −1
Original line number Diff line number Diff line
@@ -354,6 +354,9 @@ static void nand_command(struct nand_chip *chip, unsigned int command, 


static void nand_ccs_delay(struct nand_chip *chip)

{

	const struct nand_sdr_timings *sdr =

		nand_get_sdr_timings(nand_get_interface_config(chip));



	/*

	 * The controller already takes care of waiting for tCCS when the RNDIN

	 * or RNDOUT command is sent, return directly.
@@ -366,7 +369,7 @@ static void nand_ccs_delay(struct nand_chip *chip) 
	 * (which should be safe for all NANDs).

	 */

	if (nand_controller_can_setup_data_iface(chip))

		ndelay(chip->data_interface.timings.sdr.tCCS_min / 1000);

		ndelay(sdr->tCCS_min / 1000);

	else

		ndelay(500);

}

drivers/mtd/nand/raw/nand_toshiba.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static int toshiba_nand_benand_read_eccstatus_op(struct nand_chip *chip, 


	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

			nand_get_sdr_timings(nand_get_interface_config(chip));

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(TOSHIBA_NAND_CMD_ECC_STATUS_READ,

				    PSEC_TO_NSEC(sdr->tADL_min)),