Skip to content

Commit 346bd8a

Browse files
committed
Merge tag 'asoc-fix-v6.16-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.16 A small collection of fixes, the main one being a fix for resume from hibernation on AMD systems, plus a few new quirk entries for AMD systems.
2 parents 5e95717 + 6c038b5 commit 346bd8a

File tree

690 files changed

+7332
-3240
lines changed

Some content is hidden

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

690 files changed

+7332
-3240
lines changed

.mailmap

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ Daniel Borkmann <[email protected]> <[email protected]>
197197
198198
199199
200+
200201
David Brownell <[email protected]>
201202
202203
@@ -282,6 +283,7 @@ Gustavo Padovan <[email protected]>
282283
Gustavo Padovan <[email protected]>
283284
284285
286+
285287
286288
287289
@@ -426,6 +428,9 @@ Krzysztof Wilczyński <[email protected]> <[email protected]>
426428
Krzysztof Wilczyński <[email protected]> <[email protected]>
427429
428430
Kuninori Morimoto <[email protected]>
431+
432+
433+
429434
430435
431436
@@ -688,9 +693,10 @@ Serge Hallyn <[email protected]> <[email protected]>
688693
689694
690695
691-
692-
693-
696+
697+
698+
699+
694700
Sharath Chandra Vurukala <[email protected]> <[email protected]>
695701
696702
@@ -719,6 +725,7 @@ Srinivas Ramana <[email protected]> <[email protected]>
719725
720726
721727
Stanislav Fomichev <[email protected]> <[email protected]>
728+
Stanislav Fomichev <[email protected]> <[email protected]>
722729
723730
Stéphane Witzmann <[email protected]>
724731

Documentation/admin-guide/cifs/usage.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ configured for Unix Extensions (and the client has not disabled
270270
illegal Windows/NTFS/SMB characters to a remap range (this mount parameter
271271
is the default for SMB3). This remap (``mapposix``) range is also
272272
compatible with Mac (and "Services for Mac" on some older Windows).
273+
When POSIX Extensions for SMB 3.1.1 are negotiated, remapping is automatically
274+
disabled.
273275

274276
CIFS VFS Mount Options
275277
======================

Documentation/arch/arm64/booting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ Before jumping into the kernel, the following conditions must be met:
234234

235235
- If the kernel is entered at EL1:
236236

237-
- ICC.SRE_EL2.Enable (bit 3) must be initialised to 0b1
237+
- ICC_SRE_EL2.Enable (bit 3) must be initialised to 0b1
238238
- ICC_SRE_EL2.SRE (bit 0) must be initialised to 0b1.
239239

240240
- The DT or ACPI tables must describe a GICv3 interrupt controller.

Documentation/block/ublk.rst

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,83 @@ For reaching best IO performance, ublk server should align its segment
352352
parameter of `struct ublk_param_segment` with backend for avoiding
353353
unnecessary IO split, which usually hurts io_uring performance.
354354

355+
Auto Buffer Registration
356+
------------------------
357+
358+
The ``UBLK_F_AUTO_BUF_REG`` feature automatically handles buffer registration
359+
and unregistration for I/O requests, which simplifies the buffer management
360+
process and reduces overhead in the ublk server implementation.
361+
362+
This is another feature flag for using zero copy, and it is compatible with
363+
``UBLK_F_SUPPORT_ZERO_COPY``.
364+
365+
Feature Overview
366+
~~~~~~~~~~~~~~~~
367+
368+
This feature automatically registers request buffers to the io_uring context
369+
before delivering I/O commands to the ublk server and unregisters them when
370+
completing I/O commands. This eliminates the need for manual buffer
371+
registration/unregistration via ``UBLK_IO_REGISTER_IO_BUF`` and
372+
``UBLK_IO_UNREGISTER_IO_BUF`` commands, then IO handling in ublk server
373+
can avoid dependency on the two uring_cmd operations.
374+
375+
IOs can't be issued concurrently to io_uring if there is any dependency
376+
among these IOs. So this way not only simplifies ublk server implementation,
377+
but also makes concurrent IO handling becomes possible by removing the
378+
dependency on buffer registration & unregistration commands.
379+
380+
Usage Requirements
381+
~~~~~~~~~~~~~~~~~~
382+
383+
1. The ublk server must create a sparse buffer table on the same ``io_ring_ctx``
384+
used for ``UBLK_IO_FETCH_REQ`` and ``UBLK_IO_COMMIT_AND_FETCH_REQ``. If
385+
uring_cmd is issued on a different ``io_ring_ctx``, manual buffer
386+
unregistration is required.
387+
388+
2. Buffer registration data must be passed via uring_cmd's ``sqe->addr`` with the
389+
following structure::
390+
391+
struct ublk_auto_buf_reg {
392+
__u16 index; /* Buffer index for registration */
393+
__u8 flags; /* Registration flags */
394+
__u8 reserved0; /* Reserved for future use */
395+
__u32 reserved1; /* Reserved for future use */
396+
};
397+
398+
ublk_auto_buf_reg_to_sqe_addr() is for converting the above structure into
399+
``sqe->addr``.
400+
401+
3. All reserved fields in ``ublk_auto_buf_reg`` must be zeroed.
402+
403+
4. Optional flags can be passed via ``ublk_auto_buf_reg.flags``.
404+
405+
Fallback Behavior
406+
~~~~~~~~~~~~~~~~~
407+
408+
If auto buffer registration fails:
409+
410+
1. When ``UBLK_AUTO_BUF_REG_FALLBACK`` is enabled:
411+
412+
- The uring_cmd is completed
413+
- ``UBLK_IO_F_NEED_REG_BUF`` is set in ``ublksrv_io_desc.op_flags``
414+
- The ublk server must manually deal with the failure, such as, register
415+
the buffer manually, or using user copy feature for retrieving the data
416+
for handling ublk IO
417+
418+
2. If fallback is not enabled:
419+
420+
- The ublk I/O request fails silently
421+
- The uring_cmd won't be completed
422+
423+
Limitations
424+
~~~~~~~~~~~
425+
426+
- Requires same ``io_ring_ctx`` for all operations
427+
- May require manual buffer management in fallback cases
428+
- io_ring_ctx buffer table has a max size of 16K, which may not be enough
429+
in case that too many ublk devices are handled by this single io_ring_ctx
430+
and each one has very large queue depth
431+
355432
References
356433
==========
357434

Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@ properties:
9797

9898
resets:
9999
items:
100-
- description: module reset
100+
- description:
101+
Module reset. This property is optional for controllers in Tegra194,
102+
Tegra234 etc where an internal software reset is available as an
103+
alternative.
101104

102105
reset-names:
103106
items:
@@ -116,6 +119,13 @@ properties:
116119
- const: rx
117120
- const: tx
118121

122+
required:
123+
- compatible
124+
- reg
125+
- interrupts
126+
- clocks
127+
- clock-names
128+
119129
allOf:
120130
- $ref: /schemas/i2c/i2c-controller.yaml
121131
- if:
@@ -169,6 +179,18 @@ allOf:
169179
properties:
170180
power-domains: false
171181

182+
- if:
183+
not:
184+
properties:
185+
compatible:
186+
contains:
187+
enum:
188+
- nvidia,tegra194-i2c
189+
then:
190+
required:
191+
- resets
192+
- reset-names
193+
172194
unevaluatedProperties: false
173195

174196
examples:

Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description: |
1515
Some peripherals such as PWM have their I/O go through the 4 "GPIOs".
1616
1717
maintainers:
18-
- Jianlong Huang <jianlong.huang@starfivetech.com>
18+
- Hal Feng <hal.feng@starfivetech.com>
1919

2020
properties:
2121
compatible:

Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ description: |
1818
any GPIO can be set up to be controlled by any of the peripherals.
1919
2020
maintainers:
21-
- Jianlong Huang <jianlong.huang@starfivetech.com>
21+
- Hal Feng <hal.feng@starfivetech.com>
2222

2323
properties:
2424
compatible:

Documentation/devicetree/bindings/pmem/pmem-region.txt

Lines changed: 0 additions & 65 deletions
This file was deleted.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pmem-region.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
maintainers:
8+
- Oliver O'Halloran <[email protected]>
9+
10+
title: Persistent Memory Regions
11+
12+
description: |
13+
Persistent memory refers to a class of memory devices that are:
14+
15+
a) Usable as main system memory (i.e. cacheable), and
16+
b) Retain their contents across power failure.
17+
18+
Given b) it is best to think of persistent memory as a kind of memory mapped
19+
storage device. To ensure data integrity the operating system needs to manage
20+
persistent regions separately to the normal memory pool. To aid with that this
21+
binding provides a standardised interface for discovering where persistent
22+
memory regions exist inside the physical address space.
23+
24+
properties:
25+
compatible:
26+
const: pmem-region
27+
28+
reg:
29+
maxItems: 1
30+
31+
volatile:
32+
description:
33+
Indicates the region is volatile (non-persistent) and the OS can skip
34+
cache flushes for writes
35+
type: boolean
36+
37+
required:
38+
- compatible
39+
- reg
40+
41+
additionalProperties: false
42+
43+
examples:
44+
- |
45+
pmem@5000 {
46+
compatible = "pmem-region";
47+
reg = <0x00005000 0x00001000>;
48+
};

Documentation/filesystems/proc.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,6 @@ encoded manner. The codes are the following:
584584
ms may share
585585
gd stack segment growns down
586586
pf pure PFN range
587-
dw disabled write to the mapped file
588587
lo pages are locked in memory
589588
io memory mapped I/O area
590589
sr sequential read advise provided
@@ -607,8 +606,11 @@ encoded manner. The codes are the following:
607606
mt arm64 MTE allocation tags are enabled
608607
um userfaultfd missing tracking
609608
uw userfaultfd wr-protect tracking
609+
ui userfaultfd minor fault
610610
ss shadow/guarded control stack page
611611
sl sealed
612+
lf lock on fault pages
613+
dp always lazily freeable mapping
612614
== =======================================
613615

614616
Note that there is no guarantee that every flag and associated mnemonic will

0 commit comments

Comments
 (0)