mtd: nand: raw: qcom_nandc: handle ret from parse with codeword_fixup
Subsystems (5)
PATCH 1/1 mtd: nand: raw: qcom_nandc: handle ret from parse with codeword_fixup
With use_codeword_fixup enabled, any return from mtd_device_parse_register gets overwritten. Aside from the clear bug, this is also problematic as a parser can EPROBE_DEFER and because this is not correctly handled, the nand is never rescanned later in the bootup process.
An example of this problem is when smem requires additional time to be probed and nandc use qcomsmempart as parser. Parser will return EPROBE_DEFER but in the current code this ret gets overwritten by qcom_nand_host_parse_boot_partitions and qcom_nand_host_init_and_register return 0.
Correctly handle the return code from mtd_device_parse_register so that any error from this function is not ignored.
--- drivers/mtd/nand/raw/qcom_nandc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/mtd/nand/raw/qcom_nandc.c +7 -5
@@ -3167,16 +3167,18 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc, ret =mtd_device_parse_register (mtd, probes,NULL ,NULL ,0 );if (ret) -nand_cleanup (chip); + goto err;if (nandc->props->use_codeword_fixup) { ret =qcom_nand_host_parse_boot_partitions (nandc, host, dn); -if (ret) { -nand_cleanup (chip); -return ret; - } +if (ret) + goto err; } +return 0 ; + +err: +nand_cleanup (chip);return ret; }
Signature · 6 lines
2.37.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Quoted 12 lines · Christian Marangi
With
use_codeword_fixupenabled, any return frommtd_device_parse_registergets overwritten. Aside from the clear bug, this is also problematic as a parser canEPROBE_DEFERand because this is not correctly handled, the nand is never rescanned later in the bootup process.An example of this problem is when smem requires additional time to be probed and nandc use qcomsmempart as parser. Parser will return
EPROBE_DEFERbut in the current code this ret gets overwritten byqcom_nand_host_parse_boot_partitionsandqcom_nand_host_init_and_registerreturn 0.
Quoted 6 lines
Correctly handle the return code from
mtd_device_parse_registerso that any error from this function is not ignored.Fixes 862bdedd7f4b ("mtd: nand: raw: qcom_nandc: add support for unprotected spare data pages")Cc [email protected] # v6.0+Signed-off-by Christian Marangi <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.
Miquel