* [PATCH 05/29] pxa3xx_nand: set oob length in the runtime
@ 2010-06-22 13:01 Lei Wen
0 siblings, 0 replies; 3+ messages in thread
From: Lei Wen @ 2010-06-22 13:01 UTC (permalink / raw)
To: linux-arm-kernel
For different command need different oob requirement, set the proper
oob length by different cmd.
Signed-off-by: Lei Wen <leiwen@marvell.com>
---
drivers/mtd/nand/pxa3xx_nand.c | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 50e08db..26c0286 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -274,13 +274,20 @@ static int wait_for_event(struct
pxa3xx_nand_info *info, uint32_t event)
static void pxa3xx_set_datasize(struct pxa3xx_nand_info *info)
{
- /* calculate data size */
+ int oob_enable = info->reg_ndcr & NDCR_SPARE_EN;
+
+ info->data_size = info->page_size;
+ if (!oob_enable) {
+ info->oob_size = 0;
+ return;
+ }
+
switch (info->page_size) {
case 2048:
- info->data_size = (info->use_ecc) ? 2088 : 2112;
+ info->oob_size = (info->use_ecc) ? 40 : 64;
break;
case 512:
- info->data_size = (info->use_ecc) ? 520 : 528;
+ info->oob_size = (info->use_ecc) ? 8 : 16;
break;
}
}
@@ -334,6 +341,7 @@ static int prepare_other_cmd(struct
pxa3xx_nand_info *info, uint16_t cmd)
info->ndcb1 = 0;
info->ndcb2 = 0;
+ info->oob_size = 0;
if (cmd == cmdset->read_id) {
info->ndcb0 |= NDCB0_CMD_TYPE(3);
info->data_size = 8;
@@ -402,6 +410,9 @@ static int handle_data_pio(struct pxa3xx_nand_info *info)
case STATE_PIO_WRITING:
__raw_writesl(info->mmio_base + NDDB, info->data_buff,
DIV_ROUND_UP(info->data_size, 4));
+ if (info->oob_size > 0)
+ __raw_writesl(info->mmio_base + NDDB, info->oob_buff,
+ DIV_ROUND_UP(info->oob_size, 4));
enable_int(info, NDSR_CS0_BBD | NDSR_CS0_CMDD);
@@ -414,6 +425,9 @@ static int handle_data_pio(struct pxa3xx_nand_info *info)
case STATE_PIO_READING:
__raw_readsl(info->mmio_base + NDDB, info->data_buff,
DIV_ROUND_UP(info->data_size, 4));
+ if (info->oob_size > 0)
+ __raw_readsl(info->mmio_base + NDDB, info->oob_buff,
+ DIV_ROUND_UP(info->oob_size, 4));
break;
default:
@@ -429,7 +443,7 @@ static int handle_data_pio(struct pxa3xx_nand_info *info)
static void start_data_dma(struct pxa3xx_nand_info *info, int dir_out)
{
struct pxa_dma_desc *desc = info->data_desc;
- int dma_len = ALIGN(info->data_size, 32);
+ int dma_len = ALIGN(info->data_size + info->oob_size, 32);
desc->ddadr = DDADR_STOP;
desc->dcmd = DCMD_ENDIRQEN | DCMD_WIDTH4 | DCMD_BURST32 | dma_len;
@@ -835,7 +849,6 @@ static int pxa3xx_nand_config_flash(struct
pxa3xx_nand_info *info,
info->cmdset = f->cmdset;
info->page_size = f->page_size;
info->oob_buff = info->data_buff + f->page_size;
- info->oob_size = (f->page_size == 2048) ? 64 : 16;
info->read_id_bytes = (f->page_size == 2048) ? 4 : 2;
/* calculate addressing information */
@@ -894,8 +907,6 @@ static int pxa3xx_nand_detect_config(struct
pxa3xx_nand_info *info)
i = __ffs(page_per_block * info->page_size);
num_blocks = type->chipsize << (20 - i);
- info->oob_size = (info->page_size == 2048) ? 64 : 16;
-
/* calculate addressing information */
info->col_addr_cycles = (info->page_size == 2048) ? 2 : 1;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 05/29] pxa3xx_nand: set oob length in the runtime
@ 2010-07-28 5:56 Haojian Zhuang
2010-07-28 6:51 ` Eric Miao
0 siblings, 1 reply; 3+ messages in thread
From: Haojian Zhuang @ 2010-07-28 5:56 UTC (permalink / raw)
To: linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 05/29] pxa3xx_nand: set oob length in the runtime
2010-07-28 5:56 [PATCH 05/29] pxa3xx_nand: set oob length in the runtime Haojian Zhuang
@ 2010-07-28 6:51 ` Eric Miao
0 siblings, 0 replies; 3+ messages in thread
From: Eric Miao @ 2010-07-28 6:51 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 28, 2010 at 1:56 PM, Haojian Zhuang
<haojian.zhuang@gmail.com> wrote:
> From 66073b51eb2431545c581556e42ec1358cf72a70 Mon Sep 17 00:00:00 2001
> From: Lei Wen <leiwen@marvell.com>
> Date: Tue, 22 Jun 2010 21:01:04 +0800
> Subject: [PATCH 05/29] pxa3xx_nand: set oob length in the runtime
>
> For different command need different oob requirement, set the proper
> oob length by different cmd.
>
Looks good.
> Signed-off-by: Lei Wen <leiwen@marvell.com>
> ---
> ?drivers/mtd/nand/pxa3xx_nand.c | ? 25 ++++++++++++++++++-------
> ?1 files changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
> index 50e08db..26c0286 100644
> --- a/drivers/mtd/nand/pxa3xx_nand.c
> +++ b/drivers/mtd/nand/pxa3xx_nand.c
> @@ -274,13 +274,20 @@ static int wait_for_event(struct
> pxa3xx_nand_info *info, uint32_t event)
>
> ?static void pxa3xx_set_datasize(struct pxa3xx_nand_info *info)
> ?{
> - ? ? ? /* calculate data size */
> + ? ? ? int oob_enable = info->reg_ndcr & NDCR_SPARE_EN;
> +
> + ? ? ? info->data_size = info->page_size;
> + ? ? ? if (!oob_enable) {
> + ? ? ? ? ? ? ? info->oob_size = 0;
> + ? ? ? ? ? ? ? return;
> + ? ? ? }
> +
> ? ? ? ?switch (info->page_size) {
> ? ? ? ?case 2048:
> - ? ? ? ? ? ? ? info->data_size = (info->use_ecc) ? 2088 : 2112;
> + ? ? ? ? ? ? ? info->oob_size = (info->use_ecc) ? 40 : 64;
> ? ? ? ? ? ? ? ?break;
> ? ? ? ?case 512:
> - ? ? ? ? ? ? ? info->data_size = (info->use_ecc) ? 520 : 528;
> + ? ? ? ? ? ? ? info->oob_size = (info->use_ecc) ? 8 : 16;
> ? ? ? ? ? ? ? ?break;
> ? ? ? ?}
> ?}
> @@ -334,6 +341,7 @@ static int prepare_other_cmd(struct
> pxa3xx_nand_info *info, uint16_t cmd)
> ? ? ? ?info->ndcb1 = 0;
> ? ? ? ?info->ndcb2 = 0;
>
> + ? ? ? info->oob_size = 0;
> ? ? ? ?if (cmd == cmdset->read_id) {
> ? ? ? ? ? ? ? ?info->ndcb0 |= NDCB0_CMD_TYPE(3);
> ? ? ? ? ? ? ? ?info->data_size = 8;
> @@ -402,6 +410,9 @@ static int handle_data_pio(struct pxa3xx_nand_info *info)
> ? ? ? ?case STATE_PIO_WRITING:
> ? ? ? ? ? ? ? ?__raw_writesl(info->mmio_base + NDDB, info->data_buff,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?DIV_ROUND_UP(info->data_size, 4));
> + ? ? ? ? ? ? ? if (info->oob_size > 0)
> + ? ? ? ? ? ? ? ? ? ? ? __raw_writesl(info->mmio_base + NDDB, info->oob_buff,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? DIV_ROUND_UP(info->oob_size, 4));
>
> ? ? ? ? ? ? ? ?enable_int(info, NDSR_CS0_BBD | NDSR_CS0_CMDD);
>
> @@ -414,6 +425,9 @@ static int handle_data_pio(struct pxa3xx_nand_info *info)
> ? ? ? ?case STATE_PIO_READING:
> ? ? ? ? ? ? ? ?__raw_readsl(info->mmio_base + NDDB, info->data_buff,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?DIV_ROUND_UP(info->data_size, 4));
> + ? ? ? ? ? ? ? if (info->oob_size > 0)
> + ? ? ? ? ? ? ? ? ? ? ? __raw_readsl(info->mmio_base + NDDB, info->oob_buff,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? DIV_ROUND_UP(info->oob_size, 4));
>
> ? ? ? ? ? ? ? ?break;
> ? ? ? ?default:
> @@ -429,7 +443,7 @@ static int handle_data_pio(struct pxa3xx_nand_info *info)
> ?static void start_data_dma(struct pxa3xx_nand_info *info, int dir_out)
> ?{
> ? ? ? ?struct pxa_dma_desc *desc = info->data_desc;
> - ? ? ? int dma_len = ALIGN(info->data_size, 32);
> + ? ? ? int dma_len = ALIGN(info->data_size + info->oob_size, 32);
>
> ? ? ? ?desc->ddadr = DDADR_STOP;
> ? ? ? ?desc->dcmd = DCMD_ENDIRQEN | DCMD_WIDTH4 | DCMD_BURST32 | dma_len;
> @@ -835,7 +849,6 @@ static int pxa3xx_nand_config_flash(struct
> pxa3xx_nand_info *info,
> ? ? ? ?info->cmdset = f->cmdset;
> ? ? ? ?info->page_size = f->page_size;
> ? ? ? ?info->oob_buff = info->data_buff + f->page_size;
> - ? ? ? info->oob_size = (f->page_size == 2048) ? 64 : 16;
> ? ? ? ?info->read_id_bytes = (f->page_size == 2048) ? 4 : 2;
>
> ? ? ? ?/* calculate addressing information */
> @@ -894,8 +907,6 @@ static int pxa3xx_nand_detect_config(struct
> pxa3xx_nand_info *info)
> ? ? ? ?i = __ffs(page_per_block * info->page_size);
> ? ? ? ?num_blocks = type->chipsize << (20 - i);
>
> - ? ? ? info->oob_size = (info->page_size == 2048) ? 64 : 16;
> -
> ? ? ? ?/* calculate addressing information */
> ? ? ? ?info->col_addr_cycles = (info->page_size == 2048) ? 2 : 1;
>
> --
> 1.7.0.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-28 6:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-28 5:56 [PATCH 05/29] pxa3xx_nand: set oob length in the runtime Haojian Zhuang
2010-07-28 6:51 ` Eric Miao
-- strict thread matches above, loose matches on Subject: below --
2010-06-22 13:01 Lei Wen
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).