Skip to content

Commit bbaa44b

Browse files
Merge pull request #38 from torvalds/master
Sync updates
2 parents 505326e + 37bb2e7 commit bbaa44b

File tree

1,392 files changed

+54632
-26168
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,392 files changed

+54632
-26168
lines changed

.mailmap

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>
303303
Hans Verkuil <hverkuil@kernel.org> <hverkuil@xs4all.nl>
304304
Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>
305305
Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>
306+
Hao Ge <hao.ge@linux.dev> <gehao@kylinos.cn>
306307
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
307308
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
308309
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
@@ -503,9 +504,7 @@ Mark Brown <broonie@sirena.org.uk>
503504
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
504505
Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>
505506
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
506-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
507-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
508-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
507+
Martin Kepplinger-Novakovic <martink@posteo.de> <martin.kepplinger-novakovic@ginzinger.com>
509508
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
510509
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
511510
Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
@@ -856,6 +855,9 @@ Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
856855
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
857856
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
858857
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
858+
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
859+
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
860+
WangYuli <wangyuli@aosc.io> <wangyuli@uniontech.com>
859861
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
860862
WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>
861863
Wen Gong <quic_wgong@quicinc.com> <wgong@codeaurora.org>
@@ -867,6 +869,7 @@ Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
867869
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
868870
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
869871
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
872+
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
870873
Yusuke Goda <goda.yusuke@renesas.com>
871874
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
872875
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,16 +2056,15 @@ S: Korte Heul 95
20562056
S: 1403 ND BUSSUM
20572057
S: The Netherlands
20582058

2059-
N: Martin Kepplinger
2059+
N: Martin Kepplinger-Novakovic
20602060
E: martink@posteo.de
2061-
E: martin.kepplinger@puri.sm
2062-
W: http://www.martinkepplinger.com
20632061
P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468 6E3F 5003 98DF 5AB3 87D3
20642062
D: mma8452 accelerators iio driver
20652063
D: pegasus_notetaker input driver
2064+
D: imx8m media and hi846 sensor driver
20662065
D: Kernel fixes and cleanups
2067-
S: Garnisonstraße 26
2068-
S: 4020 Linz
2066+
S: Keplerstr. 6
2067+
S: 4050 Traun
20692068
S: Austria
20702069

20712070
N: Karl Keyte
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
NOTE: all the ABIs listed in this file are deprecated and will be removed after 2028.
2+
3+
Here are the alternative ABIs:
4+
+------------------------------------+-----------------------------------------+
5+
| Deprecated | Alternative |
6+
+------------------------------------+-----------------------------------------+
7+
| /sys/kernel/kexec_loaded | /sys/kernel/kexec/loaded |
8+
+------------------------------------+-----------------------------------------+
9+
| /sys/kernel/kexec_crash_loaded | /sys/kernel/kexec/crash_loaded |
10+
+------------------------------------+-----------------------------------------+
11+
| /sys/kernel/kexec_crash_size | /sys/kernel/kexec/crash_size |
12+
+------------------------------------+-----------------------------------------+
13+
| /sys/kernel/crash_elfcorehdr_size | /sys/kernel/kexec/crash_elfcorehdr_size |
14+
+------------------------------------+-----------------------------------------+
15+
| /sys/kernel/kexec_crash_cma_ranges | /sys/kernel/kexec/crash_cma_ranges |
16+
+------------------------------------+-----------------------------------------+
17+
18+
19+
What: /sys/kernel/kexec_loaded
20+
Date: Jun 2006
21+
Contact: kexec@lists.infradead.org
22+
Description: read only
23+
Indicates whether a new kernel image has been loaded
24+
into memory using the kexec system call. It shows 1 if
25+
a kexec image is present and ready to boot, or 0 if none
26+
is loaded.
27+
User: kexec tools, kdump service
28+
29+
What: /sys/kernel/kexec_crash_loaded
30+
Date: Jun 2006
31+
Contact: kexec@lists.infradead.org
32+
Description: read only
33+
Indicates whether a crash (kdump) kernel is currently
34+
loaded into memory. It shows 1 if a crash kernel has been
35+
successfully loaded for panic handling, or 0 if no crash
36+
kernel is present.
37+
User: Kexec tools, Kdump service
38+
39+
What: /sys/kernel/kexec_crash_size
40+
Date: Dec 2009
41+
Contact: kexec@lists.infradead.org
42+
Description: read/write
43+
Shows the amount of memory reserved for loading the crash
44+
(kdump) kernel. It reports the size, in bytes, of the
45+
crash kernel area defined by the crashkernel= parameter.
46+
This interface also allows reducing the crashkernel
47+
reservation by writing a smaller value, and the reclaimed
48+
space is added back to the system RAM.
49+
User: Kdump service
50+
51+
What: /sys/kernel/crash_elfcorehdr_size
52+
Date: Aug 2023
53+
Contact: kexec@lists.infradead.org
54+
Description: read only
55+
Indicates the preferred size of the memory buffer for the
56+
ELF core header used by the crash (kdump) kernel. It defines
57+
how much space is needed to hold metadata about the crashed
58+
system, including CPU and memory information. This information
59+
is used by the user space utility kexec to support updating the
60+
in-kernel kdump image during hotplug operations.
61+
User: Kexec tools
62+
63+
What: /sys/kernel/kexec_crash_cma_ranges
64+
Date: Nov 2025
65+
Contact: kexec@lists.infradead.org
66+
Description: read only
67+
Provides information about the memory ranges reserved from
68+
the Contiguous Memory Allocator (CMA) area that are allocated
69+
to the crash (kdump) kernel. It lists the start and end physical
70+
addresses of CMA regions assigned for crashkernel use.
71+
User: kdump service

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,7 @@ What: /sys/.../iio:deviceX/events/in_tempY_thresh_rising_en
898898
What: /sys/.../iio:deviceX/events/in_tempY_thresh_falling_en
899899
What: /sys/.../iio:deviceX/events/in_capacitanceY_thresh_rising_en
900900
What: /sys/.../iio:deviceX/events/in_capacitanceY_thresh_falling_en
901+
What: /sys/.../iio:deviceX/events/in_pressure_thresh_rising_en
901902
KernelVersion: 2.6.37
902903
Contact: linux-iio@vger.kernel.org
903904
Description:
@@ -926,6 +927,7 @@ What: /sys/.../iio:deviceX/events/in_accel_y_roc_rising_en
926927
What: /sys/.../iio:deviceX/events/in_accel_y_roc_falling_en
927928
What: /sys/.../iio:deviceX/events/in_accel_z_roc_rising_en
928929
What: /sys/.../iio:deviceX/events/in_accel_z_roc_falling_en
930+
What: /sys/.../iio:deviceX/events/in_accel_x&y&z_roc_rising_en
929931
What: /sys/.../iio:deviceX/events/in_anglvel_x_roc_rising_en
930932
What: /sys/.../iio:deviceX/events/in_anglvel_x_roc_falling_en
931933
What: /sys/.../iio:deviceX/events/in_anglvel_y_roc_rising_en
@@ -1001,6 +1003,7 @@ Description:
10011003
to the raw signal, allowing slow tracking to resume and the
10021004
adaptive threshold event detection to function as expected.
10031005

1006+
What: /sys/.../events/in_accel_mag_adaptive_rising_value
10041007
What: /sys/.../events/in_accel_thresh_rising_value
10051008
What: /sys/.../events/in_accel_thresh_falling_value
10061009
What: /sys/.../events/in_accel_x_raw_thresh_rising_value
@@ -1045,6 +1048,7 @@ What: /sys/.../events/in_capacitanceY_thresh_rising_value
10451048
What: /sys/.../events/in_capacitanceY_thresh_falling_value
10461049
What: /sys/.../events/in_capacitanceY_thresh_adaptive_rising_value
10471050
What: /sys/.../events/in_capacitanceY_thresh_falling_rising_value
1051+
What: /sys/.../events/in_pressure_thresh_rising_value
10481052
KernelVersion: 2.6.37
10491053
Contact: linux-iio@vger.kernel.org
10501054
Description:
@@ -1147,6 +1151,7 @@ Description:
11471151
will get activated once in_voltage0_raw goes above 1200 and will become
11481152
deactivated again once the value falls below 1150.
11491153

1154+
What: /sys/.../events/in_accel_roc_rising_value
11501155
What: /sys/.../events/in_accel_x_raw_roc_rising_value
11511156
What: /sys/.../events/in_accel_x_raw_roc_falling_value
11521157
What: /sys/.../events/in_accel_y_raw_roc_rising_value
@@ -1193,6 +1198,8 @@ Description:
11931198
value is in raw device units or in processed units (as _raw
11941199
and _input do on sysfs direct channel read attributes).
11951200

1201+
What: /sys/.../events/in_accel_mag_adaptive_rising_period
1202+
What: /sys/.../events/in_accel_roc_rising_period
11961203
What: /sys/.../events/in_accel_x_thresh_rising_period
11971204
What: /sys/.../events/in_accel_x_thresh_falling_period
11981205
What: /sys/.../events/in_accel_x_roc_rising_period
@@ -1362,6 +1369,15 @@ Description:
13621369
number or direction is not specified, applies to all channels of
13631370
this type.
13641371

1372+
What: /sys/.../iio:deviceX/events/in_accel_x_mag_adaptive_rising_en
1373+
What: /sys/.../iio:deviceX/events/in_accel_y_mag_adaptive_rising_en
1374+
What: /sys/.../iio:deviceX/events/in_accel_z_mag_adaptive_rising_en
1375+
KernelVersion: 2.6.37
1376+
Contact: linux-iio@vger.kernel.org
1377+
Description:
1378+
Similar to in_accel_x_thresh[_rising|_falling]_en, but here the
1379+
magnitude of the channel is compared to the adaptive threshold.
1380+
13651381
What: /sys/.../iio:deviceX/events/in_accel_mag_referenced_en
13661382
What: /sys/.../iio:deviceX/events/in_accel_mag_referenced_rising_en
13671383
What: /sys/.../iio:deviceX/events/in_accel_mag_referenced_falling_en
@@ -2422,3 +2438,23 @@ Description:
24222438
Value representing the user's attention to the system expressed
24232439
in units as percentage. This usually means if the user is
24242440
looking at the screen or not.
2441+
2442+
What: /sys/.../events/in_accel_value_available
2443+
KernelVersion: 6.18
2444+
Contact: linux-iio@vger.kernel.org
2445+
Description:
2446+
List of available threshold values for acceleration event
2447+
generation. Applies to all event types on in_accel channels.
2448+
Units after application of scale and offset are m/s^2.
2449+
Expressed as:
2450+
2451+
- a range specified as "[min step max]"
2452+
2453+
What: /sys/.../events/in_accel_period_available
2454+
KernelVersion: 6.18
2455+
Contact: linux-iio@vger.kernel.org
2456+
Description:
2457+
List of available periods for accelerometer event detection in
2458+
seconds, expressed as:
2459+
2460+
- a range specified as "[min step max]"

Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,3 +621,84 @@ Description:
621621
number extended capability. The file is read only and due to
622622
the possible sensitivity of accessible serial numbers, admin
623623
only.
624+
625+
What: /sys/bus/pci/devices/.../tsm/
626+
Contact: linux-coco@lists.linux.dev
627+
Description:
628+
This directory only appears if a physical device function
629+
supports authentication (PCIe CMA-SPDM), interface security
630+
(PCIe TDISP), and is accepted for secure operation by the
631+
platform TSM driver. This attribute directory appears
632+
dynamically after the platform TSM driver loads. So, only after
633+
the /sys/class/tsm/tsm0 device arrives can tools assume that
634+
devices without a tsm/ attribute directory will never have one;
635+
before that, the security capabilities of the device relative to
636+
the platform TSM are unknown. See
637+
Documentation/ABI/testing/sysfs-class-tsm.
638+
639+
What: /sys/bus/pci/devices/.../tsm/connect
640+
Contact: linux-coco@lists.linux.dev
641+
Description:
642+
(RW) Write the name of a TSM (TEE Security Manager) device from
643+
/sys/class/tsm to this file to establish a connection with the
644+
device. This typically includes an SPDM (DMTF Security
645+
Protocols and Data Models) session over PCIe DOE (Data Object
646+
Exchange) and may also include PCIe IDE (Integrity and Data
647+
Encryption) establishment. Reads from this attribute return the
648+
name of the connected TSM or the empty string if not
649+
connected. A TSM device signals its readiness to accept PCI
650+
connection via a KOBJ_CHANGE event.
651+
652+
What: /sys/bus/pci/devices/.../tsm/disconnect
653+
Contact: linux-coco@lists.linux.dev
654+
Description:
655+
(WO) Write the name of the TSM device that was specified
656+
to 'connect' to teardown the connection.
657+
658+
What: /sys/bus/pci/devices/.../tsm/dsm
659+
Contact: linux-coco@lists.linux.dev
660+
Description: (RO) Return PCI device name of this device's DSM (Device
661+
Security Manager). When a device is in the connected state it
662+
indicates that the platform TSM (TEE Security Manager) has made
663+
a secure-session connection with a device's DSM. A DSM is always
664+
physical function 0 and when the device supports TDISP (TEE
665+
Device Interface Security Protocol) its managed functions also
666+
populate this tsm/dsm attribute. The managed functions of a DSM
667+
are SR-IOV (Single Root I/O Virtualization) virtual functions,
668+
non-zero functions of a multi-function device, or downstream
669+
endpoints depending on whether the DSM is an SR-IOV physical
670+
function, function0 of a multi-function device, or an upstream
671+
PCIe switch port. This is a "link" TSM attribute, see
672+
Documentation/ABI/testing/sysfs-class-tsm.
673+
674+
What: /sys/bus/pci/devices/.../tsm/bound
675+
Contact: linux-coco@lists.linux.dev
676+
Description: (RO) Return the device name of the TSM when the device is in a
677+
TDISP (TEE Device Interface Security Protocol) operational state
678+
(LOCKED, RUN, or ERROR, not UNLOCKED). Bound devices consume
679+
platform TSM resources and depend on the device's configuration
680+
(e.g. BME (Bus Master Enable) and MSE (Memory Space Enable)
681+
among other settings) to remain stable for the duration of the
682+
bound state. This attribute is only visible for devices that
683+
support TDISP operation, and it is only populated after
684+
successful connect and TSM bind. The TSM bind operation is
685+
initiated by VFIO/IOMMUFD. This is a "link" TSM attribute, see
686+
Documentation/ABI/testing/sysfs-class-tsm.
687+
688+
What: /sys/bus/pci/devices/.../authenticated
689+
Contact: linux-pci@vger.kernel.org
690+
Description:
691+
When the device's tsm/ directory is present device
692+
authentication (PCIe CMA-SPDM) and link encryption (PCIe IDE)
693+
are handled by the platform TSM (TEE Security Manager). When the
694+
tsm/ directory is not present this attribute reflects only the
695+
native CMA-SPDM authentication state with the kernel's
696+
certificate store.
697+
698+
If the attribute is not present, it indicates that
699+
authentication is unsupported by the device, or the TSM has no
700+
available authentication methods for the device.
701+
702+
When present and the tsm/ attribute directory is present, the
703+
authenticated attribute is an alias for the device 'connect'
704+
state. See the 'tsm/connect' attribute for more details.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/class/tsm/tsmN
2+
Contact: linux-coco@lists.linux.dev
3+
Description:
4+
"tsmN" is a device that represents the generic attributes of a
5+
platform TEE Security Manager. It is typically a child of a
6+
platform enumerated TSM device. /sys/class/tsm/tsmN/uevent
7+
signals when the PCI layer is able to support establishment of
8+
link encryption and other device-security features coordinated
9+
through a platform tsm.
10+
11+
What: /sys/class/tsm/tsmN/streamH.R.E
12+
Contact: linux-pci@vger.kernel.org
13+
Description:
14+
(RO) When a host bridge has established a secure connection via
15+
the platform TSM, symlink appears. The primary function of this
16+
is have a system global review of TSM resource consumption
17+
across host bridges. The link points to the endpoint PCI device
18+
and matches the same link published by the host bridge. See
19+
Documentation/ABI/testing/sysfs-devices-pci-host-bridge.

Documentation/ABI/testing/sysfs-class-usb_power_delivery

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,3 +254,31 @@ Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
254254
Description:
255255
The PPS Power Limited bit indicates whether or not the source
256256
supply will exceed the rated output power if requested.
257+
258+
Standard Power Range (SPR) Adjustable Voltage Supplies
259+
260+
What: /sys/class/usb_power_delivery/.../<capability>/<position>:spr_adjustable_voltage_supply
261+
Date: Oct 2025
262+
Contact: Badhri Jagan Sridharan <badhri@google.com>
263+
Description:
264+
Adjustable Voltage Supply (AVS) Augmented PDO (APDO).
265+
266+
What: /sys/class/usb_power_delivery/.../<capability>/<position>:spr_adjustable_voltage_supply/maximum_current_9V_to_15V
267+
Date: Oct 2025
268+
Contact: Badhri Jagan Sridharan <badhri@google.com>
269+
Description:
270+
Maximum Current for 9V to 15V range in milliamperes.
271+
272+
What: /sys/class/usb_power_delivery/.../<capability>/<position>:spr_adjustable_voltage_supply/maximum_current_15V_to_20V
273+
Date: Oct 2025
274+
Contact: Badhri Jagan Sridharan <badhri@google.com>
275+
Description:
276+
Maximum Current for greater than 15V till 20V range in
277+
milliamperes.
278+
279+
What: /sys/class/usb_power_delivery/.../<capability>/<position>:spr_adjustable_voltage_supply/peak_current
280+
Date: Oct 2025
281+
Contact: Badhri Jagan Sridharan <badhri@google.com>
282+
Description:
283+
This file shows the value of the Adjustable Voltage Supply Peak Current
284+
Capability field.

0 commit comments

Comments
 (0)