From: Bastian Hecht <hechtb@googlemail.com>
To: linux-mtd@lists.infradead.org, linux-sh@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>,
Laurent Pichart <laurent.pinchart@ideasonboard.com>
Subject: [PATCH 3/9] mtd: sh_flctl: Use different OOB layout
Date: Fri, 20 Apr 2012 11:13:44 +0200 [thread overview]
Message-ID: <1334913230-23615-4-git-send-email-hechtb@gmail.com> (raw)
In-Reply-To: <1334913230-23615-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 | 20 +++++++++++++-------
include/linux/mtd/sh_flctl.h | 4 ----
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 3c27921..411d783 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},
- .oobfree = {
- {.offset = 60,
- . length = 4} },
+ .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 = 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 6832a90..91c5b01 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
WARNING: multiple messages have this Message-ID (diff)
From: Bastian Hecht <hechtb@googlemail.com>
To: linux-mtd@lists.infradead.org, linux-sh@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>,
Laurent Pichart <laurent.pinchart@ideasonboard.com>
Subject: [PATCH 3/9] mtd: sh_flctl: Use different OOB layout
Date: Fri, 20 Apr 2012 09:13:44 +0000 [thread overview]
Message-ID: <1334913230-23615-4-git-send-email-hechtb@gmail.com> (raw)
In-Reply-To: <1334913230-23615-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 | 20 +++++++++++++-------
include/linux/mtd/sh_flctl.h | 4 ----
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 3c27921..411d783 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},
- .oobfree = {
- {.offset = 60,
- . length = 4} },
+ .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 = 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 6832a90..91c5b01 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-04-20 9:14 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 9:13 [PATCH 0/9] sh_flctl hardware ECC mode cleanup Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 1/9] mtd: sh_flctl: Add support for error IRQ Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-21 14:29 ` Laurent Pinchart
2012-04-21 14:29 ` Laurent Pinchart
2012-04-23 8:41 ` Bastian Hecht
2012-04-23 8:41 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 2/9] ARM: sh-mobile: mackerel: Add error IRQ resource Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-21 14:30 ` Laurent Pinchart
2012-04-21 14:30 ` Laurent Pinchart
2012-04-23 8:43 ` Bastian Hecht
2012-04-23 8:43 ` Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht [this message]
2012-04-20 9:13 ` [PATCH 3/9] mtd: sh_flctl: Use different OOB layout Bastian Hecht
2012-04-21 14:41 ` Laurent Pinchart
2012-04-21 14:41 ` Laurent Pinchart
2012-04-23 8:51 ` Bastian Hecht
2012-04-23 8:51 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 4/9] mtd: sh_flctl: Fix hardware ECC behaviour Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 5/9] mtd: sh_flctl: Simplify the hardware ecc page read/write Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 6/9] mtd: sh_flctl: Group sector accesses into a single transfer Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 7/9] mtd: sh_flctl: Restructure the hardware ECC handling Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 8/9] mtd: sh_flctl: Use user oob data in hardware ECC mode Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
2012-04-21 15:00 ` Laurent Pinchart
2012-04-21 15:00 ` Laurent Pinchart
2012-04-23 9:05 ` Bastian Hecht
2012-04-23 9:05 ` Bastian Hecht
2012-04-23 9:36 ` Bastian Hecht
2012-04-23 9:36 ` Bastian Hecht
2012-04-24 9:33 ` Laurent Pinchart
2012-04-24 9:33 ` Laurent Pinchart
2012-04-25 4:01 ` Brian Norris
2012-04-25 4:01 ` Brian Norris
2012-04-25 13:26 ` Bastian Hecht
2012-04-25 13:26 ` Bastian Hecht
2012-04-20 9:13 ` [PATCH 9/9] ARM: sh-mobile: mackerel: Use hardware error correction Bastian Hecht
2012-04-20 9:13 ` Bastian Hecht
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=1334913230-23615-4-git-send-email-hechtb@gmail.com \
--to=hechtb@googlemail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.