Skip to content

Commit 38f1aa5

Browse files
miquelraynalmiquelraynal
committed
Merge tag 'spi-nor/for-6.4' into mtd/next
SPI NOR core changes: * introduce Read While Write support for flashes featuring several banks * set the 4-Byte Address Mode method based on SFDP data * allow post_sfdp hook to return errors * parse SCCR MC table and introduce support for multi-chip devices SPI NOR manufacturer drivers changes: * macronix: add support for mx25uw51245g with RWW * spansion: - determine current address mode at runtime as it can be changed in a non-volatile way and differ from factory defaults or from what SFDP advertises. - enable JFFS2 write buffer mode for few ECC'd NOR flashes: S25FS256T, s25hx and s28hx - add support for s25hl02gt and s25hs02gt Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
2 parents e6026eb + df6def8 commit 38f1aa5

399 files changed

Lines changed: 4972 additions & 52402 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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
136136
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
137137
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
138138
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
139+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
140+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
141+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
139142
Felipe W Damasio <felipewd@terra.com.br>
140143
Felix Kuhling <fxkuehl@gmx.de>
141144
Felix Moeller <felix@derklecks.de>
@@ -306,6 +309,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
306309
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
307310
Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
308311
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
312+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
313+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
309314
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
310315
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
311316
Mayuresh Janorkar <mayur@ti.com>
@@ -411,7 +416,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
411416
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
412417
Simon Kelley <simon@thekelleys.org.uk>
413418
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
414-
Stephen Hemminger <shemminger@osdl.org>
419+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
420+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
421+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>
422+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>
415423
Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
416424
Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
417425
Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

‎Documentation/ABI/stable/sysfs-block‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,15 @@ Description:
705705
zoned will report "none".
706706

707707

708+
What: /sys/block/<disk>/hidden
709+
Date: March 2023
710+
Contact: linux-block@vger.kernel.org
711+
Description:
712+
[RO] the block device is hidden. it doesn’t produce events, and
713+
can’t be opened from userspace or using blkdev_get*.
714+
Used for the underlying components of multipath devices.
715+
716+
708717
What: /sys/block/<disk>/stat
709718
Date: February 2008
710719
Contact: Jerome Marchand <jmarchan@redhat.com>

‎Documentation/bpf/bpf_devel_QA.rst‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ workflows related to reporting bugs, submitting patches, and queueing
77
patches for stable kernels.
88

99
For general information about submitting patches, please refer to
10-
`Documentation/process/`_. This document only describes additional specifics
11-
related to BPF.
10+
Documentation/process/submitting-patches.rst. This document only describes
11+
additional specifics related to BPF.
1212

1313
.. contents::
1414
:local:
@@ -461,15 +461,15 @@ needed::
461461

462462
$ sudo make run_tests
463463

464-
See the kernels selftest `Documentation/dev-tools/kselftest.rst`_
465-
document for further documentation.
464+
See :doc:`kernel selftest documentation </dev-tools/kselftest>`
465+
for details.
466466

467467
To maximize the number of tests passing, the .config of the kernel
468468
under test should match the config file fragment in
469469
tools/testing/selftests/bpf as closely as possible.
470470

471471
Finally to ensure support for latest BPF Type Format features -
472-
discussed in `Documentation/bpf/btf.rst`_ - pahole version 1.16
472+
discussed in Documentation/bpf/btf.rst - pahole version 1.16
473473
is required for kernels built with CONFIG_DEBUG_INFO_BTF=y.
474474
pahole is delivered in the dwarves package or can be built
475475
from source at
@@ -684,12 +684,8 @@ when:
684684

685685

686686
.. Links
687-
.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
688687
.. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
689688
.. _selftests:
690689
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
691-
.. _Documentation/dev-tools/kselftest.rst:
692-
https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
693-
.. _Documentation/bpf/btf.rst: btf.rst
694690

695691
Happy BPF hacking!

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,3 @@ The main API is spi_nor_scan(). Before you call the hook, a driver should
6363
initialize the necessary fields for spi_nor{}. Please see
6464
drivers/mtd/spi-nor/spi-nor.c for detail. Please also refer to spi-fsl-qspi.c
6565
when you want to write a new driver for a SPI NOR controller.
66-
Another API is spi_nor_restore(), this is used to restore the status of SPI
67-
flash chip such as addressing mode. Call it whenever detach the driver from
68-
device or reboot the system.

‎Documentation/filesystems/ext4/blockgroup.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ descriptors. Instead, the superblock and a single block group descriptor
105105
block is placed at the beginning of the first, second, and last block
106106
groups in a meta-block group. A meta-block group is a collection of
107107
block groups which can be described by a single block group descriptor
108-
block. Since the size of the block group descriptor structure is 32
109-
bytes, a meta-block group contains 32 block groups for filesystems with
110-
a 1KB block size, and 128 block groups for filesystems with a 4KB
108+
block. Since the size of the block group descriptor structure is 64
109+
bytes, a meta-block group contains 16 block groups for filesystems with
110+
a 1KB block size, and 64 block groups for filesystems with a 4KB
111111
blocksize. Filesystems can either be created using this new block group
112112
descriptor layout, or existing filesystems can be resized on-line, and
113113
the field s_first_meta_bg in the superblock will indicate the first

‎Documentation/netlink/genetlink-c.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-c.yaml#

‎Documentation/netlink/genetlink-legacy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#

‎Documentation/netlink/genetlink.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#

‎Documentation/netlink/specs/ethtool.yaml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2+
13
name: ethtool
24

35
protocol: genetlink-legacy
@@ -11,7 +13,6 @@ attribute-sets:
1113
-
1214
name: dev-index
1315
type: u32
14-
value: 1
1516
-
1617
name: dev-name
1718
type: string
@@ -25,7 +26,6 @@ attribute-sets:
2526
-
2627
name: index
2728
type: u32
28-
value: 1
2929
-
3030
name: name
3131
type: string
@@ -39,14 +39,12 @@ attribute-sets:
3939
name: bit
4040
type: nest
4141
nested-attributes: bitset-bit
42-
value: 1
4342
-
4443
name: bitset
4544
attributes:
4645
-
4746
name: nomask
4847
type: flag
49-
value: 1
5048
-
5149
name: size
5250
type: u32
@@ -61,7 +59,6 @@ attribute-sets:
6159
-
6260
name: index
6361
type: u32
64-
value: 1
6562
-
6663
name: value
6764
type: string
@@ -71,7 +68,6 @@ attribute-sets:
7168
-
7269
name: string
7370
type: nest
74-
value: 1
7571
multi-attr: true
7672
nested-attributes: string
7773
-
@@ -80,7 +76,6 @@ attribute-sets:
8076
-
8177
name: id
8278
type: u32
83-
value: 1
8479
-
8580
name: count
8681
type: u32
@@ -96,14 +91,12 @@ attribute-sets:
9691
name: stringset
9792
type: nest
9893
multi-attr: true
99-
value: 1
10094
nested-attributes: stringset
10195
-
10296
name: strset
10397
attributes:
10498
-
10599
name: header
106-
value: 1
107100
type: nest
108101
nested-attributes: header
109102
-
@@ -119,7 +112,6 @@ attribute-sets:
119112
attributes:
120113
-
121114
name: header
122-
value: 1
123115
type: nest
124116
nested-attributes: header
125117
-
@@ -132,7 +124,6 @@ attribute-sets:
132124
attributes:
133125
-
134126
name: header
135-
value: 1
136127
type: nest
137128
nested-attributes: header
138129
-
@@ -180,7 +171,6 @@ attribute-sets:
180171
attributes:
181172
-
182173
name: pad
183-
value: 1
184174
type: pad
185175
-
186176
name: reassembly-errors
@@ -205,7 +195,6 @@ attribute-sets:
205195
attributes:
206196
-
207197
name: header
208-
value: 1
209198
type: nest
210199
nested-attributes: header
211200
-
@@ -251,13 +240,11 @@ operations:
251240

252241
do: &strset-get-op
253242
request:
254-
value: 1
255243
attributes:
256244
- header
257245
- stringsets
258246
- counts-only
259247
reply:
260-
value: 1
261248
attributes:
262249
- header
263250
- stringsets

‎Documentation/netlink/specs/fou.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2+
13
name: fou
24

35
protocol: genetlink-legacy
@@ -26,6 +28,7 @@ attribute-sets:
2628
-
2729
name: unspec
2830
type: unused
31+
value: 0
2932
-
3033
name: port
3134
type: u16
@@ -71,6 +74,7 @@ operations:
7174
-
7275
name: unspec
7376
doc: unused
77+
value: 0
7478

7579
-
7680
name: add

0 commit comments

Comments
 (0)