From 90d0da93bd1e187d192bb417b4d343fa3de5d0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Tue, 2 Dec 2008 06:47:28 +0100 Subject: linux-2.6.26: cleanup backport of Freescale NAND controller --- .../linux/linux-2.6.26/boc01/003-081124-nand.patch | 107 ---------------- .../linux-2.6.26/fsl-elbc-nand-backport.patch | 138 +++++++++++++++++++++ packages/linux/linux-2.6.26/mpc831x-nand.patch | 27 ---- packages/linux/linux_2.6.26.bb | 4 +- 4 files changed, 140 insertions(+), 136 deletions(-) delete mode 100644 packages/linux/linux-2.6.26/boc01/003-081124-nand.patch create mode 100644 packages/linux/linux-2.6.26/fsl-elbc-nand-backport.patch delete mode 100644 packages/linux/linux-2.6.26/mpc831x-nand.patch diff --git a/packages/linux/linux-2.6.26/boc01/003-081124-nand.patch b/packages/linux/linux-2.6.26/boc01/003-081124-nand.patch deleted file mode 100644 index 885bad2715..0000000000 --- a/packages/linux/linux-2.6.26/boc01/003-081124-nand.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -Nru linux-2.6.26/drivers/mtd/nand/fsl_elbc_nand.c linux-2.6.26.modified/drivers/mtd/nand/fsl_elbc_nand.c ---- linux-2.6.26/drivers/mtd/nand/fsl_elbc_nand.c 2008-07-13 23:51:29.000000000 +0200 -+++ linux-2.6.26.modified/drivers/mtd/nand/fsl_elbc_nand.c 2008-10-24 13:43:30.000000000 +0200 -@@ -89,7 +89,7 @@ - .eccbytes = 3, - .eccpos = {6, 7, 8}, - .oobfree = { {0, 5}, {9, 7} }, -- .oobavail = 12, -+// .oobavail = 12, - }; - - /* Small Page FLASH with FMR[ECCM] = 1 */ -@@ -97,7 +97,7 @@ - .eccbytes = 3, - .eccpos = {8, 9, 10}, - .oobfree = { {0, 5}, {6, 2}, {11, 5} }, -- .oobavail = 12, -+ //.oobavail = 12, - }; - - /* Large Page FLASH with FMR[ECCM] = 0 */ -@@ -105,7 +105,7 @@ - .eccbytes = 12, - .eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56}, - .oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} }, -- .oobavail = 48, -+ //.oobavail = 48, - }; - - /* Large Page FLASH with FMR[ECCM] = 1 */ -@@ -113,7 +113,48 @@ - .eccbytes = 12, - .eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58}, - .oobfree = { {1, 7}, {11, 13}, {27, 13}, {43, 13}, {59, 5} }, -- .oobavail = 48, -+// .oobavail = 48, -+}; -+/* -+ * fsl_elbc_oob_lp_eccm* specify that LP NAND's OOB free area starts at offset -+ * 1, so we have to adjust bad block pattern. This pattern should be used for -+ * x8 chips only. So far hardware does not support x16 chips anyway. -+ */ -+static u8 scan_ff_pattern[] = { 0xff, }; -+ -+static struct nand_bbt_descr largepage_memorybased = { -+ .options = 0, -+ .offs = 0, -+ .len = 1, -+ .pattern = scan_ff_pattern, -+}; -+ -+/* -+ * ELBC may use HW ECC, so that OOB offsets, that NAND core uses for bbt, -+ * interfere with ECC positions, that's why we implement our own descriptors. -+ * OOB {11, 5}, works for both SP and LP chips, with ECCM = 1 and ECCM = 0. -+ */ -+static u8 bbt_pattern[] = {'B', 'b', 't', '0' }; -+static u8 mirror_pattern[] = {'1', 't', 'b', 'B' }; -+ -+static struct nand_bbt_descr bbt_main_descr = { -+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE | -+ NAND_BBT_2BIT | NAND_BBT_VERSION, -+ .offs = 11, -+ .len = 4, -+ .veroffs = 15, -+ .maxblocks = 4, -+ .pattern = bbt_pattern, -+}; -+ -+static struct nand_bbt_descr bbt_mirror_descr = { -+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE | -+ NAND_BBT_2BIT | NAND_BBT_VERSION, -+ .offs = 11, -+ .len = 4, -+ .veroffs = 15, -+ .maxblocks = 4, -+ .pattern = mirror_pattern, - }; - - /*=================================*/ -@@ -687,8 +728,9 @@ - chip->ecc.layout = (priv->fmr & FMR_ECCM) ? - &fsl_elbc_oob_lp_eccm1 : - &fsl_elbc_oob_lp_eccm0; -- mtd->ecclayout = chip->ecc.layout; -- mtd->oobavail = chip->ecc.layout->oobavail; -+ //mtd->ecclayout = chip->ecc.layout; -+ //mtd->oobavail = chip->ecc.layout->oobavail; -+ chip->badblock_pattern = &largepage_memorybased; - } - } else { - dev_err(ctrl->dev, -@@ -752,8 +794,12 @@ - chip->cmdfunc = fsl_elbc_cmdfunc; - chip->waitfunc = fsl_elbc_wait; - -+ chip->bbt_td = &bbt_main_descr; -+ chip->bbt_md = &bbt_mirror_descr; -+ - /* set up nand options */ -- chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR; -+ //chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR; -+ chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR | NAND_USE_FLASH_BBT; - - chip->controller = &ctrl->controller; - chip->priv = priv; - diff --git a/packages/linux/linux-2.6.26/fsl-elbc-nand-backport.patch b/packages/linux/linux-2.6.26/fsl-elbc-nand-backport.patch new file mode 100644 index 0000000000..99f4628122 --- /dev/null +++ b/packages/linux/linux-2.6.26/fsl-elbc-nand-backport.patch @@ -0,0 +1,138 @@ +--- linux-2.6.26/drivers/mtd/nand/fsl_elbc_nand.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.27/drivers/mtd/nand/fsl_elbc_nand.c 2008-10-10 00:13:53.000000000 +0200 +@@ -89,7 +89,6 @@ + .eccbytes = 3, + .eccpos = {6, 7, 8}, + .oobfree = { {0, 5}, {9, 7} }, +- .oobavail = 12, + }; + + /* Small Page FLASH with FMR[ECCM] = 1 */ +@@ -97,7 +96,6 @@ + .eccbytes = 3, + .eccpos = {8, 9, 10}, + .oobfree = { {0, 5}, {6, 2}, {11, 5} }, +- .oobavail = 12, + }; + + /* Large Page FLASH with FMR[ECCM] = 0 */ +@@ -105,7 +103,6 @@ + .eccbytes = 12, + .eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56}, + .oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} }, +- .oobavail = 48, + }; + + /* Large Page FLASH with FMR[ECCM] = 1 */ +@@ -113,7 +110,48 @@ + .eccbytes = 12, + .eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58}, + .oobfree = { {1, 7}, {11, 13}, {27, 13}, {43, 13}, {59, 5} }, +- .oobavail = 48, ++}; ++ ++/* ++ * fsl_elbc_oob_lp_eccm* specify that LP NAND's OOB free area starts at offset ++ * 1, so we have to adjust bad block pattern. This pattern should be used for ++ * x8 chips only. So far hardware does not support x16 chips anyway. ++ */ ++static u8 scan_ff_pattern[] = { 0xff, }; ++ ++static struct nand_bbt_descr largepage_memorybased = { ++ .options = 0, ++ .offs = 0, ++ .len = 1, ++ .pattern = scan_ff_pattern, ++}; ++ ++/* ++ * ELBC may use HW ECC, so that OOB offsets, that NAND core uses for bbt, ++ * interfere with ECC positions, that's why we implement our own descriptors. ++ * OOB {11, 5}, works for both SP and LP chips, with ECCM = 1 and ECCM = 0. ++ */ ++static u8 bbt_pattern[] = {'B', 'b', 't', '0' }; ++static u8 mirror_pattern[] = {'1', 't', 'b', 'B' }; ++ ++static struct nand_bbt_descr bbt_main_descr = { ++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE | ++ NAND_BBT_2BIT | NAND_BBT_VERSION, ++ .offs = 11, ++ .len = 4, ++ .veroffs = 15, ++ .maxblocks = 4, ++ .pattern = bbt_pattern, ++}; ++ ++static struct nand_bbt_descr bbt_mirror_descr = { ++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE | ++ NAND_BBT_2BIT | NAND_BBT_VERSION, ++ .offs = 11, ++ .len = 4, ++ .veroffs = 15, ++ .maxblocks = 4, ++ .pattern = mirror_pattern, + }; + + /*=================================*/ +@@ -687,8 +725,7 @@ + chip->ecc.layout = (priv->fmr & FMR_ECCM) ? + &fsl_elbc_oob_lp_eccm1 : + &fsl_elbc_oob_lp_eccm0; +- mtd->ecclayout = chip->ecc.layout; +- mtd->oobavail = chip->ecc.layout->oobavail; ++ chip->badblock_pattern = &largepage_memorybased; + } + } else { + dev_err(ctrl->dev, +@@ -752,8 +789,12 @@ + chip->cmdfunc = fsl_elbc_cmdfunc; + chip->waitfunc = fsl_elbc_wait; + ++ chip->bbt_td = &bbt_main_descr; ++ chip->bbt_md = &bbt_mirror_descr; ++ + /* set up nand options */ +- chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR; ++ chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR | ++ NAND_USE_FLASH_BBT; + + chip->controller = &ctrl->controller; + chip->priv = priv; +@@ -795,8 +836,8 @@ + return 0; + } + +-static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl, +- struct device_node *node) ++static int __devinit fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl, ++ struct device_node *node) + { + struct fsl_lbc_regs __iomem *lbc = ctrl->regs; + struct fsl_elbc_mtd *priv; +@@ -846,7 +887,7 @@ + goto err; + } + +- priv->mtd.name = kasprintf(GFP_KERNEL, "%x.flash", res.start); ++ priv->mtd.name = kasprintf(GFP_KERNEL, "%x.flash", (unsigned)res.start); + if (!priv->mtd.name) { + ret = -ENOMEM; + goto err; +@@ -917,7 +958,7 @@ + return 0; + } + +-static int __devexit fsl_elbc_ctrl_remove(struct of_device *ofdev) ++static int fsl_elbc_ctrl_remove(struct of_device *ofdev) + { + struct fsl_elbc_ctrl *ctrl = dev_get_drvdata(&ofdev->dev); + int i; +@@ -1041,7 +1082,7 @@ + }, + .match_table = fsl_elbc_match, + .probe = fsl_elbc_ctrl_probe, +- .remove = __devexit_p(fsl_elbc_ctrl_remove), ++ .remove = fsl_elbc_ctrl_remove, + }; + + static int __init fsl_elbc_init(void) diff --git a/packages/linux/linux-2.6.26/mpc831x-nand.patch b/packages/linux/linux-2.6.26/mpc831x-nand.patch deleted file mode 100644 index 23520cbdb7..0000000000 --- a/packages/linux/linux-2.6.26/mpc831x-nand.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c -index b025dfe..9c86d9b 100644 ---- a/drivers/mtd/nand/fsl_elbc_nand.c -+++ b/drivers/mtd/nand/fsl_elbc_nand.c -@@ -974,6 +974,8 @@ static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv) - - nand_release(&priv->mtd); - -+ kfree(priv->mtd.name); -+ - if (priv->vbase) - iounmap(priv->vbase); - -@@ -1034,6 +1036,12 @@ static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl, - goto err; - } - -+ priv->mtd.name = kasprintf(GFP_KERNEL, "%x.flash", res.start); -+ if (!priv->mtd.name) { -+ ret = -ENOMEM; -+ goto err; -+ } -+ - ret = fsl_elbc_chip_init(priv); - if (ret) - goto err; - diff --git a/packages/linux/linux_2.6.26.bb b/packages/linux/linux_2.6.26.bb index 1b539b750d..405655ba05 100644 --- a/packages/linux/linux_2.6.26.bb +++ b/packages/linux/linux_2.6.26.bb @@ -14,8 +14,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \ SRC_URI_append_boc01 = "\ file://boc01.dts \ file://cdc-ether-hack.patch;patch=1 \ + file://fsl-elbc-nand-backport.patch;patch=1 \ file://002-081105-headers.patch;patch=1 \ - file://003-081124-nand.patch;patch=1 \ file://004-081105-usb.patch;patch=1 \ file://005-081105-isl12024.patch;patch=1 \ file://006-081105-at24c32.patch;patch=1 \ @@ -28,7 +28,7 @@ SRC_URI_append_boc01 = "\ SRC_URI_append_mpc8313e-rdb = "\ file://cdc-ether-hack.patch;patch=1 \ - file://mpc831x-nand.patch;patch=1 \ + file://fsl-elbc-nand-backport.patch;patch=1 \ file://mpc8313e-rdb-leds.patch;patch=1 \ file://mpc8313e-rdb-cardbus.patch;patch=1 \ file://mpc8313e-rdb-eth-fixed.patch;patch=1 \ -- cgit v1.2.3