Skip to content

Commit 95faf6b

Browse files
torvaldstorvalds
committed
Merge tag 'driver-core-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here is the big set of driver core changes for 5.16-rc1. All of these have been in linux-next for a while now with no reported problems. Included in here are: - big update and cleanup of the sysfs abi documentation files and scripts from Mauro. We are almost at the place where we can properly check that the running kernel's sysfs abi is documented fully. - firmware loader updates - dyndbg updates - kernfs cleanups and fixes from Christoph - device property updates - component fix - other minor driver core cleanups and fixes" * tag 'driver-core-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (122 commits) device property: Drop redundant NULL checks x86/build: Tuck away built-in firmware under FW_LOADER vmlinux.lds.h: wrap built-in firmware support under FW_LOADER firmware_loader: move struct builtin_fw to the only place used x86/microcode: Use the firmware_loader built-in API firmware_loader: remove old DECLARE_BUILTIN_FIRMWARE() firmware_loader: formalize built-in firmware API component: do not leave master devres group open after bind dyndbg: refine verbosity 1-4 summary-detail gpiolib: acpi: Replace custom code with device_match_acpi_handle() i2c: acpi: Replace custom function with device_match_acpi_handle() driver core: Provide device_match_acpi_handle() helper dyndbg: fix spurious vNpr_info change dyndbg: no vpr-info on empty queries dyndbg: vpr-info on remove-module complete, not starting device property: Add missed header in fwnode.h Documentation: dyndbg: Improve cli param examples dyndbg: Remove support for ddebug_query param dyndbg: make dyndbg a known cli param dyndbg: show module in vpr-info in dd-exec-queries ...
2 parents 5c904c6 + 27e0bcd commit 95faf6b

83 files changed

Lines changed: 2812 additions & 1264 deletions

Some content is hidden

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

‎Documentation/ABI/obsolete/o2cb‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
What: /sys/o2cb
2+
Date: Dec 2005
3+
KernelVersion: 2.6.16
4+
Contact: ocfs2-devel@oss.oracle.com
5+
Description: Ocfs2-tools looks at 'interface-revision' for versioning
6+
information. Each logmask/ file controls a set of debug prints
7+
and can be written into with the strings "allow", "deny", or
8+
"off". Reading the file returns the current state.
9+
Was renamed to /sys/fs/u2cb/
10+
Users: ocfs2-tools. It's sufficient to mail proposed changes to
11+
ocfs2-devel@oss.oracle.com.

‎Documentation/ABI/obsolete/sysfs-bus-iio‎

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

77
Since Kernel 5.11, multiple buffers are supported.
88
so, it is better to use, instead:
9+
910
/sys/bus/iio/devices/iio:deviceX/bufferY/length
1011

1112
What: /sys/bus/iio/devices/iio:deviceX/buffer/enable
@@ -17,6 +18,7 @@ Description:
1718

1819
Since Kernel 5.11, multiple buffers are supported.
1920
so, it is better to use, instead:
21+
2022
/sys/bus/iio/devices/iio:deviceX/bufferY/enable
2123

2224
What: /sys/bus/iio/devices/iio:deviceX/scan_elements
@@ -165,6 +167,7 @@ Description:
165167

166168
Since Kernel 5.11, multiple buffers are supported.
167169
so, it is better to use, instead:
170+
168171
/sys/bus/iio/devices/iio:deviceX/bufferY/watermark
169172

170173
What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available
@@ -179,4 +182,5 @@ Description:
179182

180183
Since Kernel 5.11, multiple buffers are supported.
181184
so, it is better to use, instead:
185+
182186
/sys/bus/iio/devices/iio:deviceX/bufferY/data_available

‎Documentation/ABI/stable/o2cb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/fs/o2cb/ (was /sys/o2cb)
1+
What: /sys/fs/o2cb/
22
Date: Dec 2005
33
KernelVersion: 2.6.16
44
Contact: ocfs2-devel@oss.oracle.com

‎Documentation/ABI/stable/sysfs-class-infiniband‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ Description: The RoCE type of the associated GID resides at index <gid-index>.
232232
or "RoCE v2" for RoCE v2 based GIDs.
233233

234234

235-
What: /sys/class/infiniband_mad/umadN/ibdev
236-
What: /sys/class/infiniband_mad/umadN/port
237-
What: /sys/class/infiniband_mad/issmN/ibdev
238-
What: /sys/class/infiniband_mad/issmN/port
235+
What: /sys/class/infiniband_mad/umad<N>/ibdev
236+
What: /sys/class/infiniband_mad/umad<N>/port
237+
What: /sys/class/infiniband_mad/issm<N>/ibdev
238+
What: /sys/class/infiniband_mad/issm<N>/port
239239
Date: Apr, 2005
240240
KernelVersion: v2.6.12
241241
Contact: linux-rdma@vger.kernel.org
@@ -261,8 +261,8 @@ Description:
261261
userspace ABI compatibility of umad & issm devices.
262262

263263

264-
What: /sys/class/infiniband_verbs/uverbsN/ibdev
265-
What: /sys/class/infiniband_verbs/uverbsN/abi_version
264+
What: /sys/class/infiniband_verbs/uverbs<N>/ibdev
265+
What: /sys/class/infiniband_verbs/uverbs<N>/abi_version
266266
Date: Sept, 2005
267267
KernelVersion: v2.6.14
268268
Contact: linux-rdma@vger.kernel.org
@@ -471,7 +471,7 @@ Description:
471471
=============== ======================================================
472472

473473

474-
What: /sys/class/infiniband/qibX/ports/N/sl2vl/[0-15]
474+
What: /sys/class/infiniband/qibX/ports/<N>/sl2vl/[0-15]
475475
Date: May, 2010
476476
KernelVersion: v2.6.35
477477
Contact: linux-rdma@vger.kernel.org
@@ -480,8 +480,8 @@ Description:
480480
the Service Level (SL). Listing the SL files returns the Virtual
481481
Lane (VL) as programmed by the SL.
482482

483-
What: /sys/class/infiniband/qibX/ports/N/CCMgtA/cc_settings_bin
484-
What: /sys/class/infiniband/qibX/ports/N/CCMgtA/cc_table_bin
483+
What: /sys/class/infiniband/qibX/ports/<N>/CCMgtA/cc_settings_bin
484+
What: /sys/class/infiniband/qibX/ports/<N>/CCMgtA/cc_table_bin
485485
Date: May, 2010
486486
KernelVersion: v2.6.35
487487
Contact: linux-rdma@vger.kernel.org
@@ -499,11 +499,11 @@ Description:
499499
delay.
500500
=============== ================================================
501501

502-
What: /sys/class/infiniband/qibX/ports/N/linkstate/loopback
503-
What: /sys/class/infiniband/qibX/ports/N/linkstate/led_override
504-
What: /sys/class/infiniband/qibX/ports/N/linkstate/hrtbt_enable
505-
What: /sys/class/infiniband/qibX/ports/N/linkstate/status
506-
What: /sys/class/infiniband/qibX/ports/N/linkstate/status_str
502+
What: /sys/class/infiniband/qibX/ports/<N>/linkstate/loopback
503+
What: /sys/class/infiniband/qibX/ports/<N>/linkstate/led_override
504+
What: /sys/class/infiniband/qibX/ports/<N>/linkstate/hrtbt_enable
505+
What: /sys/class/infiniband/qibX/ports/<N>/linkstate/status
506+
What: /sys/class/infiniband/qibX/ports/<N>/linkstate/status_str
507507
Date: May, 2010
508508
KernelVersion: v2.6.35
509509
Contact: linux-rdma@vger.kernel.org
@@ -523,16 +523,16 @@ Description:
523523
"Fatal_Hardware_Error".
524524
=============== ===============================================
525525

526-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/rc_resends
527-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/seq_naks
528-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/rdma_seq
529-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/rnr_naks
530-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/other_naks
531-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/rc_timeouts
532-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/look_pkts
533-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/pkt_drops
534-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/dma_wait
535-
What: /sys/class/infiniband/qibX/ports/N/diag_counters/unaligned
526+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rc_resends
527+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/seq_naks
528+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rdma_seq
529+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rnr_naks
530+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/other_naks
531+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rc_timeouts
532+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/look_pkts
533+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/pkt_drops
534+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/dma_wait
535+
What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/unaligned
536536
Date: May, 2010
537537
KernelVersion: v2.6.35
538538
Contact: linux-rdma@vger.kernel.org
@@ -650,9 +650,9 @@ Description:
650650
=============== =============================================
651651

652652

653-
What: /sys/class/infiniband/hfi1_X/ports/N/CCMgtA/cc_settings_bin
654-
What: /sys/class/infiniband/hfi1_X/ports/N/CCMgtA/cc_table_bin
655-
What: /sys/class/infiniband/hfi1_X/ports/N/CCMgtA/cc_prescan
653+
What: /sys/class/infiniband/hfi1_X/ports/<N>/CCMgtA/cc_settings_bin
654+
What: /sys/class/infiniband/hfi1_X/ports/<N>/CCMgtA/cc_table_bin
655+
What: /sys/class/infiniband/hfi1_X/ports/<N>/CCMgtA/cc_prescan
656656
Date: May, 2016
657657
KernelVersion: v4.6
658658
Contact: linux-rdma@vger.kernel.org
@@ -675,9 +675,9 @@ Description:
675675
disable.
676676
=============== ================================================
677677

678-
What: /sys/class/infiniband/hfi1_X/ports/N/sc2vl/[0-31]
679-
What: /sys/class/infiniband/hfi1_X/ports/N/sl2sc/[0-31]
680-
What: /sys/class/infiniband/hfi1_X/ports/N/vl2mtu/[0-15]
678+
What: /sys/class/infiniband/hfi1_X/ports/<N>/sc2vl/[0-31]
679+
What: /sys/class/infiniband/hfi1_X/ports/<N>/sl2sc/[0-31]
680+
What: /sys/class/infiniband/hfi1_X/ports/<N>/vl2mtu/[0-15]
681681
Date: May, 2016
682682
KernelVersion: v4.6
683683
Contact: linux-rdma@vger.kernel.org
@@ -691,8 +691,8 @@ Description:
691691
=============== ===================================================
692692

693693

694-
What: /sys/class/infiniband/hfi1_X/sdma_N/cpu_list
695-
What: /sys/class/infiniband/hfi1_X/sdma_N/vl
694+
What: /sys/class/infiniband/hfi1_X/sdma_<N>/cpu_list
695+
What: /sys/class/infiniband/hfi1_X/sdma_<N>/vl
696696
Date: Sept, 2016
697697
KernelVersion: v4.8
698698
Contact: linux-rdma@vger.kernel.org

‎Documentation/ABI/stable/sysfs-class-tpm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Description: The "tpm_version_major" property shows the TCG spec major version
195195

196196
2
197197

198-
What: /sys/class/tpm/tpmX/pcr-H/N
198+
What: /sys/class/tpm/tpmX/pcr-<H>/<N>
199199
Date: March 2021
200200
KernelVersion: 5.12
201201
Contact: linux-integrity@vger.kernel.org

‎Documentation/ABI/stable/sysfs-devices‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,10 @@ Contact: Device Tree mailing list <devicetree@vger.kernel.org>
2323
Description:
2424
If CONFIG_OF is enabled, then this file is present. When
2525
read, it returns full name of the device node.
26+
27+
What: /sys/devices/*/dev
28+
Date: Jun 2006
29+
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
30+
Description:
31+
Major and minor numbers of the character device corresponding
32+
to the device (in <major>:<minor> format).

‎Documentation/ABI/stable/sysfs-module‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
What: /sys/module
2-
Description:
3-
The /sys/module tree consists of the following structure:
1+
The /sys/module tree consists of the following structure:
42

5-
/sys/module/MODULENAME
3+
What: /sys/module/<MODULENAME>
4+
Description:
65
The name of the module that is in the kernel. This
76
module name will always show up if the module is loaded as a
87
dynamic module. If it is built directly into the kernel, it
@@ -12,7 +11,8 @@ Description:
1211
Note: The conditions of creation in the built-in case are not
1312
by design and may be removed in the future.
1413

15-
/sys/module/MODULENAME/parameters
14+
What: /sys/module/<MODULENAME>/parameters
15+
Description:
1616
This directory contains individual files that are each
1717
individual parameters of the module that are able to be
1818
changed at runtime. See the individual module
@@ -25,10 +25,23 @@ Description:
2525
individual driver documentation for details as to the
2626
stability of the different parameters.
2727

28-
/sys/module/MODULENAME/refcnt
28+
What: /sys/module/<MODULENAME>/refcnt
29+
Description:
2930
If the module is able to be unloaded from the kernel, this file
3031
will contain the current reference count of the module.
3132

3233
Note: If the module is built into the kernel, or if the
3334
CONFIG_MODULE_UNLOAD kernel configuration value is not enabled,
3435
this file will not be present.
36+
37+
What: /sys/module/<MODULENAME>/srcversion
38+
Date: Jun 2005
39+
Description:
40+
If the module source has MODULE_VERSION, this file will contain
41+
the checksum of the the source code.
42+
43+
What: /sys/module/<MODULENAME>/version
44+
Date: Jun 2005
45+
Description:
46+
If the module source has MODULE_VERSION, this file will contain
47+
the version of the source code.

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

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,29 @@ KernelVersion: 4.14
44
Description:
55
The attributes:
66

7-
========== ===================================
8-
c_chmask capture channel mask
9-
c_srate capture sampling rate
10-
c_ssize capture sample size (bytes)
11-
c_mute_present capture mute control enable
7+
===================== =======================================
8+
c_chmask capture channel mask
9+
c_srate capture sampling rate
10+
c_ssize capture sample size (bytes)
11+
c_mute_present capture mute control enable
1212
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)
16-
p_chmask playback channel mask
17-
p_srate playback sampling rate
18-
p_ssize playback sample size (bytes)
19-
p_mute_present playback mute control enable
13+
c_volume_min capture volume control min value
14+
(in 1/256 dB)
15+
c_volume_max capture volume control max value
16+
(in 1/256 dB)
17+
c_volume_res capture volume control resolution
18+
(in 1/256 dB)
19+
p_chmask playback channel mask
20+
p_srate playback sampling rate
21+
p_ssize playback sample size (bytes)
22+
p_mute_present playback mute control enable
2023
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)
24-
req_number the number of pre-allocated request
25-
for both capture and playback
26-
========== ===================================
24+
p_volume_min playback volume control min value
25+
(in 1/256 dB)
26+
p_volume_max playback volume control max value
27+
(in 1/256 dB)
28+
p_volume_res playback volume control resolution
29+
(in 1/256 dB)
30+
req_number the number of pre-allocated request
31+
for both capture and playback
32+
===================== =======================================

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

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,30 @@ KernelVersion: 3.18
44
Description:
55
The attributes:
66

7-
========= ============================
8-
c_chmask capture channel mask
9-
c_srate capture sampling rate
10-
c_ssize capture sample size (bytes)
11-
c_sync capture synchronization type (async/adaptive)
12-
c_mute_present capture mute control enable
7+
===================== =======================================
8+
c_chmask capture channel mask
9+
c_srate capture sampling rate
10+
c_ssize capture sample size (bytes)
11+
c_sync capture synchronization type
12+
(async/adaptive)
13+
c_mute_present capture mute control enable
1314
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)
17-
fb_max maximum extra bandwidth in async mode
18-
p_chmask playback channel mask
19-
p_srate playback sampling rate
20-
p_ssize playback sample size (bytes)
21-
p_mute_present playback mute control enable
15+
c_volume_min capture volume control min value
16+
(in 1/256 dB)
17+
c_volume_max capture volume control max value
18+
(in 1/256 dB)
19+
c_volume_res capture volume control resolution
20+
(in 1/256 dB)
21+
fb_max maximum extra bandwidth in async mode
22+
p_chmask playback channel mask
23+
p_srate playback sampling rate
24+
p_ssize playback sample size (bytes)
25+
p_mute_present playback mute control enable
2226
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)
26-
========= ============================
27+
p_volume_min playback volume control min value
28+
(in 1/256 dB)
29+
p_volume_max playback volume control max value
30+
(in 1/256 dB)
31+
p_volume_res playback volume control resolution
32+
(in 1/256 dB)
33+
===================== =======================================

‎Documentation/ABI/testing/evm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
What: security/evm
1+
What: /sys/kernel/security/evm
2+
What: /sys/kernel/security/*/evm
23
Date: March 2011
34
Contact: Mimi Zohar <zohar@us.ibm.com>
45
Description:
@@ -93,7 +94,7 @@ Description:
9394
core/ima-setup) have support for loading keys at boot
9495
time.
9596

96-
What: security/integrity/evm/evm_xattrs
97+
What: /sys/kernel/security/*/evm/evm_xattrs
9798
Date: April 2018
9899
Contact: Matthew Garrett <mjg59@google.com>
99100
Description:

0 commit comments

Comments
 (0)