You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
From eee0166d8ead9d719d794df3e66acd8f83630e05 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Wed, 14 May 2014 14:58:07 -0300
|
|
Subject: mtd: nand: pxa3xx: Clean pxa_ecc_init() error handling
|
|
|
|
Let's make pxa_ecc_init() return a negative errno on error or zero
|
|
if succesful, which is standard kernel practice. Also, report the
|
|
selected ECC strength and step size, which is important information.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -1355,7 +1355,6 @@ static int pxa_ecc_init(struct pxa3xx_na
|
|
ecc->mode = NAND_ECC_HW;
|
|
ecc->size = 512;
|
|
ecc->strength = 1;
|
|
- return 1;
|
|
|
|
} else if (strength == 1 && ecc_stepsize == 512 && page_size == 512) {
|
|
info->chunk_size = 512;
|
|
@@ -1364,7 +1363,6 @@ static int pxa_ecc_init(struct pxa3xx_na
|
|
ecc->mode = NAND_ECC_HW;
|
|
ecc->size = 512;
|
|
ecc->strength = 1;
|
|
- return 1;
|
|
|
|
/*
|
|
* Required ECC: 4-bit correction per 512 bytes
|
|
@@ -1379,7 +1377,6 @@ static int pxa_ecc_init(struct pxa3xx_na
|
|
ecc->size = info->chunk_size;
|
|
ecc->layout = &ecc_layout_2KB_bch4bit;
|
|
ecc->strength = 16;
|
|
- return 1;
|
|
|
|
} else if (strength == 4 && ecc_stepsize == 512 && page_size == 4096) {
|
|
info->ecc_bch = 1;
|
|
@@ -1390,7 +1387,6 @@ static int pxa_ecc_init(struct pxa3xx_na
|
|
ecc->size = info->chunk_size;
|
|
ecc->layout = &ecc_layout_4KB_bch4bit;
|
|
ecc->strength = 16;
|
|
- return 1;
|
|
|
|
/*
|
|
* Required ECC: 8-bit correction per 512 bytes
|
|
@@ -1405,8 +1401,15 @@ static int pxa_ecc_init(struct pxa3xx_na
|
|
ecc->size = info->chunk_size;
|
|
ecc->layout = &ecc_layout_4KB_bch8bit;
|
|
ecc->strength = 16;
|
|
- return 1;
|
|
+ } else {
|
|
+ dev_err(&info->pdev->dev,
|
|
+ "ECC strength %d at page size %d is not supported\n",
|
|
+ strength, page_size);
|
|
+ return -ENODEV;
|
|
}
|
|
+
|
|
+ dev_info(&info->pdev->dev, "ECC strength %d, ECC step size %d\n",
|
|
+ ecc->strength, ecc->size);
|
|
return 0;
|
|
}
|
|
|
|
@@ -1528,12 +1531,8 @@ KEEP_CONFIG:
|
|
|
|
ret = pxa_ecc_init(info, &chip->ecc, ecc_strength,
|
|
ecc_step, mtd->writesize);
|
|
- if (!ret) {
|
|
- dev_err(&info->pdev->dev,
|
|
- "ECC strength %d at page size %d is not supported\n",
|
|
- ecc_strength, mtd->writesize);
|
|
- return -ENODEV;
|
|
- }
|
|
+ if (ret)
|
|
+ return ret;
|
|
|
|
/* calculate addressing information */
|
|
if (mtd->writesize >= 2048)
|