Skip to content

Commit e6828be

Browse files
committed
Merge tag 'spi-nor/for-5.19' into mtd/next
SPI NOR core changes: - Read back written SR value to make sure the write was done correctly. - Introduce a common function for Read ID that manufacturer drivers can use to verify the Octal DTR switch worked correctly. - Add helpers for read/write any register commands so manufacturer drivers don't open code it every time. - Clarify rdsr dummy cycles documentation. - Add debugfs entry to expose internal flash parameters and state. SPI NOR manufacturer drivers changes: - Add support for Winbond W25Q512NW-IM, and Eon EN25QH256A. - Move spi_nor_write_ear() to Winbond module since only Winbond flashes use it. - Rework Micron and Cypress Octal DTR enable methods to improve readability. - Use the common Read ID function to verify switch to Octal DTR mode for Micron and Cypress flashes. - Skip polling status on volatile register writes for Micron and Cypress flashes since the operation is instant. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
2 parents 1fefc8e + c474521 commit e6828be

848 files changed

Lines changed: 8454 additions & 6098 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@ Uwe Kleine-König <ukleinek@strlen.de>
391391
Uwe Kleine-König <ukl@pengutronix.de>
392392
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
393393
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
394+
Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com>
395+
Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>
396+
Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>
397+
Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>
394398
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
395399
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
396400
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/ABI/testing/sysfs-class-firmware-attributes

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Description:
116116
<value>[ForceIf:<attribute>=<value>]
117117
<value>[ForceIfNot:<attribute>=<value>]
118118

119-
For example:
119+
For example::
120120

121121
LegacyOrom/dell_value_modifier has value:
122122
Disabled[ForceIf:SecureBoot=Enabled]
@@ -212,7 +212,7 @@ Description:
212212
the next boot.
213213

214214
Lenovo specific class extensions
215-
------------------------------
215+
--------------------------------
216216

217217
On Lenovo systems the following additional settings are available:
218218

@@ -246,9 +246,7 @@ Description:
246246
that is being referenced (e.g hdd0, hdd1 etc)
247247
This attribute defaults to device 0.
248248

249-
certificate:
250-
signature:
251-
save_signature:
249+
certificate, signature, save_signature:
252250
These attributes are used for certificate based authentication. This is
253251
used in conjunction with a signing server as an alternative to password
254252
based authentication.
@@ -257,22 +255,27 @@ Description:
257255
The attributes can be displayed to check the stored value.
258256

259257
Some usage examples:
260-
Installing a certificate to enable feature:
261-
echo <supervisor password > authentication/Admin/current_password
262-
echo <signed certificate> > authentication/Admin/certificate
263258

264-
Updating the installed certificate:
265-
echo <signature> > authentication/Admin/signature
266-
echo <signed certificate> > authentication/Admin/certificate
259+
Installing a certificate to enable feature::
260+
261+
echo "supervisor password" > authentication/Admin/current_password
262+
echo "signed certificate" > authentication/Admin/certificate
263+
264+
Updating the installed certificate::
265+
266+
echo "signature" > authentication/Admin/signature
267+
echo "signed certificate" > authentication/Admin/certificate
267268

268-
Removing the installed certificate:
269-
echo <signature> > authentication/Admin/signature
270-
echo '' > authentication/Admin/certificate
269+
Removing the installed certificate::
271270

272-
Changing a BIOS setting:
273-
echo <signature> > authentication/Admin/signature
274-
echo <save signature> > authentication/Admin/save_signature
275-
echo Enable > attribute/PasswordBeep/current_value
271+
echo "signature" > authentication/Admin/signature
272+
echo "" > authentication/Admin/certificate
273+
274+
Changing a BIOS setting::
275+
276+
echo "signature" > authentication/Admin/signature
277+
echo "save signature" > authentication/Admin/save_signature
278+
echo Enable > attribute/PasswordBeep/current_value
276279

277280
You cannot enable certificate authentication if a supervisor password
278281
has not been set.
@@ -288,9 +291,10 @@ Description:
288291
certificate_to_password:
289292
Write only attribute used to switch from certificate based authentication
290293
back to password based.
291-
Usage:
292-
echo <signature> > authentication/Admin/signature
293-
echo <password> > authentication/Admin/certificate_to_password
294+
Usage::
295+
296+
echo "signature" > authentication/Admin/signature
297+
echo "password" > authentication/Admin/certificate_to_password
294298

295299

296300
What: /sys/class/firmware-attributes/*/attributes/pending_reboot
@@ -345,7 +349,7 @@ Description:
345349

346350
# echo "factory" > /sys/class/firmware-attributes/*/device/attributes/reset_bios
347351
# cat /sys/class/firmware-attributes/*/device/attributes/reset_bios
348-
# builtinsafe lastknowngood [factory] custom
352+
builtinsafe lastknowngood [factory] custom
349353

350354
Note that any changes to this attribute requires a reboot
351355
for changes to take effect.

Documentation/ABI/testing/sysfs-driver-intel_sdsi

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,19 @@ Description:
1313
Should the operation fail, one of the following error codes
1414
may be returned:
1515

16+
========== =====
1617
Error Code Cause
17-
---------- -----
18-
EIO General mailbox failure. Log may indicate cause.
19-
EBUSY Mailbox is owned by another agent.
20-
EPERM SDSI capability is not enabled in hardware.
21-
EPROTO Failure in mailbox protocol detected by driver.
18+
========== =====
19+
EIO General mailbox failure. Log may indicate cause.
20+
EBUSY Mailbox is owned by another agent.
21+
EPERM SDSI capability is not enabled in hardware.
22+
EPROTO Failure in mailbox protocol detected by driver.
2223
See log for details.
23-
EOVERFLOW For provision commands, the size of the data
24+
EOVERFLOW For provision commands, the size of the data
2425
exceeds what may be written.
25-
ESPIPE Seeking is not allowed.
26-
ETIMEDOUT Failure to complete mailbox transaction in time.
26+
ESPIPE Seeking is not allowed.
27+
ETIMEDOUT Failure to complete mailbox transaction in time.
28+
========== =====
2729

2830
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/guid
2931
Date: Feb 2022

Documentation/dev-tools/kunit/start.rst

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,18 @@ or ``VFAT_FS``. To run ``FAT_KUNIT_TEST``, the ``.kunitconfig`` has:
4141
CONFIG_MSDOS_FS=y
4242
CONFIG_FAT_KUNIT_TEST=y
4343
44-
1. A good starting point for the ``.kunitconfig``, is the KUnit default
45-
config. Run the command:
44+
1. A good starting point for the ``.kunitconfig`` is the KUnit default config.
45+
You can generate it by running:
4646

4747
.. code-block:: bash
4848
4949
cd $PATH_TO_LINUX_REPO
50-
cp tools/testing/kunit/configs/default.config .kunitconfig
50+
tools/testing/kunit/kunit.py config
51+
cat .kunit/.kunitconfig
52+
53+
.. note ::
54+
``.kunitconfig`` lives in the ``--build_dir`` used by kunit.py, which is
55+
``.kunit`` by default.
5156
5257
.. note ::
5358
You may want to remove CONFIG_KUNIT_ALL_TESTS from the ``.kunitconfig`` as

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ maintainers:
1313
properties:
1414
compatible:
1515
enum:
16-
- nvidia,tegra20-pmc
1716
- nvidia,tegra20-pmc
1817
- nvidia,tegra30-pmc
1918
- nvidia,tegra114-pmc

Documentation/devicetree/bindings/bus/ti-sysc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ properties:
3434
oneOf:
3535
- items:
3636
- enum:
37-
- ti,sysc-omap2
3837
- ti,sysc-omap2
3938
- ti,sysc-omap4
4039
- ti,sysc-omap4-simple

Documentation/devicetree/bindings/clock/samsung,exynos-audss-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Samsung Exynos SoC Audio SubSystem clock controller
88

99
maintainers:
1010
- Chanwoo Choi <cw00.choi@samsung.com>
11-
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11+
- Krzysztof Kozlowski <krzk@kernel.org>
1212
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1313
- Tomasz Figa <tomasz.figa@gmail.com>
1414

Documentation/devicetree/bindings/clock/samsung,exynos-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Samsung Exynos SoC clock controller
88

99
maintainers:
1010
- Chanwoo Choi <cw00.choi@samsung.com>
11-
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11+
- Krzysztof Kozlowski <krzk@kernel.org>
1212
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1313
- Tomasz Figa <tomasz.figa@gmail.com>
1414

Documentation/devicetree/bindings/clock/samsung,exynos-ext-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Samsung SoC external/osc/XXTI/XusbXTI clock
88

99
maintainers:
1010
- Chanwoo Choi <cw00.choi@samsung.com>
11-
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11+
- Krzysztof Kozlowski <krzk@kernel.org>
1212
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1313
- Tomasz Figa <tomasz.figa@gmail.com>
1414

Documentation/devicetree/bindings/clock/samsung,exynos4412-isp-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Samsung Exynos4412 SoC ISP clock controller
88

99
maintainers:
1010
- Chanwoo Choi <cw00.choi@samsung.com>
11-
- Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11+
- Krzysztof Kozlowski <krzk@kernel.org>
1212
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1313
- Tomasz Figa <tomasz.figa@gmail.com>
1414

0 commit comments

Comments
 (0)