mtd: nand: correct extemded param page error handling
Subsystems (2)
PATCH 1/1 mtd: nand: correct extemded param page error handling
If the ONFI extended parameter page gives codeword_size == 0, the extended ECC information is corrupt and should not be used. Currently, we (correctly) avoid using the information, but we don't report the error to the caller, so the caller doesn't know that we didn't initialize ecc_strength_ds and ecc_step_ds. Now the caller can warn the user that it does not have sufficient information.
This also removes the false and useless "ONFI extended param page detected" debug message (it was printed even on the aforementioned corruption, and for the success case, we don't really want a print).
--- drivers/mtd/nand/nand_base.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/mtd/nand/nand_base.c +5 -4
@@ -2912,12 +2912,13 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,/* get the info we want. */ ecc = (struct onfi_ext_ecc_info *)cursor; -if (ecc->codeword_size) { - chip->ecc_strength_ds = ecc->ecc_bits; - chip->ecc_step_ds =1 << ecc->codeword_size; +if (!ecc->codeword_size) { +pr_debug ("Invalid codeword size\n" ); + goto ext_out; } -pr_info ("ONFI extended param page detected.\n" ); + chip->ecc_strength_ds = ecc->ecc_bits; + chip->ecc_step_ds =1 << ecc->codeword_size; ret =0 ; ext_out:
Signature · 1 line
1.8.4
Quoted 29 lines · Brian Norris
If the ONFI extended parameter page gives
codeword_size== 0, the extended ECC information is corrupt and should not be used. Currently, we (correctly) avoid using the information, but we don't report the error to the caller, so the caller doesn't know that we didn't initializeecc_strength_dsandecc_step_ds. Now the caller can warn the user that it does not have sufficient information.This also removes the false and useless "ONFI extended param page detected" debug message (it was printed even on the aforementioned corruption, and for the success case, we don't really want a print).
Signed-off-by Brian Norris <[email protected]>Cc Huang Shijie <[email protected]>--- drivers/mtd/nand/nand_base.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/mtd/nand/nand_base.c +1
-3@@ -2912,12 +2912,13 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd,/* get the info we want. */ ecc = (struct onfi_ext_ecc_info *)cursor; -if (ecc->codeword_size) { - chip->ecc_strength_ds = ecc->ecc_bits; - chip->ecc_step_ds =1 << ecc->codeword_size; +if (!ecc->codeword_size) {
drivers/mtd/nand/nand_base.c static int nand_flash_detect_ext_param_page(struct mtd_info *mtd, · line 2924
Quoted 10 lines
drivers/mtd/nand/nand_base.c +4
-1+pr_debug ("Invalid codeword size\n" ); + goto ext_out; } -pr_info ("ONFI extended param page detected.\n" ); + chip->ecc_strength_ds = ecc->ecc_bits; + chip->ecc_step_ds =1 << ecc->codeword_size; ret =0 ; ext_out:
Brian Norris
AppliedQuoted 14 lines · Huang Shijie
Quoted 13 lines · Brian Norris
If the ONFI extended parameter page gives
codeword_size== 0, the extended ECC information is corrupt and should not be used. Currently, we (correctly) avoid using the information, but we don't report the error to the caller, so the caller doesn't know that we didn't initializeecc_strength_dsandecc_step_ds. Now the caller can warn the user that it does not have sufficient information.This also removes the false and useless "ONFI extended param page detected" debug message (it was printed even on the aforementioned corruption, and for the success case, we don't really want a print).
Signed-off-by Brian Norris <[email protected]>Cc Huang Shijie <[email protected]>
...
Quoted 1 line
Acked-by Huang Shijie <[email protected]>
Pushed to l2-mtd.git.
Brian