target/linux/ramips/patches-4.3/0040-nand-add-mtk-nand-hack-hook.patch

   1 From 61e17c2f864698033f4661e1fc7ba63d4d982491 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Mon, 7 Dec 2015 17:21:55 +0100
   4 Subject: [PATCH 40/53] nand: add mtk-nand hack/hook
   5
   6 Signed-off-by: John Crispin <blogic@openwrt.org>
   7 ---
   8  drivers/mtd/nand/mtk_nand.c         |   34 ++++++++++++++++++++++++++++++----
   9  drivers/mtd/nand/nand_base.c        |    9 ++++++++-
  10  drivers/mtd/nand/nand_device_list.h |    2 ++
  11  include/linux/mtd/nand.h            |    4 ++++
  12  4 files changed, 44 insertions(+), 5 deletions(-)
  13
  14 diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
  15 index 00e150c..808e9c3 100644
  16 --- a/drivers/mtd/nand/mtk_nand.c
  17 +++ b/drivers/mtd/nand/mtk_nand.c
  18 @@ -110,6 +110,10 @@ int part_num = NUM_PARTITIONS;
  19  int manu_id;
  20  int dev_id;
  21
  22 +/* this constant was taken from linux/nand/nand.h v 3.14
  23 + * in later versions it seems it was removed in order to save a bit of space
  24 + */
  25 +#define NAND_MAX_OOBSIZE 774
  26  static u8 local_oob_buf[NAND_MAX_OOBSIZE];
  27
  28  static u8 nand_badblock_offset = 0;
  29 @@ -348,7 +352,7 @@ mtk_nand_check_bch_error(struct mtd_info *mtd, u8 * pDataBuf, u32 u4SecIndex, u3
  30                 if (0xF == u4ErrNum) {
  31                         mtd->ecc_stats.failed++;
  32                         bRet = false;
  33 -                       //printk(KERN_ERR"UnCorrectable at PageAddr=%d\n", u4PageAddr);
  34 +                       printk(KERN_ERR"mtk_nand: UnCorrectable at PageAddr=%d\n", u4PageAddr);
  35                 } else {
  36                         for (i = 0; i < ((u4ErrNum + 1) >> 1); ++i) {
  37                                 au4ErrBitLoc[i] = DRV_Reg32(ECC_DECEL0_REG32 + i);
  38 @@ -1422,7 +1426,7 @@ mtk_nand_erase_hw(struct mtd_info *mtd, int page)
  39  {
  40         struct nand_chip *chip = (struct nand_chip *)mtd->priv;
  41
  42 -       chip->erase_cmd(mtd, page);
  43 +       chip->erase(mtd, page);
  44
  45         return chip->waitfunc(mtd, chip);
  46  }
  47 @@ -2094,8 +2098,8 @@ mtk_nand_probe(struct platform_device *pdev)
  48         nand_chip->write_page = mtk_nand_write_page;
  49         nand_chip->ecc.write_oob = mtk_nand_write_oob;
  50         nand_chip->block_markbad = mtk_nand_block_markbad;   // need to add nand_get_device()/nand_release_device().
  51 -       //      nand_chip->erase = mtk_nand_erase;
  52 -       //    nand_chip->read_page = mtk_nand_read_page;
  53 +       nand_chip->erase_mtk = mtk_nand_erase;
  54 +       nand_chip->read_page = mtk_nand_read_page;
  55         nand_chip->ecc.read_oob = mtk_nand_read_oob;
  56         nand_chip->block_bad = mtk_nand_block_bad;
  57
  58 @@ -2175,6 +2179,21 @@ mtk_nand_probe(struct platform_device *pdev)
  59         nand_chip->pagemask = (nand_chip->chipsize >> nand_chip->page_shift) - 1;
  60         nand_chip->phys_erase_shift = ffs(mtd->erasesize) - 1;
  61         nand_chip->chip_shift = ffs(nand_chip->chipsize) - 1;//0x1C;//ffs(nand_chip->chipsize) - 1;
  62 +
  63 +       /* allocate buffers or call select_chip here or a bit earlier*/
  64 +       {
  65 +               struct nand_buffers *nbuf = kzalloc(sizeof(*nbuf) + mtd->writesize + mtd->oobsize * 3, GFP_KERNEL);
  66 +               if (!nbuf) {
  67 +                       return -ENOMEM;
  68 +               }
  69 +               nbuf->ecccalc = (uint8_t *)(nbuf + 1);
  70 +               nbuf->ecccode = nbuf->ecccalc + mtd->oobsize;
  71 +               nbuf->databuf = nbuf->ecccode + mtd->oobsize;
  72 +
  73 +               nand_chip->buffers = nbuf;
  74 +               nand_chip->options |= NAND_OWN_BUFFERS;
  75 +       }
  76 +
  77         nand_chip->oob_poi = nand_chip->buffers->databuf + mtd->writesize;
  78         nand_chip->badblockpos = 0;
  79
  80 @@ -2251,6 +2270,9 @@ out:
  81         MSG(INIT, "[NFI] mtk_nand_probe fail, err = %d!\n", err);
  82         nand_release(mtd);
  83         platform_set_drvdata(pdev, NULL);
  84 +       if ( NULL != nand_chip->buffers) {
  85 +               kfree(nand_chip->buffers);
  86 +       }
  87         kfree(host);
  88         nand_disable_clock();
  89         return err;
  90 @@ -2261,8 +2283,12 @@ mtk_nand_remove(struct platform_device *pdev)
  91  {
  92         struct mtk_nand_host *host = platform_get_drvdata(pdev);
  93         struct mtd_info *mtd = &host->mtd;
  94 +       struct nand_chip *nand_chip = &host->nand_chip;
  95
  96         nand_release(mtd);
  97 +       if ( NULL != nand_chip->buffers) {
  98 +               kfree(nand_chip->buffers);
  99 +       }
 100         kfree(host);
 101         nand_disable_clock();
 102
 103 diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
 104 index 04dbc69..c5ed6fc 100644
 105 --- a/drivers/mtd/nand/nand_base.c
 106 +++ b/drivers/mtd/nand/nand_base.c
 107 @@ -1592,6 +1592,9 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
 108                                                  __func__, buf);
 109
 110  read_retry:
 111 +#ifdef CONFIG_MTK_MTD_NAND
 112 +                       ret = chip->read_page(mtd, chip, bufpoi, page);
 113 +#else
 114                         chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
 115
 116                         /*
 117 @@ -1610,6 +1613,7 @@ read_retry:
 118                         else
 119                                 ret = chip->ecc.read_page(mtd, chip, bufpoi,
 120                                                           oob_required, page);
 121 +#endif /* CONFIG_MTK_MTD_NAND */
 122                         if (ret < 0) {
 123                                 if (use_bufpoi)
 124                                         /* Invalidate page cache */
 125 @@ -2786,8 +2790,11 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 126                 if (page <= chip->pagebuf && chip->pagebuf <
 127                     (page + pages_per_block))
 128                         chip->pagebuf = -1;
 129 -
 130 +#ifdef CONFIG_MTK_MTD_NAND
 131 +               status = chip->erase_mtk(mtd, page & chip->pagemask);
 132 +#else
 133                 status = chip->erase(mtd, page & chip->pagemask);
 134 +#endif /* CONFIG_MTK_MTD_NAND */
 135
 136                 /*
 137                  * See if operation failed and additional status checks are
 138 diff --git a/drivers/mtd/nand/nand_device_list.h b/drivers/mtd/nand/nand_device_list.h
 139 index 4c36b3a..267fd0c 100644
 140 --- a/drivers/mtd/nand/nand_device_list.h
 141 +++ b/drivers/mtd/nand/nand_device_list.h
 142 @@ -43,6 +43,8 @@ static const flashdev_info gen_FlashTable[]={
 143         {0xADBC, 0x905554, 5, 16, 512, 128, 2048, 64, 0x10801011, "H9DA4GH4JJAMC", 0},
 144      {0x01F1, 0x801D01, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "S34ML01G100TF", 0},
 145      {0x92F1, 0x8095FF, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "F59L1G81A", 0},
 146 +       {0xC8DA, 0x909544, 5, 8, 256, 128, 2048, 64, 0x30C77fff, "F59L2G81A", 0},
 147 +       {0xC8DC, 0x909554, 5, 8, 512, 128, 2048, 64, 0x30C77fff, "F59L4G81A", 0},
 148         {0xECD3, 0x519558, 5, 8, 1024, 128, 2048, 64, 0x44333, "K9K8G8000", 0},
 149      {0xC2F1, 0x801DC2, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "MX30LF1G08AA", 0},
 150      {0x98D3, 0x902676, 5, 8, 1024, 256, 4096, 224, 0x00C25332, "TC58NVG3S0F", 0},
 151 diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
 152 index 272f429..b633b84 100644
 153 --- a/include/linux/mtd/nand.h
 154 +++ b/include/linux/mtd/nand.h
 155 @@ -671,6 +671,10 @@ struct nand_chip {
 156         int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
 157                         uint32_t offset, int data_len, const uint8_t *buf,
 158                         int oob_required, int page, int cached, int raw);
 159 +#ifdef CONFIG_MTK_MTD_NAND
 160 +       int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, u8 *buf, int page);
 161 +       int (*erase_mtk)(struct mtd_info *mtd, int page);
 162 +#endif /* CONFIG_MTK_MTD_NAND */
 163         int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip,
 164                         int feature_addr, uint8_t *subfeature_para);
 165         int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,
 166 --
 167 1.7.10.4
 168