Skip to content

Commit c8d430d

Browse files
committed
Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.12, take #1 - Fix pKVM error path on init, making sure we do not change critical system registers as we're about to fail - Make sure that the host's vector length is at capped by a value common to all CPUs - Fix kvm_has_feat*() handling of "negative" features, as the current code is pretty broken - Promote Joey to the status of official reviewer, while James steps down -- hopefully only temporarly
2 parents 2a5fe5a + a1d402a commit c8d430d

File tree

11,401 files changed

+458936
-198175
lines changed

Some content is hidden

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

11,401 files changed

+458936
-198175
lines changed

.clang-format

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,13 @@ ForEachMacros:
141141
- 'damon_for_each_target_safe'
142142
- 'damos_for_each_filter'
143143
- 'damos_for_each_filter_safe'
144+
- 'damos_for_each_quota_goal'
145+
- 'damos_for_each_quota_goal_safe'
144146
- 'data__for_each_file'
145147
- 'data__for_each_file_new'
146148
- 'data__for_each_file_start'
147149
- 'device_for_each_child_node'
148-
- 'displayid_iter_for_each'
150+
- 'device_for_each_child_node_scoped'
149151
- 'dma_fence_array_for_each'
150152
- 'dma_fence_chain_for_each'
151153
- 'dma_fence_unwrap_for_each'
@@ -172,11 +174,14 @@ ForEachMacros:
172174
- 'drm_for_each_plane'
173175
- 'drm_for_each_plane_mask'
174176
- 'drm_for_each_privobj'
175-
- 'drm_gem_for_each_gpuva'
176-
- 'drm_gem_for_each_gpuva_safe'
177+
- 'drm_gem_for_each_gpuvm_bo'
178+
- 'drm_gem_for_each_gpuvm_bo_safe'
177179
- 'drm_gpuva_for_each_op'
178180
- 'drm_gpuva_for_each_op_from_reverse'
181+
- 'drm_gpuva_for_each_op_reverse'
179182
- 'drm_gpuva_for_each_op_safe'
183+
- 'drm_gpuvm_bo_for_each_va'
184+
- 'drm_gpuvm_bo_for_each_va_safe'
180185
- 'drm_gpuvm_for_each_va'
181186
- 'drm_gpuvm_for_each_va_range'
182187
- 'drm_gpuvm_for_each_va_range_safe'
@@ -192,11 +197,11 @@ ForEachMacros:
192197
- 'dsa_switch_for_each_port_continue_reverse'
193198
- 'dsa_switch_for_each_port_safe'
194199
- 'dsa_switch_for_each_user_port'
200+
- 'dsa_switch_for_each_user_port_continue_reverse'
195201
- 'dsa_tree_for_each_cpu_port'
196202
- 'dsa_tree_for_each_user_port'
197203
- 'dsa_tree_for_each_user_port_continue_reverse'
198204
- 'dso__for_each_symbol'
199-
- 'dsos__for_each_with_build_id'
200205
- 'elf_hash_for_each_possible'
201206
- 'elf_symtab__for_each_symbol'
202207
- 'evlist__for_each_cpu'
@@ -216,6 +221,7 @@ ForEachMacros:
216221
- 'for_each_and_bit'
217222
- 'for_each_andnot_bit'
218223
- 'for_each_available_child_of_node'
224+
- 'for_each_available_child_of_node_scoped'
219225
- 'for_each_bench'
220226
- 'for_each_bio'
221227
- 'for_each_board_func_rsrc'
@@ -234,6 +240,7 @@ ForEachMacros:
234240
- 'for_each_card_widgets_safe'
235241
- 'for_each_cgroup_storage_type'
236242
- 'for_each_child_of_node'
243+
- 'for_each_child_of_node_scoped'
237244
- 'for_each_clear_bit'
238245
- 'for_each_clear_bit_from'
239246
- 'for_each_clear_bitrange'
@@ -251,6 +258,7 @@ ForEachMacros:
251258
- 'for_each_cpu'
252259
- 'for_each_cpu_and'
253260
- 'for_each_cpu_andnot'
261+
- 'for_each_cpu_from'
254262
- 'for_each_cpu_or'
255263
- 'for_each_cpu_wrap'
256264
- 'for_each_dapm_widgets'
@@ -269,13 +277,14 @@ ForEachMacros:
269277
- 'for_each_element'
270278
- 'for_each_element_extid'
271279
- 'for_each_element_id'
280+
- 'for_each_enabled_cpu'
272281
- 'for_each_endpoint_of_node'
273282
- 'for_each_event'
274283
- 'for_each_event_tps'
275284
- 'for_each_evictable_lru'
276285
- 'for_each_fib6_node_rt_rcu'
277286
- 'for_each_fib6_walker_rt'
278-
- 'for_each_free_mem_pfn_range_in_zone'
287+
- 'for_each_file_lock'
279288
- 'for_each_free_mem_pfn_range_in_zone_from'
280289
- 'for_each_free_mem_range'
281290
- 'for_each_free_mem_range_reverse'
@@ -286,15 +295,18 @@ ForEachMacros:
286295
- 'for_each_group_member'
287296
- 'for_each_group_member_head'
288297
- 'for_each_hstate'
298+
- 'for_each_hwgpio'
289299
- 'for_each_if'
290300
- 'for_each_inject_fn'
291301
- 'for_each_insn'
302+
- 'for_each_insn_op_loc'
292303
- 'for_each_insn_prefix'
293304
- 'for_each_intid'
294305
- 'for_each_iommu'
295306
- 'for_each_ip_tunnel_rcu'
296307
- 'for_each_irq_nr'
297308
- 'for_each_lang'
309+
- 'for_each_link_ch_maps'
298310
- 'for_each_link_codecs'
299311
- 'for_each_link_cpus'
300312
- 'for_each_link_platforms'
@@ -332,6 +344,9 @@ ForEachMacros:
332344
- 'for_each_new_plane_in_state_reverse'
333345
- 'for_each_new_private_obj_in_state'
334346
- 'for_each_new_reg'
347+
- 'for_each_nhlt_endpoint'
348+
- 'for_each_nhlt_endpoint_fmtcfg'
349+
- 'for_each_nhlt_fmtcfg'
335350
- 'for_each_node'
336351
- 'for_each_node_by_name'
337352
- 'for_each_node_by_type'
@@ -387,12 +402,15 @@ ForEachMacros:
387402
- 'for_each_reloc_from'
388403
- 'for_each_requested_gpio'
389404
- 'for_each_requested_gpio_in_range'
405+
- 'for_each_reserved_child_of_node'
390406
- 'for_each_reserved_mem_range'
391407
- 'for_each_reserved_mem_region'
408+
- 'for_each_rtd_ch_maps'
392409
- 'for_each_rtd_codec_dais'
393410
- 'for_each_rtd_components'
394411
- 'for_each_rtd_cpu_dais'
395412
- 'for_each_rtd_dais'
413+
- 'for_each_rtd_dais_reverse'
396414
- 'for_each_sband_iftype_data'
397415
- 'for_each_script'
398416
- 'for_each_sec'
@@ -533,8 +551,6 @@ ForEachMacros:
533551
- 'lwq_for_each_safe'
534552
- 'map__for_each_symbol'
535553
- 'map__for_each_symbol_by_name'
536-
- 'maps__for_each_entry'
537-
- 'maps__for_each_entry_safe'
538554
- 'mas_for_each'
539555
- 'mci_for_each_dimm'
540556
- 'media_device_for_each_entity'
@@ -560,7 +576,9 @@ ForEachMacros:
560576
- 'netdev_hw_addr_list_for_each'
561577
- 'nft_rule_for_each_expr'
562578
- 'nla_for_each_attr'
579+
- 'nla_for_each_attr_type'
563580
- 'nla_for_each_nested'
581+
- 'nla_for_each_nested_type'
564582
- 'nlmsg_for_each_attr'
565583
- 'nlmsg_for_each_msg'
566584
- 'nr_neigh_for_each'
@@ -579,6 +597,7 @@ ForEachMacros:
579597
- 'perf_config_sections__for_each_entry'
580598
- 'perf_config_set__for_each_entry'
581599
- 'perf_cpu_map__for_each_cpu'
600+
- 'perf_cpu_map__for_each_cpu_skip_any'
582601
- 'perf_cpu_map__for_each_idx'
583602
- 'perf_evlist__for_each_entry'
584603
- 'perf_evlist__for_each_entry_reverse'
@@ -639,7 +658,6 @@ ForEachMacros:
639658
- 'shost_for_each_device'
640659
- 'sk_for_each'
641660
- 'sk_for_each_bound'
642-
- 'sk_for_each_bound_bhash2'
643661
- 'sk_for_each_entry_offset_rcu'
644662
- 'sk_for_each_from'
645663
- 'sk_for_each_rcu'
@@ -653,6 +671,7 @@ ForEachMacros:
653671
- 'snd_soc_dapm_widget_for_each_path_safe'
654672
- 'snd_soc_dapm_widget_for_each_sink_path'
655673
- 'snd_soc_dapm_widget_for_each_source_path'
674+
- 'sparsebit_for_each_set_range'
656675
- 'strlist__for_each_entry'
657676
- 'strlist__for_each_entry_safe'
658677
- 'sym_for_each_insn'
@@ -662,7 +681,6 @@ ForEachMacros:
662681
- 'tcf_act_for_each_action'
663682
- 'tcf_exts_for_each_action'
664683
- 'ttm_resource_manager_for_each_res'
665-
- 'twsk_for_each_bound_bhash2'
666684
- 'udp_portaddr_for_each_entry'
667685
- 'udp_portaddr_for_each_entry_rcu'
668686
- 'usb_hub_for_each_child'
@@ -686,6 +704,9 @@ ForEachMacros:
686704
- 'xbc_node_for_each_child'
687705
- 'xbc_node_for_each_key_value'
688706
- 'xbc_node_for_each_subkey'
707+
- 'ynl_attr_for_each'
708+
- 'ynl_attr_for_each_nested'
709+
- 'ynl_attr_for_each_payload'
689710
- 'zorro_for_each_dev'
690711

691712
IncludeBlocks: Preserve

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*.dwo
2525
*.elf
2626
*.gcno
27+
*.gcda
2728
*.gz
2829
*.i
2930
*.ko
@@ -46,7 +47,6 @@
4647
*.so.dbg
4748
*.su
4849
*.symtypes
49-
*.symversions
5050
*.tab.[ch]
5151
*.tar
5252
*.xz
@@ -70,6 +70,7 @@ modules.order
7070
/Module.markers
7171
/modules.builtin
7272
/modules.builtin.modinfo
73+
/modules.builtin.ranges
7374
/modules.nsdeps
7475

7576
#
@@ -142,7 +143,6 @@ GTAGS
142143
# id-utils files
143144
ID
144145

145-
*.orig
146146
*~
147147
\#*#
148148

.mailmap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ Christian Brauner <[email protected]> <[email protected]>
154154
Christian Marangi <[email protected]>
155155
Christophe Ricard <[email protected]>
156156
Christoph Hellwig <[email protected]>
157+
158+
159+
157160
158161
159162
Corey Minyard <[email protected]>
@@ -313,6 +316,7 @@ Jiri Slaby <[email protected]> <[email protected]>
313316
314317
315318
319+
316320
317321
318322
@@ -529,6 +533,7 @@ Pavankumar Kondeti <[email protected]> <[email protected]>
529533
Peter A Jonsson <[email protected]>
530534
Peter Oruba <[email protected]>
531535
Peter Oruba <[email protected]>
536+
Pierre-Louis Bossart <[email protected]> <[email protected]>
532537
533538
Praveen BP <[email protected]>
534539
Pradeep Kumar Chitrapu <[email protected]> <[email protected]>
@@ -612,6 +617,10 @@ Shuah Khan <[email protected]> <[email protected]>
612617
613618
614619
620+
621+
622+
623+
615624
616625
617626
Simon Kelley <[email protected]>

CREDITS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,9 @@ S: 1549 Hiironen Rd.
378378
S: Brimson, MN 55602
379379
S: USA
380380

381+
N: Arnd Bergmann
382+
D: Maintainer of Cell Broadband Engine Architecture
383+
381384
N: Hennus Bergman
382385
P: 1024/77D50909 76 99 FD 31 91 E1 96 1C 90 BB 22 80 62 F6 BD 63
383386
D: Author and maintainer of the QIC-02 tape driver
@@ -1869,6 +1872,9 @@ S: K osmidomkum 723
18691872
S: 160 00 Praha 6
18701873
S: Czech Republic
18711874

1875+
N: Jeremy Kerr
1876+
D: Maintainer of SPU File System
1877+
18721878
N: Michael Kerrisk
18731879
18741880
W: https://man7.org/

Documentation/ABI/stable/sysfs-bus-nvmem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Description:
1111
Read returns '0' or '1' for read-write or read-only modes
1212
respectively.
1313
Write parses one of 'YyTt1NnFf0', or [oO][NnFf] for "on"
14-
and "off", i.e. what kstrbool() supports.
14+
and "off", i.e. what kstrtobool() supports.
1515
Note: This file is only present if CONFIG_NVMEM_SYSFS
1616
is enabled.
1717

Documentation/ABI/stable/vdso

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ maps an ELF DSO into that program's address space. This DSO is called
99
the vDSO and it often contains useful and highly-optimized alternatives
1010
to real syscalls.
1111

12-
These functions are called just like ordinary C function according to
13-
your platform's ABI. Call them from a sensible context. (For example,
14-
if you set CS on x86 to something strange, the vDSO functions are
12+
These functions are called according to your platform's ABI. On many
13+
platforms they are called just like ordinary C function. On other platforms
14+
(ex: powerpc) they are called with the same convention as system calls which
15+
is different from ordinary C functions. Call them from a sensible context.
16+
(For example, if you set CS on x86 to something strange, the vDSO functions are
1517
within their rights to crash.) In addition, if you pass a bad
1618
pointer to a vDSO function, you might get SIGSEGV instead of -EFAULT.
1719

Documentation/ABI/testing/configfs-usb-gadget-acm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@ Description:
66
This item contains just one readonly attribute: port_num.
77
It contains the port number of the /dev/ttyGS<n> device
88
associated with acm function's instance "name".
9+
10+
What: /config/usb-gadget/gadget/functions/acm.name/protocol
11+
Date: Aug 2024
12+
KernelVersion: 6.13
13+
Description:
14+
Reported bInterfaceProtocol for the ACM device. For legacy
15+
reasons, this defaults to 1 (USB_CDC_ACM_PROTO_AT_V25TER).

Documentation/ABI/testing/configfs-usb-gadget-uac1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,12 @@ Description:
3030
req_number the number of pre-allocated requests
3131
for both capture and playback
3232
function_name name of the interface
33+
p_it_name playback input terminal name
34+
p_it_ch_name playback channels name
35+
p_ot_name playback output terminal name
36+
p_fu_vol_name playback mute/volume functional unit name
37+
c_it_name capture input terminal name
38+
c_it_ch_name capture channels name
39+
c_ot_name capture output terminal name
40+
c_fu_vol_name capture mute/volume functional unit name
3341
===================== =======================================

Documentation/ABI/testing/configfs-usb-gadget-uac2

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,17 @@ Description:
3535
req_number the number of pre-allocated requests
3636
for both capture and playback
3737
function_name name of the interface
38+
if_ctrl_name topology control name
39+
clksrc_in_name input clock name
40+
clksrc_out_name output clock name
41+
p_it_name playback input terminal name
42+
p_it_ch_name playback input first channel name
43+
p_ot_name playback output terminal name
44+
p_fu_vol_name playback mute/volume function unit name
45+
c_it_name capture input terminal name
46+
c_it_ch_name capture input first channel name
47+
c_ot_name capture output terminal name
48+
c_fu_vol_name capture mute/volume functional unit name
3849
c_terminal_type code of the capture terminal type
3950
p_terminal_type code of the playback terminal type
4051
===================== =======================================
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
What: /sys/kernel/debug/iio/iio:deviceX/calibration_table_dump
2+
KernelVersion: 6.11
3+
4+
Description:
5+
This dumps the calibration table that was filled during the
6+
digital interface tuning process.
7+
8+
What: /sys/kernel/debug/iio/iio:deviceX/in_voltage_test_mode_available
9+
KernelVersion: 6.11
10+
11+
Description:
12+
List all the available test tones:
13+
- off
14+
- midscale_short
15+
- pos_fullscale
16+
- neg_fullscale
17+
- checkerboard
18+
- prbs23
19+
- prbs9
20+
- one_zero_toggle
21+
- user
22+
- bit_toggle
23+
- sync
24+
- one_bit_high
25+
- mixed_bit_frequency
26+
- ramp
27+
28+
Note that depending on the actual device being used, some of the
29+
above might not be available (and they won't be listed when
30+
reading the file).
31+
32+
What: /sys/kernel/debug/iio/iio:deviceX/in_voltageY_test_mode
33+
KernelVersion: 6.11
34+
35+
Description:
36+
Writing to this file will initiate one of available test tone on
37+
channel Y. Reading it, shows which test is running. In cases
38+
where an IIO backend is available and supports the test tone,
39+
additional information about the data correctness is given.

0 commit comments

Comments
 (0)