From: Bastian Hecht <hechtb@googlemail.com>
To: linux-mtd@lists.infradead.org, linux-sh@vger.kernel.org
Cc: Brian Norris <computersforpeace@gmail.com>,
Magnus Damm <magnus.damm@gmail.com>,
Laurent Pichart <laurent.pinchart@ideasonboard.com>,
Artem Bityutskiy <dedekind1@gmail.com>
Subject: [PATCH v3 04/10] mtd: sh_flctl: Use different OOB layout
Date: Wed, 2 May 2012 11:41:44 +0200 [thread overview]
Message-ID: <1335951710-9390-5-git-send-email-hechtb@gmail.com> (raw)
In-Reply-To: <1335951710-9390-1-git-send-email-hechtb@gmail.com>
The flctl hardware has changed and a new OOB layout must be adapted for
2k page size NAND chips when using hardware ECC.
The related bit fields ECCPOS[0-2] are gone - the bits are marked as
reserved now in the datasheet. As there are no official users of the
hardware ECC so far, they are completely removed.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
---
drivers/mtd/nand/sh_flctl.c | 18 ++++++++++++------
include/linux/mtd/sh_flctl.h | 4 ----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index dd00853..dda34a2 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -44,11 +44,17 @@ static struct nand_ecclayout flctl_4secc_oob_16 = {
};
static struct nand_ecclayout flctl_4secc_oob_64 = {
- .eccbytes = 10,
- .eccpos = {48, 49, 50, 51, 52, 53, 54, 55, 56, 57},
+ .eccbytes = 4 * 10,
+ .eccpos = {
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 },
.oobfree = {
- {.offset = 60,
- . length = 4} },
+ {.offset = 2, .length = 4},
+ {.offset = 16, .length = 6},
+ {.offset = 32, .length = 6},
+ {.offset = 48, .length = 6} },
};
static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
@@ -62,7 +68,7 @@ static struct nand_bbt_descr flctl_4secc_smallpage = {
static struct nand_bbt_descr flctl_4secc_largepage = {
.options = NAND_BBT_SCAN2NDPAGE,
- .offs = 58,
+ .offs = 0,
.len = 2,
.pattern = scan_ff_pattern,
};
@@ -831,7 +837,7 @@ static int flctl_chip_init_tail(struct mtd_info *mtd)
chip->ecc.mode = NAND_ECC_HW;
/* 4 symbols ECC enabled */
- flctl->flcmncr_base |= _4ECCEN | ECCPOS2 | ECCPOS_02;
+ flctl->flcmncr_base |= _4ECCEN;
} else {
chip->ecc.mode = NAND_ECC_SOFT;
}
diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 2daa43e..3feaae0 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -49,7 +49,6 @@
#define FLERRADR(f) (f->reg + 0x98)
/* FLCMNCR control bits */
-#define ECCPOS2 (0x1 << 25)
#define _4ECCCNTEN (0x1 << 24)
#define _4ECCEN (0x1 << 23)
#define _4ECCCORRECT (0x1 << 22)
@@ -59,9 +58,6 @@
#define QTSEL_E (0x1 << 17)
#define ENDIAN (0x1 << 16) /* 1 = little endian */
#define FCKSEL_E (0x1 << 15)
-#define ECCPOS_00 (0x00 << 12)
-#define ECCPOS_01 (0x01 << 12)
-#define ECCPOS_02 (0x02 << 12)
#define ACM_SACCES_MODE (0x01 << 10)
#define NANWF_E (0x1 << 9)
#define SE_D (0x1 << 8) /* Spare area disable */
--
1.7.5.4
next prev parent reply other threads:[~2012-05-02 9:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 9:41 [PATCH v3 0/10] sh_flctl hardware ECC mode cleanup Bastian Hecht
2012-05-02 9:41 ` [PATCH v3 01/10] mtd: sh_flctl: Add missing iounmap() Bastian Hecht
2012-05-02 9:41 ` [PATCH v3 02/10] ARM: sh-mobile: mackerel: Add error IRQ resource Bastian Hecht
2012-05-02 20:49 ` Rafael J. Wysocki
2012-05-02 21:03 ` Magnus Damm
2012-05-03 6:00 ` Artem Bityutskiy
2012-05-03 6:01 ` Artem Bityutskiy
2012-05-03 9:29 ` Bastian Hecht
2012-05-03 10:05 ` Artem Bityutskiy
2012-05-03 13:31 ` Rafael J. Wysocki
2012-05-02 9:41 ` [PATCH v3 03/10] mtd: sh_flctl: Add support for error IRQ Bastian Hecht
2012-05-02 9:41 ` Bastian Hecht [this message]
2012-05-02 9:41 ` [PATCH v3 05/10] mtd: sh_flctl: Fix hardware ECC behaviour Bastian Hecht
2012-05-02 9:41 ` [PATCH v3 06/10] mtd: sh_flctl: Simplify the hardware ecc page read/write Bastian Hecht
2012-05-02 9:41 ` [PATCH v3 07/10] mtd: sh_flctl: Group sector accesses into a single transfer Bastian Hecht
2012-05-02 9:41 ` [PATCH v3 08/10] mtd: sh_flctl: Restructure the hardware ECC handling Bastian Hecht
2012-05-02 9:41 ` [PATCH v3 09/10] mtd: sh_flctl: Use user oob data in hardware ECC mode Bastian Hecht
2012-05-02 9:41 ` [PATCH v3 10/10] ARM: sh-mobile: mackerel: Use hardware error correction Bastian Hecht
2012-05-02 10:38 ` [PATCH v3 0/10] sh_flctl hardware ECC mode cleanup Artem Bityutskiy
2012-05-02 11:51 ` Bastian Hecht
2012-05-02 12:02 ` Artem Bityutskiy
2012-05-02 13:41 ` Bastian Hecht
2012-05-02 13:55 ` Artem Bityutskiy
2012-05-02 14:00 ` Bastian Hecht
2012-05-02 14:08 ` Artem Bityutskiy
2012-05-02 14:40 ` Bastian Hecht
2012-05-02 14:46 ` Bastian Hecht
2012-05-02 14:51 ` Artem Bityutskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335951710-9390-5-git-send-email-hechtb@gmail.com \
--to=hechtb@googlemail.com \
--cc=computersforpeace@gmail.com \
--cc=dedekind1@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).