Skip to content

Commit 9414cf9

Browse files
ujfalusiujfalusi
authored
Merge pull request thesofproject#5548 from ujfalusi/merge/sound-upstream-20251003
Merge/sound upstream 20251003
2 parents 73ba76b + 349a11a commit 9414cf9

File tree

3,632 files changed

+119445
-156064
lines changed

Some content is hidden

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

3,632 files changed

+119445
-156064
lines changed

‎.get_maintainer.ignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Alan Cox <alan@lxorguk.ukuu.org.uk>
22
Alan Cox <root@hraefn.swansea.linux.org.uk>
3+
Alyssa Rosenzweig <alyssa@rosenzweig.io>
34
Christoph Hellwig <hch@lst.de>
45
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
56
Marc Gonzalez <marc.w.gonzalez@free.fr>

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ Ben M Cahill <ben.m.cahill@intel.com>
134134
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
135135
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
136136
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
137+
Bence Csókás <bence98@sch.bme.hu> <csokas.bence@prolan.hu>
137138
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
138139
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
139140
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
@@ -623,6 +624,7 @@ Paulo Alcantara <pc@manguebit.org> <palcantara@suse.com>
623624
Paulo Alcantara <pc@manguebit.org> <pc@manguebit.com>
624625
Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>
625626
Peter A Jonsson <pj@ludd.ltu.se>
627+
Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>
626628
Peter Oruba <peter.oruba@amd.com>
627629
Peter Oruba <peter@oruba.de>
628630
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>

‎CREDITS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3912,6 +3912,12 @@ S: C/ Federico Garcia Lorca 1 10-A
39123912
S: Sevilla 41005
39133913
S: Spain
39143914

3915+
N: Björn Töpel
3916+
E: bjorn@kernel.org
3917+
D: AF_XDP
3918+
S: Gothenburg
3919+
S: Sweden
3920+
39153921
N: Linus Torvalds
39163922
E: torvalds@linux-foundation.org
39173923
D: Original kernel hacker

‎Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-dtl‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/bus/event_source/devices/vpa_dtl/format
2+
Date: February 2025
3+
Contact: Linux on PowerPC Developer List <linuxppc-dev at lists.ozlabs.org>
4+
Description: Read-only. Attribute group to describe the magic bits
5+
that go into perf_event_attr.config for a particular pmu.
6+
(See ABI/testing/sysfs-bus-event_source-devices-format).
7+
8+
Each attribute under this group defines a bit range of the
9+
perf_event_attr.config. Supported attribute are listed
10+
below::
11+
12+
event = "config:0-7" - event ID
13+
14+
For example::
15+
16+
dtl_cede = "event=0x1"
17+
18+
What: /sys/bus/event_source/devices/vpa_dtl/events
19+
Date: February 2025
20+
Contact: Linux on PowerPC Developer List <linuxppc-dev at lists.ozlabs.org>
21+
Description: (RO) Attribute group to describe performance monitoring events
22+
for the Virtual Processor Dispatch Trace Log. Each attribute in
23+
this group describes a single performance monitoring event
24+
supported by vpa_dtl pmu. The name of the file is the name of
25+
the event (See ABI/testing/sysfs-bus-event_source-devices-events).

‎Documentation/ABI/testing/sysfs-class-power‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,43 @@ Description:
553553
Integer > 0: representing full cycles
554554
Integer = 0: cycle_count info is not available
555555

556+
What: /sys/class/power_supply/<supply_name>/internal_resistance
557+
Date: August 2025
558+
Contact: linux-arm-msm@vger.kernel.org
559+
Description:
560+
Represent the battery's internal resistance, often referred
561+
to as Equivalent Series Resistance (ESR). It is a dynamic
562+
parameter that reflects the opposition to current flow within
563+
the cell. It is not a fixed value but varies significantly
564+
based on several operational conditions, including battery
565+
state of charge (SoC), temperature, and whether the battery
566+
is in a charging or discharging state.
567+
568+
Access: Read
569+
570+
Valid values: Represented in microohms
571+
572+
What: /sys/class/power_supply/<supply_name>/state_of_health
573+
Date: August 2025
574+
Contact: linux-arm-msm@vger.kernel.org
575+
Description:
576+
The state_of_health parameter quantifies the overall condition
577+
of a battery as a percentage, reflecting its ability to deliver
578+
rated performance relative to its original specifications. It is
579+
dynamically computed using a combination of learned capacity
580+
and impedance-based degradation indicators, both of which evolve
581+
over the battery's lifecycle.
582+
Note that the exact algorithms are kept secret by most battery
583+
vendors and the value from different battery vendors cannot be
584+
compared with each other as there is no vendor-agnostic definition
585+
of "performance". Also this usually cannot be used for any
586+
calculations (i.e. this is not the factor between charge_full and
587+
charge_full_design).
588+
589+
Access: Read
590+
591+
Valid values: 0 - 100 (percent)
592+
556593
**USB Properties**
557594

558595
What: /sys/class/power_supply/<supply_name>/input_current_limit

‎Documentation/ABI/testing/sysfs-devices-power‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,15 @@ What: /sys/devices/.../power/runtime_active_time
274274
Date: Jul 2010
275275
Contact: Arjan van de Ven <arjan@linux.intel.com>
276276
Description:
277-
Reports the total time that the device has been active.
278-
Used for runtime PM statistics.
277+
Reports the total time that the device has been active, in
278+
milliseconds. Used for runtime PM statistics.
279279

280280
What: /sys/devices/.../power/runtime_suspended_time
281281
Date: Jul 2010
282282
Contact: Arjan van de Ven <arjan@linux.intel.com>
283283
Description:
284-
Reports total time that the device has been suspended.
285-
Used for runtime PM statistics.
284+
Reports total time that the device has been suspended, in
285+
milliseconds. Used for runtime PM statistics.
286286

287287
What: /sys/devices/.../power/runtime_usage
288288
Date: Apr 2010

‎Documentation/ABI/testing/sysfs-devices-system-cpu‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ What: /sys/devices/system/cpu/vulnerabilities
586586
/sys/devices/system/cpu/vulnerabilities/srbds
587587
/sys/devices/system/cpu/vulnerabilities/tsa
588588
/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
589+
/sys/devices/system/cpu/vulnerabilities/vmscape
589590
Date: January 2018
590591
Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
591592
Description: Information about CPU vulnerabilities

‎Documentation/admin-guide/cgroup-v2.rst‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ v1 is available under :ref:`Documentation/admin-guide/cgroup-v1/index.rst <cgrou
1515

1616
.. CONTENTS
1717
18+
[Whenever any new section is added to this document, please also add
19+
an entry here.]
20+
1821
1. Introduction
1922
1-1. Terminology
2023
1-2. What is cgroup?
@@ -25,9 +28,10 @@ v1 is available under :ref:`Documentation/admin-guide/cgroup-v1/index.rst <cgrou
2528
2-2-2. Threads
2629
2-3. [Un]populated Notification
2730
2-4. Controlling Controllers
28-
2-4-1. Enabling and Disabling
29-
2-4-2. Top-down Constraint
30-
2-4-3. No Internal Process Constraint
31+
2-4-1. Availability
32+
2-4-2. Enabling and Disabling
33+
2-4-3. Top-down Constraint
34+
2-4-4. No Internal Process Constraint
3135
2-5. Delegation
3236
2-5-1. Model of Delegation
3337
2-5-2. Delegation Containment
@@ -61,14 +65,15 @@ v1 is available under :ref:`Documentation/admin-guide/cgroup-v1/index.rst <cgrou
6165
5-4-1. PID Interface Files
6266
5-5. Cpuset
6367
5.5-1. Cpuset Interface Files
64-
5-6. Device
68+
5-6. Device controller
6569
5-7. RDMA
6670
5-7-1. RDMA Interface Files
6771
5-8. DMEM
72+
5-8-1. DMEM Interface Files
6873
5-9. HugeTLB
6974
5.9-1. HugeTLB Interface Files
7075
5-10. Misc
71-
5.10-1 Miscellaneous cgroup Interface Files
76+
5.10-1 Misc Interface Files
7277
5.10-2 Migration and Ownership
7378
5-11. Others
7479
5-11-1. perf_event
@@ -1001,6 +1006,24 @@ All cgroup core files are prefixed with "cgroup."
10011006
Total number of dying cgroup subsystems (e.g. memory
10021007
cgroup) at and beneath the current cgroup.
10031008

1009+
cgroup.stat.local
1010+
A read-only flat-keyed file which exists in non-root cgroups.
1011+
The following entry is defined:
1012+
1013+
frozen_usec
1014+
Cumulative time that this cgroup has spent between freezing and
1015+
thawing, regardless of whether by self or ancestor groups.
1016+
NB: (not) reaching "frozen" state is not accounted here.
1017+
1018+
Using the following ASCII representation of a cgroup's freezer
1019+
state, ::
1020+
1021+
1 _____
1022+
frozen 0 __/ \__
1023+
ab cd
1024+
1025+
the duration being measured is the span between a and c.
1026+
10041027
cgroup.freeze
10051028
A read-write single value file which exists on non-root cgroups.
10061029
Allowed values are "0" and "1". The default is "0".

‎Documentation/admin-guide/hw-vuln/attack_vector_controls.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ SRSO X X X X
218218
SSB X
219219
TAA X X X X * (Note 2)
220220
TSA X X X X
221+
VMSCAPE X
221222
=============== ============== ============ ============= ============== ============ ========
222223

223224
Notes:

‎Documentation/admin-guide/hw-vuln/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ are configurable at compile, boot or run time.
2626
rsb
2727
old_microcode
2828
indirect-target-selection
29+
vmscape

0 commit comments

Comments
 (0)