From patchwork Sun Aug 26 12:06:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 180048 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 1BCAA2C00E7 for ; Sun, 26 Aug 2012 22:08:35 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T5bdB-00084U-My; Sun, 26 Aug 2012 12:07:53 +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 1T5bcp-0007yA-Pi for linux-mtd@lists.infradead.org; Sun, 26 Aug 2012 12:07:32 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so6170319pbb.36 for ; Sun, 26 Aug 2012 05:07:31 -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=zDbBhtSbkmK5UFpcpfXkRqEUVI6d5a0YfJMoZmjIxG0=; b=UkuB46olrHYsba88AKzF1i4KwU1Ub3qYeXPsq9gYx5OGuvL6I2SxwBbCaCYEC/B/YJ Eko4DWoVm7XWWVL63iT0rik+GNFcRSRnRbHniUimFxd4YVMAlHyGg64l/90yY9v9qioU uz5veXiou4kBCdXu3/OOxJNRo7BWzjLd8q+DMCd8G/V9QS1gVDCnMJoydR/DMaDAXQN3 JObPbi8JQ7q4WswbFFAfQgjOyAFyYwrtWXBCYWz3O0u96iaDBrbcMgl9kqc1I6SnKcl6 tswH4430/WQJLeTjU/tAVgzn3xUcVtNN9K4B7CaTAStjM2lBiazlfAB7CN2U3/2hRIzL wJBw== Received: by 10.66.74.3 with SMTP id p3mr23066331pav.49.1345982851546; Sun, 26 Aug 2012 05:07:31 -0700 (PDT) Received: from localhost.localdomain (p4038-ipngn701hodogaya.kanagawa.ocn.ne.jp. [114.158.195.38]) by mx.google.com with ESMTPS id uj3sm12422743pbc.39.2012.08.26.05.07.30 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 26 Aug 2012 05:07:31 -0700 (PDT) From: Akinobu Mita To: linux-mtd@lists.infradead.org Subject: [PATCH v2 5/6] mtd: mtd_nandecctest: add single bit error correction test Date: Sun, 26 Aug 2012 21:06:47 +0900 Message-Id: <1345982808-11440-6-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1345982808-11440-1-git-send-email-akinobu.mita@gmail.com> References: <1345982808-11440-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 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 --- 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 49d6673..d7d7983 100644 --- a/drivers/mtd/tests/mtd_nandecctest.c +++ b/drivers/mtd/tests/mtd_nandecctest.c @@ -34,6 +34,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) { @@ -62,6 +87,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) { @@ -87,6 +119,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,