During the last months, Boris Brezillon shared his work to support serial flashes within Linux. First, he delivered (and merged) a new layer called spi-mem. He also initiated in Linux MTD subsystem the move of all 'raw' NAND related code to a raw/ subdirectory, adding at the same time a NAND core that would be shared with all NAND devices. Then, he contributed a generic SPI-NAND driver, making use of this NAND core, as well as some vendor code to drive a few chips.
On top of this work, I made some cleanups in the MTD layer and added an 'mtd' U-Boot command to handle all sort of MTD devices. This should become the default command instead of having one per flash flavor ('sf', 'nand', 'spi-nand' ?).
The series has been tested on an Ocelot board PCB123 (VSC7514), featuring a Macronix SPI NAND chip.
TL;DR: the series contains: - A few patches from Linux to resynchronize some areas of the MTD layer. - Various fixes and re-organization of the MTD subsystem. - The introduction of the SPI-mem interface. - The addition of the generic SPI-NAND driver (and its bindings). - Several SPI NAND chip drivers (Macronix, Micron, Winbond). - A new 'mtd' command. - Support for spi-nand devices in mtdparts.
To test your SPI-NAND device with U-Boot simply follow these lines:
setenv mtdparts mtdparts=spi-nand0:1m(foo),-(bar) ubi part bar # create a static UBI volume in the bar partition mtd list # show the current MTD devices/partitions
Thanks, Miquèl
Changes since v6: ----------------- * Squashed Boris' fixes about build issues in Travis. * Merged Stefan Roese's contributions. * cmd: mtdparts: * added fallthrough comments in switch blocks deriving sizes. * balanced debug messages to compare freed and allocated partitions. * move mtdparts_init() declaration in mtd/partitions.h to be used in mtd command as well. * introduced a "compatibility" function to return what the MTD device name could be thanks to the mtdids environment variable (which is useless with the new partitioning logic). * mtd: mtdpart: * reworked the way partitions are created/handled. * cmd: mtd: * implement a partitioning logic that takes the best out of the MTD layer without re-inventing the wheel. Partitions are all freed correctly when the value of mtdparts changes. * balance get_mtd_device() by put_mtd_device() calls. * prevent memory leak by reorganizing the code a bit in do_mtd. * do not reconstruct partition list when a partition is already in use (complain about that instead). * add support for the legacy mtdids (not needed anymore if mtdparts directly uses the MTD device names as in Linux. * cmd: ubi: * clean and simplify the partition handling a bit to make use the best use of the MTD layer as well and keep the code simple.
Changes since v5: ----------------- * Included Boris fixup about the build issues. * Added Rb/Ab tags from Jagan on patchs 20/21.
Changes since v4: ----------------- * Added Jagan's Acked-by tags to every patch related to the SPI-mem/SPI-NAND addition. * Rebased on top of master.
Changes since v3: ----------------- * Fixed the debug messages in spi-mem to print either Rx or Tx data. * Fixed a Kconfig error that prevented to build mtdparts with plain defconfig. * Fixed a compilation error due to the above error that prevented one file to be compiled. * Adapted the mtd command to probe MTD partitions also. * Declared mtd_probe_devices() in a header so mtdparts or UBI could use it too (to probe all devices and MTD partitions in a clean way). * As I worked on mtdparts, I found annoying and completely useless the fact that we need to prefix the environment variable with "mtdparts=". Canceled this obligation. * Added one patch to allow spi-nand devices to be recognized by mtdparts (this is purely useless but needed to be done in order to use this command). * Removed useless definitions of MTD device types in UBI code. * Wrote a generic mtdparts environment variable parser, used by the mtd command. * Used the mtd_probe_devices() function from get_mtd_info() in cmd/mtdparts.c to be sure the desired partition really does not exist (otherwise it will be probed and then found).
Changes since v2: ----------------- * Rebased on u-boot master branch. * Removed extra-parenthesis in "mtd: Fallback to ->_read/write() when ->_read/write_oob() is missing" * s/fiels/files/ in "mtd: move NAND fiels into a raw/ subdirectory" * Do not describe generic SPI device properties in SPI NAND bindings. * Changes in the mtd command: * Printing more information in 'mtd list' (device type, device characteristics) * Switch to do_div() instead of '(u32)value64b % value32b' which only worked because value32b was a power of 2. * Removed erase.chip option. * By default, erase/read/write happen on the full MTD device while a dump will only work on a single page.
Changes since v1: ----------------- * Fixed the nand_memorg structure of the MX35LF2GE4AB chip. * Added Reviewed-by tags from Jagan. * Backported and squashed two patches fixing things in the SPI NAND core received on the Linux ML. * Backported more changes in mtdcore.c from Linux. * Added a patch to add a fallback on mtd->_read/_write() in mtdcore.c when mtd->_read/write_oob() is not supported. * Removed the DT changes, useless as the DTs are not available in mainline yet. * Addressed Boris/Stefan comments on the 'mtd' command. * Added support for multi-pages OOB read/write.
Boris Brezillon (7): mtd: Fallback to ->_read/write_oob() when ->_read/write() is missing mtd: Add sanity checks in mtd_write/read_oob() mtd: nand: Add core infrastructure to deal with NAND devices mtd: nand: Pass mode information to nand_page_io_req spi: Extend the core to ease integration of SPI memory controllers mtd: spinand: Add initial support for the MX35LF1GE4AB chip dt-bindings: Add bindings for SPI NAND devices
Brian Norris (1): mtd: add get/set of_node/flash_node helpers
Ezequiel Garcia (1): mtd: Uninline mtd_write_oob and move it to mtdcore.c
Frieder Schrempf (1): mtd: spinand: Add initial support for Winbond W25M02GV
Miquel Raynal (19): mtd: Fallback to ->_read/write() when ->_read/write_oob() is missing mtd: fix build issue with includes mtd: move definitions to enlarge their range mtd: move all flash categories inside MTD submenu mtd: move NAND files into a raw/ subdirectory mtd: rename nand into rawnand in Kconfig prompt mtd: spinand: Add initial support for the MX35LF2GE4AB chip mtd: declare MTD_PARTITIONS symbol in Kconfig mtd: mtdpart: balance debug messages cmd: ubi: delete useless and misleading definitions cmd: mtdparts: add fallthrough in switch statement cmd: mtdparts: accept spi-nand devices cmd: mtdparts: add a generic 'mtdparts' parser mtd: uclass: add probe function mtd: move mtdparts_init() declaration mtd: mtdpart: implement proper partition handling cmd: mtd: add 'mtd' command cmd: mtdparts: try to probe the MTD devices as a fallback cmd: ubi: clean the partition handling
Peter Pan (2): mtd: nand: Add core infrastructure to support SPI NANDs mtd: spinand: Add initial support for Micron MT29F2G01ABAGD
MAINTAINERS | 6 +- Makefile | 2 +- README | 6 +- arch/arm/mach-uniphier/board_late_init.c | 2 +- cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/flash.c | 1 + cmd/jffs2.c | 1 + cmd/mtd.c | 513 +++++++ cmd/mtdparts.c | 134 +- cmd/nand.c | 1 + cmd/ubi.c | 100 +- common/fdt_support.c | 1 + common/spl/Kconfig | 2 +- common/spl/spl_spi.c | 2 +- doc/README.SPL | 4 +- doc/README.arm-relocation | 2 +- doc/README.nand | 6 +- doc/README.zynq | 2 +- doc/device-tree-bindings/mtd/spi-nand.txt | 5 + drivers/Makefile | 2 +- drivers/dfu/dfu_nand.c | 1 + drivers/fastboot/fb_nand.c | 1 + drivers/mtd/Kconfig | 7 +- drivers/mtd/Makefile | 4 +- drivers/mtd/mtd-uclass.c | 20 + drivers/mtd/mtd_uboot.c | 1 + drivers/mtd/mtdcore.c | 106 +- drivers/mtd/mtdcore.h | 6 - drivers/mtd/mtdpart.c | 389 +++-- drivers/mtd/nand/Kconfig | 299 +--- drivers/mtd/nand/Makefile | 78 +- drivers/mtd/nand/bbt.c | 132 ++ drivers/mtd/nand/core.c | 243 ++++ drivers/mtd/nand/raw/Kconfig | 297 ++++ drivers/mtd/nand/raw/Makefile | 77 + drivers/mtd/nand/{ => raw}/am335x_spl_bch.c | 0 drivers/mtd/nand/{ => raw}/arasan_nfc.c | 0 drivers/mtd/nand/{ => raw}/atmel_nand.c | 0 drivers/mtd/nand/{ => raw}/atmel_nand_ecc.h | 0 drivers/mtd/nand/{ => raw}/davinci_nand.c | 2 +- drivers/mtd/nand/{ => raw}/denali.c | 0 drivers/mtd/nand/{ => raw}/denali.h | 0 drivers/mtd/nand/{ => raw}/denali_dt.c | 0 drivers/mtd/nand/{ => raw}/denali_spl.c | 0 drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c | 0 drivers/mtd/nand/{ => raw}/fsl_elbc_spl.c | 0 drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c | 0 drivers/mtd/nand/{ => raw}/fsl_ifc_spl.c | 0 drivers/mtd/nand/{ => raw}/fsl_upm.c | 0 drivers/mtd/nand/{ => raw}/fsmc_nand.c | 0 drivers/mtd/nand/{ => raw}/kb9202_nand.c | 0 drivers/mtd/nand/{ => raw}/kirkwood_nand.c | 0 drivers/mtd/nand/{ => raw}/kmeter1_nand.c | 0 drivers/mtd/nand/{ => raw}/lpc32xx_nand_mlc.c | 0 drivers/mtd/nand/{ => raw}/lpc32xx_nand_slc.c | 0 drivers/mtd/nand/{ => raw}/mxc_nand.c | 0 drivers/mtd/nand/{ => raw}/mxc_nand.h | 0 drivers/mtd/nand/{ => raw}/mxc_nand_spl.c | 0 drivers/mtd/nand/{ => raw}/mxs_nand.c | 0 drivers/mtd/nand/{ => raw}/mxs_nand.h | 0 drivers/mtd/nand/{ => raw}/mxs_nand_dt.c | 0 drivers/mtd/nand/{ => raw}/mxs_nand_spl.c | 0 drivers/mtd/nand/{ => raw}/nand.c | 0 drivers/mtd/nand/{ => raw}/nand_base.c | 56 - drivers/mtd/nand/{ => raw}/nand_bbt.c | 0 drivers/mtd/nand/{ => raw}/nand_bch.c | 0 drivers/mtd/nand/{ => raw}/nand_ecc.c | 2 +- drivers/mtd/nand/{ => raw}/nand_ids.c | 0 drivers/mtd/nand/{ => raw}/nand_plat.c | 0 drivers/mtd/nand/{ => raw}/nand_spl_load.c | 0 drivers/mtd/nand/{ => raw}/nand_spl_loaders.c | 0 drivers/mtd/nand/{ => raw}/nand_spl_simple.c | 0 drivers/mtd/nand/{ => raw}/nand_timings.c | 0 drivers/mtd/nand/{ => raw}/nand_util.c | 2 +- drivers/mtd/nand/{ => raw}/omap_elm.c | 0 drivers/mtd/nand/{ => raw}/omap_gpmc.c | 0 drivers/mtd/nand/{ => raw}/pxa3xx_nand.c | 2 +- drivers/mtd/nand/{ => raw}/pxa3xx_nand.h | 0 drivers/mtd/nand/{ => raw}/sunxi_nand.c | 0 drivers/mtd/nand/{ => raw}/sunxi_nand_spl.c | 0 drivers/mtd/nand/{ => raw}/tegra_nand.c | 0 drivers/mtd/nand/{ => raw}/tegra_nand.h | 0 drivers/mtd/nand/{ => raw}/vf610_nfc.c | 0 drivers/mtd/nand/{ => raw}/zynq_nand.c | 0 drivers/mtd/nand/spi/Kconfig | 7 + drivers/mtd/nand/spi/Makefile | 4 + drivers/mtd/nand/spi/core.c | 1254 +++++++++++++++++ drivers/mtd/nand/spi/macronix.c | 146 ++ drivers/mtd/nand/spi/micron.c | 135 ++ drivers/mtd/nand/spi/winbond.c | 143 ++ drivers/mtd/onenand/onenand_base.c | 2 - drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/spi-mem.c | 501 +++++++ include/configs/MPC8313ERDB.h | 2 +- include/jffs2/load_kernel.h | 8 +- include/linux/mtd/mtd.h | 69 +- include/linux/mtd/nand.h | 734 ++++++++++ include/linux/mtd/partitions.h | 7 +- include/linux/mtd/spinand.h | 432 ++++++ include/spi-mem.h | 258 ++++ include/spi.h | 11 + 103 files changed, 5441 insertions(+), 805 deletions(-) create mode 100644 cmd/mtd.c create mode 100644 doc/device-tree-bindings/mtd/spi-nand.txt create mode 100644 drivers/mtd/nand/bbt.c create mode 100644 drivers/mtd/nand/core.c create mode 100644 drivers/mtd/nand/raw/Kconfig create mode 100644 drivers/mtd/nand/raw/Makefile rename drivers/mtd/nand/{ => raw}/am335x_spl_bch.c (100%) rename drivers/mtd/nand/{ => raw}/arasan_nfc.c (100%) rename drivers/mtd/nand/{ => raw}/atmel_nand.c (100%) rename drivers/mtd/nand/{ => raw}/atmel_nand_ecc.h (100%) rename drivers/mtd/nand/{ => raw}/davinci_nand.c (99%) rename drivers/mtd/nand/{ => raw}/denali.c (100%) rename drivers/mtd/nand/{ => raw}/denali.h (100%) rename drivers/mtd/nand/{ => raw}/denali_dt.c (100%) rename drivers/mtd/nand/{ => raw}/denali_spl.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_elbc_spl.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_ifc_spl.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_upm.c (100%) rename drivers/mtd/nand/{ => raw}/fsmc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/kb9202_nand.c (100%) rename drivers/mtd/nand/{ => raw}/kirkwood_nand.c (100%) rename drivers/mtd/nand/{ => raw}/kmeter1_nand.c (100%) rename drivers/mtd/nand/{ => raw}/lpc32xx_nand_mlc.c (100%) rename drivers/mtd/nand/{ => raw}/lpc32xx_nand_slc.c (100%) rename drivers/mtd/nand/{ => raw}/mxc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/mxc_nand.h (100%) rename drivers/mtd/nand/{ => raw}/mxc_nand_spl.c (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand.c (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand.h (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand_dt.c (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand_spl.c (100%) rename drivers/mtd/nand/{ => raw}/nand.c (100%) rename drivers/mtd/nand/{ => raw}/nand_base.c (98%) rename drivers/mtd/nand/{ => raw}/nand_bbt.c (100%) rename drivers/mtd/nand/{ => raw}/nand_bch.c (100%) rename drivers/mtd/nand/{ => raw}/nand_ecc.c (99%) rename drivers/mtd/nand/{ => raw}/nand_ids.c (100%) rename drivers/mtd/nand/{ => raw}/nand_plat.c (100%) rename drivers/mtd/nand/{ => raw}/nand_spl_load.c (100%) rename drivers/mtd/nand/{ => raw}/nand_spl_loaders.c (100%) rename drivers/mtd/nand/{ => raw}/nand_spl_simple.c (100%) rename drivers/mtd/nand/{ => raw}/nand_timings.c (100%) rename drivers/mtd/nand/{ => raw}/nand_util.c (99%) rename drivers/mtd/nand/{ => raw}/omap_elm.c (100%) rename drivers/mtd/nand/{ => raw}/omap_gpmc.c (100%) rename drivers/mtd/nand/{ => raw}/pxa3xx_nand.c (99%) rename drivers/mtd/nand/{ => raw}/pxa3xx_nand.h (100%) rename drivers/mtd/nand/{ => raw}/sunxi_nand.c (100%) rename drivers/mtd/nand/{ => raw}/sunxi_nand_spl.c (100%) rename drivers/mtd/nand/{ => raw}/tegra_nand.c (100%) rename drivers/mtd/nand/{ => raw}/tegra_nand.h (100%) rename drivers/mtd/nand/{ => raw}/vf610_nfc.c (100%) rename drivers/mtd/nand/{ => raw}/zynq_nand.c (100%) create mode 100644 drivers/mtd/nand/spi/Kconfig create mode 100644 drivers/mtd/nand/spi/Makefile create mode 100644 drivers/mtd/nand/spi/core.c create mode 100644 drivers/mtd/nand/spi/macronix.c create mode 100644 drivers/mtd/nand/spi/micron.c create mode 100644 drivers/mtd/nand/spi/winbond.c create mode 100644 drivers/spi/spi-mem.c create mode 100644 include/linux/mtd/nand.h create mode 100644 include/linux/mtd/spinand.h create mode 100644 include/spi-mem.h