Skip to content

Commit 6b93f35

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.8/amd-sfh' into for-linus
- addition of new interfaces to export User presence information and Ambient light from amd-sfh to other drivers within the kernel (Basavaraj Natikar)
2 parents b0a1fe4 + 584f35a commit 6b93f35

File tree

6,825 files changed

+222837
-138788
lines changed

Some content is hidden

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

6,825 files changed

+222837
-138788
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ modules.order
7474
#
7575
# RPM spec file (make rpm-pkg)
7676
#
77-
/kernel.spec
7877
/rpmbuild/
7978

8079
#

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Ben M Cahill <[email protected]>
9595
9696
9797
98+
9899
99100
100101
@@ -116,6 +117,7 @@ Changbin Du <[email protected]> <[email protected]>
116117
117118
118119
120+
119121
120122
121123
@@ -128,6 +130,7 @@ Christian Brauner <[email protected]> <[email protected]>
128130
Christian Marangi <[email protected]>
129131
Christophe Ricard <[email protected]>
130132
Christoph Hellwig <[email protected]>
133+
131134
132135
Corey Minyard <[email protected]>
133136
Damian Hobson-Garcia <[email protected]>
@@ -571,6 +574,7 @@ Takashi YOSHII <[email protected]>
571574
Tamizh Chelvam Raja <[email protected]> <[email protected]>
572575
573576
Tejun Heo <[email protected]>
577+
574578
Thomas Graf <[email protected]>
575579
576580
Thomas Pedersen <[email protected]>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2944,6 +2944,14 @@ D: IPX development and support
29442944
N: Venkatesh Pallipadi (Venki)
29452945
D: x86/HPET
29462946

2947+
N: Antti Palosaari
2948+
2949+
D: Various DVB drivers
2950+
W: https://palosaari.fi/linux/
2951+
S: Yliopistokatu 1 D 513
2952+
S: FI-90570 Oulu
2953+
S: FINLAND
2954+
29472955
N: Kyungmin Park
29482956
29492957
D: Samsung S5Pv210 and Exynos4210 mobile platforms

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,12 @@ Description: Shows the operation capability bits displayed in bitmap format
270270
correlates to the operations allowed. It's visible only
271271
on platforms that support the capability.
272272

273+
What: /sys/bus/dsa/devices/wq<m>.<n>/driver_name
274+
Date: Sept 8, 2023
275+
KernelVersion: 6.7.0
276+
277+
Description: Name of driver to be bounded to the wq.
278+
273279
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
274280
Date: Oct 25, 2019
275281
KernelVersion: 5.6.0
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
What: /sys/kernel/config/tsm/report/$name/inblob
2+
Date: September, 2023
3+
KernelVersion: v6.7
4+
5+
Description:
6+
(WO) Up to 64 bytes of user specified binary data. For replay
7+
protection this should include a nonce, but the kernel does not
8+
place any restrictions on the content.
9+
10+
What: /sys/kernel/config/tsm/report/$name/outblob
11+
Date: September, 2023
12+
KernelVersion: v6.7
13+
14+
Description:
15+
(RO) Binary attestation report generated from @inblob and other
16+
options The format of the report is implementation specific
17+
where the implementation is conveyed via the @provider
18+
attribute.
19+
20+
What: /sys/kernel/config/tsm/report/$name/auxblob
21+
Date: October, 2023
22+
KernelVersion: v6.7
23+
24+
Description:
25+
(RO) Optional supplemental data that a TSM may emit, visibility
26+
of this attribute depends on TSM, and may be empty if no
27+
auxiliary data is available.
28+
29+
When @provider is "sev_guest" this file contains the
30+
"cert_table" from SEV-ES Guest-Hypervisor Communication Block
31+
Standardization v2.03 Section 4.1.8.1 MSG_REPORT_REQ.
32+
https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/specifications/56421.pdf
33+
34+
What: /sys/kernel/config/tsm/report/$name/provider
35+
Date: September, 2023
36+
KernelVersion: v6.7
37+
38+
Description:
39+
(RO) A name for the format-specification of @outblob like
40+
"sev_guest" [1] or "tdx_guest" [2] in the near term, or a
41+
common standard format in the future.
42+
43+
[1]: SEV Secure Nested Paging Firmware ABI Specification
44+
Revision 1.55 Table 22
45+
https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/specifications/56860.pdf
46+
47+
[2]: Intel® Trust Domain Extensions Data Center Attestation
48+
Primitives : Quote Generation Library and Quote Verification
49+
Library Revision 0.8 Appendix 4,5
50+
https://download.01.org/intel-sgx/latest/dcap-latest/linux/docs/Intel_TDX_DCAP_Quoting_Library_API.pdf
51+
52+
What: /sys/kernel/config/tsm/report/$name/generation
53+
Date: September, 2023
54+
KernelVersion: v6.7
55+
56+
Description:
57+
(RO) The value in this attribute increments each time @inblob or
58+
any option is written. Userspace can detect conflicts by
59+
checking generation before writing to any attribute and making
60+
sure the number of writes matches expectations after reading
61+
@outblob, or it can prevent conflicts by creating a report
62+
instance per requesting context.
63+
64+
What: /sys/kernel/config/tsm/report/$name/privlevel
65+
Date: September, 2023
66+
KernelVersion: v6.7
67+
68+
Description:
69+
(WO) Attribute is visible if a TSM implementation provider
70+
supports the concept of attestation reports for TVMs running at
71+
different privilege levels, like SEV-SNP "VMPL", specify the
72+
privilege level via this attribute. The minimum acceptable
73+
value is conveyed via @privlevel_floor and the maximum
74+
acceptable value is TSM_PRIVLEVEL_MAX (3).
75+
76+
What: /sys/kernel/config/tsm/report/$name/privlevel_floor
77+
Date: September, 2023
78+
KernelVersion: v6.7
79+
80+
Description:
81+
(RO) Indicates the minimum permissible value that can be written
82+
to @privlevel.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ Description:
3535
req_number the number of pre-allocated requests
3636
for both capture and playback
3737
function_name name of the interface
38+
c_terminal_type code of the capture terminal type
39+
p_terminal_type code of the playback terminal type
3840
===================== =======================================

Documentation/ABI/testing/debugfs-driver-qat

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/kernel/debug/qat_<device>_<BDF>/qat/fw_counters
1+
What: /sys/kernel/debug/qat_<device>_<BDF>/fw_counters
22
Date: November 2023
33
KernelVersion: 6.6
44
@@ -59,3 +59,25 @@ Description: (RO) Read returns the device health status.
5959

6060
The driver does not monitor for Heartbeat. It is left for a user
6161
to poll the status periodically.
62+
63+
What: /sys/kernel/debug/qat_<device>_<BDF>/pm_status
64+
Date: January 2024
65+
KernelVersion: 6.7
66+
67+
Description: (RO) Read returns power management information specific to the
68+
QAT device.
69+
70+
This attribute is only available for qat_4xxx devices.
71+
72+
What: /sys/kernel/debug/qat_<device>_<BDF>/cnv_errors
73+
Date: January 2024
74+
KernelVersion: 6.7
75+
76+
Description: (RO) Read returns, for each Acceleration Engine (AE), the number
77+
of errors and the type of the last error detected by the device
78+
when performing verified compression.
79+
Reported counters::
80+
81+
<N>: Number of Compress and Verify (CnV) errors and type
82+
of the last CnV error detected by Acceleration
83+
Engine N.

Documentation/ABI/testing/sysfs-bus-cdx

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,57 @@ Description:
2828
of a device manufacturer.
2929
Combination of Vendor ID and Device ID identifies a device.
3030

31+
What: /sys/bus/cdx/devices/.../subsystem_vendor
32+
Date: July 2023
33+
34+
Description:
35+
Subsystem Vendor ID for this CDX device, in hexadecimal.
36+
Subsystem Vendor ID is 16 bit identifier specific to the
37+
card manufacturer.
38+
39+
What: /sys/bus/cdx/devices/.../subsystem_device
40+
Date: July 2023
41+
42+
Description:
43+
Subsystem Device ID for this CDX device, in hexadecimal
44+
Subsystem Device ID is 16 bit identifier specific to the
45+
card manufacturer.
46+
47+
What: /sys/bus/cdx/devices/.../class
48+
Date: July 2023
49+
50+
Description:
51+
This file contains the class of the CDX device, in hexadecimal.
52+
Class is 24 bit identifier specifies the functionality of the device.
53+
54+
What: /sys/bus/cdx/devices/.../revision
55+
Date: July 2023
56+
57+
Description:
58+
This file contains the revision field of the CDX device, in hexadecimal.
59+
Revision is 8 bit revision identifier of the device.
60+
61+
What: /sys/bus/cdx/devices/.../enable
62+
Date: October 2023
63+
64+
Description:
65+
CDX bus should be disabled before updating the devices in FPGA.
66+
Writing n/0/off will attempt to disable the CDX bus and.
67+
writing y/1/on will attempt to enable the CDX bus. Reading this file
68+
gives the current state of the bus, 1 for enabled and 0 for disabled.
69+
70+
For example::
71+
72+
# echo 1 > /sys/bus/cdx/.../enable
73+
3174
What: /sys/bus/cdx/devices/.../reset
3275
Date: March 2023
3376
3477
Description:
35-
Writing y/1/on to this file resets the CDX device.
36-
On resetting the device, the corresponding driver is notified
37-
twice, once before the device is being reset, and again after
38-
the reset has been complete.
78+
Writing y/1/on to this file resets the CDX device or all devices
79+
on the bus. On resetting the device, the corresponding driver is
80+
notified twice, once before the device is being reset, and again
81+
after the reset has been complete.
3982

4083
For example::
4184

@@ -54,3 +97,18 @@ Description:
5497
For example::
5598

5699
# echo 1 > /sys/bus/cdx/devices/.../remove
100+
101+
What: /sys/bus/cdx/devices/.../modalias
102+
Date: July 2023
103+
104+
Description:
105+
This attribute indicates the CDX ID of the device.
106+
That is in the format:
107+
cdx:vXXXXdXXXXsvXXXXsdXXXXcXXXXXX,
108+
where:
109+
110+
- vXXXX contains the vendor ID;
111+
- dXXXX contains the device ID;
112+
- svXXXX contains the subsystem vendor ID;
113+
- sdXXXX contains the subsystem device ID;
114+
- cXXXXXX contains the device class.

Documentation/ABI/testing/sysfs-bus-cxl

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@ Description:
178178
hardware decoder target list.
179179

180180

181+
What: /sys/bus/cxl/devices/portX/decoders_committed
182+
Date: October, 2023
183+
KernelVersion: v6.7
184+
185+
Description:
186+
(RO) A memory device is considered active when any of its
187+
decoders are in the "committed" state (See CXL 3.0 8.2.4.19.7
188+
CXL HDM Decoder n Control Register). Hotplug and destructive
189+
operations like "sanitize" are blocked while device is actively
190+
decoding a Host Physical Address range. Note that this number
191+
may be elevated without any regionX objects active or even
192+
enumerated, as this may be due to decoders established by
193+
platform firwmare or a previous kernel (kexec).
194+
195+
181196
What: /sys/bus/cxl/devices/decoderX.Y
182197
Date: June, 2021
183198
KernelVersion: v5.14
@@ -369,6 +384,21 @@ Description:
369384
provided it is currently idle / not bound to a driver.
370385

371386

387+
What: /sys/bus/cxl/devices/decoderX.Y/qos_class
388+
Date: May, 2023
389+
KernelVersion: v6.5
390+
391+
Description:
392+
(RO) For CXL host platforms that support "QoS Telemmetry" this
393+
root-decoder-only attribute conveys a platform specific cookie
394+
that identifies a QoS performance class for the CXL Window.
395+
This class-id can be compared against a similar "qos_class"
396+
published for each memory-type that an endpoint supports. While
397+
it is not required that endpoints map their local memory-class
398+
to a matching platform class, mismatches are not recommended and
399+
there are platform specific side-effects that may result.
400+
401+
372402
What: /sys/bus/cxl/devices/regionZ/uuid
373403
Date: May, 2022
374404
KernelVersion: v6.0

Documentation/ABI/testing/sysfs-bus-i3c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ What: /sys/bus/i3c/devices/i3c-<bus-id>/pid
6767
KernelVersion: 5.0
6868
6969
Description:
70-
PID stands for Provisional ID and is used to uniquely identify
70+
PID stands for Provisioned ID and is used to uniquely identify
7171
a device on a bus. This PID contains information about the
7272
vendor, the part and an instance ID so that several devices of
7373
the same type can be connected on the same bus.
@@ -123,7 +123,7 @@ What: /sys/bus/i3c/devices/i3c-<bus-id>/<bus-id>-<device-pid>/pid
123123
KernelVersion: 5.0
124124
125125
Description:
126-
PID stands for Provisional ID and is used to uniquely identify
126+
PID stands for Provisioned ID and is used to uniquely identify
127127
a device on a bus. This PID contains information about the
128128
vendor, the part and an instance ID so that several devices of
129129
the same type can be connected on the same bus.

0 commit comments

Comments
 (0)