Patchwork mtd: gpmi: Always report ECC stats and return max_bitflips

login
register
mail settings
Submitter Zach Sadecki
Date Dec. 14, 2012, 2:36 a.m.
Message ID <50CA90BB.5030801@itwatchdogs.com>
Download mbox | patch
Permalink /patch/206283/
State New
Headers show

Comments

Zach Sadecki - Dec. 14, 2012, 2:36 a.m.
Always report corrected and failed ECC stats back up to the MTD layer.  Also
return max_bitflips from read_page() as is expected from NAND drivers now.

Signed-off-by: Zach Sadecki <zsadecki@itwatchdogs.com>
Acked-by: Huang Shijie <b32955@freescale.com>
---
  drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   27 ++++++++-------------------
  1 file changed, 8 insertions(+), 19 deletions(-)
Huang Shijie - Jan. 10, 2013, 3:01 a.m.
于 2012年12月14日 10:36, Zach Sadecki 写道:
> Always report corrected and failed ECC stats back up to the MTD layer. 
> Also
> return max_bitflips from read_page() as is expected from NAND drivers 
> now.
>
> Signed-off-by: Zach Sadecki <zsadecki@itwatchdogs.com>
> Acked-by: Huang Shijie <b32955@freescale.com>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 27 ++++++++-------------------
> 1 file changed, 8 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 
> b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 5cd141f..1535bd5 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -921,8 +921,7 @@ static int gpmi_ecc_read_page(struct mtd_info 
> *mtd, struct nand_chip *chip,
> dma_addr_t auxiliary_phys;
> unsigned int i;
> unsigned char *status;
> - unsigned int failed;
> - unsigned int corrected;
> + unsigned int max_bitflips = 0;
> int ret;
>
> pr_debug("page number is : %d\n", page);
> @@ -946,35 +945,25 @@ static int gpmi_ecc_read_page(struct mtd_info 
> *mtd, struct nand_chip *chip,
> payload_virt, payload_phys);
> if (ret) {
> pr_err("Error in ECC-based read: %d\n", ret);
> - goto exit_nfc;
> + return ret;
> }
>
> /* handle the block mark swapping */
> block_mark_swapping(this, payload_virt, auxiliary_virt);
>
> /* Loop over status bytes, accumulating ECC status. */
> - failed = 0;
> - corrected = 0;
> - status = auxiliary_virt + nfc_geo->auxiliary_status_offset;
> + status = auxiliary_virt + nfc_geo->auxiliary_status_offset;
>
> for (i = 0; i < nfc_geo->ecc_chunk_count; i++, status++) {
> if ((*status == STATUS_GOOD) || (*status == STATUS_ERASED))
> continue;
>
> if (*status == STATUS_UNCORRECTABLE) {
> - failed++;
> + mtd->ecc_stats.failed++;
> continue;
> }
> - corrected += *status;
> - }
> -
> - /*
> - * Propagate ECC status to the owning MTD only when failed or
> - * corrected times nearly reaches our ECC correction threshold.
> - */
> - if (failed || corrected >= (nfc_geo->ecc_strength - 1)) {
> - mtd->ecc_stats.failed += failed;
> - mtd->ecc_stats.corrected += corrected;
> + mtd->ecc_stats.corrected += *status;
> + max_bitflips = max_t(unsigned int, max_bitflips, *status);
> }
>
> if (oob_required) {
> @@ -996,8 +985,8 @@ static int gpmi_ecc_read_page(struct mtd_info 
> *mtd, struct nand_chip *chip,
> this->payload_virt, this->payload_phys,
> nfc_geo->payload_size,
> payload_virt, payload_phys);
> -exit_nfc:
> - return ret;
> +
> + return max_bitflips;
> }
>
> static int gpmi_ecc_write_page(struct mtd_info *mtd, struct nand_chip 
> *chip,
just a ping.
Artem Bityutskiy - Jan. 15, 2013, 9:30 a.m.
On Thu, 2012-12-13 at 20:36 -0600, Zach Sadecki wrote:
> Always report corrected and failed ECC stats back up to the MTD layer.  Also
> return max_bitflips from read_page() as is expected from NAND drivers now.
> 
> Signed-off-by: Zach Sadecki <zsadecki@itwatchdogs.com>
> Acked-by: Huang Shijie <b32955@freescale.com>

Pushed to l2-mtd.git, thanks!

Patch

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 5cd141f..1535bd5 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -921,8 +921,7 @@  static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
  	dma_addr_t    auxiliary_phys;
  	unsigned int  i;
  	unsigned char *status;
-	unsigned int  failed;
-	unsigned int  corrected;
+	unsigned int  max_bitflips = 0;
  	int           ret;
  
  	pr_debug("page number is : %d\n", page);
@@ -946,35 +945,25 @@  static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
  			payload_virt, payload_phys);
  	if (ret) {
  		pr_err("Error in ECC-based read: %d\n", ret);
-		goto exit_nfc;
+		return ret;
  	}
  
  	/* handle the block mark swapping */
  	block_mark_swapping(this, payload_virt, auxiliary_virt);
  
  	/* Loop over status bytes, accumulating ECC status. */
-	failed		= 0;
-	corrected	= 0;
-	status		= auxiliary_virt + nfc_geo->auxiliary_status_offset;
+	status = auxiliary_virt + nfc_geo->auxiliary_status_offset;
  
  	for (i = 0; i < nfc_geo->ecc_chunk_count; i++, status++) {
  		if ((*status == STATUS_GOOD) || (*status == STATUS_ERASED))
  			continue;
  
  		if (*status == STATUS_UNCORRECTABLE) {
-			failed++;
+			mtd->ecc_stats.failed++;
  			continue;
  		}
-		corrected += *status;
-	}
-
-	/*
-	 * Propagate ECC status to the owning MTD only when failed or
-	 * corrected times nearly reaches our ECC correction threshold.
-	 */
-	if (failed || corrected >= (nfc_geo->ecc_strength - 1)) {
-		mtd->ecc_stats.failed    += failed;
-		mtd->ecc_stats.corrected += corrected;
+		mtd->ecc_stats.corrected += *status;
+		max_bitflips = max_t(unsigned int, max_bitflips, *status);
  	}
  
  	if (oob_required) {
@@ -996,8 +985,8 @@  static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
  			this->payload_virt, this->payload_phys,
  			nfc_geo->payload_size,
  			payload_virt, payload_phys);
-exit_nfc:
-	return ret;
+
+	return max_bitflips;
  }
  
  static int gpmi_ecc_write_page(struct mtd_info *mtd, struct nand_chip *chip,