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

Commit ff0a2154 authored by Wu, Josh's avatar Wu, Josh Committed by Brian Norris
Browse files

mtd: atmel_nand: NFC: fix mtd_nandbiterrs.ko test fail when using sram write 



When enable NFC sram write, it will failed the mtd_nandbiterrs.ko test.

As in driver's nfc_sram_write_page(), if ops->mode equal to MTD_OSP_RAW,
driver assumes the data buffer contains one page data and one oob data
followed. And driver will write the page data and oob data to nand.

But this is wrong implementation. Since the data buffer don't contains the
oob data to write. We should write the chip->oob_poi to nand's oob.

So this patch fix it by writing the oob data from chip->oob_poi.

Signed-off-by: default avatarJosh Wu <josh.wu@atmel.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 1cc8d841

drivers/mtd/nand/atmel_nand.c

+9 −8
Original line number Original line Diff line number Diff line
@@ -1907,15 +1907,7 @@ static int nfc_sram_write_page(struct mtd_info *mtd, struct nand_chip *chip, 
	if (offset || (data_len < mtd->writesize))

	if (offset || (data_len < mtd->writesize))

		return -EINVAL;

		return -EINVAL;





	cfg = nfc_readl(host->nfc->hsmc_regs, CFG);

	len = mtd->writesize;

	len = mtd->writesize;



	if (unlikely(raw)) {

		len += mtd->oobsize;

		nfc_writel(host->nfc->hsmc_regs, CFG, cfg | NFC_CFG_WSPARE);

	} else

		nfc_writel(host->nfc->hsmc_regs, CFG, cfg & ~NFC_CFG_WSPARE);



	/* Copy page data to sram that will write to nand via NFC */

	/* Copy page data to sram that will write to nand via NFC */

	if (use_dma) {

	if (use_dma) {

		if (atmel_nand_dma_op(mtd, (void *)buf, len, 0) != 0)

		if (atmel_nand_dma_op(mtd, (void *)buf, len, 0) != 0)
@@ -1925,6 +1917,15 @@ static int nfc_sram_write_page(struct mtd_info *mtd, struct nand_chip *chip, 
		memcpy32_toio(sram, buf, len);

		memcpy32_toio(sram, buf, len);

	}

	}





	cfg = nfc_readl(host->nfc->hsmc_regs, CFG);

	if (unlikely(raw) && oob_required) {

		memcpy32_toio(sram + len, chip->oob_poi, mtd->oobsize);

		len += mtd->oobsize;

		nfc_writel(host->nfc->hsmc_regs, CFG, cfg | NFC_CFG_WSPARE);

	} else {

		nfc_writel(host->nfc->hsmc_regs, CFG, cfg & ~NFC_CFG_WSPARE);

	}



	if (chip->ecc.mode == NAND_ECC_HW && host->has_pmecc)

	if (chip->ecc.mode == NAND_ECC_HW && host->has_pmecc)

		/*

		/*

		 * When use NFC sram, need set up PMECC before send

		 * When use NFC sram, need set up PMECC before send