linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
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 05/10] mtd: sh_flctl: Fix hardware ECC behaviour
Date: Wed,  2 May 2012 11:41:45 +0200	[thread overview]
Message-ID: <1335951710-9390-6-git-send-email-hechtb@gmail.com> (raw)
In-Reply-To: <1335951710-9390-1-git-send-email-hechtb@gmail.com>

The flctl uses 10 bytes ECC data for every 512 bytes sector. This patch
makes the controller write all 40 bytes instead of 10 bytes only.

Signed-off-by: Bastian Hecht <hechtb@gmail.com>
---
 drivers/mtd/nand/sh_flctl.c |   30 +++++++-----------------------
 1 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index dda34a2..c8e58bb 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -427,30 +427,20 @@ static void execmd_read_page_sector(struct mtd_info *mtd, int page_addr)
 static void execmd_read_oob(struct mtd_info *mtd, int page_addr)
 {
 	struct sh_flctl *flctl = mtd_to_flctl(mtd);
+	int page_sectors = flctl->page_size ? 4 : 1;
+	int i;
 
 	set_cmd_regs(mtd, NAND_CMD_READ0,
 		(NAND_CMD_READSTART << 8) | NAND_CMD_READ0);
 
 	empty_fifo(flctl);
-	if (flctl->page_size) {
-		int i;
-		/* In case that the page size is 2k */
-		for (i = 0; i < 16 * 3; i++)
-			flctl->done_buff[i] = 0xFF;
-
-		set_addr(mtd, 3 * 528 + 512, page_addr);
-		writel(16, FLDTCNTR(flctl));
 
-		start_translation(flctl);
-		read_fiforeg(flctl, 16, 16 * 3);
-		wait_completion(flctl);
-	} else {
-		/* In case that the page size is 512b */
-		set_addr(mtd, 512, page_addr);
+	for (i = 0; i < page_sectors; i++) {
+		set_addr(mtd, (512 + 16) * i + 512 , page_addr);
 		writel(16, FLDTCNTR(flctl));
 
 		start_translation(flctl);
-		read_fiforeg(flctl, 16, 0);
+		read_fiforeg(flctl, 16, 16 * i);
 		wait_completion(flctl);
 	}
 }
@@ -495,18 +485,12 @@ static void execmd_write_oob(struct mtd_info *mtd)
 	int page_addr = flctl->seqin_page_addr;
 	int sector, page_sectors;
 
-	if (flctl->page_size) {
-		sector = 3;
-		page_sectors = 4;
-	} else {
-		sector = 0;
-		page_sectors = 1;
-	}
+	page_sectors = flctl->page_size ? 4 : 1;
 
 	set_cmd_regs(mtd, NAND_CMD_PAGEPROG,
 			(NAND_CMD_PAGEPROG << 8) | NAND_CMD_SEQIN);
 
-	for (; sector < page_sectors; sector++) {
+	for (sector = 0; sector < page_sectors; sector++) {
 		empty_fifo(flctl);
 		set_addr(mtd, sector * 528 + 512, page_addr);
 		writel(16, FLDTCNTR(flctl));	/* set read size */
-- 
1.7.5.4

  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 ` [PATCH v3 04/10] mtd: sh_flctl: Use different OOB layout Bastian Hecht
2012-05-02  9:41 ` Bastian Hecht [this message]
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-6-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).