drivers: rkflash: Add more information for SPI Nand MTD debug

1.Add more information for SPI Nand MTD debug
2.Return program result

Change-Id: I3fc7d63955355ad88adfbd02f0b67fc16c9d76d5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>

Author: Jon Lin

drivers/rkflash/sfc_nand_mtd.c

@@ -26,7 +26,15 @@ static inline struct snand_mtd_dev *mtd_to_priv(struct mtd_info *ptr_mtd)
 
 int sfc_nand_erase_mtd(struct mtd_info *mtd, u32 addr)
 {
-	return sfc_nand_erase_block(0, addr >> mtd->writesize_shift);
+	int ret;
+
+	ret = sfc_nand_erase_block(0, addr >> mtd->writesize_shift);
+	if (ret) {
+		rkflash_print_error("%s fail ret= %d\n", __func__, ret);
+		ret = -EIO;
+	}
+
+	return ret;
 }
 
 static int sfc_nand_write_mtd(struct mtd_info *mtd, loff_t to,
@@ -52,8 +60,9 @@ static int sfc_nand_write_mtd(struct mtd_info *mtd, loff_t to,
 		ret = sfc_nand_prog_page_raw(0, to >> mtd->writesize_shift,
 					     (u32 *)p_dev->dma_buf);
 		if (ret != SFC_OK) {
-			rkflash_print_dio("%s addr %llx ret= %d\n",
-					  __func__, to, ret);
+			rkflash_print_error("%s addr %llx ret= %d\n",
+					    __func__, to, ret);
+			ret = -EIO;
 			break;
 		}
 
@@ -63,7 +72,7 @@ static int sfc_nand_write_mtd(struct mtd_info *mtd, loff_t to,
 		to += mtd->writesize;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int sfc_nand_read_mtd(struct mtd_info *mtd, loff_t from,
@@ -92,11 +101,11 @@ static int sfc_nand_read_mtd(struct mtd_info *mtd, loff_t from,
 
 		ret = sfc_nand_read(page, (u32 *)data, off, real_size);
 		if (ret == SFC_NAND_HW_ERROR) {
+			rkflash_print_error("%s addr %llx ret= %d\n",
+					    __func__, from, ret);
 			ret = -EIO;
 			break;
-		}
-
-		if (ret == SFC_NAND_ECC_ERROR) {
+		} else if (ret == SFC_NAND_ECC_ERROR) {
 			rkflash_print_error("%s addr %llx ret= %d\n",
 					    __func__, from, ret);
 			ecc_failed = true;
@@ -127,8 +136,11 @@ int sfc_nand_isbad_mtd(struct mtd_info *mtd, loff_t ofs)
 	struct snand_mtd_dev *p_dev = mtd_to_priv(mtd);
 
 	rkflash_print_dio("%s %llx\n", __func__, ofs);
-	if (ofs & mtd->writesize_mask)
+	if (ofs & mtd->writesize_mask) {
+		rkflash_print_error("%s %llx input error\n", __func__, ofs);
+
 		return -EINVAL;
+	}
 
 	if (snanddev_bbt_is_initialized(p_dev)) {
 		unsigned int entry;
@@ -167,8 +179,11 @@ static int sfc_nand_markbad_mtd(struct mtd_info *mtd, loff_t ofs)
 	unsigned int entry;
 
 	rkflash_print_error("%s %llx\n", __func__, ofs);
-	if (ofs & mtd->erasesize_mask)
+	if (ofs & mtd->erasesize_mask) {
+		rkflash_print_error("%s %llx input error\n", __func__, ofs);
+
 		return -EINVAL;
+	}
 
 	if (sfc_nand_isbad_mtd(mtd, ofs))
 		return 0;
@@ -228,8 +243,8 @@ static int sfc_erase_mtd(struct mtd_info *mtd, struct erase_info *instr)
 		ret = snanddev_bbt_get_block_status(nand, addr >> mtd->erasesize_shift);
 		if (ret == NAND_BBT_BLOCK_WORN ||
 		    ret == NAND_BBT_BLOCK_FACTORY_BAD) {
-			pr_warn("attempt to erase a bad/reserved block @%llx\n",
-				addr >> mtd->erasesize_shift);
+			rkflash_print_error("attempt to erase a bad/reserved block @%llx\n",
+					    addr >> mtd->erasesize_shift);
 			addr += mtd->erasesize;
 			remaining -= mtd->erasesize;
 			continue;