Skip to content

Commit c8e9cec

Browse files
Automatic merge of 'next' into merge (2025-06-23 18:21)
2 parents 547fe2e + 86731a2 commit c8e9cec

394 files changed

Lines changed: 5094 additions & 1892 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
197197
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
198198
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
199199
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
200+
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
200201
David Brownell <david-b@pacbell.net>
201202
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
202203
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
@@ -282,6 +283,7 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br>
282283
Gustavo Padovan <padovan@profusion.mobi>
283284
Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>
284285
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
286+
Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>
285287
Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>
286288
Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
287289
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
@@ -691,9 +693,10 @@ Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
691693
Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
692694
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
693695
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
694-
Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
695-
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>
696-
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>
696+
Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>
697+
Shannon Nelson <sln@onemain.com> <snelson@pensando.io>
698+
Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>
699+
Shannon Nelson <sln@onemain.com> <shannon.nelson@oracle.com>
697700
Sharath Chandra Vurukala <quic_sharathv@quicinc.com> <sharathv@codeaurora.org>
698701
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
699702
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

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/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/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 <oohall@gmail.com>
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/gpu/nouveau.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ providing a consistent API to upper layers of the driver stack.
2525
GSP Support
2626
------------------------
2727

28-
.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
28+
.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
2929
:doc: GSP message queue element
3030

3131
.. kernel-doc:: drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h

Documentation/netlink/specs/ethtool.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ protocol: genetlink-legacy
77
doc: Partial family for Ethtool Netlink.
88
uapi-header: linux/ethtool_netlink_generated.h
99

10+
c-family-name: ethtool-genl-name
11+
c-version-name: ethtool-genl-version
12+
1013
definitions:
1114
-
1215
name: udp-tunnel-type

Documentation/process/embargoed-hardware-issues.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ an involved disclosed party. The current ambassadors list:
290290
AMD Tom Lendacky <thomas.lendacky@amd.com>
291291
Ampere Darren Hart <darren@os.amperecomputing.com>
292292
ARM Catalin Marinas <catalin.marinas@arm.com>
293+
IBM Power Madhavan Srinivasan <maddy@linux.ibm.com>
293294
IBM Z Christian Borntraeger <borntraeger@de.ibm.com>
294295
Intel Tony Luck <tony.luck@intel.com>
295296
Qualcomm Trilok Soni <quic_tsoni@quicinc.com>

Documentation/sound/codecs/cs35l56.rst

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. SPDX-License-Identifier: GPL-2.0-only
22
3-
=====================================================================
4-
Audio drivers for Cirrus Logic CS35L54/56/57 Boosted Smart Amplifiers
5-
=====================================================================
3+
========================================================================
4+
Audio drivers for Cirrus Logic CS35L54/56/57/63 Boosted Smart Amplifiers
5+
========================================================================
66
:Copyright: 2025 Cirrus Logic, Inc. and
77
Cirrus Logic International Semiconductor Ltd.
88

@@ -13,11 +13,11 @@ Summary
1313

1414
The high-level summary of this document is:
1515

16-
**If you have a laptop that uses CS35L54/56/57 amplifiers but audio is not
16+
**If you have a laptop that uses CS35L54/56/57/63 amplifiers but audio is not
1717
working, DO NOT ATTEMPT TO USE FIRMWARE AND SETTINGS FROM ANOTHER LAPTOP,
1818
EVEN IF THAT LAPTOP SEEMS SIMILAR.**
1919

20-
The CS35L54/56/57 amplifiers must be correctly configured for the power
20+
The CS35L54/56/57/63 amplifiers must be correctly configured for the power
2121
supply voltage, speaker impedance, maximum speaker voltage/current, and
2222
other external hardware connections.
2323

@@ -34,6 +34,7 @@ The cs35l56 drivers support:
3434
* CS35L54
3535
* CS35L56
3636
* CS35L57
37+
* CS35L63
3738

3839
There are two drivers in the kernel
3940

@@ -104,19 +105,32 @@ In this example the SSID is 10280c63.
104105

105106
The format of the firmware file names is:
106107

108+
SoundWire (except CS35L56 Rev B0):
109+
cs35lxx-b0-dsp1-misc-SSID[-spkidX]-l?u?
110+
111+
SoundWire CS35L56 Rev B0:
112+
cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN
113+
114+
Non-SoundWire (HDA and I2S):
107115
cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN
108116

109117
Where:
110118

111119
* cs35lxx-b0 is the amplifier model and silicon revision. This information
112120
is logged by the driver during initialization.
113121
* SSID is the 8-digit hexadecimal SSID value.
122+
* l?u? is the physical address on the SoundWire bus of the amp this
123+
file applies to.
114124
* ampN is the amplifier number (for example amp1). This is the same as
115125
the prefix on the ALSA control names except that it is always lower-case
116126
in the file name.
117127
* spkidX is an optional part, used for laptops that have firmware
118128
configurations for different makes and models of internal speakers.
119129

130+
The CS35L56 Rev B0 continues to use the old filename scheme because a
131+
large number of firmware files have already been published with these
132+
names.
133+
120134
Sound Open Firmware and ALSA topology files
121135
-------------------------------------------
122136

Documentation/virt/kvm/api.rst

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6645,7 +6645,8 @@ to the byte array.
66456645
.. note::
66466646

66476647
For KVM_EXIT_IO, KVM_EXIT_MMIO, KVM_EXIT_OSI, KVM_EXIT_PAPR, KVM_EXIT_XEN,
6648-
KVM_EXIT_EPR, KVM_EXIT_X86_RDMSR and KVM_EXIT_X86_WRMSR the corresponding
6648+
KVM_EXIT_EPR, KVM_EXIT_HYPERCALL, KVM_EXIT_TDX,
6649+
KVM_EXIT_X86_RDMSR and KVM_EXIT_X86_WRMSR the corresponding
66496650
operations are complete (and guest state is consistent) only after userspace
66506651
has re-entered the kernel with KVM_RUN. The kernel side will first finish
66516652
incomplete operations and then check for pending signals.
@@ -7174,6 +7175,62 @@ The valid value for 'flags' is:
71747175
- KVM_NOTIFY_CONTEXT_INVALID -- the VM context is corrupted and not valid
71757176
in VMCS. It would run into unknown result if resume the target VM.
71767177

7178+
::
7179+
7180+
/* KVM_EXIT_TDX */
7181+
struct {
7182+
__u64 flags;
7183+
__u64 nr;
7184+
union {
7185+
struct {
7186+
u64 ret;
7187+
u64 data[5];
7188+
} unknown;
7189+
struct {
7190+
u64 ret;
7191+
u64 gpa;
7192+
u64 size;
7193+
} get_quote;
7194+
struct {
7195+
u64 ret;
7196+
u64 leaf;
7197+
u64 r11, r12, r13, r14;
7198+
} get_tdvmcall_info;
7199+
};
7200+
} tdx;
7201+
7202+
Process a TDVMCALL from the guest. KVM forwards select TDVMCALL based
7203+
on the Guest-Hypervisor Communication Interface (GHCI) specification;
7204+
KVM bridges these requests to the userspace VMM with minimal changes,
7205+
placing the inputs in the union and copying them back to the guest
7206+
on re-entry.
7207+
7208+
Flags are currently always zero, whereas ``nr`` contains the TDVMCALL
7209+
number from register R11. The remaining field of the union provide the
7210+
inputs and outputs of the TDVMCALL. Currently the following values of
7211+
``nr`` are defined:
7212+
7213+
* ``TDVMCALL_GET_QUOTE``: the guest has requested to generate a TD-Quote
7214+
signed by a service hosting TD-Quoting Enclave operating on the host.
7215+
Parameters and return value are in the ``get_quote`` field of the union.
7216+
The ``gpa`` field and ``size`` specify the guest physical address
7217+
(without the shared bit set) and the size of a shared-memory buffer, in
7218+
which the TDX guest passes a TD Report. The ``ret`` field represents
7219+
the return value of the GetQuote request. When the request has been
7220+
queued successfully, the TDX guest can poll the status field in the
7221+
shared-memory area to check whether the Quote generation is completed or
7222+
not. When completed, the generated Quote is returned via the same buffer.
7223+
7224+
* ``TDVMCALL_GET_TD_VM_CALL_INFO``: the guest has requested the support
7225+
status of TDVMCALLs. The output values for the given leaf should be
7226+
placed in fields from ``r11`` to ``r14`` of the ``get_tdvmcall_info``
7227+
field of the union.
7228+
7229+
KVM may add support for more values in the future that may cause a userspace
7230+
exit, even without calls to ``KVM_ENABLE_CAP`` or similar. In this case,
7231+
it will enter with output fields already valid; in the common case, the
7232+
``unknown.ret`` field of the union will be ``TDVMCALL_STATUS_SUBFUNC_UNSUPPORTED``.
7233+
Userspace need not do anything if it does not wish to support a TDVMCALL.
71777234
::
71787235

71797236
/* Fix the size of the union. */

0 commit comments

Comments
 (0)