Skip to content

Commit 3fbff91

Browse files
akpm00akpm00
committed
Merge branch 'master' into mm-hotfixes-stable
2 parents 44f10db + a901a35 commit 3fbff91

File tree

1,576 files changed

+69243
-35653
lines changed

Some content is hidden

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

1,576 files changed

+69243
-35653
lines changed

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
*.symversions
5252
*.tab.[ch]
5353
*.tar
54-
*.usyms
5554
*.xz
5655
*.zst
5756
Module.symvers
@@ -112,7 +111,6 @@ modules.order
112111
#
113112
/include/config/
114113
/include/generated/
115-
/include/ksym/
116114
/arch/*/include/generated/
117115

118116
# stgit generated dirs

‎Documentation/ABI/stable/sysfs-platform-wmi-bmof

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/bus/wmi/devices/05901221-D566-11D1-B2F0-00A0C9062910[-X]/bmof
2+
Date: Jun 2017
3+
KernelVersion: 4.13
4+
Description:
5+
Binary MOF metadata used to decribe the details of available ACPI WMI interfaces.
6+
7+
See Documentation/wmi/devices/wmi-bmof.rst for details.

‎Documentation/ABI/testing/debugfs-dell-wmi-ddv

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,32 @@ Date: September 2022
33
KernelVersion: 6.1
44
Contact: Armin Wolf <[email protected]>
55
Description:
6-
This file contains the contents of the fan sensor information buffer,
7-
which contains fan sensor entries and a terminating character (0xFF).
6+
This file contains the contents of the fan sensor information
7+
buffer, which contains fan sensor entries and a terminating
8+
character (0xFF).
89

9-
Each fan sensor entry consists of three bytes with an unknown meaning,
10-
interested people may use this file for reverse-engineering.
10+
Each fan sensor entry contains:
11+
12+
- fan type (single byte)
13+
- fan speed in RPM (two bytes, little endian)
14+
15+
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.
1116

1217
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
1318
Date: September 2022
1419
KernelVersion: 6.1
1520
Contact: Armin Wolf <[email protected]>
1621
Description:
17-
This file contains the contents of the thermal sensor information buffer,
18-
which contains thermal sensor entries and a terminating character (0xFF).
22+
This file contains the contents of the thermal sensor information
23+
buffer, which contains thermal sensor entries and a terminating
24+
character (0xFF).
25+
26+
Each thermal sensor entry contains:
27+
28+
- thermal type (single byte)
29+
- current temperature (single byte)
30+
- min. temperature (single byte)
31+
- max. temperature (single byte)
32+
- unknown field (single byte)
1933

20-
Each thermal sensor entry consists of five bytes with an unknown meaning,
21-
interested people may use this file for reverse-engineering.
34+
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,25 @@ Description:
9595
This file does not exist if the HBA driver does not implement
9696
support for the SATA NCQ priority feature, regardless of the
9797
device support for this feature.
98+
99+
100+
What: /sys/block/*/device/cdl_supported
101+
Date: May, 2023
102+
KernelVersion: v6.5
103+
Contact: [email protected]
104+
Description:
105+
(RO) Indicates if the device supports the command duration
106+
limits feature found in some ATA and SCSI devices.
107+
108+
109+
What: /sys/block/*/device/cdl_enable
110+
Date: May, 2023
111+
KernelVersion: v6.5
112+
Contact: [email protected]
113+
Description:
114+
(RW) For a device supporting the command duration limits
115+
feature, write to the file to turn on or off the feature.
116+
By default this feature is turned off.
117+
Writing "1" to this file enables the use of command duration
118+
limits for read and write commands in the kernel and turns on
119+
the feature on the device. Writing "0" disables the feature.

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,54 @@ Description:
5858
affinity for this device.
5959

6060

61+
What: /sys/bus/cxl/devices/memX/security/state
62+
Date: June, 2023
63+
KernelVersion: v6.5
64+
Contact: [email protected]
65+
Description:
66+
(RO) Reading this file will display the CXL security state for
67+
that device. Such states can be: 'disabled', 'sanitize', when
68+
a sanitization is currently underway; or those available only
69+
for persistent memory: 'locked', 'unlocked' or 'frozen'. This
70+
sysfs entry is select/poll capable from userspace to notify
71+
upon completion of a sanitize operation.
72+
73+
74+
What: /sys/bus/cxl/devices/memX/security/sanitize
75+
Date: June, 2023
76+
KernelVersion: v6.5
77+
Contact: [email protected]
78+
Description:
79+
(WO) Write a boolean 'true' string value to this attribute to
80+
sanitize the device to securely re-purpose or decommission it.
81+
This is done by ensuring that all user data and meta-data,
82+
whether it resides in persistent capacity, volatile capacity,
83+
or the LSA, is made permanently unavailable by whatever means
84+
is appropriate for the media type. This functionality requires
85+
the device to be not be actively decoding any HPA ranges.
86+
87+
88+
What /sys/bus/cxl/devices/memX/security/erase
89+
Date: June, 2023
90+
KernelVersion: v6.5
91+
Contact: [email protected]
92+
Description:
93+
(WO) Write a boolean 'true' string value to this attribute to
94+
secure erase user data by changing the media encryption keys for
95+
all user data areas of the device.
96+
97+
98+
What: /sys/bus/cxl/devices/memX/firmware/
99+
Date: April, 2023
100+
KernelVersion: v6.5
101+
Contact: [email protected]
102+
Description:
103+
(RW) Firmware uploader mechanism. The different files under
104+
this directory can be used to upload and activate new
105+
firmware for CXL devices. The interfaces under this are
106+
documented in sysfs-class-firmware.
107+
108+
61109
What: /sys/bus/cxl/devices/*/devtype
62110
Date: June, 2021
63111
KernelVersion: v5.14

‎Documentation/ABI/testing/sysfs-class-firmware-attributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ Description:
243243

244244
index:
245245
Used with HDD and NVME authentication to set the drive index
246-
that is being referenced (e.g hdd0, hdd1 etc)
247-
This attribute defaults to device 0.
246+
that is being referenced (e.g hdd1, hdd2 etc)
247+
This attribute defaults to device 1.
248248

249249
certificate, signature, save_signature:
250250
These attributes are used for certificate based authentication. This is

‎Documentation/ABI/testing/sysfs-driver-qat

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,18 @@ Description: (RW) Reports the current configuration of the QAT device.
2727

2828
* sym;asym: the device is configured for running crypto
2929
services
30+
* asym;sym: identical to sym;asym
3031
* dc: the device is configured for running compression services
32+
* sym: the device is configured for running symmetric crypto
33+
services
34+
* asym: the device is configured for running asymmetric crypto
35+
services
36+
* asym;dc: the device is configured for running asymmetric
37+
crypto services and compression services
38+
* dc;asym: identical to asym;dc
39+
* sym;dc: the device is configured for running symmetric crypto
40+
services and compression services
41+
* dc;sym: identical to sym;dc
3142

3243
It is possible to set the configuration only if the device
3344
is in the `down` state (see /sys/bus/pci/devices/<BDF>/qat/state)
@@ -47,3 +58,38 @@ Description: (RW) Reports the current configuration of the QAT device.
4758
dc
4859

4960
This attribute is only available for qat_4xxx devices.
61+
62+
What: /sys/bus/pci/devices/<BDF>/qat/pm_idle_enabled
63+
Date: June 2023
64+
KernelVersion: 6.5
65+
Contact: [email protected]
66+
Description: (RW) This configuration option provides a way to force the device into remaining in
67+
the MAX power state.
68+
If idle support is enabled the device will transition to the `MIN` power state when
69+
idle, otherwise will stay in the MAX power state.
70+
Write to the file to enable or disable idle support.
71+
72+
The values are:
73+
74+
* 0: idle support is disabled
75+
* 1: idle support is enabled
76+
77+
Default value is 1.
78+
79+
It is possible to set the pm_idle_enabled value only if the device
80+
is in the `down` state (see /sys/bus/pci/devices/<BDF>/qat/state)
81+
82+
The following example shows how to change the pm_idle_enabled of
83+
a device::
84+
85+
# cat /sys/bus/pci/devices/<BDF>/qat/state
86+
up
87+
# cat /sys/bus/pci/devices/<BDF>/qat/pm_idle_enabled
88+
1
89+
# echo down > /sys/bus/pci/devices/<BDF>/qat/state
90+
# echo 0 > /sys/bus/pci/devices/<BDF>/qat/pm_idle_enabled
91+
# echo up > /sys/bus/pci/devices/<BDF>/qat/state
92+
# cat /sys/bus/pci/devices/<BDF>/qat/pm_idle_enabled
93+
0
94+
95+
This attribute is only available for qat_4xxx devices.

‎Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,6 +1426,17 @@ Description: This entry shows the status of WriteBooster buffer flushing
14261426
If flushing is enabled, the device executes the flush
14271427
operation when the command queue is empty.
14281428

1429+
What: /sys/bus/platform/drivers/ufshcd/*/wb_flush_threshold
1430+
What: /sys/bus/platform/devices/*.ufs/wb_flush_threshold
1431+
Date: June 2023
1432+
Contact: Lu Hongfei <[email protected]>
1433+
Description:
1434+
wb_flush_threshold represents the threshold for flushing WriteBooster buffer,
1435+
whose value expressed in unit of 10% granularity, such as '1' representing 10%,
1436+
'2' representing 20%, and so on.
1437+
If avail_wb_buff < wb_flush_threshold, it indicates that WriteBooster buffer needs to
1438+
be flushed, otherwise it is not necessary.
1439+
14291440
What: /sys/bus/platform/drivers/ufshcd/*/device_descriptor/hpb_version
14301441
What: /sys/bus/platform/devices/*.ufs/device_descriptor/hpb_version
14311442
Date: June 2021

‎Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ Date: September 2022
33
KernelVersion: 6.1
44
Contact: Armin Wolf <[email protected]>
55
Description:
6-
Reports the Dell ePPID (electronic Dell Piece Part Identification)
6+
Reports the Dell ePPID (electronic Piece Part Identification)
77
of the ACPI battery.
8+
9+
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.

‎Documentation/ABI/testing/sysfs-platform-mellanox-bootctl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,12 @@ KernelVersion: 6.4
7575
Contact: "Liming Sun <[email protected]>"
7676
Description:
7777
The file used to access the BlueField boot fifo.
78+
79+
What: /sys/bus/platform/devices/MLNXBF04:00/rsh_log
80+
Date: May 2023
81+
KernelVersion: 6.4
82+
Contact: "Liming Sun <[email protected]>"
83+
Description:
84+
The file used to write BlueField boot log with the format
85+
"[INFO|WARN|ERR|ASSERT ]<msg>". Log level 'INFO' is used by
86+
default if not specified.

0 commit comments

Comments
 (0)