Skip to content

Commit 8bb5e7f

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.20 (or 6.0) merge window.
2 parents 2a96271 + 7c744d0 commit 8bb5e7f

File tree

22,173 files changed

+2136128
-598376
lines changed

Some content is hidden

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

22,173 files changed

+2136128
-598376
lines changed

.clang-format

Lines changed: 170 additions & 48 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
*.symversions
4646
*.tab.[ch]
4747
*.tar
48+
*.usyms
4849
*.xz
4950
*.zst
5051
Module.symvers

.mailmap

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
# Please keep this list dictionary sorted.
1111
#
1212
Aaron Durbin <[email protected]>
13+
14+
1315
1416
Adam Oldham <[email protected]>
1517
Adam Radford <[email protected]>
@@ -45,6 +47,7 @@ Andrey Konovalov <[email protected]> <[email protected]>
4547
4648
4749
50+
4851
Andy Adamson <[email protected]>
4952
5053
@@ -71,6 +74,7 @@ Boris Brezillon <[email protected]> <[email protected]>
7174
Brian Avery <[email protected]>
7275
Brian King <[email protected]>
7376
77+
7478
7579
7680
@@ -83,6 +87,7 @@ Christian Borntraeger <[email protected]> <[email protected]>
8387
8488
8589
90+
Christian Marangi <[email protected]>
8691
Christophe Ricard <[email protected]>
8792
Christoph Hellwig <[email protected]>
8893
@@ -163,6 +168,7 @@ Jan Glauber <[email protected]> <[email protected]>
163168
164169
165170
171+
166172
167173
168174
@@ -199,10 +205,13 @@ Jordan Crouse <[email protected]> <[email protected]>
199205
200206
201207
208+
209+
202210
Juha Yrjola <at solidboot.com>
203211
Juha Yrjola <[email protected]>
204212
Juha Yrjola <[email protected]>
205213
214+
206215
207216
Kay Sievers <[email protected]>
208217
@@ -212,6 +221,7 @@ Kees Cook <[email protected]> <[email protected]>
212221
213222
214223
Kenneth W Chen <[email protected]>
224+
215225
Konstantin Khlebnikov <[email protected]> <[email protected]>
216226
Konstantin Khlebnikov <[email protected]> <[email protected]>
217227
@@ -232,6 +242,7 @@ Linus Lüssing <[email protected]> <[email protected]>
232242
233243
234244
245+
235246
236247
237248
@@ -247,6 +258,7 @@ Mark Yao <[email protected]> <[email protected]>
247258
248259
249260
261+
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
250262
Mathieu Othacehe <[email protected]>
251263
252264
@@ -389,6 +401,11 @@ Uwe Kleine-König <[email protected]>
389401
Uwe Kleine-König <[email protected]>
390402
Uwe Kleine-König <[email protected]>
391403
Valdis Kletnieks <[email protected]>
404+
405+
406+
407+
408+
Valentin Schneider <[email protected]> <[email protected]>
392409
393410
394411

Documentation/ABI/obsolete/procfs-i8k

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /proc/i8k
2+
Date: November 2001
3+
KernelVersion: 2.4.14
4+
Contact: Pali Rohár <[email protected]>
5+
Description: Legacy interface for getting/setting sensor information like
6+
fan speed, temperature, serial number, hotkey status etc
7+
on Dell Laptops.
8+
Since the driver is now using the standard hwmon sysfs interface,
9+
the procfs interface is deprecated.
10+
Users: https://github.com/vitorafsr/i8kutils

Documentation/ABI/removed/sysfs-mce

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
What: /sys/devices/system/machinecheck/machinecheckX/tolerant
2+
Contact: Borislav Petkov <[email protected]>
3+
Date: Dec, 2021
4+
Description:
5+
Unused and obsolete after the advent of recoverable machine
6+
checks (see last sentence below) and those are present since
7+
2010 (Nehalem).
8+
9+
Original description:
10+
11+
The entries appear for each CPU, but they are truly shared
12+
between all CPUs.
13+
14+
Tolerance level. When a machine check exception occurs for a
15+
non corrected machine check the kernel can take different
16+
actions.
17+
18+
Since machine check exceptions can happen any time it is
19+
sometimes risky for the kernel to kill a process because it
20+
defies normal kernel locking rules. The tolerance level
21+
configures how hard the kernel tries to recover even at some
22+
risk of deadlock. Higher tolerant values trade potentially
23+
better uptime with the risk of a crash or even corruption
24+
(for tolerant >= 3).
25+
26+
== ===========================================================
27+
0 always panic on uncorrected errors, log corrected errors
28+
1 panic or SIGBUS on uncorrected errors, log corrected errors
29+
2 SIGBUS or log uncorrected errors, log corrected errors
30+
3 never panic or SIGBUS, log all errors (for testing only)
31+
== ===========================================================
32+
33+
Default: 1
34+
35+
Note this only makes a difference if the CPU allows recovery
36+
from a machine check exception. Current x86 CPUs generally
37+
do not.

Documentation/ABI/stable/sysfs-block

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,55 @@ Description:
155155
last zone of the device which may be smaller.
156156

157157

158+
What: /sys/block/<disk>/queue/crypto/
159+
Date: February 2022
160+
161+
Description:
162+
The presence of this subdirectory of /sys/block/<disk>/queue/
163+
indicates that the device supports inline encryption. This
164+
subdirectory contains files which describe the inline encryption
165+
capabilities of the device. For more information about inline
166+
encryption, refer to Documentation/block/inline-encryption.rst.
167+
168+
169+
What: /sys/block/<disk>/queue/crypto/max_dun_bits
170+
Date: February 2022
171+
172+
Description:
173+
[RO] This file shows the maximum length, in bits, of data unit
174+
numbers accepted by the device in inline encryption requests.
175+
176+
177+
What: /sys/block/<disk>/queue/crypto/modes/<mode>
178+
Date: February 2022
179+
180+
Description:
181+
[RO] For each crypto mode (i.e., encryption/decryption
182+
algorithm) the device supports with inline encryption, a file
183+
will exist at this location. It will contain a hexadecimal
184+
number that is a bitmask of the supported data unit sizes, in
185+
bytes, for that crypto mode.
186+
187+
Currently, the crypto modes that may be supported are:
188+
189+
* AES-256-XTS
190+
* AES-128-CBC-ESSIV
191+
* Adiantum
192+
193+
For example, if a device supports AES-256-XTS inline encryption
194+
with data unit sizes of 512 and 4096 bytes, the file
195+
/sys/block/<disk>/queue/crypto/modes/AES-256-XTS will exist and
196+
will contain "0x1200".
197+
198+
199+
What: /sys/block/<disk>/queue/crypto/num_keyslots
200+
Date: February 2022
201+
202+
Description:
203+
[RO] This file shows the number of keyslots the device has for
204+
use with inline encryption.
205+
206+
158207
What: /sys/block/<disk>/queue/dax
159208
Date: June 2016
160209

Documentation/ABI/stable/sysfs-bus-mhi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,13 @@ Description: The file holds the OEM PK Hash value of the endpoint device
1919
read without having the device power on at least once, the file
2020
will read all 0's.
2121
Users: Any userspace application or clients interested in device info.
22+
23+
What: /sys/bus/mhi/devices/.../soc_reset
24+
Date: April 2022
25+
KernelVersion: 5.19
26+
27+
Description: Initiates a SoC reset on the MHI controller. A SoC reset is
28+
a reset of last resort, and will require a complete re-init.
29+
This can be useful as a method of recovery if the device is
30+
non-responsive, or as a means of loading new firmware as a
31+
system administration task.

Documentation/ABI/stable/sysfs-devices-system-cpu

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ What: /sys/devices/system/cpu/cpuX/topology/die_cpus
8686
Description: internal kernel map of CPUs within the same die.
8787
Values: hexadecimal bitmask.
8888

89+
What: /sys/devices/system/cpu/cpuX/topology/ppin
90+
Description: per-socket protected processor inventory number
91+
Values: hexadecimal.
92+
8993
What: /sys/devices/system/cpu/cpuX/topology/die_cpus_list
9094
Description: human-readable list of CPUs within the same die.
9195
The format is like 0-3, 8-11, 14,17.

Documentation/ABI/stable/sysfs-driver-firmware-zynqmp

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,144 @@ Description:
113113
# echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/health_status
114114

115115
Users: Xilinx
116+
117+
What: /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
118+
Date: Feb 2022
119+
KernelVersion: 5.18
120+
Contact: "Ronak Jain" <[email protected]>
121+
Description:
122+
This sysfs interface allows user to configure features at
123+
runtime. The user can enable or disable features running at
124+
firmware as well as the user can configure the parameters of
125+
the features at runtime. The supported features are over
126+
temperature and external watchdog. Here, the external watchdog
127+
is completely different than the /dev/watchdog as the external
128+
watchdog is running on the firmware and it is used to monitor
129+
the health of firmware not APU(Linux). Also, the external
130+
watchdog is interfaced outside of the zynqmp soc.
131+
132+
The supported config ids are for the feature configuration is,
133+
1. PM_FEATURE_OVERTEMP_STATUS = 1, the user can enable or
134+
disable the over temperature feature.
135+
2. PM_FEATURE_OVERTEMP_VALUE = 2, the user can configure the
136+
over temperature limit in Degree Celsius.
137+
3. PM_FEATURE_EXTWDT_STATUS = 3, the user can enable or disable
138+
the external watchdog feature.
139+
4. PM_FEATURE_EXTWDT_VALUE = 4, the user can configure the
140+
external watchdog feature.
141+
142+
Usage:
143+
144+
Select over temperature config ID to enable/disable feature
145+
# echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
146+
147+
Check over temperature config ID is selected or not
148+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
149+
The expected result is 1.
150+
151+
Select over temperature config ID to configure OT limit
152+
# echo 2 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
153+
154+
Check over temperature config ID is selected or not
155+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
156+
The expected result is 2.
157+
158+
Select external watchdog config ID to enable/disable feature
159+
# echo 3 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
160+
161+
Check external watchdog config ID is selected or not
162+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
163+
The expected result is 3.
164+
165+
Select external watchdog config ID to configure time interval
166+
# echo 4 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
167+
168+
Check external watchdog config ID is selected or not
169+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
170+
The expected result is 4.
171+
172+
Users: Xilinx
173+
174+
What: /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
175+
Date: Feb 2022
176+
KernelVersion: 5.18
177+
Contact: "Ronak Jain" <[email protected]>
178+
Description:
179+
This sysfs interface allows to configure features at runtime.
180+
The user can enable or disable features running at firmware.
181+
Also, the user can configure the parameters of the features
182+
at runtime. The supported features are over temperature and
183+
external watchdog. Here, the external watchdog is completely
184+
different than the /dev/watchdog as the external watchdog is
185+
running on the firmware and it is used to monitor the health
186+
of firmware not APU(Linux). Also, the external watchdog is
187+
interfaced outside of the zynqmp soc.
188+
189+
By default the features are disabled in the firmware. The user
190+
can enable features by querying appropriate config id of the
191+
features.
192+
193+
The default limit for the over temperature is 90 Degree Celsius.
194+
The default timer interval for the external watchdog is 570ms.
195+
196+
The supported config ids are for the feature configuration is,
197+
1. PM_FEATURE_OVERTEMP_STATUS = 1, the user can enable or
198+
disable the over temperature feature.
199+
2. PM_FEATURE_OVERTEMP_VALUE = 2, the user can configure the
200+
over temperature limit in Degree Celsius.
201+
3. PM_FEATURE_EXTWDT_STATUS = 3, the user can enable or disable
202+
the external watchdog feature.
203+
4. PM_FEATURE_EXTWDT_VALUE = 4, the user can configure the
204+
external watchdog feature.
205+
206+
Usage:
207+
208+
Enable over temperature feature
209+
# echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
210+
# echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
211+
212+
Check whether the over temperature feature is enabled or not
213+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
214+
The expected result is 1.
215+
216+
Disable over temperature feature
217+
# echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
218+
# echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
219+
220+
Check whether the over temperature feature is disabled or not
221+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
222+
The expected result is 0.
223+
224+
Configure over temperature limit to 50 Degree Celsius
225+
# echo 2 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
226+
# echo 50 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
227+
228+
Check whether the over temperature limit is configured or not
229+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
230+
The expected result is 50.
231+
232+
Enable external watchdog feature
233+
# echo 3 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
234+
# echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
235+
236+
Check whether the external watchdog feature is enabled or not
237+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
238+
The expected result is 1.
239+
240+
Disable external watchdog feature
241+
# echo 3 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
242+
# echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
243+
244+
Check whether the external watchdog feature is disabled or not
245+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
246+
The expected result is 0.
247+
248+
Configure external watchdog timer interval to 500ms
249+
# echo 4 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
250+
# echo 500 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
251+
252+
Check whether the external watchdog timer interval is configured or not
253+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
254+
The expected result is 500.
255+
256+
Users: Xilinx

0 commit comments

Comments
 (0)