Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit add0cfa3 authored by Abhishek Sahu's avatar Abhishek Sahu Committed by Miquel Raynal
Browse files

mtd: rawnand: qcom: parse read errors for read oob also 



read_page and read_oob both calls the read_page_ecc function.
The QCOM NAND controller protect the OOB available bytes with
ECC so read errors should be checked for read_oob also.
This patch moves the error checking code inside read_page_ecc
so caller does not have to check explicitly for read errors.

Signed-off-by: default avatarAbhishek Sahu <absahu@codeaurora.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 2f610386

drivers/mtd/nand/raw/qcom_nandc.c

+9 −17
Original line number Diff line number Diff line
@@ -1698,6 +1698,7 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf, 
	struct nand_chip *chip = &host->chip;

	struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);

	struct nand_ecc_ctrl *ecc = &chip->ecc;

	u8 *data_buf_start = data_buf, *oob_buf_start = oob_buf;

	int i, ret;



	config_nand_page_read(nandc);
@@ -1758,14 +1759,16 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf, 
	}



	ret = submit_descs(nandc);

	if (ret)

		dev_err(nandc->dev, "failure to read page/oob\n");



	free_descs(nandc);



	if (ret) {

		dev_err(nandc->dev, "failure to read page/oob\n");

		return ret;

	}



	return parse_read_errors(host, data_buf_start, oob_buf_start);

}



/*

 * a helper that copies the last step/codeword of a page (containing free oob)

 * into our local buffer
@@ -1808,20 +1811,14 @@ static int qcom_nandc_read_page(struct mtd_info *mtd, struct nand_chip *chip, 
	struct qcom_nand_host *host = to_qcom_nand_host(chip);

	struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);

	u8 *data_buf, *oob_buf = NULL;

	int ret;



	nand_read_page_op(chip, page, 0, NULL, 0);

	data_buf = buf;

	oob_buf = oob_required ? chip->oob_poi : NULL;



	clear_bam_transaction(nandc);

	ret = read_page_ecc(host, data_buf, oob_buf);

	if (ret) {

		dev_err(nandc->dev, "failure to read page\n");

		return ret;

	}



	return parse_read_errors(host, data_buf, oob_buf);

	return read_page_ecc(host, data_buf, oob_buf);

}



/* implements ecc->read_page_raw() */
@@ -1911,7 +1908,6 @@ static int qcom_nandc_read_oob(struct mtd_info *mtd, struct nand_chip *chip, 
	struct qcom_nand_host *host = to_qcom_nand_host(chip);

	struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);

	struct nand_ecc_ctrl *ecc = &chip->ecc;

	int ret;



	clear_read_regs(nandc);

	clear_bam_transaction(nandc);
@@ -1920,11 +1916,7 @@ static int qcom_nandc_read_oob(struct mtd_info *mtd, struct nand_chip *chip, 
	set_address(host, 0, page);

	update_rw_regs(host, ecc->steps, true);



	ret = read_page_ecc(host, NULL, chip->oob_poi);

	if (ret)

		dev_err(nandc->dev, "failure to read oob\n");



	return ret;

	return read_page_ecc(host, NULL, chip->oob_poi);

}



/* implements ecc->write_page() */