From mboxrd@z Thu Jan 1 00:00:00 1970 From: Abhishek Sahu Subject: [PATCH v4 12/15] mtd: rawnand: qcom: check for operation errors in case of raw read Date: Wed, 20 Jun 2018 12:57:39 +0530 Message-ID: <1529479662-4026-13-git-send-email-absahu@codeaurora.org> References: <1529479662-4026-1-git-send-email-absahu@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1529479662-4026-1-git-send-email-absahu@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+gldm-linux-mtd-36=gmane.org@lists.infradead.org To: Boris Brezillon , Miquel Raynal Cc: Archit Taneja , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Vasut , Abhishek Sahu , linux-mtd@lists.infradead.org, Richard Weinberger , Andy Gross , Brian Norris , David Woodhouse List-Id: linux-arm-msm@vger.kernel.org Q3VycmVudGx5IHRoZXJlIGlzIG5vIGVycm9yIGNoZWNraW5nIGZvciByYXcgcmVhZC4gRm9yIHJh dwpyZWFkcywgdGhlcmUgd29u4oCZdCBiZSBhbnkgRUNDIGZhaWx1cmUgYnV0IHRoZSBvcGVyYXRp b25hbApmYWlsdXJlcyBhcmUgcG9zc2libGUsIHNvIHNjaGVkdWxlIHRoZSBOQU5EX0ZMQVNIX1NU QVRVUyByZWFkCmFmdGVyIGVhY2ggY29kZXdvcmQuCgpBY2tlZC1ieTogTWlxdWVsIFJheW5hbCA8 bWlxdWVsLnJheW5hbEBib290bGluLmNvbT4KU2lnbmVkLW9mZi1ieTogQWJoaXNoZWsgU2FodSA8 YWJzYWh1QGNvZGVhdXJvcmEub3JnPgotLS0KKiBDaGFuZ2VzIGZyb20gdjM6CiAxLiBTaW5jZSBi YWQgYmxvY2sgcmVvcmdhbml6YXRpb24gcGF0Y2ggaGFzIHJlbW92ZWQgZnJvbSB0aGlzCiAgICBw YXRjaCBzZXJpZXMgc28gZm9sbG93aW5nIGNoYW5nZSBpcyByZXF1aXJlZCBpbiBjb3B5X2xhc3Rf Y3cpCiAgICBjb25maWdfbmFuZF9zaW5nbGVfY3dfcGFnZV9yZWFkKG5hbmRjKTsKICAgIC0+IGNv bmZpZ19uYW5kX3NpbmdsZV9jd19wYWdlX3JlYWQobmFuZGMsIGhvc3QtPnVzZV9lY2MpOwoKKiBD aGFuZ2VzIGZyb20gdjI6CiAgTk9ORQoKKiBDaGFuZ2VzIGZyb20gdjE6CiAxLiBSZW1vdmVkIHRo ZSBjb2RlIGZvciBjb3B5X2xhc3RfY3cuCgogZHJpdmVycy9tdGQvbmFuZC9yYXcvcWNvbV9uYW5k Yy5jIHwgNTggKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9tdGQvbmFuZC9yYXcvcWNvbV9uYW5kYy5jIGIvZHJpdmVycy9tdGQvbmFuZC9yYXcv cWNvbV9uYW5kYy5jCmluZGV4IDg4N2IxZjYuLjU5OTljMzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv bXRkL25hbmQvcmF3L3Fjb21fbmFuZGMuYworKysgYi9kcml2ZXJzL210ZC9uYW5kL3Jhdy9xY29t X25hbmRjLmMKQEAgLTEwOTYsNyArMTA5Niw4IEBAIHN0YXRpYyB2b2lkIGNvbmZpZ19uYW5kX3Bh Z2VfcmVhZChzdHJ1Y3QgcWNvbV9uYW5kX2NvbnRyb2xsZXIgKm5hbmRjKQogICogSGVscGVyIHRv IHByZXBhcmUgRE1BIGRlc2NyaXB0b3JzIGZvciBjb25maWd1cmluZyByZWdpc3RlcnMKICAqIGJl Zm9yZSByZWFkaW5nIGVhY2ggY29kZXdvcmQgaW4gTkFORCBwYWdlLgogICovCi1zdGF0aWMgdm9p ZCBjb25maWdfbmFuZF9jd19yZWFkKHN0cnVjdCBxY29tX25hbmRfY29udHJvbGxlciAqbmFuZGMp CitzdGF0aWMgdm9pZAorY29uZmlnX25hbmRfY3dfcmVhZChzdHJ1Y3QgcWNvbV9uYW5kX2NvbnRy b2xsZXIgKm5hbmRjLCBib29sIHVzZV9lY2MpCiB7CiAJaWYgKG5hbmRjLT5wcm9wcy0+aXNfYmFt KQogCQl3cml0ZV9yZWdfZG1hKG5hbmRjLCBOQU5EX1JFQURfTE9DQVRJT05fMCwgNCwKQEAgLTEx MDUsMTkgKzExMDYsMjUgQEAgc3RhdGljIHZvaWQgY29uZmlnX25hbmRfY3dfcmVhZChzdHJ1Y3Qg cWNvbV9uYW5kX2NvbnRyb2xsZXIgKm5hbmRjKQogCXdyaXRlX3JlZ19kbWEobmFuZGMsIE5BTkRf RkxBU0hfQ01ELCAxLCBOQU5EX0JBTV9ORVhUX1NHTCk7CiAJd3JpdGVfcmVnX2RtYShuYW5kYywg TkFORF9FWEVDX0NNRCwgMSwgTkFORF9CQU1fTkVYVF9TR0wpOwogCi0JcmVhZF9yZWdfZG1hKG5h bmRjLCBOQU5EX0ZMQVNIX1NUQVRVUywgMiwgMCk7Ci0JcmVhZF9yZWdfZG1hKG5hbmRjLCBOQU5E X0VSQVNFRF9DV19ERVRFQ1RfU1RBVFVTLCAxLAotCQkgICAgIE5BTkRfQkFNX05FWFRfU0dMKTsK KwlpZiAodXNlX2VjYykgeworCQlyZWFkX3JlZ19kbWEobmFuZGMsIE5BTkRfRkxBU0hfU1RBVFVT LCAyLCAwKTsKKwkJcmVhZF9yZWdfZG1hKG5hbmRjLCBOQU5EX0VSQVNFRF9DV19ERVRFQ1RfU1RB VFVTLCAxLAorCQkJICAgICBOQU5EX0JBTV9ORVhUX1NHTCk7CisJfSBlbHNlIHsKKwkJcmVhZF9y ZWdfZG1hKG5hbmRjLCBOQU5EX0ZMQVNIX1NUQVRVUywgMSwgTkFORF9CQU1fTkVYVF9TR0wpOwor CX0KIH0KIAogLyoKICAqIEhlbHBlciB0byBwcmVwYXJlIGRtYSBkZXNjcmlwdG9ycyB0byBjb25m aWd1cmUgcmVnaXN0ZXJzIG5lZWRlZCBmb3IgcmVhZGluZyBhCiAgKiBzaW5nbGUgY29kZXdvcmQg aW4gcGFnZQogICovCi1zdGF0aWMgdm9pZCBjb25maWdfbmFuZF9zaW5nbGVfY3dfcGFnZV9yZWFk KHN0cnVjdCBxY29tX25hbmRfY29udHJvbGxlciAqbmFuZGMpCitzdGF0aWMgdm9pZAorY29uZmln X25hbmRfc2luZ2xlX2N3X3BhZ2VfcmVhZChzdHJ1Y3QgcWNvbV9uYW5kX2NvbnRyb2xsZXIgKm5h bmRjLAorCQkJCWJvb2wgdXNlX2VjYykKIHsKIAljb25maWdfbmFuZF9wYWdlX3JlYWQobmFuZGMp OwotCWNvbmZpZ19uYW5kX2N3X3JlYWQobmFuZGMpOworCWNvbmZpZ19uYW5kX2N3X3JlYWQobmFu ZGMsIHVzZV9lY2MpOwogfQogCiAvKgpAQCAtMTE5OCw3ICsxMjA1LDcgQEAgc3RhdGljIGludCBu YW5kY19wYXJhbShzdHJ1Y3QgcWNvbV9uYW5kX2hvc3QgKmhvc3QpCiAJbmFuZGMtPmJ1Zl9jb3Vu dCA9IDUxMjsKIAltZW1zZXQobmFuZGMtPmRhdGFfYnVmZmVyLCAweGZmLCBuYW5kYy0+YnVmX2Nv dW50KTsKIAotCWNvbmZpZ19uYW5kX3NpbmdsZV9jd19wYWdlX3JlYWQobmFuZGMpOworCWNvbmZp Z19uYW5kX3NpbmdsZV9jd19wYWdlX3JlYWQobmFuZGMsIGZhbHNlKTsKIAogCXJlYWRfZGF0YV9k bWEobmFuZGMsIEZMQVNIX0JVRl9BQ0MsIG5hbmRjLT5kYXRhX2J1ZmZlciwKIAkJICAgICAgbmFu ZGMtPmJ1Zl9jb3VudCwgMCk7CkBAIC0xNTYzLDYgKzE1NzAsMjMgQEAgc3RydWN0IHJlYWRfc3Rh dHMgewogCV9fbGUzMiBlcmFzZWRfY3c7CiB9OwogCisvKiByZWFkcyBiYWNrIEZMQVNIX1NUQVRV UyByZWdpc3RlciBzZXQgYnkgdGhlIGNvbnRyb2xsZXIgKi8KK3N0YXRpYyBpbnQgY2hlY2tfZmxh c2hfZXJyb3JzKHN0cnVjdCBxY29tX25hbmRfaG9zdCAqaG9zdCwgaW50IGN3X2NudCkKK3sKKwlz dHJ1Y3QgbmFuZF9jaGlwICpjaGlwID0gJmhvc3QtPmNoaXA7CisJc3RydWN0IHFjb21fbmFuZF9j b250cm9sbGVyICpuYW5kYyA9IGdldF9xY29tX25hbmRfY29udHJvbGxlcihjaGlwKTsKKwlpbnQg aTsKKworCWZvciAoaSA9IDA7IGkgPCBjd19jbnQ7IGkrKykgeworCQl1MzIgZmxhc2ggPSBsZTMy X3RvX2NwdShuYW5kYy0+cmVnX3JlYWRfYnVmW2ldKTsKKworCQlpZiAoZmxhc2ggJiAoRlNfT1Bf RVJSIHwgRlNfTVBVX0VSUikpCisJCQlyZXR1cm4gLUVJTzsKKwl9CisKKwlyZXR1cm4gMDsKK30K KwogLyoKICAqIHJlYWRzIGJhY2sgc3RhdHVzIHJlZ2lzdGVycyBzZXQgYnkgdGhlIGNvbnRyb2xs ZXIgdG8gbm90aWZ5IHBhZ2UgcmVhZAogICogZXJyb3JzLiB0aGlzIGlzIGVxdWl2YWxlbnQgdG8g d2hhdCAnZWNjLT5jb3JyZWN0KCknIHdvdWxkIGRvLgpAQCAtMTcyOSw3ICsxNzUzLDcgQEAgc3Rh dGljIGludCByZWFkX3BhZ2VfZWNjKHN0cnVjdCBxY29tX25hbmRfaG9zdCAqaG9zdCwgdTggKmRh dGFfYnVmLAogCQkJfQogCQl9CiAKLQkJY29uZmlnX25hbmRfY3dfcmVhZChuYW5kYyk7CisJCWNv bmZpZ19uYW5kX2N3X3JlYWQobmFuZGMsIHRydWUpOwogCiAJCWlmIChkYXRhX2J1ZikKIAkJCXJl YWRfZGF0YV9kbWEobmFuZGMsIEZMQVNIX0JVRl9BQ0MsIGRhdGFfYnVmLApAQCAtMTc5MSw3ICsx ODE1LDcgQEAgc3RhdGljIGludCBjb3B5X2xhc3RfY3coc3RydWN0IHFjb21fbmFuZF9ob3N0ICpo b3N0LCBpbnQgcGFnZSkKIAlzZXRfYWRkcmVzcyhob3N0LCBob3N0LT5jd19zaXplICogKGVjYy0+ c3RlcHMgLSAxKSwgcGFnZSk7CiAJdXBkYXRlX3J3X3JlZ3MoaG9zdCwgMSwgdHJ1ZSk7CiAKLQlj b25maWdfbmFuZF9zaW5nbGVfY3dfcGFnZV9yZWFkKG5hbmRjKTsKKwljb25maWdfbmFuZF9zaW5n bGVfY3dfcGFnZV9yZWFkKG5hbmRjLCBob3N0LT51c2VfZWNjKTsKIAogCXJlYWRfZGF0YV9kbWEo bmFuZGMsIEZMQVNIX0JVRl9BQ0MsIG5hbmRjLT5kYXRhX2J1ZmZlciwgc2l6ZSwgMCk7CiAKQEAg LTE4NzQsNyArMTg5OCw3IEBAIHN0YXRpYyBpbnQgcWNvbV9uYW5kY19yZWFkX3BhZ2VfcmF3KHN0 cnVjdCBtdGRfaW5mbyAqbXRkLAogCQkJbmFuZGNfc2V0X3JlYWRfbG9jKG5hbmRjLCAzLCByZWFk X2xvYywgb29iX3NpemUyLCAxKTsKIAkJfQogCi0JCWNvbmZpZ19uYW5kX2N3X3JlYWQobmFuZGMp OworCQljb25maWdfbmFuZF9jd19yZWFkKG5hbmRjLCBmYWxzZSk7CiAKIAkJcmVhZF9kYXRhX2Rt YShuYW5kYywgcmVnX29mZiwgZGF0YV9idWYsIGRhdGFfc2l6ZTEsIDApOwogCQlyZWdfb2ZmICs9 IGRhdGFfc2l6ZTE7CkBAIC0xODkzLDEyICsxOTE3LDEzIEBAIHN0YXRpYyBpbnQgcWNvbV9uYW5k Y19yZWFkX3BhZ2VfcmF3KHN0cnVjdCBtdGRfaW5mbyAqbXRkLAogCX0KIAogCXJldCA9IHN1Ym1p dF9kZXNjcyhuYW5kYyk7Ci0JaWYgKHJldCkKKwlmcmVlX2Rlc2NzKG5hbmRjKTsKKwlpZiAocmV0 KSB7CiAJCWRldl9lcnIobmFuZGMtPmRldiwgImZhaWx1cmUgdG8gcmVhZCByYXcgcGFnZVxuIik7 CisJCXJldHVybiByZXQ7CisJfQogCi0JZnJlZV9kZXNjcyhuYW5kYyk7Ci0KLQlyZXR1cm4gcmV0 OworCXJldHVybiBjaGVja19mbGFzaF9lcnJvcnMoaG9zdCwgZWNjLT5zdGVwcyk7CiB9CiAKIC8q IGltcGxlbWVudHMgZWNjLT5yZWFkX29vYigpICovCkBAIC0yMTE3LDcgKzIxNDIsNiBAQCBzdGF0 aWMgaW50IHFjb21fbmFuZGNfYmxvY2tfYmFkKHN0cnVjdCBtdGRfaW5mbyAqbXRkLCBsb2ZmX3Qg b2ZzKQogCXN0cnVjdCBxY29tX25hbmRfY29udHJvbGxlciAqbmFuZGMgPSBnZXRfcWNvbV9uYW5k X2NvbnRyb2xsZXIoY2hpcCk7CiAJc3RydWN0IG5hbmRfZWNjX2N0cmwgKmVjYyA9ICZjaGlwLT5l Y2M7CiAJaW50IHBhZ2UsIHJldCwgYmJwb3MsIGJhZCA9IDA7Ci0JdTMyIGZsYXNoX3N0YXR1czsK IAogCXBhZ2UgPSAoaW50KShvZnMgPj4gY2hpcC0+cGFnZV9zaGlmdCkgJiBjaGlwLT5wYWdlbWFz azsKIApAQCAtMjEzNCw5ICsyMTU4LDcgQEAgc3RhdGljIGludCBxY29tX25hbmRjX2Jsb2NrX2Jh ZChzdHJ1Y3QgbXRkX2luZm8gKm10ZCwgbG9mZl90IG9mcykKIAlpZiAocmV0KQogCQlnb3RvIGVy cjsKIAotCWZsYXNoX3N0YXR1cyA9IGxlMzJfdG9fY3B1KG5hbmRjLT5yZWdfcmVhZF9idWZbMF0p OwotCi0JaWYgKGZsYXNoX3N0YXR1cyAmIChGU19PUF9FUlIgfCBGU19NUFVfRVJSKSkgeworCWlm IChjaGVja19mbGFzaF9lcnJvcnMoaG9zdCwgMSkpIHsKIAkJZGV2X3dhcm4obmFuZGMtPmRldiwg ImVycm9yIHdoZW4gdHJ5aW5nIHRvIHJlYWQgQkJNXG4iKTsKIAkJZ290byBlcnI7CiAJfQotLSAK UVVBTENPTU0gSU5ESUEsIG9uIGJlaGFsZiBvZiBRdWFsY29tbSBJbm5vdmF0aW9uIENlbnRlciwg SW5jLgppcyBhIG1lbWJlciBvZiBDb2RlIEF1cm9yYSBGb3J1bSwgaG9zdGVkIGJ5IFRoZSBMaW51 eCBGb3VuZGF0aW9uCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkxpbnV4IE1URCBkaXNjdXNzaW9uIG1haWxpbmcgbGlzdApodHRwOi8vbGlz dHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LW10ZC8K From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fVXXw-0003ev-Cy for linux-mtd@lists.infradead.org; Wed, 20 Jun 2018 07:28:57 +0000 From: Abhishek Sahu To: Boris Brezillon , Miquel Raynal Cc: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Andy Gross , Archit Taneja , Abhishek Sahu Subject: [PATCH v4 12/15] mtd: rawnand: qcom: check for operation errors in case of raw read Date: Wed, 20 Jun 2018 12:57:39 +0530 Message-Id: <1529479662-4026-13-git-send-email-absahu@codeaurora.org> In-Reply-To: <1529479662-4026-1-git-send-email-absahu@codeaurora.org> References: <1529479662-4026-1-git-send-email-absahu@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Currently there is no error checking for raw read. For raw reads, there won’t be any ECC failure but the operational failures are possible, so schedule the NAND_FLASH_STATUS read after each codeword. Acked-by: Miquel Raynal Signed-off-by: Abhishek Sahu --- * Changes from v3: 1. Since bad block reorganization patch has removed from this patch series so following change is required in copy_last_cw) config_nand_single_cw_page_read(nandc); -> config_nand_single_cw_page_read(nandc, host->use_ecc); * Changes from v2: NONE * Changes from v1: 1. Removed the code for copy_last_cw. drivers/mtd/nand/raw/qcom_nandc.c | 58 +++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index 887b1f6..5999c39 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -1096,7 +1096,8 @@ static void config_nand_page_read(struct qcom_nand_controller *nandc) * Helper to prepare DMA descriptors for configuring registers * before reading each codeword in NAND page. */ -static void config_nand_cw_read(struct qcom_nand_controller *nandc) +static void +config_nand_cw_read(struct qcom_nand_controller *nandc, bool use_ecc) { if (nandc->props->is_bam) write_reg_dma(nandc, NAND_READ_LOCATION_0, 4, @@ -1105,19 +1106,25 @@ static void config_nand_cw_read(struct qcom_nand_controller *nandc) write_reg_dma(nandc, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL); write_reg_dma(nandc, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL); - read_reg_dma(nandc, NAND_FLASH_STATUS, 2, 0); - read_reg_dma(nandc, NAND_ERASED_CW_DETECT_STATUS, 1, - NAND_BAM_NEXT_SGL); + if (use_ecc) { + read_reg_dma(nandc, NAND_FLASH_STATUS, 2, 0); + read_reg_dma(nandc, NAND_ERASED_CW_DETECT_STATUS, 1, + NAND_BAM_NEXT_SGL); + } else { + read_reg_dma(nandc, NAND_FLASH_STATUS, 1, NAND_BAM_NEXT_SGL); + } } /* * Helper to prepare dma descriptors to configure registers needed for reading a * single codeword in page */ -static void config_nand_single_cw_page_read(struct qcom_nand_controller *nandc) +static void +config_nand_single_cw_page_read(struct qcom_nand_controller *nandc, + bool use_ecc) { config_nand_page_read(nandc); - config_nand_cw_read(nandc); + config_nand_cw_read(nandc, use_ecc); } /* @@ -1198,7 +1205,7 @@ static int nandc_param(struct qcom_nand_host *host) nandc->buf_count = 512; memset(nandc->data_buffer, 0xff, nandc->buf_count); - config_nand_single_cw_page_read(nandc); + config_nand_single_cw_page_read(nandc, false); read_data_dma(nandc, FLASH_BUF_ACC, nandc->data_buffer, nandc->buf_count, 0); @@ -1563,6 +1570,23 @@ struct read_stats { __le32 erased_cw; }; +/* reads back FLASH_STATUS register set by the controller */ +static int check_flash_errors(struct qcom_nand_host *host, int cw_cnt) +{ + struct nand_chip *chip = &host->chip; + struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); + int i; + + for (i = 0; i < cw_cnt; i++) { + u32 flash = le32_to_cpu(nandc->reg_read_buf[i]); + + if (flash & (FS_OP_ERR | FS_MPU_ERR)) + return -EIO; + } + + return 0; +} + /* * reads back status registers set by the controller to notify page read * errors. this is equivalent to what 'ecc->correct()' would do. @@ -1729,7 +1753,7 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf, } } - config_nand_cw_read(nandc); + config_nand_cw_read(nandc, true); if (data_buf) read_data_dma(nandc, FLASH_BUF_ACC, data_buf, @@ -1791,7 +1815,7 @@ static int copy_last_cw(struct qcom_nand_host *host, int page) set_address(host, host->cw_size * (ecc->steps - 1), page); update_rw_regs(host, 1, true); - config_nand_single_cw_page_read(nandc); + config_nand_single_cw_page_read(nandc, host->use_ecc); read_data_dma(nandc, FLASH_BUF_ACC, nandc->data_buffer, size, 0); @@ -1874,7 +1898,7 @@ static int qcom_nandc_read_page_raw(struct mtd_info *mtd, nandc_set_read_loc(nandc, 3, read_loc, oob_size2, 1); } - config_nand_cw_read(nandc); + config_nand_cw_read(nandc, false); read_data_dma(nandc, reg_off, data_buf, data_size1, 0); reg_off += data_size1; @@ -1893,12 +1917,13 @@ static int qcom_nandc_read_page_raw(struct mtd_info *mtd, } ret = submit_descs(nandc); - if (ret) + free_descs(nandc); + if (ret) { dev_err(nandc->dev, "failure to read raw page\n"); + return ret; + } - free_descs(nandc); - - return ret; + return check_flash_errors(host, ecc->steps); } /* implements ecc->read_oob() */ @@ -2117,7 +2142,6 @@ static int qcom_nandc_block_bad(struct mtd_info *mtd, loff_t ofs) struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); struct nand_ecc_ctrl *ecc = &chip->ecc; int page, ret, bbpos, bad = 0; - u32 flash_status; page = (int)(ofs >> chip->page_shift) & chip->pagemask; @@ -2134,9 +2158,7 @@ static int qcom_nandc_block_bad(struct mtd_info *mtd, loff_t ofs) if (ret) goto err; - flash_status = le32_to_cpu(nandc->reg_read_buf[0]); - - if (flash_status & (FS_OP_ERR | FS_MPU_ERR)) { + if (check_flash_errors(host, 1)) { dev_warn(nandc->dev, "error when trying to read BBM\n"); goto err; } -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation