Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de15e1f authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: sunxi: Stop using polling mode when waiting for long operations 



Some operations, like read/write an entire page of data with the ECC
engine enabled, are known to take a lot of time. Use the interrupt-based
waiting mode in these situation.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 19649e2c

drivers/mtd/nand/sunxi_nand.c

+18 −6
Original line number Diff line number Diff line
@@ -522,6 +522,8 @@ static void sunxi_nfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) 
	u32 tmp;



	while (len > offs) {

		bool poll = false;



		cnt = min(len - offs, NFC_SRAM_SIZE);



		ret = sunxi_nfc_wait_cmd_fifo_empty(nfc);
@@ -532,7 +534,11 @@ static void sunxi_nfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) 
		tmp = NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD;

		writel(tmp, nfc->regs + NFC_REG_CMD);



		ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);

		/* Arbitrary limit for polling mode */

		if (cnt < 64)

			poll = true;



		ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, poll, 0);

		if (ret)

			break;
@@ -555,6 +561,8 @@ static void sunxi_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf, 
	u32 tmp;



	while (len > offs) {

		bool poll = false;



		cnt = min(len - offs, NFC_SRAM_SIZE);



		ret = sunxi_nfc_wait_cmd_fifo_empty(nfc);
@@ -567,7 +575,11 @@ static void sunxi_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf, 
		      NFC_ACCESS_DIR;

		writel(tmp, nfc->regs + NFC_REG_CMD);



		ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);

		/* Arbitrary limit for polling mode */

		if (cnt < 64)

			poll = true;



		ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, poll, 0);

		if (ret)

			break;
@@ -961,7 +973,7 @@ static int sunxi_nfc_hw_ecc_read_chunk(struct mtd_info *mtd, 
	writel(NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD | NFC_ECC_OP,

	       nfc->regs + NFC_REG_CMD);



	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);

	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);

	sunxi_nfc_randomizer_disable(mtd);

	if (ret)

		return ret;
@@ -1073,7 +1085,7 @@ static int sunxi_nfc_hw_ecc_read_chunks_dma(struct mtd_info *mtd, uint8_t *buf, 
	writel(NFC_PAGE_OP | NFC_DATA_SWAP_METHOD | NFC_DATA_TRANS,

	       nfc->regs + NFC_REG_CMD);



	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);

	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);

	if (ret)

		dmaengine_terminate_all(nfc->dmac);
@@ -1193,7 +1205,7 @@ static int sunxi_nfc_hw_ecc_write_chunk(struct mtd_info *mtd, 
	       NFC_ACCESS_DIR | NFC_ECC_OP,

	       nfc->regs + NFC_REG_CMD);



	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);

	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);

	sunxi_nfc_randomizer_disable(mtd);

	if (ret)

		return ret;
@@ -1432,7 +1444,7 @@ static int sunxi_nfc_hw_ecc_write_page_dma(struct mtd_info *mtd, 
	       NFC_DATA_TRANS | NFC_ACCESS_DIR,

	       nfc->regs + NFC_REG_CMD);



	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);

	ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);

	if (ret)

		dmaengine_terminate_all(nfc->dmac);