Merge tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jun 2015 00:38:39 +0000 (17:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jun 2015 00:38:39 +0000 (17:38 -0700)
Pull MTD updates from Brian Norris:
 "JFFS2:
   - fix a theoretical unbalanced locking issue; the lock handling was a
     bit unclean, but AFAICT, it didn't actually lead to real deadlocks

  NAND:
   - brcmnand driver: new driver supporting NAND controller found
     originally on Broadcom STB SoCs (BCM7xxx), but now also found on
     BCM63xxx, iProc (e.g., Cygnus, BCM5301x), BCM3xxx, and more

   - begin factoring out BBT code so it can be shared between
     traditional (parallel) NAND drivers and upcoming SPI NAND drivers
     (WIP)

   - add common DT-based init support, so nand_base can pick up some
     flash properties automatically, using established common NAND DT
     properties

   - mxc_nand: support 8-bit ECC

   - pxa3xx_nand:
     * fix build for ARM64
     * use a jiffies-based timeout

  SPI NOR:
   - add a few new IDs

   - clear out some unnecessary entries

   - make sure SECT_4K flags are correct for all (?) entries

  Core:
   - fix mtd->usecount race conditions (BUG_ON())

   - switch to modern PM ops

  Other:
   - CFI: save code space by de-inlining large functions

   - clean up some partition parser selection code across several
     drivers

   - various miscellaneous changes, mostly minor"

* tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd: (57 commits)
  mtd: docg3: Fix kasprintf() usage
  mtd: docg3: Don't leak docg3->bbt in error path
  mtd: nandsim: Fix kasprintf() usage
  mtd: cs553x_nand: Fix kasprintf() usage
  mtd: r852: Fix device_create_file() usage
  mtd: brcmnand: drop unnecessary initialization
  mtd: propagate error codes from add_mtd_device()
  mtd: diskonchip: remove two-phase partitioning / registration
  mtd: dc21285: use raw spinlock functions for nw_gpio_lock
  mtd: chips: fixup dependencies, to prevent build error
  mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial
  mtd: cfi: deinline large functions
  mtd: lantiq-flash: use default partition parsers
  mtd: plat_nand: use default partition probe
  mtd: nand: correct indentation within conditional
  mtd: remove incorrect file name
  mtd: blktrans: use better error code for unimplemented ioctl()
  mtd: maps: Spelling s/reseved/reserved/
  mtd: blktrans: change blktrans_getgeo return value
  mtd: mxc_nand: generate nand_ecclayout for 8 bit ECC
  ...

47 files changed:
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt [new file with mode: 0644]
MAINTAINERS
drivers/mtd/chips/Kconfig
drivers/mtd/chips/cfi_cmdset_0002.c
drivers/mtd/chips/cfi_util.c
drivers/mtd/devices/docg3.c
drivers/mtd/devices/m25p80.c
drivers/mtd/devices/spear_smi.c
drivers/mtd/maps/Kconfig
drivers/mtd/maps/amd76xrom.c
drivers/mtd/maps/dc21285.c
drivers/mtd/maps/esb2rom.c
drivers/mtd/maps/ichxrom.c
drivers/mtd/maps/lantiq-flash.c
drivers/mtd/maps/physmap_of.c
drivers/mtd/mtd_blkdevs.c
drivers/mtd/mtdcore.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/nand/brcmnand/Makefile [new file with mode: 0644]
drivers/mtd/nand/brcmnand/bcm63138_nand.c [new file with mode: 0644]
drivers/mtd/nand/brcmnand/brcmnand.c [new file with mode: 0644]
drivers/mtd/nand/brcmnand/brcmnand.h [new file with mode: 0644]
drivers/mtd/nand/brcmnand/brcmstb_nand.c [new file with mode: 0644]
drivers/mtd/nand/brcmnand/iproc_nand.c [new file with mode: 0644]
drivers/mtd/nand/cs553x_nand.c
drivers/mtd/nand/diskonchip.c
drivers/mtd/nand/fsmc_nand.c
drivers/mtd/nand/mpc5121_nfc.c
drivers/mtd/nand/mxc_nand.c
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/nand_bbt.c
drivers/mtd/nand/nand_ids.c
drivers/mtd/nand/nandsim.c
drivers/mtd/nand/ndfc.c
drivers/mtd/nand/plat_nand.c
drivers/mtd/nand/pxa3xx_nand.c
drivers/mtd/nand/r852.c
drivers/mtd/nand/s3c2410.c
drivers/mtd/nand/xway_nand.c
drivers/mtd/onenand/samsung.c
drivers/mtd/spi-nor/fsl-quadspi.c
drivers/mtd/spi-nor/spi-nor.c
fs/jffs2/fs.c
fs/jffs2/readinode.c
include/linux/mtd/cfi.h
include/linux/mtd/nand.h

diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
new file mode 100644 (file)
index 0000000..4ff7128
--- /dev/null
@@ -0,0 +1,150 @@
+* Broadcom STB NAND Controller
+
+The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
+flash chips. It has a memory-mapped register interface for both control
+registers and for its data input/output buffer. On some SoCs, this controller is
+paired with a custom DMA engine (inventively named "Flash DMA") which supports
+basic PROGRAM and READ functions, among other features.
+
+This controller was originally designed for STB SoCs (BCM7xxx) but is now
+available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
+iProc/Cygnus. Its history includes several similar (but not fully register
+compatible) versions.
+
+Required properties:
+- compatible       : May contain an SoC-specific compatibility string (see below)
+                     to account for any SoC-specific hardware bits that may be
+                     added on top of the base core controller.
+                     In addition, must contain compatibility information about
+                     the core NAND controller, of the following form:
+                     "brcm,brcmnand" and an appropriate version compatibility
+                     string, like "brcm,brcmnand-v7.0"
+                     Possible values:
+                         brcm,brcmnand-v4.0
+                         brcm,brcmnand-v5.0
+                         brcm,brcmnand-v6.0
+                         brcm,brcmnand-v6.1
+                         brcm,brcmnand-v7.0
+                         brcm,brcmnand-v7.1
+                         brcm,brcmnand
+- reg              : the register start and length for NAND register region.
+                     (optional) Flash DMA register range (if present)
+                     (optional) NAND flash cache range (if at non-standard offset)
+- reg-names        : a list of the names corresponding to the previous register
+                     ranges. Should contain "nand" and (optionally)
+                     "flash-dma" and/or "nand-cache".
+- interrupts       : The NAND CTLRDY interrupt and (if Flash DMA is available)
+                     FLASH_DMA_DONE
+- interrupt-names  : May be "nand_ctlrdy" or "flash_dma_done", if broken out as
+                     individual interrupts.
+                     May be "nand", if the SoC has the individual NAND
+                     interrupts multiplexed behind another custom piece of
+                     hardware
+- interrupt-parent : See standard interrupt bindings
+- #address-cells   : <1> - subnodes give the chip-select number
+- #size-cells      : <0>
+
+Optional properties:
+- brcm,nand-has-wp          : Some versions of this IP include a write-protect
+                              (WP) control bit. It is always available on >=
+                              v7.0. Use this property to describe the rare
+                              earlier versions of this core that include WP
+
+ -- Additonal SoC-specific NAND controller properties --
+
+The NAND controller is integrated differently on the variety of SoCs on which it
+is found. Part of this integration involves providing status and enable bits
+with which to control the 8 exposed NAND interrupts, as well as hardware for
+configuring the endianness of the data bus. On some SoCs, these features are
+handled via standard, modular components (e.g., their interrupts look like a
+normal IRQ chip), but on others, they are controlled in unique and interesting
+ways, sometimes with registers that lump multiple NAND-related functions
+together. The former case can be described simply by the standard interrupts
+properties in the main controller node. But for the latter exceptional cases,
+we define additional 'compatible' properties and associated register resources within the NAND controller node above.
+
+ - compatible: Can be one of several SoC-specific strings. Each SoC may have
+   different requirements for its additional properties, as described below each
+   bullet point below.
+
+   * "brcm,nand-bcm63138"
+     - reg: (required) the 'NAND_INT_BASE' register range, with separate status
+       and enable registers
+     - reg-names: (required) "nand-int-base"
+
+   * "brcm,nand-iproc"
+     - reg: (required) the "IDM" register range, for interrupt enable and APB
+       bus access endianness configuration, and the "EXT" register range,
+       for interrupt status/ack.
+     - reg-names: (required) a list of the names corresponding to the previous
+       register ranges. Should contain "iproc-idm" and "iproc-ext".
+
+
+* NAND chip-select
+
+Each controller (compatible: "brcm,brcmnand") may contain one or more subnodes
+to represent enabled chip-selects which (may) contain NAND flash chips. Their
+properties are as follows.
+
+Required properties:
+- compatible                : should contain "brcm,nandcs"
+- reg                       : a single integer representing the chip-select
+                              number (e.g., 0, 1, 2, etc.)
+- #address-cells            : see partition.txt
+- #size-cells               : see partition.txt
+- nand-ecc-strength         : see nand.txt
+- nand-ecc-step-size        : must be 512 or 1024. See nand.txt
+
+Optional properties:
+- nand-on-flash-bbt         : boolean, to enable the on-flash BBT for this
+                              chip-select. See nand.txt
+- brcm,nand-oob-sector-size : integer, to denote the spare area sector size
+                              expected for the ECC layout in use. This size, in
+                              addition to the strength and step-size,
+                              determines how the hardware BCH engine will lay
+                              out the parity bytes it stores on the flash.
+                              This property can be automatically determined by
+                              the flash geometry (particularly the NAND page
+                              and OOB size) in many cases, but when booting
+                              from NAND, the boot controller has only a limited
+                              number of available options for its default ECC
+                              layout.
+
+Each nandcs device node may optionally contain sub-nodes describing the flash
+partition mapping. See partition.txt for more detail.
+
+
+Example:
+
+nand@f0442800 {
+       compatible = "brcm,brcmnand-v7.0", "brcm,brcmnand";
+       reg = <0xF0442800 0x600>,
+             <0xF0443000 0x100>;
+       reg-names = "nand", "flash-dma";
+       interrupt-parent = <&hif_intr2_intc>;
+       interrupts = <24>, <4>;
+
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       nandcs@1 {
+               compatible = "brcm,nandcs";
+               reg = <1>; // Chip select 1
+               nand-on-flash-bbt;
+               nand-ecc-strength = <12>;
+               nand-ecc-step-size = <512>;
+
+               // Partitions
+               #address-cells = <1>;  // <2>, for 64-bit offset
+               #size-cells = <1>;     // <2>, for 64-bit length
+               flash0.rootfs@0 {
+                       reg = <0 0x10000000>;
+               };
+               flash0@0 {
+                       reg = <0 0>; // MTDPART_SIZ_FULL
+               };
+               flash0.kernel@10000000 {
+                       reg = <0x10000000 0x400000>;
+               };
+       };
+};
index a0ee3ca890ede76e43bcefdf5ef931c14834f7f3..e46cf6f0e5b0c704e84103fb47c2f3eb1a9971c5 100644 (file)
@@ -2267,6 +2267,12 @@ S:       Supported
 F:     drivers/gpio/gpio-bcm-kona.c
 F:     Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
 
+BROADCOM STB NAND FLASH DRIVER
+M:     Brian Norris <computersforpeace@gmail.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/brcmnand/
+
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 M:     RafaÅ‚ MiÅ‚ecki <zajec5@gmail.com>
 L:     linux-wireless@vger.kernel.org
index 9f02c28c0204d1c6935551dbca443d3665eee31e..54479c481a7a815dbedc5cbdc3bc734039620925 100644 (file)
@@ -16,6 +16,7 @@ config MTD_CFI
 config MTD_JEDECPROBE
        tristate "Detect non-CFI AMD/JEDEC-compatible flash chips"
        select MTD_GEN_PROBE
+       select MTD_CFI_UTIL
        help
          This option enables JEDEC-style probing of flash chips which are not
          compatible with the Common Flash Interface, but will use the common
index c50d8cf0f60dd01b0b6c25822788b53dd2884bfd..c3624eb571d16f0067acc8137e8654f1bf829a37 100644 (file)
@@ -1295,7 +1295,7 @@ static int do_otp_write(struct map_info *map, struct flchip *chip, loff_t adr,
                unsigned long bus_ofs = adr & ~(map_bankwidth(map)-1);
                int gap = adr - bus_ofs;
                int n = min_t(int, len, map_bankwidth(map) - gap);
-               map_word datum;
+               map_word datum = map_word_ff(map);
 
                if (n != map_bankwidth(map)) {
                        /* partial write of a word, load old contents */
index 09c79bd0b4f4fbdfd16f87fab4cb5687be070209..6f16552cd59f48d4cb4aab5f6fb3a250190cb4c2 100644 (file)
 #include <linux/mtd/map.h>
 #include <linux/mtd/cfi.h>
 
+void cfi_udelay(int us)
+{
+       if (us >= 1000) {
+               msleep((us+999)/1000);
+       } else {
+               udelay(us);
+               cond_resched();
+       }
+}
+EXPORT_SYMBOL(cfi_udelay);
+
+/*
+ * Returns the command address according to the given geometry.
+ */
+uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,
+                               struct map_info *map, struct cfi_private *cfi)
+{
+       unsigned bankwidth = map_bankwidth(map);
+       unsigned interleave = cfi_interleave(cfi);
+       unsigned type = cfi->device_type;
+       uint32_t addr;
+
+       addr = (cmd_ofs * type) * interleave;
+
+       /* Modify the unlock address if we are in compatibility mode.
+        * For 16bit devices on 8 bit busses
+        * and 32bit devices on 16 bit busses
+        * set the low bit of the alternating bit sequence of the address.
+        */
+       if (((type * interleave) > bankwidth) && ((cmd_ofs & 0xff) == 0xaa))
+               addr |= (type >> 1)*interleave;
+
+       return  addr;
+}
+EXPORT_SYMBOL(cfi_build_cmd_addr);
+
+/*
+ * Transforms the CFI command for the given geometry (bus width & interleave).
+ * It looks too long to be inline, but in the common case it should almost all
+ * get optimised away.
+ */
+map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi)
+{
+       map_word val = { {0} };
+       int wordwidth, words_per_bus, chip_mode, chips_per_word;
+       unsigned long onecmd;
+       int i;
+
+       /* We do it this way to give the compiler a fighting chance
+          of optimising away all the crap for 'bankwidth' larger than
+          an unsigned long, in the common case where that support is
+          disabled */
+       if (map_bankwidth_is_large(map)) {
+               wordwidth = sizeof(unsigned long);
+               words_per_bus = (map_bankwidth(map)) / wordwidth; // i.e. normally 1
+       } else {
+               wordwidth = map_bankwidth(map);
+               words_per_bus = 1;
+       }
+
+       chip_mode = map_bankwidth(map) / cfi_interleave(cfi);
+       chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map);
+
+       /* First, determine what the bit-pattern should be for a single
+          device, according to chip mode and endianness... */
+       switch (chip_mode) {
+       default: BUG();
+       case 1:
+               onecmd = cmd;
+               break;
+       case 2:
+               onecmd = cpu_to_cfi16(map, cmd);
+               break;
+       case 4:
+               onecmd = cpu_to_cfi32(map, cmd);
+               break;
+       }
+
+       /* Now replicate it across the size of an unsigned long, or
+          just to the bus width as appropriate */
+       switch (chips_per_word) {
+       default: BUG();
+#if BITS_PER_LONG >= 64
+       case 8:
+               onecmd |= (onecmd << (chip_mode * 32));
+#endif
+       case 4:
+               onecmd |= (onecmd << (chip_mode * 16));
+       case 2:
+               onecmd |= (onecmd << (chip_mode * 8));
+       case 1:
+               ;
+       }
+
+       /* And finally, for the multi-word case, replicate it
+          in all words in the structure */
+       for (i=0; i < words_per_bus; i++) {
+               val.x[i] = onecmd;
+       }
+
+       return val;
+}
+EXPORT_SYMBOL(cfi_build_cmd);
+
+unsigned long cfi_merge_status(map_word val, struct map_info *map,
+                                          struct cfi_private *cfi)
+{
+       int wordwidth, words_per_bus, chip_mode, chips_per_word;
+       unsigned long onestat, res = 0;
+       int i;
+
+       /* We do it this way to give the compiler a fighting chance
+          of optimising away all the crap for 'bankwidth' larger than
+          an unsigned long, in the common case where that support is
+          disabled */
+       if (map_bankwidth_is_large(map)) {
+               wordwidth = sizeof(unsigned long);
+               words_per_bus = (map_bankwidth(map)) / wordwidth; // i.e. normally 1
+       } else {
+               wordwidth = map_bankwidth(map);
+               words_per_bus = 1;
+       }
+
+       chip_mode = map_bankwidth(map) / cfi_interleave(cfi);
+       chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map);
+
+       onestat = val.x[0];
+       /* Or all status words together */
+       for (i=1; i < words_per_bus; i++) {
+               onestat |= val.x[i];
+       }
+
+       res = onestat;
+       switch(chips_per_word) {
+       default: BUG();
+#if BITS_PER_LONG >= 64
+       case 8:
+               res |= (onestat >> (chip_mode * 32));
+#endif
+       case 4:
+               res |= (onestat >> (chip_mode * 16));
+       case 2:
+               res |= (onestat >> (chip_mode * 8));
+       case 1:
+               ;
+       }
+
+       /* Last, determine what the bit-pattern should be for a single
+          device, according to chip mode and endianness... */
+       switch (chip_mode) {
+       case 1:
+               break;
+       case 2:
+               res = cfi16_to_cpu(map, res);
+               break;
+       case 4:
+               res = cfi32_to_cpu(map, res);
+               break;
+       default: BUG();
+       }
+       return res;
+}
+EXPORT_SYMBOL(cfi_merge_status);
+
+/*
+ * Sends a CFI command to a bank of flash for the given geometry.
+ *
+ * Returns the offset in flash where the command was written.
+ * If prev_val is non-null, it will be set to the value at the command address,
+ * before the command was written.
+ */
+uint32_t cfi_send_gen_cmd(u_char cmd, uint32_t cmd_addr, uint32_t base,
+                               struct map_info *map, struct cfi_private *cfi,
+                               int type, map_word *prev_val)
+{
+       map_word val;
+       uint32_t addr = base + cfi_build_cmd_addr(cmd_addr, map, cfi);
+       val = cfi_build_cmd(cmd, map, cfi);
+
+       if (prev_val)
+               *prev_val = map_read(map, addr);
+
+       map_write(map, val, addr);
+
+       return addr - base;
+}
+EXPORT_SYMBOL(cfi_send_gen_cmd);
+
 int __xipram cfi_qry_present(struct map_info *map, __u32 base,
                             struct cfi_private *cfi)
 {
index 866d319044750bda27e5679d36ff4b0e5d9d26aa..5e67b4acde780e648669c8de753776a89f99fff8 100644 (file)
@@ -1815,7 +1815,7 @@ static void doc_dbg_unregister(struct docg3 *docg3)
  * @chip_id: The chip ID of the supported chip
  * @mtd: The structure to fill
  */
-static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
+static int __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
 {
        struct docg3 *docg3 = mtd->priv;
        int cfg;
@@ -1828,6 +1828,8 @@ static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
        case DOC_CHIPID_G3:
                mtd->name = kasprintf(GFP_KERNEL, "docg3.%d",
                                      docg3->device_id);
+               if (!mtd->name)
+                       return -ENOMEM;
                docg3->max_block = 2047;
                break;
        }
@@ -1850,6 +1852,8 @@ static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
        mtd->_block_isbad = doc_block_isbad;
        mtd->ecclayout = &docg3_oobinfo;
        mtd->ecc_strength = DOC_ECC_BCH_T;
+
+       return 0;
 }
 
 /**
@@ -1900,7 +1904,7 @@ doc_probe_device(struct docg3_cascade *cascade, int floor, struct device *dev)
 
        ret = 0;
        if (chip_id != (u16)(~chip_id_inv)) {
-               goto nomem3;
+               goto nomem4;
        }
 
        switch (chip_id) {
@@ -1910,15 +1914,19 @@ doc_probe_device(struct docg3_cascade *cascade, int floor, struct device *dev)
                break;
        default:
                doc_err("Chip id %04x is not a DiskOnChip G3 chip\n", chip_id);
-               goto nomem3;
+               goto nomem4;
        }
 
-       doc_set_driver_info(chip_id, mtd);
+       ret = doc_set_driver_info(chip_id, mtd);
+       if (ret)
+               goto nomem4;
 
        doc_hamming_ecc_init(docg3, DOC_LAYOUT_OOB_PAGEINFO_SZ);
        doc_reload_bbt(docg3);
        return mtd;
 
+nomem4:
+       kfree(docg3->bbt);
 nomem3:
        kfree(mtd);
 nomem2:
@@ -2117,7 +2125,7 @@ static int docg3_release(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_OF
-static struct of_device_id docg3_dt_ids[] = {
+static const struct of_device_id docg3_dt_ids[] = {
        { .compatible = "m-systems,diskonchip-g3" },
        {}
 };
index 3af137f49ac9aa49c0c58ad59977b53b9d81f358..d313f948b96c62f208f3a20372f34efff176b2a7 100644 (file)
@@ -261,45 +261,33 @@ static int m25p_remove(struct spi_device *spi)
  * keep them available as module aliases for existing platforms.
  */
 static const struct spi_device_id m25p_ids[] = {
-       {"at25fs010"},  {"at25fs040"},  {"at25df041a"}, {"at25df321a"},
-       {"at25df641"},  {"at26f004"},   {"at26df081a"}, {"at26df161a"},
-       {"at26df321"},  {"at45db081d"},
-       {"en25f32"},    {"en25p32"},    {"en25q32b"},   {"en25p64"},
-       {"en25q64"},    {"en25qh128"},  {"en25qh256"},
-       {"f25l32pa"},
-       {"mr25h256"},   {"mr25h10"},
-       {"gd25q32"},    {"gd25q64"},
-       {"160s33b"},    {"320s33b"},    {"640s33b"},
-       {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"},  {"mx25l1606e"},
-       {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"},
-       {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"},
-       {"mx66l1g55g"},
-       {"n25q064"},    {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"},
-       {"n25q512a"},   {"n25q512ax3"}, {"n25q00"},
-       {"pm25lv512"},  {"pm25lv010"},  {"pm25lq032"},
-       {"s25sl032p"},  {"s25sl064p"},  {"s25fl256s0"}, {"s25fl256s1"},
-       {"s25fl512s"},  {"s70fl01gs"},  {"s25sl12800"}, {"s25sl12801"},
-       {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"},  {"s25sl008a"},
-       {"s25sl016a"},  {"s25sl032a"},  {"s25sl064a"},  {"s25fl008k"},
-       {"s25fl016k"},  {"s25fl064k"},  {"s25fl132k"},
-       {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"},
-       {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"},
-       {"sst25wf040"},
-       {"m25p05"},     {"m25p10"},     {"m25p20"},     {"m25p40"},
-       {"m25p80"},     {"m25p16"},     {"m25p32"},     {"m25p64"},
-       {"m25p128"},    {"n25q032"},
+       /*
+        * Entries not used in DTs that should be safe to drop after replacing
+        * them with "nor-jedec" in platform data.
+        */
+       {"s25sl064a"},  {"w25x16"},     {"m25p10"},     {"m25px64"},
+
+       /*
+        * Entries that were used in DTs without "nor-jedec" fallback and should
+        * be kept for backward compatibility.
+        */
+       {"at25df321a"}, {"at25df641"},  {"at26df081a"},
+       {"mr25h256"},
+       {"mx25l4005a"}, {"mx25l1606e"}, {"mx25l6405d"}, {"mx25l12805d"},
+       {"mx25l25635e"},{"mx66l51235l"},
+       {"n25q064"},    {"n25q128a11"}, {"n25q128a13"}, {"n25q512a"},
+       {"s25fl256s1"}, {"s25fl512s"},  {"s25sl12801"}, {"s25fl008k"},
+       {"s25fl064k"},
+       {"sst25vf040b"},{"sst25vf016b"},{"sst25vf032b"},{"sst25wf040"},
+       {"m25p40"},     {"m25p80"},     {"m25p16"},     {"m25p32"},
+       {"m25p64"},     {"m25p128"},
+       {"w25x80"},     {"w25x32"},     {"w25q32"},     {"w25q32dw"},
+       {"w25q80bl"},   {"w25q128"},    {"w25q256"},
+
+       /* Flashes that can't be detected using JEDEC */
        {"m25p05-nonjedec"},    {"m25p10-nonjedec"},    {"m25p20-nonjedec"},
        {"m25p40-nonjedec"},    {"m25p80-nonjedec"},    {"m25p16-nonjedec"},
        {"m25p32-nonjedec"},    {"m25p64-nonjedec"},    {"m25p128-nonjedec"},
-       {"m45pe10"},    {"m45pe80"},    {"m45pe16"},
-       {"m25pe20"},    {"m25pe80"},    {"m25pe16"},
-       {"m25px16"},    {"m25px32"},    {"m25px32-s0"}, {"m25px32-s1"},
-       {"m25px64"},    {"m25px80"},
-       {"w25x10"},     {"w25x20"},     {"w25x40"},     {"w25x80"},
-       {"w25x16"},     {"w25x32"},     {"w25q32"},     {"w25q32dw"},
-       {"w25x64"},     {"w25q64"},     {"w25q80"},     {"w25q80bl"},
-       {"w25q128"},    {"w25q256"},    {"cat25c11"},
-       {"cat25c03"},   {"cat25c09"},   {"cat25c17"},   {"cat25128"},
 
        /*
         * Generic support for SPI NOR that can be identified by the JEDEC READ
index 508bab3bd0c49b555b3cacf803f93b153b46ce13..04b24d2b03f285ab10c98d742b2915e48b3e4189 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * SMI (Serial Memory Controller) device driver for Serial NOR Flash on
  * SPEAr platform
- * The serial nor interface is largely based on drivers/mtd/m25p80.c,
- * however the SPI interface has been replaced by SMI.
+ * The serial nor interface is largely based on m25p80.c, however the SPI
+ * interface has been replaced by SMI.
  *
  * Copyright Â© 2010 STMicroelectronics.
  * Ashish Priyadarshi
index e715ae90632f82e69991bdc7704cc5dbd35ab0f9..7c95a656f9e479339464ea2cc3423353fbbc808f 100644 (file)
@@ -326,7 +326,7 @@ config MTD_BFIN_ASYNC
 
 config MTD_GPIO_ADDR
        tristate "GPIO-assisted Flash Chip Support"
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        depends on MTD_COMPLEX_MAPPINGS
        help
          Map driver which allows flashes to be partially physically addressed
index f7207b0a76dcf9d3537f6202c04dbf4696d3f069..f2b68667ea5904126daf90d2e7f719dfb7c25844 100644 (file)
@@ -138,7 +138,7 @@ static int amd76xrom_init_one(struct pci_dev *pdev,
        /*
         * Try to reserve the window mem region.  If this fails then
         * it is likely due to a fragment of the window being
-        * "reseved" by the BIOS.  In the case that the
+        * "reserved" by the BIOS.  In the case that the
         * request_mem_region() fails then once the rom size is
         * discovered we will try to reserve the unreserved fragment.
         */
index f8a7dd14cee0cc7a8b6767f0ef281ea95dd89149..70a3db3ab856f47c8da32959aed6bf996f83428c 100644 (file)
@@ -38,9 +38,9 @@ static void nw_en_write(void)
         * we want to write a bit pattern XXX1 to Xilinx to enable
         * the write gate, which will be open for about the next 2ms.
         */
-       spin_lock_irqsave(&nw_gpio_lock, flags);
+       raw_spin_lock_irqsave(&nw_gpio_lock, flags);
        nw_cpld_modify(CPLD_FLASH_WR_ENABLE, CPLD_FLASH_WR_ENABLE);
-       spin_unlock_irqrestore(&nw_gpio_lock, flags);
+       raw_spin_unlock_irqrestore(&nw_gpio_lock, flags);
 
        /*
         * let the ISA bus to catch on...
index f784cf0caa13b03d7a24542befe1a29e3638e35f..76ed651b515beef6275b7d67820eb1c4fee8e8dc 100644 (file)
@@ -234,7 +234,7 @@ static int esb2rom_init_one(struct pci_dev *pdev,
 
        /*
         * Try to reserve the window mem region.  If this fails then
-        * it is likely due to the window being "reseved" by the BIOS.
+        * it is likely due to the window being "reserved" by the BIOS.
         */
        window->rsrc.name = MOD_NAME;
        window->rsrc.start = window->phys;
index c7478e18f4858239319b34f916be6ad595695001..8636bba422009a1f54ff58b1611acac54cbf9b45 100644 (file)
@@ -167,7 +167,7 @@ static int ichxrom_init_one(struct pci_dev *pdev,
 
        /*
         * Try to reserve the window mem region.  If this fails then
-        * it is likely due to the window being "reseved" by the BIOS.
+        * it is likely due to the window being "reserved" by the BIOS.
         */
        window->rsrc.name = MOD_NAME;
        window->rsrc.start = window->phys;
index 33d26f5bee549ecd8bae2426ec9de3028e217d85..e2f878216048eed8ac69e973d5da7e9f4e668147 100644 (file)
@@ -45,7 +45,6 @@ struct ltq_mtd {
 };
 
 static const char ltq_map_name[] = "ltq_nor";
-static const char * const ltq_probe_types[] = { "cmdlinepart", "ofpart", NULL };
 
 static map_word
 ltq_read16(struct map_info *map, unsigned long adr)
@@ -168,8 +167,7 @@ ltq_mtd_probe(struct platform_device *pdev)
        cfi->addr_unlock2 ^= 1;
 
        ppdata.of_node = pdev->dev.of_node;
-       err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types,
-                                       &ppdata, NULL, 0);
+       err = mtd_device_parse_register(ltq_mtd->mtd, NULL, &ppdata, NULL, 0);
        if (err) {
                dev_err(&pdev->dev, "failed to add partitions\n");
                goto err_destroy;
index ff26e979b1a17c243e1525adfceed3886d479ba1..774b32fd29e673c10cf927cd159a5d50829d6e86 100644 (file)
@@ -147,7 +147,7 @@ static void of_free_probes(const char * const *probes)
                kfree(probes);
 }
 
-static struct of_device_id of_flash_match[];
+static const struct of_device_id of_flash_match[];
 static int of_flash_probe(struct platform_device *dev)
 {
        const char * const *part_probe_types;
@@ -327,7 +327,7 @@ err_flash_remove:
        return err;
 }
 
-static struct of_device_id of_flash_match[] = {
+static const struct of_device_id of_flash_match[] = {
        {
                .compatible     = "cfi-flash",
                .data           = (void *)"cfi_probe",
index 2b0c528709997a618d672e55c50bb44336a8cd69..41acc507b22ed942bee2f0df6f43dda073efeb99 100644 (file)
@@ -197,6 +197,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
                return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/
 
        mutex_lock(&dev->lock);
+       mutex_lock(&mtd_table_mutex);
 
        if (dev->open)
                goto unlock;
@@ -220,6 +221,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
 
 unlock:
        dev->open++;
+       mutex_unlock(&mtd_table_mutex);
        mutex_unlock(&dev->lock);
        blktrans_dev_put(dev);
        return ret;
@@ -230,6 +232,7 @@ error_release:
 error_put:
        module_put(dev->tr->owner);
        kref_put(&dev->ref, blktrans_dev_release);
+       mutex_unlock(&mtd_table_mutex);
        mutex_unlock(&dev->lock);
        blktrans_dev_put(dev);
        return ret;
@@ -243,6 +246,7 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode)
                return;
 
        mutex_lock(&dev->lock);
+       mutex_lock(&mtd_table_mutex);
 
        if (--dev->open)
                goto unlock;
@@ -256,6 +260,7 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode)
                __put_mtd_device(dev->mtd);
        }
 unlock:
+       mutex_unlock(&mtd_table_mutex);
        mutex_unlock(&dev->lock);
        blktrans_dev_put(dev);
 }
@@ -273,7 +278,7 @@ static int blktrans_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        if (!dev->mtd)
                goto unlock;
 
-       ret = dev->tr->getgeo ? dev->tr->getgeo(dev, geo) : 0;
+       ret = dev->tr->getgeo ? dev->tr->getgeo(dev, geo) : -ENOTTY;
 unlock:
        mutex_unlock(&dev->lock);
        blktrans_dev_put(dev);
index d172195fbd15fcbd947a2bc0780d0f9044cba2fd..8bbbb751bf45e2340e727439b6368c78d148089f 100644 (file)
 static struct backing_dev_info mtd_bdi = {
 };
 
-static int mtd_cls_suspend(struct device *dev, pm_message_t state);
-static int mtd_cls_resume(struct device *dev);
+#ifdef CONFIG_PM_SLEEP
+
+static int mtd_cls_suspend(struct device *dev)
+{
+       struct mtd_info *mtd = dev_get_drvdata(dev);
+
+       return mtd ? mtd_suspend(mtd) : 0;
+}
+
+static int mtd_cls_resume(struct device *dev)
+{
+       struct mtd_info *mtd = dev_get_drvdata(dev);
+
+       if (mtd)
+               mtd_resume(mtd);
+       return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(mtd_cls_pm_ops, mtd_cls_suspend, mtd_cls_resume);
+#define MTD_CLS_PM_OPS (&mtd_cls_pm_ops)
+#else
+#define MTD_CLS_PM_OPS NULL
+#endif
 
 static struct class mtd_class = {
        .name = "mtd",
        .owner = THIS_MODULE,
-       .suspend = mtd_cls_suspend,
-       .resume = mtd_cls_resume,
+       .pm = MTD_CLS_PM_OPS,
 };
 
 static DEFINE_IDR(mtd_idr);
@@ -88,22 +108,6 @@ static void mtd_release(struct device *dev)
        device_destroy(&mtd_class, index + 1);
 }
 
-static int mtd_cls_suspend(struct device *dev, pm_message_t state)
-{
-       struct mtd_info *mtd = dev_get_drvdata(dev);
-
-       return mtd ? mtd_suspend(mtd) : 0;
-}
-
-static int mtd_cls_resume(struct device *dev)
-{
-       struct mtd_info *mtd = dev_get_drvdata(dev);
-
-       if (mtd)
-               mtd_resume(mtd);
-       return 0;
-}
-
 static ssize_t mtd_type_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
@@ -375,8 +379,7 @@ static int mtd_reboot_notifier(struct notifier_block *n, unsigned long state,
  *
  *     Add a device to the list of MTD devices present in the system, and
  *     notify each currently active MTD 'user' of its arrival. Returns
- *     zero on success or 1 on failure, which currently will only happen
- *     if there is insufficient memory or a sysfs error.
+ *     zero on success or non-zero on failure.
  */
 
 int add_mtd_device(struct mtd_info *mtd)
@@ -390,8 +393,10 @@ int add_mtd_device(struct mtd_info *mtd)
        mutex_lock(&mtd_table_mutex);
 
        i = idr_alloc(&mtd_idr, mtd, 0, 0, GFP_KERNEL);
-       if (i < 0)
+       if (i < 0) {
+               error = i;
                goto fail_locked;
+       }
 
        mtd->index = i;
        mtd->usecount = 0;
@@ -420,6 +425,8 @@ int add_mtd_device(struct mtd_info *mtd)
                        printk(KERN_WARNING
                               "%s: unlock failed, writes may not work\n",
                               mtd->name);
+               /* Ignore unlock failures? */
+               error = 0;
        }
 
        /* Caller should have set dev.parent to match the
@@ -430,7 +437,8 @@ int add_mtd_device(struct mtd_info *mtd)
        mtd->dev.devt = MTD_DEVT(i);
        dev_set_name(&mtd->dev, "mtd%d", i);
        dev_set_drvdata(&mtd->dev, mtd);
-       if (device_register(&mtd->dev) != 0)
+       error = device_register(&mtd->dev);
+       if (error)
                goto fail_added;
 
        device_create(&mtd_class, mtd->dev.parent, MTD_DEVT(i) + 1, NULL,
@@ -454,7 +462,7 @@ fail_added:
        idr_remove(&mtd_idr, i);
 fail_locked:
        mutex_unlock(&mtd_table_mutex);
-       return 1;
+       return error;
 }
 
 /**
@@ -510,8 +518,8 @@ static int mtd_add_device_partitions(struct mtd_info *mtd,
 
        if (nbparts == 0 || IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) {
                ret = add_mtd_device(mtd);
-               if (ret == 1)
-                       return -ENODEV;
+               if (ret)
+                       return ret;
        }
 
        if (nbparts > 0) {
index 5897d8d8fa5a962d896e6726edde207b99575d39..5b2806a7e5f75fe928242bcfdd625d1194738507 100644 (file)
@@ -76,7 +76,7 @@ config MTD_NAND_DENALI_SCRATCH_REG_ADDR
 
 config MTD_NAND_GPIO
        tristate "GPIO assisted NAND Flash driver"
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
          This enables a NAND flash driver where control signals are
          connected to GPIO pins, and commands and data are communicated
@@ -394,6 +394,14 @@ config MTD_NAND_GPMI_NAND
         block, such as SD card. So pay attention to it when you enable
         the GPMI.
 
+config MTD_NAND_BRCMNAND
+       tristate "Broadcom STB NAND controller"
+       depends on ARM || MIPS
+       help
+         Enables the Broadcom NAND controller driver. The controller was
+         originally designed for Set-Top Box but is used on various BCM7xxx,
+         BCM3xxx, BCM63xxx, iProc/Cygnus and more.
+
 config MTD_NAND_BCM47XXNFLASH
        tristate "Support for NAND flash on BCM4706 BCMA bus"
        depends on BCMA_NFLASH
index 582bbd05aff7ab7df0a20c282bc25faa1532437a..1f897ec3c242a977a52128e37f56ef9431fbd548 100644 (file)
@@ -52,5 +52,6 @@ obj-$(CONFIG_MTD_NAND_XWAY)           += xway_nand.o
 obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)   += bcm47xxnflash/
 obj-$(CONFIG_MTD_NAND_SUNXI)           += sunxi_nand.o
 obj-$(CONFIG_MTD_NAND_HISI504)         += hisi504_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)                += brcmnand/
 
 nand-objs := nand_base.o nand_bbt.o nand_timings.o
diff --git a/drivers/mtd/nand/brcmnand/Makefile b/drivers/mtd/nand/brcmnand/Makefile
new file mode 100644 (file)
index 0000000..3b1fbfd
--- /dev/null
@@ -0,0 +1,6 @@
+# link order matters; don't link the more generic brcmstb_nand.o before the
+# more specific iproc_nand.o, for instance
+obj-$(CONFIG_MTD_NAND_BRCMNAND)                += iproc_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)                += bcm63138_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)                += brcmstb_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)                += brcmnand.o
diff --git a/drivers/mtd/nand/brcmnand/bcm63138_nand.c b/drivers/mtd/nand/brcmnand/bcm63138_nand.c
new file mode 100644 (file)
index 0000000..3f4c44c
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * Copyright Â© 2015 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/device.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include "brcmnand.h"
+
+struct bcm63138_nand_soc_priv {
+       void __iomem *base;
+};
+
+#define BCM63138_NAND_INT_STATUS               0x00
+#define BCM63138_NAND_INT_EN                   0x04
+
+enum {
+       BCM63138_CTLRDY         = BIT(4),
+};
+
+static bool bcm63138_nand_intc_ack(struct brcmnand_soc *soc)
+{
+       struct bcm63138_nand_soc_priv *priv = soc->priv;
+       void __iomem *mmio = priv->base + BCM63138_NAND_INT_STATUS;
+       u32 val = brcmnand_readl(mmio);
+
+       if (val & BCM63138_CTLRDY) {
+               brcmnand_writel(val & ~BCM63138_CTLRDY, mmio);
+               return true;
+       }
+
+       return false;
+}
+
+static void bcm63138_nand_intc_set(struct brcmnand_soc *soc, bool en)
+{
+       struct bcm63138_nand_soc_priv *priv = soc->priv;
+       void __iomem *mmio = priv->base + BCM63138_NAND_INT_EN;
+       u32 val = brcmnand_readl(mmio);
+
+       if (en)
+               val |= BCM63138_CTLRDY;
+       else
+               val &= ~BCM63138_CTLRDY;
+
+       brcmnand_writel(val, mmio);
+}
+
+static int bcm63138_nand_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct bcm63138_nand_soc_priv *priv;
+       struct brcmnand_soc *soc;
+       struct resource *res;
+
+       soc = devm_kzalloc(dev, sizeof(*soc), GFP_KERNEL);
+       if (!soc)
+               return -ENOMEM;
+
+       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand-int-base");
+       priv->base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(priv->base))
+               return PTR_ERR(priv->base);
+
+       soc->pdev = pdev;
+       soc->priv = priv;
+       soc->ctlrdy_ack = bcm63138_nand_intc_ack;
+       soc->ctlrdy_set_enabled = bcm63138_nand_intc_set;
+
+       return brcmnand_probe(pdev, soc);
+}
+
+static const struct of_device_id bcm63138_nand_of_match[] = {
+       { .compatible = "brcm,nand-bcm63138" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, bcm63138_nand_of_match);
+
+static struct platform_driver bcm63138_nand_driver = {
+       .probe                  = bcm63138_nand_probe,
+       .remove                 = brcmnand_remove,
+       .driver = {
+               .name           = "bcm63138_nand",
+               .pm             = &brcmnand_pm_ops,
+               .of_match_table = bcm63138_nand_of_match,
+       }
+};
+module_platform_driver(bcm63138_nand_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Brian Norris");
+MODULE_DESCRIPTION("NAND driver for BCM63138");
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
new file mode 100644 (file)
index 0000000..fddb795
--- /dev/null
@@ -0,0 +1,2246 @@
+/*
+ * Copyright Â© 2010-2015 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/completion.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
+#include <linux/ioport.h>
+#include <linux/bug.h>
+#include <linux/kernel.h>
+#include <linux/bitops.h>
+#include <linux/mm.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/of.h>
+#include <linux/of_mtd.h>
+#include <linux/of_platform.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/log2.h>
+
+#include "brcmnand.h"
+
+/*
+ * This flag controls if WP stays on between erase/write commands to mitigate
+ * flash corruption due to power glitches. Values:
+ * 0: NAND_WP is not used or not available
+ * 1: NAND_WP is set by default, cleared for erase/write operations
+ * 2: NAND_WP is always cleared
+ */
+static int wp_on = 1;
+module_param(wp_on, int, 0444);
+
+/***********************************************************************
+ * Definitions
+ ***********************************************************************/
+
+#define DRV_NAME                       "brcmnand"
+
+#define CMD_NULL                       0x00
+#define CMD_PAGE_READ                  0x01
+#define CMD_SPARE_AREA_READ            0x02
+#define CMD_STATUS_READ                        0x03
+#define CMD_PROGRAM_PAGE               0x04
+#define CMD_PROGRAM_SPARE_AREA         0x05
+#define CMD_COPY_BACK                  0x06
+#define CMD_DEVICE_ID_READ             0x07
+#define CMD_BLOCK_ERASE                        0x08
+#define CMD_FLASH_RESET                        0x09
+#define CMD_BLOCKS_LOCK                        0x0a
+#define CMD_BLOCKS_LOCK_DOWN           0x0b
+#define CMD_BLOCKS_UNLOCK              0x0c
+#define CMD_READ_BLOCKS_LOCK_STATUS    0x0d
+#define CMD_PARAMETER_READ             0x0e
+#define CMD_PARAMETER_CHANGE_COL       0x0f
+#define CMD_LOW_LEVEL_OP               0x10
+
+struct brcm_nand_dma_desc {
+       u32 next_desc;
+       u32 next_desc_ext;
+       u32 cmd_irq;
+       u32 dram_addr;
+       u32 dram_addr_ext;
+       u32 tfr_len;
+       u32 total_len;
+       u32 flash_addr;
+       u32 flash_addr_ext;
+       u32 cs;
+       u32 pad2[5];
+       u32 status_valid;
+} __packed;
+
+/* Bitfields for brcm_nand_dma_desc::status_valid */
+#define FLASH_DMA_ECC_ERROR    (1 << 8)
+#define FLASH_DMA_CORR_ERROR   (1 << 9)
+
+/* 512B flash cache in the NAND controller HW */
+#define FC_SHIFT               9U
+#define FC_BYTES               512U
+#define FC_WORDS               (FC_BYTES >> 2)
+
+#define BRCMNAND_MIN_PAGESIZE  512
+#define BRCMNAND_MIN_BLOCKSIZE (8 * 1024)
+#define BRCMNAND_MIN_DEVSIZE   (4ULL * 1024 * 1024)
+
+/* Controller feature flags */
+enum {
+       BRCMNAND_HAS_1K_SECTORS                 = BIT(0),
+       BRCMNAND_HAS_PREFETCH                   = BIT(1),
+       BRCMNAND_HAS_CACHE_MODE                 = BIT(2),
+       BRCMNAND_HAS_WP                         = BIT(3),
+};
+
+struct brcmnand_controller {
+       struct device           *dev;
+       struct nand_hw_control  controller;
+       void __iomem            *nand_base;
+       void __iomem            *nand_fc; /* flash cache */
+       void __iomem            *flash_dma_base;
+       unsigned int            irq;
+       unsigned int            dma_irq;
+       int                     nand_version;
+
+       /* Some SoCs provide custom interrupt status register(s) */
+       struct brcmnand_soc     *soc;
+
+       int                     cmd_pending;
+       bool                    dma_pending;
+       struct completion       done;
+       struct completion       dma_done;
+
+       /* List of NAND hosts (one for each chip-select) */
+       struct list_head host_list;
+
+       struct brcm_nand_dma_desc *dma_desc;
+       dma_addr_t              dma_pa;
+
+       /* in-memory cache of the FLASH_CACHE, used only for some commands */
+       u32                     flash_cache[FC_WORDS];
+
+       /* Controller revision details */
+       const u16               *reg_offsets;
+       unsigned int            reg_spacing; /* between CS1, CS2, ... regs */
+       const u8                *cs_offsets; /* within each chip-select */
+       const u8                *cs0_offsets; /* within CS0, if different */
+       unsigned int            max_block_size;
+       const unsigned int      *block_sizes;
+       unsigned int            max_page_size;
+       const unsigned int      *page_sizes;
+       unsigned int            max_oob;
+       u32                     features;
+
+       /* for low-power standby/resume only */
+       u32                     nand_cs_nand_select;
+       u32                     nand_cs_nand_xor;
+       u32                     corr_stat_threshold;
+       u32                     flash_dma_mode;
+};
+
+struct brcmnand_cfg {
+       u64                     device_size;
+       unsigned int            block_size;
+       unsigned int            page_size;
+       unsigned int            spare_area_size;
+       unsigned int            device_width;
+       unsigned int            col_adr_bytes;
+       unsigned int            blk_adr_bytes;
+       unsigned int            ful_adr_bytes;
+       unsigned int            sector_size_1k;
+       unsigned int            ecc_level;
+       /* use for low-power standby/resume only */
+       u32                     acc_control;
+       u32                     config;
+       u32                     config_ext;
+       u32                     timing_1;
+       u32                     timing_2;
+};
+
+struct brcmnand_host {
+       struct list_head        node;
+       struct device_node      *of_node;
+
+       struct nand_chip        chip;
+       struct mtd_info         mtd;
+       struct platform_device  *pdev;
+       int                     cs;
+
+       unsigned int            last_cmd;
+       unsigned int            last_byte;
+       u64                     last_addr;
+       struct brcmnand_cfg     hwcfg;
+       struct brcmnand_controller *ctrl;
+};
+
+enum brcmnand_reg {
+       BRCMNAND_CMD_START = 0,
+       BRCMNAND_CMD_EXT_ADDRESS,
+       BRCMNAND_CMD_ADDRESS,
+       BRCMNAND_INTFC_STATUS,
+       BRCMNAND_CS_SELECT,
+       BRCMNAND_CS_XOR,
+       BRCMNAND_LL_OP,
+       BRCMNAND_CS0_BASE,
+       BRCMNAND_CS1_BASE,              /* CS1 regs, if non-contiguous */
+       BRCMNAND_CORR_THRESHOLD,
+       BRCMNAND_CORR_THRESHOLD_EXT,
+       BRCMNAND_UNCORR_COUNT,
+       BRCMNAND_CORR_COUNT,
+       BRCMNAND_CORR_EXT_ADDR,
+       BRCMNAND_CORR_ADDR,
+       BRCMNAND_UNCORR_EXT_ADDR,
+       BRCMNAND_UNCORR_ADDR,
+       BRCMNAND_SEMAPHORE,
+       BRCMNAND_ID,
+       BRCMNAND_ID_EXT,
+       BRCMNAND_LL_RDATA,
+       BRCMNAND_OOB_READ_BASE,
+       BRCMNAND_OOB_READ_10_BASE,      /* offset 0x10, if non-contiguous */
+       BRCMNAND_OOB_WRITE_BASE,
+       BRCMNAND_OOB_WRITE_10_BASE,     /* offset 0x10, if non-contiguous */
+       BRCMNAND_FC_BASE,
+};
+
+/* BRCMNAND v4.0 */
+static const u16 brcmnand_regs_v40[] = {
+       [BRCMNAND_CMD_START]            =  0x04,
+       [BRCMNAND_CMD_EXT_ADDRESS]      =  0x08,
+       [BRCMNAND_CMD_ADDRESS]          =  0x0c,
+       [BRCMNAND_INTFC_STATUS]         =  0x6c,
+       [BRCMNAND_CS_SELECT]            =  0x14,
+       [BRCMNAND_CS_XOR]               =  0x18,
+       [BRCMNAND_LL_OP]                = 0x178,
+       [BRCMNAND_CS0_BASE]             =  0x40,
+       [BRCMNAND_CS1_BASE]             =  0xd0,
+       [BRCMNAND_CORR_THRESHOLD]       =  0x84,
+       [BRCMNAND_CORR_THRESHOLD_EXT]   =     0,
+       [BRCMNAND_UNCORR_COUNT]         =     0,
+       [BRCMNAND_CORR_COUNT]           =     0,
+       [BRCMNAND_CORR_EXT_ADDR]        =  0x70,
+       [BRCMNAND_CORR_ADDR]            =  0x74,
+       [BRCMNAND_UNCORR_EXT_ADDR]      =  0x78,
+       [BRCMNAND_UNCORR_ADDR]          =  0x7c,
+       [BRCMNAND_SEMAPHORE]            =  0x58,
+       [BRCMNAND_ID]                   =  0x60,
+       [BRCMNAND_ID_EXT]               =  0x64,
+       [BRCMNAND_LL_RDATA]             = 0x17c,
+       [BRCMNAND_OOB_READ_BASE]        =  0x20,
+       [BRCMNAND_OOB_READ_10_BASE]     = 0x130,
+       [BRCMNAND_OOB_WRITE_BASE]       =  0x30,
+       [BRCMNAND_OOB_WRITE_10_BASE]    =     0,
+       [BRCMNAND_FC_BASE]              = 0x200,
+};
+
+/* BRCMNAND v5.0 */
+static const u16 brcmnand_regs_v50[] = {
+       [BRCMNAND_CMD_START]            =  0x04,
+       [BRCMNAND_CMD_EXT_ADDRESS]      =  0x08,
+       [BRCMNAND_CMD_ADDRESS]          =  0x0c,
+       [BRCMNAND_INTFC_STATUS]         =  0x6c,
+       [BRCMNAND_CS_SELECT]            =  0x14,
+       [BRCMNAND_CS_XOR]               =  0x18,
+       [BRCMNAND_LL_OP]                = 0x178,
+       [BRCMNAND_CS0_BASE]             =  0x40,
+       [BRCMNAND_CS1_BASE]             =  0xd0,
+       [BRCMNAND_CORR_THRESHOLD]       =  0x84,
+       [BRCMNAND_CORR_THRESHOLD_EXT]   =     0,
+       [BRCMNAND_UNCORR_COUNT]         =     0,
+       [BRCMNAND_CORR_COUNT]           =     0,
+       [BRCMNAND_CORR_EXT_ADDR]        =  0x70,
+       [BRCMNAND_CORR_ADDR]            =  0x74,
+       [BRCMNAND_UNCORR_EXT_ADDR]      =  0x78,
+       [BRCMNAND_UNCORR_ADDR]          =  0x7c,
+       [BRCMNAND_SEMAPHORE]            =  0x58,
+       [BRCMNAND_ID]                   =  0x60,
+       [BRCMNAND_ID_EXT]               =  0x64,
+       [BRCMNAND_LL_RDATA]             = 0x17c,
+       [BRCMNAND_OOB_READ_BASE]        =  0x20,
+       [BRCMNAND_OOB_READ_10_BASE]     = 0x130,
+       [BRCMNAND_OOB_WRITE_BASE]       =  0x30,
+       [BRCMNAND_OOB_WRITE_10_BASE]    = 0x140,
+       [BRCMNAND_FC_BASE]              = 0x200,
+};
+
+/* BRCMNAND v6.0 - v7.1 */
+static const u16 brcmnand_regs_v60[] = {
+       [BRCMNAND_CMD_START]            =  0x04,
+       [BRCMNAND_CMD_EXT_ADDRESS]      =  0x08,
+       [BRCMNAND_CMD_ADDRESS]          =  0x0c,
+       [BRCMNAND_INTFC_STATUS]         =  0x14,
+       [BRCMNAND_CS_SELECT]            =  0x18,
+       [BRCMNAND_CS_XOR]               =  0x1c,
+       [BRCMNAND_LL_OP]                =  0x20,
+       [BRCMNAND_CS0_BASE]             =  0x50,
+       [BRCMNAND_CS1_BASE]             =     0,
+       [BRCMNAND_CORR_THRESHOLD]       =  0xc0,
+       [BRCMNAND_CORR_THRESHOLD_EXT]   =  0xc4,
+       [BRCMNAND_UNCORR_COUNT]         =  0xfc,
+       [BRCMNAND_CORR_COUNT]           = 0x100,
+       [BRCMNAND_CORR_EXT_ADDR]        = 0x10c,
+       [BRCMNAND_CORR_ADDR]            = 0x110,
+       [BRCMNAND_UNCORR_EXT_ADDR]      = 0x114,
+       [BRCMNAND_UNCORR_ADDR]          = 0x118,
+       [BRCMNAND_SEMAPHORE]            = 0x150,
+       [BRCMNAND_ID]                   = 0x194,
+       [BRCMNAND_ID_EXT]               = 0x198,
+       [BRCMNAND_LL_RDATA]             = 0x19c,
+       [BRCMNAND_OOB_READ_BASE]        = 0x200,
+       [BRCMNAND_OOB_READ_10_BASE]     =     0,
+       [BRCMNAND_OOB_WRITE_BASE]       = 0x280,
+       [BRCMNAND_OOB_WRITE_10_BASE]    =     0,
+       [BRCMNAND_FC_BASE]              = 0x400,
+};
+
+enum brcmnand_cs_reg {
+       BRCMNAND_CS_CFG_EXT = 0,
+       BRCMNAND_CS_CFG,
+       BRCMNAND_CS_ACC_CONTROL,
+       BRCMNAND_CS_TIMING1,
+       BRCMNAND_CS_TIMING2,
+};
+
+/* Per chip-select offsets for v7.1 */
+static const u8 brcmnand_cs_offsets_v71[] = {
+       [BRCMNAND_CS_ACC_CONTROL]       = 0x00,
+       [BRCMNAND_CS_CFG_EXT]           = 0x04,
+       [BRCMNAND_CS_CFG]               = 0x08,
+       [BRCMNAND_CS_TIMING1]           = 0x0c,
+       [BRCMNAND_CS_TIMING2]           = 0x10,
+};
+
+/* Per chip-select offsets for pre v7.1, except CS0 on <= v5.0 */
+static const u8 brcmnand_cs_offsets[] = {
+       [BRCMNAND_CS_ACC_CONTROL]       = 0x00,
+       [BRCMNAND_CS_CFG_EXT]           = 0x04,
+       [BRCMNAND_CS_CFG]               = 0x04,
+       [BRCMNAND_CS_TIMING1]           = 0x08,
+       [BRCMNAND_CS_TIMING2]           = 0x0c,
+};
+
+/* Per chip-select offset for <= v5.0 on CS0 only */
+static const u8 brcmnand_cs_offsets_cs0[] = {
+       [BRCMNAND_CS_ACC_CONTROL]       = 0x00,
+       [BRCMNAND_CS_CFG_EXT]           = 0x08,
+       [BRCMNAND_CS_CFG]               = 0x08,
+       [BRCMNAND_CS_TIMING1]           = 0x10,
+       [BRCMNAND_CS_TIMING2]           = 0x14,
+};
+
+/* BRCMNAND_INTFC_STATUS */
+enum {
+       INTFC_FLASH_STATUS              = GENMASK(7, 0),
+
+       INTFC_ERASED                    = BIT(27),
+       INTFC_OOB_VALID                 = BIT(28),
+       INTFC_CACHE_VALID               = BIT(29),
+       INTFC_FLASH_READY               = BIT(30),
+       INTFC_CTLR_READY                = BIT(31),
+};
+
+static inline u32 nand_readreg(struct brcmnand_controller *ctrl, u32 offs)
+{
+       return brcmnand_readl(ctrl->nand_base + offs);
+}
+
+static inline void nand_writereg(struct brcmnand_controller *ctrl, u32 offs,
+                                u32 val)
+{
+       brcmnand_writel(val, ctrl->nand_base + offs);
+}
+
+static int brcmnand_revision_init(struct brcmnand_controller *ctrl)
+{
+       static const unsigned int block_sizes_v6[] = { 8, 16, 128, 256, 512, 1024, 2048, 0 };
+       static const unsigned int block_sizes_v4[] = { 16, 128, 8, 512, 256, 1024, 2048, 0 };
+       static const unsigned int page_sizes[] = { 512, 2048, 4096, 8192, 0 };
+
+       ctrl->nand_version = nand_readreg(ctrl, 0) & 0xffff;
+
+       /* Only support v4.0+? */
+       if (ctrl->nand_version < 0x0400) {
+               dev_err(ctrl->dev, "version %#x not supported\n",
+                       ctrl->nand_version);
+               return -ENODEV;
+       }
+
+       /* Register offsets */
+       if (ctrl->nand_version >= 0x0600)
+               ctrl->reg_offsets = brcmnand_regs_v60;
+       else if (ctrl->nand_version >= 0x0500)
+               ctrl->reg_offsets = brcmnand_regs_v50;
+       else if (ctrl->nand_version >= 0x0400)
+               ctrl->reg_offsets = brcmnand_regs_v40;
+
+       /* Chip-select stride */
+       if (ctrl->nand_version >= 0x0701)
+               ctrl->reg_spacing = 0x14;
+       else
+               ctrl->reg_spacing = 0x10;
+
+       /* Per chip-select registers */
+       if (ctrl->nand_version >= 0x0701) {
+               ctrl->cs_offsets = brcmnand_cs_offsets_v71;
+       } else {
+               ctrl->cs_offsets = brcmnand_cs_offsets;
+
+               /* v5.0 and earlier has a different CS0 offset layout */
+               if (ctrl->nand_version <= 0x0500)
+                       ctrl->cs0_offsets = brcmnand_cs_offsets_cs0;
+       }
+
+       /* Page / block sizes */
+       if (ctrl->nand_version >= 0x0701) {
+               /* >= v7.1 use nice power-of-2 values! */
+               ctrl->max_page_size = 16 * 1024;
+               ctrl->max_block_size = 2 * 1024 * 1024;
+       } else {
+               ctrl->page_sizes = page_sizes;
+               if (ctrl->nand_version >= 0x0600)
+                       ctrl->block_sizes = block_sizes_v6;
+               else
+                       ctrl->block_sizes = block_sizes_v4;
+
+               if (ctrl->nand_version < 0x0400) {
+                       ctrl->max_page_size = 4096;
+                       ctrl->max_block_size = 512 * 1024;
+               }
+       }
+
+       /* Maximum spare area sector size (per 512B) */
+       if (ctrl->nand_version >= 0x0600)
+               ctrl->max_oob = 64;
+       else if (ctrl->nand_version >= 0x0500)
+               ctrl->max_oob = 32;
+       else
+               ctrl->max_oob = 16;
+
+       /* v6.0 and newer (except v6.1) have prefetch support */
+       if (ctrl->nand_version >= 0x0600 && ctrl->nand_version != 0x0601)
+               ctrl->features |= BRCMNAND_HAS_PREFETCH;
+
+       /*
+        * v6.x has cache mode, but it's implemented differently. Ignore it for
+        * now.
+        */
+       if (ctrl->nand_version >= 0x0700)
+               ctrl->features |= BRCMNAND_HAS_CACHE_MODE;
+
+       if (ctrl->nand_version >= 0x0500)
+               ctrl->features |= BRCMNAND_HAS_1K_SECTORS;
+
+       if (ctrl->nand_version >= 0x0700)
+               ctrl->features |= BRCMNAND_HAS_WP;
+       else if (of_property_read_bool(ctrl->dev->of_node, "brcm,nand-has-wp"))
+               ctrl->features |= BRCMNAND_HAS_WP;
+
+       return 0;
+}
+
+static inline u32 brcmnand_read_reg(struct brcmnand_controller *ctrl,
+               enum brcmnand_reg reg)
+{
+       u16 offs = ctrl->reg_offsets[reg];
+
+       if (offs)
+               return nand_readreg(ctrl, offs);
+       else
+               return 0;
+}
+
+static inline void brcmnand_write_reg(struct brcmnand_controller *ctrl,
+                                     enum brcmnand_reg reg, u32 val)
+{
+       u16 offs = ctrl->reg_offsets[reg];
+
+       if (offs)
+               nand_writereg(ctrl, offs, val);
+}
+
+static inline void brcmnand_rmw_reg(struct brcmnand_controller *ctrl,
+                                   enum brcmnand_reg reg, u32 mask, unsigned
+                                   int shift, u32 val)
+{
+       u32 tmp = brcmnand_read_reg(ctrl, reg);
+
+       tmp &= ~mask;
+       tmp |= val << shift;
+       brcmnand_write_reg(ctrl, reg, tmp);
+}
+
+static inline u32 brcmnand_read_fc(struct brcmnand_controller *ctrl, int word)
+{
+       return __raw_readl(ctrl->nand_fc + word * 4);
+}
+
+static inline void brcmnand_write_fc(struct brcmnand_controller *ctrl,
+                                    int word, u32 val)
+{
+       __raw_writel(val, ctrl->nand_fc + word * 4);
+}
+
+static inline u16 brcmnand_cs_offset(struct brcmnand_controller *ctrl, int cs,
+                                    enum brcmnand_cs_reg reg)
+{
+       u16 offs_cs0 = ctrl->reg_offsets[BRCMNAND_CS0_BASE];
+       u16 offs_cs1 = ctrl->reg_offsets[BRCMNAND_CS1_BASE];
+       u8 cs_offs;
+
+       if (cs == 0 && ctrl->cs0_offsets)
+               cs_offs = ctrl->cs0_offsets[reg];
+       else
+               cs_offs = ctrl->cs_offsets[reg];
+
+       if (cs && offs_cs1)
+               return offs_cs1 + (cs - 1) * ctrl->reg_spacing + cs_offs;
+
+       return offs_cs0 + cs * ctrl->reg_spacing + cs_offs;
+}
+
+static inline u32 brcmnand_count_corrected(struct brcmnand_controller *ctrl)
+{
+       if (ctrl->nand_version < 0x0600)
+               return 1;
+       return brcmnand_read_reg(ctrl, BRCMNAND_CORR_COUNT);
+}
+
+static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       unsigned int shift = 0, bits;
+       enum brcmnand_reg reg = BRCMNAND_CORR_THRESHOLD;
+       int cs = host->cs;
+
+       if (ctrl->nand_version >= 0x0600)
+               bits = 6;
+       else if (ctrl->nand_version >= 0x0500)
+               bits = 5;
+       else
+               bits = 4;
+
+       if (ctrl->nand_version >= 0x0600) {
+               if (cs >= 5)
+                       reg = BRCMNAND_CORR_THRESHOLD_EXT;
+               shift = (cs % 5) * bits;
+       }
+       brcmnand_rmw_reg(ctrl, reg, (bits - 1) << shift, shift, val);
+}
+
+static inline int brcmnand_cmd_shift(struct brcmnand_controller *ctrl)
+{
+       if (ctrl->nand_version < 0x0700)
+               return 24;
+       return 0;
+}
+
+/***********************************************************************
+ * NAND ACC CONTROL bitfield
+ *
+ * Some bits have remained constant throughout hardware revision, while
+ * others have shifted around.
+ ***********************************************************************/
+
+/* Constant for all versions (where supported) */
+enum {
+       /* See BRCMNAND_HAS_CACHE_MODE */
+       ACC_CONTROL_CACHE_MODE                          = BIT(22),
+
+       /* See BRCMNAND_HAS_PREFETCH */
+       ACC_CONTROL_PREFETCH                            = BIT(23),
+
+       ACC_CONTROL_PAGE_HIT                            = BIT(24),
+       ACC_CONTROL_WR_PREEMPT                          = BIT(25),
+       ACC_CONTROL_PARTIAL_PAGE                        = BIT(26),
+       ACC_CONTROL_RD_ERASED                           = BIT(27),
+       ACC_CONTROL_FAST_PGM_RDIN                       = BIT(28),
+       ACC_CONTROL_WR_ECC                              = BIT(30),
+       ACC_CONTROL_RD_ECC                              = BIT(31),
+};
+
+static inline u32 brcmnand_spare_area_mask(struct brcmnand_controller *ctrl)
+{
+       if (ctrl->nand_version >= 0x0600)
+               return GENMASK(6, 0);
+       else
+               return GENMASK(5, 0);
+}
+
+#define NAND_ACC_CONTROL_ECC_SHIFT     16
+
+static inline u32 brcmnand_ecc_level_mask(struct brcmnand_controller *ctrl)
+{
+       u32 mask = (ctrl->nand_version >= 0x0600) ? 0x1f : 0x0f;
+
+       return mask << NAND_ACC_CONTROL_ECC_SHIFT;
+}
+
+static void brcmnand_set_ecc_enabled(struct brcmnand_host *host, int en)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       u16 offs = brcmnand_cs_offset(ctrl, host->cs, BRCMNAND_CS_ACC_CONTROL);
+       u32 acc_control = nand_readreg(ctrl, offs);
+       u32 ecc_flags = ACC_CONTROL_WR_ECC | ACC_CONTROL_RD_ECC;
+
+       if (en) {
+               acc_control |= ecc_flags; /* enable RD/WR ECC */
+               acc_control |= host->hwcfg.ecc_level
+                              << NAND_ACC_CONTROL_ECC_SHIFT;
+       } else {
+               acc_control &= ~ecc_flags; /* disable RD/WR ECC */
+               acc_control &= ~brcmnand_ecc_level_mask(ctrl);
+       }
+
+       nand_writereg(ctrl, offs, acc_control);
+}
+
+static inline int brcmnand_sector_1k_shift(struct brcmnand_controller *ctrl)
+{
+       if (ctrl->nand_version >= 0x0600)
+               return 7;
+       else if (ctrl->nand_version >= 0x0500)
+               return 6;
+       else
+               return -1;
+}
+
+static int brcmnand_get_sector_size_1k(struct brcmnand_host *host)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       int shift = brcmnand_sector_1k_shift(ctrl);
+       u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
+                                                 BRCMNAND_CS_ACC_CONTROL);
+
+       if (shift < 0)
+               return 0;
+
+       return (nand_readreg(ctrl, acc_control_offs) >> shift) & 0x1;
+}
+
+static void brcmnand_set_sector_size_1k(struct brcmnand_host *host, int val)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       int shift = brcmnand_sector_1k_shift(ctrl);
+       u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
+                                                 BRCMNAND_CS_ACC_CONTROL);
+       u32 tmp;
+
+       if (shift < 0)
+               return;
+
+       tmp = nand_readreg(ctrl, acc_control_offs);
+       tmp &= ~(1 << shift);
+       tmp |= (!!val) << shift;
+       nand_writereg(ctrl, acc_control_offs, tmp);
+}
+
+/***********************************************************************
+ * CS_NAND_SELECT
+ ***********************************************************************/
+
+enum {
+       CS_SELECT_NAND_WP                       = BIT(29),
+       CS_SELECT_AUTO_DEVICE_ID_CFG            = BIT(30),
+};
+
+static inline void brcmnand_set_wp(struct brcmnand_controller *ctrl, bool en)
+{
+       u32 val = en ? CS_SELECT_NAND_WP : 0;
+
+       brcmnand_rmw_reg(ctrl, BRCMNAND_CS_SELECT, CS_SELECT_NAND_WP, 0, val);
+}
+
+/***********************************************************************
+ * Flash DMA
+ ***********************************************************************/
+
+enum flash_dma_reg {
+       FLASH_DMA_REVISION              = 0x00,
+       FLASH_DMA_FIRST_DESC            = 0x04,
+       FLASH_DMA_FIRST_DESC_EXT        = 0x08,
+       FLASH_DMA_CTRL                  = 0x0c,
+       FLASH_DMA_MODE                  = 0x10,
+       FLASH_DMA_STATUS                = 0x14,
+       FLASH_DMA_INTERRUPT_DESC        = 0x18,
+       FLASH_DMA_INTERRUPT_DESC_EXT    = 0x1c,
+       FLASH_DMA_ERROR_STATUS          = 0x20,
+       FLASH_DMA_CURRENT_DESC          = 0x24,
+       FLASH_DMA_CURRENT_DESC_EXT      = 0x28,
+};
+
+static inline bool has_flash_dma(struct brcmnand_controller *ctrl)
+{
+       return ctrl->flash_dma_base;
+}
+
+static inline bool flash_dma_buf_ok(const void *buf)
+{
+       return buf && !is_vmalloc_addr(buf) &&
+               likely(IS_ALIGNED((uintptr_t)buf, 4));
+}
+
+static inline void flash_dma_writel(struct brcmnand_controller *ctrl, u8 offs,
+                                   u32 val)
+{
+       brcmnand_writel(val, ctrl->flash_dma_base + offs);
+}
+
+static inline u32 flash_dma_readl(struct brcmnand_controller *ctrl, u8 offs)
+{
+       return brcmnand_readl(ctrl->flash_dma_base + offs);
+}
+
+/* Low-level operation types: command, address, write, or read */
+enum brcmnand_llop_type {
+       LL_OP_CMD,
+       LL_OP_ADDR,
+       LL_OP_WR,
+       LL_OP_RD,
+};
+
+/***********************************************************************
+ * Internal support functions
+ ***********************************************************************/
+
+static inline bool is_hamming_ecc(struct brcmnand_cfg *cfg)
+{
+       return cfg->sector_size_1k == 0 && cfg->spare_area_size == 16 &&
+               cfg->ecc_level == 15;
+}
+
+/*
+ * Returns a nand_ecclayout strucutre for the given layout/configuration.
+ * Returns NULL on failure.
+ */
+static struct nand_ecclayout *brcmnand_create_layout(int ecc_level,
+                                                    struct brcmnand_host *host)
+{
+       struct brcmnand_cfg *cfg = &host->hwcfg;
+       int i, j;
+       struct nand_ecclayout *layout;
+       int req;
+       int sectors;
+       int sas;
+       int idx1, idx2;
+
+       layout = devm_kzalloc(&host->pdev->dev, sizeof(*layout), GFP_KERNEL);
+       if (!layout)
+               return NULL;
+
+       sectors = cfg->page_size / (512 << cfg->sector_size_1k);
+       sas = cfg->spare_area_size << cfg->sector_size_1k;
+
+       /* Hamming */
+       if (is_hamming_ecc(cfg)) {
+               for (i = 0, idx1 = 0, idx2 = 0; i < sectors; i++) {
+                       /* First sector of each page may have BBI */
+                       if (i == 0) {
+                               layout->oobfree[idx2].offset = i * sas + 1;
+                               /* Small-page NAND use byte 6 for BBI */
+                               if (cfg->page_size == 512)
+                                       layout->oobfree[idx2].offset--;
+                               layout->oobfree[idx2].length = 5;
+                       } else {
+                               layout->oobfree[idx2].offset = i * sas;
+                               layout->oobfree[idx2].length = 6;
+                       }
+                       idx2++;
+                       layout->eccpos[idx1++] = i * sas + 6;
+                       layout->eccpos[idx1++] = i * sas + 7;
+                       layout->eccpos[idx1++] = i * sas + 8;
+                       layout->oobfree[idx2].offset = i * sas + 9;
+                       layout->oobfree[idx2].length = 7;
+                       idx2++;
+                       /* Leave zero-terminated entry for OOBFREE */
+                       if (idx1 >= MTD_MAX_ECCPOS_ENTRIES_LARGE ||
+                                   idx2 >= MTD_MAX_OOBFREE_ENTRIES_LARGE - 1)
+                               break;
+               }
+               goto out;
+       }
+
+       /*
+        * CONTROLLER_VERSION:
+        *   < v5.0: ECC_REQ = ceil(BCH_T * 13/8)
+        *  >= v5.0: ECC_REQ = ceil(BCH_T * 14/8)
+        * But we will just be conservative.
+        */
+       req = DIV_ROUND_UP(ecc_level * 14, 8);
+       if (req >= sas) {
+               dev_err(&host->pdev->dev,
+                       "error: ECC too large for OOB (ECC bytes %d, spare sector %d)\n",
+                       req, sas);
+               return NULL;
+       }
+
+       layout->eccbytes = req * sectors;
+       for (i = 0, idx1 = 0, idx2 = 0; i < sectors; i++) {
+               for (j = sas - req; j < sas && idx1 <
+                               MTD_MAX_ECCPOS_ENTRIES_LARGE; j++, idx1++)
+                       layout->eccpos[idx1] = i * sas + j;
+
+               /* First sector of each page may have BBI */
+               if (i == 0) {
+                       if (cfg->page_size == 512 && (sas - req >= 6)) {
+                               /* Small-page NAND use byte 6 for BBI */
+                               layout->oobfree[idx2].offset = 0;
+                               layout->oobfree[idx2].length = 5;
+                               idx2++;
+                               if (sas - req > 6) {
+                                       layout->oobfree[idx2].offset = 6;
+                                       layout->oobfree[idx2].length =
+                                               sas - req - 6;
+                                       idx2++;
+                               }
+                       } else if (sas > req + 1) {
+                               layout->oobfree[idx2].offset = i * sas + 1;
+                               layout->oobfree[idx2].length = sas - req - 1;
+                               idx2++;
+                       }
+               } else if (sas > req) {
+                       layout->oobfree[idx2].offset = i * sas;
+                       layout->oobfree[idx2].length = sas - req;
+                       idx2++;
+               }
+               /* Leave zero-terminated entry for OOBFREE */
+               if (idx1 >= MTD_MAX_ECCPOS_ENTRIES_LARGE ||
+                               idx2 >= MTD_MAX_OOBFREE_ENTRIES_LARGE - 1)
+                       break;
+       }
+out:
+       /* Sum available OOB */
+       for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES_LARGE; i++)
+               layout->oobavail += layout->oobfree[i].length;
+       return layout;
+}
+
+static struct nand_ecclayout *brcmstb_choose_ecc_layout(
+               struct brcmnand_host *host)
+{
+       struct nand_ecclayout *layout;
+       struct brcmnand_cfg *p = &host->hwcfg;
+       unsigned int ecc_level = p->ecc_level;
+
+       if (p->sector_size_1k)
+               ecc_level <<= 1;
+
+       layout = brcmnand_create_layout(ecc_level, host);
+       if (!layout) {
+               dev_err(&host->pdev->dev,
+                               "no proper ecc_layout for this NAND cfg\n");
+               return NULL;
+       }
+
+       return layout;
+}
+
+static void brcmnand_wp(struct mtd_info *mtd, int wp)
+{
+       struct nand_chip *chip = mtd->priv;
+       struct brcmnand_host *host = chip->priv;
+       struct brcmnand_controller *ctrl = host->ctrl;
+
+       if ((ctrl->features & BRCMNAND_HAS_WP) && wp_on == 1) {
+               static int old_wp = -1;
+
+               if (old_wp != wp) {
+                       dev_dbg(ctrl->dev, "WP %s\n", wp ? "on" : "off");
+                       old_wp = wp;
+               }
+               brcmnand_set_wp(ctrl, wp);
+       }
+}
+
+/* Helper functions for reading and writing OOB registers */
+static inline u8 oob_reg_read(struct brcmnand_controller *ctrl, u32 offs)
+{
+       u16 offset0, offset10, reg_offs;
+
+       offset0 = ctrl->reg_offsets[BRCMNAND_OOB_READ_BASE];
+       offset10 = ctrl->reg_offsets[BRCMNAND_OOB_READ_10_BASE];
+
+       if (offs >= ctrl->max_oob)
+               return 0x77;
+
+       if (offs >= 16 && offset10)
+               reg_offs = offset10 + ((offs - 0x10) & ~0x03);
+       else
+               reg_offs = offset0 + (offs & ~0x03);
+
+       return nand_readreg(ctrl, reg_offs) >> (24 - ((offs & 0x03) << 3));
+}
+
+static inline void oob_reg_write(struct brcmnand_controller *ctrl, u32 offs,
+                                u32 data)
+{
+       u16 offset0, offset10, reg_offs;
+
+       offset0 = ctrl->reg_offsets[BRCMNAND_OOB_WRITE_BASE];
+       offset10 = ctrl->reg_offsets[BRCMNAND_OOB_WRITE_10_BASE];
+
+       if (offs >= ctrl->max_oob)
+               return;
+
+       if (offs >= 16 && offset10)
+               reg_offs = offset10 + ((offs - 0x10) & ~0x03);
+       else
+               reg_offs = offset0 + (offs & ~0x03);
+
+       nand_writereg(ctrl, reg_offs, data);
+}
+
+/*
+ * read_oob_from_regs - read data from OOB registers
+ * @ctrl: NAND controller
+ * @i: sub-page sector index
+ * @oob: buffer to read to
+ * @sas: spare area sector size (i.e., OOB size per FLASH_CACHE)
+ * @sector_1k: 1 for 1KiB sectors, 0 for 512B, other values are illegal
+ */
+static int read_oob_from_regs(struct brcmnand_controller *ctrl, int i, u8 *oob,
+                             int sas, int sector_1k)
+{
+       int tbytes = sas << sector_1k;
+       int j;
+
+       /* Adjust OOB values for 1K sector size */
+       if (sector_1k && (i & 0x01))
+               tbytes = max(0, tbytes - (int)ctrl->max_oob);
+       tbytes = min_t(int, tbytes, ctrl->max_oob);
+
+       for (j = 0; j < tbytes; j++)
+               oob[j] = oob_reg_read(ctrl, j);
+       return tbytes;
+}
+
+/*
+ * write_oob_to_regs - write data to OOB registers
+ * @i: sub-page sector index
+ * @oob: buffer to write from
+ * @sas: spare area sector size (i.e., OOB size per FLASH_CACHE)
+ * @sector_1k: 1 for 1KiB sectors, 0 for 512B, other values are illegal
+ */
+static int write_oob_to_regs(struct brcmnand_controller *ctrl, int i,
+                            const u8 *oob, int sas, int sector_1k)
+{
+       int tbytes = sas << sector_1k;
+       int j;
+
+       /* Adjust OOB values for 1K sector size */
+       if (sector_1k && (i & 0x01))
+               tbytes = max(0, tbytes - (int)ctrl->max_oob);
+       tbytes = min_t(int, tbytes, ctrl->max_oob);
+
+       for (j = 0; j < tbytes; j += 4)
+               oob_reg_write(ctrl, j,
+                               (oob[j + 0] << 24) |
+                               (oob[j + 1] << 16) |
+                               (oob[j + 2] <<  8) |
+                               (oob[j + 3] <<  0));
+       return tbytes;
+}
+
+static irqreturn_t brcmnand_ctlrdy_irq(int irq, void *data)
+{
+       struct brcmnand_controller *ctrl = data;
+
+       /* Discard all NAND_CTLRDY interrupts during DMA */
+       if (ctrl->dma_pending)
+               return IRQ_HANDLED;
+
+       complete(&ctrl->done);
+       return IRQ_HANDLED;
+}
+
+/* Handle SoC-specific interrupt hardware */
+static irqreturn_t brcmnand_irq(int irq, void *data)
+{
+       struct brcmnand_controller *ctrl = data;
+
+       if (ctrl->soc->ctlrdy_ack(ctrl->soc))
+               return brcmnand_ctlrdy_irq(irq, data);
+
+       return IRQ_NONE;
+}
+
+static irqreturn_t brcmnand_dma_irq(int irq, void *data)
+{
+       struct brcmnand_controller *ctrl = data;
+
+       complete(&ctrl->dma_done);
+
+       return IRQ_HANDLED;
+}
+
+static void brcmnand_send_cmd(struct brcmnand_host *host, int cmd)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       u32 intfc;
+
+       dev_dbg(ctrl->dev, "send native cmd %d addr_lo 0x%x\n", cmd,
+               brcmnand_read_reg(ctrl, BRCMNAND_CMD_ADDRESS));
+       BUG_ON(ctrl->cmd_pending != 0);
+       ctrl->cmd_pending = cmd;
+
+       intfc = brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS);
+       BUG_ON(!(intfc & INTFC_CTLR_READY));
+
+       mb(); /* flush previous writes */
+       brcmnand_write_reg(ctrl, BRCMNAND_CMD_START,
+                          cmd << brcmnand_cmd_shift(ctrl));
+}
+
+/***********************************************************************
+ * NAND MTD API: read/program/erase
+ ***********************************************************************/
+
+static void brcmnand_cmd_ctrl(struct mtd_info *mtd, int dat,
+       unsigned int ctrl)
+{
+       /* intentionally left blank */
+}
+
+static int brcmnand_waitfunc(struct mtd_info *mtd, struct nand_chip *this)
+{
+       struct nand_chip *chip = mtd->priv;
+       struct brcmnand_host *host = chip->priv;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       unsigned long timeo = msecs_to_jiffies(100);
+
+       dev_dbg(ctrl->dev, "wait on native cmd %d\n", ctrl->cmd_pending);
+       if (ctrl->cmd_pending &&
+                       wait_for_completion_timeout(&ctrl->done, timeo) <= 0) {
+               u32 cmd = brcmnand_read_reg(ctrl, BRCMNAND_CMD_START)
+                                       >> brcmnand_cmd_shift(ctrl);
+
+               dev_err_ratelimited(ctrl->dev,
+                       "timeout waiting for command %#02x\n", cmd);
+               dev_err_ratelimited(ctrl->dev, "intfc status %08x\n",
+                       brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS));
+       }
+       ctrl->cmd_pending = 0;
+       return brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS) &
+                                INTFC_FLASH_STATUS;
+}
+
+enum {
+       LLOP_RE                         = BIT(16),
+       LLOP_WE                         = BIT(17),
+       LLOP_ALE                        = BIT(18),
+       LLOP_CLE                        = BIT(19),
+       LLOP_RETURN_IDLE                = BIT(31),
+
+       LLOP_DATA_MASK                  = GENMASK(15, 0),
+};
+
+static int brcmnand_low_level_op(struct brcmnand_host *host,
+                                enum brcmnand_llop_type type, u32 data,
+                                bool last_op)
+{
+       struct mtd_info *mtd = &host->mtd;
+       struct nand_chip *chip = &host->chip;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       u32 tmp;
+
+       tmp = data & LLOP_DATA_MASK;
+       switch (type) {
+       case LL_OP_CMD:
+               tmp |= LLOP_WE | LLOP_CLE;
+               break;
+       case LL_OP_ADDR:
+               /* WE | ALE */
+               tmp |= LLOP_WE | LLOP_ALE;
+               break;
+       case LL_OP_WR:
+               /* WE */
+               tmp |= LLOP_WE;
+               break;
+       case LL_OP_RD:
+               /* RE */
+               tmp |= LLOP_RE;
+               break;
+       }
+       if (last_op)
+               /* RETURN_IDLE */
+               tmp |= LLOP_RETURN_IDLE;
+
+       dev_dbg(ctrl->dev, "ll_op cmd %#x\n", tmp);
+
+       brcmnand_write_reg(ctrl, BRCMNAND_LL_OP, tmp);
+       (void)brcmnand_read_reg(ctrl, BRCMNAND_LL_OP);
+
+       brcmnand_send_cmd(host, CMD_LOW_LEVEL_OP);
+       return brcmnand_waitfunc(mtd, chip);
+}
+
+static void brcmnand_cmdfunc(struct mtd_info *mtd, unsigned command,
+                            int column, int page_addr)
+{
+       struct nand_chip *chip = mtd->priv;
+       struct brcmnand_host *host = chip->priv;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       u64 addr = (u64)page_addr << chip->page_shift;
+       int native_cmd = 0;
+
+       if (command == NAND_CMD_READID || command == NAND_CMD_PARAM ||
+                       command == NAND_CMD_RNDOUT)
+               addr = (u64)column;
+       /* Avoid propagating a negative, don't-care address */
+       else if (page_addr < 0)
+               addr = 0;
+
+       dev_dbg(ctrl->dev, "cmd 0x%x addr 0x%llx\n", command,
+               (unsigned long long)addr);
+
+       host->last_cmd = command;
+       host->last_byte = 0;
+       host->last_addr = addr;
+
+       switch (command) {
+       case NAND_CMD_RESET:
+               native_cmd = CMD_FLASH_RESET;
+               break;
+       case NAND_CMD_STATUS:
+               native_cmd = CMD_STATUS_READ;
+               break;
+       case NAND_CMD_READID:
+               native_cmd = CMD_DEVICE_ID_READ;
+               break;
+       case NAND_CMD_READOOB:
+               native_cmd = CMD_SPARE_AREA_READ;
+               break;
+       case NAND_CMD_ERASE1:
+               native_cmd = CMD_BLOCK_ERASE;
+               brcmnand_wp(mtd, 0);
+               break;
+       case NAND_CMD_PARAM:
+               native_cmd = CMD_PARAMETER_READ;
+               break;
+       case NAND_CMD_SET_FEATURES:
+       case NAND_CMD_GET_FEATURES:
+               brcmnand_low_level_op(host, LL_OP_CMD, command, false);
+               brcmnand_low_level_op(host, LL_OP_ADDR, column, false);
+               break;
+       case NAND_CMD_RNDOUT:
+               native_cmd = CMD_PARAMETER_CHANGE_COL;
+               addr &= ~((u64)(FC_BYTES - 1));
+               /*
+                * HW quirk: PARAMETER_CHANGE_COL requires SECTOR_SIZE_1K=0
+                * NB: hwcfg.sector_size_1k may not be initialized yet
+                */
+               if (brcmnand_get_sector_size_1k(host)) {
+                       host->hwcfg.sector_size_1k =
+                               brcmnand_get_sector_size_1k(host);
+                       brcmnand_set_sector_size_1k(host, 0);
+               }
+               break;
+       }
+
+       if (!native_cmd)
+               return;
+
+       brcmnand_write_reg(ctrl, BRCMNAND_CMD_EXT_ADDRESS,
+               (host->cs << 16) | ((addr >> 32) & 0xffff));
+       (void)brcmnand_read_reg(ctrl, BRCMNAND_CMD_EXT_ADDRESS);
+       brcmnand_write_reg(ctrl, BRCMNAND_CMD_ADDRESS, lower_32_bits(addr));
+       (void)brcmnand_read_reg(ctrl, BRCMNAND_CMD_ADDRESS);
+
+       brcmnand_send_cmd(host, native_cmd);
+       brcmnand_waitfunc(mtd, chip);
+
+       if (native_cmd == CMD_PARAMETER_READ ||
+                       native_cmd == CMD_PARAMETER_CHANGE_COL) {
+               int i;
+
+               brcmnand_soc_data_bus_prepare(ctrl->soc);
+
+               /*
+                * Must cache the FLASH_CACHE now, since changes in
+                * SECTOR_SIZE_1K may invalidate it
+                */
+               for (i = 0; i < FC_WORDS; i++)
+                       ctrl->flash_cache[i] = brcmnand_read_fc(ctrl, i);
+
+               brcmnand_soc_data_bus_unprepare(ctrl->soc);
+
+               /* Cleanup from HW quirk: restore SECTOR_SIZE_1K */
+               if (host->hwcfg.sector_size_1k)
+                       brcmnand_set_sector_size_1k(host,
+                                                   host->hwcfg.sector_size_1k);
+       }
+
+       /* Re-enable protection is necessary only after erase */
+       if (command == NAND_CMD_ERASE1)
+               brcmnand_wp(mtd, 1);
+}
+
+static uint8_t brcmnand_read_byte(struct mtd_info *mtd)
+{
+       struct nand_chip *chip = mtd->priv;
+       struct brcmnand_host *host = chip->priv;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       uint8_t ret = 0;
+       int addr, offs;
+
+       switch (host->last_cmd) {
+       case NAND_CMD_READID:
+               if (host->last_byte < 4)
+                       ret = brcmnand_read_reg(ctrl, BRCMNAND_ID) >>
+                               (24 - (host->last_byte << 3));
+               else if (host->last_byte < 8)
+                       ret = brcmnand_read_reg(ctrl, BRCMNAND_ID_EXT) >>
+                               (56 - (host->last_byte << 3));
+               break;
+
+       case NAND_CMD_READOOB:
+               ret = oob_reg_read(ctrl, host->last_byte);
+               break;
+
+       case NAND_CMD_STATUS:
+               ret = brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS) &
+                                       INTFC_FLASH_STATUS;
+               if (wp_on) /* hide WP status */
+                       ret |= NAND_STATUS_WP;
+               break;
+
+       case NAND_CMD_PARAM:
+       case NAND_CMD_RNDOUT:
+               addr = host->last_addr + host->last_byte;
+               offs = addr & (FC_BYTES - 1);
+
+               /* At FC_BYTES boundary, switch to next column */
+               if (host->last_byte > 0 && offs == 0)
+                       chip->cmdfunc(mtd, NAND_CMD_RNDOUT, addr, -1);
+
+               ret = ctrl->flash_cache[offs >> 2] >>
+                                       (24 - ((offs & 0x03) << 3));
+               break;
+       case NAND_CMD_GET_FEATURES:
+               if (host->last_byte >= ONFI_SUBFEATURE_PARAM_LEN) {
+                       ret = 0;
+               } else {
+                       bool last = host->last_byte ==
+                               ONFI_SUBFEATURE_PARAM_LEN - 1;
+                       brcmnand_low_level_op(host, LL_OP_RD, 0, last);
+                       ret = brcmnand_read_reg(ctrl, BRCMNAND_LL_RDATA) & 0xff;
+               }
+       }
+
+       dev_dbg(ctrl->dev, "read byte = 0x%02x\n", ret);
+       host->last_byte++;
+
+       return ret;
+}
+
+static void brcmnand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
+{
+       int i;
+
+       for (i = 0; i < len; i++, buf++)
+               *buf = brcmnand_read_byte(mtd);
+}
+
+static void brcmnand_write_buf(struct mtd_info *mtd, const uint8_t *buf,
+                                  int len)
+{
+       int i;
+       struct nand_chip *chip = mtd->priv;
+       struct brcmnand_host *host = chip->priv;
+
+       switch (host->last_cmd) {
+       case NAND_CMD_SET_FEATURES:
+               for (i = 0; i < len; i++)
+                       brcmnand_low_level_op(host, LL_OP_WR, buf[i],
+                                                 (i + 1) == len);
+               break;
+       default:
+               BUG();
+               break;
+       }
+}
+
+/**
+ * Construct a FLASH_DMA descriptor as part of a linked list. You must know the
+ * following ahead of time:
+ *  - Is this descriptor the beginning or end of a linked list?
+ *  - What is the (DMA) address of the next descriptor in the linked list?
+ */
+static int brcmnand_fill_dma_desc(struct brcmnand_host *host,
+                                 struct brcm_nand_dma_desc *desc, u64 addr,
+                                 dma_addr_t buf, u32 len, u8 dma_cmd,
+                                 bool begin, bool end,
+                                 dma_addr_t next_desc)
+{
+       memset(desc, 0, sizeof(*desc));
+       /* Descriptors are written in native byte order (wordwise) */
+       desc->next_desc = lower_32_bits(next_desc);
+       desc->next_desc_ext = upper_32_bits(next_desc);
+       desc->cmd_irq = (dma_cmd << 24) |
+               (end ? (0x03 << 8) : 0) | /* IRQ | STOP */
+               (!!begin) | ((!!end) << 1); /* head, tail */
+#ifdef CONFIG_CPU_BIG_ENDIAN
+       desc->cmd_irq |= 0x01 << 12;
+#endif
+       desc->dram_addr = lower_32_bits(buf);
+       desc->dram_addr_ext = upper_32_bits(buf);
+       desc->tfr_len = len;
+       desc->total_len = len;
+       desc->flash_addr = lower_32_bits(addr);
+       desc->flash_addr_ext = upper_32_bits(addr);
+       desc->cs = host->cs;
+       desc->status_valid = 0x01;
+       return 0;
+}
+
+/**
+ * Kick the FLASH_DMA engine, with a given DMA descriptor
+ */
+static void brcmnand_dma_run(struct brcmnand_host *host, dma_addr_t desc)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       unsigned long timeo = msecs_to_jiffies(100);
+
+       flash_dma_writel(ctrl, FLASH_DMA_FIRST_DESC, lower_32_bits(desc));
+       (void)flash_dma_readl(ctrl, FLASH_DMA_FIRST_DESC);
+       flash_dma_writel(ctrl, FLASH_DMA_FIRST_DESC_EXT, upper_32_bits(desc));
+       (void)flash_dma_readl(ctrl, FLASH_DMA_FIRST_DESC_EXT);
+
+       /* Start FLASH_DMA engine */
+       ctrl->dma_pending = true;
+       mb(); /* flush previous writes */
+       flash_dma_writel(ctrl, FLASH_DMA_CTRL, 0x03); /* wake | run */
+
+       if (wait_for_completion_timeout(&ctrl->dma_done, timeo) <= 0) {
+               dev_err(ctrl->dev,
+                               "timeout waiting for DMA; status %#x, error status %#x\n",
+                               flash_dma_readl(ctrl, FLASH_DMA_STATUS),
+                               flash_dma_readl(ctrl, FLASH_DMA_ERROR_STATUS));
+       }
+       ctrl->dma_pending = false;
+       flash_dma_writel(ctrl, FLASH_DMA_CTRL, 0); /* force stop */
+}
+
+static int brcmnand_dma_trans(struct brcmnand_host *host, u64 addr, u32 *buf,
+                             u32 len, u8 dma_cmd)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       dma_addr_t buf_pa;
+       int dir = dma_cmd == CMD_PAGE_READ ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
+
+       buf_pa = dma_map_single(ctrl->dev, buf, len, dir);
+       if (dma_mapping_error(ctrl->dev, buf_pa)) {
+               dev_err(ctrl->dev, "unable to map buffer for DMA\n");
+               return -ENOMEM;
+       }
+
+       brcmnand_fill_dma_desc(host, ctrl->dma_desc, addr, buf_pa, len,
+                                  dma_cmd, true, true, 0);
+
+       brcmnand_dma_run(host, ctrl->dma_pa);
+
+       dma_unmap_single(ctrl->dev, buf_pa, len, dir);
+
+       if (ctrl->dma_desc->status_valid & FLASH_DMA_ECC_ERROR)
+               return -EBADMSG;
+       else if (ctrl->dma_desc->status_valid & FLASH_DMA_CORR_ERROR)
+               return -EUCLEAN;
+
+       return 0;
+}
+
+/*
+ * Assumes proper CS is already set
+ */
+static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
+                               u64 addr, unsigned int trans, u32 *buf,
+                               u8 *oob, u64 *err_addr)
+{
+       struct brcmnand_host *host = chip->priv;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       int i, j, ret = 0;
+
+       /* Clear error addresses */
+       brcmnand_write_reg(ctrl, BRCMNAND_UNCORR_ADDR, 0);
+       brcmnand_write_reg(ctrl, BRCMNAND_CORR_ADDR, 0);
+
+       brcmnand_write_reg(ctrl, BRCMNAND_CMD_EXT_ADDRESS,
+                       (host->cs << 16) | ((addr >> 32) & 0xffff));
+       (void)brcmnand_read_reg(ctrl, BRCMNAND_CMD_EXT_ADDRESS);
+
+       for (i = 0; i < trans; i++, addr += FC_BYTES) {
+               brcmnand_write_reg(ctrl, BRCMNAND_CMD_ADDRESS,
+                                  lower_32_bits(addr));
+               (void)brcmnand_read_reg(ctrl, BRCMNAND_CMD_ADDRESS);
+               /* SPARE_AREA_READ does not use ECC, so just use PAGE_READ */
+               brcmnand_send_cmd(host, CMD_PAGE_READ);
+               brcmnand_waitfunc(mtd, chip);
+
+               if (likely(buf)) {
+                       brcmnand_soc_data_bus_prepare(ctrl->soc);
+
+                       for (j = 0; j < FC_WORDS; j++, buf++)
+                               *buf = brcmnand_read_fc(ctrl, j);
+
+                       brcmnand_soc_data_bus_unprepare(ctrl->soc);
+               }
+
+               if (oob)
+                       oob += read_oob_from_regs(ctrl, i, oob,
+                                       mtd->oobsize / trans,
+                                       host->hwcfg.sector_size_1k);
+
+               if (!ret) {
+                       *err_addr = brcmnand_read_reg(ctrl,
+                                       BRCMNAND_UNCORR_ADDR) |
+                               ((u64)(brcmnand_read_reg(ctrl,
+                                               BRCMNAND_UNCORR_EXT_ADDR)
+                                       & 0xffff) << 32);
+                       if (*err_addr)
+                               ret = -EBADMSG;
+               }
+
+               if (!ret) {
+                       *err_addr = brcmnand_read_reg(ctrl,
+                                       BRCMNAND_CORR_ADDR) |
+                               ((u64)(brcmnand_read_reg(ctrl,
+                                               BRCMNAND_CORR_EXT_ADDR)
+                                       & 0xffff) << 32);
+                       if (*err_addr)
+                               ret = -EUCLEAN;
+               }
+       }
+
+       return ret;
+}
+
+static int brcmnand_read(struct mtd_info *mtd, struct nand_chip *chip,
+                        u64 addr, unsigned int trans, u32 *buf, u8 *oob)
+{
+       struct brcmnand_host *host = chip->priv;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       u64 err_addr = 0;
+       int err;
+
+       dev_dbg(ctrl->dev, "read %llx -> %p\n", (unsigned long long)addr, buf);
+
+       brcmnand_write_reg(ctrl, BRCMNAND_UNCORR_COUNT, 0);
+
+       if (has_flash_dma(ctrl) && !oob && flash_dma_buf_ok(buf)) {
+               err = brcmnand_dma_trans(host, addr, buf, trans * FC_BYTES,
+                                            CMD_PAGE_READ);
+               if (err) {
+                       if (mtd_is_bitflip_or_eccerr(err))
+                               err_addr = addr;
+                       else
+                               return -EIO;
+               }
+       } else {
+               if (oob)
+                       memset(oob, 0x99, mtd->oobsize);
+
+               err = brcmnand_read_by_pio(mtd, chip, addr, trans, buf,
+                                              oob, &err_addr);
+       }
+
+       if (mtd_is_eccerr(err)) {
+               dev_dbg(ctrl->dev, "uncorrectable error at 0x%llx\n",
+                       (unsigned long long)err_addr);
+               mtd->ecc_stats.failed++;
+               /* NAND layer expects zero on ECC errors */
+               return 0;
+       }
+
+       if (mtd_is_bitflip(err)) {
+               unsigned int corrected = brcmnand_count_corrected(ctrl);
+
+               dev_dbg(ctrl->dev, "corrected error at 0x%llx\n",
+                       (unsigned long long)err_addr);
+               mtd->ecc_stats.corrected += corrected;
+               /* Always exceed the software-imposed threshold */
+               return max(mtd->bitflip_threshold, corrected);
+       }
+
+       return 0;
+}
+
+static int brcmnand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+                             uint8_t *buf, int oob_required, int page)
+{
+       struct brcmnand_host *host = chip->priv;
+       u8 *oob = oob_required ? (u8 *)chip->oob_poi : NULL;
+
+       return brcmnand_read(mtd, chip, host->last_addr,
+                       mtd->writesize >> FC_SHIFT, (u32 *)buf, oob);
+}
+
+static int brcmnand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                                 uint8_t *buf, int oob_required, int page)
+{
+       struct brcmnand_host *host = chip->priv;
+       u8 *oob = oob_required ? (u8 *)chip->oob_poi : NULL;
+       int ret;
+
+       brcmnand_set_ecc_enabled(host, 0);
+       ret = brcmnand_read(mtd, chip, host->last_addr,
+                       mtd->writesize >> FC_SHIFT, (u32 *)buf, oob);
+       brcmnand_set_ecc_enabled(host, 1);
+       return ret;
+}
+
+static int brcmnand_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
+                            int page)
+{
+       return brcmnand_read(mtd, chip, (u64)page << chip->page_shift,
+                       mtd->writesize >> FC_SHIFT,
+                       NULL, (u8 *)chip->oob_poi);
+}
+
+static int brcmnand_read_oob_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                                int page)
+{
+       struct brcmnand_host *host = chip->priv;
+
+       brcmnand_set_ecc_enabled(host, 0);
+       brcmnand_read(mtd, chip, (u64)page << chip->page_shift,
+               mtd->writesize >> FC_SHIFT,
+               NULL, (u8 *)chip->oob_poi);
+       brcmnand_set_ecc_enabled(host, 1);
+       return 0;
+}
+
+static int brcmnand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
+                                uint32_t data_offs, uint32_t readlen,
+                                uint8_t *bufpoi, int page)
+{
+       struct brcmnand_host *host = chip->priv;
+
+       return brcmnand_read(mtd, chip, host->last_addr + data_offs,
+                       readlen >> FC_SHIFT, (u32 *)bufpoi, NULL);
+}
+
+static int brcmnand_write(struct mtd_info *mtd, struct nand_chip *chip,
+                         u64 addr, const u32 *buf, u8 *oob)
+{
+       struct brcmnand_host *host = chip->priv;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       unsigned int i, j, trans = mtd->writesize >> FC_SHIFT;
+       int status, ret = 0;
+
+       dev_dbg(ctrl->dev, "write %llx <- %p\n", (unsigned long long)addr, buf);
+
+       if (unlikely((u32)buf & 0x03)) {
+               dev_warn(ctrl->dev, "unaligned buffer: %p\n", buf);
+               buf = (u32 *)((u32)buf & ~0x03);
+       }
+
+       brcmnand_wp(mtd, 0);
+
+       for (i = 0; i < ctrl->max_oob; i += 4)
+               oob_reg_write(ctrl, i, 0xffffffff);
+
+       if (has_flash_dma(ctrl) && !oob && flash_dma_buf_ok(buf)) {
+               if (brcmnand_dma_trans(host, addr, (u32 *)buf,
+                                       mtd->writesize, CMD_PROGRAM_PAGE))
+                       ret = -EIO;
+               goto out;
+       }
+
+       brcmnand_write_reg(ctrl, BRCMNAND_CMD_EXT_ADDRESS,
+                       (host->cs << 16) | ((addr >> 32) & 0xffff));
+       (void)brcmnand_read_reg(ctrl, BRCMNAND_CMD_EXT_ADDRESS);
+
+       for (i = 0; i < trans; i++, addr += FC_BYTES) {
+               /* full address MUST be set before populating FC */
+               brcmnand_write_reg(ctrl, BRCMNAND_CMD_ADDRESS,
+                                  lower_32_bits(addr));
+               (void)brcmnand_read_reg(ctrl, BRCMNAND_CMD_ADDRESS);
+
+               if (buf) {
+                       brcmnand_soc_data_bus_prepare(ctrl->soc);
+
+                       for (j = 0; j < FC_WORDS; j++, buf++)
+                               brcmnand_write_fc(ctrl, j, *buf);
+
+                       brcmnand_soc_data_bus_unprepare(ctrl->soc);
+               } else if (oob) {
+                       for (j = 0; j < FC_WORDS; j++)
+                               brcmnand_write_fc(ctrl, j, 0xffffffff);
+               }
+
+               if (oob) {
+                       oob += write_oob_to_regs(ctrl, i, oob,
+                                       mtd->oobsize / trans,
+                                       host->hwcfg.sector_size_1k);
+               }
+
+               /* we cannot use SPARE_AREA_PROGRAM when PARTIAL_PAGE_EN=0 */
+               brcmnand_send_cmd(host, CMD_PROGRAM_PAGE);
+               status = brcmnand_waitfunc(mtd, chip);
+
+               if (status & NAND_STATUS_FAIL) {
+                       dev_info(ctrl->dev, "program failed at %llx\n",
+                               (unsigned long long)addr);
+                       ret = -EIO;
+                       goto out;
+               }
+       }
+out:
+       brcmnand_wp(mtd, 1);
+       return ret;
+}
+
+static int brcmnand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+                              const uint8_t *buf, int oob_required)
+{
+       struct brcmnand_host *host = chip->priv;
+       void *oob = oob_required ? chip->oob_poi : NULL;
+
+       brcmnand_write(mtd, chip, host->last_addr, (const u32 *)buf, oob);
+       return 0;
+}
+
+static int brcmnand_write_page_raw(struct mtd_info *mtd,
+                                  struct nand_chip *chip, const uint8_t *buf,
+                                  int oob_required)
+{
+       struct brcmnand_host *host = chip->priv;
+       void *oob = oob_required ? chip->oob_poi : NULL;
+
+       brcmnand_set_ecc_enabled(host, 0);
+       brcmnand_write(mtd, chip, host->last_addr, (const u32 *)buf, oob);
+       brcmnand_set_ecc_enabled(host, 1);
+       return 0;
+}
+
+static int brcmnand_write_oob(struct mtd_info *mtd, struct nand_chip *chip,
+                                 int page)
+{
+       return brcmnand_write(mtd, chip, (u64)page << chip->page_shift,
+                                 NULL, chip->oob_poi);
+}
+
+static int brcmnand_write_oob_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                                 int page)
+{
+       struct brcmnand_host *host = chip->priv;
+       int ret;
+
+       brcmnand_set_ecc_enabled(host, 0);
+       ret = brcmnand_write(mtd, chip, (u64)page << chip->page_shift, NULL,
+                                (u8 *)chip->oob_poi);
+       brcmnand_set_ecc_enabled(host, 1);
+
+       return ret;
+}
+
+/***********************************************************************
+ * Per-CS setup (1 NAND device)
+ ***********************************************************************/
+
+static int brcmnand_set_cfg(struct brcmnand_host *host,
+                           struct brcmnand_cfg *cfg)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       struct nand_chip *chip = &host->chip;
+       u16 cfg_offs = brcmnand_cs_offset(ctrl, host->cs, BRCMNAND_CS_CFG);
+       u16 cfg_ext_offs = brcmnand_cs_offset(ctrl, host->cs,
+                       BRCMNAND_CS_CFG_EXT);
+       u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
+                       BRCMNAND_CS_ACC_CONTROL);
+       u8 block_size = 0, page_size = 0, device_size = 0;
+       u32 tmp;
+
+       if (ctrl->block_sizes) {
+               int i, found;
+
+               for (i = 0, found = 0; ctrl->block_sizes[i]; i++)
+                       if (ctrl->block_sizes[i] * 1024 == cfg->block_size) {
+                               block_size = i;
+                               found = 1;
+                       }
+               if (!found) {
+                       dev_warn(ctrl->dev, "invalid block size %u\n",
+                                       cfg->block_size);
+                       return -EINVAL;
+               }
+       } else {
+               block_size = ffs(cfg->block_size) - ffs(BRCMNAND_MIN_BLOCKSIZE);
+       }
+
+       if (cfg->block_size < BRCMNAND_MIN_BLOCKSIZE || (ctrl->max_block_size &&
+                               cfg->block_size > ctrl->max_block_size)) {
+               dev_warn(ctrl->dev, "invalid block size %u\n",
+                               cfg->block_size);
+               block_size = 0;
+       }
+
+       if (ctrl->page_sizes) {
+               int i, found;
+
+               for (i = 0, found = 0; ctrl->page_sizes[i]; i++)
+                       if (ctrl->page_sizes[i] == cfg->page_size) {
+                               page_size = i;
+                               found = 1;
+                       }
+               if (!found) {
+                       dev_warn(ctrl->dev, "invalid page size %u\n",
+                                       cfg->page_size);
+                       return -EINVAL;
+               }
+       } else {
+               page_size = ffs(cfg->page_size) - ffs(BRCMNAND_MIN_PAGESIZE);
+       }
+
+       if (cfg->page_size < BRCMNAND_MIN_PAGESIZE || (ctrl->max_page_size &&
+                               cfg->page_size > ctrl->max_page_size)) {
+               dev_warn(ctrl->dev, "invalid page size %u\n", cfg->page_size);
+               return -EINVAL;
+       }
+
+       if (fls64(cfg->device_size) < fls64(BRCMNAND_MIN_DEVSIZE)) {
+               dev_warn(ctrl->dev, "invalid device size 0x%llx\n",
+                       (unsigned long long)cfg->device_size);
+               return -EINVAL;
+       }
+       device_size = fls64(cfg->device_size) - fls64(BRCMNAND_MIN_DEVSIZE);
+
+       tmp = (cfg->blk_adr_bytes << 8) |
+               (cfg->col_adr_bytes << 12) |
+               (cfg->ful_adr_bytes << 16) |
+               (!!(cfg->device_width == 16) << 23) |
+               (device_size << 24);
+       if (cfg_offs == cfg_ext_offs) {
+               tmp |= (page_size << 20) | (block_size << 28);
+               nand_writereg(ctrl, cfg_offs, tmp);
+       } else {
+               nand_writereg(ctrl, cfg_offs, tmp);
+               tmp = page_size | (block_size << 4);
+               nand_writereg(ctrl, cfg_ext_offs, tmp);
+       }
+
+       tmp = nand_readreg(ctrl, acc_control_offs);
+       tmp &= ~brcmnand_ecc_level_mask(ctrl);
+       tmp |= cfg->ecc_level << NAND_ACC_CONTROL_ECC_SHIFT;
+       tmp &= ~brcmnand_spare_area_mask(ctrl);
+       tmp |= cfg->spare_area_size;
+       nand_writereg(ctrl, acc_control_offs, tmp);
+
+       brcmnand_set_sector_size_1k(host, cfg->sector_size_1k);
+
+       /* threshold = ceil(BCH-level * 0.75) */
+       brcmnand_wr_corr_thresh(host, DIV_ROUND_UP(chip->ecc.strength * 3, 4));
+
+       return 0;
+}
+
+static void brcmnand_print_cfg(char *buf, struct brcmnand_cfg *cfg)
+{
+       buf += sprintf(buf,
+               "%lluMiB total, %uKiB blocks, %u%s pages, %uB OOB, %u-bit",
+               (unsigned long long)cfg->device_size >> 20,
+               cfg->block_size >> 10,
+               cfg->page_size >= 1024 ? cfg->page_size >> 10 : cfg->page_size,
+               cfg->page_size >= 1024 ? "KiB" : "B",
+               cfg->spare_area_size, cfg->device_width);
+
+       /* Account for Hamming ECC and for BCH 512B vs 1KiB sectors */
+       if (is_hamming_ecc(cfg))
+               sprintf(buf, ", Hamming ECC");
+       else if (cfg->sector_size_1k)
+               sprintf(buf, ", BCH-%u (1KiB sector)", cfg->ecc_level << 1);
+       else
+               sprintf(buf, ", BCH-%u", cfg->ecc_level);
+}
+
+/*
+ * Minimum number of bytes to address a page. Calculated as:
+ *     roundup(log2(size / page-size) / 8)
+ *
+ * NB: the following does not "round up" for non-power-of-2 'size'; but this is
+ *     OK because many other things will break if 'size' is irregular...
+ */
+static inline int get_blk_adr_bytes(u64 size, u32 writesize)
+{
+       return ALIGN(ilog2(size) - ilog2(writesize), 8) >> 3;
+}
+
+static int brcmnand_setup_dev(struct brcmnand_host *host)
+{
+       struct mtd_info *mtd = &host->mtd;
+       struct nand_chip *chip = &host->chip;
+       struct brcmnand_controller *ctrl = host->ctrl;
+       struct brcmnand_cfg *cfg = &host->hwcfg;
+       char msg[128];
+       u32 offs, tmp, oob_sector;
+       int ret;
+
+       memset(cfg, 0, sizeof(*cfg));
+
+       ret = of_property_read_u32(chip->dn, "brcm,nand-oob-sector-size",
+                                  &oob_sector);
+       if (ret) {
+               /* Use detected size */
+               cfg->spare_area_size = mtd->oobsize /
+                                       (mtd->writesize >> FC_SHIFT);
+       } else {
+               cfg->spare_area_size = oob_sector;
+       }
+       if (cfg->spare_area_size > ctrl->max_oob)
+               cfg->spare_area_size = ctrl->max_oob;
+       /*
+        * Set oobsize to be consistent with controller's spare_area_size, as
+        * the rest is inaccessible.
+        */
+       mtd->oobsize = cfg->spare_area_size * (mtd->writesize >> FC_SHIFT);
+
+       cfg->device_size = mtd->size;
+       cfg->block_size = mtd->erasesize;
+       cfg->page_size = mtd->writesize;
+       cfg->device_width = (chip->options & NAND_BUSWIDTH_16) ? 16 : 8;
+       cfg->col_adr_bytes = 2;
+       cfg->blk_adr_bytes = get_blk_adr_bytes(mtd->size, mtd->writesize);
+
+       switch (chip->ecc.size) {
+       case 512:
+               if (chip->ecc.strength == 1) /* Hamming */
+                       cfg->ecc_level = 15;
+               else
+                       cfg->ecc_level = chip->ecc.strength;
+               cfg->sector_size_1k = 0;
+               break;
+       case 1024:
+               if (!(ctrl->features & BRCMNAND_HAS_1K_SECTORS)) {
+                       dev_err(ctrl->dev, "1KB sectors not supported\n");
+                       return -EINVAL;
+               }
+               if (chip->ecc.strength & 0x1) {
+                       dev_err(ctrl->dev,
+                               "odd ECC not supported with 1KB sectors\n");
+                       return -EINVAL;
+               }
+
+               cfg->ecc_level = chip->ecc.strength >> 1;
+               cfg->sector_size_1k = 1;
+               break;
+       default:
+               dev_err(ctrl->dev, "unsupported ECC size: %d\n",
+                       chip->ecc.size);
+               return -EINVAL;
+       }
+
+       cfg->ful_adr_bytes = cfg->blk_adr_bytes;
+       if (mtd->writesize > 512)
+               cfg->ful_adr_bytes += cfg->col_adr_bytes;
+       else
+               cfg->ful_adr_bytes += 1;
+
+       ret = brcmnand_set_cfg(host, cfg);
+       if (ret)
+               return ret;
+
+       brcmnand_set_ecc_enabled(host, 1);
+
+       brcmnand_print_cfg(msg, cfg);
+       dev_info(ctrl->dev, "detected %s\n", msg);
+
+       /* Configure ACC_CONTROL */
+       offs = brcmnand_cs_offset(ctrl, host->cs, BRCMNAND_CS_ACC_CONTROL);
+       tmp = nand_readreg(ctrl, offs);
+       tmp &= ~ACC_CONTROL_PARTIAL_PAGE;
+       tmp &= ~ACC_CONTROL_RD_ERASED;
+       tmp &= ~ACC_CONTROL_FAST_PGM_RDIN;
+       if (ctrl->features & BRCMNAND_HAS_PREFETCH) {
+               /*
+                * FIXME: Flash DMA + prefetch may see spurious erased-page ECC
+                * errors
+                */
+               if (has_flash_dma(ctrl))
+                       tmp &= ~ACC_CONTROL_PREFETCH;
+               else
+                       tmp |= ACC_CONTROL_PREFETCH;
+       }
+       nand_writereg(ctrl, offs, tmp);
+
+       return 0;
+}
+
+static int brcmnand_init_cs(struct brcmnand_host *host)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       struct device_node *dn = host->of_node;
+       struct platform_device *pdev = host->pdev;
+       struct mtd_info *mtd;
+       struct nand_chip *chip;
+       int ret;
+       struct mtd_part_parser_data ppdata = { .of_node = dn };
+
+       ret = of_property_read_u32(dn, "reg", &host->cs);
+       if (ret) {
+               dev_err(&pdev->dev, "can't get chip-select\n");
+               return -ENXIO;
+       }
+
+       mtd = &host->mtd;
+       chip = &host->chip;
+
+       chip->dn = dn;
+       chip->priv = host;
+       mtd->priv = chip;
+       mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",
+                                  host->cs);
+       mtd->owner = THIS_MODULE;
+       mtd->dev.parent = &pdev->dev;
+
+       chip->IO_ADDR_R = (void __iomem *)0xdeadbeef;
+       chip->IO_ADDR_W = (void __iomem *)0xdeadbeef;
+
+       chip->cmd_ctrl = brcmnand_cmd_ctrl;
+       chip->cmdfunc = brcmnand_cmdfunc;
+       chip->waitfunc = brcmnand_waitfunc;
+       chip->read_byte = brcmnand_read_byte;
+       chip->read_buf = brcmnand_read_buf;
+       chip->write_buf = brcmnand_write_buf;
+
+       chip->ecc.mode = NAND_ECC_HW;
+       chip->ecc.read_page = brcmnand_read_page;
+       chip->ecc.read_subpage = brcmnand_read_subpage;
+       chip->ecc.write_page = brcmnand_write_page;
+       chip->ecc.read_page_raw = brcmnand_read_page_raw;
+       chip->ecc.write_page_raw = brcmnand_write_page_raw;
+       chip->ecc.write_oob_raw = brcmnand_write_oob_raw;
+       chip->ecc.read_oob_raw = brcmnand_read_oob_raw;
+       chip->ecc.read_oob = brcmnand_read_oob;
+       chip->ecc.write_oob = brcmnand_write_oob;
+
+       chip->controller = &ctrl->controller;
+
+       if (nand_scan_ident(mtd, 1, NULL))
+               return -ENXIO;
+
+       chip->options |= NAND_NO_SUBPAGE_WRITE;
+       /*
+        * Avoid (for instance) kmap()'d buffers from JFFS2, which we can't DMA
+        * to/from, and have nand_base pass us a bounce buffer instead, as
+        * needed.
+        */
+       chip->options |= NAND_USE_BOUNCE_BUFFER;
+
+       if (of_get_nand_on_flash_bbt(dn))
+               chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB;
+
+       if (brcmnand_setup_dev(host))
+               return -ENXIO;
+
+       chip->ecc.size = host->hwcfg.sector_size_1k ? 1024 : 512;
+       /* only use our internal HW threshold */
+       mtd->bitflip_threshold = 1;
+
+       chip->ecc.layout = brcmstb_choose_ecc_layout(host);
+       if (!chip->ecc.layout)
+               return -ENXIO;
+
+       if (nand_scan_tail(mtd))
+               return -ENXIO;
+
+       return mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
+}
+
+static void brcmnand_save_restore_cs_config(struct brcmnand_host *host,
+                                           int restore)
+{
+       struct brcmnand_controller *ctrl = host->ctrl;
+       u16 cfg_offs = brcmnand_cs_offset(ctrl, host->cs, BRCMNAND_CS_CFG);
+       u16 cfg_ext_offs = brcmnand_cs_offset(ctrl, host->cs,
+                       BRCMNAND_CS_CFG_EXT);
+       u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
+                       BRCMNAND_CS_ACC_CONTROL);
+       u16 t1_offs = brcmnand_cs_offset(ctrl, host->cs, BRCMNAND_CS_TIMING1);
+       u16 t2_offs = brcmnand_cs_offset(ctrl, host->cs, BRCMNAND_CS_TIMING2);
+
+       if (restore) {
+               nand_writereg(ctrl, cfg_offs, host->hwcfg.config);
+               if (cfg_offs != cfg_ext_offs)
+                       nand_writereg(ctrl, cfg_ext_offs,
+                                     host->hwcfg.config_ext);
+               nand_writereg(ctrl, acc_control_offs, host->hwcfg.acc_control);
+               nand_writereg(ctrl, t1_offs, host->hwcfg.timing_1);
+               nand_writereg(ctrl, t2_offs, host->hwcfg.timing_2);
+       } else {
+               host->hwcfg.config = nand_readreg(ctrl, cfg_offs);
+               if (cfg_offs != cfg_ext_offs)
+                       host->hwcfg.config_ext =
+                               nand_readreg(ctrl, cfg_ext_offs);
+               host->hwcfg.acc_control = nand_readreg(ctrl, acc_control_offs);
+               host->hwcfg.timing_1 = nand_readreg(ctrl, t1_offs);
+               host->hwcfg.timing_2 = nand_readreg(ctrl, t2_offs);
+       }
+}
+
+static int brcmnand_suspend(struct device *dev)
+{
+       struct brcmnand_controller *ctrl = dev_get_drvdata(dev);
+       struct brcmnand_host *host;
+
+       list_for_each_entry(host, &ctrl->host_list, node)
+               brcmnand_save_restore_cs_config(host, 0);
+
+       ctrl->nand_cs_nand_select = brcmnand_read_reg(ctrl, BRCMNAND_CS_SELECT);
+       ctrl->nand_cs_nand_xor = brcmnand_read_reg(ctrl, BRCMNAND_CS_XOR);
+       ctrl->corr_stat_threshold =
+               brcmnand_read_reg(ctrl, BRCMNAND_CORR_THRESHOLD);
+
+       if (has_flash_dma(ctrl))
+               ctrl->flash_dma_mode = flash_dma_readl(ctrl, FLASH_DMA_MODE);
+
+       return 0;
+}
+
+static int brcmnand_resume(struct device *dev)
+{
+       struct brcmnand_controller *ctrl = dev_get_drvdata(dev);
+       struct brcmnand_host *host;
+
+       if (has_flash_dma(ctrl)) {
+               flash_dma_writel(ctrl, FLASH_DMA_MODE, ctrl->flash_dma_mode);
+               flash_dma_writel(ctrl, FLASH_DMA_ERROR_STATUS, 0);
+       }
+
+       brcmnand_write_reg(ctrl, BRCMNAND_CS_SELECT, ctrl->nand_cs_nand_select);
+       brcmnand_write_reg(ctrl, BRCMNAND_CS_XOR, ctrl->nand_cs_nand_xor);
+       brcmnand_write_reg(ctrl, BRCMNAND_CORR_THRESHOLD,
+                       ctrl->corr_stat_threshold);
+       if (ctrl->soc) {
+               /* Clear/re-enable interrupt */
+               ctrl->soc->ctlrdy_ack(ctrl->soc);
+               ctrl->soc->ctlrdy_set_enabled(ctrl->soc, true);
+       }
+
+       list_for_each_entry(host, &ctrl->host_list, node) {
+               struct mtd_info *mtd = &host->mtd;
+               struct nand_chip *chip = mtd->priv;
+
+               brcmnand_save_restore_cs_config(host, 1);
+
+               /* Reset the chip, required by some chips after power-up */
+               chip->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
+       }
+
+       return 0;
+}
+
+const struct dev_pm_ops brcmnand_pm_ops = {
+       .suspend                = brcmnand_suspend,
+       .resume                 = brcmnand_resume,
+};
+EXPORT_SYMBOL_GPL(brcmnand_pm_ops);
+
+static const struct of_device_id brcmnand_of_match[] = {
+       { .compatible = "brcm,brcmnand-v4.0" },
+       { .compatible = "brcm,brcmnand-v5.0" },
+       { .compatible = "brcm,brcmnand-v6.0" },
+       { .compatible = "brcm,brcmnand-v6.1" },
+       { .compatible = "brcm,brcmnand-v7.0" },
+       { .compatible = "brcm,brcmnand-v7.1" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, brcmnand_of_match);
+
+/***********************************************************************
+ * Platform driver setup (per controller)
+ ***********************************************************************/
+
+int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
+{
+       struct device *dev = &pdev->dev;
+       struct device_node *dn = dev->of_node, *child;
+       struct brcmnand_controller *ctrl;
+       struct resource *res;
+       int ret;
+
+       /* We only support device-tree instantiation */
+       if (!dn)
+               return -ENODEV;
+
+       if (!of_match_node(brcmnand_of_match, dn))
+               return -ENODEV;
+
+       ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);
+       if (!ctrl)
+               return -ENOMEM;
+
+       dev_set_drvdata(dev, ctrl);
+       ctrl->dev = dev;
+
+       init_completion(&ctrl->done);
+       init_completion(&ctrl->dma_done);
+       spin_lock_init(&ctrl->controller.lock);
+       init_waitqueue_head(&ctrl->controller.wq);
+       INIT_LIST_HEAD(&ctrl->host_list);
+
+       /* NAND register range */
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       ctrl->nand_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(ctrl->nand_base))
+               return PTR_ERR(ctrl->nand_base);
+
+       /* Initialize NAND revision */
+       ret = brcmnand_revision_init(ctrl);
+       if (ret)
+               return ret;
+
+       /*
+        * Most chips have this cache at a fixed offset within 'nand' block.
+        * Some must specify this region separately.
+        */
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand-cache");
+       if (res) {
+               ctrl->nand_fc = devm_ioremap_resource(dev, res);
+               if (IS_ERR(ctrl->nand_fc))
+                       return PTR_ERR(ctrl->nand_fc);
+       } else {
+               ctrl->nand_fc = ctrl->nand_base +
+                               ctrl->reg_offsets[BRCMNAND_FC_BASE];
+       }
+
+       /* FLASH_DMA */
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "flash-dma");
+       if (res) {
+               ctrl->flash_dma_base = devm_ioremap_resource(dev, res);
+               if (IS_ERR(ctrl->flash_dma_base))
+                       return PTR_ERR(ctrl->flash_dma_base);
+
+               flash_dma_writel(ctrl, FLASH_DMA_MODE, 1); /* linked-list */
+               flash_dma_writel(ctrl, FLASH_DMA_ERROR_STATUS, 0);
+
+               /* Allocate descriptor(s) */
+               ctrl->dma_desc = dmam_alloc_coherent(dev,
+                                                    sizeof(*ctrl->dma_desc),
+                                                    &ctrl->dma_pa, GFP_KERNEL);
+               if (!ctrl->dma_desc)
+                       return -ENOMEM;
+
+               ctrl->dma_irq = platform_get_irq(pdev, 1);
+               if ((int)ctrl->dma_irq < 0) {
+                       dev_err(dev, "missing FLASH_DMA IRQ\n");
+                       return -ENODEV;
+               }
+
+               ret = devm_request_irq(dev, ctrl->dma_irq,
+                               brcmnand_dma_irq, 0, DRV_NAME,
+                               ctrl);
+               if (ret < 0) {
+                       dev_err(dev, "can't allocate IRQ %d: error %d\n",
+                                       ctrl->dma_irq, ret);
+                       return ret;
+               }
+
+               dev_info(dev, "enabling FLASH_DMA\n");
+       }
+
+       /* Disable automatic device ID config, direct addressing */
+       brcmnand_rmw_reg(ctrl, BRCMNAND_CS_SELECT,
+                        CS_SELECT_AUTO_DEVICE_ID_CFG | 0xff, 0, 0);
+       /* Disable XOR addressing */
+       brcmnand_rmw_reg(ctrl, BRCMNAND_CS_XOR, 0xff, 0, 0);
+
+       if (ctrl->features & BRCMNAND_HAS_WP) {
+               /* Permanently disable write protection */
+               if (wp_on == 2)
+                       brcmnand_set_wp(ctrl, false);
+       } else {
+               wp_on = 0;
+       }
+
+       /* IRQ */
+       ctrl->irq = platform_get_irq(pdev, 0);
+       if ((int)ctrl->irq < 0) {
+               dev_err(dev, "no IRQ defined\n");
+               return -ENODEV;
+       }
+
+       /*
+        * Some SoCs integrate this controller (e.g., its interrupt bits) in
+        * interesting ways
+        */
+       if (soc) {
+               ctrl->soc = soc;
+
+               ret = devm_request_irq(dev, ctrl->irq, brcmnand_irq, 0,
+                                      DRV_NAME, ctrl);
+
+               /* Enable interrupt */
+               ctrl->soc->ctlrdy_ack(ctrl->soc);
+               ctrl->soc->ctlrdy_set_enabled(ctrl->soc, true);
+       } else {
+               /* Use standard interrupt infrastructure */
+               ret = devm_request_irq(dev, ctrl->irq, brcmnand_ctlrdy_irq, 0,
+                                      DRV_NAME, ctrl);
+       }
+       if (ret < 0) {
+               dev_err(dev, "can't allocate IRQ %d: error %d\n",
+                       ctrl->irq, ret);
+               return ret;
+       }
+
+       for_each_available_child_of_node(dn, child) {
+               if (of_device_is_compatible(child, "brcm,nandcs")) {
+                       struct brcmnand_host *host;
+
+                       host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
+                       if (!host)
+                               return -ENOMEM;
+                       host->pdev = pdev;
+                       host->ctrl = ctrl;
+                       host->of_node = child;
+
+                       ret = brcmnand_init_cs(host);
+                       if (ret)
+                               continue; /* Try all chip-selects */
+
+                       list_add_tail(&host->node, &ctrl->host_list);
+               }
+       }
+
+       /* No chip-selects could initialize properly */
+       if (list_empty(&ctrl->host_list))
+               return -ENODEV;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(brcmnand_probe);
+
+int brcmnand_remove(struct platform_device *pdev)
+{
+       struct brcmnand_controller *ctrl = dev_get_drvdata(&pdev->dev);
+       struct brcmnand_host *host;
+
+       list_for_each_entry(host, &ctrl->host_list, node)
+               nand_release(&host->mtd);
+
+       dev_set_drvdata(&pdev->dev, NULL);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(brcmnand_remove);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Kevin Cernekee");
+MODULE_AUTHOR("Brian Norris");
+MODULE_DESCRIPTION("NAND driver for Broadcom chips");
+MODULE_ALIAS("platform:brcmnand");
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.h b/drivers/mtd/nand/brcmnand/brcmnand.h
new file mode 100644 (file)
index 0000000..a20c736
--- /dev/null
@@ -0,0 +1,73 @@
+/*
+ * Copyright Â© 2015 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __BRCMNAND_H__
+#define __BRCMNAND_H__
+
+#include <linux/types.h>
+#include <linux/io.h>
+
+struct platform_device;
+struct dev_pm_ops;
+
+struct brcmnand_soc {
+       struct platform_device *pdev;
+       void *priv;
+       bool (*ctlrdy_ack)(struct brcmnand_soc *soc);
+       void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
+       void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare);
+};
+
+static inline void brcmnand_soc_data_bus_prepare(struct brcmnand_soc *soc)
+{
+       if (soc && soc->prepare_data_bus)
+               soc->prepare_data_bus(soc, true);
+}
+
+static inline void brcmnand_soc_data_bus_unprepare(struct brcmnand_soc *soc)
+{
+       if (soc && soc->prepare_data_bus)
+               soc->prepare_data_bus(soc, false);
+}
+
+static inline u32 brcmnand_readl(void __iomem *addr)
+{
+       /*
+        * MIPS endianness is configured by boot strap, which also reverses all
+        * bus endianness (i.e., big-endian CPU + big endian bus ==> native
+        * endian I/O).
+        *
+        * Other architectures (e.g., ARM) either do not support big endian, or
+        * else leave I/O in little endian mode.
+        */
+       if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))
+               return __raw_readl(addr);
+       else
+               return readl_relaxed(addr);
+}
+
+static inline void brcmnand_writel(u32 val, void __iomem *addr)
+{
+       /* See brcmnand_readl() comments */
+       if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))
+               __raw_writel(val, addr);
+       else
+               writel_relaxed(val, addr);
+}
+
+int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc);
+int brcmnand_remove(struct platform_device *pdev);
+
+extern const struct dev_pm_ops brcmnand_pm_ops;
+
+#endif /* __BRCMNAND_H__ */
diff --git a/drivers/mtd/nand/brcmnand/brcmstb_nand.c b/drivers/mtd/nand/brcmnand/brcmstb_nand.c
new file mode 100644 (file)
index 0000000..5c27107
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright Â© 2015 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include "brcmnand.h"
+
+static const struct of_device_id brcmstb_nand_of_match[] = {
+       { .compatible = "brcm,brcmnand" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, brcmstb_nand_of_match);
+
+static int brcmstb_nand_probe(struct platform_device *pdev)
+{
+       return brcmnand_probe(pdev, NULL);
+}
+
+static struct platform_driver brcmstb_nand_driver = {
+       .probe                  = brcmstb_nand_probe,
+       .remove                 = brcmnand_remove,
+       .driver = {
+               .name           = "brcmstb_nand",
+               .pm             = &brcmnand_pm_ops,
+               .of_match_table = brcmstb_nand_of_match,
+       }
+};
+module_platform_driver(brcmstb_nand_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Brian Norris");
+MODULE_DESCRIPTION("NAND driver for Broadcom STB chips");
diff --git a/drivers/mtd/nand/brcmnand/iproc_nand.c b/drivers/mtd/nand/brcmnand/iproc_nand.c
new file mode 100644 (file)
index 0000000..683495c
--- /dev/null
@@ -0,0 +1,150 @@
+/*
+ * Copyright Â© 2015 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/device.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include "brcmnand.h"
+
+struct iproc_nand_soc_priv {
+       void __iomem *idm_base;
+       void __iomem *ext_base;
+       spinlock_t idm_lock;
+};
+
+#define IPROC_NAND_CTLR_READY_OFFSET       0x10
+#define IPROC_NAND_CTLR_READY              BIT(0)
+
+#define IPROC_NAND_IO_CTRL_OFFSET          0x00
+#define IPROC_NAND_APB_LE_MODE             BIT(24)
+#define IPROC_NAND_INT_CTRL_READ_ENABLE    BIT(6)
+
+static bool iproc_nand_intc_ack(struct brcmnand_soc *soc)
+{
+       struct iproc_nand_soc_priv *priv = soc->priv;
+       void __iomem *mmio = priv->ext_base + IPROC_NAND_CTLR_READY_OFFSET;
+       u32 val = brcmnand_readl(mmio);
+
+       if (val & IPROC_NAND_CTLR_READY) {
+               brcmnand_writel(IPROC_NAND_CTLR_READY, mmio);
+               return true;
+       }
+
+       return false;
+}
+
+static void iproc_nand_intc_set(struct brcmnand_soc *soc, bool en)
+{
+       struct iproc_nand_soc_priv *priv = soc->priv;
+       void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET;
+       u32 val;
+       unsigned long flags;
+
+       spin_lock_irqsave(&priv->idm_lock, flags);
+
+       val = brcmnand_readl(mmio);
+
+       if (en)
+               val |= IPROC_NAND_INT_CTRL_READ_ENABLE;
+       else
+               val &= ~IPROC_NAND_INT_CTRL_READ_ENABLE;
+
+       brcmnand_writel(val, mmio);
+
+       spin_unlock_irqrestore(&priv->idm_lock, flags);
+}
+
+static void iproc_nand_apb_access(struct brcmnand_soc *soc, bool prepare)
+{
+       struct iproc_nand_soc_priv *priv = soc->priv;
+       void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET;
+       u32 val;
+       unsigned long flags;
+
+       spin_lock_irqsave(&priv->idm_lock, flags);
+
+       val = brcmnand_readl(mmio);
+
+       if (prepare)
+               val |= IPROC_NAND_APB_LE_MODE;
+       else
+               val &= ~IPROC_NAND_APB_LE_MODE;
+
+       brcmnand_writel(val, mmio);
+
+       spin_unlock_irqrestore(&priv->idm_lock, flags);
+}
+
+static int iproc_nand_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct iproc_nand_soc_priv *priv;
+       struct brcmnand_soc *soc;
+       struct resource *res;
+
+       soc = devm_kzalloc(dev, sizeof(*soc), GFP_KERNEL);
+       if (!soc)
+               return -ENOMEM;
+
+       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       spin_lock_init(&priv->idm_lock);
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "iproc-idm");
+       priv->idm_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(priv->idm_base))
+               return PTR_ERR(priv->idm_base);
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "iproc-ext");
+       priv->ext_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(priv->ext_base))
+               return PTR_ERR(priv->ext_base);
+
+       soc->pdev = pdev;
+       soc->priv = priv;
+       soc->ctlrdy_ack = iproc_nand_intc_ack;
+       soc->ctlrdy_set_enabled = iproc_nand_intc_set;
+       soc->prepare_data_bus = iproc_nand_apb_access;
+
+       return brcmnand_probe(pdev, soc);
+}
+
+static const struct of_device_id iproc_nand_of_match[] = {
+       { .compatible = "brcm,nand-iproc" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, iproc_nand_of_match);
+
+static struct platform_driver iproc_nand_driver = {
+       .probe                  = iproc_nand_probe,
+       .remove                 = brcmnand_remove,
+       .driver = {
+               .name           = "iproc_nand",
+               .pm             = &brcmnand_pm_ops,
+               .of_match_table = iproc_nand_of_match,
+       }
+};
+module_platform_driver(iproc_nand_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Brian Norris");
+MODULE_AUTHOR("Ray Jui");
+MODULE_DESCRIPTION("NAND driver for Broadcom IPROC-based SoCs");
index 88109d375ae7f65546a2225e894e19ade98c41ba..aec6045058c7760d436e14ad865a64c1bcf38ec1 100644 (file)
@@ -237,17 +237,23 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
        /* Enable the following for a flash based bad block table */
        this->bbt_options = NAND_BBT_USE_FLASH;
 
+       new_mtd->name = kasprintf(GFP_KERNEL, "cs553x_nand_cs%d", cs);
+       if (!new_mtd->name) {
+               err = -ENOMEM;
+               goto out_ior;
+       }
+
        /* Scan to find existence of the device */
        if (nand_scan(new_mtd, 1)) {
                err = -ENXIO;
-               goto out_ior;
+               goto out_free;
        }
 
-       new_mtd->name = kasprintf(GFP_KERNEL, "cs553x_nand_cs%d", cs);
-
        cs553x_mtd[cs] = new_mtd;
        goto out;
 
+out_free:
+       kfree(new_mtd->name);
 out_ior:
        iounmap(this->IO_ADDR_R);
 out_mtd:
index f68a7bccecdc65878fac3ed3056ac499099992b7..7da266a5397990281e0a35625435168b2f11a78f 100644 (file)
@@ -69,6 +69,9 @@ struct doc_priv {
        int mh0_page;
        int mh1_page;
        struct mtd_info *nextdoc;
+
+       /* Handle the last stage of initialization (BBT scan, partitioning) */
+       int (*late_init)(struct mtd_info *mtd);
 };
 
 /* This is the syndrome computed by the HW ecc generator upon reading an empty
@@ -1294,14 +1297,11 @@ static int __init nftl_scan_bbt(struct mtd_info *mtd)
                this->bbt_md = NULL;
        }
 
-       /* It's safe to set bd=NULL below because NAND_BBT_CREATE is not set.
-          At least as nand_bbt.c is currently written. */
-       if ((ret = nand_scan_bbt(mtd, NULL)))
+       ret = this->scan_bbt(mtd);
+       if (ret)
                return ret;
-       mtd_device_register(mtd, NULL, 0);
-       if (!no_autopart)
-               mtd_device_register(mtd, parts, numparts);
-       return 0;
+
+       return mtd_device_register(mtd, parts, no_autopart ? 0 : numparts);
 }
 
 static int __init inftl_scan_bbt(struct mtd_info *mtd)
@@ -1344,10 +1344,10 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
                this->bbt_md->pattern = "TBB_SYSM";
        }
 
-       /* It's safe to set bd=NULL below because NAND_BBT_CREATE is not set.
-          At least as nand_bbt.c is currently written. */
-       if ((ret = nand_scan_bbt(mtd, NULL)))
+       ret = this->scan_bbt(mtd);
+       if (ret)
                return ret;
+
        memset((char *)parts, 0, sizeof(parts));
        numparts = inftl_partscan(mtd, parts);
        /* At least for now, require the INFTL Media Header.  We could probably
@@ -1355,10 +1355,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
           autopartitioning, but I want to give it more thought. */
        if (!numparts)
                return -EIO;
-       mtd_device_register(mtd, NULL, 0);
-       if (!no_autopart)
-               mtd_device_register(mtd, parts, numparts);
-       return 0;
+       return mtd_device_register(mtd, parts, no_autopart ? 0 : numparts);
 }
 
 static inline int __init doc2000_init(struct mtd_info *mtd)
@@ -1369,7 +1366,7 @@ static inline int __init doc2000_init(struct mtd_info *mtd)
        this->read_byte = doc2000_read_byte;
        this->write_buf = doc2000_writebuf;
        this->read_buf = doc2000_readbuf;
-       this->scan_bbt = nftl_scan_bbt;
+       doc->late_init = nftl_scan_bbt;
 
        doc->CDSNControl = CDSN_CTRL_FLASH_IO | CDSN_CTRL_ECC_IO;
        doc2000_count_chips(mtd);
@@ -1396,13 +1393,13 @@ static inline int __init doc2001_init(struct mtd_info *mtd)
                   can have multiple chips. */
                doc2000_count_chips(mtd);
                mtd->name = "DiskOnChip 2000 (INFTL Model)";
-               this->scan_bbt = inftl_scan_bbt;
+               doc->late_init = inftl_scan_bbt;
                return (4 * doc->chips_per_floor);
        } else {
                /* Bog-standard Millennium */
                doc->chips_per_floor = 1;
                mtd->name = "DiskOnChip Millennium";
-               this->scan_bbt = nftl_scan_bbt;
+               doc->late_init = nftl_scan_bbt;
                return 1;
        }
 }
@@ -1415,7 +1412,7 @@ static inline int __init doc2001plus_init(struct mtd_info *mtd)
        this->read_byte = doc2001plus_read_byte;
        this->write_buf = doc2001plus_writebuf;
        this->read_buf = doc2001plus_readbuf;
-       this->scan_bbt = inftl_scan_bbt;
+       doc->late_init = inftl_scan_bbt;
        this->cmd_ctrl = NULL;
        this->select_chip = doc2001plus_select_chip;
        this->cmdfunc = doc2001plus_command;
@@ -1591,6 +1588,8 @@ static int __init doc_probe(unsigned long physadr)
        nand->ecc.bytes         = 6;
        nand->ecc.strength      = 2;
        nand->bbt_options       = NAND_BBT_USE_FLASH;
+       /* Skip the automatic BBT scan so we can run it manually */
+       nand->options           |= NAND_SKIP_BBTSCAN;
 
        doc->physadr            = physadr;
        doc->virtadr            = virtadr;
@@ -1608,7 +1607,7 @@ static int __init doc_probe(unsigned long physadr)
        else
                numchips = doc2001_init(mtd);
 
-       if ((ret = nand_scan(mtd, numchips))) {
+       if ((ret = nand_scan(mtd, numchips)) || (ret = doc->late_init(mtd))) {
                /* DBB note: i believe nand_release is necessary here, as
                   buffers may have been allocated in nand_base.  Check with
                   Thomas. FIX ME! */
index e58af4bfa8c81d1752151adc8a8b86175351057e..793872f180657e65e7d82237853b511dd72e82b3 100644 (file)
@@ -562,6 +562,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
        dma_cookie_t cookie;
        unsigned long flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
        int ret;
+       unsigned long time_left;
 
        if (direction == DMA_TO_DEVICE)
                chan = host->write_dma_chan;
@@ -601,14 +602,13 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
 
        dma_async_issue_pending(chan);
 
-       ret =
+       time_left =
        wait_for_completion_timeout(&host->dma_access_complete,
                                msecs_to_jiffies(3000));
-       if (ret <= 0) {
+       if (time_left == 0) {
                dmaengine_terminate_all(chan);
                dev_err(host->dev, "wait_for_completion_timeout\n");
-               if (!ret)
-                       ret = -ETIMEDOUT;
+               ret = -ETIMEDOUT;
                goto unmap_dma;
        }
 
index 1f12e5bfbceda428ecb7650cc6bc0db1355d5124..2a49b53c8db96b03a3b56a7cd039502ebfee0c9d 100644 (file)
@@ -837,7 +837,7 @@ static int mpc5121_nfc_remove(struct platform_device *op)
        return 0;
 }
 
-static struct of_device_id mpc5121_nfc_match[] = {
+static const struct of_device_id mpc5121_nfc_match[] = {
        { .compatible = "fsl,mpc5121-nfc", },
        {},
 };
index 372e0e38f59b323f4388c6d96416ea5ea35f3c69..2426db88db36bf95f1f247eeae597ff69238c70d 100644 (file)
@@ -189,6 +189,7 @@ struct mxc_nand_host {
        int                     clk_act;
        int                     irq;
        int                     eccsize;
+       int                     used_oobsize;
        int                     active_cs;
 
        struct completion       op_completion;
@@ -280,12 +281,44 @@ static void memcpy32_fromio(void *trg, const void __iomem  *src, size_t size)
                *t++ = __raw_readl(s++);
 }
 
+static void memcpy16_fromio(void *trg, const void __iomem  *src, size_t size)
+{
+       int i;
+       u16 *t = trg;
+       const __iomem u16 *s = src;
+
+       /* We assume that src (IO) is always 32bit aligned */
+       if (PTR_ALIGN(trg, 4) == trg && IS_ALIGNED(size, 4)) {
+               memcpy32_fromio(trg, src, size);
+               return;
+       }
+
+       for (i = 0; i < (size >> 1); i++)
+               *t++ = __raw_readw(s++);
+}
+
 static inline void memcpy32_toio(void __iomem *trg, const void *src, int size)
 {
        /* __iowrite32_copy use 32bit size values so divide by 4 */
        __iowrite32_copy(trg, src, size / 4);
 }
 
+static void memcpy16_toio(void __iomem *trg, const void *src, int size)
+{
+       int i;
+       __iomem u16 *t = trg;
+       const u16 *s = src;
+
+       /* We assume that trg (IO) is always 32bit aligned */
+       if (PTR_ALIGN(src, 4) == src && IS_ALIGNED(size, 4)) {
+               memcpy32_toio(trg, src, size);
+               return;
+       }
+
+       for (i = 0; i < (size >> 1); i++)
+               __raw_writew(*s++, t++);
+}
+
 static int check_int_v3(struct mxc_nand_host *host)
 {
        uint32_t tmp;
@@ -807,32 +840,48 @@ static void mxc_nand_select_chip_v2(struct mtd_info *mtd, int chip)
 }
 
 /*
- * Function to transfer data to/from spare area.
+ * The controller splits a page into data chunks of 512 bytes + partial oob.
+ * There are writesize / 512 such chunks, the size of the partial oob parts is
+ * oobsize / #chunks rounded down to a multiple of 2. The last oob chunk then
+ * contains additionally the byte lost by rounding (if any).
+ * This function handles the needed shuffling between host->data_buf (which
+ * holds a page in natural order, i.e. writesize bytes data + oobsize bytes
+ * spare) and the NFC buffer.
  */
 static void copy_spare(struct mtd_info *mtd, bool bfrom)
 {
        struct nand_chip *this = mtd->priv;
        struct mxc_nand_host *host = this->priv;
-       u16 i, j;
-       u16 n = mtd->writesize >> 9;
+       u16 i, oob_chunk_size;
+       u16 num_chunks = mtd->writesize / 512;
+
        u8 *d = host->data_buf + mtd->writesize;
        u8 __iomem *s = host->spare0;
-       u16 t = host->devtype_data->spare_len;
+       u16 sparebuf_size = host->devtype_data->spare_len;
 
-       j = (mtd->oobsize / n >> 1) << 1;
+       /* size of oob chunk for all but possibly the last one */
+       oob_chunk_size = (host->used_oobsize / num_chunks) & ~1;
 
        if (bfrom) {
-               for (i = 0; i < n - 1; i++)
-                       memcpy32_fromio(d + i * j, s + i * t, j);
-
-               /* the last section */
-               memcpy32_fromio(d + i * j, s + i * t, mtd->oobsize - i * j);
+               for (i = 0; i < num_chunks - 1; i++)
+                       memcpy16_fromio(d + i * oob_chunk_size,
+                                       s + i * sparebuf_size,
+                                       oob_chunk_size);
+
+               /* the last chunk */
+               memcpy16_fromio(d + i * oob_chunk_size,
+                               s + i * sparebuf_size,
+                               host->used_oobsize - i * oob_chunk_size);
        } else {
-               for (i = 0; i < n - 1; i++)
-                       memcpy32_toio(&s[i * t], &d[i * j], j);
-
-               /* the last section */
-               memcpy32_toio(&s[i * t], &d[i * j], mtd->oobsize - i * j);
+               for (i = 0; i < num_chunks - 1; i++)
+                       memcpy16_toio(&s[i * sparebuf_size],
+                                     &d[i * oob_chunk_size],
+                                     oob_chunk_size);
+
+               /* the last chunk */
+               memcpy16_toio(&s[oob_chunk_size * sparebuf_size],
+                             &d[i * oob_chunk_size],
+                             host->used_oobsize - i * oob_chunk_size);
        }
 }
 
@@ -911,6 +960,23 @@ static int get_eccsize(struct mtd_info *mtd)
                return 8;
 }
 
+static void ecc_8bit_layout_4k(struct nand_ecclayout *layout)
+{
+       int i, j;
+
+       layout->eccbytes = 8*18;
+       for (i = 0; i < 8; i++)
+               for (j = 0; j < 18; j++)
+                       layout->eccpos[i*18 + j] = i*26 + j + 7;
+
+       layout->oobfree[0].offset = 2;
+       layout->oobfree[0].length = 4;
+       for (i = 1; i < 8; i++) {
+               layout->oobfree[i].offset = i*26;
+               layout->oobfree[i].length = 7;
+       }
+}
+
 static void preset_v1(struct mtd_info *mtd)
 {
        struct nand_chip *nand_chip = mtd->priv;
@@ -1350,7 +1416,7 @@ static inline int is_imx53_nfc(struct mxc_nand_host *host)
        return host->devtype_data == &imx53_nand_devtype_data;
 }
 
-static struct platform_device_id mxcnd_devtype[] = {
+static const struct platform_device_id mxcnd_devtype[] = {
        {
                .name = "imx21-nand",
                .driver_data = (kernel_ulong_t) &imx21_nand_devtype_data,
@@ -1587,8 +1653,20 @@ static int mxcnd_probe(struct platform_device *pdev)
 
        if (mtd->writesize == 2048)
                this->ecc.layout = host->devtype_data->ecclayout_2k;
-       else if (mtd->writesize == 4096)
+       else if (mtd->writesize == 4096) {
                this->ecc.layout = host->devtype_data->ecclayout_4k;
+               if (get_eccsize(mtd) == 8)
+                       ecc_8bit_layout_4k(this->ecc.layout);
+       }
+
+       /*
+        * Experimentation shows that i.MX NFC can only handle up to 218 oob
+        * bytes. Limit used_oobsize to 218 so as to not confuse copy_spare()
+        * into copying invalid data to/from the spare IO buffer, as this
+        * might cause ECC data corruption when doing sub-page write to a
+        * partially written page.
+        */
+       host->used_oobsize = min(mtd->oobsize, 218U);
 
        if (this->ecc.mode == NAND_ECC_HW) {
                if (is_imx21_nfc(host) || is_imx27_nfc(host))
index c2e1232cd45cc847197c3960ddbd3cd38584dd55..ceb68ca8277a9ebb49c763a72b0979f089b878bb 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *  drivers/mtd/nand.c
- *
  *  Overview:
  *   This is the generic MTD driver for NAND flash devices. It should be
  *   capable of working with almost all NAND chips currently available.
@@ -48,6 +46,7 @@
 #include <linux/leds.h>
 #include <linux/io.h>
 #include <linux/mtd/partitions.h>
+#include <linux/of_mtd.h>
 
 /* Define default oob placement schemes for large and small page devices */
 static struct nand_ecclayout nand_oob_8 = {
@@ -2928,9 +2927,6 @@ static int nand_onfi_get_features(struct mtd_info *mtd, struct nand_chip *chip,
              & ONFI_OPT_CMD_SET_GET_FEATURES))
                return -EINVAL;
 
-       /* clear the sub feature parameters */
-       memset(subfeature_param, 0, ONFI_SUBFEATURE_PARAM_LEN);
-
        chip->cmdfunc(mtd, NAND_CMD_GET_FEATURES, addr, -1);
        for (i = 0; i < ONFI_SUBFEATURE_PARAM_LEN; ++i)
                *subfeature_param++ = chip->read_byte(mtd);
@@ -3689,7 +3685,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
                        if (find_full_id_nand(mtd, chip, type, id_data, &busw))
                                goto ident_done;
                } else if (*dev_id == type->dev_id) {
-                               break;
+                       break;
                }
        }
 
@@ -3798,6 +3794,39 @@ ident_done:
        return type;
 }
 
+static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip,
+                       struct device_node *dn)
+{
+       int ecc_mode, ecc_strength, ecc_step;
+
+       if (of_get_nand_bus_width(dn) == 16)
+               chip->options |= NAND_BUSWIDTH_16;
+
+       if (of_get_nand_on_flash_bbt(dn))
+               chip->bbt_options |= NAND_BBT_USE_FLASH;
+
+       ecc_mode = of_get_nand_ecc_mode(dn);
+       ecc_strength = of_get_nand_ecc_strength(dn);
+       ecc_step = of_get_nand_ecc_step_size(dn);
+
+       if ((ecc_step >= 0 && !(ecc_strength >= 0)) ||
+           (!(ecc_step >= 0) && ecc_strength >= 0)) {
+               pr_err("must set both strength and step size in DT\n");
+               return -EINVAL;
+       }
+
+       if (ecc_mode >= 0)
+               chip->ecc.mode = ecc_mode;
+
+       if (ecc_strength >= 0)
+               chip->ecc.strength = ecc_strength;
+
+       if (ecc_step > 0)
+               chip->ecc.size = ecc_step;
+
+       return 0;
+}
+
 /**
  * nand_scan_ident - [NAND Interface] Scan for the NAND device
  * @mtd: MTD device structure
@@ -3815,6 +3844,13 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
        int i, nand_maf_id, nand_dev_id;
        struct nand_chip *chip = mtd->priv;
        struct nand_flash_dev *type;
+       int ret;
+
+       if (chip->dn) {
+               ret = nand_dt_init(mtd, chip, chip->dn);
+               if (ret)
+                       return ret;
+       }
 
        /* Set the default functions */
        nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16);
index 9bb8453d224ec81239a30b035d0aa59f2bc6912b..63a1a36a3f4b4b804f7c4b389eacdc8c19d30a43 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *  drivers/mtd/nand_bbt.c
- *
  *  Overview:
  *   Bad block table support for the NAND driver
  *
@@ -64,7 +62,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
 #include <linux/mtd/nand.h>
-#include <linux/mtd/nand_ecc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
@@ -720,7 +717,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                /* Must we save the block contents? */
                if (td->options & NAND_BBT_SAVECONTENT) {
                        /* Make it block aligned */
-                       to &= ~((loff_t)((1 << this->bbt_erase_shift) - 1));
+                       to &= ~(((loff_t)1 << this->bbt_erase_shift) - 1);
                        len = 1 << this->bbt_erase_shift;
                        res = mtd_read(mtd, to, len, &retlen, buf);
                        if (res < 0) {
@@ -1075,10 +1072,10 @@ static void verify_bbt_descr(struct mtd_info *mtd, struct nand_bbt_descr *bd)
  * The bad block table memory is allocated here. It must be freed by calling
  * the nand_free_bbt function.
  */
-int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
+static int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
 {
        struct nand_chip *this = mtd->priv;
-       int len, res = 0;
+       int len, res;
        uint8_t *buf;
        struct nand_bbt_descr *td = this->bbt_td;
        struct nand_bbt_descr *md = this->bbt_md;
@@ -1099,10 +1096,9 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
        if (!td) {
                if ((res = nand_memory_bbt(mtd, bd))) {
                        pr_err("nand_bbt: can't scan flash and build the RAM-based BBT\n");
-                       kfree(this->bbt);
-                       this->bbt = NULL;
+                       goto err;
                }
-               return res;
+               return 0;
        }
        verify_bbt_descr(mtd, td);
        verify_bbt_descr(mtd, md);
@@ -1112,9 +1108,8 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
        len += (len >> this->page_shift) * mtd->oobsize;
        buf = vmalloc(len);
        if (!buf) {
-               kfree(this->bbt);
-               this->bbt = NULL;
-               return -ENOMEM;
+               res = -ENOMEM;
+               goto err;
        }
 
        /* Is the bbt at a given page? */
@@ -1126,6 +1121,8 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
        }
 
        res = check_create(mtd, buf, bd);
+       if (res)
+               goto err;
 
        /* Prevent the bbt regions from erasing / writing */
        mark_bbt_region(mtd, td);
@@ -1133,6 +1130,11 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
                mark_bbt_region(mtd, md);
 
        vfree(buf);
+       return 0;
+
+err:
+       kfree(this->bbt);
+       this->bbt = NULL;
        return res;
 }
 
index dd620c19c6192f200ecfb1a83d77a08580e84a4b..7124400d903b3b5feb5412371c5b5dc634fbb250 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *  drivers/mtd/nandids.c
- *
  *  Copyright (C) 2002 Thomas Gleixner (tglx@linutronix.de)
  *
  * This program is free software; you can redistribute it and/or modify
index f2324271b94e9d19cc39aafae95cc0ccf934fc42..52c0c1a3899cd1d09bd4d5d9685405be04deaab5 100644 (file)
@@ -743,6 +743,11 @@ static int init_nandsim(struct mtd_info *mtd)
                        goto error;
                }
                ns->partitions[i].name   = get_partition_name(i);
+               if (!ns->partitions[i].name) {
+                       NS_ERR("unable to allocate memory.\n");
+                       ret = -ENOMEM;
+                       goto error;
+               }
                ns->partitions[i].offset = next_offset;
                ns->partitions[i].size   = part_sz;
                next_offset += ns->partitions[i].size;
@@ -756,6 +761,11 @@ static int init_nandsim(struct mtd_info *mtd)
                        goto error;
                }
                ns->partitions[i].name   = get_partition_name(i);
+               if (!ns->partitions[i].name) {
+                       NS_ERR("unable to allocate memory.\n");
+                       ret = -ENOMEM;
+                       goto error;
+               }
                ns->partitions[i].offset = next_offset;
                ns->partitions[i].size   = remains;
                ns->nbparts += 1;
index 3187c6b92d9aaa7537a4a9e2b090035672591347..67a1b3f911cfec41e723a6b6212c9551447544cc 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *  drivers/mtd/ndfc.c
- *
  *  Overview:
  *   Platform independent driver for NDFC (NanD Flash Controller)
  *   integrated into EP440 cores
index 4535c263fae576e59b87594f924c2deb5ed0f3e1..717cf623fcdef81a761940cee99ceed616501d66 100644 (file)
@@ -24,8 +24,6 @@ struct plat_nand_data {
        void __iomem            *io_base;
 };
 
-static const char *part_probe_types[] = { "cmdlinepart", NULL };
-
 /*
  * Probe for the NAND device.
  */
@@ -95,7 +93,7 @@ static int plat_nand_probe(struct platform_device *pdev)
                goto out;
        }
 
-       part_types = pdata->chip.part_probe_types ? : part_probe_types;
+       part_types = pdata->chip.part_probe_types;
 
        ppdata.of_node = pdev->dev.of_node;
        err = mtd_device_parse_register(&data->mtd, part_types, &ppdata,
index a4615fcc3d001f6a0efba58ddfc5b5573ad91069..1259cc558ce98954f00de813facae4bb5317ac82 100644 (file)
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
+#include <linux/iopoll.h>
 #include <linux/irq.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_mtd.h>
 
-#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)
+#if defined(CONFIG_ARM) && (defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP))
 #define ARCH_HAS_DMA
 #endif
 
@@ -483,7 +484,8 @@ static void disable_int(struct pxa3xx_nand_info *info, uint32_t int_mask)
 static void drain_fifo(struct pxa3xx_nand_info *info, void *data, int len)
 {
        if (info->ecc_bch) {
-               int timeout;
+               u32 val;
+               int ret;
 
                /*
                 * According to the datasheet, when reading from NDDB
@@ -494,18 +496,14 @@ static void drain_fifo(struct pxa3xx_nand_info *info, void *data, int len)
                 * the polling on the last read.
                 */
                while (len > 8) {
-                       __raw_readsl(info->mmio_base + NDDB, data, 8);
-
-                       for (timeout = 0;
-                            !(nand_readl(info, NDSR) & NDSR_RDDREQ);
-                            timeout++) {
-                               if (timeout >= 5) {
-                                       dev_err(&info->pdev->dev,
-                                               "Timeout on RDDREQ while draining the FIFO\n");
-                                       return;
-                               }
-
-                               mdelay(1);
+                       readsl(info->mmio_base + NDDB, data, 8);
+
+                       ret = readl_relaxed_poll_timeout(info->mmio_base + NDSR, val,
+                                                        val & NDSR_RDDREQ, 1000, 5000);
+                       if (ret) {
+                               dev_err(&info->pdev->dev,
+                                       "Timeout on RDDREQ while draining the FIFO\n");
+                               return;
                        }
 
                        data += 32;
@@ -513,7 +511,7 @@ static void drain_fifo(struct pxa3xx_nand_info *info, void *data, int len)
                }
        }
 
-       __raw_readsl(info->mmio_base + NDDB, data, len);
+       readsl(info->mmio_base + NDDB, data, len);
 }
 
 static void handle_data_pio(struct pxa3xx_nand_info *info)
@@ -522,14 +520,14 @@ static void handle_data_pio(struct pxa3xx_nand_info *info)
 
        switch (info->state) {
        case STATE_PIO_WRITING:
-               __raw_writesl(info->mmio_base + NDDB,
-                             info->data_buff + info->data_buff_pos,
-                             DIV_ROUND_UP(do_bytes, 4));
+               writesl(info->mmio_base + NDDB,
+                       info->data_buff + info->data_buff_pos,
+                       DIV_ROUND_UP(do_bytes, 4));
 
                if (info->oob_size > 0)
-                       __raw_writesl(info->mmio_base + NDDB,
-                                     info->oob_buff + info->oob_buff_pos,
-                                     DIV_ROUND_UP(info->oob_size, 4));
+                       writesl(info->mmio_base + NDDB,
+                               info->oob_buff + info->oob_buff_pos,
+                               DIV_ROUND_UP(info->oob_size, 4));
                break;
        case STATE_PIO_READING:
                drain_fifo(info,
@@ -1630,8 +1628,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
        info->pdev = pdev;
        info->variant = pxa3xx_nand_get_variant(pdev);
        for (cs = 0; cs < pdata->num_cs; cs++) {
-               mtd = (struct mtd_info *)((unsigned int)&info[1] +
-                     (sizeof(*mtd) + sizeof(*host)) * cs);
+               mtd = (void *)&info[1] + (sizeof(*mtd) + sizeof(*host)) * cs;
                chip = (struct nand_chip *)(&mtd[1]);
                host = (struct pxa3xx_nand_host *)chip;
                info->host[cs] = host;
index baea83f4dea84f0f0f3d9917e1797b47cb262fca..77e96d2df96cac12194dc0679dfac1dceb098d5e 100644 (file)
@@ -653,11 +653,15 @@ static int r852_register_nand_device(struct r852_device *dev)
        if (sm_register_device(dev->mtd, dev->sm))
                goto error2;
 
-       if (device_create_file(&dev->mtd->dev, &dev_attr_media_type))
+       if (device_create_file(&dev->mtd->dev, &dev_attr_media_type)) {
                message("can't create media type sysfs attribute");
+               goto error3;
+       }
 
        dev->card_registred = 1;
        return 0;
+error3:
+       nand_release(dev->mtd);
 error2:
        kfree(dev->mtd);
 error1:
index 0e02be47ce1d4dbc959e7037a5bb08edc8e91b98..381f67ac6b5a0626a562ffb1508b66cb263fa245 100644 (file)
@@ -1105,7 +1105,7 @@ static int s3c24xx_nand_resume(struct platform_device *dev)
 
 /* driver device registration */
 
-static struct platform_device_id s3c24xx_driver_ids[] = {
+static const struct platform_device_id s3c24xx_driver_ids[] = {
        {
                .name           = "s3c2410-nand",
                .driver_data    = TYPE_S3C2410,
index 3f81dc8f214cdc0240c8a7d07cee734b96d544f1..3b28db458ea042794913dffed7c160c29d24b189 100644 (file)
@@ -160,14 +160,10 @@ static int xway_nand_probe(struct platform_device *pdev)
        return 0;
 }
 
-/* allow users to override the partition in DT using the cmdline */
-static const char *part_probes[] = { "cmdlinepart", "ofpart", NULL };
-
 static struct platform_nand_data xway_nand_data = {
        .chip = {
                .nr_chips               = 1,
                .chip_delay             = 30,
-               .part_probe_types       = part_probes,
        },
        .ctrl = {
                .probe          = xway_nand_probe,
index 19cfb97adbc0447deae8611f03ffc565973b6076..739259513055567114aa26649f74ef6b7d7a58c9 100644 (file)
@@ -1083,7 +1083,7 @@ static const struct dev_pm_ops s3c_pm_ops = {
        .resume         = s3c_pm_ops_resume,
 };
 
-static struct platform_device_id s3c_onenand_driver_ids[] = {
+static const struct platform_device_id s3c_onenand_driver_ids[] = {
        {
                .name           = "s3c6400-onenand",
                .driver_data    = TYPE_S3C6400,
index 5d5d36272bb5b3b5d50074e89515e683cb7f6084..52a872fa1b6e412649653490bcf2a64a008feb18 100644 (file)
@@ -662,7 +662,7 @@ static int fsl_qspi_nor_setup_last(struct fsl_qspi *q)
        return 0;
 }
 
-static struct of_device_id fsl_qspi_dt_ids[] = {
+static const struct of_device_id fsl_qspi_dt_ids[] = {
        { .compatible = "fsl,vf610-qspi", .data = (void *)&vybrid_data, },
        { .compatible = "fsl,imx6sx-qspi", .data = (void *)&imx6sx_data, },
        { /* sentinel */ }
index 14a5d2325dac0cdf0558d881a99fee2727b7a7bb..d78831b4422b4edb1d2b6f13b879ea888603f492 100644 (file)
@@ -513,6 +513,13 @@ static int spi_nor_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 /* NOTE: double check command sets and memory organization when you add
  * more nor chips.  This current list focusses on newer chips, which
  * have been converging on command sets which including JEDEC ID.
+ *
+ * All newly added entries should describe *hardware* and should use SECT_4K
+ * (or SECT_4K_PMC) if hardware supports erasing 4 KiB sectors. For usage
+ * scenarios excluding small sectors there is config option that can be
+ * disabled: CONFIG_MTD_SPI_NOR_USE_4K_SECTORS.
+ * For historical (and compatibility) reasons (before we got above config) some
+ * old entries may be missing 4K flag.
  */
 static const struct spi_device_id spi_nor_ids[] = {
        /* Atmel -- some are (confusingly) marketed as "DataFlash" */
@@ -538,7 +545,7 @@ static const struct spi_device_id spi_nor_ids[] = {
        { "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
        { "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },
        { "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },
-       { "en25s64",    INFO(0x1c3817, 0, 64 * 1024,  128, 0) },
+       { "en25s64",    INFO(0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
 
        /* ESMT */
        { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) },
@@ -560,7 +567,11 @@ static const struct spi_device_id spi_nor_ids[] = {
        { "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
        { "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
 
+       /* ISSI */
+       { "is25cd512", INFO(0x7f9d20, 0, 32 * 1024,   2, SECT_4K) },
+
        /* Macronix */
+       { "mx25l512e",   INFO(0xc22010, 0, 64 * 1024,   1, SECT_4K) },
        { "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
        { "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
        { "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
@@ -602,7 +613,7 @@ static const struct spi_device_id spi_nor_ids[] = {
        { "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
        { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
        { "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
-       { "s25fl128s",  INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_QUAD_READ) },
+       { "s25fl128s",  INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SECT_4K | SPI_NOR_QUAD_READ) },
        { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, 0) },
        { "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, 0) },
        { "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
@@ -613,7 +624,8 @@ static const struct spi_device_id spi_nor_ids[] = {
        { "s25fl008k",  INFO(0xef4014,      0,  64 * 1024,  16, SECT_4K) },
        { "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32, SECT_4K) },
        { "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) },
-       { "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, 0) },
+       { "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, SECT_4K) },
+       { "s25fl164k",  INFO(0x014017,      0,  64 * 1024, 128, SECT_4K) },
 
        /* SST -- large erase sizes are "overlays", "sectors" are 4K */
        { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024,  8, SECT_4K | SST_WRITE) },
index 60d86e8fba6e9561bb4204ef2c99fe7c744288da..2caf1682036dc1914aaa887565b0a54edbe0ed35 100644 (file)
@@ -272,12 +272,9 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino)
        mutex_lock(&f->sem);
 
        ret = jffs2_do_read_inode(c, f, inode->i_ino, &latest_node);
+       if (ret)
+               goto error;
 
-       if (ret) {
-               mutex_unlock(&f->sem);
-               iget_failed(inode);
-               return ERR_PTR(ret);
-       }
        inode->i_mode = jemode_to_cpu(latest_node.mode);
        i_uid_write(inode, je16_to_cpu(latest_node.uid));
        i_gid_write(inode, je16_to_cpu(latest_node.gid));
index dddbde4f56f4e32a4c43caff1c4ab231c7106ce6..28e0aab42bc34f6a26f67b82bc3f8c94a9bf4232 100644 (file)
@@ -1203,17 +1203,13 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                JFFS2_ERROR("failed to read from flash: error %d, %zd of %zd bytes read\n",
                        ret, retlen, sizeof(*latest_node));
                /* FIXME: If this fails, there seems to be a memory leak. Find it. */
-               mutex_unlock(&f->sem);
-               jffs2_do_clear_inode(c, f);
-               return ret?ret:-EIO;
+               return ret ? ret : -EIO;
        }
 
        crc = crc32(0, latest_node, sizeof(*latest_node)-8);
        if (crc != je32_to_cpu(latest_node->node_crc)) {
                JFFS2_ERROR("CRC failed for read_inode of inode %u at physical location 0x%x\n",
                        f->inocache->ino, ref_offset(rii.latest_ref));
-               mutex_unlock(&f->sem);
-               jffs2_do_clear_inode(c, f);
                return -EIO;
        }
 
@@ -1250,16 +1246,11 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                         * keep in RAM to facilitate quick follow symlink
                         * operation. */
                        uint32_t csize = je32_to_cpu(latest_node->csize);
-                       if (csize > JFFS2_MAX_NAME_LEN) {
-                               mutex_unlock(&f->sem);
-                               jffs2_do_clear_inode(c, f);
+                       if (csize > JFFS2_MAX_NAME_LEN)
                                return -ENAMETOOLONG;
-                       }
                        f->target = kmalloc(csize + 1, GFP_KERNEL);
                        if (!f->target) {
                                JFFS2_ERROR("can't allocate %u bytes of memory for the symlink target path cache\n", csize);
-                               mutex_unlock(&f->sem);
-                               jffs2_do_clear_inode(c, f);
                                return -ENOMEM;
                        }
 
@@ -1271,8 +1262,6 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                                        ret = -EIO;
                                kfree(f->target);
                                f->target = NULL;
-                               mutex_unlock(&f->sem);
-                               jffs2_do_clear_inode(c, f);
                                return ret;
                        }
 
@@ -1289,15 +1278,11 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                if (f->metadata) {
                        JFFS2_ERROR("Argh. Special inode #%u with mode 0%o had metadata node\n",
                               f->inocache->ino, jemode_to_cpu(latest_node->mode));
-                       mutex_unlock(&f->sem);
-                       jffs2_do_clear_inode(c, f);
                        return -EIO;
                }
                if (!frag_first(&f->fragtree)) {
                        JFFS2_ERROR("Argh. Special inode #%u with mode 0%o has no fragments\n",
                               f->inocache->ino, jemode_to_cpu(latest_node->mode));
-                       mutex_unlock(&f->sem);
-                       jffs2_do_clear_inode(c, f);
                        return -EIO;
                }
                /* ASSERT: f->fraglist != NULL */
@@ -1305,8 +1290,6 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                        JFFS2_ERROR("Argh. Special inode #%u with mode 0x%x had more than one node\n",
                               f->inocache->ino, jemode_to_cpu(latest_node->mode));
                        /* FIXME: Deal with it - check crc32, check for duplicate node, check times and discard the older one */
-                       mutex_unlock(&f->sem);
-                       jffs2_do_clear_inode(c, f);
                        return -EIO;
                }
                /* OK. We're happy */
@@ -1400,10 +1383,8 @@ int jffs2_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *i
        f->inocache = ic;
 
        ret = jffs2_do_read_inode_internal(c, f, &n);
-       if (!ret) {
-               mutex_unlock(&f->sem);
-               jffs2_do_clear_inode(c, f);
-       }
+       mutex_unlock(&f->sem);
+       jffs2_do_clear_inode(c, f);
        jffs2_xattr_do_crccheck_inode(c, ic);
        kfree (f);
        return ret;
index 299d7d31fe539df197d571b584cca3423d6a1907..9b57a9b1b081d375b2a5bf0b8f28f4ee92305b18 100644 (file)
@@ -296,183 +296,19 @@ struct cfi_private {
        struct flchip chips[0];  /* per-chip data structure for each chip */
 };
 
-/*
- * Returns the command address according to the given geometry.
- */
-static inline uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,
-                               struct map_info *map, struct cfi_private *cfi)
-{
-       unsigned bankwidth = map_bankwidth(map);
-       unsigned interleave = cfi_interleave(cfi);
-       unsigned type = cfi->device_type;
-       uint32_t addr;
-       
-       addr = (cmd_ofs * type) * interleave;
-
-       /* Modify the unlock address if we are in compatibility mode.
-        * For 16bit devices on 8 bit busses
-        * and 32bit devices on 16 bit busses
-        * set the low bit of the alternating bit sequence of the address.
-        */
-       if (((type * interleave) > bankwidth) && ((cmd_ofs & 0xff) == 0xaa))
-               addr |= (type >> 1)*interleave;
-
-       return  addr;
-}
-
-/*
- * Transforms the CFI command for the given geometry (bus width & interleave).
- * It looks too long to be inline, but in the common case it should almost all
- * get optimised away.
- */
-static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi)
-{
-       map_word val = { {0} };
-       int wordwidth, words_per_bus, chip_mode, chips_per_word;
-       unsigned long onecmd;
-       int i;
-
-       /* We do it this way to give the compiler a fighting chance
-          of optimising away all the crap for 'bankwidth' larger than
-          an unsigned long, in the common case where that support is
-          disabled */
-       if (map_bankwidth_is_large(map)) {
-               wordwidth = sizeof(unsigned long);
-               words_per_bus = (map_bankwidth(map)) / wordwidth; // i.e. normally 1
-       } else {
-               wordwidth = map_bankwidth(map);
-               words_per_bus = 1;
-       }
-
-       chip_mode = map_bankwidth(map) / cfi_interleave(cfi);
-       chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map);
-
-       /* First, determine what the bit-pattern should be for a single
-          device, according to chip mode and endianness... */
-       switch (chip_mode) {
-       default: BUG();
-       case 1:
-               onecmd = cmd;
-               break;
-       case 2:
-               onecmd = cpu_to_cfi16(map, cmd);
-               break;
-       case 4:
-               onecmd = cpu_to_cfi32(map, cmd);
-               break;
-       }
-
-       /* Now replicate it across the size of an unsigned long, or
-          just to the bus width as appropriate */
-       switch (chips_per_word) {
-       default: BUG();
-#if BITS_PER_LONG >= 64
-       case 8:
-               onecmd |= (onecmd << (chip_mode * 32));
-#endif
-       case 4:
-               onecmd |= (onecmd << (chip_mode * 16));
-       case 2:
-               onecmd |= (onecmd << (chip_mode * 8));
-       case 1:
-               ;
-       }
+uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,
+                               struct map_info *map, struct cfi_private *cfi);
 
-       /* And finally, for the multi-word case, replicate it
-          in all words in the structure */
-       for (i=0; i < words_per_bus; i++) {
-               val.x[i] = onecmd;
-       }
-
-       return val;
-}
+map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi);
 #define CMD(x)  cfi_build_cmd((x), map, cfi)
 
-
-static inline unsigned long cfi_merge_status(map_word val, struct map_info *map,
-                                          struct cfi_private *cfi)
-{
-       int wordwidth, words_per_bus, chip_mode, chips_per_word;
-       unsigned long onestat, res = 0;
-       int i;
-
-       /* We do it this way to give the compiler a fighting chance
-          of optimising away all the crap for 'bankwidth' larger than
-          an unsigned long, in the common case where that support is
-          disabled */
-       if (map_bankwidth_is_large(map)) {
-               wordwidth = sizeof(unsigned long);
-               words_per_bus = (map_bankwidth(map)) / wordwidth; // i.e. normally 1
-       } else {
-               wordwidth = map_bankwidth(map);
-               words_per_bus = 1;
-       }
-
-       chip_mode = map_bankwidth(map) / cfi_interleave(cfi);
-       chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map);
-
-       onestat = val.x[0];
-       /* Or all status words together */
-       for (i=1; i < words_per_bus; i++) {
-               onestat |= val.x[i];
-       }
-
-       res = onestat;
-       switch(chips_per_word) {
-       default: BUG();
-#if BITS_PER_LONG >= 64
-       case 8:
-               res |= (onestat >> (chip_mode * 32));
-#endif
-       case 4:
-               res |= (onestat >> (chip_mode * 16));
-       case 2:
-               res |= (onestat >> (chip_mode * 8));
-       case 1:
-               ;
-       }
-
-       /* Last, determine what the bit-pattern should be for a single
-          device, according to chip mode and endianness... */
-       switch (chip_mode) {
-       case 1:
-               break;
-       case 2:
-               res = cfi16_to_cpu(map, res);
-               break;
-       case 4:
-               res = cfi32_to_cpu(map, res);
-               break;
-       default: BUG();
-       }
-       return res;
-}
-
+unsigned long cfi_merge_status(map_word val, struct map_info *map,
+                                          struct cfi_private *cfi);
 #define MERGESTATUS(x) cfi_merge_status((x), map, cfi)
 
-
-/*
- * Sends a CFI command to a bank of flash for the given geometry.
- *
- * Returns the offset in flash where the command was written.
- * If prev_val is non-null, it will be set to the value at the command address,
- * before the command was written.
- */
-static inline uint32_t cfi_send_gen_cmd(u_char cmd, uint32_t cmd_addr, uint32_t base,
+uint32_t cfi_send_gen_cmd(u_char cmd, uint32_t cmd_addr, uint32_t base,
                                struct map_info *map, struct cfi_private *cfi,
-                               int type, map_word *prev_val)
-{
-       map_word val;
-       uint32_t addr = base + cfi_build_cmd_addr(cmd_addr, map, cfi);
-       val = cfi_build_cmd(cmd, map, cfi);
-
-       if (prev_val)
-               *prev_val = map_read(map, addr);
-
-       map_write(map, val, addr);
-
-       return addr - base;
-}
+                               int type, map_word *prev_val);
 
 static inline uint8_t cfi_read_query(struct map_info *map, uint32_t addr)
 {
@@ -506,15 +342,7 @@ static inline uint16_t cfi_read_query16(struct map_info *map, uint32_t addr)
        }
 }
 
-static inline void cfi_udelay(int us)
-{
-       if (us >= 1000) {
-               msleep((us+999)/1000);
-       } else {
-               udelay(us);
-               cond_resched();
-       }
-}
+void cfi_udelay(int us);
 
 int __xipram cfi_qry_present(struct map_info *map, __u32 base,
                             struct cfi_private *cfi);
index 3d4ea7eb2b68b9681a77c161669a1944994d4431..f25e2bdd188c94643efc0f3a94c7c67de81897aa 100644 (file)
@@ -26,6 +26,8 @@
 
 struct mtd_info;
 struct nand_flash_dev;
+struct device_node;
+
 /* Scan and identify a NAND device */
 extern int nand_scan(struct mtd_info *mtd, int max_chips);
 /*
@@ -542,6 +544,7 @@ struct nand_buffers {
  *                     flash device
  * @IO_ADDR_W:         [BOARDSPECIFIC] address to write the 8 I/O lines of the
  *                     flash device.
+ * @dn:                        [BOARDSPECIFIC] device node describing this instance
  * @read_byte:         [REPLACEABLE] read one byte from the chip
  * @read_word:         [REPLACEABLE] read one word from the chip
  * @write_byte:                [REPLACEABLE] write a single byte to the chip on the
@@ -644,6 +647,8 @@ struct nand_chip {
        void __iomem *IO_ADDR_R;
        void __iomem *IO_ADDR_W;
 
+       struct device_node *dn;
+
        uint8_t (*read_byte)(struct mtd_info *mtd);
        u16 (*read_word)(struct mtd_info *mtd);
        void (*write_byte)(struct mtd_info *mtd, uint8_t byte);
@@ -833,7 +838,6 @@ struct nand_manufacturers {
 extern struct nand_flash_dev nand_flash_ids[];
 extern struct nand_manufacturers nand_manuf_ids[];
 
-extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd);
 extern int nand_default_bbt(struct mtd_info *mtd);
 extern int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);
 extern int nand_isreserved_bbt(struct mtd_info *mtd, loff_t offs);