From patchwork Mon Sep 3 13:00:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 181363 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 CF1A72C0094 for ; Mon, 3 Sep 2012 23:03:01 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T8WHx-00084t-LT; Mon, 03 Sep 2012 13:02:02 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T8WGa-0007Dw-LP for linux-mtd@lists.infradead.org; Mon, 03 Sep 2012 13:00:37 +0000 Received: by mail-pz0-f49.google.com with SMTP id q27so3778279daj.36 for ; Mon, 03 Sep 2012 06:00:36 -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=tMjCtEikYuEKLE8gLaIFS3nruBdOoNgJeunDd5bJ99w=; b=ytfXkzmwjN0Kubfmf9+UAx2I/Ir8gEdvCqdei97Lg3SnxrEVV9iSI7aGzF43OeEPnf 7XZbS46C2ZTIuWXUVW6TVvAPxNZ7SgJVhe2C+ntJOMKcEuEBnZMjf3MrgeOKj5A3KHIN kCJs0UxROovzIA5UJoYRUwWwp6r4R5cSYmKdjZg0gN5zdUVLRXQp7L6a9kQa5EvbLdfY 1LnmO4p18ZgTvdcHef+MOmg1jLtLRNqKNSk62aUuFkgZWq2EDaxPWmkidSoBkM1JHWNt 30d2x+eWahQKGeZwp2wjdGNwF+qDd/6jOLpDzGgNdrrypCRsm2uQ7xkNxe4cgaQ1wSRZ S00w== Received: by 10.68.132.194 with SMTP id ow2mr37812936pbb.36.1346677236367; Mon, 03 Sep 2012 06:00:36 -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.35 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Sep 2012 06:00:36 -0700 (PDT) From: Akinobu Mita To: linux-mtd@lists.infradead.org Subject: [PATCH v3 10/11] mtd: mtd_nandecctest: add single bit error correction test Date: Mon, 3 Sep 2012 22:00:05 +0900 Message-Id: <1346677206-13621-11-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.210.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 single bit error correction test case listed below: Prepare data block without corruption and ECC data with single bit error, and verify that the data block is preserved by __nand_correct_data(). 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 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c index 1d1af09..77ba479 100644 --- a/drivers/mtd/tests/mtd_nandecctest.c +++ b/drivers/mtd/tests/mtd_nandecctest.c @@ -33,6 +33,31 @@ static void single_bit_error_data(void *error_data, void *correct_data, __change_bit_le(offset, error_data); } +static unsigned int random_ecc_bit(size_t size) +{ + unsigned int offset = random32() % (3 * BITS_PER_BYTE); + + if (size == 256) { + /* + * Don't inject a bit error into the insignificant bits (16th + * and 17th bit) in ECC code for 256 byte data block + */ + while (offset == 16 || offset == 17) + offset = random32() % (3 * BITS_PER_BYTE); + } + + return offset; +} + +static void single_bit_error_ecc(void *error_ecc, void *correct_ecc, + size_t size) +{ + unsigned int offset = random_ecc_bit(size); + + memcpy(error_ecc, correct_ecc, 3); + __change_bit_le(offset, error_ecc); +} + static void no_bit_error(void *error_data, void *error_ecc, void *correct_data, void *correct_ecc, const size_t size) { @@ -61,6 +86,13 @@ static void single_bit_error_in_data(void *error_data, void *error_ecc, memcpy(error_ecc, correct_ecc, 3); } +static void single_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); + single_bit_error_ecc(error_ecc, correct_ecc, size); +} + static int single_bit_error_correct(void *error_data, void *error_ecc, void *correct_data, const size_t size) { @@ -86,6 +118,11 @@ static const struct nand_ecc_test nand_ecc_test[] = { .prepare = single_bit_error_in_data, .verify = single_bit_error_correct, }, + { + .name = "single-bit-error-in-ecc-correct", + .prepare = single_bit_error_in_ecc, + .verify = single_bit_error_correct, + }, }; static void dump_data_ecc(void *error_data, void *error_ecc, void *correct_data,