Patchwork [v5,5/5] omap: nand: making ecc layout as compatible with romcode ecc

login
register
mail settings
Submitter Sukumar Ghorai
Date Sept. 27, 2010, 1:37 p.m.
Message ID <1285594634-19277-6-git-send-email-s-ghorai@ti.com>
Download mbox | patch
Permalink /patch/65851/
State New
Headers show

Comments

Sukumar Ghorai - Sept. 27, 2010, 1:37 p.m.
This patch overrides nand ecc layout and bad block descriptor (for 8-bit
    device) to support hw ecc in romcode layout. So as to have in sync with ecc
    layout throughout; i.e. x-loader, u-boot and kernel.

    This patch also enables to use romcode ecc for spd and zoom, by default.

    This enables to flash x-loader, u-boot, kernel, FS images from kernel itself
    and compatiable with other tools.

Signed-off-by: Vimal Singh <vimalsingh@ti.com>
Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
---
 drivers/mtd/nand/omap2.c |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)
Sanjeev Premi - Sept. 27, 2010, 1:58 p.m.
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org 
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Sukumar Ghorai
> Sent: Monday, September 27, 2010 7:07 PM
> To: linux-omap@vger.kernel.org
> Cc: linux-mtd@lists.infradead.org; 
> linux-arm-kernel@lists.infradead.org; Ghorai, Sukumar; Vimal Singh
> Subject: [PATCH v5 5/5] omap: nand: making ecc layout as 
> compatible with romcode ecc
> 
>     This patch overrides nand ecc layout and bad block 
> descriptor (for 8-bit
>     device) to support hw ecc in romcode layout. So as to 
> have in sync with ecc
>     layout throughout; i.e. x-loader, u-boot and kernel.
> 
>     This patch also enables to use romcode ecc for spd and 
> zoom, by default.
> 
>     This enables to flash x-loader, u-boot, kernel, FS images 
> from kernel itself
>     and compatiable with other tools.
> 
The description seems to start with different whitespace indents
in this patch series.

~sanjeev

[snip]...[snip]
Sukumar Ghorai - Sept. 27, 2010, 2:02 p.m.
> -----Original Message-----
> From: Premi, Sanjeev
> Sent: Monday, September 27, 2010 7:29 PM
> To: Ghorai, Sukumar; linux-omap@vger.kernel.org
> Cc: linux-mtd@lists.infradead.org; linux-arm-kernel@lists.infradead.org;
> Ghorai, Sukumar; Vimal Singh
> Subject: RE: [PATCH v5 5/5] omap: nand: making ecc layout as compatible
> with romcode ecc
> 
> > -----Original Message-----
> > From: linux-omap-owner@vger.kernel.org
> > [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Sukumar Ghorai
> > Sent: Monday, September 27, 2010 7:07 PM
> > To: linux-omap@vger.kernel.org
> > Cc: linux-mtd@lists.infradead.org;
> > linux-arm-kernel@lists.infradead.org; Ghorai, Sukumar; Vimal Singh
> > Subject: [PATCH v5 5/5] omap: nand: making ecc layout as
> > compatible with romcode ecc
> >
> >     This patch overrides nand ecc layout and bad block
> > descriptor (for 8-bit
> >     device) to support hw ecc in romcode layout. So as to
> > have in sync with ecc
> >     layout throughout; i.e. x-loader, u-boot and kernel.
> >
> >     This patch also enables to use romcode ecc for spd and
> > zoom, by default.
> >
> >     This enables to flash x-loader, u-boot, kernel, FS images
> > from kernel itself
> >     and compatiable with other tools.
> >
> The description seems to start with different whitespace indents
> in this patch series.
> 
[Ghorai] Thanks. I will RESEND.

> ~sanjeev
> 
> [snip]...[snip]

Patch

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 3fd9ee0..9ccfd88 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -128,6 +128,20 @@  const int use_dma;
 const int use_interrupt;
 #endif
 
+/* oob info generated runtime depending on ecc algorithm and layout selected */
+static struct nand_ecclayout omap_oobinfo;
+/* Define some generic bad / good block scan pattern which are used
+ * while scanning a device for factory marked good / bad blocks
+ */
+static uint8_t scan_ff_pattern[] = { 0xff };
+static struct nand_bbt_descr bb_descrip_flashbased = {
+	.options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,
+	.offs = 0,
+	.len = 1,
+	.pattern = scan_ff_pattern,
+};
+
+
 struct omap_nand_info {
 	struct nand_hw_control		controller;
 	struct omap_nand_platform_data	*pdata;
@@ -946,6 +960,7 @@  static int __devinit omap_nand_probe(struct platform_device *pdev)
 	struct omap_nand_info		*info;
 	struct omap_nand_platform_data	*pdata;
 	int				err;
+	int				i, offset;
 
 	pdata = pdev->dev.platform_data;
 	if (pdata == NULL) {
@@ -1079,6 +1094,25 @@  static int __devinit omap_nand_probe(struct platform_device *pdev)
 		}
 	}
 
+	/* rom code layout */
+	if (pdata->ecc_opt != OMAP_ECC_HAMMING_CODE_DIFF_LAYOUT) {
+		offset = (info->nand.options & NAND_BUSWIDTH_16) ? 2 : 1;
+		if (info->mtd.oobsize == 16) {
+			info->nand.badblock_pattern = &bb_descrip_flashbased;
+			omap_oobinfo.eccbytes = 3;
+		} else
+			omap_oobinfo.eccbytes  = 3 * 4;
+
+		for (i = 0; i < omap_oobinfo.eccbytes; i++)
+			omap_oobinfo.eccpos[i] = i+offset;
+
+		omap_oobinfo.oobfree->offset = offset + omap_oobinfo.eccbytes;
+		omap_oobinfo.oobfree->length = info->mtd.oobsize -
+					(offset + omap_oobinfo.eccbytes);
+
+		info->nand.ecc.layout = &omap_oobinfo;
+	}
+
 #ifdef CONFIG_MTD_PARTITIONS
 	err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
 	if (err > 0)