Commit 35f11a37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull mtd updates from Miquel Raynal:
 "MTD:

   - Apart from preventing the mtdblk to run on top of ftl or ubiblk
     (which may cause security issues and has no meaning anyway), there
     are a few misc fixes.

  Raw NAND:

   - Two meaningful changes this time. The conversion of the brcmnand
     driver to the ->exec_op() API, this series brought additional
     changes to the core in order to help controller drivers to handle
     themselves the WP pin during destructive operations when relevant.

   - There is also a series bringing important fixes to the sequential
     read feature.

   - As always, there is as well a whole bunch of miscellaneous W=1
     fixes, together with a few runtime fixes (double free, timeout
     value, OOB layout, missing register initialization) and the usual
     load of remove callbacks turned into void (which led to switch the
     txx9ndfmc driver to use module_platform_driver()).

  SPI NOR:

   - SPI NOR comes with die erase support for multi die flashes, with
     new octal protocols (1-1-8 and 1-8-8) parsed from SFDP and with an
     updated documentation about what the contributors shall consider
     when proposing flash additions or updates.

   - Michael Walle stepped out from the reviewer role to maintainer"

* tag 'mtd/for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (39 commits)
  mtd: rawnand: Clarify conditions to enable continuous reads
  mtd: rawnand: Prevent sequential reads with on-die ECC engines
  mtd: rawnand: Fix core interference with sequential reads
  mtd: rawnand: Prevent crossing LUN boundaries during sequential reads
  mtd: Fix gluebi NULL pointer dereference caused by ftl notifier
  dt-bindings: mtd: partitions: u-boot: Fix typo
  mtd: rawnand: s3c2410: fix Excess struct member description kernel-doc warnings
  MAINTAINERS: change my mail to the kernel.org one
  mtd: spi-nor: sfdp: get the 1-1-8 and 1-8-8 protocol from SFDP
  mtd: spi-nor: drop superfluous debug prints
  mtd: spi-nor: sysfs: hide the flash name if not set
  mtd: spi-nor: mark the flash name as obsolete
  mtd: spi-nor: print flash ID instead of name
  mtd: maps: vmu-flash: Fix the (mtd core) switch to ref counters
  mtd: ssfdc: Remove an unused variable
  mtd: rawnand: diskonchip: fix a potential double free in doc_probe
  mtd: rawnand: rockchip: Add missing title to a kernel doc comment
  mtd: rawnand: rockchip: Rename a structure
  mtd: rawnand: pl353: Fix kernel doc
  mtd: spi-nor: micron-st: Add support for mt25qu01g
  ...
parents 30194002 98d4fda8

Documentation/ABI/testing/sysfs-bus-spi-devices-spi-nor

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ KernelVersion: 5.14 
Contact:	linux-mtd@lists.infradead.org

Description:	(RO) Part name of the SPI NOR flash.



		The attribute is optional. User space should not rely on

		it to be present or even correct. Instead, user space

		should read the jedec_id attribute.



What:		/sys/bus/spi/devices/.../spi-nor/sfdp

Date:		April 2021

Documentation/devicetree/bindings/mtd/partitions/u-boot.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: U-Boot bootloader partition



description: |

  U-Boot is a bootlodaer commonly used in embedded devices. It's almost always

  U-Boot is a bootloader commonly used in embedded devices. It's almost always

  located on some kind of flash device.



  Device configuration is stored as a set of environment variables that are

Documentation/driver-api/mtd/spi-nor.rst

+201 −61
Original line number Diff line number Diff line
@@ -2,64 +2,204 @@ 
SPI NOR framework

=================



Part I - Why do we need this framework?

---------------------------------------



SPI bus controllers (drivers/spi/) only deal with streams of bytes; the bus

controller operates agnostic of the specific device attached. However, some

controllers (such as Freescale's QuadSPI controller) cannot easily handle

arbitrary streams of bytes, but rather are designed specifically for SPI NOR.



In particular, Freescale's QuadSPI controller must know the NOR commands to

find the right LUT sequence. Unfortunately, the SPI subsystem has no notion of

opcodes, addresses, or data payloads; a SPI controller simply knows to send or

receive bytes (Tx and Rx). Therefore, we must define a new layering scheme under

which the controller driver is aware of the opcodes, addressing, and other

details of the SPI NOR protocol.



Part II - How does the framework work?

--------------------------------------



This framework just adds a new layer between the MTD and the SPI bus driver.

With this new layer, the SPI NOR controller driver does not depend on the

m25p80 code anymore.



Before this framework, the layer is like::



                   MTD

         ------------------------

                  m25p80

         ------------------------

	       SPI bus driver

         ------------------------

	        SPI NOR chip



After this framework, the layer is like::



                   MTD

         ------------------------

              SPI NOR framework

         ------------------------

                  m25p80

         ------------------------

	       SPI bus driver

         ------------------------

	       SPI NOR chip

How to propose a new flash addition

-----------------------------------



With the SPI NOR controller driver (Freescale QuadSPI), it looks like::

Most SPI NOR flashes comply with the JEDEC JESD216

Serial Flash Discoverable Parameter (SFDP) standard. SFDP describes

the functional and feature capabilities of serial flash devices in a

standard set of internal read-only parameter tables.



                   MTD

         ------------------------

              SPI NOR framework

         ------------------------

                fsl-quadSPI

         ------------------------

	       SPI NOR chip



Part III - How can drivers use the framework?

---------------------------------------------



The main API is spi_nor_scan(). Before you call the hook, a driver should

initialize the necessary fields for spi_nor{}. Please see

drivers/mtd/spi-nor/spi-nor.c for detail. Please also refer to spi-fsl-qspi.c

when you want to write a new driver for a SPI NOR controller.
 
The SPI NOR driver queries the SFDP tables in order to determine the

flash's parameters and settings. If the flash defines the SFDP tables

it's likely that you won't need a flash entry at all, and instead

rely on the generic flash driver which probes the flash solely based

on its SFDP data. All one has to do is to specify the "jedec,spi-nor"

compatible in the device tree.



There are cases however where you need to define an explicit flash

entry. This typically happens when the flash has settings or support

that is not covered by the SFDP tables (e.g. Block Protection), or

when the flash contains mangled SFDP data. If the later, one needs

to implement the ``spi_nor_fixups`` hooks in order to amend the SFDP

parameters with the correct values.



Minimum testing requirements

-----------------------------



Do all the tests from below and paste them in the commit's comments

section, after the ``---`` marker.



1) Specify the controller that you used to test the flash and specify

   the frequency at which the flash was operated, e.g.::



    This flash is populated on the X board and was tested at Y

    frequency using the Z (put compatible) SPI controller.



2) Dump the sysfs entries and print the md5/sha1/sha256 SFDP checksum::



    root@1:~# cat /sys/bus/spi/devices/spi0.0/spi-nor/partname

    sst26vf064b

    root@1:~# cat /sys/bus/spi/devices/spi0.0/spi-nor/jedec_id

    bf2643

    root@1:~# cat /sys/bus/spi/devices/spi0.0/spi-nor/manufacturer

    sst

    root@1:~# xxd -p /sys/bus/spi/devices/spi0.0/spi-nor/sfdp

    53464450060102ff00060110300000ff81000106000100ffbf0001180002

    0001fffffffffffffffffffffffffffffffffd20f1ffffffff0344eb086b

    083b80bbfeffffffffff00ffffff440b0c200dd80fd810d820914824806f

    1d81ed0f773830b030b0f7ffffff29c25cfff030c080ffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffff0004fff37f0000f57f0000f9ff

    7d00f57f0000f37f0000ffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

    ffffbf2643ffb95ffdff30f260f332ff0a122346ff0f19320f1919ffffff

    ffffffff00669938ff05013506040232b03072428de89888a585c09faf5a

    ffff06ec060c0003080bffffffffff07ffff0202ff060300fdfd040700fc

    0300fefe0202070e

    root@1:~# sha256sum /sys/bus/spi/devices/spi0.0/spi-nor/sfdp

    428f34d0461876f189ac97f93e68a05fa6428c6650b3b7baf736a921e5898ed1  /sys/bus/spi/devices/spi0.0/spi-nor/sfdp



   Please dump the SFDP tables using ``xxd -p``. It enables us to do

   the reverse operation and convert the hexdump to binary with

   ``xxd -rp``. Dumping the SFDP data with ``hexdump -Cv`` is accepted,

   but less desirable.



3) Dump debugfs data::



    root@1:~# cat /sys/kernel/debug/spi-nor/spi0.0/capabilities

    Supported read modes by the flash

     1S-1S-1S

      opcode		0x03

      mode cycles	0

      dummy cycles	0

     1S-1S-1S (fast read)

      opcode		0x0b

      mode cycles	0

      dummy cycles	8

     1S-1S-2S

      opcode		0x3b

      mode cycles	0

      dummy cycles	8

     1S-2S-2S

      opcode		0xbb

      mode cycles	4

      dummy cycles	0

     1S-1S-4S

      opcode		0x6b

      mode cycles	0

      dummy cycles	8

     1S-4S-4S

      opcode		0xeb

      mode cycles	2

      dummy cycles	4

     4S-4S-4S

      opcode		0x0b

      mode cycles	2

      dummy cycles	4



    Supported page program modes by the flash

     1S-1S-1S

      opcode	0x02



    root@1:~# cat /sys/kernel/debug/spi-nor/spi0.0/params

    name		sst26vf064b

    id			bf 26 43 bf 26 43

    size		8.00 MiB

    write size		1

    page size		256

    address nbytes	3

    flags		HAS_LOCK | HAS_16BIT_SR | SOFT_RESET | SWP_IS_VOLATILE



    opcodes

     read		0xeb

      dummy cycles	6

     erase		0x20

     program		0x02

     8D extension	none



    protocols

     read		1S-4S-4S

     write		1S-1S-1S

     register		1S-1S-1S



    erase commands

     20 (4.00 KiB) [0]

     d8 (8.00 KiB) [1]

     d8 (32.0 KiB) [2]

     d8 (64.0 KiB) [3]

     c7 (8.00 MiB)



    sector map

     region (in hex)   | erase mask | flags

     ------------------+------------+----------

     00000000-00007fff |     [01  ] |

     00008000-0000ffff |     [0 2 ] |

     00010000-007effff |     [0  3] |

     007f0000-007f7fff |     [0 2 ] |

     007f8000-007fffff |     [01  ] |



4) Use `mtd-utils <https://git.infradead.org/mtd-utils.git>`__

   and verify that erase, read and page program operations work fine::



    root@1:~# dd if=/dev/urandom of=./spi_test bs=1M count=2

    2+0 records in

    2+0 records out

    2097152 bytes (2.1 MB, 2.0 MiB) copied, 0.848566 s, 2.5 MB/s



    root@1:~# mtd_debug erase /dev/mtd0 0 2097152

    Erased 2097152 bytes from address 0x00000000 in flash



    root@1:~# mtd_debug read /dev/mtd0 0 2097152 spi_read

    Copied 2097152 bytes from address 0x00000000 in flash to spi_read



    root@1:~# hexdump spi_read

    0000000 ffff ffff ffff ffff ffff ffff ffff ffff

    *

    0200000



    root@1:~# sha256sum spi_read

    4bda3a28f4ffe603c0ec1258c0034d65a1a0d35ab7bd523a834608adabf03cc5  spi_read



    root@1:~# mtd_debug write /dev/mtd0 0 2097152 spi_test

    Copied 2097152 bytes from spi_test to address 0x00000000 in flash



    root@1:~# mtd_debug read /dev/mtd0 0 2097152 spi_read

    Copied 2097152 bytes from address 0x00000000 in flash to spi_read



    root@1:~# sha256sum spi*

    c444216a6ba2a4a66cccd60a0dd062bce4b865dd52b200ef5e21838c4b899ac8  spi_read

    c444216a6ba2a4a66cccd60a0dd062bce4b865dd52b200ef5e21838c4b899ac8  spi_test



   If the flash comes erased by default and the previous erase was ignored,

   we won't catch it, thus test the erase again::



    root@1:~# mtd_debug erase /dev/mtd0 0 2097152

    Erased 2097152 bytes from address 0x00000000 in flash



    root@1:~# mtd_debug read /dev/mtd0 0 2097152 spi_read

    Copied 2097152 bytes from address 0x00000000 in flash to spi_read



    root@1:~# sha256sum spi*

    4bda3a28f4ffe603c0ec1258c0034d65a1a0d35ab7bd523a834608adabf03cc5  spi_read

    c444216a6ba2a4a66cccd60a0dd062bce4b865dd52b200ef5e21838c4b899ac8  spi_test



   Dump some other relevant data::



    root@1:~# mtd_debug info /dev/mtd0

    mtd.type = MTD_NORFLASH

    mtd.flags = MTD_CAP_NORFLASH

    mtd.size = 8388608 (8M)

    mtd.erasesize = 4096 (4K)

    mtd.writesize = 1

    mtd.oobsize = 0

    regions = 0

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -9026,7 +9026,7 @@ F: drivers/gpio/gpio-mockup.c 
F:	tools/testing/selftests/gpio/









GPIO REGMAP









M:	Michael Walle <michael@walle.cc>









M:	Michael Walle <mwalle@kernel.org>









S:	Maintained









F:	drivers/gpio/gpio-regmap.c









F:	include/linux/gpio/regmap.h








@@ -19868,7 +19868,7 @@ W:	http://www.winischhofer.at/linuxsisusbvga.shtml







F:	drivers/usb/misc/sisusbvga/

















SL28 CPLD MFD DRIVER









M:	Michael Walle <michael@walle.cc>









M:	Michael Walle <mwalle@kernel.org>









S:	Maintained









F:	Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml









F:	Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml








@@ -19883,7 +19883,7 @@ F:	drivers/pwm/pwm-sl28cpld.c







F:	drivers/watchdog/sl28cpld_wdt.c

















SL28 VPD NVMEM LAYOUT DRIVER









M:	Michael Walle <michael@walle.cc>









M:	Michael Walle <mwalle@kernel.org>









S:	Maintained









F:	Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml









F:	drivers/nvmem/layouts/sl28vpd.c








@@ -20393,7 +20393,7 @@ F:	drivers/pinctrl/spear/







SPI NOR SUBSYSTEM









M:	Tudor Ambarus <tudor.ambarus@linaro.org>









M:	Pratyush Yadav <pratyush@kernel.org>









R:	Michael Walle <michael@walle.cc>









M:	Michael Walle <mwalle@kernel.org>









L:	linux-mtd@lists.infradead.org









S:	Maintained









W:	http://www.linux-mtd.infradead.org/

























drivers/mtd/maps/vmu-flash.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -719,7 +719,7 @@ static int vmu_can_unload(struct maple_device *mdev)







	card = maple_get_drvdata(mdev);









	for (x = 0; x < card->partitions; x++) {









		mtd = &((card->mtd)[x]);









		if (mtd->usecount > 0)









		if (kref_read(&mtd->refcnt))









			return 0;









	}









	return 1;