Skip to content

Commit f401b2c

Browse files
committed
Merge tag 'asoc-v5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.10 Not a huge amount going on in the core for ASoC this time but quite a lot of driver activity, especially for the Intel platforms: - Replacement of the DSP driver for some older x86 systems with a new one which was written with closer reference to the DSP firmware so should hopefully be more robust and maintainable. - A big batch of static checker and other fixes for the rest of the x86 DSP drivers. - Cleanup of the error unwinding code from Morimoto-san, hopefully making it more robust. - Helpers for parsing auxiluary devices from the device tree from Stephan Gerhold. - New support for AllWinner A64, Cirrus Logic CS4234, Mediatek MT6359 Microchip S/PDIF TX and RX controllers, Realtek RT1015P, and Texas Instruments J721E, TAS2110, TAS2564 and TAS2764
2 parents a6e7d0a + c890e30 commit f401b2c

File tree

2,612 files changed

+39246
-22648
lines changed

Some content is hidden

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

2,612 files changed

+39246
-22648
lines changed

.clang-format

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ ForEachMacros:
111111
- 'css_for_each_descendant_pre'
112112
- 'device_for_each_child_node'
113113
- 'dma_fence_chain_for_each'
114+
- 'do_for_each_ftrace_op'
114115
- 'drm_atomic_crtc_for_each_plane'
115116
- 'drm_atomic_crtc_state_for_each_plane'
116117
- 'drm_atomic_crtc_state_for_each_plane_state'
@@ -136,6 +137,7 @@ ForEachMacros:
136137
- 'for_each_active_dev_scope'
137138
- 'for_each_active_drhd_unit'
138139
- 'for_each_active_iommu'
140+
- 'for_each_aggr_pgid'
139141
- 'for_each_available_child_of_node'
140142
- 'for_each_bio'
141143
- 'for_each_board_func_rsrc'
@@ -234,6 +236,7 @@ ForEachMacros:
234236
- 'for_each_node_state'
235237
- 'for_each_node_with_cpus'
236238
- 'for_each_node_with_property'
239+
- 'for_each_nonreserved_multicast_dest_pgid'
237240
- 'for_each_of_allnodes'
238241
- 'for_each_of_allnodes_from'
239242
- 'for_each_of_cpu_node'
@@ -256,6 +259,7 @@ ForEachMacros:
256259
- 'for_each_pci_dev'
257260
- 'for_each_pci_msi_entry'
258261
- 'for_each_pcm_streams'
262+
- 'for_each_physmem_range'
259263
- 'for_each_populated_zone'
260264
- 'for_each_possible_cpu'
261265
- 'for_each_present_cpu'
@@ -265,6 +269,8 @@ ForEachMacros:
265269
- 'for_each_process_thread'
266270
- 'for_each_property_of_node'
267271
- 'for_each_registered_fb'
272+
- 'for_each_requested_gpio'
273+
- 'for_each_requested_gpio_in_range'
268274
- 'for_each_reserved_mem_region'
269275
- 'for_each_rtd_codec_dais'
270276
- 'for_each_rtd_codec_dais_rollback'
@@ -278,12 +284,17 @@ ForEachMacros:
278284
- 'for_each_sg'
279285
- 'for_each_sg_dma_page'
280286
- 'for_each_sg_page'
287+
- 'for_each_sgtable_dma_page'
288+
- 'for_each_sgtable_dma_sg'
289+
- 'for_each_sgtable_page'
290+
- 'for_each_sgtable_sg'
281291
- 'for_each_sibling_event'
282292
- 'for_each_subelement'
283293
- 'for_each_subelement_extid'
284294
- 'for_each_subelement_id'
285295
- '__for_each_thread'
286296
- 'for_each_thread'
297+
- 'for_each_unicast_dest_pgid'
287298
- 'for_each_wakeup_source'
288299
- 'for_each_zone'
289300
- 'for_each_zone_zonelist'
@@ -464,6 +475,7 @@ ForEachMacros:
464475
- 'v4l2_m2m_for_each_src_buf'
465476
- 'v4l2_m2m_for_each_src_buf_safe'
466477
- 'virtio_device_for_each_vq'
478+
- 'while_for_each_ftrace_op'
467479
- 'xa_for_each'
468480
- 'xa_for_each_marked'
469481
- 'xa_for_each_range'

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ Juha Yrjola <[email protected]>
169169
170170
171171
Kay Sievers <[email protected]>
172+
173+
174+
175+
172176
Kenneth W Chen <[email protected]>
173177
Konstantin Khlebnikov <[email protected]> <[email protected]>
174178
Konstantin Khlebnikov <[email protected]> <[email protected]>
@@ -308,6 +312,7 @@ Tony Luck <[email protected]>
308312
309313
310314
Tsuneo Yoshioka <[email protected]>
315+
311316
Uwe Kleine-König <[email protected]>
312317
Uwe Kleine-König <[email protected]>
313318
Uwe Kleine-König <[email protected]>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: /sys/devices/pci0000:00/<dev>/fw_version
2+
Date: September 2020
3+
Contact: Cezary Rojewski <[email protected]>
4+
Description:
5+
Version of AudioDSP firmware ASoC catpt driver is
6+
communicating with.
7+
Format: %d.%d.%d.%d, type:major:minor:build.
8+
9+
What: /sys/devices/pci0000:00/<dev>/fw_info
10+
Date: September 2020
11+
Contact: Cezary Rojewski <[email protected]>
12+
Description:
13+
Detailed AudioDSP firmware build information including
14+
build hash and log-providers hash. This information is
15+
obtained during initial handshake with firmware.
16+
Format: %s.

Documentation/RCU/lockdep.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ checking of rcu_dereference() primitives:
4949
is invoked by both RCU-sched readers and updaters.
5050
srcu_dereference_check(p, c):
5151
Use explicit check expression "c" along with
52-
srcu_read_lock_held()(). This is useful in code that
52+
srcu_read_lock_held(). This is useful in code that
5353
is invoked by both SRCU readers and updaters.
5454
rcu_dereference_raw(p):
5555
Don't check. (Use sparingly, if at all.)

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,15 +1324,26 @@ PAGE_SIZE multiple when read back.
13241324
pgmajfault
13251325
Number of major page faults incurred
13261326

1327-
workingset_refault
1328-
Number of refaults of previously evicted pages
1327+
workingset_refault_anon
1328+
Number of refaults of previously evicted anonymous pages.
13291329

1330-
workingset_activate
1331-
Number of refaulted pages that were immediately activated
1330+
workingset_refault_file
1331+
Number of refaults of previously evicted file pages.
13321332

1333-
workingset_restore
1334-
Number of restored pages which have been detected as an active
1335-
workingset before they got reclaimed.
1333+
workingset_activate_anon
1334+
Number of refaulted anonymous pages that were immediately
1335+
activated.
1336+
1337+
workingset_activate_file
1338+
Number of refaulted file pages that were immediately activated.
1339+
1340+
workingset_restore_anon
1341+
Number of restored anonymous pages which have been detected as
1342+
an active workingset before they got reclaimed.
1343+
1344+
workingset_restore_file
1345+
Number of restored file pages which have been detected as an
1346+
active workingset before they got reclaimed.
13361347

13371348
workingset_nodereclaim
13381349
Number of times a shadow node has been reclaimed

Documentation/admin-guide/device-mapper/dm-crypt.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Parameters::
6767
the value passed in <key_size>.
6868

6969
<key_type>
70-
Either 'logon' or 'user' kernel key type.
70+
Either 'logon', 'user' or 'encrypted' kernel key type.
7171

7272
<key_description>
7373
The kernel keyring key description crypt target should look for
@@ -121,6 +121,14 @@ submit_from_crypt_cpus
121121
thread because it benefits CFQ to have writes submitted using the
122122
same context.
123123

124+
no_read_workqueue
125+
Bypass dm-crypt internal workqueue and process read requests synchronously.
126+
127+
no_write_workqueue
128+
Bypass dm-crypt internal workqueue and process write requests synchronously.
129+
This option is automatically enabled for host-managed zoned block devices
130+
(e.g. host-managed SMR hard-disks).
131+
124132
integrity:<bytes>:<type>
125133
The device requires additional <bytes> metadata per-sector stored
126134
in per-bio integrity structure. This metadata must by provided

Documentation/admin-guide/devices.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@
16621662

16631663
98 block User-mode virtual block device
16641664
0 = /dev/ubda First user-mode block device
1665-
16 = /dev/udbb Second user-mode block device
1665+
16 = /dev/ubdb Second user-mode block device
16661666
...
16671667

16681668
Partitions are handled in the same way as for IDE

Documentation/admin-guide/dynamic-debug-howto.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ against. Possible keywords are:::
156156
``line-range`` cannot contain space, e.g.
157157
"1-30" is valid range but "1 - 30" is not.
158158

159-
``module=foo`` combined keyword=value form is interchangably accepted
160159

161160
The meanings of each keyword are:
162161

Documentation/admin-guide/laptops/thinkpad-acpi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ on the feature, restricting the viewing angles.
14341434

14351435

14361436
DYTC Lapmode sensor
1437-
------------------
1437+
-------------------
14381438

14391439
sysfs: dytc_lapmode
14401440

Documentation/admin-guide/pm/cpuidle.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ which of the two parameters is added to the kernel command line. In the
690690
instruction of the CPUs (which, as a rule, suspends the execution of the program
691691
and causes the hardware to attempt to enter the shallowest available idle state)
692692
for this purpose, and if ``idle=poll`` is used, idle CPUs will execute a
693-
more or less ``lightweight'' sequence of instructions in a tight loop. [Note
693+
more or less "lightweight" sequence of instructions in a tight loop. [Note
694694
that using ``idle=poll`` is somewhat drastic in many cases, as preventing idle
695695
CPUs from saving almost any energy at all may not be the only effect of it.
696696
For example, on Intel hardware it effectively prevents CPUs from using

0 commit comments

Comments
 (0)