[U-Boot] [PATCH][v3] mtd: nand: fsl_ifc: Fix nand waitfunc return value

Jagdish Gediya jagdish.gediya at nxp.com
Tue May 1 19:50:57 UTC 2018


As per the IFC hardware manual, Most significant byte in
nand_fsr register is the outcome of NAND READ STATUS command.

So status value need to be shifted as per the nand
framework requirement.

Signed-off-by: Jagdish Gediya <jagdish.gediya at nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha at nxp.com>
---
Changes for v2:
	- Change the waitfunc return value according to semantic
	  enforced by framework.

Changes for v3:
	- Change commit message as per York's suggestion.

 drivers/mtd/nand/fsl_ifc_nand.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index c36043d..9bf4d71 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -701,6 +701,7 @@ static int fsl_ifc_wait(struct mtd_info *mtd, struct nand_chip *chip)
 	struct fsl_ifc_ctrl *ctrl = priv->ctrl;
 	struct fsl_ifc_runtime *ifc = ctrl->regs.rregs;
 	u32 nand_fsr;
+	int status;
 
 	if (ctrl->status != IFC_NAND_EVTER_STAT_OPC)
 		return NAND_STATUS_FAIL;
@@ -721,10 +722,10 @@ static int fsl_ifc_wait(struct mtd_info *mtd, struct nand_chip *chip)
 		return NAND_STATUS_FAIL;
 
 	nand_fsr = ifc_in32(&ifc->ifc_nand.nand_fsr);
+	status = nand_fsr >> 24;
 
 	/* Chip sometimes reporting write protect even when it's not */
-	nand_fsr = nand_fsr | NAND_STATUS_WP;
-	return nand_fsr;
+	return status | NAND_STATUS_WP;
 }
 
 static int fsl_ifc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
-- 
2.7.4



More information about the U-Boot mailing list