Skip to content

Commit f3985f0

Browse files
ojedaojeda
authored
Merge pull request #500 from ojeda/sync
Sync with v5.15-rc3
2 parents f104b42 + 9c7427c commit f3985f0

File tree

10,726 files changed

+611783
-280999
lines changed

Some content is hidden

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

10,726 files changed

+611783
-280999
lines changed

‎.github/workflows/ci.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ jobs:
2222
# arm 32-bit gcc not yet supported
2323
- arch: arm
2424
toolchain: gcc
25+
# riscv64 debug (see #500 and #502).
26+
- arch: riscv64
27+
config: debug
2528
# Exclude `LLVM=1` where not supported.
2629
- arch: ppc64le
2730
toolchain: llvm
@@ -93,6 +96,7 @@ jobs:
9396
run: |
9497
echo 'MAKE_ARCH=ARCH=powerpc' >> $GITHUB_ENV
9598
echo 'MAKE_CROSS_COMPILE=CROSS_COMPILE=powerpc64le-linux-gnu-' >> $GITHUB_ENV
99+
echo 'MAKE_LLVM_IAS=LLVM_IAS=0' >> $GITHUB_ENV
96100
echo 'IMAGE_PATH=vmlinux' >> $GITHUB_ENV
97101
echo 'QEMU_ARCH=ppc64' >> $GITHUB_ENV
98102
echo 'QEMU_MACHINE=pseries' >> $GITHUB_ENV
@@ -250,7 +254,7 @@ jobs:
250254
mv .config ${{ env.BUILD_DIR }}.config
251255
sed -i 's:samples/rust/:${{ env.BUILD_DIR }}samples/rust/:' .github/workflows/qemu-initramfs.desc
252256
253-
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3
257+
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_LLVM_IAS }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3
254258

255259
# Run
256260
- run: ${{ env.BUILD_DIR }}usr/gen_init_cpio .github/workflows/qemu-initramfs.desc > qemu-initramfs.img
@@ -393,16 +397,16 @@ jobs:
393397
${{ env.BUILD_DIR }}vmlinux
394398
395399
# Clippy
396-
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 CLIPPY=1
400+
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_LLVM_IAS }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 CLIPPY=1
397401

398402
# Docs
399-
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 rustdoc
403+
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_LLVM_IAS }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 rustdoc
400404

401405
# Tests
402-
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 rusttest
406+
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_LLVM_IAS }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 rusttest
403407

404408
# Formatting
405-
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 rustfmtcheck
409+
- run: make ${{ env.MAKE_ARCH }} ${{ env.MAKE_CROSS_COMPILE }} ${{ env.MAKE_LLVM_IAS }} ${{ env.MAKE_TOOLCHAIN }} ${{ env.MAKE_OUTPUT }} ${{ env.MAKE_SYSROOT }} -j3 rustfmtcheck
406410

407411
# View changes to ccache
408412
- run: ccache -s

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ Matthew Wilcox <[email protected]> <[email protected]>
229229
Matthew Wilcox <[email protected]> <[email protected]>
230230
Matthew Wilcox <[email protected]> <[email protected]>
231231
Matthew Wilcox <[email protected]> <[email protected]>
232+
Matthias Fuchs <[email protected]> <[email protected]>
232233
Matthieu CASTET <[email protected]>
233234
Matt Ranostay <[email protected]> <[email protected]>
234235
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
@@ -341,6 +342,7 @@ Sumit Semwal <[email protected]>
341342
Takashi YOSHII <[email protected]>
342343
Tejun Heo <[email protected]>
343344
Thomas Graf <[email protected]>
345+
Thomas Körper <[email protected]> <[email protected]>
344346
Thomas Pedersen <[email protected]>
345347
Tiezhu Yang <[email protected]> <[email protected]>
346348
Todor Tomov <[email protected]> <[email protected]>

‎Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ Date: Aug 28, 2020
128128
KernelVersion: 5.10.0
129129
Contact: [email protected]
130130
Description: The last executed device administrative command's status/error.
131+
Also last configuration error overloaded.
132+
Writing to it will clear the status.
131133

132134
What: /sys/bus/dsa/devices/wq<m>.<n>/block_on_fault
133135
Date: Oct 27, 2020
@@ -211,6 +213,13 @@ Contact: [email protected]
211213
Description: Indicate whether ATS disable is turned on for the workqueue.
212214
0 indicates ATS is on, and 1 indicates ATS is off for the workqueue.
213215

216+
What: /sys/bus/dsa/devices/wq<m>.<n>/occupancy
217+
Date May 25, 2021
218+
KernelVersion: 5.14.0
219+
Contact: [email protected]
220+
Description: Show the current number of entries in this WQ if WQ Occupancy
221+
Support bit WQ capabilities is 1.
222+
214223
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
215224
Date: Oct 25, 2019
216225
KernelVersion: 5.6.0

‎Documentation/ABI/testing/configfs-usb-gadget-uac1

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,19 @@ Description:
88
c_chmask capture channel mask
99
c_srate capture sampling rate
1010
c_ssize capture sample size (bytes)
11+
c_mute_present capture mute control enable
12+
c_volume_present capture volume control enable
13+
c_volume_min capture volume control min value (in 1/256 dB)
14+
c_volume_max capture volume control max value (in 1/256 dB)
15+
c_volume_res capture volume control resolution (in 1/256 dB)
1116
p_chmask playback channel mask
1217
p_srate playback sampling rate
1318
p_ssize playback sample size (bytes)
19+
p_mute_present playback mute control enable
20+
p_volume_present playback volume control enable
21+
p_volume_min playback volume control min value (in 1/256 dB)
22+
p_volume_max playback volume control max value (in 1/256 dB)
23+
p_volume_res playback volume control resolution (in 1/256 dB)
1424
req_number the number of pre-allocated request
1525
for both capture and playback
1626
========== ===================================

‎Documentation/ABI/testing/configfs-usb-gadget-uac2

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,18 @@ Description:
99
c_srate capture sampling rate
1010
c_ssize capture sample size (bytes)
1111
c_sync capture synchronization type (async/adaptive)
12+
c_mute_present capture mute control enable
13+
c_volume_present capture volume control enable
14+
c_volume_min capture volume control min value (in 1/256 dB)
15+
c_volume_max capture volume control max value (in 1/256 dB)
16+
c_volume_res capture volume control resolution (in 1/256 dB)
1217
fb_max maximum extra bandwidth in async mode
1318
p_chmask playback channel mask
1419
p_srate playback sampling rate
1520
p_ssize playback sample size (bytes)
21+
p_mute_present playback mute control enable
22+
p_volume_present playback volume control enable
23+
p_volume_min playback volume control min value (in 1/256 dB)
24+
p_volume_max playback volume control max value (in 1/256 dB)
25+
p_volume_res playback volume control resolution (in 1/256 dB)
1626
========= ============================

‎Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,17 @@ Description: Sets the skip reset on timeout option for the device. Value of
215215
"0" means device will be reset in case some CS has timed out,
216216
otherwise it will not be reset.
217217

218+
What: /sys/kernel/debug/habanalabs/hl<n>/state_dump
219+
Date: Oct 2021
220+
KernelVersion: 5.15
221+
Contact: [email protected]
222+
Description: Gets the state dump occurring on a CS timeout or failure.
223+
State dump is used for debug and is created each time in case of
224+
a problem in a CS execution, before reset.
225+
Reading from the node returns the newest state dump available.
226+
Writing an integer X discards X state dumps, so that the
227+
next read would return X+1-st newest state dump.
228+
218229
What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
219230
Date: Mar 2020
220231
KernelVersion: 5.6
@@ -230,6 +241,14 @@ Description: Displays a list with information about the currently user
230241
pointers (user virtual addresses) that are pinned and mapped
231242
to DMA addresses
232243

244+
What: /sys/kernel/debug/habanalabs/hl<n>/userptr_lookup
245+
Date: Aug 2021
246+
KernelVersion: 5.15
247+
Contact: [email protected]
248+
Description: Allows to search for specific user pointers (user virtual
249+
addresses) that are pinned and mapped to DMA addresses, and see
250+
their resolution to the specific dma address.
251+
233252
What: /sys/kernel/debug/habanalabs/hl<n>/vm
234253
Date: Jan 2019
235254
KernelVersion: 5.1

‎Documentation/ABI/testing/dell-smbios-wmi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /dev/wmi/dell-smbios
22
Date: November 2017
33
KernelVersion: 4.15
4-
Contact: "Mario Limonciello" <mario.limonciello@dell.com>
4+
Contact: Dell.Client.Kernel@dell.com
55
Description:
66
Perform SMBIOS calls on supported Dell machines.
77
through the Dell ACPI-WMI interface.

‎Documentation/ABI/testing/ima_policy

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ Description:
2727
lsm: [[subj_user=] [subj_role=] [subj_type=]
2828
[obj_user=] [obj_role=] [obj_type=]]
2929
option: [[appraise_type=]] [template=] [permit_directio]
30-
[appraise_flag=] [keyrings=]
30+
[appraise_flag=] [appraise_algos=] [keyrings=]
3131
base:
3232
func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK][MODULE_CHECK]
33-
[FIRMWARE_CHECK]
33+
[FIRMWARE_CHECK]
3434
[KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK]
3535
[KEXEC_CMDLINE] [KEY_CHECK] [CRITICAL_DATA]
36+
[SETXATTR_CHECK]
3637
mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
3738
[[^]MAY_EXEC]
3839
fsmagic:= hex value
@@ -55,6 +56,10 @@ Description:
5556
label:= [selinux]|[kernel_info]|[data_label]
5657
data_label:= a unique string used for grouping and limiting critical data.
5758
For example, "selinux" to measure critical data for SELinux.
59+
appraise_algos:= comma-separated list of hash algorithms
60+
For example, "sha256,sha512" to only accept to appraise
61+
files where the security.ima xattr was hashed with one
62+
of these two algorithms.
5863

5964
default policy:
6065
# PROC_SUPER_MAGIC
@@ -134,3 +139,9 @@ Description:
134139
keys added to .builtin_trusted_keys or .ima keyring:
135140

136141
measure func=KEY_CHECK keyrings=.builtin_trusted_keys|.ima
142+
143+
Example of the special SETXATTR_CHECK appraise rule, that
144+
restricts the hash algorithms allowed when writing to the
145+
security.ima xattr of a file:
146+
147+
appraise func=SETXATTR_CHECK appraise_algos=sha256,sha384,sha512

‎Documentation/ABI/testing/sysfs-block

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,18 @@ Description:
2828
For more details refer Documentation/admin-guide/iostats.rst
2929

3030

31+
What: /sys/block/<disk>/diskseq
32+
Date: February 2021
33+
Contact: Matteo Croce <[email protected]>
34+
Description:
35+
The /sys/block/<disk>/diskseq files reports the disk
36+
sequence number, which is a monotonically increasing
37+
number assigned to every drive.
38+
Some devices, like the loop device, refresh such number
39+
every time the backing file is changed.
40+
The value type is 64 bit unsigned.
41+
42+
3143
What: /sys/block/<disk>/<part>/stat
3244
Date: February 2008
3345
Contact: Jerome Marchand <[email protected]>

‎Documentation/ABI/testing/sysfs-block-device

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,43 @@ Date: Oct, 2016
5555
KernelVersion: v4.10
5656
Contact: [email protected]
5757
Description:
58-
(RW) Write to the file to turn on or off the SATA ncq (native
59-
command queueing) support. By default this feature is turned
60-
off.
58+
(RW) Write to the file to turn on or off the SATA NCQ (native
59+
command queueing) priority support. By default this feature is
60+
turned off. If the device does not support the SATA NCQ
61+
priority feature, writing "1" to this file results in an error
62+
(see ncq_prio_supported).
63+
64+
65+
What: /sys/block/*/device/sas_ncq_prio_enable
66+
Date: Oct, 2016
67+
KernelVersion: v4.10
68+
Contact: [email protected]
69+
Description:
70+
(RW) This is the equivalent of the ncq_prio_enable attribute
71+
file for SATA devices connected to a SAS host-bus-adapter
72+
(HBA) implementing support for the SATA NCQ priority feature.
73+
This file does not exist if the HBA driver does not implement
74+
support for the SATA NCQ priority feature, regardless of the
75+
device support for this feature (see sas_ncq_prio_supported).
76+
77+
78+
What: /sys/block/*/device/ncq_prio_supported
79+
Date: Aug, 2021
80+
KernelVersion: v5.15
81+
Contact: [email protected]
82+
Description:
83+
(RO) Indicates if the device supports the SATA NCQ (native
84+
command queueing) priority feature.
85+
86+
87+
What: /sys/block/*/device/sas_ncq_prio_supported
88+
Date: Aug, 2021
89+
KernelVersion: v5.15
90+
Contact: [email protected]
91+
Description:
92+
(RO) This is the equivalent of the ncq_prio_supported attribute
93+
file for SATA devices connected to a SAS host-bus-adapter
94+
(HBA) implementing support for the SATA NCQ priority feature.
95+
This file does not exist if the HBA driver does not implement
96+
support for the SATA NCQ priority feature, regardless of the
97+
device support for this feature.

‎Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/bus/event_source/devices/uncore_*/alias
2+
Date: June 2021
3+
KernelVersion: 5.15
4+
Contact: Linux kernel mailing list <[email protected]>
5+
Description: Read-only. An attribute to describe the alias name of
6+
the uncore PMU if an alias exists on some platforms.
7+
The 'perf(1)' tool should treat both names the same.
8+
They both can be used to access the uncore PMU.
9+
10+
Example:
11+
12+
$ cat /sys/devices/uncore_cha_2/alias
13+
uncore_type_0_2

‎Documentation/ABI/testing/sysfs-bus-iio-chemical-sgp40

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/out_temp_raw
2+
Date: August 2021
3+
KernelVersion: 5.15
4+
Contact: Andreas Klinger <[email protected]>
5+
Description:
6+
Set the temperature. This value is sent to the sensor for
7+
temperature compensation.
8+
Default value: 25000 (25 °C)
9+
10+
What: /sys/bus/iio/devices/iio:deviceX/out_humidityrelative_raw
11+
Date: August 2021
12+
KernelVersion: 5.15
13+
Contact: Andreas Klinger <[email protected]>
14+
Description:
15+
Set the relative humidity. This value is sent to the sensor for
16+
humidity compensation.
17+
Default value: 50000 (50 % relative humidity)
18+
19+
What: /sys/bus/iio/devices/iio:deviceX/in_resistance_calibbias
20+
Date: August 2021
21+
KernelVersion: 5.15
22+
Contact: Andreas Klinger <[email protected]>
23+
Description:
24+
Set the bias value for the resistance which is used for
25+
calculation of in_concentration_input as follows:
26+
27+
x = (in_resistance_raw - in_resistance_calibbias) * 0.65
28+
29+
in_concentration_input = 500 / (1 + e^x)
30+
31+
Default value: 30000

‎Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,23 @@ Description:
121121
child buses, and re-discover devices removed earlier
122122
from this part of the device tree.
123123

124+
What: /sys/bus/pci/devices/.../reset_method
125+
Date: August 2021
126+
Contact: Amey Narkhede <[email protected]>
127+
Description:
128+
Some devices allow an individual function to be reset
129+
without affecting other functions in the same slot.
130+
131+
For devices that have this support, a file named
132+
reset_method is present in sysfs. Reading this file
133+
gives names of the supported and enabled reset methods and
134+
their ordering. Writing a space-separated list of names of
135+
reset methods sets the reset methods and ordering to be
136+
used when resetting the device. Writing an empty string
137+
disables the ability to reset the device. Writing
138+
"default" enables all supported reset methods in the
139+
default ordering.
140+
124141
What: /sys/bus/pci/devices/.../reset
125142
Date: July 2009
126143
Contact: Michael S. Tsirkin <[email protected]>

‎Documentation/ABI/testing/sysfs-bus-platform

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,17 @@ Description:
2828
value comes from an ACPI _PXM method or a similar firmware
2929
source. Initial users for this file would be devices like
3030
arm smmu which are populated by arm64 acpi_iort.
31+
32+
What: /sys/bus/platform/devices/.../msi_irqs/
33+
Date: August 2021
34+
Contact: Barry Song <[email protected]>
35+
Description:
36+
The /sys/devices/.../msi_irqs directory contains a variable set
37+
of files, with each file being named after a corresponding msi
38+
irq vector allocated to that device.
39+
40+
What: /sys/bus/platform/devices/.../msi_irqs/<N>
41+
Date: August 2021
42+
Contact: Barry Song <[email protected]>
43+
Description:
44+
This attribute will show "msi" if <N> is a valid msi irq

‎Documentation/ABI/testing/sysfs-bus-thunderbolt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Description: When new NVM image is written to the non-active NVM
232232
What: /sys/bus/thunderbolt/devices/.../nvm_authenticate_on_disconnect
233233
Date: Oct 2020
234234
KernelVersion: v5.9
235-
Contact: Mario Limonciello <mario.limonciello@dell.com>
235+
Contact: Mario Limonciello <mario.limonciello@outlook.com>
236236
Description: For supported devices, automatically authenticate the new Thunderbolt
237237
image when the device is disconnected from the host system.
238238

0 commit comments

Comments
 (0)