Skip to content

Commit 4e33868

Browse files
bonzinibonzini
committed
Merge tag 'kvmarm-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 updates for Linux 5.16 - More progress on the protected VM front, now with the full fixed feature set as well as the limitation of some hypercalls after initialisation. - Cleanup of the RAZ/WI sysreg handling, which was pointlessly complicated - Fixes for the vgic placement in the IPA space, together with a bunch of selftests - More memcg accounting of the memory allocated on behalf of a guest - Timer and vgic selftests - Workarounds for the Apple M1 broken vgic implementation - KConfig cleanups - New kvmarm.mode=none option, for those who really dislike us
2 parents e59f3e5 + 5a2acbb commit 4e33868

File tree

731 files changed

+10961
-4234
lines changed

Some content is hidden

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

731 files changed

+10961
-4234
lines changed

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2372,14 +2372,18 @@
23722372
kvm-arm.mode=
23732373
[KVM,ARM] Select one of KVM/arm64's modes of operation.
23742374

2375+
none: Forcefully disable KVM.
2376+
23752377
nvhe: Standard nVHE-based mode, without support for
23762378
protected guests.
23772379

23782380
protected: nVHE-based mode with support for guests whose
23792381
state is kept private from the host.
23802382
Not valid if the kernel is running in EL2.
23812383

2382-
Defaults to VHE/nVHE based on hardware support.
2384+
Defaults to VHE/nVHE based on hardware support. Setting
2385+
mode to "protected" will disable kexec and hibernation
2386+
for the host.
23832387

23842388
kvm-arm.vgic_v3_group0_trap=
23852389
[KVM,ARM] Trap guest accesses to GICv3 group-0

‎Documentation/core-api/irq/irq-domain.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that
175175
case the Linux IRQ numbers cannot be dynamically assigned and the legacy
176176
mapping should be used.
177177

178-
As the name implies, the *_legacy() functions are deprecated and only
178+
As the name implies, the \*_legacy() functions are deprecated and only
179179
exist to ease the support of ancient platforms. No new users should be
180-
added.
180+
added. Same goes for the \*_simple() functions when their use results
181+
in the legacy behaviour.
181182

182183
The legacy map assumes a contiguous range of IRQ numbers has already
183184
been allocated for the controller and that the IRQ number can be

‎Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ properties:
3131

3232
clocks:
3333
minItems: 1
34-
maxItems: 3
34+
maxItems: 7
3535

3636
clock-names:
3737
minItems: 1
38-
maxItems: 3
38+
maxItems: 7
3939

4040
required:
4141
- compatible
@@ -72,6 +72,32 @@ allOf:
7272
contains:
7373
enum:
7474
- qcom,sdm660-a2noc
75+
then:
76+
properties:
77+
clocks:
78+
items:
79+
- description: Bus Clock.
80+
- description: Bus A Clock.
81+
- description: IPA Clock.
82+
- description: UFS AXI Clock.
83+
- description: Aggregate2 UFS AXI Clock.
84+
- description: Aggregate2 USB3 AXI Clock.
85+
- description: Config NoC USB2 AXI Clock.
86+
clock-names:
87+
items:
88+
- const: bus
89+
- const: bus_a
90+
- const: ipa
91+
- const: ufs_axi
92+
- const: aggre2_ufs_axi
93+
- const: aggre2_usb3_axi
94+
- const: cfg_noc_usb2_axi
95+
96+
- if:
97+
properties:
98+
compatible:
99+
contains:
100+
enum:
75101
- qcom,sdm660-bimc
76102
- qcom,sdm660-cnoc
77103
- qcom,sdm660-gnoc
@@ -91,6 +117,7 @@ examples:
91117
- |
92118
#include <dt-bindings/clock/qcom,rpmcc.h>
93119
#include <dt-bindings/clock/qcom,mmcc-sdm660.h>
120+
#include <dt-bindings/clock/qcom,gcc-sdm660.h>
94121
95122
bimc: interconnect@1008000 {
96123
compatible = "qcom,sdm660-bimc";
@@ -123,9 +150,20 @@ examples:
123150
compatible = "qcom,sdm660-a2noc";
124151
reg = <0x01704000 0xc100>;
125152
#interconnect-cells = <1>;
126-
clock-names = "bus", "bus_a";
153+
clock-names = "bus",
154+
"bus_a",
155+
"ipa",
156+
"ufs_axi",
157+
"aggre2_ufs_axi",
158+
"aggre2_usb3_axi",
159+
"cfg_noc_usb2_axi";
127160
clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
128-
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;
161+
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,
162+
<&rpmcc RPM_SMD_IPA_CLK>,
163+
<&gcc GCC_UFS_AXI_CLK>,
164+
<&gcc GCC_AGGRE2_UFS_AXI_CLK>,
165+
<&gcc GCC_AGGRE2_USB3_AXI_CLK>,
166+
<&gcc GCC_CFG_NOC_USB2_AXI_CLK>;
129167
};
130168
131169
mnoc: interconnect@1745000 {

‎Documentation/hwmon/k10temp.rst

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,3 @@ On Family 17h and Family 18h CPUs, additional temperature sensors may report
132132
Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported
133133
as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU
134134
variant.
135-
136-
Various Family 17h and 18h CPUs report voltage and current telemetry
137-
information. The following attributes may be reported.
138-
139-
Attribute Label Description
140-
=============== ======= ================
141-
in0_input Vcore Core voltage
142-
in1_input Vsoc SoC voltage
143-
curr1_input Icore Core current
144-
curr2_input Isoc SoC current
145-
=============== ======= ================
146-
147-
Current values are raw (unscaled) as reported by the CPU. Core current is
148-
reported as multiples of 1A / LSB. SoC is reported as multiples of 0.25A
149-
/ LSB. The real current is board specific. Reported currents should be seen
150-
as rough guidance, and should be scaled using sensors3.conf as appropriate
151-
for a given board.

‎Documentation/networking/device_drivers/ethernet/intel/ice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ NOTES:
851851
- 0x88A8 traffic will not be received unless VLAN stripping is disabled with
852852
the following command::
853853

854-
# ethool -K <ethX> rxvlan off
854+
# ethtool -K <ethX> rxvlan off
855855

856856
- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS
857857
configured on the same port. 0x88a8/0x8100 traffic will not be received if

‎MAINTAINERS

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
414414
F: drivers/acpi/pmic/
415415

416416
ACPI THERMAL DRIVER
417-
M: Zhang Rui <[email protected]>
417+
M: Rafael J. Wysocki <[email protected]>
418+
R: Zhang Rui <[email protected]>
418419
L: [email protected]
419420
S: Supported
420421
W: https://01.org/linux-acpi
@@ -810,7 +811,7 @@ F: Documentation/devicetree/bindings/dma/altr,msgdma.yaml
810811
F: drivers/dma/altera-msgdma.c
811812

812813
ALTERA PIO DRIVER
813-
M: Joyce Ooi <joyce.ooi@intel.com>
814+
M: Mun Yew Tham <mun.yew.tham@intel.com>
814815
L: [email protected]
815816
S: Maintained
816817
F: drivers/gpio/gpio-altera.c
@@ -977,12 +978,12 @@ L: [email protected]
977978
S: Maintained
978979
F: drivers/platform/x86/amd-pmc.*
979980

980-
AMD POWERPLAY
981+
AMD POWERPLAY AND SWSMU
981982
M: Evan Quan <[email protected]>
982983
L: [email protected]
983984
S: Supported
984985
T: git https://gitlab.freedesktop.org/agd5f/linux.git
985-
F: drivers/gpu/drm/amd/pm/powerplay/
986+
F: drivers/gpu/drm/amd/pm/
986987

987988
AMD PTDMA DRIVER
988989
M: Sanjay R Mehta <[email protected]>
@@ -2804,9 +2805,8 @@ F: arch/arm/mach-pxa/include/mach/vpac270.h
28042805
F: arch/arm/mach-pxa/vpac270.c
28052806

28062807
ARM/VT8500 ARM ARCHITECTURE
2807-
M: Tony Prisk <[email protected]>
28082808
L: [email protected] (moderated for non-subscribers)
2809-
S: Maintained
2809+
S: Orphan
28102810
F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt
28112811
F: arch/arm/mach-vt8500/
28122812
F: drivers/clocksource/timer-vt8500.c
@@ -2962,7 +2962,7 @@ F: crypto/async_tx/
29622962
F: include/linux/async_tx.h
29632963

29642964
AT24 EEPROM DRIVER
2965-
M: Bartosz Golaszewski <[email protected]>
2965+
M: Bartosz Golaszewski <[email protected]>
29662966
L: [email protected]
29672967
S: Maintained
29682968
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@ -3385,9 +3385,11 @@ F: Documentation/networking/filter.rst
33853385
F: Documentation/userspace-api/ebpf/
33863386
F: arch/*/net/*
33873387
F: include/linux/bpf*
3388+
F: include/linux/btf*
33883389
F: include/linux/filter.h
33893390
F: include/trace/events/xdp.h
33903391
F: include/uapi/linux/bpf*
3392+
F: include/uapi/linux/btf*
33913393
F: include/uapi/linux/filter.h
33923394
F: kernel/bpf/
33933395
F: kernel/trace/bpf_trace.c
@@ -3821,7 +3823,6 @@ F: drivers/scsi/mpi3mr/
38213823

38223824
BROADCOM NETXTREME-E ROCE DRIVER
38233825
M: Selvin Xavier <[email protected]>
3824-
M: Naresh Kumar PBS <[email protected]>
38253826
L: [email protected]
38263827
S: Supported
38273828
W: http://www.broadcom.com
@@ -4656,7 +4657,7 @@ W: http://linux-cifs.samba.org/
46564657
T: git git://git.samba.org/sfrench/cifs-2.6.git
46574658
F: Documentation/admin-guide/cifs/
46584659
F: fs/cifs/
4659-
F: fs/cifs_common/
4660+
F: fs/smbfs_common/
46604661

46614662
COMPACTPCI HOTPLUG CORE
46624663
M: Scott Murray <[email protected]>
@@ -7986,7 +7987,7 @@ F: include/linux/gpio/regmap.h
79867987

79877988
GPIO SUBSYSTEM
79887989
M: Linus Walleij <[email protected]>
7989-
M: Bartosz Golaszewski <[email protected]>
7990+
M: Bartosz Golaszewski <[email protected]>
79907991
L: [email protected]
79917992
S: Maintained
79927993
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
@@ -10194,8 +10195,8 @@ M: Hyunchul Lee <[email protected]>
1019410195
L: [email protected]
1019510196
S: Maintained
1019610197
T: git git://git.samba.org/ksmbd.git
10197-
F: fs/cifs_common/
1019810198
F: fs/ksmbd/
10199+
F: fs/smbfs_common/
1019910200

1020010201
KERNEL UNIT TESTING FRAMEWORK (KUnit)
1020110202
M: Brendan Higgins <[email protected]>
@@ -11379,7 +11380,7 @@ F: Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
1137911380
F: drivers/iio/proximity/mb1232.c
1138011381

1138111382
MAXIM MAX77650 PMIC MFD DRIVER
11382-
M: Bartosz Golaszewski <[email protected]>
11383+
M: Bartosz Golaszewski <[email protected]>
1138311384
L: [email protected]
1138411385
S: Maintained
1138511386
F: Documentation/devicetree/bindings/*/*max77650.yaml
@@ -13267,9 +13268,9 @@ F: Documentation/scsi/NinjaSCSI.rst
1326713268
F: drivers/scsi/nsp32*
1326813269

1326913270
NIOS2 ARCHITECTURE
13270-
M: Ley Foon Tan <[email protected]>
13271+
M: Dinh Nguyen <[email protected]>
1327113272
S: Maintained
13272-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
13273+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
1327313274
F: arch/nios2/
1327413275

1327513276
NITRO ENCLAVES (NE)
@@ -16663,13 +16664,6 @@ M: Lubomir Rintel <[email protected]>
1666316664
S: Supported
1666416665
F: drivers/char/pcmcia/scr24x_cs.c
1666516666

16666-
SCSI CDROM DRIVER
16667-
M: Jens Axboe <[email protected]>
16668-
L: [email protected]
16669-
S: Maintained
16670-
W: http://www.kernel.dk
16671-
F: drivers/scsi/sr*
16672-
1667316667
SCSI RDMA PROTOCOL (SRP) INITIATOR
1667416668
M: Bart Van Assche <[email protected]>
1667516669
L: [email protected]
@@ -16968,7 +16962,6 @@ F: drivers/misc/sgi-xp/
1696816962

1696916963
SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
1697016964
M: Karsten Graul <[email protected]>
16971-
M: Guvenc Gulce <[email protected]>
1697216965
L: [email protected]
1697316966
S: Supported
1697416967
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -17904,7 +17897,8 @@ M: Olivier Moysan <[email protected]>
1790417897
M: Arnaud Pouliquen <[email protected]>
1790517898
L: [email protected] (moderated for non-subscribers)
1790617899
S: Maintained
17907-
F: Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
17900+
F: Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
17901+
F: Documentation/devicetree/bindings/sound/st,stm32-*.yaml
1790817902
F: sound/soc/stm/
1790917903

1791017904
STM32 TIMER/LPTIMER DRIVERS
@@ -17981,10 +17975,11 @@ F: Documentation/admin-guide/svga.rst
1798117975
F: arch/x86/boot/video*
1798217976

1798317977
SWIOTLB SUBSYSTEM
17984-
M: Konrad Rzeszutek Wilk <[email protected]>
17978+
M: Christoph Hellwig <[email protected]>
1798517979
L: [email protected]
1798617980
S: Supported
17987-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
17981+
W: http://git.infradead.org/users/hch/dma-mapping.git
17982+
T: git git://git.infradead.org/users/hch/dma-mapping.git
1798817983
F: arch/*/kernel/pci-swiotlb.c
1798917984
F: include/linux/swiotlb.h
1799017985
F: kernel/dma/swiotlb.c
@@ -18567,13 +18562,14 @@ T: git git://linuxtv.org/media_tree.git
1856718562
F: drivers/media/radio/radio-raremono.c
1856818563

1856918564
THERMAL
18570-
M: Zhang Rui <[email protected]>
18565+
M: Rafael J. Wysocki <[email protected]>
1857118566
M: Daniel Lezcano <[email protected]>
1857218567
R: Amit Kucheria <[email protected]>
18568+
R: Zhang Rui <[email protected]>
1857318569
L: [email protected]
1857418570
S: Supported
1857518571
Q: https://patchwork.kernel.org/project/linux-pm/list/
18576-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
18572+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
1857718573
F: Documentation/devicetree/bindings/thermal/
1857818574
F: drivers/thermal/
1857918575
F: include/linux/cpu_cooling.h
@@ -18702,7 +18698,7 @@ F: include/linux/clk/ti.h
1870218698

1870318699
TI DAVINCI MACHINE SUPPORT
1870418700
M: Sekhar Nori <[email protected]>
18705-
R: Bartosz Golaszewski <[email protected]>
18701+
R: Bartosz Golaszewski <[email protected]>
1870618702
L: [email protected] (moderated for non-subscribers)
1870718703
S: Supported
1870818704
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
@@ -19301,13 +19297,12 @@ S: Maintained
1930119297
F: drivers/usb/misc/chaoskey.c
1930219298

1930319299
USB CYPRESS C67X00 DRIVER
19304-
M: Peter Korsgaard <[email protected]>
1930519300
L: [email protected]
19306-
S: Maintained
19301+
S: Orphan
1930719302
F: drivers/usb/c67x00/
1930819303

1930919304
USB DAVICOM DM9601 DRIVER
19310-
M: Peter Korsgaard <[email protected]>
19305+
M: Peter Korsgaard <[email protected]>
1931119306
L: [email protected]
1931219307
S: Maintained
1931319308
W: http://www.linux-usb.org/usbnet
@@ -20487,7 +20482,6 @@ F: samples/bpf/xdpsock*
2048720482
F: tools/lib/bpf/xsk*
2048820483

2048920484
XEN BLOCK SUBSYSTEM
20490-
M: Konrad Rzeszutek Wilk <[email protected]>
2049120485
M: Roger Pau Monné <[email protected]>
2049220486
L: [email protected] (moderated for non-subscribers)
2049320487
S: Supported
@@ -20535,7 +20529,7 @@ S: Supported
2053520529
F: drivers/net/xen-netback/*
2053620530

2053720531
XEN PCI SUBSYSTEM
20538-
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
20532+
M: Juergen Gross <jgross@suse.com>
2053920533
L: [email protected] (moderated for non-subscribers)
2054020534
S: Supported
2054120535
F: arch/x86/pci/*xen*
@@ -20558,7 +20552,8 @@ S: Supported
2055820552
F: sound/xen/*
2055920553

2056020554
XEN SWIOTLB SUBSYSTEM
20561-
M: Konrad Rzeszutek Wilk <[email protected]>
20555+
M: Juergen Gross <[email protected]>
20556+
M: Stefano Stabellini <[email protected]>
2056220557
L: [email protected] (moderated for non-subscribers)
2056320558
L: [email protected]
2056420559
S: Supported

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 15
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc4
66
NAME = Opossums on Parade
77

88
# *DOCUMENTATION*

‎arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ config ARM64
186186
select HAVE_GCC_PLUGINS
187187
select HAVE_HW_BREAKPOINT if PERF_EVENTS
188188
select HAVE_IRQ_TIME_ACCOUNTING
189+
select HAVE_KVM
189190
select HAVE_NMI
190191
select HAVE_PATA_PLATFORM
191192
select HAVE_PERF_EVENTS

0 commit comments

Comments
 (0)