[PATCH 6/9] mtd: sh_flctl: Group sector accesses into a single transfer

All of lore.kernel.org
 help / color / mirror / Atom feed

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 6/9] mtd: sh_flctl: Group sector accesses into a single transfer
Date: Fri, 20 Apr 2012 11:13:47 +0200	[thread overview]
Message-ID: <1334913230-23615-7-git-send-email-hechtb@gmail.com> (raw)
In-Reply-To: <1334913230-23615-1-git-send-email-hechtb@gmail.com>

When we use hardware ecc, the flctl is run in so-called "sector access
mode". We can bundle 4 sector accesses when using 2k page sizes to read
a whole page at once and speed up things.

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

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 8e56f87..1e5d684 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -368,25 +368,21 @@ static void execmd_read_page_sector(struct mtd_info *mtd, int page_addr)
 	struct sh_flctl *flctl = mtd_to_flctl(mtd);
 	int sector, page_sectors;
 
-	if (flctl->page_size)
-		page_sectors = 4;
-	else
-		page_sectors = 1;
+	page_sectors = flctl->page_size ? 4 : 1;
+
+	set_cmd_regs(mtd, NAND_CMD_READ0,
+		(NAND_CMD_READSTART << 8) | NAND_CMD_READ0);
 
 	writel(readl(FLCMNCR(flctl)) | ACM_SACCES_MODE | _4ECCCORRECT,
 		 FLCMNCR(flctl));
+	writel(readl(FLCMDCR(flctl)) | page_sectors, FLCMDCR(flctl));
+	writel(page_addr << 2, FLADR(flctl));
 
-	set_cmd_regs(mtd, NAND_CMD_READ0,
-		(NAND_CMD_READSTART << 8) | NAND_CMD_READ0);
+	empty_fifo(flctl);
+	start_translation(flctl);
 
 	for (sector = 0; sector < page_sectors; sector++) {
 		int ret;
-
-		empty_fifo(flctl);
-		writel(readl(FLCMDCR(flctl)) | 1, FLCMDCR(flctl));
-		writel(page_addr << 2 | sector, FLADR(flctl));
-
-		start_translation(flctl);
 		read_fiforeg(flctl, 512, 512 * sector);
 
 		ret = read_ecfiforeg(flctl,
@@ -397,8 +393,10 @@ static void execmd_read_page_sector(struct mtd_info *mtd, int page_addr)
 			flctl->hwecc_cant_correct[sector] = 1;
 
 		writel(0x0, FL4ECCCR(flctl));
-		wait_completion(flctl);
 	}
+
+	wait_completion(flctl);
+
 	writel(readl(FLCMNCR(flctl)) & ~(ACM_SACCES_MODE | _4ECCCORRECT),
 			FLCMNCR(flctl));
 }
@@ -430,31 +428,27 @@ static void execmd_write_page_sector(struct mtd_info *mtd)
 	int i, page_addr = flctl->seqin_page_addr;
 	int sector, page_sectors;
 
-	if (flctl->page_size)
-		page_sectors = 4;
-	else
-		page_sectors = 1;
-
-	writel(readl(FLCMNCR(flctl)) | ACM_SACCES_MODE, FLCMNCR(flctl));
+	page_sectors = flctl->page_size ? 4 : 1;
 
 	set_cmd_regs(mtd, NAND_CMD_PAGEPROG,
 			(NAND_CMD_PAGEPROG << 8) | NAND_CMD_SEQIN);
 
-	for (sector = 0; sector < page_sectors; sector++) {
-		empty_fifo(flctl);
-		writel(readl(FLCMDCR(flctl)) | 1, FLCMDCR(flctl));
-		writel(page_addr << 2 | sector, FLADR(flctl));
+	empty_fifo(flctl);
+	writel(readl(FLCMNCR(flctl)) | ACM_SACCES_MODE, FLCMNCR(flctl));
+	writel(readl(FLCMDCR(flctl)) | page_sectors, FLCMDCR(flctl));
+	writel(page_addr << 2, FLADR(flctl));
+	start_translation(flctl);
 
-		start_translation(flctl);
+	for (sector = 0; sector < page_sectors; sector++) {
 		write_fiforeg(flctl, 512, 512 * sector);
 
 		for (i = 0; i < 4; i++) {
 			wait_wecfifo_ready(flctl); /* wait for write ready */
 			writel(0xFFFFFFFF, FLECFIFO(flctl));
 		}
-		wait_completion(flctl);
 	}
 
+	wait_completion(flctl);
 	writel(readl(FLCMNCR(flctl)) & ~ACM_SACCES_MODE, FLCMNCR(flctl));
 }
 
-- 
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 6/9] mtd: sh_flctl: Group sector accesses into a single transfer
Date: Fri, 20 Apr 2012 09:13:47 +0000	[thread overview]
Message-ID: <1334913230-23615-7-git-send-email-hechtb@gmail.com> (raw)
In-Reply-To: <1334913230-23615-1-git-send-email-hechtb@gmail.com>

When we use hardware ecc, the flctl is run in so-called "sector access
mode". We can bundle 4 sector accesses when using 2k page sizes to read
a whole page at once and speed up things.

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

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 8e56f87..1e5d684 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -368,25 +368,21 @@ static void execmd_read_page_sector(struct mtd_info *mtd, int page_addr)
 	struct sh_flctl *flctl = mtd_to_flctl(mtd);
 	int sector, page_sectors;
 
-	if (flctl->page_size)
-		page_sectors = 4;
-	else
-		page_sectors = 1;
+	page_sectors = flctl->page_size ? 4 : 1;
+
+	set_cmd_regs(mtd, NAND_CMD_READ0,
+		(NAND_CMD_READSTART << 8) | NAND_CMD_READ0);
 
 	writel(readl(FLCMNCR(flctl)) | ACM_SACCES_MODE | _4ECCCORRECT,
 		 FLCMNCR(flctl));
+	writel(readl(FLCMDCR(flctl)) | page_sectors, FLCMDCR(flctl));
+	writel(page_addr << 2, FLADR(flctl));
 
-	set_cmd_regs(mtd, NAND_CMD_READ0,
-		(NAND_CMD_READSTART << 8) | NAND_CMD_READ0);
+	empty_fifo(flctl);
+	start_translation(flctl);
 
 	for (sector = 0; sector < page_sectors; sector++) {
 		int ret;
-
-		empty_fifo(flctl);
-		writel(readl(FLCMDCR(flctl)) | 1, FLCMDCR(flctl));
-		writel(page_addr << 2 | sector, FLADR(flctl));
-
-		start_translation(flctl);
 		read_fiforeg(flctl, 512, 512 * sector);
 
 		ret = read_ecfiforeg(flctl,
@@ -397,8 +393,10 @@ static void execmd_read_page_sector(struct mtd_info *mtd, int page_addr)
 			flctl->hwecc_cant_correct[sector] = 1;
 
 		writel(0x0, FL4ECCCR(flctl));
-		wait_completion(flctl);
 	}
+
+	wait_completion(flctl);
+
 	writel(readl(FLCMNCR(flctl)) & ~(ACM_SACCES_MODE | _4ECCCORRECT),
 			FLCMNCR(flctl));
 }
@@ -430,31 +428,27 @@ static void execmd_write_page_sector(struct mtd_info *mtd)
 	int i, page_addr = flctl->seqin_page_addr;
 	int sector, page_sectors;
 
-	if (flctl->page_size)
-		page_sectors = 4;
-	else
-		page_sectors = 1;
-
-	writel(readl(FLCMNCR(flctl)) | ACM_SACCES_MODE, FLCMNCR(flctl));
+	page_sectors = flctl->page_size ? 4 : 1;
 
 	set_cmd_regs(mtd, NAND_CMD_PAGEPROG,
 			(NAND_CMD_PAGEPROG << 8) | NAND_CMD_SEQIN);
 
-	for (sector = 0; sector < page_sectors; sector++) {
-		empty_fifo(flctl);
-		writel(readl(FLCMDCR(flctl)) | 1, FLCMDCR(flctl));
-		writel(page_addr << 2 | sector, FLADR(flctl));
+	empty_fifo(flctl);
+	writel(readl(FLCMNCR(flctl)) | ACM_SACCES_MODE, FLCMNCR(flctl));
+	writel(readl(FLCMDCR(flctl)) | page_sectors, FLCMDCR(flctl));
+	writel(page_addr << 2, FLADR(flctl));
+	start_translation(flctl);
 
-		start_translation(flctl);
+	for (sector = 0; sector < page_sectors; sector++) {
 		write_fiforeg(flctl, 512, 512 * sector);
 
 		for (i = 0; i < 4; i++) {
 			wait_wecfifo_ready(flctl); /* wait for write ready */
 			writel(0xFFFFFFFF, FLECFIFO(flctl));
 		}
-		wait_completion(flctl);
 	}
 
+	wait_completion(flctl);
 	writel(readl(FLCMNCR(flctl)) & ~ACM_SACCES_MODE, FLCMNCR(flctl));
 }
 
-- 
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 ` [PATCH 3/9] mtd: sh_flctl: Use different OOB layout Bastian Hecht
2012-04-20  9:13   ` 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 ` Bastian Hecht [this message]
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 ` [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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8e56f87 dfblob:1e5d684 dfblob:8e56f87 dfblob:1e5d684 )
 OR (
bs:"[PATCH 6/9] mtd: sh_flctl: Group sector accesses into a single transfer" )
	(help)

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-7-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.