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 09/10] mtd: sh_flctl: Use user oob data in hardware ECC mode Date: Wed, 02 May 2012 09:41:49 +0000 [thread overview] Message-ID: <1335951710-9390-10-git-send-email-hechtb@gmail.com> (raw) In-Reply-To: <1335951710-9390-1-git-send-email-hechtb@gmail.com> In hardware ecc mode, the flctl now writes and reads the oob data provided by the user. Additionally the ECC is now returned in normal page reads, not only when using the explicit NAND_CMD_READOOB command. Signed-off-by: Bastian Hecht <hechtb@gmail.com> Acked-by: Brian Norris <computersforpeace@gmail.com> --- drivers/mtd/nand/sh_flctl.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index 95bf636..1b1dd7a 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c @@ -312,6 +312,19 @@ static void write_fiforeg(struct sh_flctl *flctl, int rlen, int offset) } } +static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen, int offset) +{ + int i, len_4align; + unsigned long *data = (unsigned long *)&flctl->done_buff[offset]; + void *fifo_addr = (void *)FLECFIFO(flctl); + + len_4align = (rlen + 3) / 4; + for (i = 0; i < len_4align; i++) { + wait_wecfifo_ready(flctl); + writel(cpu_to_be32(data[i]), fifo_addr); + } +} + static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_val) { struct sh_flctl *flctl = mtd_to_flctl(mtd); @@ -378,6 +391,7 @@ static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, uint8_t *buf, int page) { chip->read_buf(mtd, buf, mtd->writesize); + chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); return 0; } @@ -385,6 +399,7 @@ static void flctl_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, const uint8_t *buf) { chip->write_buf(mtd, buf, mtd->writesize); + chip->write_buf(mtd, chip->oob_poi, mtd->oobsize); } static void execmd_read_page_sector(struct mtd_info *mtd, int page_addr) @@ -470,7 +485,7 @@ static void execmd_read_oob(struct mtd_info *mtd, int page_addr) static void execmd_write_page_sector(struct mtd_info *mtd) { struct sh_flctl *flctl = mtd_to_flctl(mtd); - int i, page_addr = flctl->seqin_page_addr; + int page_addr = flctl->seqin_page_addr; int sector, page_sectors; page_sectors = flctl->page_size ? 4 : 1; @@ -486,11 +501,7 @@ static void execmd_write_page_sector(struct mtd_info *mtd) 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)); - } + write_ec_fiforeg(flctl, 16, mtd->writesize + 16 * sector); } wait_completion(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: 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 09/10] mtd: sh_flctl: Use user oob data in hardware ECC mode Date: Wed, 2 May 2012 11:41:49 +0200 [thread overview] Message-ID: <1335951710-9390-10-git-send-email-hechtb@gmail.com> (raw) In-Reply-To: <1335951710-9390-1-git-send-email-hechtb@gmail.com> In hardware ecc mode, the flctl now writes and reads the oob data provided by the user. Additionally the ECC is now returned in normal page reads, not only when using the explicit NAND_CMD_READOOB command. Signed-off-by: Bastian Hecht <hechtb@gmail.com> Acked-by: Brian Norris <computersforpeace@gmail.com> --- drivers/mtd/nand/sh_flctl.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index 95bf636..1b1dd7a 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c @@ -312,6 +312,19 @@ static void write_fiforeg(struct sh_flctl *flctl, int rlen, int offset) } } +static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen, int offset) +{ + int i, len_4align; + unsigned long *data = (unsigned long *)&flctl->done_buff[offset]; + void *fifo_addr = (void *)FLECFIFO(flctl); + + len_4align = (rlen + 3) / 4; + for (i = 0; i < len_4align; i++) { + wait_wecfifo_ready(flctl); + writel(cpu_to_be32(data[i]), fifo_addr); + } +} + static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_val) { struct sh_flctl *flctl = mtd_to_flctl(mtd); @@ -378,6 +391,7 @@ static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, uint8_t *buf, int page) { chip->read_buf(mtd, buf, mtd->writesize); + chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); return 0; } @@ -385,6 +399,7 @@ static void flctl_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, const uint8_t *buf) { chip->write_buf(mtd, buf, mtd->writesize); + chip->write_buf(mtd, chip->oob_poi, mtd->oobsize); } static void execmd_read_page_sector(struct mtd_info *mtd, int page_addr) @@ -470,7 +485,7 @@ static void execmd_read_oob(struct mtd_info *mtd, int page_addr) static void execmd_write_page_sector(struct mtd_info *mtd) { struct sh_flctl *flctl = mtd_to_flctl(mtd); - int i, page_addr = flctl->seqin_page_addr; + int page_addr = flctl->seqin_page_addr; int sector, page_sectors; page_sectors = flctl->page_size ? 4 : 1; @@ -486,11 +501,7 @@ static void execmd_write_page_sector(struct mtd_info *mtd) 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)); - } + write_ec_fiforeg(flctl, 16, mtd->writesize + 16 * sector); } wait_completion(flctl); -- 1.7.5.4
next prev parent reply other threads:[~2012-05-02 9:41 UTC|newest] Thread overview: 55+ 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 ` Bastian Hecht 2012-05-02 9:41 ` [PATCH v3 01/10] mtd: sh_flctl: Add missing iounmap() Bastian Hecht 2012-05-02 9:41 ` Bastian Hecht 2012-05-02 9:41 ` [PATCH v3 02/10] ARM: sh-mobile: mackerel: Add error IRQ resource Bastian Hecht 2012-05-02 9:41 ` Bastian Hecht 2012-05-02 20:49 ` Rafael J. Wysocki 2012-05-02 20:49 ` Rafael J. Wysocki 2012-05-02 21:03 ` Magnus Damm 2012-05-02 21:03 ` Magnus Damm 2012-05-03 6:00 ` Artem Bityutskiy 2012-05-03 6:00 ` Artem Bityutskiy 2012-05-03 6:01 ` 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 10:05 ` Artem Bityutskiy 2012-05-03 13:31 ` Rafael J. Wysocki 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 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 2012-05-02 9:41 ` [PATCH v3 05/10] mtd: sh_flctl: Fix hardware ECC behaviour Bastian Hecht 2012-05-02 9:41 ` 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 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 ` 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 ` Bastian Hecht 2012-05-02 9:41 ` Bastian Hecht [this message] 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 9:41 ` Bastian Hecht 2012-05-02 10:38 ` [PATCH v3 0/10] sh_flctl hardware ECC mode cleanup Artem Bityutskiy 2012-05-02 10:38 ` Artem Bityutskiy 2012-05-02 11:51 ` Bastian Hecht 2012-05-02 11:51 ` Bastian Hecht 2012-05-02 12:02 ` Artem Bityutskiy 2012-05-02 12:02 ` Artem Bityutskiy 2012-05-02 13:41 ` Bastian Hecht 2012-05-02 13:41 ` Bastian Hecht 2012-05-02 13:55 ` Artem Bityutskiy 2012-05-02 13:55 ` Artem Bityutskiy 2012-05-02 14:00 ` Bastian Hecht 2012-05-02 14:00 ` Bastian Hecht 2012-05-02 14:08 ` Artem Bityutskiy 2012-05-02 14:08 ` Artem Bityutskiy 2012-05-02 14:40 ` Bastian Hecht 2012-05-02 14:40 ` Bastian Hecht 2012-05-02 14:46 ` Bastian Hecht 2012-05-02 14:46 ` Bastian Hecht 2012-05-02 14:51 ` Artem Bityutskiy 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-10-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: linkBe 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.