Skip to content

Commit 7573ea4

Browse files
chessturochessturo
authored
WSL Kernel 6.6.87.1 (#253)
Noteworthy changes include: - Release rolling-lts/wsl/6.6.87.1 - Update to stable kernel version v6.6.87 - Update to 6.6.87 kernel configs; reenable CONFIG_IKCONFIG_PROC on ARM64 - dxgkrnl: include linux/types.h in d3dkmthk.h to fix build problems under some configs - Rebase feature/hvlite_virtio_pmem/6.6 onto the latest stable kernel
2 parents f6f9c9a + f60f36d commit 7573ea4

File tree

374 files changed

+3468
-1889
lines changed

Some content is hidden

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

374 files changed

+3468
-1889
lines changed

‎Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,8 @@ patternProperties:
524524
description: GlobalTop Technology, Inc.
525525
"^gmt,.*":
526526
description: Global Mixed-mode Technology, Inc.
527+
"^gocontroll,.*":
528+
description: GOcontroll Modular Embedded Electronics B.V.
527529
"^goldelico,.*":
528530
description: Golden Delicious Computers GmbH & Co. KG
529531
"^goodix,.*":

‎MSFT-Merge/log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Name SHA1
22
---- ----
3-
config/wsl-6.6 2e4107a7ac87f36f6de6340915cd70f7a519e41d
3+
config/wsl-6.6 6ef5424f03866bdc448beb946751bb85233cbace
44
feature/arm64-hyperv-hypercall-interface/6.6 8db985fdc14b63b0520d4286eaf57b04b25e00a4
55
feature/arm64-hyperv-synthetic-clocks-timers/6.6 27ff58a87b8e8f33461b2443efe4dfa6487ad352
6-
feature/dxgkrnl/6.6 b75d75bf0bc7c5a3e33e9e08e6b9a82af0dc2719
7-
feature/hvlite_virtio_pmem/6.6 7d955beb0207d880fa1862b1ace8487057b5aa6c
6+
feature/dxgkrnl/6.6 d4ec8a2216634e7c0ca058214febce3a2f029bc6
7+
feature/hvlite_virtio_pmem/6.6 ed182130a52524b3225bd20f88dbdec80b8f5bbe
88
feature/wsl-module-script/6.6 c313d7377ddbf534848625cce7f175389e553e48
99
fix/hv_utils_clock/6.6 a34090e9209d3d3db3d97aa567bb323ebc7620a4
1010
product/wsl/readme/6.6 3c7e4de9ac43d3e052f8d9247cbd79fed1d8999f

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 84
4+
SUBLEVEL = 87
55
EXTRAVERSION = .1
66
NAME = Pinguïn Aangedreven
77

‎arch/arm/boot/dts/broadcom/bcm2711.dtsi

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
clocks = <&clocks BCM2835_CLOCK_UART>,
135135
<&clocks BCM2835_CLOCK_VPU>;
136136
clock-names = "uartclk", "apb_pclk";
137-
arm,primecell-periphid = <0x00241011>;
137+
arm,primecell-periphid = <0x00341011>;
138138
status = "disabled";
139139
};
140140

@@ -145,7 +145,7 @@
145145
clocks = <&clocks BCM2835_CLOCK_UART>,
146146
<&clocks BCM2835_CLOCK_VPU>;
147147
clock-names = "uartclk", "apb_pclk";
148-
arm,primecell-periphid = <0x00241011>;
148+
arm,primecell-periphid = <0x00341011>;
149149
status = "disabled";
150150
};
151151

@@ -156,7 +156,7 @@
156156
clocks = <&clocks BCM2835_CLOCK_UART>,
157157
<&clocks BCM2835_CLOCK_VPU>;
158158
clock-names = "uartclk", "apb_pclk";
159-
arm,primecell-periphid = <0x00241011>;
159+
arm,primecell-periphid = <0x00341011>;
160160
status = "disabled";
161161
};
162162

@@ -167,7 +167,7 @@
167167
clocks = <&clocks BCM2835_CLOCK_UART>,
168168
<&clocks BCM2835_CLOCK_VPU>;
169169
clock-names = "uartclk", "apb_pclk";
170-
arm,primecell-periphid = <0x00241011>;
170+
arm,primecell-periphid = <0x00341011>;
171171
status = "disabled";
172172
};
173173

@@ -451,8 +451,6 @@
451451
IRQ_TYPE_LEVEL_LOW)>,
452452
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) |
453453
IRQ_TYPE_LEVEL_LOW)>;
454-
/* This only applies to the ARMv7 stub */
455-
arm,cpu-registers-not-fw-configured;
456454
};
457455

458456
cpus: cpus {
@@ -1155,6 +1153,7 @@
11551153
};
11561154

11571155
&uart0 {
1156+
arm,primecell-periphid = <0x00341011>;
11581157
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
11591158
};
11601159

‎arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@
101101
};
102102
};
103103

104+
poweroff {
105+
compatible = "regulator-poweroff";
106+
cpu-supply = <&vgen2_reg>;
107+
};
108+
104109
reg_module_3v3: regulator-module-3v3 {
105110
compatible = "regulator-fixed";
106111
regulator-always-on;
@@ -220,10 +225,6 @@
220225
status = "disabled";
221226
};
222227

223-
&clks {
224-
fsl,pmic-stby-poweroff;
225-
};
226-
227228
/* Apalis SPI1 */
228229
&ecspi1 {
229230
cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
@@ -511,7 +512,6 @@
511512

512513
pmic: pmic@8 {
513514
compatible = "fsl,pfuze100";
514-
fsl,pmic-stby-poweroff;
515515
reg = <0x08>;
516516

517517
regulators {

‎arch/arm/mach-davinci/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ config ARCH_DAVINCI_DA830
2727

2828
config ARCH_DAVINCI_DA850
2929
bool "DA850/OMAP-L138/AM18x based system"
30+
select ARCH_DAVINCI_DA8XX
3031
select DAVINCI_CP_INTC
3132

3233
config ARCH_DAVINCI_DA8XX

‎arch/arm/mach-omap1/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ menuconfig ARCH_OMAP1
99
select ARCH_OMAP
1010
select CLKSRC_MMIO
1111
select FORCE_PCI if PCCARD
12+
select GENERIC_IRQ_CHIP
1213
select GPIOLIB
1314
help
1415
Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)

‎arch/arm/mach-shmobile/headsmp.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ ENDPROC(shmobile_smp_sleep)
136136
.long shmobile_smp_arg - 1b
137137

138138
.bss
139+
.align 2
139140
.globl shmobile_smp_mpidr
140141
shmobile_smp_mpidr:
141142
.space NR_CPUS * 4

‎arch/arm/mm/fault.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727

2828
#ifdef CONFIG_MMU
2929

30+
bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)
31+
{
32+
unsigned long addr = (unsigned long)unsafe_src;
33+
34+
return addr >= TASK_SIZE && ULONG_MAX - addr >= size;
35+
}
36+
3037
/*
3138
* This is useful to dump out the page tables associated with
3239
* 'addr' in mm 'mm'.
@@ -556,6 +563,7 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
556563
if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
557564
return;
558565

566+
pr_alert("8<--- cut here ---\n");
559567
pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
560568
inf->name, ifsr, addr);
561569

‎arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"Headphone Jack", "HPOUTR",
1717
"IN2L", "Line In Jack",
1818
"IN2R", "Line In Jack",
19-
"Headphone Jack", "MICBIAS",
20-
"IN1L", "Headphone Jack";
19+
"Microphone Jack", "MICBIAS",
20+
"IN1L", "Microphone Jack";
2121
simple-audio-card,widgets =
22-
"Microphone", "Headphone Jack",
22+
"Microphone", "Microphone Jack",
2323
"Headphone", "Headphone Jack",
2424
"Line", "Line In Jack";
2525

‎arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
22
/*
3-
* Copyright 2021-2022 TQ-Systems GmbH
4-
* Author: Alexander Stein <alexander.stein@tq-group.com>
3+
* Copyright 2021-2025 TQ-Systems GmbH <linux@ew.tq-group.com>,
4+
* D-82229 Seefeld, Germany.
5+
* Author: Alexander Stein
56
*/
67

78
#include "imx8mp.dtsi"
@@ -23,15 +24,6 @@
2324
regulator-max-microvolt = <3300000>;
2425
regulator-always-on;
2526
};
26-
27-
/* e-MMC IO, needed for HS modes */
28-
reg_vcc1v8: regulator-vcc1v8 {
29-
compatible = "regulator-fixed";
30-
regulator-name = "VCC1V8";
31-
regulator-min-microvolt = <1800000>;
32-
regulator-max-microvolt = <1800000>;
33-
regulator-always-on;
34-
};
3527
};
3628

3729
&A53_0 {
@@ -193,7 +185,7 @@
193185
no-sd;
194186
no-sdio;
195187
vmmc-supply = <&reg_vcc3v3>;
196-
vqmmc-supply = <&reg_vcc1v8>;
188+
vqmmc-supply = <&buck5_reg>;
197189
status = "okay";
198190
};
199191

‎arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"Headphone Jack", "HPOUTR",
1717
"IN2L", "Line In Jack",
1818
"IN2R", "Line In Jack",
19-
"Headphone Jack", "MICBIAS",
20-
"IN1L", "Headphone Jack";
19+
"Microphone Jack", "MICBIAS",
20+
"IN1L", "Microphone Jack";
2121
simple-audio-card,widgets =
22-
"Microphone", "Headphone Jack",
22+
"Microphone", "Microphone Jack",
2323
"Headphone", "Headphone Jack",
2424
"Line", "Line In Jack";
2525

‎arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@
221221
};
222222

223223
&uart0 {
224+
pinctrl-names = "default";
225+
pinctrl-0 = <&uart0_xfer>;
224226
status = "okay";
225227
};
226228

‎arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
};
118118

119119
&u2phy1_host {
120-
status = "disabled";
120+
phy-supply = <&vdd_5v>;
121121
};
122122

123123
&uart0 {

‎arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@
513513

514514
&sdmmc0 {
515515
max-frequency = <150000000>;
516-
supports-sd;
517516
bus-width = <4>;
518517
cap-mmc-highspeed;
519518
cap-sd-highspeed;

‎arch/arm64/configs/config-wsl-arm64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.6.84.1 Kernel Configuration
3+
# Linux/arm64 6.6.87.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -146,7 +146,7 @@ CONFIG_RCU_NEED_SEGCBLIST=y
146146
# end of RCU Subsystem
147147

148148
CONFIG_IKCONFIG=y
149-
# CONFIG_IKCONFIG_PROC is not set
149+
CONFIG_IKCONFIG_PROC=y
150150
CONFIG_IKHEADERS=m
151151
CONFIG_LOG_BUF_SHIFT=18
152152
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12

‎arch/arm64/include/asm/kvm_host.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ static inline enum kvm_mode kvm_get_mode(void) { return KVM_MODE_NONE; };
7373
#endif
7474

7575
extern unsigned int __ro_after_init kvm_sve_max_vl;
76+
extern unsigned int __ro_after_init kvm_host_sve_max_vl;
7677
int __init kvm_arm_init_sve(void);
7778

7879
u32 __attribute_const__ kvm_target_cpu(void);
@@ -486,7 +487,6 @@ struct kvm_vcpu_arch {
486487
/* Values of trap registers for the guest. */
487488
u64 hcr_el2;
488489
u64 mdcr_el2;
489-
u64 cptr_el2;
490490

491491
/* Values of trap registers for the host before guest entry. */
492492
u64 mdcr_el2_host;
@@ -536,7 +536,6 @@ struct kvm_vcpu_arch {
536536
struct kvm_guest_debug_arch vcpu_debug_state;
537537
struct kvm_guest_debug_arch external_debug_state;
538538

539-
struct user_fpsimd_state *host_fpsimd_state; /* hyp VA */
540539
struct task_struct *parent_task;
541540

542541
struct {
@@ -719,10 +718,6 @@ struct kvm_vcpu_arch {
719718
/* vcpu running in HYP context */
720719
#define VCPU_HYP_CONTEXT __vcpu_single_flag(iflags, BIT(7))
721720

722-
/* SVE enabled for host EL0 */
723-
#define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0))
724-
/* SME enabled for EL0 */
725-
#define HOST_SME_ENABLED __vcpu_single_flag(sflags, BIT(1))
726721
/* Physical CPU not in supported_cpus */
727722
#define ON_UNSUPPORTED_CPU __vcpu_single_flag(sflags, BIT(2))
728723
/* WFIT instruction trapped */

‎arch/arm64/include/asm/kvm_hyp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,6 @@ extern u64 kvm_nvhe_sym(id_aa64smfr0_el1_sys_val);
145145

146146
extern unsigned long kvm_nvhe_sym(__icache_flags);
147147
extern unsigned int kvm_nvhe_sym(kvm_arm_vmid_bits);
148+
extern unsigned int kvm_nvhe_sym(kvm_host_sve_max_vl);
148149

149150
#endif /* __ARM64_KVM_HYP_H__ */

‎arch/arm64/kernel/compat_alignment.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,8 @@ int do_compat_alignment_fixup(unsigned long addr, struct pt_regs *regs)
368368
return 1;
369369
}
370370

371+
if (!handler)
372+
return 1;
371373
type = handler(addr, instr, regs);
372374

373375
if (type == TYPE_ERROR || type == TYPE_FAULT)

‎arch/arm64/kernel/fpsimd.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,31 +1707,6 @@ void fpsimd_signal_preserve_current_state(void)
17071707
sve_to_fpsimd(current);
17081708
}
17091709

1710-
/*
1711-
* Called by KVM when entering the guest.
1712-
*/
1713-
void fpsimd_kvm_prepare(void)
1714-
{
1715-
if (!system_supports_sve())
1716-
return;
1717-
1718-
/*
1719-
* KVM does not save host SVE state since we can only enter
1720-
* the guest from a syscall so the ABI means that only the
1721-
* non-saved SVE state needs to be saved. If we have left
1722-
* SVE enabled for performance reasons then update the task
1723-
* state to be FPSIMD only.
1724-
*/
1725-
get_cpu_fpsimd_context();
1726-
1727-
if (test_and_clear_thread_flag(TIF_SVE)) {
1728-
sve_to_fpsimd(current);
1729-
current->thread.fp_type = FP_STATE_FPSIMD;
1730-
}
1731-
1732-
put_cpu_fpsimd_context();
1733-
}
1734-
17351710
/*
17361711
* Associate current's FPSIMD context with this cpu
17371712
* The caller must have ownership of the cpu FPSIMD context before calling

‎arch/arm64/kvm/arm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,6 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,
13091309
}
13101310

13111311
vcpu_reset_hcr(vcpu);
1312-
vcpu->arch.cptr_el2 = kvm_get_reset_cptr_el2(vcpu);
13131312

13141313
/*
13151314
* Handle the "start in power-off" case.

0 commit comments

Comments
 (0)