Commit 2234585f authored by Arseniy Krasnov's avatar Arseniy Krasnov Committed by Miquel Raynal
Browse files

mtd: rawnand: meson: refactor use of 'meson_nfc_cmd_access()' 



Move call 'meson_nfc_cmd_seed()' and check for 'NAND_NEED_SCRAMBLING'
to 'meson_nfc_cmd_access()', thus removing code duplication.

Signed-off-by: default avatarArseniy Krasnov <avkrasnov@salutedevices.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240507230903.3399594-3-avkrasnov@salutedevices.com
parent 4e976b15

drivers/mtd/nand/raw/meson_nand.c

+12 −18
Original line number Diff line number Diff line
@@ -298,14 +298,19 @@ static void meson_nfc_cmd_seed(struct meson_nfc *nfc, u32 seed) 
	       nfc->reg_base + NFC_REG_CMD);

}



static void meson_nfc_cmd_access(struct nand_chip *nand, int raw, bool dir,

				 int scrambler)

static void meson_nfc_cmd_access(struct nand_chip *nand, int raw, bool dir, int page)

{

	struct mtd_info *mtd = nand_to_mtd(nand);

	struct meson_nfc *nfc = nand_get_controller_data(mtd_to_nand(mtd));

	struct meson_nfc_nand_chip *meson_chip = to_meson_nand(nand);

	u32 bch = meson_chip->bch_mode, cmd;

	int len = mtd->writesize, pagesize, pages;

	int scrambler;



	if (nand->options & NAND_NEED_SCRAMBLING)

		scrambler = NFC_CMD_SCRAMBLER_ENABLE;

	else

		scrambler = NFC_CMD_SCRAMBLER_DISABLE;



	pagesize = nand->ecc.size;
@@ -321,6 +326,9 @@ static void meson_nfc_cmd_access(struct nand_chip *nand, int raw, bool dir, 
	cmd = CMDRWGEN(DMA_DIR(dir), scrambler, bch,

		       NFC_CMD_SHORTMODE_DISABLE, pagesize, pages);



	if (scrambler == NFC_CMD_SCRAMBLER_ENABLE)

		meson_nfc_cmd_seed(nfc, page);



	writel(cmd, nfc->reg_base + NFC_REG_CMD);

}
@@ -743,14 +751,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *nand, 
	if (ret)

		return ret;



	if (nand->options & NAND_NEED_SCRAMBLING) {

		meson_nfc_cmd_seed(nfc, page);

		meson_nfc_cmd_access(nand, raw, DIRWRITE,

				     NFC_CMD_SCRAMBLER_ENABLE);

	} else {

		meson_nfc_cmd_access(nand, raw, DIRWRITE,

				     NFC_CMD_SCRAMBLER_DISABLE);

	}

	meson_nfc_cmd_access(nand, raw, DIRWRITE, page);



	cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_PAGEPROG;

	writel(cmd, nfc->reg_base + NFC_REG_CMD);
@@ -829,14 +830,7 @@ static int meson_nfc_read_page_sub(struct nand_chip *nand, 
	if (ret)

		return ret;



	if (nand->options & NAND_NEED_SCRAMBLING) {

		meson_nfc_cmd_seed(nfc, page);

		meson_nfc_cmd_access(nand, raw, DIRREAD,

				     NFC_CMD_SCRAMBLER_ENABLE);

	} else {

		meson_nfc_cmd_access(nand, raw, DIRREAD,

				     NFC_CMD_SCRAMBLER_DISABLE);

	}

	meson_nfc_cmd_access(nand, raw, DIRREAD, page);



	ret = meson_nfc_wait_dma_finish(nfc);

	meson_nfc_check_ecc_pages_valid(nfc, nand, raw);