Skip to content

Commit ec166f4

Browse files
authored
Merge pull request #5717 from bardliao/merge/sound-upstream-20260402
Merge/sound upstream 20260402
2 parents 60cbdd6 + 16dda3e commit ec166f4

File tree

1,378 files changed

+17019
-8640
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,378 files changed

+17019
-8640
lines changed

.mailmap

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>
316316
Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>
317317
Hao Ge <hao.ge@linux.dev> <gehao@kylinos.cn>
318318
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
319+
Harry Yoo <harry@kernel.org> <harry.yoo@oracle.com>
319320
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
320321
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
321322
Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>
@@ -327,6 +328,7 @@ Henrik Rydberg <rydberg@bitmath.org>
327328
Herbert Xu <herbert@gondor.apana.org.au>
328329
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
329330
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
331+
Ignat Korchagin <ignat@linux.win> <ignat@cloudflare.com>
330332
Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>
331333
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
332334
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
@@ -498,7 +500,8 @@ Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
498500
Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@linaro.org>
499501
Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@intel.com>
500502
Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
501-
Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>
503+
Lorenzo Stoakes <ljs@kernel.org> <lstoakes@gmail.com>
504+
Lorenzo Stoakes <ljs@kernel.org> <lorenzo.stoakes@oracle.com>
502505
Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>
503506
Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>
504507
Lucas De Marchi <demarchi@kernel.org> <lucas.demarchi@intel.com>
@@ -585,6 +588,7 @@ Morten Welinder <terra@gnome.org>
585588
Morten Welinder <welinder@anemone.rentec.com>
586589
Morten Welinder <welinder@darter.rentec.com>
587590
Morten Welinder <welinder@troll.com>
591+
Muhammad Usama Anjum <usama.anjum@arm.com> <usama.anjum@collabora.com>
588592
Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org>
589593
Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
590594
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>

Documentation/ABI/testing/sysfs-block-zram

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ Description:
151151
The algorithm_params file is write-only and is used to setup
152152
compression algorithm parameters.
153153

154-
What: /sys/block/zram<id>/writeback_compressed
154+
What: /sys/block/zram<id>/compressed_writeback
155155
Date: Decemeber 2025
156156
Contact: Richard Chang <richardycc@google.com>
157157
Description:
158-
The writeback_compressed device atrribute toggles compressed
158+
The compressed_writeback device atrribute toggles compressed
159159
writeback feature.
160160

161161
What: /sys/block/zram<id>/writeback_batch_size

Documentation/PCI/pcieaer-howto.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@ In the example, 'Requester ID' means the ID of the device that sent
8585
the error message to the Root Port. Please refer to PCIe specs for other
8686
fields.
8787

88+
The 'TLP Header' is the prefix/header of the TLP that caused the error
89+
in raw hex format. To decode the TLP Header into human-readable form
90+
one may use tlp-tool:
91+
92+
https://github.com/mmpg-x86/tlp-tool
93+
94+
Example usage::
95+
96+
curl -L https://git.kernel.org/linus/2ca1c94ce0b6 | rtlp-tool --aer
97+
8898
AER Ratelimits
8999
--------------
90100

Documentation/admin-guide/blockdev/zram.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ writeback_limit WO specifies the maximum amount of write IO zram
216216
writeback_limit_enable RW show and set writeback_limit feature
217217
writeback_batch_size RW show and set maximum number of in-flight
218218
writeback operations
219-
writeback_compressed RW show and set compressed writeback feature
219+
compressed_writeback RW show and set compressed writeback feature
220220
comp_algorithm RW show and change the compression algorithm
221221
algorithm_params WO setup compression algorithm parameters
222222
compact WO trigger memory compaction
@@ -439,11 +439,11 @@ budget in next setting is user's job.
439439
By default zram stores written back pages in decompressed (raw) form, which
440440
means that writeback operation involves decompression of the page before
441441
writing it to the backing device. This behavior can be changed by enabling
442-
`writeback_compressed` feature, which causes zram to write compressed pages
442+
`compressed_writeback` feature, which causes zram to write compressed pages
443443
to the backing device, thus avoiding decompression overhead. To enable
444444
this feature, execute::
445445

446-
$ echo yes > /sys/block/zramX/writeback_compressed
446+
$ echo yes > /sys/block/zramX/compressed_writeback
447447

448448
Note that this feature should be configured before the `zramX` device is
449449
initialized.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8196,6 +8196,9 @@ Kernel parameters
81968196
p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT
81978197
(Reduce timeout of the SET_ADDRESS
81988198
request from 5000 ms to 500 ms);
8199+
q = USB_QUIRK_FORCE_ONE_CONFIG (Device
8200+
claims zero configurations,
8201+
forcing to 1);
81998202
Example: quirks=0781:5580:bk,0a5c:5834:gij
82008203

82018204
usbhid.mousepoll=

Documentation/core-api/dma-attributes.rst

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,33 @@ For architectures that require cache flushing for DMA coherence
149149
DMA_ATTR_MMIO will not perform any cache flushing. The address
150150
provided must never be mapped cacheable into the CPU.
151151

152-
DMA_ATTR_CPU_CACHE_CLEAN
153-
------------------------
154-
155-
This attribute indicates the CPU will not dirty any cacheline overlapping this
156-
DMA_FROM_DEVICE/DMA_BIDIRECTIONAL buffer while it is mapped. This allows
157-
multiple small buffers to safely share a cacheline without risk of data
158-
corruption, suppressing DMA debug warnings about overlapping mappings.
159-
All mappings sharing a cacheline should have this attribute.
152+
DMA_ATTR_DEBUGGING_IGNORE_CACHELINES
153+
------------------------------------
154+
155+
This attribute indicates that CPU cache lines may overlap for buffers mapped
156+
with DMA_FROM_DEVICE or DMA_BIDIRECTIONAL.
157+
158+
Such overlap may occur when callers map multiple small buffers that reside
159+
within the same cache line. In this case, callers must guarantee that the CPU
160+
will not dirty these cache lines after the mappings are established. When this
161+
condition is met, multiple buffers can safely share a cache line without risking
162+
data corruption.
163+
164+
All mappings that share a cache line must set this attribute to suppress DMA
165+
debug warnings about overlapping mappings.
166+
167+
DMA_ATTR_REQUIRE_COHERENT
168+
-------------------------
169+
170+
DMA mapping requests with the DMA_ATTR_REQUIRE_COHERENT fail on any
171+
system where SWIOTLB or cache management is required. This should only
172+
be used to support uAPI designs that require continuous HW DMA
173+
coherence with userspace processes, for example RDMA and DRM. At a
174+
minimum the memory being mapped must be userspace memory from
175+
pin_user_pages() or similar.
176+
177+
Drivers should consider using dma_mmap_pages() instead of this
178+
interface when building their uAPIs, when possible.
179+
180+
It must never be used in an in-kernel driver that only works with
181+
kernel memory.

Documentation/dev-tools/kunit/run_wrapper.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ command line arguments:
336336
- ``--list_tests_attr``: If set, lists all tests that will be run and all of their
337337
attributes.
338338

339+
- ``--list_suites``: If set, lists all suites that will be run.
340+
339341
Command-line completion
340342
==============================
341343

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ allOf:
253253
enum:
254254
# these platforms support 2 streams MST on some interfaces,
255255
# others are SST only
256-
- qcom,glymur-dp
257256
- qcom,sc8280xp-dp
258257
- qcom,x1e80100-dp
259258
then:
@@ -310,6 +309,26 @@ allOf:
310309
minItems: 6
311310
maxItems: 8
312311

312+
- if:
313+
properties:
314+
compatible:
315+
contains:
316+
enum:
317+
# these platforms support 2 streams MST on some interfaces,
318+
# others are SST only, but all controllers have 4 ports
319+
- qcom,glymur-dp
320+
then:
321+
properties:
322+
reg:
323+
minItems: 9
324+
maxItems: 9
325+
clocks:
326+
minItems: 5
327+
maxItems: 6
328+
clocks-names:
329+
minItems: 5
330+
maxItems: 6
331+
313332
unevaluatedProperties: false
314333

315334
examples:

Documentation/devicetree/bindings/display/msm/qcom,glymur-mdss.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,17 @@ examples:
176176
};
177177
};
178178
179-
displayport-controller@ae90000 {
179+
displayport-controller@af54000 {
180180
compatible = "qcom,glymur-dp";
181-
reg = <0xae90000 0x200>,
182-
<0xae90200 0x200>,
183-
<0xae90400 0x600>,
184-
<0xae91000 0x400>,
185-
<0xae91400 0x400>;
181+
reg = <0xaf54000 0x200>,
182+
<0xaf54200 0x200>,
183+
<0xaf55000 0xc00>,
184+
<0xaf56000 0x400>,
185+
<0xaf57000 0x400>,
186+
<0xaf58000 0x400>,
187+
<0xaf59000 0x400>,
188+
<0xaf5a000 0x600>,
189+
<0xaf5b000 0x600>;
186190
187191
interrupt-parent = <&mdss>;
188192
interrupts = <12>;

Documentation/devicetree/bindings/display/msm/qcom,sm8750-mdss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Krzysztof Kozlowski <krzk@kernel.org>
1111

1212
description:
13-
SM8650 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like
13+
SM8750 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like
1414
DPU display controller, DSI and DP interfaces etc.
1515

1616
$ref: /schemas/display/msm/mdss-common.yaml#

0 commit comments

Comments
 (0)