When doing a page write we always have to copy the OOB data in place,
as the controller will always write it. Not copying it means we write
random data to the OOB area.

Fixes: 3df54960b63cc ("mtd: nand: mxc_nand: implement exec_op")
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
Miquel, feel free to fixup the original patch with this.
---
 drivers/mtd/nand/raw/mxc_nand.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 9d50f41b3d5a1..e90c6047e82a5 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -806,8 +806,7 @@ static int mxc_nand_write_page_ecc(struct nand_chip *chip, const uint8_t *buf,
 	struct mxc_nand_host *host = nand_get_controller_data(chip);
 	int ret;
 
-	if (oob_required)
-		copy_spare(mtd, false, chip->oob_poi);
+	copy_spare(mtd, false, chip->oob_poi);
 
 	host->devtype_data->enable_hwecc(chip, true);
 
@@ -823,8 +822,7 @@ static int mxc_nand_write_page_raw(struct nand_chip *chip, const uint8_t *buf,
 {
 	struct mtd_info *mtd = nand_to_mtd(chip);
 
-	if (oob_required)
-		copy_spare(mtd, false, chip->oob_poi);
+	copy_spare(mtd, false, chip->oob_poi);
 
 	return nand_prog_page_op(chip, page, 0, buf, mtd->writesize);
 }
-- 
2.39.2

On Tue, 2024-05-28 at 20:30:06 UTC, Sascha Hauer wrote:
> When doing a page write we always have to copy the OOB data in place,
> as the controller will always write it. Not copying it means we write
> random data to the OOB area.
> 
> Fixes: 3df54960b63cc ("mtd: nand: mxc_nand: implement exec_op")
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.

Miquel

Hi Sascha,

s.hauer@pengutronix.de wrote on Tue, 28 May 2024 22:30:06 +0200:

> When doing a page write we always have to copy the OOB data in place,
> as the controller will always write it. Not copying it means we write
> random data to the OOB area.
> 
> Fixes: 3df54960b63cc ("mtd: nand: mxc_nand: implement exec_op")
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> Miquel, feel free to fixup the original patch with this.

Sorry for the delay, I'm now fixing up the original patch with this one.

Thanks for the follow-up.

BTW I've changed the titles to "mtd: rawnand: mxc:" to match the naming
changes since the introduction of spi-nand.

Cheers,
Miquèl