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 07/10] mtd: sh_flctl: Group sector accesses into a single transfer
Date: Wed, 2 May 2012 11:41:47 +0200 [thread overview]
Message-ID: <1335951710-9390-8-git-send-email-hechtb@gmail.com> (raw)
In-Reply-To: <1335951710-9390-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 b027370..96c88b8 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-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 ` [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 ` Bastian Hecht [this message]
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-8-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).