| Message ID | 1303109438-24309-1-git-send-email-j.weitzel@phytec.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
On Mon, Apr 18, 2011 at 12:20 PM, Jan Weitzel <j.weitzel@phytec.de> wrote: > nand_scan calls nand_scan_tail and here we got a ecc.layout and calculate > oobavail for this layout. After calling nand_scan, we change the layout pointer > if OMAP_ECC_HAMMING_CODE_HW_ROMCODE is set. This results in not calcluated > oobavail. Mountig as jffs2 is not possible. > > To fix that nand_scan has to split up in nand_scan_ident and nand_scan_tail > setting ecc.layout between these calls. So nand_scan_tail calculates oobvail > for the used layout. This is also done in serveral other platforms. > > v2: > update commit message Move above two lines to below (as there are not part of commit log): > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> > --- here. Feel free to add: Reviewed-by: Vimal Singh <vimal.newwork@gmail.com> Regards, Vimal -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index da9a351..288423f 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1073,9 +1073,9 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) /* DIP switches on some boards change between 8 and 16 bit * bus widths for flash. Try the other width if the first try fails. */ - if (nand_scan(&info->mtd, 1)) { + if (nand_scan_ident(&info->mtd, 1, NULL)) { info->nand.options ^= NAND_BUSWIDTH_16; - if (nand_scan(&info->mtd, 1)) { + if (nand_scan_ident(&info->mtd, 1, NULL)) { err = -ENXIO; goto out_release_mem_region; } @@ -1101,6 +1101,12 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) info->nand.ecc.layout = &omap_oobinfo; } + /* second phase scan */ + if (nand_scan_tail(&info->mtd)) { + err = -ENXIO; + goto out_release_mem_region; + } + #ifdef CONFIG_MTD_PARTITIONS err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0); if (err > 0)
nand_scan calls nand_scan_tail and here we got a ecc.layout and calculate oobavail for this layout. After calling nand_scan, we change the layout pointer if OMAP_ECC_HAMMING_CODE_HW_ROMCODE is set. This results in not calcluated oobavail. Mountig as jffs2 is not possible. To fix that nand_scan has to split up in nand_scan_ident and nand_scan_tail setting ecc.layout between these calls. So nand_scan_tail calculates oobvail for the used layout. This is also done in serveral other platforms. v2: update commit message Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> --- drivers/mtd/nand/omap2.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)