In the fifth revision some more changes, which have been made in the
U-Boot driver, have been applied to this driver too. The driver now
uses dedicated vf610_nfc_read_page/vf610_nfc_write_page functions
which feel more appropriate for the device. This changes enable raw
page writes, which in turn enables to use the the mtd_nandbiterrs.ko
test.
Beside that, the changes from the reviews have been implemented.
If one is interested in the individual changes, the U-Boot patchset,
which has been applied/adopted and squashed into this driver, is
available in the U-Boot mailing list archive:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/220416
The patchset is based on the patchset by Bill Pringlemeir, see:
http://thread.gmane.org/gmane.linux.ports.arm.kernel/295419
The driver passes the MTD tests, the logs are attched inline, below
the change log.
Performance key points on Colibri VF61:
mtd_speedtest: testing eraseblock write speed
mtd_speedtest: eraseblock write speed is 5417 KiB/s
mtd_speedtest: testing eraseblock read speed
mtd_speedtest: eraseblock read speed is 13012 KiB/s
mtd_speedtest: testing page write speed
Changes since v4:
- Rebased ontop of l2-mtd/master (v4.1-rc4 based)
- Eliminate unnecessary page read (NAND_CMD_SEQIN) since the driver does
not support sub-page writes anyway (improves write performance)
- Support ONFI by enabling READID command with offset and parameter page
reads (CMD_PARAM)
- Change to dedicated read_page/write_page function, enables raw writes
- Use __LITTLE_ENDIAN to distingush between LE/BE relevant statements
- Eliminated vf610_nfc_probe_dt in favor of common DT init code
- Use wait_for_completion_timeout
- Some style fixes (spaces, etc.)
Changes since v3:
- Make the driver selectable when COMPILE_TEST is set
- Fix compile error due to superfluous ECC_STATUS configuration in initial
patch (without ECC correction ECC_STATUS does not need to be configured)
- Remove custom BBT pattern and switch to in-band BBT in the initial patch
- Include two bug fixes, for details see the corresponding U-Boot patches:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/215802
Changes since v2:
- Updated binding documentation
Changes since v1:
- Nest nfc_config struct within the main nfc struct
- Use assigned clock binding to specify NFC clock
- Rebased ontop of MSCM IR patchset (driver parts have been merged)
- Split out arch Kconfig in a separate config
- Fix module license
- Updated MAINTAINERS
Changes since RFC (Bill Pringlemeir):
- Renamed driver from fsl_nfc to vf610_nfc
- Use readl/writel for all register in accessor functions
- Optimized field accessor functions
- Implemented PM (suspend/resume) functions
- Implemented basic support for ECC strength/ECC step size from dt
- Improved performance of count_written_bits by using hweight32
- Support ECC with 60-bytes to correct up to 32 bit errors
- Changed to in-band BBT (NAND_BBT_NO_OOB) which also allows ECC modes
which uses up to 60 bytes on 64 byte OOB
- Removed custom (downstream) BBT pattern since BBT table won't be
compatible anyway (due to the change above)
MTD tests:
[ 197.039235] ==================================================
[ 197.045208] mtd_nandbiterrs: MTD device: 3
[ 197.066559] mtd_nandbiterrs: MTD device size 134217728, eraseblock=131072, page=2048, oob=64
[ 197.075314] mtd_nandbiterrs: Device uses 1 subpages of 2048 bytes
[ 197.081506] mtd_nandbiterrs: Using page=0, offset=0, eraseblock=0
[ 197.099422] mtd_nandbiterrs: incremental biterrors test
[ 197.105002] mtd_nandbiterrs: write_page
[ 197.109515] mtd_nandbiterrs: rewrite page
[ 197.124398] mtd_nandbiterrs: read_page
[ 197.128747] mtd_nandbiterrs: verify_page
[ 197.132964] mtd_nandbiterrs: Successfully corrected 0 bit errors per subpage
[ 197.140201] mtd_nandbiterrs: Inserted biterror @ 0/5
[ 197.145212] mtd_nandbiterrs: rewrite page
[ 197.149796] mtd_nandbiterrs: read_page
[ 197.162519] mtd_nandbiterrs: verify_page
[ 197.166953] mtd_nandbiterrs: Successfully corrected 1 bit errors per subpage
[ 197.174109] mtd_nandbiterrs: Inserted biterror @ 0/2
[ 197.179117] mtd_nandbiterrs: rewrite page
[ 197.183743] mtd_nandbiterrs: read_page
[ 197.187931] mtd_nandbiterrs: verify_page
[ 197.192239] mtd_nandbiterrs: Successfully corrected 2 bit errors per subpage
[ 197.199339] mtd_nandbiterrs: Inserted biterror @ 0/0
[ 197.204377] mtd_nandbiterrs: rewrite page
[ 197.218883] mtd_nandbiterrs: read_page
[ 197.222929] mtd_nandbiterrs: verify_page
[ 197.227091] mtd_nandbiterrs: Successfully corrected 3 bit errors per subpage
[ 197.234218] mtd_nandbiterrs: Inserted biterror @ 1/7
[ 197.239336] mtd_nandbiterrs: rewrite page
[ 197.243912] mtd_nandbiterrs: read_page
[ 197.257324] mtd_nandbiterrs: verify_page
[ 197.261871] mtd_nandbiterrs: Successfully corrected 4 bit errors per subpage
[ 197.268975] mtd_nandbiterrs: Inserted biterror @ 1/5
[ 197.274024] mtd_nandbiterrs: rewrite page
[ 197.278626] mtd_nandbiterrs: read_page
[ 197.282638] mtd_nandbiterrs: verify_page
[ 197.286909] mtd_nandbiterrs: Successfully corrected 5 bit errors per subpage
[ 197.294046] mtd_nandbiterrs: Inserted biterror @ 1/2
[ 197.299051] mtd_nandbiterrs: rewrite page
[ 197.303646] mtd_nandbiterrs: read_page
[ 197.307628] mtd_nandbiterrs: verify_page
[ 197.311814] mtd_nandbiterrs: Successfully corrected 6 bit errors per subpage
[ 197.319044] mtd_nandbiterrs: Inserted biterror @ 1/0
[ 197.324092] mtd_nandbiterrs: rewrite page
[ 197.338545] mtd_nandbiterrs: read_page
[ 197.342583] mtd_nandbiterrs: verify_page
[ 197.346852] mtd_nandbiterrs: Successfully corrected 7 bit errors per subpage
[ 197.353989] mtd_nandbiterrs: Inserted biterror @ 2/6
[ 197.358993] mtd_nandbiterrs: rewrite page
[ 197.363596] mtd_nandbiterrs: read_page
[ 197.376554] mtd_nandbiterrs: verify_page
[ 197.381268] mtd_nandbiterrs: Successfully corrected 8 bit errors per subpage
[ 197.388373] mtd_nandbiterrs: Inserted biterror @ 2/5
[ 197.393422] mtd_nandbiterrs: rewrite page
[ 197.398104] mtd_nandbiterrs: read_page
[ 197.402330] mtd_nandbiterrs: verify_page
[ 197.406597] mtd_nandbiterrs: Successfully corrected 9 bit errors per subpage
[ 197.413738] mtd_nandbiterrs: Inserted biterror @ 2/2
[ 197.418743] mtd_nandbiterrs: rewrite page
[ 197.435214] mtd_nandbiterrs: read_page
[ 197.439226] mtd_nandbiterrs: verify_page
[ 197.443536] mtd_nandbiterrs: Successfully corrected 10 bit errors per subpage
[ 197.450760] mtd_nandbiterrs: Inserted biterror @ 2/0
[ 197.455764] mtd_nandbiterrs: rewrite page
[ 197.460388] mtd_nandbiterrs: read_page
[ 197.475201] mtd_nandbiterrs: verify_page
[ 197.479639] mtd_nandbiterrs: Successfully corrected 11 bit errors per subpage
[ 197.486827] mtd_nandbiterrs: Inserted biterror @ 3/7
[ 197.491861] mtd_nandbiterrs: rewrite page
[ 197.496462] mtd_nandbiterrs: read_page
[ 197.500703] mtd_nandbiterrs: verify_page
[ 197.504977] mtd_nandbiterrs: Successfully corrected 12 bit errors per subpage
[ 197.512205] mtd_nandbiterrs: Inserted biterror @ 3/6
[ 197.517207] mtd_nandbiterrs: rewrite page
[ 197.531491] mtd_nandbiterrs: read_page
[ 197.535503] mtd_nandbiterrs: verify_page
[ 197.539810] mtd_nandbiterrs: Successfully corrected 13 bit errors per subpage
[ 197.547003] mtd_nandbiterrs: Inserted biterror @ 3/5
[ 197.552042] mtd_nandbiterrs: rewrite page
[ 197.556627] mtd_nandbiterrs: read_page
[ 197.569904] mtd_nandbiterrs: verify_page
[ 197.574460] mtd_nandbiterrs: Successfully corrected 14 bit errors per subpage
[ 197.581688] mtd_nandbiterrs: Inserted biterror @ 3/2
[ 197.586696] mtd_nandbiterrs: rewrite page
[ 197.591390] mtd_nandbiterrs: read_page
[ 197.595378] mtd_nandbiterrs: verify_page
[ 197.599679] mtd_nandbiterrs: Successfully corrected 15 bit errors per subpage
[ 197.606865] mtd_nandbiterrs: Inserted biterror @ 3/0
[ 197.611898] mtd_nandbiterrs: rewrite page
[ 197.616474] mtd_nandbiterrs: read_page
[ 197.629809] mtd_nandbiterrs: verify_page
[ 197.633987] mtd_nandbiterrs: Successfully corrected 16 bit errors per subpage
[ 197.641212] mtd_nandbiterrs: Inserted biterror @ 4/2
[ 197.646221] mtd_nandbiterrs: rewrite page
[ 197.650866] mtd_nandbiterrs: read_page
[ 197.654851] mtd_nandbiterrs: verify_page
[ 197.659010] mtd_nandbiterrs: Successfully corrected 17 bit errors per subpage
[ 197.666349] mtd_nandbiterrs: Inserted biterror @ 4/0
[ 197.671392] mtd_nandbiterrs: rewrite page
[ 197.676019] mtd_nandbiterrs: read_page
[ 197.690248] mtd_nandbiterrs: verify_page
[ 197.694705] mtd_nandbiterrs: Successfully corrected 18 bit errors per subpage
[ 197.701943] mtd_nandbiterrs: Inserted biterror @ 5/7
[ 197.706952] mtd_nandbiterrs: rewrite page
[ 197.711588] mtd_nandbiterrs: read_page
[ 197.715575] mtd_nandbiterrs: verify_page
[ 197.719881] mtd_nandbiterrs: Successfully corrected 19 bit errors per subpage
[ 197.727070] mtd_nandbiterrs: Inserted biterror @ 5/2
[ 197.732108] mtd_nandbiterrs: rewrite page
[ 197.736650] mtd_nandbiterrs: read_page
[ 197.750836] mtd_nandbiterrs: verify_page
[ 197.755261] mtd_nandbiterrs: Successfully corrected 20 bit errors per subpage
[ 197.762491] mtd_nandbiterrs: Inserted biterror @ 5/0
[ 197.767500] mtd_nandbiterrs: rewrite page
[ 197.772081] mtd_nandbiterrs: read_page
[ 197.776070] mtd_nandbiterrs: verify_page
[ 197.780374] mtd_nandbiterrs: Successfully corrected 21 bit errors per subpage
[ 197.787566] mtd_nandbiterrs: Inserted biterror @ 6/6
[ 197.792605] mtd_nandbiterrs: rewrite page
[ 197.797182] mtd_nandbiterrs: read_page
[ 197.811376] mtd_nandbiterrs: verify_page
[ 197.815653] mtd_nandbiterrs: Successfully corrected 22 bit errors per subpage
[ 197.823023] mtd_nandbiterrs: Inserted biterror @ 6/2
[ 197.828034] mtd_nandbiterrs: rewrite page
[ 197.832662] mtd_nandbiterrs: read_page
[ 197.836647] mtd_nandbiterrs: verify_page
[ 197.840949] mtd_nandbiterrs: Successfully corrected 23 bit errors per subpage
[ 197.848140] mtd_nandbiterrs: Inserted biterror @ 6/0
[ 197.853178] mtd_nandbiterrs: rewrite page
[ 197.857762] mtd_nandbiterrs: read_page
[ 197.871308] mtd_nandbiterrs: verify_page
[ 197.875690] mtd_nandbiterrs: Successfully corrected 24 bit errors per subpage
[ 197.882923] mtd_nandbiterrs: Inserted biterror @ 7/7
[ 197.887929] mtd_nandbiterrs: rewrite page
[ 197.892515] mtd_nandbiterrs: read_page
[ 197.896503] mtd_nandbiterrs: verify_page
[ 197.900694] mtd_nandbiterrs: Successfully corrected 25 bit errors per subpage
[ 197.907994] mtd_nandbiterrs: Inserted biterror @ 7/6
[ 197.913038] mtd_nandbiterrs: rewrite page
[ 197.917568] mtd_nandbiterrs: read_page
[ 197.930384] mtd_nandbiterrs: verify_page
[ 197.934712] mtd_nandbiterrs: Successfully corrected 26 bit errors per subpage
[ 197.941941] mtd_nandbiterrs: Inserted biterror @ 7/2
[ 197.946950] mtd_nandbiterrs: rewrite page
[ 197.951529] mtd_nandbiterrs: read_page
[ 197.955515] mtd_nandbiterrs: verify_page
[ 197.959817] mtd_nandbiterrs: Successfully corrected 27 bit errors per subpage
[ 197.967008] mtd_nandbiterrs: Inserted biterror @ 7/0
[ 197.972057] mtd_nandbiterrs: rewrite page
[ 197.977849] mtd_nandbiterrs: read_page
[ 197.992304] mtd_nandbiterrs: verify_page
[ 197.996624] mtd_nandbiterrs: Successfully corrected 28 bit errors per subpage
[ 198.003858] mtd_nandbiterrs: Inserted biterror @ 8/7
[ 198.008862] mtd_nandbiterrs: rewrite page
[ 198.013441] mtd_nandbiterrs: read_page
[ 198.017424] mtd_nandbiterrs: verify_page
[ 198.021644] mtd_nandbiterrs: Successfully corrected 29 bit errors per subpage
[ 198.028829] mtd_nandbiterrs: Inserted biterror @ 8/5
[ 198.033979] mtd_nandbiterrs: rewrite page
[ 198.038616] mtd_nandbiterrs: read_page
[ 198.052747] mtd_nandbiterrs: verify_page
[ 198.057239] mtd_nandbiterrs: Successfully corrected 30 bit errors per subpage
[ 198.064477] mtd_nandbiterrs: Inserted biterror @ 8/4
[ 198.069490] mtd_nandbiterrs: rewrite page
[ 198.074074] mtd_nandbiterrs: read_page
[ 198.078062] mtd_nandbiterrs: verify_page
[ 198.082368] mtd_nandbiterrs: Successfully corrected 31 bit errors per subpage
[ 198.089597] mtd_nandbiterrs: Inserted biterror @ 8/2
[ 198.094603] mtd_nandbiterrs: rewrite page
[ 198.099202] mtd_nandbiterrs: read_page
[ 198.113451] mtd_nandbiterrs: verify_page
[ 198.117846] mtd_nandbiterrs: Successfully corrected 32 bit errors per subpage
[ 198.125076] mtd_nandbiterrs: Inserted biterror @ 8/0
[ 198.130105] mtd_nandbiterrs: rewrite page
[ 198.134705] mtd_nandbiterrs: read_page
[ 198.138905] mtd_nandbiterrs: error: read failed at 0x0
[ 198.144239] mtd_nandbiterrs: After 33 biterrors per subpage, read reported error -74
[ 198.163281] mtd_nandbiterrs: finished successfully.
[ 198.168332] ==================================================
[ 228.550809]
[ 228.552545] =================================================
[ 228.558346] mtd_oobtest: MTD device: 3
[ 228.581278] mtd_oobtest: MTD device size 134217728, eraseblock size 131072, page size 2048, count of eraseblocks 1024, pages per eraseblock 64, OOB size 64
[ 228.595985] mtd_test: scanning for bad eraseblocks
[ 228.611269] mtd_test: block 316 is bad
[ 228.615909] mtd_test: block 917 is bad
[ 228.619790] mtd_test: scanned 1024 eraseblocks, 2 are bad
[ 228.625347] mtd_oobtest: test 1 of 5
[ 228.900362] mtd_oobtest: writing OOBs of whole device
[ 228.932108] mtd_oobtest: written up to eraseblock 0
[ 233.052533] mtd_oobtest: written up to eraseblock 256
[ 237.155804] mtd_oobtest: written up to eraseblock 512
[ 241.274283] mtd_oobtest: written up to eraseblock 768
[ 245.361809] mtd_oobtest: written 1024 eraseblocks
[ 245.366613] mtd_oobtest: verifying all eraseblocks
[ 245.374180] mtd_oobtest: verified up to eraseblock 0
[ 246.223481] mtd_oobtest: verified up to eraseblock 256
[ 247.045983] mtd_oobtest: verified up to eraseblock 512
[ 247.870732] mtd_oobtest: verified up to eraseblock 768
[ 248.683053] mtd_oobtest: verified 1024 eraseblocks
[ 248.687936] mtd_oobtest: test 2 of 5
[ 249.636996] mtd_oobtest: writing OOBs of whole device
[ 249.668742] mtd_oobtest: written up to eraseblock 0
[ 253.782380] mtd_oobtest: written up to eraseblock 256
[ 257.882626] mtd_oobtest: written up to eraseblock 512
[ 261.996761] mtd_oobtest: written up to eraseblock 768
[ 266.082061] mtd_oobtest: written 1024 eraseblocks
[ 266.086841] mtd_oobtest: verifying all eraseblocks
[ 266.105270] mtd_oobtest: verified up to eraseblock 0
[ 266.893608] mtd_oobtest: verified up to eraseblock 256
[ 267.662111] mtd_oobtest: verified up to eraseblock 512
[ 268.437666] mtd_oobtest: verified up to eraseblock 768
[ 269.199091] mtd_oobtest: verified 1024 eraseblocks
[ 269.203950] mtd_oobtest: test 3 of 5
[ 270.153944] mtd_oobtest: writing OOBs of whole device
[ 270.184817] mtd_oobtest: written up to eraseblock 0
[ 274.253906] mtd_oobtest: written up to eraseblock 256
[ 278.304987] mtd_oobtest: written up to eraseblock 512
[ 282.377734] mtd_oobtest: written up to eraseblock 768
[ 286.420526] mtd_oobtest: written 1024 eraseblocks
[ 286.425326] mtd_oobtest: verifying all eraseblocks
[ 286.445855] mtd_oobtest: verified up to eraseblock 0
[ 287.822691] mtd_oobtest: verified up to eraseblock 256
[ 289.182885] mtd_oobtest: verified up to eraseblock 512
[ 290.549325] mtd_oobtest: verified up to eraseblock 768
[ 291.910018] mtd_oobtest: verified 1024 eraseblocks
[ 291.914908] mtd_oobtest: test 4 of 5
[ 292.866482] mtd_oobtest: attempting to start write past end of OOB
[ 292.872769] mtd_oobtest: an error is expected...
[ 292.877437] mtd_oobtest: error occurred as expected
[ 292.882388] mtd_oobtest: attempting to start read past end of OOB
[ 292.888524] mtd_oobtest: an error is expected...
[ 292.893213] mtd_oobtest: error occurred as expected
[ 292.898130] mtd_oobtest: attempting to write past end of device
[ 292.904117] mtd_oobtest: an error is expected...
[ 292.908778] mtd_oobtest: error occurred as expected
[ 292.913719] mtd_oobtest: attempting to read past end of device
[ 292.919591] mtd_oobtest: an error is expected...
[ 292.924275] mtd_oobtest: error occurred as expected
[ 292.939108] mtd_oobtest: attempting to write past end of device
[ 292.945314] mtd_oobtest: an error is expected...
[ 292.949991] mtd_oobtest: error occurred as expected
[ 292.954958] mtd_oobtest: attempting to read past end of device
[ 292.960832] mtd_oobtest: an error is expected...
[ 292.965519] mtd_oobtest: error occurred as expected
[ 292.970436] mtd_oobtest: test 5 of 5
[ 293.353327] mtd_oobtest: writing OOBs of whole device
[ 293.358748] mtd_oobtest: written up to eraseblock 0
[ 293.376318] mtd_oobtest: written up to eraseblock 0
[ 293.520054] mtd_oobtest: written up to eraseblock 256
[ 293.525416] mtd_oobtest: written up to eraseblock 256
[ 293.670380] mtd_oobtest: written up to eraseblock 512
[ 293.675740] mtd_oobtest: written up to eraseblock 512
[ 293.821610] mtd_oobtest: written up to eraseblock 768
[ 293.826949] mtd_oobtest: written up to eraseblock 768
[ 293.970588] mtd_oobtest: written 1023 eraseblocks
[ 293.975401] mtd_oobtest: verifying all eraseblocks
[ 293.990560] mtd_oobtest: verified up to eraseblock 0
[ 294.044032] mtd_oobtest: verified up to eraseblock 256
[ 294.084619] mtd_oobtest: verified up to eraseblock 512
[ 294.126433] mtd_oobtest: verified up to eraseblock 768
[ 294.165784] mtd_oobtest: verified 1023 eraseblocks
[ 294.170639] mtd_oobtest: finished with 0 errors
[ 294.183643] =================================================
[ 680.940230]
[ 680.941955] =================================================
[ 680.947837] mtd_pagetest: MTD device: 3
[ 680.963656] mtd_pagetest: MTD device size 134217728, eraseblock size 131072, page size 2048, count of eraseblocks 1024, pages per eraseblock 64, OOB size 64
[ 680.979125] mtd_test: scanning for bad eraseblocks
[ 680.985544] mtd_test: block 316 is bad
[ 681.003039] mtd_test: block 917 is bad
[ 681.013254] mtd_test: scanned 1024 eraseblocks, 2 are bad
[ 681.018816] mtd_pagetest: erasing whole device
[ 681.996061] mtd_pagetest: erased 1024 eraseblocks
[ 682.000848] mtd_pagetest: writing whole device
[ 682.047637] mtd_pagetest: written up to eraseblock 0
[ 688.833017] mtd_pagetest: written up to eraseblock 256
[ 695.627467] mtd_pagetest: written up to eraseblock 512
[ 702.445828] mtd_pagetest: written up to eraseblock 768
[ 709.194956] mtd_pagetest: written 1024 eraseblocks
[ 709.199851] mtd_pagetest: verifying all eraseblocks
[ 709.293300] mtd_pagetest: verified up to eraseblock 0
[ 726.138810] mtd_pagetest: verified up to eraseblock 256
[ 742.916639] mtd_pagetest: verified up to eraseblock 512
[ 759.762748] mtd_pagetest: verified up to eraseblock 768
[ 776.475675] mtd_pagetest: verified 1024 eraseblocks
[ 776.480664] mtd_pagetest: crosstest
[ 776.484539] mtd_pagetest: reading page at 0x0
[ 776.500772] mtd_pagetest: reading page at 0x7fff800
[ 776.506272] mtd_pagetest: reading page at 0x0
[ 776.510894] mtd_pagetest: verifying pages read at 0x0 match
[ 776.516546] mtd_pagetest: crosstest ok
[ 776.520480] mtd_pagetest: erasecrosstest
[ 776.524452] mtd_pagetest: erasing block 0
[ 776.529717] mtd_pagetest: writing 1st page of block 0
[ 776.546505] mtd_pagetest: reading 1st page of block 0
[ 776.551842] mtd_pagetest: verifying 1st page of block 0
[ 776.557266] mtd_pagetest: erasing block 0
[ 776.562543] mtd_pagetest: writing 1st page of block 0
[ 776.568051] mtd_pagetest: erasing block 1023
[ 776.585315] mtd_pagetest: reading 1st page of block 0
[ 776.590643] mtd_pagetest: verifying 1st page of block 0
[ 776.596064] mtd_pagetest: erasecrosstest ok
[ 776.600328] mtd_pagetest: erasetest
[ 776.603855] mtd_pagetest: erasing block 0
[ 776.609124] mtd_pagetest: writing 1st page of block 0
[ 776.624166] mtd_pagetest: erasing block 0
[ 776.629215] mtd_pagetest: reading 1st page of block 0
[ 776.634752] mtd_pagetest: verifying 1st page of block 0 is all 0xff
[ 776.641247] mtd_pagetest: erasetest ok
[ 776.645047] mtd_pagetest: finished with 0 errors
[ 776.659316] =================================================
[ 813.279152]
[ 813.280872] =================================================
[ 813.286736] mtd_readtest: MTD device: 3
[ 813.304677] mtd_readtest: MTD device size 134217728, eraseblock size 131072, page size 2048, count of eraseblocks 1024, pages per eraseblock 64, OOB size 64
[ 813.320133] mtd_test: scanning for bad eraseblocks
[ 813.340247] mtd_test: block 316 is bad
[ 813.361102] mtd_test: block 917 is bad
[ 813.365642] mtd_test: scanned 1024 eraseblocks, 2 are bad
[ 813.371236] mtd_readtest: testing page read
[ 827.307978] mtd_readtest: finished
[ 827.311495] =================================================
[ 872.104334]
[ 872.105977] =================================================
[ 872.111773] mtd_speedtest: MTD device: 3
[ 872.115791] mtd_speedtest: MTD device size 134217728, eraseblock size 131072, page size 2048, count of eraseblocks 1024, pages per eraseblock 64, OOB size 64
[ 872.144566] mtd_test: scanning for bad eraseblocks
[ 872.150139] mtd_test: block 316 is bad
[ 872.154142] mtd_test: block 917 is bad
[ 872.158012] mtd_test: scanned 1024 eraseblocks, 2 are bad
[ 873.129035] mtd_speedtest: testing eraseblock write speed
[ 896.786975] mtd_speedtest: eraseblock write speed is 5531 KiB/s
[ 896.793012] mtd_speedtest: testing eraseblock read speed
[ 906.852427] mtd_speedtest: eraseblock read speed is 13012 KiB/s
[ 907.806007] mtd_speedtest: testing page write speed
[ 932.631540] mtd_speedtest: page write speed is 5270 KiB/s
[ 932.637025] mtd_speedtest: testing page read speed
[ 942.883652] mtd_speedtest: page read speed is 12775 KiB/s
[ 943.837307] mtd_speedtest: testing 2 page write speed
[ 967.757883] mtd_speedtest: 2 page write speed is 5470 KiB/s
[ 967.763571] mtd_speedtest: testing 2 page read speed
[ 977.914108] mtd_speedtest: 2 page read speed is 12895 KiB/s
[ 977.919763] mtd_speedtest: Testing erase speed
[ 978.880217] mtd_speedtest: erase speed is 136836 KiB/s
[ 978.885463] mtd_speedtest: Testing 2x multi-block erase speed
[ 979.103001] mtd_speedtest: 2x multi-block erase speed is 619981 KiB/s
[ 979.109559] mtd_speedtest: Testing 4x multi-block erase speed
[ 979.323339] mtd_speedtest: 4x multi-block erase speed is 631961 KiB/s
[ 979.329882] mtd_speedtest: Testing 8x multi-block erase speed
[ 979.541457] mtd_speedtest: 8x multi-block erase speed is 638126 KiB/s
[ 979.547993] mtd_speedtest: Testing 16x multi-block erase speed
[ 979.756687] mtd_speedtest: 16x multi-block erase speed is 644413 KiB/s
[ 979.763295] mtd_speedtest: Testing 32x multi-block erase speed
[ 979.972792] mtd_speedtest: 32x multi-block erase speed is 644413 KiB/s
[ 979.979423] mtd_speedtest: Testing 64x multi-block erase speed
[ 980.189510] mtd_speedtest: 64x multi-block erase speed is 641254 KiB/s
[ 980.196136] mtd_speedtest: finished
[ 980.199691] =================================================
[ 990.768858]
[ 990.770572] =================================================
[ 990.776448] mtd_stresstest: MTD device: 3
[ 990.794553] mtd_stresstest: MTD device size 134217728, eraseblock size 131072, page size 2048, count of eraseblocks 1024, pages per eraseblock 64, OOB size 64
[ 990.831237] mtd_test: scanning for bad eraseblocks
[ 990.837349] mtd_test: block 316 is bad
[ 990.842945] mtd_test: block 917 is bad
[ 990.858831] mtd_test: scanned 1024 eraseblocks, 2 are bad
[ 990.864702] mtd_stresstest: doing operations
[ 990.869078] mtd_stresstest: 0 operations done
[ 1006.064161] mtd_stresstest: 1024 operations done
[ 1019.995691] mtd_stresstest: 2048 operations done
[ 1033.373661] mtd_stresstest: 3072 operations done
[ 1047.380562] mtd_stresstest: 4096 operations done
[ 1060.903347] mtd_stresstest: 5120 operations done
[ 1074.271605] mtd_stresstest: 6144 operations done
[ 1088.084848] mtd_stresstest: 7168 operations done
[ 1101.145225] mtd_stresstest: 8192 operations done
[ 1114.460050] mtd_stresstest: 9216 operations done
[ 1124.579963] mtd_stresstest: finished, 10000 operations done
[ 1124.585839] =================================================
[ 1191.017762]
[ 1191.019488] =================================================
[ 1191.025350] mtd_subpagetest: MTD device: 3
[ 1191.042604] mtd_subpagetest: MTD device size 134217728, eraseblock size 131072, page size 2048, subpage size 2048, count of eraseblocks 1024, pages per eraseblock 64, OOB size 64
[ 1191.060156] mtd_test: scanning for bad eraseblocks
[ 1191.081143] mtd_test: block 316 is bad
[ 1191.090832] mtd_test: block 917 is bad
[ 1191.107359] mtd_test: scanned 1024 eraseblocks, 2 are bad
[ 1192.082790] mtd_subpagetest: writing whole device
[ 1192.088410] mtd_subpagetest: written up to eraseblock 0
[ 1192.316990] mtd_subpagetest: written up to eraseblock 256
[ 1192.534023] mtd_subpagetest: written up to eraseblock 512
[ 1192.749818] mtd_subpagetest: written up to eraseblock 768
[ 1192.966055] mtd_subpagetest: written 1024 eraseblocks
[ 1192.971178] mtd_subpagetest: verifying all eraseblocks
[ 1192.986433] mtd_subpagetest: verified up to eraseblock 0
[ 1193.130746] mtd_subpagetest: verified up to eraseblock 256
[ 1193.264266] mtd_subpagetest: verified up to eraseblock 512
[ 1193.398699] mtd_subpagetest: verified up to eraseblock 768
[ 1193.531363] mtd_subpagetest: verified 1024 eraseblocks
[ 1194.487203] mtd_subpagetest: verifying all eraseblocks for 0xff
[ 1194.520323] mtd_subpagetest: verified up to eraseblock 0
[ 1198.586458] mtd_subpagetest: verified up to eraseblock 256
[ 1202.915264] mtd_subpagetest: verified up to eraseblock 512
[ 1206.980799] mtd_subpagetest: verified up to eraseblock 768
[ 1211.017044] mtd_subpagetest: verified 1024 eraseblocks
[ 1211.022254] mtd_subpagetest: writing whole device
[ 1211.069251] mtd_subpagetest: written up to eraseblock 0
[ 1216.795927] mtd_subpagetest: written up to eraseblock 256
[ 1222.539298] mtd_subpagetest: written up to eraseblock 512
[ 1228.311730] mtd_subpagetest: written up to eraseblock 768
[ 1234.023293] mtd_subpagetest: written 1024 eraseblocks
[ 1234.028418] mtd_subpagetest: verifying all eraseblocks
[ 1234.068746] mtd_subpagetest: verified up to eraseblock 0
[ 1237.300199] mtd_subpagetest: verified up to eraseblock 256
[ 1240.518463] mtd_subpagetest: verified up to eraseblock 512
[ 1243.748402] mtd_subpagetest: verified up to eraseblock 768
[ 1246.954212] mtd_subpagetest: verified 1024 eraseblocks
[ 1247.906580] mtd_subpagetest: verifying all eraseblocks for 0xff
[ 1247.938841] mtd_subpagetest: verified up to eraseblock 0
[ 1252.006415] mtd_subpagetest: verified up to eraseblock 256
[ 1256.056679] mtd_subpagetest: verified up to eraseblock 512
[ 1260.126068] mtd_subpagetest: verified up to eraseblock 768
[ 1264.161988] mtd_subpagetest: verified 1024 eraseblocks
[ 1264.167204] mtd_subpagetest: finished with 0 errors
[ 1264.182901] =================================================
Stefan Agner (6):
mtd: nand: vf610_nfc: Freescale NFC for VF610, MPC5125 and others
mtd: nand: vf610_nfc: add hardware BCH-ECC support
mtd: nand: vf610_nfc: add device tree bindings
ARM: vf610: enable NAND Flash Controller
ARM: dts: vf610twr: add NAND flash controller peripherial
ARM: dts: vf-colibri: enable NAND flash controller
.../devicetree/bindings/mtd/vf610-nfc.txt | 47 ++
MAINTAINERS | 6 +
arch/arm/boot/dts/vf-colibri.dtsi | 32 +
arch/arm/boot/dts/vf610-twr.dts | 44 ++
arch/arm/boot/dts/vfxxx.dtsi | 8 +
arch/arm/mach-imx/Kconfig | 1 +
drivers/mtd/nand/Kconfig | 14 +
drivers/mtd/nand/Makefile | 1 +
drivers/mtd/nand/vf610_nfc.c | 843 +++++++++++++++++++++
9 files changed, 996 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mtd/vf610-nfc.txt
create mode 100644 drivers/mtd/nand/vf610_nfc.c
--
2.4.2
This driver supports Freescale NFC (NAND flash controller) found on
Vybrid (VF610), MPC5125, MCF54418 and Kinetis K70. The driver has
been tested on 8-bit and 16-bit NAND interface and supports ONFI
parameter page reading.
Limitations:
- DMA and pipelining not used
- Pages larger than 2k are not supported
- No hardware ECC
The driver has only been tested on Vybrid (VF610).
Signed-off-by: Bill Pringlemeir <[email protected]>
Signed-off-by: Stefan Agner <[email protected]>
---
MAINTAINERS | 6 +
drivers/mtd/nand/Kconfig | 12 +
drivers/mtd/nand/Makefile | 1 +
drivers/mtd/nand/vf610_nfc.c | 644 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 663 insertions(+)
create mode 100644 drivers/mtd/nand/vf610_nfc.c
diff --git a/MAINTAINERS b/MAINTAINERS
index ad9f368..1fd6545 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10532,6 +10532,12 @@ S: Maintained
F: Documentation/fb/uvesafb.txt
F: drivers/video/fbdev/uvesafb.*
+VF610 NAND DRIVER
+M: Stefan Agner <[email protected]>
+L: [email protected]
+S: Supported
+F: drivers/mtd/nand/vf610_nfc.c
+
VFAT/FAT/MSDOS FILESYSTEM
M: OGAWA Hirofumi <[email protected]>
S: Maintained
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 5b2806a..9ceac79 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -463,6 +463,18 @@ config MTD_NAND_MPC5121_NFC
This enables the driver for the NAND flash controller on the
MPC5121 SoC.
+config HAVE_NAND_VF610_NFC
+ bool
+
+config MTD_NAND_VF610_NFC
+ tristate "Support for Freescale NFC for VF610/MPC5125"
+ depends on (HAVE_NAND_VF610_NFC || COMPILE_TEST)
+ help
+ Enables support for NAND Flash Controller on some Freescale
+ processors like the VF610, MPC5125, MCF54418 or Kinetis K70.
+ The driver supports a maximum 2k page size. The driver
+ currently does not support hardware ECC.
+
config MTD_NAND_MXC
tristate "MXC NAND support"
depends on ARCH_MXC
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 1f897ec..a490af8 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o
obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o
obj-$(CONFIG_MTD_NAND_NUC900) += nuc900_nand.o
obj-$(CONFIG_MTD_NAND_MPC5121_NFC) += mpc5121_nfc.o
+obj-$(CONFIG_MTD_NAND_VF610_NFC) += vf610_nfc.o
obj-$(CONFIG_MTD_NAND_RICOH) += r852.o
obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o
obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
new file mode 100644
index 0000000..bb5ee11
--- /dev/null
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -0,0 +1,644 @@
+/*
+ * Copyright 2009-2015 Freescale Semiconductor, Inc. and others
+ *
+ * Description: MPC5125, VF610, MCF54418 and Kinetis K70 Nand driver.
+ * Jason ported to M54418TWR and MVFA5 (VF610).
+ * Authors: Stefan Agner <[email protected]>
+ * Bill Pringlemeir <[email protected]>
+ * Shaohui Xie <[email protected]>
+ * Jason Jin <[email protected]>
+ *
+ * Based on original driver mpc5121_nfc.c.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Limitations:
+ * - Untested on MPC5125 and M54418.
+ * - DMA not used.
+ * - 2K pages or less.
+ */
+
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/of_mtd.h>
+
+#define DRV_NAME "vf610_nfc"
+
+/* Register Offsets */
+#define NFC_FLASH_CMD1 0x3F00
+#define NFC_FLASH_CMD2 0x3F04
+#define NFC_COL_ADDR 0x3F08
+#define NFC_ROW_ADDR 0x3F0c
+#define NFC_ROW_ADDR_INC 0x3F14
+#define NFC_FLASH_STATUS1 0x3F18
+#define NFC_FLASH_STATUS2 0x3F1c
+#define NFC_CACHE_SWAP 0x3F28
+#define NFC_SECTOR_SIZE 0x3F2c
+#define NFC_FLASH_CONFIG 0x3F30
+#define NFC_IRQ_STATUS 0x3F38
+
+/* Addresses for NFC MAIN RAM BUFFER areas */
+#define NFC_MAIN_AREA(n) ((n) * 0x1000)
+
+#define PAGE_2K 0x0800
+#define OOB_64 0x0040
+
+/*
+ * NFC_CMD2[CODE] values. See section:
+ * - 31.4.7 Flash Command Code Description, Vybrid manual
+ * - 23.8.6 Flash Command Sequencer, MPC5125 manual
+ *
+ * Briefly these are bitmasks of controller cycles.
+ */
+#define READ_PAGE_CMD_CODE 0x7EE0
+#define READ_ONFI_PARAM_CMD_CODE 0x4860
+#define PROGRAM_PAGE_CMD_CODE 0x7FC0
+#define ERASE_CMD_CODE 0x4EC0
+#define READ_ID_CMD_CODE 0x4804
+#define RESET_CMD_CODE 0x4040
+#define STATUS_READ_CMD_CODE 0x4068
+
+/* NFC ECC mode define */
+#define ECC_BYPASS 0
+
+/*** Register Mask and bit definitions */
+
+/* NFC_FLASH_CMD1 Field */
+#define CMD_BYTE2_MASK 0xFF000000
+#define CMD_BYTE2_SHIFT 24
+
+/* NFC_FLASH_CM2 Field */
+#define CMD_BYTE1_MASK 0xFF000000
+#define CMD_BYTE1_SHIFT 24
+#define CMD_CODE_MASK 0x00FFFF00
+#define CMD_CODE_SHIFT 8
+#define BUFNO_MASK 0x00000006
+#define BUFNO_SHIFT 1
+#define START_BIT (1<<0)
+
+/* NFC_COL_ADDR Field */
+#define COL_ADDR_MASK 0x0000FFFF
+#define COL_ADDR_SHIFT 0
+
+/* NFC_ROW_ADDR Field */
+#define ROW_ADDR_MASK 0x00FFFFFF
+#define ROW_ADDR_SHIFT 0
+#define ROW_ADDR_CHIP_SEL_RB_MASK 0xF0000000
+#define ROW_ADDR_CHIP_SEL_RB_SHIFT 28
+#define ROW_ADDR_CHIP_SEL_MASK 0x0F000000
+#define ROW_ADDR_CHIP_SEL_SHIFT 24
+
+/* NFC_FLASH_STATUS2 Field */
+#define STATUS_BYTE1_MASK 0x000000FF
+
+/* NFC_FLASH_CONFIG Field */
+#define CONFIG_ECC_SRAM_REQ_BIT (1<<21)
+#define CONFIG_DMA_REQ_BIT (1<<20)
+#define CONFIG_ECC_MODE_MASK 0x000E0000
+#define CONFIG_ECC_MODE_SHIFT 17
+#define CONFIG_FAST_FLASH_BIT (1<<16)
+#define CONFIG_16BIT (1<<7)
+#define CONFIG_BOOT_MODE_BIT (1<<6)
+#define CONFIG_ADDR_AUTO_INCR_BIT (1<<5)
+#define CONFIG_BUFNO_AUTO_INCR_BIT (1<<4)
+#define CONFIG_PAGE_CNT_MASK 0xF
+#define CONFIG_PAGE_CNT_SHIFT 0
+
+/* NFC_IRQ_STATUS Field */
+#define IDLE_IRQ_BIT (1<<29)
+#define IDLE_EN_BIT (1<<20)
+#define CMD_DONE_CLEAR_BIT (1<<18)
+#define IDLE_CLEAR_BIT (1<<17)
+
+struct vf610_nfc {
+ struct mtd_info mtd;
+ struct nand_chip chip;
+ struct device *dev;
+ void __iomem *regs;
+ struct completion cmd_done;
+ uint buf_offset;
+ int page_sz;
+ /* Status and ID are in alternate locations. */
+ int alt_buf;
+#define ALT_BUF_ID 1
+#define ALT_BUF_STAT 2
+#define ALT_BUF_ONFI 3
+ struct clk *clk;
+};
+
+#define mtd_to_nfc(_mtd) container_of(_mtd, struct vf610_nfc, mtd)
+
+static inline u32 vf610_nfc_read(struct vf610_nfc *nfc, uint reg)
+{
+ return readl(nfc->regs + reg);
+}
+
+static inline void vf610_nfc_write(struct vf610_nfc *nfc, uint reg, u32 val)
+{
+ writel(val, nfc->regs + reg);
+}
+
+static inline void vf610_nfc_set(struct vf610_nfc *nfc, uint reg, u32 bits)
+{
+ vf610_nfc_write(nfc, reg, vf610_nfc_read(nfc, reg) | bits);
+}
+
+static inline void vf610_nfc_clear(struct vf610_nfc *nfc, uint reg, u32 bits)
+{
+ vf610_nfc_write(nfc, reg, vf610_nfc_read(nfc, reg) & ~bits);
+}
+
+static inline void vf610_nfc_set_field(struct vf610_nfc *nfc, u32 reg,
+ u32 mask, u32 shift, u32 val)
+{
+ vf610_nfc_write(nfc, reg,
+ (vf610_nfc_read(nfc, reg) & (~mask)) | val << shift);
+}
+
+static inline void vf610_nfc_memcpy(void *dst, const void *src, size_t n)
+{
+ /*
+ * Use this accessor for the internal SRAM buffers. On the ARM
+ * Freescale Vybrid SoC it's known that the driver can treat
+ * the SRAM buffer as if it's memory. Other platform might need
+ * to treat the buffers differently.
+ *
+ * For the time being, use memcpy
+ */
+ memcpy(dst, src, n);
+}
+
+/* Clear flags for upcoming command */
+static inline void vf610_nfc_clear_status(struct vf610_nfc *nfc)
+{
+ void __iomem *reg = nfc->regs + NFC_IRQ_STATUS;
+ u32 tmp = readl_relaxed(reg);
+
+ tmp |= CMD_DONE_CLEAR_BIT | IDLE_CLEAR_BIT;
+ writel_relaxed(tmp, reg);
+}
+
+static inline void vf610_nfc_done(struct vf610_nfc *nfc)
+{
+ unsigned long timeout = msecs_to_jiffies(100);
+
+ /*
+ * Barrier is needed after this write. This write need
+ * to be done before reading the next register the first
+ * time.
+ * vf610_nfc_set implicates such a barrier by using writel
+ * to write to the register.
+ */
+ vf610_nfc_set(nfc, NFC_IRQ_STATUS, IDLE_EN_BIT);
+ vf610_nfc_set(nfc, NFC_FLASH_CMD2, START_BIT);
+
+ if (!(vf610_nfc_read(nfc, NFC_IRQ_STATUS) & IDLE_IRQ_BIT)) {
+ if (!wait_for_completion_timeout(&nfc->cmd_done, timeout))
+ dev_warn(nfc->dev, "Timeout while waiting for BUSY.\n");
+ }
+ vf610_nfc_clear_status(nfc);
+}
+
+static u8 vf610_nfc_get_id(struct vf610_nfc *nfc, int col)
+{
+ u32 flash_id;
+
+ if (col < 4) {
+ flash_id = vf610_nfc_read(nfc, NFC_FLASH_STATUS1);
+ flash_id >>= (3 - col) * 8;
+ } else {
+ flash_id = vf610_nfc_read(nfc, NFC_FLASH_STATUS2);
+ flash_id >>= 24;
+ }
+
+ return flash_id & 0xff;
+}
+
+static u8 vf610_nfc_get_status(struct vf610_nfc *nfc)
+{
+ return vf610_nfc_read(nfc, NFC_FLASH_STATUS2) & STATUS_BYTE1_MASK;
+}
+
+static void vf610_nfc_send_command(struct vf610_nfc *nfc, u32 cmd_byte1,
+ u32 cmd_code)
+{
+ void __iomem *reg = nfc->regs + NFC_FLASH_CMD2;
+ u32 tmp;
+
+ vf610_nfc_clear_status(nfc);
+
+ tmp = readl_relaxed(reg);
+ tmp &= ~(CMD_BYTE1_MASK | CMD_CODE_MASK | BUFNO_MASK);
+ tmp |= cmd_byte1 << CMD_BYTE1_SHIFT;
+ tmp |= cmd_code << CMD_CODE_SHIFT;
+ writel_relaxed(tmp, reg);
+}
+
+static void vf610_nfc_send_commands(struct vf610_nfc *nfc, u32 cmd_byte1,
+ u32 cmd_byte2, u32 cmd_code)
+{
+ void __iomem *reg = nfc->regs + NFC_FLASH_CMD1;
+ u32 tmp;
+
+ vf610_nfc_send_command(nfc, cmd_byte1, cmd_code);
+
+ tmp = readl_relaxed(reg);
+ tmp &= ~CMD_BYTE2_MASK;
+ tmp |= cmd_byte2 << CMD_BYTE2_SHIFT;
+ writel_relaxed(tmp, reg);
+}
+
+static irqreturn_t vf610_nfc_irq(int irq, void *data)
+{
+ struct mtd_info *mtd = data;
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+
+ vf610_nfc_clear(nfc, NFC_IRQ_STATUS, IDLE_EN_BIT);
+ complete(&nfc->cmd_done);
+
+ return IRQ_HANDLED;
+}
+
+static void vf610_nfc_addr_cycle(struct vf610_nfc *nfc, int column, int page)
+{
+ if (column != -1) {
+ if (nfc->chip.options & NAND_BUSWIDTH_16)
+ column = column / 2;
+ vf610_nfc_set_field(nfc, NFC_COL_ADDR, COL_ADDR_MASK,
+ COL_ADDR_SHIFT, column);
+ }
+ if (page != -1)
+ vf610_nfc_set_field(nfc, NFC_ROW_ADDR, ROW_ADDR_MASK,
+ ROW_ADDR_SHIFT, page);
+}
+
+static inline void vf610_nfc_transfer_size(void __iomem *regbase, int size)
+{
+ writel_relaxed(size, regbase + NFC_SECTOR_SIZE);
+}
+
+static void vf610_nfc_command(struct mtd_info *mtd, unsigned command,
+ int column, int page)
+{
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+ int page_sz = nfc->chip.options & NAND_BUSWIDTH_16 ? 1 : 0;
+
+ nfc->buf_offset = max(column, 0);
+ nfc->alt_buf = 0;
+
+ switch (command) {
+ case NAND_CMD_SEQIN:
+ /* Use valid column/page from preread... */
+ vf610_nfc_addr_cycle(nfc, column, page);
+ /*
+ * SEQIN => data => PAGEPROG sequence is done by the controller
+ * hence we do not need to issue the command here...
+ */
+ return;
+ case NAND_CMD_PAGEPROG:
+ page_sz += mtd->writesize + mtd->oobsize;
+ vf610_nfc_transfer_size(nfc->regs, page_sz);
+ vf610_nfc_send_commands(nfc, NAND_CMD_SEQIN,
+ command, PROGRAM_PAGE_CMD_CODE);
+ break;
+
+ case NAND_CMD_RESET:
+ vf610_nfc_transfer_size(nfc->regs, 0);
+ vf610_nfc_send_command(nfc, command, RESET_CMD_CODE);
+ break;
+
+ case NAND_CMD_READOOB:
+ page_sz += mtd->oobsize;
+ column = mtd->writesize;
+ vf610_nfc_transfer_size(nfc->regs, page_sz);
+ vf610_nfc_send_commands(nfc, NAND_CMD_READ0,
+ NAND_CMD_READSTART, READ_PAGE_CMD_CODE);
+ vf610_nfc_addr_cycle(nfc, column, page);
+ break;
+
+ case NAND_CMD_READ0:
+ page_sz += mtd->writesize + mtd->oobsize;
+ vf610_nfc_transfer_size(nfc->regs, page_sz);
+ vf610_nfc_send_commands(nfc, NAND_CMD_READ0,
+ NAND_CMD_READSTART, READ_PAGE_CMD_CODE);
+ vf610_nfc_addr_cycle(nfc, column, page);
+ break;
+
+ case NAND_CMD_PARAM:
+ nfc->alt_buf = ALT_BUF_ONFI;
+ vf610_nfc_transfer_size(nfc->regs, 768);
+ vf610_nfc_send_command(nfc, command, READ_ONFI_PARAM_CMD_CODE);
+ vf610_nfc_set_field(nfc, NFC_ROW_ADDR, ROW_ADDR_MASK,
+ ROW_ADDR_SHIFT, column);
+ break;
+
+ case NAND_CMD_ERASE1:
+ vf610_nfc_transfer_size(nfc->regs, 0);
+ vf610_nfc_send_commands(nfc, command,
+ NAND_CMD_ERASE2, ERASE_CMD_CODE);
+ vf610_nfc_addr_cycle(nfc, column, page);
+ break;
+
+ case NAND_CMD_READID:
+ nfc->alt_buf = ALT_BUF_ID;
+ nfc->buf_offset = 0;
+ vf610_nfc_transfer_size(nfc->regs, 0);
+ vf610_nfc_send_command(nfc, command, READ_ID_CMD_CODE);
+ vf610_nfc_set_field(nfc, NFC_ROW_ADDR, ROW_ADDR_MASK,
+ ROW_ADDR_SHIFT, column);
+ break;
+
+ case NAND_CMD_STATUS:
+ nfc->alt_buf = ALT_BUF_STAT;
+ vf610_nfc_transfer_size(nfc->regs, 0);
+ vf610_nfc_send_command(nfc, command, STATUS_READ_CMD_CODE);
+ break;
+ default:
+ return;
+ }
+
+ vf610_nfc_done(nfc);
+}
+
+static void vf610_nfc_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+{
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+ uint c = nfc->buf_offset;
+
+ /* Alternate buffers are only supported through read_byte */
+ WARN_ON(nfc->alt_buf);
+
+ vf610_nfc_memcpy(buf, nfc->regs + NFC_MAIN_AREA(0) + c, len);
+
+ nfc->buf_offset += len;
+}
+
+static void vf610_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf,
+ int len)
+{
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+ uint c = nfc->buf_offset;
+ uint l;
+
+ l = min_t(uint, len, mtd->writesize + mtd->oobsize - c);
+ vf610_nfc_memcpy(nfc->regs + NFC_MAIN_AREA(0) + c, buf, l);
+
+ nfc->buf_offset += l;
+}
+
+static uint8_t vf610_nfc_read_byte(struct mtd_info *mtd)
+{
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+ u8 tmp;
+ uint c = nfc->buf_offset;
+
+ switch (nfc->alt_buf) {
+ case ALT_BUF_ID:
+ tmp = vf610_nfc_get_id(nfc, c);
+ break;
+ case ALT_BUF_STAT:
+ tmp = vf610_nfc_get_status(nfc);
+ break;
+#ifdef __LITTLE_ENDIAN
+ case ALT_BUF_ONFI:
+ /* Reverse byte since the controller uses big endianness */
+ c = nfc->buf_offset ^ 0x3;
+ tmp = *((u8 *)(nfc->regs + NFC_MAIN_AREA(0) + c));
+ break;
+#endif
+ default:
+ tmp = *((u8 *)(nfc->regs + NFC_MAIN_AREA(0) + c));
+ break;
+ }
+ nfc->buf_offset++;
+ return tmp;
+}
+
+static u16 vf610_nfc_read_word(struct mtd_info *mtd)
+{
+ u16 tmp;
+
+ vf610_nfc_read_buf(mtd, (u_char *)&tmp, sizeof(tmp));
+ return tmp;
+}
+
+/* If not provided, upper layers apply a fixed delay. */
+static int vf610_nfc_dev_ready(struct mtd_info *mtd)
+{
+ /* NFC handles R/B internally; always ready. */
+ return 1;
+}
+
+/*
+ * This function supports Vybrid only (MPC5125 would have full RB and four CS)
+ */
+static void vf610_nfc_select_chip(struct mtd_info *mtd, int chip)
+{
+#ifdef CONFIG_SOC_VF610
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+ u32 tmp = vf610_nfc_read(nfc, NFC_ROW_ADDR);
+
+ tmp &= ~(ROW_ADDR_CHIP_SEL_RB_MASK | ROW_ADDR_CHIP_SEL_MASK);
+ tmp |= 1 << ROW_ADDR_CHIP_SEL_RB_SHIFT;
+
+ if (chip == 0)
+ tmp |= 1 << ROW_ADDR_CHIP_SEL_SHIFT;
+ else if (chip == 1)
+ tmp |= 2 << ROW_ADDR_CHIP_SEL_SHIFT;
+
+ vf610_nfc_write(nfc, NFC_ROW_ADDR, tmp);
+#endif
+}
+
+static const struct of_device_id vf610_nfc_dt_ids[] = {
+ { .compatible = "fsl,vf610-nfc" },
+ { .compatible = "fsl,mpc5125-nfc" },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, vf610_nfc_dt_ids);
+
+static int vf610_nfc_init_controller(struct vf610_nfc *nfc)
+{
+ if (nfc->chip.options & NAND_BUSWIDTH_16)
+ vf610_nfc_set(nfc, NFC_FLASH_CONFIG, CONFIG_16BIT);
+ else
+ vf610_nfc_clear(nfc, NFC_FLASH_CONFIG, CONFIG_16BIT);
+
+ /* Set configuration register. */
+ vf610_nfc_clear(nfc, NFC_FLASH_CONFIG, CONFIG_ADDR_AUTO_INCR_BIT);
+ vf610_nfc_clear(nfc, NFC_FLASH_CONFIG, CONFIG_BUFNO_AUTO_INCR_BIT);
+ vf610_nfc_clear(nfc, NFC_FLASH_CONFIG, CONFIG_BOOT_MODE_BIT);
+ vf610_nfc_clear(nfc, NFC_FLASH_CONFIG, CONFIG_DMA_REQ_BIT);
+ vf610_nfc_set(nfc, NFC_FLASH_CONFIG, CONFIG_FAST_FLASH_BIT);
+
+ /* PAGE_CNT = 1 */
+ vf610_nfc_set_field(nfc, NFC_FLASH_CONFIG, CONFIG_PAGE_CNT_MASK,
+ CONFIG_PAGE_CNT_SHIFT, 1);
+
+ return 0;
+}
+
+static int vf610_nfc_probe(struct platform_device *pdev)
+{
+ struct vf610_nfc *nfc;
+ struct resource *res;
+ struct mtd_info *mtd;
+ struct nand_chip *chip;
+ int err = 0;
+ int irq;
+
+ nfc = devm_kzalloc(&pdev->dev, sizeof(*nfc), GFP_KERNEL);
+ if (!nfc)
+ return -ENOMEM;
+
+ nfc->dev = &pdev->dev;
+ mtd = &nfc->mtd;
+ chip = &nfc->chip;
+
+ mtd->priv = chip;
+ mtd->owner = THIS_MODULE;
+ mtd->dev.parent = nfc->dev;
+ mtd->name = DRV_NAME;
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq <= 0)
+ return -EINVAL;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ nfc->regs = devm_ioremap_resource(nfc->dev, res);
+ if (IS_ERR(nfc->regs))
+ return PTR_ERR(nfc->regs);
+
+ nfc->clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(nfc->clk))
+ return PTR_ERR(nfc->clk);
+
+ err = clk_prepare_enable(nfc->clk);
+ if (err) {
+ dev_err(nfc->dev, "Unable to enable clock!\n");
+ return err;
+ }
+
+ chip->dn = nfc->dev->of_node;
+ chip->dev_ready = vf610_nfc_dev_ready;
+ chip->cmdfunc = vf610_nfc_command;
+ chip->read_byte = vf610_nfc_read_byte;
+ chip->read_word = vf610_nfc_read_word;
+ chip->read_buf = vf610_nfc_read_buf;
+ chip->write_buf = vf610_nfc_write_buf;
+ chip->select_chip = vf610_nfc_select_chip;
+
+ chip->options |= NAND_NO_SUBPAGE_WRITE;
+
+ init_completion(&nfc->cmd_done);
+
+ err = devm_request_irq(nfc->dev, irq, vf610_nfc_irq, 0, DRV_NAME, mtd);
+ if (err) {
+ dev_err(nfc->dev, "Error requesting IRQ!\n");
+ goto error;
+ }
+
+ vf610_nfc_init_controller(nfc);
+
+ /* first scan to find the device and get the page size */
+ if (nand_scan_ident(mtd, 1, NULL)) {
+ err = -ENXIO;
+ goto error;
+ }
+
+ /* Bad block options. */
+ if (chip->bbt_options & NAND_BBT_USE_FLASH)
+ chip->bbt_options |= NAND_BBT_NO_OOB;
+
+ /* Single buffer only, max 256 OOB minus ECC status */
+ if (mtd->writesize + mtd->oobsize > PAGE_2K + 256 - 8) {
+ dev_err(nfc->dev, "Unsupported flash page size\n");
+ err = -ENXIO;
+ goto error;
+ }
+
+ /* second phase scan */
+ if (nand_scan_tail(mtd)) {
+ err = -ENXIO;
+ goto error;
+ }
+
+ /* Register device in MTD */
+ mtd_device_parse_register(mtd, NULL,
+ &(struct mtd_part_parser_data){
+ .of_node = pdev->dev.of_node,
+ },
+ NULL, 0);
+
+ platform_set_drvdata(pdev, mtd);
+
+ return 0;
+
+error:
+ clk_disable_unprepare(nfc->clk);
+ return err;
+}
+
+static int vf610_nfc_remove(struct platform_device *pdev)
+{
+ struct mtd_info *mtd = platform_get_drvdata(pdev);
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+
+ nand_release(mtd);
+ clk_disable_unprepare(nfc->clk);
+ return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int vf610_nfc_suspend(struct device *dev)
+{
+ struct mtd_info *mtd = dev_get_drvdata(dev);
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+
+ clk_disable_unprepare(nfc->clk);
+ return 0;
+}
+
+static int vf610_nfc_resume(struct device *dev)
+{
+ struct mtd_info *mtd = dev_get_drvdata(dev);
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+
+ pinctrl_pm_select_default_state(dev);
+
+ clk_prepare_enable(nfc->clk);
+
+ vf610_nfc_init_controller(nfc);
+ return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(vf610_nfc_pm_ops, vf610_nfc_suspend, vf610_nfc_resume);
+
+static struct platform_driver vf610_nfc_driver = {
+ .driver = {
+ .name = DRV_NAME,
+ .of_match_table = vf610_nfc_dt_ids,
+ .pm = &vf610_nfc_pm_ops,
+ },
+ .probe = vf610_nfc_probe,
+ .remove = vf610_nfc_remove,
+};
+
+module_platform_driver(vf610_nfc_driver);
+
+MODULE_AUTHOR("Stefan Agner <[email protected]>");
+MODULE_DESCRIPTION("Freescale VF610/MPC5125 NFC MTD NAND driver");
+MODULE_LICENSE("GPL");
--
2.4.2
This adds hardware ECC support using the BCH encoder in the NFC IP.
The ECC encoder supports up to 32-bit correction by using 60 error
correction bytes. There is no sub-page ECC step, ECC is calculated
always accross the whole page (up to 2k pages). Raw writes writes
are possible through the common nand_write_page_raw implementation,
however raw reads are not possible since the hardware ECC mode need
to be enabled at command time.
Signed-off-by: Bill Pringlemeir <[email protected]>
Signed-off-by: Stefan Agner <[email protected]>
---
drivers/mtd/nand/Kconfig | 6 +-
drivers/mtd/nand/vf610_nfc.c | 201 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 204 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 9ceac79..944e588 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -472,8 +472,10 @@ config MTD_NAND_VF610_NFC
help
Enables support for NAND Flash Controller on some Freescale
processors like the VF610, MPC5125, MCF54418 or Kinetis K70.
- The driver supports a maximum 2k page size. The driver
- currently does not support hardware ECC.
+ The driver supports a maximum 2k page size. With 2k pages and
+ 64 bytes or more of OOB, hardware ECC with up to 32-bit error
+ correction is supported. Hardware ECC is only enabled through
+ device tree.
config MTD_NAND_MXC
tristate "MXC NAND support"
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index bb5ee11..c0d4189 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -19,6 +19,8 @@
* - Untested on MPC5125 and M54418.
* - DMA not used.
* - 2K pages or less.
+ * - Only 2K page w. 64+ OOB and hardware ECC.
+ * - Raw page reads not implemented when using ECC.
*/
#include <linux/module.h>
@@ -72,6 +74,8 @@
/* NFC ECC mode define */
#define ECC_BYPASS 0
+#define ECC_45_BYTE 6
+#define ECC_60_BYTE 7
/*** Register Mask and bit definitions */
@@ -104,6 +108,8 @@
#define STATUS_BYTE1_MASK 0x000000FF
/* NFC_FLASH_CONFIG Field */
+#define CONFIG_ECC_SRAM_ADDR_MASK 0x7FC00000
+#define CONFIG_ECC_SRAM_ADDR_SHIFT 22
#define CONFIG_ECC_SRAM_REQ_BIT (1<<21)
#define CONFIG_DMA_REQ_BIT (1<<20)
#define CONFIG_ECC_MODE_MASK 0x000E0000
@@ -122,6 +128,21 @@
#define CMD_DONE_CLEAR_BIT (1<<18)
#define IDLE_CLEAR_BIT (1<<17)
+/* ECC status placed at end of buffers. */
+#define ECC_SRAM_ADDR ((PAGE_2K + 256 - 8) >> 3)
+#define ECC_STATUS_MASK 0x80
+#define ECC_ERR_COUNT 0x3F
+
+/*
+ * ECC status is stored at NFC_CFG[ECCADD] +4 for little-endian
+ * and +7 for big-endian SoCs.
+ */
+#ifdef __LITTLE_ENDIAN
+#define ECC_OFFSET 4
+#else
+#define ECC_OFFSET 7
+#endif
+
struct vf610_nfc {
struct mtd_info mtd;
struct nand_chip chip;
@@ -136,10 +157,40 @@ struct vf610_nfc {
#define ALT_BUF_STAT 2
#define ALT_BUF_ONFI 3
struct clk *clk;
+ bool use_hw_ecc;
+ u32 ecc_mode;
};
#define mtd_to_nfc(_mtd) container_of(_mtd, struct vf610_nfc, mtd)
+static struct nand_ecclayout vf610_nfc_ecc45 = {
+ .eccbytes = 45,
+ .eccpos = {19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63},
+ .oobfree = {
+ {.offset = 2,
+ .length = 17} }
+};
+
+static struct nand_ecclayout vf610_nfc_ecc60 = {
+ .eccbytes = 60,
+ .eccpos = { 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63 },
+ .oobfree = {
+ {.offset = 2,
+ .length = 2} }
+};
+
static inline u32 vf610_nfc_read(struct vf610_nfc *nfc, uint reg)
{
return readl(nfc->regs + reg);
@@ -284,6 +335,13 @@ static void vf610_nfc_addr_cycle(struct vf610_nfc *nfc, int column, int page)
ROW_ADDR_SHIFT, page);
}
+static inline void vf610_nfc_ecc_mode(struct vf610_nfc *nfc, int ecc_mode)
+{
+ vf610_nfc_set_field(nfc, NFC_FLASH_CONFIG,
+ CONFIG_ECC_MODE_MASK,
+ CONFIG_ECC_MODE_SHIFT, ecc_mode);
+}
+
static inline void vf610_nfc_transfer_size(void __iomem *regbase, int size)
{
writel_relaxed(size, regbase + NFC_SECTOR_SIZE);
@@ -302,13 +360,20 @@ static void vf610_nfc_command(struct mtd_info *mtd, unsigned command,
case NAND_CMD_SEQIN:
/* Use valid column/page from preread... */
vf610_nfc_addr_cycle(nfc, column, page);
+ nfc->buf_offset = 0;
+
/*
* SEQIN => data => PAGEPROG sequence is done by the controller
* hence we do not need to issue the command here...
*/
return;
case NAND_CMD_PAGEPROG:
- page_sz += mtd->writesize + mtd->oobsize;
+ page_sz += nfc->page_sz;
+ if (nfc->use_hw_ecc)
+ vf610_nfc_ecc_mode(nfc, nfc->ecc_mode);
+ else
+ vf610_nfc_ecc_mode(nfc, ECC_BYPASS);
+
vf610_nfc_transfer_size(nfc->regs, page_sz);
vf610_nfc_send_commands(nfc, NAND_CMD_SEQIN,
command, PROGRAM_PAGE_CMD_CODE);
@@ -326,11 +391,13 @@ static void vf610_nfc_command(struct mtd_info *mtd, unsigned command,
vf610_nfc_send_commands(nfc, NAND_CMD_READ0,
NAND_CMD_READSTART, READ_PAGE_CMD_CODE);
vf610_nfc_addr_cycle(nfc, column, page);
+ vf610_nfc_ecc_mode(nfc, ECC_BYPASS);
break;
case NAND_CMD_READ0:
page_sz += mtd->writesize + mtd->oobsize;
vf610_nfc_transfer_size(nfc->regs, page_sz);
+ vf610_nfc_ecc_mode(nfc, nfc->ecc_mode);
vf610_nfc_send_commands(nfc, NAND_CMD_READ0,
NAND_CMD_READSTART, READ_PAGE_CMD_CODE);
vf610_nfc_addr_cycle(nfc, column, page);
@@ -342,6 +409,7 @@ static void vf610_nfc_command(struct mtd_info *mtd, unsigned command,
vf610_nfc_send_command(nfc, command, READ_ONFI_PARAM_CMD_CODE);
vf610_nfc_set_field(nfc, NFC_ROW_ADDR, ROW_ADDR_MASK,
ROW_ADDR_SHIFT, column);
+ vf610_nfc_ecc_mode(nfc, ECC_BYPASS);
break;
case NAND_CMD_ERASE1:
@@ -370,6 +438,9 @@ static void vf610_nfc_command(struct mtd_info *mtd, unsigned command,
}
vf610_nfc_done(nfc);
+
+ nfc->use_hw_ecc = false;
+ nfc->page_sz = 0;
}
static void vf610_nfc_read_buf(struct mtd_info *mtd, u_char *buf, int len)
@@ -395,6 +466,7 @@ static void vf610_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf,
l = min_t(uint, len, mtd->writesize + mtd->oobsize - c);
vf610_nfc_memcpy(nfc->regs + NFC_MAIN_AREA(0) + c, buf, l);
+ nfc->page_sz += l;
nfc->buf_offset += l;
}
@@ -462,6 +534,84 @@ static void vf610_nfc_select_chip(struct mtd_info *mtd, int chip)
#endif
}
+/* Count the number of 0's in buff up to max_bits */
+static inline int count_written_bits(uint8_t *buff, int size, int max_bits)
+{
+ uint32_t *buff32 = (uint32_t *)buff;
+ int k, written_bits = 0;
+
+ for (k = 0; k < (size / 4); k++) {
+ written_bits += hweight32(~buff32[k]);
+ if (written_bits > max_bits)
+ break;
+ }
+
+ return written_bits;
+}
+
+static inline int vf610_nfc_correct_data(struct mtd_info *mtd, uint8_t *dat)
+{
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+ u8 ecc_status;
+ u8 ecc_count;
+ int flip;
+
+ ecc_status = __raw_readb(nfc->regs + ECC_SRAM_ADDR * 8 + ECC_OFFSET);
+ ecc_count = ecc_status & ECC_ERR_COUNT;
+ if (!(ecc_status & ECC_STATUS_MASK))
+ return ecc_count;
+
+ /*
+ * On an erased page, bit count should be zero or at least
+ * less then half of the ECC strength
+ */
+ flip = count_written_bits(dat, nfc->chip.ecc.size, ecc_count);
+
+ if (flip > ecc_count && flip > (nfc->chip.ecc.strength / 2))
+ return -1;
+
+ /* Erased page. */
+ memset(dat, 0xff, nfc->chip.ecc.size);
+ return 0;
+}
+
+static int vf610_nfc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+ uint8_t *buf, int oob_required, int page)
+{
+ int eccsize = chip->ecc.size;
+ int stat;
+
+ vf610_nfc_read_buf(mtd, buf, eccsize);
+
+ if (oob_required)
+ vf610_nfc_read_buf(mtd, chip->oob_poi, mtd->oobsize);
+
+ stat = vf610_nfc_correct_data(mtd, buf);
+
+ if (stat < 0)
+ mtd->ecc_stats.failed++;
+ else
+ mtd->ecc_stats.corrected += stat;
+
+ return 0;
+}
+
+static int vf610_nfc_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+ const uint8_t *buf, int oob_required)
+{
+ struct vf610_nfc *nfc = mtd_to_nfc(mtd);
+
+ vf610_nfc_write_buf(mtd, buf, mtd->writesize);
+ if (oob_required)
+ vf610_nfc_write_buf(mtd, chip->oob_poi, mtd->oobsize);
+
+ /* Always write whole page including OOB due to HW ECC */
+ nfc->use_hw_ecc = true;
+ nfc->page_sz = mtd->writesize + mtd->oobsize;
+
+ return 0;
+}
+
static const struct of_device_id vf610_nfc_dt_ids[] = {
{ .compatible = "fsl,vf610-nfc" },
{ .compatible = "fsl,mpc5125-nfc" },
@@ -487,6 +637,16 @@ static int vf610_nfc_init_controller(struct vf610_nfc *nfc)
vf610_nfc_set_field(nfc, NFC_FLASH_CONFIG, CONFIG_PAGE_CNT_MASK,
CONFIG_PAGE_CNT_SHIFT, 1);
+ if (nfc->chip.ecc.mode == NAND_ECC_HW) {
+ /* Set ECC_STATUS offset */
+ vf610_nfc_set_field(nfc, NFC_FLASH_CONFIG,
+ CONFIG_ECC_SRAM_ADDR_MASK,
+ CONFIG_ECC_SRAM_ADDR_SHIFT, ECC_SRAM_ADDR);
+
+ /* Enable ECC_STATUS */
+ vf610_nfc_set(nfc, NFC_FLASH_CONFIG, CONFIG_ECC_SRAM_REQ_BIT);
+ }
+
return 0;
}
@@ -569,6 +729,45 @@ static int vf610_nfc_probe(struct platform_device *pdev)
goto error;
}
+ if (chip->ecc.mode == NAND_ECC_HW) {
+ if (mtd->writesize != PAGE_2K && mtd->oobsize < 64) {
+ dev_err(nfc->dev, "Unsupported flash with hwecc\n");
+ err = -ENXIO;
+ goto error;
+ }
+
+ if (chip->ecc.size != mtd->writesize) {
+ dev_err(nfc->dev, "Step size needs to be page size\n");
+ err = -ENXIO;
+ goto error;
+ }
+
+ /* Only 64 byte ECC layouts known */
+ if (mtd->oobsize > 64)
+ mtd->oobsize = 64;
+
+ if (chip->ecc.strength == 32) {
+ nfc->ecc_mode = ECC_60_BYTE;
+ chip->ecc.bytes = 60;
+ chip->ecc.layout = &vf610_nfc_ecc60;
+ } else if (chip->ecc.strength == 24) {
+ nfc->ecc_mode = ECC_45_BYTE;
+ chip->ecc.bytes = 45;
+ chip->ecc.layout = &vf610_nfc_ecc45;
+ } else {
+ dev_err(nfc->dev, "Unsupported ECC strength\n");
+ err = -ENXIO;
+ goto error;
+ }
+
+ /* propagate ecc.layout to mtd_info */
+ mtd->ecclayout = chip->ecc.layout;
+ chip->ecc.read_page = vf610_nfc_read_page;
+ chip->ecc.write_page = vf610_nfc_write_page;
+
+ chip->ecc.size = PAGE_2K;
+ }
+
/* second phase scan */
if (nand_scan_tail(mtd)) {
err = -ENXIO;
--
2.4.2
Signed-off-by: Bill Pringlemeir <[email protected]>
Signed-off-by: Stefan Agner <[email protected]>
---
.../devicetree/bindings/mtd/vf610-nfc.txt | 47 ++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mtd/vf610-nfc.txt
diff --git a/Documentation/devicetree/bindings/mtd/vf610-nfc.txt b/Documentation/devicetree/bindings/mtd/vf610-nfc.txt
new file mode 100644
index 0000000..0cb96fd
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/vf610-nfc.txt
@@ -0,0 +1,47 @@
+Freescale's NAND flash controller (NFC)
+
+This variant of the Freescale NAND flash controller (NFC) is on Vybrid (vf610),
+MPC5125, MCF54418 and Kinetis K70.
+
+Required properties:
+- compatible: Should be set to one of the following:
+ "fsl,vf610-nfc"
+ "fsl,mpc5125-nfc"
+- reg: address range of the NFC
+- interrupts: interrupt of the NFC
+- nand-bus-width: see nand.txt
+- nand-ecc-mode: see nand.txt
+- nand-on-flash-bbt: see nand.txt
+- assigned-clocks: main clock from the SoC, for Vybrid <&clks VF610_CLK_NFC>;
+- assigned-clock-rates: The NAND bus timing is derived from this clock
+ rate and should not exceed maximum timing for any NAND memory chip
+ in a board stuffing. Typical NAND memory timings derived from this
+ clock are found in the SoC hardware reference manual. Furthermore,
+ there might be restrictions on maximum rates when using hardware ECC.
+
+- #address-cells, #size-cells : Must be present if the device has sub-nodes
+ representing partitions.
+
+Required properties for hardware ECC:
+- nand-ecc-strength: supported strengths are 24 and 32 bit (see nand.txt)
+- nand-ecc-step-size: step size equals page size, currently only 2k pages are
+ supported
+
+Example:
+
+ nfc: nand@400e0000 {
+ compatible = "fsl,vf610-nfc";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0x400e0000 0x4000>;
+ interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks VF610_CLK_NFC>;
+ clock-names = "nfc";
+ assigned-clocks = <&clks VF610_CLK_NFC>;
+ assigned-clock-rates = <33000000>;
+ nand-bus-width = <8>;
+ nand-ecc-mode = "hw";
+ nand-ecc-strength = <32>;
+ nand-ecc-step-size = <2048>;
+ nand-on-flash-bbt;
+ };
--
2.4.2
Enable the NAND Flash Controller driver which is part of the Vybrid
SoC by default.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/mach-imx/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 3a3d3e9..9358135 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -589,6 +589,7 @@ config SOC_VF610
select PINCTRL_VF610
select PL310_ERRATA_769419 if CACHE_L2X0
select SMP_ON_UP if SMP
+ select HAVE_NAND_VF610_NFC
help
This enables support for Freescale Vybrid VF610 processor.
--
2.4.2
This adds the NAND flash controller (NFC) peripherial. The driver
supports the SLC NAND chips found on Freescale's Vybrid Tower System
Module. The Micron NAND chip on the module needs 4-bit ECC per 512
byte page. Use 24-bit ECC per 2k page, which is supported by the
driver.
Signed-off-by: Bill Pringlemeir <[email protected]>
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/boot/dts/vf610-twr.dts | 44 +++++++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/vfxxx.dtsi | 8 ++++++++
2 files changed, 52 insertions(+)
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index f64fddc..59da551 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -287,6 +287,50 @@
status = "okay";
};
+&iomuxc {
+ vf610-twr {
+ pinctrl_nfc_1: nfcgrp_1 {
+ fsl,pins = <
+ VF610_PAD_PTD31__NF_IO15 0x28df
+ VF610_PAD_PTD30__NF_IO14 0x28df
+ VF610_PAD_PTD29__NF_IO13 0x28df
+ VF610_PAD_PTD28__NF_IO12 0x28df
+ VF610_PAD_PTD27__NF_IO11 0x28df
+ VF610_PAD_PTD26__NF_IO10 0x28df
+ VF610_PAD_PTD25__NF_IO9 0x28df
+ VF610_PAD_PTD24__NF_IO8 0x28df
+ VF610_PAD_PTD23__NF_IO7 0x28df
+ VF610_PAD_PTD22__NF_IO6 0x28df
+ VF610_PAD_PTD21__NF_IO5 0x28df
+ VF610_PAD_PTD20__NF_IO4 0x28df
+ VF610_PAD_PTD19__NF_IO3 0x28df
+ VF610_PAD_PTD18__NF_IO2 0x28df
+ VF610_PAD_PTD17__NF_IO1 0x28df
+ VF610_PAD_PTD16__NF_IO0 0x28df
+ VF610_PAD_PTB24__NF_WE_B 0x28c2
+ VF610_PAD_PTB25__NF_CE0_B 0x28c2
+ VF610_PAD_PTB27__NF_RE_B 0x28c2
+ VF610_PAD_PTC26__NF_RB_B 0x283d
+ VF610_PAD_PTC27__NF_ALE 0x28c2
+ VF610_PAD_PTC28__NF_CLE 0x28c2
+ >;
+ };
+ };
+};
+
+&nfc {
+ assigned-clocks = <&clks VF610_CLK_NFC>;
+ assigned-clock-rates = <33000000>;
+ nand-bus-width = <16>;
+ nand-ecc-mode = "hw";
+ nand-ecc-step-size = <2048>;
+ nand-ecc-strength = <24>;
+ nand-on-flash-bbt;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_nfc_1>;
+ status = "okay";
+};
+
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 4aa3351..2f4b04d 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -520,6 +520,14 @@
status = "disabled";
};
+ nfc: nand@400e0000 {
+ compatible = "fsl,vf610-nfc";
+ reg = <0x400e0000 0x4000>;
+ interrupts = <83 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks VF610_CLK_NFC>;
+ clock-names = "nfc";
+ status = "disabled";
+ };
};
};
};
--
2.4.2
Enable NAND access by adding pinmux and NAND flash controller node
to device tree. The NAND chips currently used on the Colibri VF61
requires 8-bit ECC per 512 byte page, hence specify 32-bit ECC
strength per 2k page size.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/boot/dts/vf-colibri.dtsi | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi
index fbef082..c009346 100644
--- a/arch/arm/boot/dts/vf-colibri.dtsi
+++ b/arch/arm/boot/dts/vf-colibri.dtsi
@@ -52,6 +52,19 @@
pinctrl-0 = <&pinctrl_i2c0>;
};
+&nfc {
+ assigned-clocks = <&clks VF610_CLK_NFC>;
+ assigned-clock-rates = <33000000>;
+ nand-bus-width = <8>;
+ nand-ecc-mode = "hw";
+ nand-ecc-step-size = <2048>;
+ nand-ecc-strength = <32>;
+ nand-on-flash-bbt;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_nfc_1>;
+ status = "okay";
+};
+
&pwm0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0>;
@@ -156,6 +169,25 @@
>;
};
+ pinctrl_nfc_1: nfcgrp_1 {
+ fsl,pins = <
+ VF610_PAD_PTD23__NF_IO7 0x28df
+ VF610_PAD_PTD22__NF_IO6 0x28df
+ VF610_PAD_PTD21__NF_IO5 0x28df
+ VF610_PAD_PTD20__NF_IO4 0x28df
+ VF610_PAD_PTD19__NF_IO3 0x28df
+ VF610_PAD_PTD18__NF_IO2 0x28df
+ VF610_PAD_PTD17__NF_IO1 0x28df
+ VF610_PAD_PTD16__NF_IO0 0x28df
+ VF610_PAD_PTB24__NF_WE_B 0x28c2
+ VF610_PAD_PTB25__NF_CE0_B 0x28c2
+ VF610_PAD_PTB27__NF_RE_B 0x28c2
+ VF610_PAD_PTC26__NF_RB_B 0x283d
+ VF610_PAD_PTC27__NF_ALE 0x28c2
+ VF610_PAD_PTC28__NF_CLE 0x28c2
+ >;
+ };
+
pinctrl_pwm0: pwm0grp {
fsl,pins = <
VF610_PAD_PTB0__FTM0_CH0 0x1182
--
2.4.2
On 2015-06-06 11:53:31 [+0200], Stefan Agner wrote:
> diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
> new file mode 100644
> index 0000000..bb5ee11
> --- /dev/null
> +++ b/drivers/mtd/nand/vf610_nfc.c
…
> +/* Clear flags for upcoming command */
> +static inline void vf610_nfc_clear_status(struct vf610_nfc *nfc)
> +{
> + void __iomem *reg = nfc->regs + NFC_IRQ_STATUS;
> + u32 tmp = readl_relaxed(reg);
^^^
> + tmp |= CMD_DONE_CLEAR_BIT | IDLE_CLEAR_BIT;
> + writel_relaxed(tmp, reg);
^^^
> +}
…
> +static inline void vf610_nfc_done(struct vf610_nfc *nfc)
> +{
> + unsigned long timeout = msecs_to_jiffies(100);
> +
> + /*
> + * Barrier is needed after this write. This write need
> + * to be done before reading the next register the first
> + * time.
> + * vf610_nfc_set implicates such a barrier by using writel
> + * to write to the register.
> + */
> + vf610_nfc_set(nfc, NFC_IRQ_STATUS, IDLE_EN_BIT);
> + vf610_nfc_set(nfc, NFC_FLASH_CMD2, START_BIT);
> +
> + if (!(vf610_nfc_read(nfc, NFC_IRQ_STATUS) & IDLE_IRQ_BIT)) {
> + if (!wait_for_completion_timeout(&nfc->cmd_done, timeout))
> + dev_warn(nfc->dev, "Timeout while waiting for BUSY.\n");
Can you or did you test for this timeout to happen? Something like reading from
a sector which is BAD for instance might trigger it. Printing a warning is
certainly a good idea.
> + }
> + vf610_nfc_clear_status(nfc);
> +}
…
> +/*
> + * This function supports Vybrid only (MPC5125 would have full RB and four CS)
> + */
> +static void vf610_nfc_select_chip(struct mtd_info *mtd, int chip)
> +{
> +#ifdef CONFIG_SOC_VF610
> + struct vf610_nfc *nfc = mtd_to_nfc(mtd);
> + u32 tmp = vf610_nfc_read(nfc, NFC_ROW_ADDR);
> +
> + tmp &= ~(ROW_ADDR_CHIP_SEL_RB_MASK | ROW_ADDR_CHIP_SEL_MASK);
> + tmp |= 1 << ROW_ADDR_CHIP_SEL_RB_SHIFT;
> +
> + if (chip == 0)
> + tmp |= 1 << ROW_ADDR_CHIP_SEL_SHIFT;
> + else if (chip == 1)
> + tmp |= 2 << ROW_ADDR_CHIP_SEL_SHIFT;
> +
> + vf610_nfc_write(nfc, NFC_ROW_ADDR, tmp);
> +#endif
> +}
> +
> +static const struct of_device_id vf610_nfc_dt_ids[] = {
> + { .compatible = "fsl,vf610-nfc" },
> + { .compatible = "fsl,mpc5125-nfc" },
I advise against a "fsl,mpc5125-nfc" binding. First of all it is the
same as the previous one. Second of all it was not tested at all on the
SoC it suggests to work. Plus the chip select function has a comment hat
it won't work on MPC5125. So it really makes no sense to add it here.
I don't mind if you put the code behind CONFIG_SOC_VF610. Later (if
someone adds additional support) it will be best to use the .data member
to select the proper SoC support.
While you add a new compatible please make sure you describe the binding
in Documentation/devicetree/bindings (in case you did and I missed the
patch, ignore this :))
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, vf610_nfc_dt_ids);
Sebastian
On 9 Jun 2015, [email protected] wrote:
> On 2015-06-06 11:53:31 [+0200], Stefan Agner wrote:
>> +static const struct of_device_id vf610_nfc_dt_ids[] = {
>> + { .compatible = "fsl,vf610-nfc" },
>> + { .compatible = "fsl,mpc5125-nfc" },
> I advise against a "fsl,mpc5125-nfc" binding. First of all it is the
> same as the previous one. Second of all it was not tested at all on
> the SoC it suggests to work. Plus the chip select function has a
> comment hat it won't work on MPC5125. So it really makes no sense to
> add it here.
Someone has used a version of the driver on the PowerPC. I don't have
access to his email address now. Anyways, the chipselect code is
different on the PowerPC versions of the controller afair. So if some
external code sets up the chipselect for a single chip, then things are
fine.
Both the PowerPC and ARM support DT/OF, but you can never actually run
either version as the code must be compiled for either assembler. So I
am not quite sure that this was the correct way to go anyways... So I
agree with your conclusion we can remove that binding.
Regards,
Bill.