shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jon Lin
2020-08-20 21:12:29 +08:00
committed by Tao Huang
parent d7ed7b4cbd
commit dd12329e06
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rkflash/sfc_nand.c
View File

@@ -192,7 +192,7 @@ static int sfc_nand_wait_busy(u8 *data, int timeout)
return SFC_OK;
sfc_delay(1);
}
return -1;
return SFC_NAND_WAIT_TIME_OUT;
}
/*

1
drivers/rkflash/sfc_nand.h
View File

@@ -8,6 +8,7 @@
#include "flash_com.h"
#include "sfc.h"
#define SFC_NAND_WAIT_TIME_OUT 3
#define SFC_NAND_PROG_ERASE_ERROR 2
#define SFC_NAND_HW_ERROR 1
#define SFC_NAND_ECC_ERROR NAND_ERROR

47
drivers/rkflash/sfc_nand_mtd.c
View File

@@ -23,7 +23,15 @@ static inline struct snand_mtd_dev *mtd_to_priv(struct mtd_info *ptr_mtd)
static 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,
@@ -38,8 +46,11 @@ static int sfc_nand_write_mtd(struct mtd_info *mtd, loff_t to,
rkflash_print_dio("%s addr= %llx len= %x\n", __func__, to, (u32)remaining);
if ((to + remaining) > mtd->size || to & mtd->writesize_mask ||
remaining & mtd->writesize_mask)
remaining & mtd->writesize_mask) {
rkflash_print_error("%s input error, %llx %x\n", __func__, to, (u32)remaining);
return -EINVAL;
}
ops->retlen = 0;
ops->oobretlen = 0;
@@ -52,8 +63,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;
}
@@ -67,7 +79,7 @@ static int sfc_nand_write_mtd(struct mtd_info *mtd, loff_t to,
}
}
return 0;
return ret;
}
static int sfc_nand_read_mtd(struct mtd_info *mtd, loff_t from,
@@ -84,8 +96,11 @@ static int sfc_nand_read_mtd(struct mtd_info *mtd, loff_t from,
int max_bitflips = 0;
rkflash_print_dio("%s addr= %llx len= %x\n", __func__, from, (u32)remaining);
if ((from + remaining) > mtd->size)
if ((from + remaining) > mtd->size) {
rkflash_print_error("%s input error, %llx %x\n", __func__, from, (u32)remaining);
return -EINVAL;
}
ops->retlen = 0;
ops->oobretlen = 0;
@@ -93,11 +108,11 @@ static int sfc_nand_read_mtd(struct mtd_info *mtd, loff_t from,
ret = sfc_nand_read_page_raw(0, from >> mtd->writesize_shift,
(u32 *)p_dev->dma_buf);
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;
@@ -144,8 +159,11 @@ static 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;
@@ -184,8 +202,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;
@@ -247,8 +268,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;