Skip to content

Commit bfd2912

Browse files
committed
ASoC: codec: Convert to GPIO descriptors for
Merge series from Peng Fan <[email protected]>: This patchset is a pick up of patch 1,2 from [1]. And I also collect Linus's R-b for patch 2. After this patchset, there is only one user of of_gpio.h left in sound driver(pxa2xx-ac97). of_gpio.h is deprecated, update the driver to use GPIO descriptors. Patch 1 is to drop legacy platform data which in-tree no users are using it Patch 2 is to convert to GPIO descriptors Checking the DTS that use the device, all are using GPIOD_ACTIVE_LOW polarity for reset-gpios, so all should work as expected with this patch. [1] https://lore.kernel.org/all/[email protected]/
2 parents e977f38 + 790d5f8 commit bfd2912

File tree

268 files changed

+2982
-1315
lines changed

Some content is hidden

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

268 files changed

+2982
-1315
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ Kenneth W Chen <[email protected]>
416416
417417
418418
419+
Kirill A. Shutemov <[email protected]> <[email protected]>
419420
Kishon Vijay Abraham I <[email protected]> <[email protected]>
420421
421422

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ What: /sys/devices/system/cpu/vulnerabilities
584584
/sys/devices/system/cpu/vulnerabilities/spectre_v1
585585
/sys/devices/system/cpu/vulnerabilities/spectre_v2
586586
/sys/devices/system/cpu/vulnerabilities/srbds
587+
/sys/devices/system/cpu/vulnerabilities/tsa
587588
/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
588589
Date: January 2018
589590
Contact: Linux kernel mailing list <[email protected]>

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,12 +1732,6 @@ The following nested keys are defined.
17321732
numa_hint_faults (npn)
17331733
Number of NUMA hinting faults.
17341734

1735-
numa_task_migrated (npn)
1736-
Number of task migration by NUMA balancing.
1737-
1738-
numa_task_swapped (npn)
1739-
Number of task swap by NUMA balancing.
1740-
17411735
pgdemote_kswapd
17421736
Number of pages demoted by kswapd.
17431737

Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ This is achieved by using the otherwise unused and obsolete VERW instruction in
157157
combination with a microcode update. The microcode clears the affected CPU
158158
buffers when the VERW instruction is executed.
159159

160-
Kernel reuses the MDS function to invoke the buffer clearing:
161-
162-
mds_clear_cpu_buffers()
160+
Kernel does the buffer clearing with x86_clear_cpu_buffers().
163161

164162
On MDS affected CPUs, the kernel already invokes CPU buffer clear on
165163
kernel/userspace, hypervisor/guest and C-state (idle) transitions. No

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7488,6 +7488,19 @@
74887488
having this key zero'ed is acceptable. E.g. in testing
74897489
scenarios.
74907490

7491+
tsa= [X86] Control mitigation for Transient Scheduler
7492+
Attacks on AMD CPUs. Search the following in your
7493+
favourite search engine for more details:
7494+
7495+
"Technical guidance for mitigating transient scheduler
7496+
attacks".
7497+
7498+
off - disable the mitigation
7499+
on - enable the mitigation (default)
7500+
user - mitigate only user/kernel transitions
7501+
vm - mitigate only guest/host transitions
7502+
7503+
74917504
tsc= Disable clocksource stability checks for TSC.
74927505
Format: <string>
74937506
[x86] reliable: mark tsc clocksource as reliable, this

Documentation/arch/x86/mds.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ enters a C-state.
9393

9494
The kernel provides a function to invoke the buffer clearing:
9595

96-
mds_clear_cpu_buffers()
96+
x86_clear_cpu_buffers()
9797

9898
Also macro CLEAR_CPU_BUFFERS can be used in ASM late in exit-to-user path.
9999
Other than CFLAGS.ZF, this macro doesn't clobber any registers.
@@ -185,9 +185,9 @@ Mitigation points
185185
idle clearing would be a window dressing exercise and is therefore not
186186
activated.
187187

188-
The invocation is controlled by the static key mds_idle_clear which is
189-
switched depending on the chosen mitigation mode and the SMT state of
190-
the system.
188+
The invocation is controlled by the static key cpu_buf_idle_clear which is
189+
switched depending on the chosen mitigation mode and the SMT state of the
190+
system.
191191

192192
The buffer clear is only invoked before entering the C-State to prevent
193193
that stale data from the idling CPU from spilling to the Hyper-Thread

Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ properties:
5252
'#clock-cells':
5353
const: 1
5454

55+
'#reset-cells':
56+
const: 1
57+
5558
required:
5659
- compatible
5760
- reg

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ properties:
2323
- allwinner,sun20i-d1-emac
2424
- allwinner,sun50i-h6-emac
2525
- allwinner,sun50i-h616-emac0
26-
- allwinner,sun55i-a523-emac0
26+
- allwinner,sun55i-a523-gmac0
2727
- const: allwinner,sun50i-a64-emac
2828

2929
reg:

Documentation/virt/kvm/api.rst

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7196,6 +7196,10 @@ The valid value for 'flags' is:
71967196
u64 leaf;
71977197
u64 r11, r12, r13, r14;
71987198
} get_tdvmcall_info;
7199+
struct {
7200+
u64 ret;
7201+
u64 vector;
7202+
} setup_event_notify;
71997203
};
72007204
} tdx;
72017205

@@ -7210,21 +7214,24 @@ number from register R11. The remaining field of the union provide the
72107214
inputs and outputs of the TDVMCALL. Currently the following values of
72117215
``nr`` are defined:
72127216

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.
7217+
* ``TDVMCALL_GET_QUOTE``: the guest has requested to generate a TD-Quote
7218+
signed by a service hosting TD-Quoting Enclave operating on the host.
7219+
Parameters and return value are in the ``get_quote`` field of the union.
7220+
The ``gpa`` field and ``size`` specify the guest physical address
7221+
(without the shared bit set) and the size of a shared-memory buffer, in
7222+
which the TDX guest passes a TD Report. The ``ret`` field represents
7223+
the return value of the GetQuote request. When the request has been
7224+
queued successfully, the TDX guest can poll the status field in the
7225+
shared-memory area to check whether the Quote generation is completed or
7226+
not. When completed, the generated Quote is returned via the same buffer.
7227+
7228+
* ``TDVMCALL_GET_TD_VM_CALL_INFO``: the guest has requested the support
7229+
status of TDVMCALLs. The output values for the given leaf should be
7230+
placed in fields from ``r11`` to ``r14`` of the ``get_tdvmcall_info``
7231+
field of the union.
7232+
7233+
* ``TDVMCALL_SETUP_EVENT_NOTIFY_INTERRUPT``: the guest has requested to
7234+
set up a notification interrupt for vector ``vector``.
72287235

72297236
KVM may add support for more values in the future that may cause a userspace
72307237
exit, even without calls to ``KVM_ENABLE_CAP`` or similar. In this case,

Documentation/virt/kvm/x86/intel-tdx.rst

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,20 @@ to be configured to the TDX guest.
7979
struct kvm_tdx_capabilities {
8080
__u64 supported_attrs;
8181
__u64 supported_xfam;
82-
__u64 reserved[254];
82+
83+
/* TDG.VP.VMCALL hypercalls executed in kernel and forwarded to
84+
* userspace, respectively
85+
*/
86+
__u64 kernel_tdvmcallinfo_1_r11;
87+
__u64 user_tdvmcallinfo_1_r11;
88+
89+
/* TDG.VP.VMCALL instruction executions subfunctions executed in kernel
90+
* and forwarded to userspace, respectively
91+
*/
92+
__u64 kernel_tdvmcallinfo_1_r12;
93+
__u64 user_tdvmcallinfo_1_r12;
94+
95+
__u64 reserved[250];
8396

8497
/* Configurable CPUID bits for userspace */
8598
struct kvm_cpuid2 cpuid;

0 commit comments

Comments
 (0)