Skip to content

Commit 8be98d2

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.15 merge window.
2 parents 818b265 + 3e204d6 commit 8be98d2

File tree

12,744 files changed

+656513
-266665
lines changed

Some content is hidden

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

12,744 files changed

+656513
-266665
lines changed

.clang-format

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ ForEachMacros:
109109
- 'css_for_each_child'
110110
- 'css_for_each_descendant_post'
111111
- 'css_for_each_descendant_pre'
112-
- 'cxl_for_each_cmd'
113112
- 'device_for_each_child_node'
113+
- 'displayid_iter_for_each'
114114
- 'dma_fence_chain_for_each'
115115
- 'do_for_each_ftrace_op'
116116
- 'drm_atomic_crtc_for_each_plane'
@@ -136,6 +136,7 @@ ForEachMacros:
136136
- 'drm_mm_for_each_node_in_range'
137137
- 'drm_mm_for_each_node_safe'
138138
- 'flow_action_for_each'
139+
- 'for_each_acpi_dev_match'
139140
- 'for_each_active_dev_scope'
140141
- 'for_each_active_drhd_unit'
141142
- 'for_each_active_iommu'
@@ -171,14 +172,14 @@ ForEachMacros:
171172
- 'for_each_dapm_widgets'
172173
- 'for_each_dev_addr'
173174
- 'for_each_dev_scope'
174-
- 'for_each_displayid_db'
175175
- 'for_each_dma_cap_mask'
176176
- 'for_each_dpcm_be'
177177
- 'for_each_dpcm_be_rollback'
178178
- 'for_each_dpcm_be_safe'
179179
- 'for_each_dpcm_fe'
180180
- 'for_each_drhd_unit'
181181
- 'for_each_dss_dev'
182+
- 'for_each_dtpm_table'
182183
- 'for_each_efi_memory_desc'
183184
- 'for_each_efi_memory_desc_in_map'
184185
- 'for_each_element'
@@ -215,6 +216,7 @@ ForEachMacros:
215216
- 'for_each_migratetype_order'
216217
- 'for_each_msi_entry'
217218
- 'for_each_msi_entry_safe'
219+
- 'for_each_msi_vector'
218220
- 'for_each_net'
219221
- 'for_each_net_continue_reverse'
220222
- 'for_each_netdev'
@@ -270,6 +272,12 @@ ForEachMacros:
270272
- 'for_each_prime_number_from'
271273
- 'for_each_process'
272274
- 'for_each_process_thread'
275+
- 'for_each_prop_codec_conf'
276+
- 'for_each_prop_dai_codec'
277+
- 'for_each_prop_dai_cpu'
278+
- 'for_each_prop_dlc_codecs'
279+
- 'for_each_prop_dlc_cpus'
280+
- 'for_each_prop_dlc_platforms'
273281
- 'for_each_property_of_node'
274282
- 'for_each_registered_fb'
275283
- 'for_each_requested_gpio'
@@ -430,6 +438,7 @@ ForEachMacros:
430438
- 'queue_for_each_hw_ctx'
431439
- 'radix_tree_for_each_slot'
432440
- 'radix_tree_for_each_tagged'
441+
- 'rb_for_each'
433442
- 'rbtree_postorder_for_each_entry_safe'
434443
- 'rdma_for_each_block'
435444
- 'rdma_for_each_port'

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@
4848
*.xz
4949
*.zst
5050
Module.symvers
51-
modules.builtin
5251
modules.order
5352

5453
#
5554
# Top-level generic files
5655
#
57-
/tags
58-
/TAGS
5956
/linux
57+
/modules-only.symvers
6058
/vmlinux
6159
/vmlinux.32
60+
/vmlinux.map
6261
/vmlinux.symvers
6362
/vmlinux-gdb.py
6463
/vmlinuz
6564
/System.map
6665
/Module.markers
66+
/modules.builtin
6767
/modules.builtin.modinfo
6868
/modules.nsdeps
6969

@@ -112,6 +112,10 @@ patches-*
112112
patches
113113
series
114114

115+
# ctags files
116+
tags
117+
TAGS
118+
115119
# cscope files
116120
cscope.*
117121
ncscope.*

.mailmap

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ Alexandre Belloni <[email protected]> <alexandre.belloni@free-electr
2525
Alexei Starovoitov <[email protected]> <[email protected]>
2626
Alexei Starovoitov <[email protected]> <[email protected]>
2727
Alexei Starovoitov <[email protected]> <[email protected]>
28-
29-
28+
29+
30+
3031
3132
3233
@@ -159,6 +160,7 @@ Jeff Layton <[email protected]> <[email protected]>
159160
160161
Jens Axboe <[email protected]>
161162
Jens Osterkamp <[email protected]>
163+
162164
163165
164166
@@ -210,6 +212,8 @@ Manivannan Sadhasivam <[email protected]> <[email protected]>
210212
Manivannan Sadhasivam <[email protected]> <[email protected]>
211213
212214
215+
216+
Marek Behún <[email protected]> Marek Behun <[email protected]>
213217
Mark Brown <[email protected]>
214218
215219
@@ -241,6 +245,9 @@ Maxime Ripard <[email protected]> <[email protected]>
241245
Mayuresh Janorkar <[email protected]>
242246
Michael Buesch <[email protected]>
243247
Michel Dänzer <[email protected]>
248+
Michel Lespinasse <[email protected]>
249+
250+
244251
245252
246253
@@ -265,6 +272,8 @@ Nicholas Piggin <[email protected]> <[email protected]>
265272
266273
267274
275+
Nicolas Saenz Julienne <[email protected]> <[email protected]>
276+
Nicolas Saenz Julienne <[email protected]> <[email protected]>
268277
269278
270279

CREDITS

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
550550
D: device drivers. His encouragement also helped many engineers get
551551
D: started working on the Linux kernel. David passed away in early
552552
D: 2011, and will be greatly missed.
553-
W: https://lkml.org/lkml/2011/4/5/36
553+
W: https://lore.kernel.org/lkml/[email protected]
554554

555555
N: Gary Brubaker
556556
@@ -1874,6 +1874,11 @@ S: Krosenska' 543
18741874
S: 181 00 Praha 8
18751875
S: Czech Republic
18761876

1877+
N: Murali Karicheri
1878+
1879+
D: Keystone NetCP driver
1880+
D: Keystone PCIe host controller driver
1881+
18771882
N: Jan "Yenya" Kasprzak
18781883
18791884
D: Author of the COSA/SRP sync serial board driver.
@@ -1933,6 +1938,9 @@ N: Kukjin Kim
19331938
19341939
D: Samsung S3C, S5P and Exynos ARM architectures
19351940

1941+
N: Milo Kim
1942+
D: TI LP855x, LP8727 and LP8788 drivers
1943+
19361944
N: Sangbeom Kim
19371945
19381946
D: Samsung SoC Audio (ASoC) drivers
@@ -2536,6 +2544,14 @@ D: Linux/PARISC hacker
25362544
D: AD1889 sound driver
25372545
S: Ottawa, Canada
25382546

2547+
N: Peter Meerwald-Stadler
2548+
2549+
W: https://pmeerw.net
2550+
D: IIO reviewing, drivers
2551+
S: Schießstandstr. 3a
2552+
S: A-5061 Elsbethen
2553+
S: Austria
2554+
25392555
N: Dirk Melchers
25402556
25412557
D: 8 bit XT hard disk driver for OMTI5520

Documentation/ABI/obsolete/sysfs-class-dax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/class/dax/
22
Date: May, 2016
33
KernelVersion: v4.7
4-
Contact: linux-nvdimm@lists.01.org
4+
Contact: nvdimm@lists.linux.dev
55
Description: Device DAX is the device-centric analogue of Filesystem
66
DAX (CONFIG_FS_DAX). It allows memory ranges to be
77
allocated and mapped without need of an intervening file

Documentation/ABI/obsolete/sysfs-kernel-fadump_registered

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.
22

33
What: /sys/kernel/fadump_registered
44
Date: Feb 2012

Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.
22

33
What: /sys/kernel/fadump_release_mem
44
Date: Feb 2012

Documentation/ABI/removed/sysfs-bus-nfit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/bus/nd/devices/regionX/nfit/ecc_unit_size
22
Date: Aug, 2017
33
KernelVersion: v4.14 (Removed v4.18)
4-
Contact: linux-nvdimm@lists.01.org
4+
Contact: nvdimm@lists.linux.dev
55
Description:
66
(RO) Size of a write request to a DIMM that will not incur a
77
read-modify-write cycle at the memory controller.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: Audit Login UID
2+
Date: 2005-02-01
3+
KernelVersion: 2.6.11-rc2 1e2d1492e178 ("[PATCH] audit: handle loginuid through proc")
4+
5+
Users: audit and login applications
6+
Description:
7+
The /proc/$pid/loginuid pseudofile is written to set and
8+
read to get the audit login UID of process $pid as a
9+
decimal unsigned int (%u, u32). If it is unset,
10+
permissions are not needed to set it. The accessor must
11+
have CAP_AUDIT_CONTROL in the initial user namespace to
12+
write it if it has been set. It cannot be written again
13+
if AUDIT_FEATURE_LOGINUID_IMMUTABLE is enabled. It
14+
cannot be unset if AUDIT_FEATURE_ONLY_UNSET_LOGINUID is
15+
enabled.
16+
17+
What: Audit Login Session ID
18+
Date: 2008-03-13
19+
KernelVersion: 2.6.25-rc7 1e0bd7550ea9 ("[PATCH] export sessionid alongside the loginuid in procfs")
20+
21+
Users: audit and login applications
22+
Description:
23+
The /proc/$pid/sessionid pseudofile is read to get the
24+
audit login session ID of process $pid as a decimal
25+
unsigned int (%u, u32). It is set automatically,
26+
serially assigned with each new login.
27+

Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 54 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,24 @@ Description: Allows the root user to read or write 64 bit data directly
8282
If the IOMMU is disabled, it also allows the root user to read
8383
or write from the host a device VA of a host mapped memory
8484

85+
What: /sys/kernel/debug/habanalabs/hl<n>/data_dma
86+
Date: Apr 2021
87+
KernelVersion: 5.13
88+
89+
Description: Allows the root user to read from the device's internal
90+
memory (DRAM/SRAM) through a DMA engine.
91+
This property is a binary blob that contains the result of the
92+
DMA transfer.
93+
This custom interface is needed (instead of using the generic
94+
Linux user-space PCI mapping) because the amount of internal
95+
memory is huge (>32GB) and reading it via the PCI bar will take
96+
a very long time.
97+
This interface doesn't support concurrency in the same device.
98+
In GAUDI and GOYA, this action can cause undefined behavior
99+
in case the it is done while the device is executing user
100+
workloads.
101+
Only supported on GAUDI at this stage.
102+
85103
What: /sys/kernel/debug/habanalabs/hl<n>/device
86104
Date: Jan 2019
87105
KernelVersion: 5.1
@@ -90,6 +108,24 @@ Description: Enables the root user to set the device to specific state.
90108
Valid values are "disable", "enable", "suspend", "resume".
91109
User can read this property to see the valid values
92110

111+
What: /sys/kernel/debug/habanalabs/hl<n>/dma_size
112+
Date: Apr 2021
113+
KernelVersion: 5.13
114+
115+
Description: Specify the size of the DMA transaction when using DMA to read
116+
from the device's internal memory. The value can not be larger
117+
than 128MB. Writing to this value initiates the DMA transfer.
118+
When the write is finished, the user can read the "data_dma"
119+
blob
120+
121+
What: /sys/kernel/debug/habanalabs/hl<n>/dump_security_violations
122+
Date: Jan 2021
123+
KernelVersion: 5.12
124+
125+
Description: Dumps all security violations to dmesg. This will also ack
126+
all security violations meanings those violations will not be
127+
dumped next time user calls this API
128+
93129
What: /sys/kernel/debug/habanalabs/hl<n>/engines
94130
Date: Jul 2019
95131
KernelVersion: 5.3
@@ -154,13 +190,30 @@ Description: Displays the hop values and physical address for a given ASID
154190
e.g. to display info about VA 0x1000 for ASID 1 you need to do:
155191
echo "1 0x1000" > /sys/kernel/debug/habanalabs/hl0/mmu
156192

193+
What: /sys/kernel/debug/habanalabs/hl<n>/mmu_error
194+
Date: Mar 2021
195+
KernelVersion: 5.12
196+
197+
Description: Check and display page fault or access violation mmu errors for
198+
all MMUs specified in mmu_cap_mask.
199+
e.g. to display error info for MMU hw cap bit 9, you need to do:
200+
echo "0x200" > /sys/kernel/debug/habanalabs/hl0/mmu_error
201+
cat /sys/kernel/debug/habanalabs/hl0/mmu_error
202+
157203
What: /sys/kernel/debug/habanalabs/hl<n>/set_power_state
158204
Date: Jan 2019
159205
KernelVersion: 5.1
160206
161207
Description: Sets the PCI power state. Valid values are "1" for D0 and "2"
162208
for D3Hot
163209

210+
What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
211+
Date: Mar 2020
212+
KernelVersion: 5.6
213+
214+
Description: Sets the stop-on_error option for the device engines. Value of
215+
"0" is for disable, otherwise enable.
216+
164217
What: /sys/kernel/debug/habanalabs/hl<n>/userptr
165218
Date: Jan 2019
166219
KernelVersion: 5.1
@@ -174,19 +227,4 @@ Date: Jan 2019
174227
KernelVersion: 5.1
175228
176229
Description: Displays a list with information about all the active virtual
177-
address mappings per ASID
178-
179-
What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
180-
Date: Mar 2020
181-
KernelVersion: 5.6
182-
183-
Description: Sets the stop-on_error option for the device engines. Value of
184-
"0" is for disable, otherwise enable.
185-
186-
What: /sys/kernel/debug/habanalabs/hl<n>/dump_security_violations
187-
Date: Jan 2021
188-
KernelVersion: 5.12
189-
190-
Description: Dumps all security violations to dmesg. This will also ack
191-
all security violations meanings those violations will not be
192-
dumped next time user calls this API
230+
address mappings per ASID and all user mappings of HW blocks

0 commit comments

Comments
 (0)