Skip to content

Commit 651a887

Browse files
committed
Merge branch 'topic/cs35l41' into for-next
Pull CS35L41 codec updates Signed-off-by: Takashi Iwai <tiwai@suse.de>
2 parents 1b6a6fc + bb06c20 commit 651a887

13,456 files changed

Lines changed: 1062816 additions & 326384 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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
7070
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
7171
Brian Avery <b.avery@hp.com>
7272
Brian King <brking@us.ibm.com>
73+
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
74+
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
7375
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
7476
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
7577
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -79,6 +81,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
7981
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
8082
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
8183
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
84+
Christian Brauner <brauner@kernel.org> <christian@brauner.io>
85+
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
86+
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
8287
Christophe Ricard <christophe.ricard@gmail.com>
8388
Christoph Hellwig <hch@lst.de>
8489
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
@@ -183,6 +188,8 @@ Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
183188
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
184189
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz>
185190
Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
191+
Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
192+
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
186193
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
187194
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
188195
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
@@ -206,12 +213,14 @@ Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
206213
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
207214
Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
208215
Kenneth W Chen <kenneth.w.chen@intel.com>
216+
Kirill Tkhai <kirill.tkhai@openvz.org> <ktkhai@virtuozzo.com>
209217
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
210218
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
211219
Koushik <raghavendra.koushik@neterion.com>
212220
Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
213221
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
214222
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
223+
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
215224
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
216225
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
217226
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
@@ -329,6 +338,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
329338
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
330339
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
331340
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
341+
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
342+
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
343+
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
332344
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
333345
Rudolf Marek <R.Marek@sh.cvut.cz>
334346
Rui Saraiva <rmps@joel.ist.utl.pt>
@@ -379,6 +391,10 @@ Uwe Kleine-König <ukleinek@strlen.de>
379391
Uwe Kleine-König <ukl@pengutronix.de>
380392
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
381393
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>
382398
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
383399
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
384400
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

CREDITS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,12 @@ S: 3000 FORE Drive
895895
S: Warrendale, Pennsylvania 15086
896896
S: USA
897897

898+
N: Ludovic Desroches
899+
E: ludovic.desroches@microchip.com
900+
D: Maintainer for ARM/Microchip (AT91) SoC support
901+
D: Author of ADC, pinctrl, XDMA and SDHCI drivers for this platform
902+
S: France
903+
898904
N: Martin Devera
899905
E: devik@cdi.cz
900906
W: http://luxik.cdi.cz/~devik/qos/
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 <pali@kernel.org>
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
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 <bp@suse.de>
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+
Contact: linux-block@vger.kernel.org
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+
Contact: linux-block@vger.kernel.org
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+
Contact: linux-block@vger.kernel.org
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+
Contact: linux-block@vger.kernel.org
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
Contact: linux-block@vger.kernel.org

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" <ronak.jain@xilinx.com>
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" <ronak.jain@xilinx.com>
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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Description:
66

77
===================== =======================================
88
c_chmask capture channel mask
9-
c_srate capture sampling rate
9+
c_srate list of capture sampling rates (comma-separated)
1010
c_ssize capture sample size (bytes)
1111
c_mute_present capture mute control enable
1212
c_volume_present capture volume control enable
@@ -17,7 +17,7 @@ Description:
1717
c_volume_res capture volume control resolution
1818
(in 1/256 dB)
1919
p_chmask playback channel mask
20-
p_srate playback sampling rate
20+
p_srate list of playback sampling rates (comma-separated)
2121
p_ssize playback sample size (bytes)
2222
p_mute_present playback mute control enable
2323
p_volume_present playback volume control enable
@@ -29,4 +29,5 @@ Description:
2929
(in 1/256 dB)
3030
req_number the number of pre-allocated requests
3131
for both capture and playback
32+
function_name name of the interface
3233
===================== =======================================

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ Description:
66

77
===================== =======================================
88
c_chmask capture channel mask
9-
c_srate capture sampling rate
9+
c_srate list of capture sampling rates (comma-separated)
1010
c_ssize capture sample size (bytes)
11+
c_hs_bint capture bInterval for HS/SS (1-4: fixed, 0: auto)
1112
c_sync capture synchronization type
1213
(async/adaptive)
1314
c_mute_present capture mute control enable
@@ -20,8 +21,9 @@ Description:
2021
(in 1/256 dB)
2122
fb_max maximum extra bandwidth in async mode
2223
p_chmask playback channel mask
23-
p_srate playback sampling rate
24+
p_srate list of playback sampling rates (comma-separated)
2425
p_ssize playback sample size (bytes)
26+
p_hs_bint playback bInterval for HS/SS (1-4: fixed, 0: auto)
2527
p_mute_present playback mute control enable
2628
p_volume_present playback volume control enable
2729
p_volume_min playback volume control min value
@@ -32,4 +34,5 @@ Description:
3234
(in 1/256 dB)
3335
req_number the number of pre-allocated requests
3436
for both capture and playback
37+
function_name name of the interface
3538
===================== =======================================

0 commit comments

Comments
 (0)