Patched in Tegra support.

2 files changed, 28 insertions, 19 deletions

diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index d3cfe26beea..65655dd59e1 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -27,7 +27,6 @@
 #include <linux/mtd/pfow.h>
 #include <linux/mtd/qinfo.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 
 static int lpddr_read(struct mtd_info *mtd, loff_t adr, size_t len,
                                         size_t *retlen, u_char *buf);
@@ -40,7 +39,7 @@ static int lpddr_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
 static int lpddr_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
 static int lpddr_point(struct mtd_info *mtd, loff_t adr, size_t len,
                         size_t *retlen, void **mtdbuf, resource_size_t *phys);
-static int lpddr_unpoint(struct mtd_info *mtd, loff_t adr, size_t len);
+static void lpddr_unpoint(struct mtd_info *mtd, loff_t adr, size_t len);
 static int get_chip(struct map_info *map, struct flchip *chip, int mode);
 static int chip_ready(struct map_info *map, struct flchip *chip, int mode);
 static void put_chip(struct map_info *map, struct flchip *chip);
@@ -63,19 +62,26 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)
         mtd->type = MTD_NORFLASH;
 
         /* Fill in the default mtd operations */
-        mtd->_read = lpddr_read;
+        mtd->read = lpddr_read;
         mtd->type = MTD_NORFLASH;
         mtd->flags = MTD_CAP_NORFLASH;
         mtd->flags &= ~MTD_BIT_WRITEABLE;
-        mtd->_erase = lpddr_erase;
-        mtd->_write = lpddr_write_buffers;
-        mtd->_writev = lpddr_writev;
-        mtd->_lock = lpddr_lock;
-        mtd->_unlock = lpddr_unlock;
+        mtd->erase = lpddr_erase;
+        mtd->write = lpddr_write_buffers;
+        mtd->writev = lpddr_writev;
+        mtd->read_oob = NULL;
+        mtd->write_oob = NULL;
+        mtd->sync = NULL;
+        mtd->lock = lpddr_lock;
+        mtd->unlock = lpddr_unlock;
+        mtd->suspend = NULL;
+        mtd->resume = NULL;
         if (map_is_linear(map)) {
-                mtd->_point = lpddr_point;
-                mtd->_unpoint = lpddr_unpoint;
+                mtd->point = lpddr_point;
+                mtd->unpoint = lpddr_unpoint;
         }
+        mtd->block_isbad = NULL;
+        mtd->block_markbad = NULL;
         mtd->size = 1 << lpddr->qinfo->DevSizeShift;
         mtd->erasesize = 1 << lpddr->qinfo->UniformBlockSizeShift;
         mtd->writesize = 1 << lpddr->qinfo->BufSizeShift;
@@ -530,12 +536,14 @@ static int lpddr_point(struct mtd_info *mtd, loff_t adr, size_t len,
         struct flchip *chip = &lpddr->chips[chipnum];
         int ret = 0;
 
-        if (!map->virt)
+        if (!map->virt || (adr + len > mtd->size))
                 return -EINVAL;
 
         /* ofs: offset within the first chip that the first read should start */
         ofs = adr - (chipnum << lpddr->chipshift);
+
         *mtdbuf = (void *)map->virt + chip->start + ofs;
+        *retlen = 0;
 
         while (len) {
                 unsigned long thislen;
@@ -573,11 +581,11 @@ static int lpddr_point(struct mtd_info *mtd, loff_t adr, size_t len,
         return 0;
 }
 
-static int lpddr_unpoint (struct mtd_info *mtd, loff_t adr, size_t len)
+static void lpddr_unpoint (struct mtd_info *mtd, loff_t adr, size_t len)
 {
         struct map_info *map = mtd->priv;
         struct lpddr_private *lpddr = map->fldrv_priv;
-        int chipnum = adr >> lpddr->chipshift, err = 0;
+        int chipnum = adr >> lpddr->chipshift;
         unsigned long ofs;
 
         /* ofs: offset within the first chip that the first read should start */
@@ -601,11 +609,9 @@ static int lpddr_unpoint (struct mtd_info *mtd, loff_t adr, size_t len)
                         chip->ref_point_counter--;
                         if (chip->ref_point_counter == 0)
                                 chip->state = FL_READY;
-                } else {
+                } else
                         printk(KERN_WARNING "%s: Warning: unpoint called on non"
                                         "pointed region\n", map->name);
-                        err = -EINVAL;
-                }
 
                 put_chip(map, chip);
                 mutex_unlock(&chip->mutex);
@@ -614,8 +620,6 @@ static int lpddr_unpoint (struct mtd_info *mtd, loff_t adr, size_t len)
                 ofs = 0;
                 chipnum++;
         }
-
-        return err;
 }
 
 static int lpddr_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
@@ -639,11 +643,13 @@ static int lpddr_writev(struct mtd_info *mtd, const struct kvec *vecs,
         int chipnum;
         unsigned long ofs, vec_seek, i;
         int wbufsize = 1 << lpddr->qinfo->BufSizeShift;
+
         size_t len = 0;
 
         for (i = 0; i < count; i++)
                 len += vecs[i].iov_len;
 
+        *retlen = 0;
         if (!len)
                 return 0;
 
@@ -688,6 +694,9 @@ static int lpddr_erase(struct mtd_info *mtd, struct erase_info *instr)
         ofs = instr->addr;
         len = instr->len;
 
+        if (ofs > mtd->size || (len + ofs) > mtd->size)
+                return -EINVAL;
+
         while (len > 0) {
                 ret = do_erase_oneblock(mtd, ofs);
                 if (ret)
diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c
index 45abed67f1e..dbfe17baf04 100644
--- a/drivers/mtd/lpddr/qinfo_probe.c
+++ b/drivers/mtd/lpddr/qinfo_probe.c
@@ -57,7 +57,7 @@ static struct qinfo_query_info qinfo_array[] = {
 
 static long lpddr_get_qinforec_pos(struct map_info *map, char *id_str)
 {
-        int qinfo_lines = ARRAY_SIZE(qinfo_array);
+        int qinfo_lines = sizeof(qinfo_array)/sizeof(struct qinfo_query_info);
         int i;
         int bankwidth = map_bankwidth(map) * 8;
         int major, minor;