Merge tag 'for-linus-20150422' of git://git.infradead.org/linux-mtd

Pull MTD updates from Brian Norris:
 "Common MTD:

   - Add Kconfig option for keeping both the 'master' and 'partition'
     MTDs registered as devices.  This would really make a better
     default if we could do it over, as it allows a lot more flexibility
     in (1) determining the flash topology of the system from user-space
     and (2) adding temporary partitions at runtime (ioctl(BLKPG)).

     Unfortunately, this would possibly cause user-space breakage, as it
     will cause renumbering of the /dev/mtdX devices.  We'll see if we
     can change this in the future, as there have already been a few
     people looking for this feature, and I know others have just been
     working around our current limitations instead of fixing them this
     way.

   - Along with the previous change, add some additional information to
     sysfs, so user-space can read the offset of each partition within
     its master device

  SPI NOR:

   - add new device tree compatible binding to represent the
     mostly-compatible class of SPI NOR flash which can be detected by
     their extended JEDEC ID bytes, cutting down the duplication of our
     ID tables

   - misc.  new IDs

  Various other miscellaneous fixes and changes"

* tag 'for-linus-20150422' of git://git.infradead.org/linux-mtd: (53 commits)
  mtd: spi-nor: Add support for Macronix mx25u6435f serial flash
  mtd: spi-nor: Add support for Winbond w25q64dw serial flash
  mtd: spi-nor: add support for the Winbond W25X05 flash
  mtd: spi-nor: support en25s64 device
  mtd: m25p80: bind to "nor-jedec" ID, for auto-detection
  Documentation: devicetree: m25p80: add "nor-jedec" binding
  mtd: Make MTD tests cancelable
  mtd: mtd_oobtest: Fix bitflip_limit usage in test case 3
  mtd: docg3: remove invalid __exit annotations
  mtd: fsl_ifc_nand: use msecs_to_jiffies for time conversion
  mtd: atmel_nand: don't map the ROM table if no pmecc table offset in DT
  mtd: atmel_nand: add a definition for the oob reserved bytes
  mtd: part: Remove partition overlap checks
  mtd: part: Add sysfs variable for offset of partition
  mtd: part: Create the master device node when partitioned
  mtd: ts5500_flash: Fix typo in MODULE_DESCRIPTION in ts5500_flash.c
  mtd: denali: Disable sub-page writes in Denali NAND driver
  mtd: pxa3xx_nand: cleanup wait_for_completion handling
  mtd: nand: gpmi: Check for scan_bbt() error
  mtd: nand: gpmi: fixup return type of wait_for_completion_timeout
  ...

1 files changed, 30 insertions, 11 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index df7eb4ff07d1..c2e1232cd45c 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -386,7 +386,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
         uint8_t buf[2] = { 0, 0 };
         int ret = 0, res, i = 0;
 
-        ops.datbuf = NULL;
+        memset(&ops, 0, sizeof(ops));
         ops.oobbuf = buf;
         ops.ooboffs = chip->badblockpos;
         if (chip->options & NAND_BUSWIDTH_16) {
@@ -566,6 +566,25 @@ void nand_wait_ready(struct mtd_info *mtd)
 EXPORT_SYMBOL_GPL(nand_wait_ready);
 
 /**
+ * nand_wait_status_ready - [GENERIC] Wait for the ready status after commands.
+ * @mtd: MTD device structure
+ * @timeo: Timeout in ms
+ *
+ * Wait for status ready (i.e. command done) or timeout.
+ */
+static void nand_wait_status_ready(struct mtd_info *mtd, unsigned long timeo)
+{
+        register struct nand_chip *chip = mtd->priv;
+
+        timeo = jiffies + msecs_to_jiffies(timeo);
+        do {
+                if ((chip->read_byte(mtd) & NAND_STATUS_READY))
+                        break;
+                touch_softlockup_watchdog();
+        } while (time_before(jiffies, timeo));
+};
+
+/**
  * nand_command - [DEFAULT] Send command to NAND device
  * @mtd: MTD device structure
  * @command: the command to be sent
@@ -643,8 +662,8 @@ static void nand_command(struct mtd_info *mtd, unsigned int command,
                                NAND_CTRL_CLE | NAND_CTRL_CHANGE);
                 chip->cmd_ctrl(mtd,
                                NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
-                while (!(chip->read_byte(mtd) & NAND_STATUS_READY))
-                                ;
+                /* EZ-NAND can take upto 250ms as per ONFi v4.0 */
+                nand_wait_status_ready(mtd, 250);
                 return;
 
                 /* This applies to read commands */
@@ -740,8 +759,8 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned int command,
                                NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);
                 chip->cmd_ctrl(mtd, NAND_CMD_NONE,
                                NAND_NCE | NAND_CTRL_CHANGE);
-                while (!(chip->read_byte(mtd) & NAND_STATUS_READY))
-                                ;
+                /* EZ-NAND can take upto 250ms as per ONFi v4.0 */
+                nand_wait_status_ready(mtd, 250);
                 return;
 
         case NAND_CMD_RNDOUT:
@@ -968,7 +987,7 @@ int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
                         __func__, (unsigned long long)ofs, len);
 
         if (check_offs_len(mtd, ofs, len))
-                ret = -EINVAL;
+                return -EINVAL;
 
         /* Align to last block address if size addresses end of the device */
         if (ofs + len == mtd->size)
@@ -1031,7 +1050,7 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
                         __func__, (unsigned long long)ofs, len);
 
         if (check_offs_len(mtd, ofs, len))
-                ret = -EINVAL;
+                return -EINVAL;
 
         nand_get_device(mtd, FL_LOCKING);
 
@@ -1716,9 +1735,9 @@ static int nand_read(struct mtd_info *mtd, loff_t from, size_t len,
         int ret;
 
         nand_get_device(mtd, FL_READING);
+        memset(&ops, 0, sizeof(ops));
         ops.len = len;
         ops.datbuf = buf;
-        ops.oobbuf = NULL;
         ops.mode = MTD_OPS_PLACE_OOB;
         ret = nand_do_read_ops(mtd, from, &ops);
         *retlen = ops.retlen;
@@ -2124,7 +2143,7 @@ static int nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
 
 
 /**
- * nand_write_subpage_hwecc - [REPLACABLE] hardware ECC based subpage write
+ * nand_write_subpage_hwecc - [REPLACEABLE] hardware ECC based subpage write
  * @mtd:        mtd info structure
  * @chip:       nand chip info structure
  * @offset:     column address of subpage within the page
@@ -2508,9 +2527,9 @@ static int panic_nand_write(struct mtd_info *mtd, loff_t to, size_t len,
         /* Grab the device */
         panic_nand_get_device(chip, mtd, FL_WRITING);
 
+        memset(&ops, 0, sizeof(ops));
         ops.len = len;
         ops.datbuf = (uint8_t *)buf;
-        ops.oobbuf = NULL;
         ops.mode = MTD_OPS_PLACE_OOB;
 
         ret = nand_do_write_ops(mtd, to, &ops);
@@ -2536,9 +2555,9 @@ static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,
         int ret;
 
         nand_get_device(mtd, FL_WRITING);
+        memset(&ops, 0, sizeof(ops));
         ops.len = len;
         ops.datbuf = (uint8_t *)buf;
-        ops.oobbuf = NULL;
         ops.mode = MTD_OPS_PLACE_OOB;
         ret = nand_do_write_ops(mtd, to, &ops);
         *retlen = ops.retlen;