Skip to content

Commit f3847af

Browse files
htejunhtejun
committed
Merge branch 'for-6.7' into for-next
2 parents dd64c87 + 6465e26 commit f3847af

File tree

410 files changed

+3849
-2265
lines changed

Some content is hidden

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

410 files changed

+3849
-2265
lines changed

‎Documentation/arch/arm64/cpu-feature-registers.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ infrastructure:
175175
+------------------------------+---------+---------+
176176
| Name | bits | visible |
177177
+------------------------------+---------+---------+
178+
| SME | [27-24] | y |
179+
+------------------------------+---------+---------+
178180
| MTE | [11-8] | y |
179181
+------------------------------+---------+---------+
180182
| SSBS | [7-4] | y |
@@ -288,8 +290,18 @@ infrastructure:
288290
+------------------------------+---------+---------+
289291
| Name | bits | visible |
290292
+------------------------------+---------+---------+
293+
| CSSC | [55-52] | y |
294+
+------------------------------+---------+---------+
295+
| RPRFM | [51-48] | y |
296+
+------------------------------+---------+---------+
297+
| BC | [23-20] | y |
298+
+------------------------------+---------+---------+
291299
| MOPS | [19-16] | y |
292300
+------------------------------+---------+---------+
301+
| APA3 | [15-12] | y |
302+
+------------------------------+---------+---------+
303+
| GPA3 | [11-8] | y |
304+
+------------------------------+---------+---------+
293305
| RPRES | [7-4] | y |
294306
+------------------------------+---------+---------+
295307
| WFXT | [3-0] | y |

‎Documentation/arch/arm64/elf_hwcaps.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ HWCAP2_SMEF16F16
305305
HWCAP2_MOPS
306306
Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001.
307307

308+
HWCAP2_HBC
309+
Functionality implied by ID_AA64ISAR2_EL1.BC == 0b0001.
310+
308311
4. Unused AT_HWCAP bits
309312
-----------------------
310313

‎Documentation/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ Documentation of LoongArch ISA:
381381

382382
Documentation of LoongArch ELF psABI:
383383

384-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-CN.pdf (in Chinese)
384+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-CN.pdf (in Chinese)
385385

386-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-EN.pdf (in English)
386+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-EN.pdf (in English)
387387

388388
Linux kernel repository of Loongson and LoongArch:
389389

‎Documentation/networking/ax25.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ AX.25
77
To use the amateur radio protocols within Linux you will need to get a
88
suitable copy of the AX.25 Utilities. More detailed information about
99
AX.25, NET/ROM and ROSE, associated programs and utilities can be
10-
found on http://www.linux-ax25.org.
10+
found on https://linux-ax25.in-berlin.de.
1111

12-
There is an active mailing list for discussing Linux amateur radio matters
12+
There is a mailing list for discussing Linux amateur radio matters
1313
called [email protected]. To subscribe to it, send a message to
1414
[email protected] with the words "subscribe linux-hams" in the body
1515
of the message, the subject field is ignored. You don't need to be

‎Documentation/sound/designs/midi-2.0.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ topology based on those information. When the device is older and
7474
doesn't respond to the new UMP inquiries, the driver falls back and
7575
builds the topology based on Group Terminal Block (GTB) information
7676
from the USB descriptor. Some device might be screwed up by the
77-
unexpected UMP command; in such a case, pass `midi2_probe=0` option to
78-
snd-usb-audio driver for skipping the UMP v1.1 inquiries.
77+
unexpected UMP command; in such a case, pass `midi2_ump_probe=0`
78+
option to snd-usb-audio driver for skipping the UMP v1.1 inquiries.
7979

8080
When the MIDI 2.0 device is probed, the kernel creates a rawmidi
8181
device for each UMP Endpoint of the device. Its device name is

‎Documentation/translations/zh_CN/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,9 @@ LoongArch指令集架构的文档：
344344

345345
LoongArch的ELF psABI文档：
346346

347-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-CN.pdf （中文版）
347+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-CN.pdf （中文版）
348348

349-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-EN.pdf （英文版）
349+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-EN.pdf （英文版）
350350

351351
Loongson与LoongArch的Linux内核源码仓库：
352352

‎MAINTAINERS

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@ F: arch/arm*/include/asm/perf_event.h
16621662
F: arch/arm*/kernel/hw_breakpoint.c
16631663
F: arch/arm*/kernel/perf_*
16641664
F: drivers/perf/
1665-
F: include/linux/perf/arm_pmu.h
1665+
F: include/linux/perf/arm_pmu*.h
16661666

16671667
ARM PORT
16681668
M: Russell King <[email protected]>
@@ -3344,7 +3344,7 @@ AX.25 NETWORK LAYER
33443344
M: Ralf Baechle <[email protected]>
33453345
L: [email protected]
33463346
S: Maintained
3347-
W: http://www.linux-ax25.org/
3347+
W: https://linux-ax25.in-berlin.de
33483348
F: include/net/ax25.h
33493349
F: include/uapi/linux/ax25.h
33503350
F: net/ax25/
@@ -6645,7 +6645,6 @@ F: Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
66456645
F: drivers/gpu/drm/panel/panel-novatek-nt36672a.c
66466646

66476647
DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
6648-
M: Ben Skeggs <[email protected]>
66496648
M: Karol Herbst <[email protected]>
66506649
M: Lyude Paul <[email protected]>
66516650
L: [email protected]
@@ -8874,7 +8873,7 @@ F: drivers/gpio/gpio-mockup.c
88748873
F: tools/testing/selftests/gpio/
88758874

88768875
GPIO REGMAP
8877-
R: Michael Walle <[email protected]>
8876+
M: Michael Walle <[email protected]>
88788877
S: Maintained
88798878
F: drivers/gpio/gpio-regmap.c
88808879
F: include/linux/gpio/regmap.h
@@ -13616,6 +13615,7 @@ F: drivers/net/ethernet/mellanox/mlxfw/
1361613615

1361713616
MELLANOX HARDWARE PLATFORM SUPPORT
1361813617
M: Hans de Goede <[email protected]>
13618+
M: Ilpo Järvinen <[email protected]>
1361913619
M: Mark Gross <[email protected]>
1362013620
M: Vadim Pasternak <[email protected]>
1362113621
L: [email protected]
@@ -14210,6 +14210,7 @@ F: drivers/platform/surface/surface_gpe.c
1421014210

1421114211
MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
1421214212
M: Hans de Goede <[email protected]>
14213+
M: Ilpo Järvinen <[email protected]>
1421314214
M: Mark Gross <[email protected]>
1421414215
M: Maximilian Luz <[email protected]>
1421514216
L: [email protected]
@@ -14756,7 +14757,7 @@ NETROM NETWORK LAYER
1475614757
M: Ralf Baechle <[email protected]>
1475714758
L: [email protected]
1475814759
S: Maintained
14759-
W: http://www.linux-ax25.org/
14760+
W: https://linux-ax25.in-berlin.de
1476014761
F: include/net/netrom.h
1476114762
F: include/uapi/linux/netrom.h
1476214763
F: net/netrom/
@@ -18607,7 +18608,7 @@ ROSE NETWORK LAYER
1860718608
M: Ralf Baechle <[email protected]>
1860818609
L: [email protected]
1860918610
S: Maintained
18610-
W: http://www.linux-ax25.org/
18611+
W: https://linux-ax25.in-berlin.de
1861118612
F: include/net/rose.h
1861218613
F: include/uapi/linux/rose.h
1861318614
F: net/rose/
@@ -23423,9 +23424,11 @@ F: drivers/platform/x86/x86-android-tablets/
2342323424

2342423425
X86 PLATFORM DRIVERS
2342523426
M: Hans de Goede <[email protected]>
23427+
M: Ilpo Järvinen <[email protected]>
2342623428
M: Mark Gross <[email protected]>
2342723429
L: [email protected]
2342823430
S: Maintained
23431+
Q: https://patchwork.kernel.org/project/platform-driver-x86/list/
2342923432
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
2343023433
F: drivers/platform/olpc/
2343123434
F: drivers/platform/x86/

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 6
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc3
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎arch/arm/xen/enlighten.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static void xen_power_off(void)
207207

208208
static irqreturn_t xen_arm_callback(int irq, void *arg)
209209
{
210-
xen_hvm_evtchn_do_upcall();
210+
xen_evtchn_do_upcall();
211211
return IRQ_HANDLED;
212212
}
213213

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ static inline bool supports_clearbhb(int scope)
663663
isar2 = read_sanitised_ftr_reg(SYS_ID_AA64ISAR2_EL1);
664664

665665
return cpuid_feature_extract_unsigned_field(isar2,
666-
ID_AA64ISAR2_EL1_BC_SHIFT);
666+
ID_AA64ISAR2_EL1_CLRBHB_SHIFT);
667667
}
668668

669669
const struct cpumask *system_32bit_el0_cpumask(void);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void deactivate_traps_vhe_put(struct kvm_vcpu *vcpu);
118118

119119
u64 __guest_enter(struct kvm_vcpu *vcpu);
120120

121-
bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt);
121+
bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt, u32 func_id);
122122

123123
#ifdef __KVM_NVHE_HYPERVISOR__
124124
void __noreturn __hyp_do_panic(struct kvm_cpu_context *host_ctxt, u64 spsr,

‎arch/arm64/kernel/cpufeature.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ static const struct arm64_ftr_bits ftr_id_aa64isar1[] = {
222222
static const struct arm64_ftr_bits ftr_id_aa64isar2[] = {
223223
ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_CSSC_SHIFT, 4, 0),
224224
ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_RPRFM_SHIFT, 4, 0),
225-
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_EL1_BC_SHIFT, 4, 0),
225+
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_CLRBHB_SHIFT, 4, 0),
226+
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_BC_SHIFT, 4, 0),
226227
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_MOPS_SHIFT, 4, 0),
227228
ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),
228229
FTR_STRICT, FTR_EXACT, ID_AA64ISAR2_EL1_APA3_SHIFT, 4, 0),

‎arch/arm64/kvm/hyp/include/nvhe/ffa.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
#define FFA_MAX_FUNC_NUM 0x7F
1313

1414
int hyp_ffa_init(void *pages);
15-
bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt);
15+
bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id);
1616

1717
#endif /* __KVM_HYP_FFA_H */

‎arch/arm64/kvm/hyp/nvhe/ffa.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,8 @@ static bool do_ffa_features(struct arm_smccc_res *res,
634634
return true;
635635
}
636636

637-
bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt)
637+
bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id)
638638
{
639-
DECLARE_REG(u64, func_id, host_ctxt, 0);
640639
struct arm_smccc_res res;
641640

642641
/*

‎arch/arm64/kvm/hyp/nvhe/hyp-init.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ __do_hyp_init:
5757
cmp x0, #HVC_STUB_HCALL_NR
5858
b.lo __kvm_handle_stub_hvc
5959

60+
bic x0, x0, #ARM_SMCCC_CALL_HINTS
6061
mov x3, #KVM_HOST_SMCCC_FUNC(__kvm_hyp_init)
6162
cmp x0, x3
6263
b.eq 1f

‎arch/arm64/kvm/hyp/nvhe/hyp-main.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ static void handle_host_hcall(struct kvm_cpu_context *host_ctxt)
368368
if (static_branch_unlikely(&kvm_protected_mode_initialized))
369369
hcall_min = __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize;
370370

371+
id &= ~ARM_SMCCC_CALL_HINTS;
371372
id -= KVM_HOST_SMCCC_ID(0);
372373

373374
if (unlikely(id < hcall_min || id >= ARRAY_SIZE(host_hcall)))
@@ -392,11 +393,14 @@ static void default_host_smc_handler(struct kvm_cpu_context *host_ctxt)
392393

393394
static void handle_host_smc(struct kvm_cpu_context *host_ctxt)
394395
{
396+
DECLARE_REG(u64, func_id, host_ctxt, 0);
395397
bool handled;
396398

397-
handled = kvm_host_psci_handler(host_ctxt);
399+
func_id &= ~ARM_SMCCC_CALL_HINTS;
400+
401+
handled = kvm_host_psci_handler(host_ctxt, func_id);
398402
if (!handled)
399-
handled = kvm_host_ffa_handler(host_ctxt);
403+
handled = kvm_host_ffa_handler(host_ctxt, func_id);
400404
if (!handled)
401405
default_host_smc_handler(host_ctxt);
402406

‎arch/arm64/kvm/hyp/nvhe/psci-relay.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,8 @@ static unsigned long psci_1_0_handler(u64 func_id, struct kvm_cpu_context *host_
273273
}
274274
}
275275

276-
bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt)
276+
bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt, u32 func_id)
277277
{
278-
DECLARE_REG(u64, func_id, host_ctxt, 0);
279278
unsigned long ret;
280279

281280
switch (kvm_host_psci_config.version) {

‎arch/arm64/kvm/mmu.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,9 @@ int hyp_alloc_private_va_range(size_t size, unsigned long *haddr)
652652

653653
mutex_unlock(&kvm_hyp_pgd_mutex);
654654

655+
if (!ret)
656+
*haddr = base;
657+
655658
return ret;
656659
}
657660

‎arch/arm64/tools/sysreg

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,11 @@ UnsignedEnum 51:48 RPRFM
13471347
0b0000 NI
13481348
0b0001 IMP
13491349
EndEnum
1350-
Res0 47:28
1350+
Res0 47:32
1351+
UnsignedEnum 31:28 CLRBHB
1352+
0b0000 NI
1353+
0b0001 IMP
1354+
EndEnum
13511355
UnsignedEnum 27:24 PAC_frac
13521356
0b0000 NI
13531357
0b0001 IMP

‎arch/ia64/kernel/acpi.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,3 +907,7 @@ EXPORT_SYMBOL(acpi_unregister_ioapic);
907907
* TBD when IA64 starts to support suspend...
908908
*/
909909
int acpi_suspend_lowlevel(void) { return 0; }
910+
911+
void acpi_proc_quirk_mwait_check(void)
912+
{
913+
}

‎arch/loongarch/include/asm/addrspace.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
#ifndef __ASSEMBLY__
2121
#ifndef PHYS_OFFSET
22-
#define PHYS_OFFSET _AC(0, UL)
22+
#define PHYS_OFFSET _UL(0)
2323
#endif
2424
extern unsigned long vm_map_base;
2525
#endif /* __ASSEMBLY__ */
@@ -43,7 +43,7 @@ extern unsigned long vm_map_base;
4343
* Memory above this physical address will be considered highmem.
4444
*/
4545
#ifndef HIGHMEM_START
46-
#define HIGHMEM_START (_AC(1, UL) << _AC(DMW_PABITS, UL))
46+
#define HIGHMEM_START (_UL(1) << _UL(DMW_PABITS))
4747
#endif
4848

4949
#define TO_PHYS(x) ( ((x) & TO_PHYS_MASK))
@@ -65,16 +65,16 @@ extern unsigned long vm_map_base;
6565
#define _ATYPE_
6666
#define _ATYPE32_
6767
#define _ATYPE64_
68-
#define _CONST64_(x) x
6968
#else
7069
#define _ATYPE_ __PTRDIFF_TYPE__
7170
#define _ATYPE32_ int
7271
#define _ATYPE64_ __s64
72+
#endif
73+
7374
#ifdef CONFIG_64BIT
74-
#define _CONST64_(x) x ## UL
75+
#define _CONST64_(x) _UL(x)
7576
#else
76-
#define _CONST64_(x) x ## ULL
77-
#endif
77+
#define _CONST64_(x) _ULL(x)
7878
#endif
7979

8080
/*

‎arch/loongarch/include/asm/exception.h

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
2+
3+
#ifndef __ASM_EXCEPTION_H
4+
#define __ASM_EXCEPTION_H
5+
6+
#include <asm/ptrace.h>
7+
#include <linux/kprobes.h>
8+
9+
void show_registers(struct pt_regs *regs);
10+
11+
asmlinkage void cache_parity_error(void);
12+
asmlinkage void noinstr do_ade(struct pt_regs *regs);
13+
asmlinkage void noinstr do_ale(struct pt_regs *regs);
14+
asmlinkage void noinstr do_bce(struct pt_regs *regs);
15+
asmlinkage void noinstr do_bp(struct pt_regs *regs);
16+
asmlinkage void noinstr do_ri(struct pt_regs *regs);
17+
asmlinkage void noinstr do_fpu(struct pt_regs *regs);
18+
asmlinkage void noinstr do_fpe(struct pt_regs *regs, unsigned long fcsr);
19+
asmlinkage void noinstr do_lsx(struct pt_regs *regs);
20+
asmlinkage void noinstr do_lasx(struct pt_regs *regs);
21+
asmlinkage void noinstr do_lbt(struct pt_regs *regs);
22+
asmlinkage void noinstr do_watch(struct pt_regs *regs);
23+
asmlinkage void noinstr do_syscall(struct pt_regs *regs);
24+
asmlinkage void noinstr do_reserved(struct pt_regs *regs);
25+
asmlinkage void noinstr do_vint(struct pt_regs *regs, unsigned long sp);
26+
asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
27+
unsigned long write, unsigned long address);
28+
29+
asmlinkage void handle_ade(void);
30+
asmlinkage void handle_ale(void);
31+
asmlinkage void handle_bce(void);
32+
asmlinkage void handle_sys(void);
33+
asmlinkage void handle_bp(void);
34+
asmlinkage void handle_ri(void);
35+
asmlinkage void handle_fpu(void);
36+
asmlinkage void handle_fpe(void);
37+
asmlinkage void handle_lsx(void);
38+
asmlinkage void handle_lasx(void);
39+
asmlinkage void handle_lbt(void);
40+
asmlinkage void handle_watch(void);
41+
asmlinkage void handle_reserved(void);
42+
asmlinkage void handle_vint(void);
43+
asmlinkage void noinstr handle_loongarch_irq(struct pt_regs *regs);
44+
45+
#endif /* __ASM_EXCEPTION_H */

0 commit comments

Comments
 (0)