Skip to content

Commit 924ccf1

Browse files
committed
Merge tag 'kvm-riscv-6.18-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv changes for 6.18 - Added SBI FWFT extension for Guest/VM with misaligned delegation and pointer masking PMLEN features - Added ONE_REG interface for SBI FWFT extension - Added Zicbop and bfloat16 extensions for Guest/VM - Enabled more common KVM selftests for RISC-V such as access_tracking_perf_test, dirty_log_perf_test, memslot_modification_stress_test, memslot_perf_test, mmu_stress_test, and rseq_test - Added SBI v3.0 PMU enhancements in KVM and perf driver
2 parents 924ebae + dbdadd9 commit 924ccf1

File tree

318 files changed

+5798
-1466
lines changed

Some content is hidden

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

318 files changed

+5798
-1466
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ Nikolay Aleksandrov <[email protected]> <[email protected]>
589589
Nikolay Aleksandrov <[email protected]> <[email protected]>
590590
Nikolay Aleksandrov <[email protected]> <[email protected]>
591591
Nikolay Aleksandrov <[email protected]> <[email protected]>
592+
592593
593594
Oleksandr Natalenko <[email protected]> <[email protected]>
594595

Documentation/devicetree/bindings/spi/spi-fsl-lpspi.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,18 @@ properties:
2020
- enum:
2121
- fsl,imx7ulp-spi
2222
- fsl,imx8qxp-spi
23+
- nxp,s32g2-lpspi
2324
- items:
2425
- enum:
2526
- fsl,imx8ulp-spi
2627
- fsl,imx93-spi
2728
- fsl,imx94-spi
2829
- fsl,imx95-spi
2930
- const: fsl,imx7ulp-spi
31+
- items:
32+
- const: nxp,s32g3-lpspi
33+
- const: nxp,s32g2-lpspi
34+
3035
reg:
3136
maxItems: 1
3237

Documentation/networking/napi.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,8 @@ Threaded NAPI
433433

434434
Threaded NAPI is an operating mode that uses dedicated kernel
435435
threads rather than software IRQ context for NAPI processing.
436-
The configuration is per netdevice and will affect all
437-
NAPI instances of that device. Each NAPI instance will spawn a separate
438-
thread (called ``napi/${ifc-name}-${napi-id}``).
436+
Each threaded NAPI instance will spawn a separate thread
437+
(called ``napi/${ifc-name}-${napi-id}``).
439438

440439
It is recommended to pin each kernel thread to a single CPU, the same
441440
CPU as the CPU which services the interrupt. Note that the mapping

Documentation/sound/alsa-configuration.rst

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,8 +2253,15 @@ device_setup
22532253
Default: 0x0000
22542254
ignore_ctl_error
22552255
Ignore any USB-controller regarding mixer interface (default: no)
2256+
``ignore_ctl_error=1`` may help when you get an error at accessing
2257+
the mixer element such as URB error -22. This happens on some
2258+
buggy USB device or the controller. This workaround corresponds to
2259+
the ``quirk_flags`` bit 14, too.
22562260
autoclock
22572261
Enable auto-clock selection for UAC2 devices (default: yes)
2262+
lowlatency
2263+
Enable low latency playback mode (default: yes).
2264+
Could disable it to switch back to the old mode if face a regression.
22582265
quirk_alias
22592266
Quirk alias list, pass strings like ``0123abcd:5678beef``, which
22602267
applies the existing quirk for the device 5678:beef to a new
@@ -2284,6 +2291,11 @@ delayed_register
22842291
The driver prints a message like "Found post-registration device
22852292
assignment: 1234abcd:04" for such a device, so that user can
22862293
notice the need.
2294+
skip_validation
2295+
Skip unit descriptor validation (default: no).
2296+
The option is used to ignores the validation errors with the hexdump
2297+
of the unit descriptor instead of a driver probe error, so that we
2298+
can check its details.
22872299
quirk_flags
22882300
Contains the bit flags for various device specific workarounds.
22892301
Applied to the corresponding card index.
@@ -2307,17 +2319,26 @@ quirk_flags
23072319
* bit 16: Set up the interface at first like UAC1
23082320
* bit 17: Apply the generic implicit feedback sync mode
23092321
* bit 18: Don't apply implicit feedback sync mode
2322+
* bit 19: Don't closed interface during setting sample rate
2323+
* bit 20: Force an interface reset whenever stopping & restarting
2324+
a stream
2325+
* bit 21: Do not set PCM rate (frequency) when only one rate is
2326+
available for the given endpoint.
2327+
* bit 22: Set the fixed resolution 16 for Mic Capture Volume
2328+
* bit 23: Set the fixed resolution 384 for Mic Capture Volume
2329+
* bit 24: Set minimum volume control value as mute for devices
2330+
where the lowest playback value represents muted state instead
2331+
of minimum audible volume
23102332

23112333
This module supports multiple devices, autoprobe and hotplugging.
23122334

23132335
NB: ``nrpacks`` parameter can be modified dynamically via sysfs.
23142336
Don't put the value over 20. Changing via sysfs has no sanity
23152337
check.
23162338

2317-
NB: ``ignore_ctl_error=1`` may help when you get an error at accessing
2318-
the mixer element such as URB error -22. This happens on some
2319-
buggy USB device or the controller. This workaround corresponds to
2320-
the ``quirk_flags`` bit 14, too.
2339+
NB: ``ignore_ctl_error=1`` just provides a quick way to work around the
2340+
issues. If you have a buggy device that requires these quirks, please
2341+
report it to the upstream.
23212342

23222343
NB: ``quirk_alias`` option is provided only for testing / development.
23232344
If you want to have a proper support, contact to upstream for

MAINTAINERS

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3526,7 +3526,7 @@ F: Documentation/devicetree/bindings/arm/ti/nspire.yaml
35263526
F: arch/arm/boot/dts/nspire/
35273527

35283528
ARM/TOSHIBA VISCONTI ARCHITECTURE
3529-
M: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
3529+
M: Nobuhiro Iwamatsu <nobuhiro.iwamatsu[email protected]>
35303530
L: [email protected] (moderated for non-subscribers)
35313531
S: Supported
35323532
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
@@ -3667,6 +3667,7 @@ F: drivers/virt/coco/arm-cca-guest/
36673667
F: drivers/virt/coco/pkvm-guest/
36683668
F: tools/testing/selftests/arm64/
36693669
X: arch/arm64/boot/dts/
3670+
X: arch/arm64/configs/defconfig
36703671

36713672
ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
36723673
M: George McCollister <[email protected]>
@@ -7820,7 +7821,7 @@ Q: https://patchwork.freedesktop.org/project/nouveau/
78207821
Q: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests
78217822
B: https://gitlab.freedesktop.org/drm/nouveau/-/issues
78227823
C: irc://irc.oftc.net/nouveau
7823-
T: git https://gitlab.freedesktop.org/drm/nouveau.git
7824+
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
78247825
F: drivers/gpu/drm/nouveau/
78257826
F: include/uapi/drm/nouveau_drm.h
78267827

@@ -10388,7 +10389,7 @@ S: Maintained
1038810389
F: drivers/input/touchscreen/goodix*
1038910390

1039010391
GOOGLE ETHERNET DRIVERS
10391-
M: Jeroen de Borst <jeroendb@google.com>
10392+
M: Joshua Washington <joshwash@google.com>
1039210393
M: Harshitha Ramamurthy <[email protected]>
1039310394
1039410395
S: Maintained
@@ -17850,6 +17851,7 @@ F: net/ipv6/tcp*.c
1785017851
NETWORKING [TLS]
1785117852
M: John Fastabend <[email protected]>
1785217853
M: Jakub Kicinski <[email protected]>
17854+
M: Sabrina Dubroca <[email protected]>
1785317855
1785417856
S: Maintained
1785517857
F: include/net/tls.h
@@ -24252,6 +24254,12 @@ S: Maintained
2425224254
F: Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
2425324255
F: drivers/input/keyboard/sun4i-lradc-keys.c
2425424256

24257+
SUNDANCE NETWORK DRIVER
24258+
M: Denis Kirjanov <[email protected]>
24259+
24260+
S: Maintained
24261+
F: drivers/net/ethernet/dlink/sundance.c
24262+
2425524263
SUNPLUS ETHERNET DRIVER
2425624264
M: Wells Lu <[email protected]>
2425724265

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 17
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc4
5+
EXTRAVERSION = -rc5
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

arch/arm/boot/dts/microchip/at91-sama7d65_curiosity.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@
387387

388388
&sdmmc1 {
389389
bus-width = <4>;
390+
no-1-8-v;
391+
sdhci-caps-mask = <0x0 0x00200000>;
390392
pinctrl-names = "default";
391393
pinctrl-0 = <&pinctrl_sdmmc1_default>;
392394
status = "okay";

arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
phy-mode = "rmii";
273273
phy-handle = <&phy0>;
274274
assigned-clocks = <&cru SCLK_MAC_SRC>;
275-
assigned-clock-rates= <50000000>;
275+
assigned-clock-rates = <50000000>;
276276
pinctrl-names = "default";
277277
pinctrl-0 = <&rmii_pins>;
278278
status = "okay";

arch/arm/boot/dts/rockchip/rv1109-relfor-saib.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@
250250
&i2s0 {
251251
/delete-property/ pinctrl-0;
252252
rockchip,trcm-sync-rx-only;
253-
pinctrl-0 = <&i2s0m0_sclk_rx>,
254-
<&i2s0m0_lrck_rx>,
255-
<&i2s0m0_sdi0>;
253+
pinctrl-0 = <&i2s0m0_sclk_rx>,
254+
<&i2s0m0_lrck_rx>,
255+
<&i2s0m0_sdi0>;
256256
pinctrl-names = "default";
257257
status = "okay";
258258
};

arch/arm/mach-at91/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2+
config ARCH_MICROCHIP
3+
bool
4+
25
menuconfig ARCH_AT91
36
bool "AT91/Microchip SoCs"
47
depends on (CPU_LITTLE_ENDIAN && (ARCH_MULTI_V4T || ARCH_MULTI_V5)) || \
@@ -8,6 +11,7 @@ menuconfig ARCH_AT91
811
select GPIOLIB
912
select PINCTRL
1013
select SOC_BUS
14+
select ARCH_MICROCHIP
1115

1216
if ARCH_AT91
1317
config SOC_SAMV7

0 commit comments

Comments
 (0)