From patchwork Mon Sep 3 13:00:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 181364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 018F52C008D for ; Mon, 3 Sep 2012 23:03:21 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T8WI8-0008Cb-SF; Mon, 03 Sep 2012 13:02:13 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T8WGb-0007EJ-V1 for linux-mtd@lists.infradead.org; Mon, 03 Sep 2012 13:00:39 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so8483440pbb.36 for ; Mon, 03 Sep 2012 06:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=B7/b/VwDiJP0qqH0bswUuXCrQeD3ef0tI/xCwVnY4uc=; b=Pyp4O+BYnone9h0+KmqozXYy2vFNEoFhOTSvCfbIzwFalIUipusQUlLK9OEhQFT7F2 7mYibFcsy7iwXC5nl2N2QmP6iZn/Lv9hVM8BzbSGykX9KiVGILYlc1ExfezalHoTH4LW AG2TnG8uGfnLGMYv8tb7LA7L3OuA9cjd0rOujqRR/HNKlLfsSGu5pGVqDePBMsZjDDRl AMFh22tLeLvhiC7sy5a/G/7AMXybiGz+6fiC3qEGKVx0n0K8D5pH2gsV2Ey+6n8jpHbZ xvwGBpSUqlDIsDZFSoQnJvbG5G2qEOcGM2yEvmt6o+jOIlswBOyT/OrONQMM0UTxOJrJ WTfQ== Received: by 10.66.73.7 with SMTP id h7mr33930303pav.34.1346677237689; Mon, 03 Sep 2012 06:00:37 -0700 (PDT) Received: from localhost.localdomain (p4038-ipngn701hodogaya.kanagawa.ocn.ne.jp. [114.158.195.38]) by mx.google.com with ESMTPS id uu6sm9884078pbc.70.2012.09.03.06.00.36 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Sep 2012 06:00:37 -0700 (PDT) From: Akinobu Mita To: linux-mtd@lists.infradead.org Subject: [PATCH v3 11/11] mtd: mtd_nandecctest: add double bit error detection tests Date: Mon, 3 Sep 2012 22:00:06 +0900 Message-Id: <1346677206-13621-12-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1346677206-13621-1-git-send-email-akinobu.mita@gmail.com> References: <1346677206-13621-1-git-send-email-akinobu.mita@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (akinobu.mita[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Artem Bityutskiy , David Woodhouse , Akinobu Mita X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This adds the double bit error detection test cases listed below: * Prepare data block with double bit error and ECC data without corruption, and verify that the uncorrectable error is detected by __nand_correct_data(). * Prepare data block with single bit error and ECC data with single bit error, and verify that the uncorrectable error is detected. * Prepare data block without corruption and ECC data with double bit error, and verify that the uncorrectable error is detected. Signed-off-by: Akinobu Mita Cc: David Woodhouse Cc: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy --- No changes from previous version drivers/mtd/tests/mtd_nandecctest.c | 80 +++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c index 77ba479..b2c95c7 100644 --- a/drivers/mtd/tests/mtd_nandecctest.c +++ b/drivers/mtd/tests/mtd_nandecctest.c @@ -33,6 +33,22 @@ static void single_bit_error_data(void *error_data, void *correct_data, __change_bit_le(offset, error_data); } +static void double_bit_error_data(void *error_data, void *correct_data, + size_t size) +{ + unsigned int offset[2]; + + offset[0] = random32() % (size * BITS_PER_BYTE); + do { + offset[1] = random32() % (size * BITS_PER_BYTE); + } while (offset[0] == offset[1]); + + memcpy(error_data, correct_data, size); + + __change_bit_le(offset[0], error_data); + __change_bit_le(offset[1], error_data); +} + static unsigned int random_ecc_bit(size_t size) { unsigned int offset = random32() % (3 * BITS_PER_BYTE); @@ -58,6 +74,21 @@ static void single_bit_error_ecc(void *error_ecc, void *correct_ecc, __change_bit_le(offset, error_ecc); } +static void double_bit_error_ecc(void *error_ecc, void *correct_ecc, + size_t size) +{ + unsigned int offset[2]; + + offset[0] = random_ecc_bit(size); + do { + offset[1] = random_ecc_bit(size); + } while (offset[0] == offset[1]); + + memcpy(error_ecc, correct_ecc, 3); + __change_bit_le(offset[0], error_ecc); + __change_bit_le(offset[1], error_ecc); +} + static void no_bit_error(void *error_data, void *error_ecc, void *correct_data, void *correct_ecc, const size_t size) { @@ -107,6 +138,40 @@ static int single_bit_error_correct(void *error_data, void *error_ecc, return -EINVAL; } +static void double_bit_error_in_data(void *error_data, void *error_ecc, + void *correct_data, void *correct_ecc, const size_t size) +{ + double_bit_error_data(error_data, correct_data, size); + memcpy(error_ecc, correct_ecc, 3); +} + +static void single_bit_error_in_data_and_ecc(void *error_data, void *error_ecc, + void *correct_data, void *correct_ecc, const size_t size) +{ + single_bit_error_data(error_data, correct_data, size); + single_bit_error_ecc(error_ecc, correct_ecc, size); +} + +static void double_bit_error_in_ecc(void *error_data, void *error_ecc, + void *correct_data, void *correct_ecc, const size_t size) +{ + memcpy(error_data, correct_data, size); + double_bit_error_ecc(error_ecc, correct_ecc, size); +} + +static int double_bit_error_detect(void *error_data, void *error_ecc, + void *correct_data, const size_t size) + +{ + unsigned char calc_ecc[3]; + int ret; + + __nand_calculate_ecc(error_data, size, calc_ecc); + ret = __nand_correct_data(error_data, calc_ecc, error_ecc, size); + + return (ret == -1) ? 0 : -EINVAL; +} + static const struct nand_ecc_test nand_ecc_test[] = { { .name = "no-bit-error", @@ -123,6 +188,21 @@ static const struct nand_ecc_test nand_ecc_test[] = { .prepare = single_bit_error_in_ecc, .verify = single_bit_error_correct, }, + { + .name = "double-bit-error-in-data-detect", + .prepare = double_bit_error_in_data, + .verify = double_bit_error_detect, + }, + { + .name = "single-bit-error-in-data-and-ecc-detect", + .prepare = single_bit_error_in_data_and_ecc, + .verify = double_bit_error_detect, + }, + { + .name = "double-bit-error-in-ecc-detect", + .prepare = double_bit_error_in_ecc, + .verify = double_bit_error_detect, + }, }; static void dump_data_ecc(void *error_data, void *error_ecc, void *correct_data,