Skip to content

mtd: spi-nor / spi / MFD: Convert intel-spi to SPI MEM

Mika Westerberg linux-mtd linux-spi 6 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest3 patches 5 repliesIn review
  2. v53 patches 7 repliesSuperseded
  3. v43 patches 7 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v33 patches7 repliesSuperseded
v23 patches3 repliesSuperseded
v13 patches15 repliesSuperseded

Changes in v6 from the cover letter

* Added tags from Pratyush Yadav and Tudor Ambarus
* Added replacement_op field to intel_spi_mem_op to be used with erase operations
* Return -EOPNOTSUPP if no match is found in intel_spi_exec_mem_op()

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3mtd: spi-nor: intel-spi: Disable write protection only if askeddrivers/mfd/lpc_ich.c drivers/mtd/spi-nor/controllers/intel-spi-pci.c drivers/mtd/spi-nor/controllers/intel-spi.c +1 more+96 -390 replies
2/3mtd: spi-nor: intel-spi: Convert to SPI MEMdrivers/mtd/spi-nor/controllers/Kconfig drivers/mtd/spi-nor/controllers/Makefile drivers/mtd/spi-nor/controllers/intel-spi.h +8 more+628 -3711 reply
3/3Documentation / MTD: Rename the intel-spi driverDocumentation/driver-api/mtd/index.rst Documentation/driver-api/mtd/spi-intel.rst+5 -50 replies

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchAndy ShevchenkoMauro LimaTudor AmbarusLee JonesBoris BrezillonPratyush Yadav
1/3R-b R-b R-b A-b
2/3R-b R-b R-b A-b R-b A-b
3/3R-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v6 thread

Cover letter [PATCH v6 0/3] mtd: spi-nor / spi / MFD: Convert intel-spi to SPI MEM

Hi all,

Based on discussion on the patch I sent some time ago here:

http://lists.infradead.org/pipermail/linux-mtd/2021-June/086867.html

it turns out that the preferred way to deal with the SPI flash controller drivers is through SPI MEM which is part of Linux SPI subsystem.

This series does that for the intel-spi driver. This also renames the driver to follow the convention used in the SPI subsystem. The first patch improves the write protection handling to be slightly more safer. The following two patches do the conversion itself. Note the Intel SPI flash controller only allows commands such as read, write and so on and it internally uses whatever addressing etc. it figured from the SFDP on the flash device.

Previous versions of the patch series can be found here:

v5: https://lore.kernel.org/linux-mtd/[email protected]/
v4: https://lore.kernel.org/linux-mtd/[email protected]/
v3: https://lore.kernel.org/linux-mtd/[email protected]/
v2: https://lore.kernel.org/linux-mtd/[email protected]/
v1: https://lore.kernel.org/linux-mtd/[email protected]/

Changes from v5:

* Added tags from Pratyush Yadav and Tudor Ambarus
* Added replacement_op field to intel_spi_mem_op to be used with erase operations
* Return -EOPNOTSUPP if no match is found in intel_spi_exec_mem_op()

Changes from v4:

* Correct check in intel_spi_cmp_mem_op()
* Added tag from Boris

Changes from v3:

* Create an array of supported opcodes and reject everything else.
* Fix checkpatch warnings reported by Mauro
* Added tags from Lee and Mauro

Changes from v2:

* Added tag from Andy
* Check buswidth in intel_spi_supports_mem_op() and return false if octal mode is asked. The Intel controllers support buswidths 1-4 but this is not exposed to software. It figures this itself through SFDP tables.
* In case of software sequencer, support same opcodes than we support with the hardware sequencer if found in the opcodes table.

Changes from v1:

* Arrange dependencies in Kconfig entries the same way in both glue drivers.
* Added empty lines between different subsystem includes.
* dev_err() to single line
* Return intel_spi_sw_cycle() directly in intel_spi_erase().
* Drop redundant elses.
* Fixed typo in the commit message of the patch 3/3.

Mika Westerberg (3):
mtd: spi-nor: intel-spi: Disable write protection only if asked
mtd: spi-nor: intel-spi: Convert to SPI MEM Documentation / MTD: Rename the intel-spi driver

 Documentation/driver-api/mtd/index.rst        |   2 +-
 .../mtd/{intel-spi.rst => spi-intel.rst}      |   8 +-
 drivers/mfd/lpc_ich.c                         |  59 +-
 drivers/mtd/spi-nor/controllers/Kconfig       |  36 -
 drivers/mtd/spi-nor/controllers/Makefile      |   3 -
 drivers/mtd/spi-nor/controllers/intel-spi.h   |  21 -
 drivers/spi/Kconfig                           |  39 +
 drivers/spi/Makefile                          |   3 +
 .../intel-spi-pci.c => spi/spi-intel-pci.c}   |  49 +-
 .../spi-intel-platform.c}                     |  21 +-
 .../intel-spi.c => spi/spi-intel.c}           | 850 ++++++++++++------
 drivers/spi/spi-intel.h                       |  19 +
 include/linux/mfd/lpc_ich.h                   |   2 +-
 .../x86/{intel-spi.h => spi-intel.h}          |  12 +-
 14 files changed, 719 insertions(+), 405 deletions(-)
 rename Documentation/driver-api/mtd/{intel-spi.rst => spi-intel.rst} (94%)
 delete mode 100644 drivers/mtd/spi-nor/controllers/intel-spi.h
 rename drivers/{mtd/spi-nor/controllers/intel-spi-pci.c => spi/spi-intel-pci.c} (84%)
 rename drivers/{mtd/spi-nor/controllers/intel-spi-platform.c => spi/spi-intel-platform.c} (65%)
 rename drivers/{mtd/spi-nor/controllers/intel-spi.c => spi/spi-intel.c} (55%)
 create mode 100644 drivers/spi/spi-intel.h
 rename include/linux/platform_data/x86/{intel-spi.h => spi-intel.h} (64%)
Signature · 1 line
2.34.1