Skip to content

Commit 02f26ec

Browse files
miquelraynalBoris Brezillon
authored and
Boris Brezillon
committed
mtd: nand: add reworked Marvell NAND controller driver
Add marvell_nand driver which aims at replacing the existing pxa3xx_nand driver. The new driver intends to be easier to understand and follows the brand new NAND framework rules by implementing hooks for every pattern the controller might support and referencing them inside a parser object that will be given to the core at each ->exec_op() call. Raw accessors are implemented, useful to test/debug memory/filesystem corruptions. Userspace binaries contained in the mtd-utils package may now be used and their output trusted. Most of the DT nodes using the old driver kept non-optimal timings from the bootloader (even if there was some mechanisms to derive them if the chip was ONFI compliant). The new default is to implement ->setup_data_interface() and follow the core's decision regarding the chip. Thanks to the improved timings, implementation of ONFI mode 5 support (with EDO managed by adding a delay on data sampling), merging the commands together and optimizing writes in the command registers, the new driver may achieve faster throughputs in both directions. Measurements show an improvement of about +23% read throughput and +24% write throughput. These measurements have been done with an Armada-385-DB-AP (4kiB NAND pages forced in 4-bit strength BCH ECC correction) using the userspace tool 'flash_speed' from the MTD test suite. Besides these important topics, the new driver addresses several unsolved known issues in the old driver which: - did not work with ECC soft neither with ECC none ; - relied on naked read/write (which is unchanged) while the NFCv1 embedded in the pxa3xx platforms do not implement it, so several NAND commands did not actually ever work without any notice (like reading the ONFI PARAM_PAGE or SET/GET_FEATURES) ; - wrote the OOB data correctly, but was not able to read it correctly past the first OOB data chunk ; - did not retrieve ECC bytes ; - used device tree bindings that did not allow more than one NAND chip, and did not allow to choose the correct chip select if not incrementing from 0. Plus, the Ready/Busy line used had to be 0. Old device tree bindings are still supported but deprecated. A more hierarchical view has to be used to keep the controller and the NAND chip structures clearly separated both inside the device tree and also in the driver code. Signed-off-by: Miquel Raynal <[email protected]> Tested-by: Sean Nyekjaer <[email protected]> Tested-by: Willy Tarreau <[email protected]> Signed-off-by: Boris Brezillon <[email protected]>
1 parent a82d206 commit 02f26ec

File tree

3 files changed

+2912
-0
lines changed

3 files changed

+2912
-0
lines changed

drivers/mtd/nand/Kconfig

+13
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ config MTD_NAND_ATMEL
315315

316316
config MTD_NAND_PXA3xx
317317
tristate "NAND support on PXA3xx and Armada 370/XP"
318+
depends on !MTD_NAND_MARVELL
318319
depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU
319320
help
320321

@@ -323,6 +324,18 @@ config MTD_NAND_PXA3xx
323324
platforms (XP, 370, 375, 38x, 39x) and 64-bit Armada
324325
platforms (7K, 8K) (NFCv2).
325326

327+
config MTD_NAND_MARVELL
328+
tristate "NAND controller support on Marvell boards"
329+
depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
330+
COMPILE_TEST
331+
depends on HAS_IOMEM
332+
help
333+
This enables the NAND flash controller driver for Marvell boards,
334+
including:
335+
- PXA3xx processors (NFCv1)
336+
- 32-bit Armada platforms (XP, 37x, 38x, 39x) (NFCv2)
337+
- 64-bit Aramda platforms (7k, 8k) (NFCv2)
338+
326339
config MTD_NAND_SLC_LPC32XX
327340
tristate "NXP LPC32xx SLC Controller"
328341
depends on ARCH_LPC32XX

drivers/mtd/nand/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ obj-$(CONFIG_MTD_NAND_OMAP2) += omap2_nand.o
3232
obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD) += omap_elm.o
3333
obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o
3434
obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
35+
obj-$(CONFIG_MTD_NAND_MARVELL) += marvell_nand.o
3536
obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
3637
obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
3738
obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o

0 commit comments

Comments
 (0)