Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 752182b

Browse files
author
Ingo Molnar
committed
Merge tag 'v6.5-rc2' into sched/core, to pick up fixes
Sync with upstream fixes before applying EEVDF. Signed-off-by: Ingo Molnar <[email protected]>
2 parents 48b5583 + fdf0eaf commit 752182b

File tree

296 files changed

+2858
-1629
lines changed

Some content is hidden

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

296 files changed

+2858
-1629
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ John Paul Adrian Glaubitz <[email protected]>
246246
John Stultz <[email protected]>
247247
<[email protected]> <[email protected]>
248248
<[email protected]> <[email protected]>
249+
Jonas Gorski <[email protected]> <[email protected]>
249250
Jordan Crouse <[email protected]> <[email protected]>
250251
<[email protected]> <[email protected]>
251252
<[email protected]> <[email protected]>

‎Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

‎Documentation/devicetree/bindings/watchdog/loongson,ls1x-wdt.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/loongson,ls1x-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Loongson-1 Watchdog Timer
8+
9+
maintainers:
10+
- Keguang Zhang <[email protected]>
11+
12+
allOf:
13+
- $ref: watchdog.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- loongson,ls1b-wdt
19+
- loongson,ls1c-wdt
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
maxItems: 1
26+
27+
required:
28+
- compatible
29+
- reg
30+
- clocks
31+
32+
unevaluatedProperties: false
33+
34+
examples:
35+
- |
36+
#include <dt-bindings/clock/loongson,ls1x-clk.h>
37+
watchdog: watchdog@1fe5c060 {
38+
compatible = "loongson,ls1b-wdt";
39+
reg = <0x1fe5c060 0xc>;
40+
41+
clocks = <&clkc LS1X_CLKID_APB>;
42+
};

‎Documentation/process/maintainer-netdev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ If you aren't subscribed to netdev and/or are simply unsure if
9898
repository link above for any new networking-related commits. You may
9999
also check the following website for the current status:
100100

101-
http://vger.kernel.org/~davem/net-next.html
101+
https://patchwork.hopto.org/net-next.html
102102

103103
The ``net`` tree continues to collect fixes for the vX.Y content, and is
104104
fed back to Linus at regular (~weekly) intervals. Meaning that the

‎Documentation/riscv/hwprobe.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following keys are defined:
4949
privileged ISA, with the following known exceptions (more exceptions may be
5050
added, but only if it can be demonstrated that the user ABI is not broken):
5151

52-
* The :fence.i: instruction cannot be directly executed by userspace
52+
* The ``fence.i`` instruction cannot be directly executed by userspace
5353
programs (it may still be executed in userspace via a
5454
kernel-controlled mechanism such as the vDSO).
5555

‎Documentation/wmi/devices/dell-wmi-ddv.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ WMI method BatteryeRawAnalytics()
187187

188188
Returns a buffer usually containg 12 blocks of analytics data.
189189
Those blocks contain:
190-
- block number starting with 0 (u8)
190+
191+
- a block number starting with 0 (u8)
191192
- 31 bytes of unknown data
192193

193194
.. note::

‎MAINTAINERS

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4121,6 +4121,13 @@ F: Documentation/devicetree/bindings/spi/brcm,bcm63xx-hsspi.yaml
41214121
F: drivers/spi/spi-bcm63xx-hsspi.c
41224122
F: drivers/spi/spi-bcmbca-hsspi.c
41234123

4124+
BROADCOM BCM6348/BCM6358 SPI controller DRIVER
4125+
M: Jonas Gorski <[email protected]>
4126+
L: [email protected]
4127+
S: Odd Fixes
4128+
F: Documentation/devicetree/bindings/spi/spi-bcm63xx.txt
4129+
F: drivers/spi/spi-bcm63xx.c
4130+
41244131
BROADCOM ETHERNET PHY DRIVERS
41254132
M: Florian Fainelli <[email protected]>
41264133
R: Broadcom internal kernel review list <[email protected]>
@@ -8672,8 +8679,11 @@ S: Maintained
86728679
F: drivers/input/touchscreen/resistive-adc-touch.c
86738680

86748681
GENERIC STRING LIBRARY
8682+
M: Kees Cook <[email protected]>
86758683
R: Andy Shevchenko <[email protected]>
8676-
S: Maintained
8684+
L: [email protected]
8685+
S: Supported
8686+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
86778687
F: include/linux/string.h
86788688
F: include/linux/string_choices.h
86798689
F: include/linux/string_helpers.h
@@ -13968,7 +13978,7 @@ T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
1396813978
F: drivers/soc/microchip/
1396913979

1397013980
MICROCHIP SPI DRIVER
13971-
M: Tudor Ambarus <[email protected]>
13981+
M: Ryan Wanner <[email protected]>
1397213982
S: Supported
1397313983
F: drivers/spi/spi-atmel.*
1397413984

@@ -17543,6 +17553,7 @@ QUALCOMM ETHQOS ETHERNET DRIVER
1754317553
M: Vinod Koul <[email protected]>
1754417554
R: Bhupesh Sharma <[email protected]>
1754517555
L: [email protected]
17556+
L: [email protected]
1754617557
S: Maintained
1754717558
F: Documentation/devicetree/bindings/net/qcom,ethqos.yaml
1754817559
F: drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

‎Makefile

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

88
# *DOCUMENTATION*

‎arch/arm64/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ config ARM64
197197
!CC_OPTIMIZE_FOR_SIZE)
198198
select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY \
199199
if DYNAMIC_FTRACE_WITH_ARGS
200+
select HAVE_SAMPLE_FTRACE_DIRECT
201+
select HAVE_SAMPLE_FTRACE_DIRECT_MULTI
200202
select HAVE_EFFICIENT_UNALIGNED_ACCESS
201203
select HAVE_FAST_GUP
202204
select HAVE_FTRACE_MCOUNT_RECORD

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@ static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs
211211
{
212212
return ret_regs->fp;
213213
}
214+
215+
void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,
216+
unsigned long frame_pointer);
217+
214218
#endif /* ifdef CONFIG_FUNCTION_GRAPH_TRACER */
215219
#endif
216220

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,7 @@ static inline int syscall_get_arch(struct task_struct *task)
8585
return AUDIT_ARCH_AARCH64;
8686
}
8787

88+
int syscall_trace_enter(struct pt_regs *regs);
89+
void syscall_trace_exit(struct pt_regs *regs);
90+
8891
#endif /* __ASM_SYSCALL_H */

‎arch/arm64/kernel/syscall.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ static inline bool has_syscall_work(unsigned long flags)
7575
return unlikely(flags & _TIF_SYSCALL_WORK);
7676
}
7777

78-
int syscall_trace_enter(struct pt_regs *regs);
79-
void syscall_trace_exit(struct pt_regs *regs);
80-
8178
static void el0_svc_common(struct pt_regs *regs, int scno, int sc_nr,
8279
const syscall_fn_t syscall_table[])
8380
{

‎arch/openrisc/include/uapi/asm/sigcontext.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828

2929
struct sigcontext {
3030
struct user_regs_struct regs; /* needs to be first */
31-
struct __or1k_fpu_state fpu;
32-
unsigned long oldmask;
31+
union {
32+
unsigned long fpcsr;
33+
unsigned long oldmask; /* unused */
34+
};
3335
};
3436

3537
#endif /* __ASM_OPENRISC_SIGCONTEXT_H */

‎arch/openrisc/kernel/signal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static int restore_sigcontext(struct pt_regs *regs,
5050
err |= __copy_from_user(regs, sc->regs.gpr, 32 * sizeof(unsigned long));
5151
err |= __copy_from_user(&regs->pc, &sc->regs.pc, sizeof(unsigned long));
5252
err |= __copy_from_user(&regs->sr, &sc->regs.sr, sizeof(unsigned long));
53-
err |= __copy_from_user(&regs->fpcsr, &sc->fpu.fpcsr, sizeof(unsigned long));
53+
err |= __copy_from_user(&regs->fpcsr, &sc->fpcsr, sizeof(unsigned long));
5454

5555
/* make sure the SM-bit is cleared so user-mode cannot fool us */
5656
regs->sr &= ~SPR_SR_SM;
@@ -113,7 +113,7 @@ static int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
113113
err |= __copy_to_user(sc->regs.gpr, regs, 32 * sizeof(unsigned long));
114114
err |= __copy_to_user(&sc->regs.pc, &regs->pc, sizeof(unsigned long));
115115
err |= __copy_to_user(&sc->regs.sr, &regs->sr, sizeof(unsigned long));
116-
err |= __copy_to_user(&sc->fpu.fpcsr, &regs->fpcsr, sizeof(unsigned long));
116+
err |= __copy_to_user(&sc->fpcsr, &regs->fpcsr, sizeof(unsigned long));
117117

118118
return err;
119119
}

‎arch/powerpc/include/asm/book3s/64/hash-4k.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,6 @@ static inline int hash__pmd_trans_huge(pmd_t pmd)
136136
return 0;
137137
}
138138

139-
static inline int hash__pmd_same(pmd_t pmd_a, pmd_t pmd_b)
140-
{
141-
BUG();
142-
return 0;
143-
}
144-
145139
static inline pmd_t hash__pmd_mkhuge(pmd_t pmd)
146140
{
147141
BUG();

‎arch/powerpc/include/asm/book3s/64/hash-64k.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,6 @@ static inline int hash__pmd_trans_huge(pmd_t pmd)
263263
(_PAGE_PTE | H_PAGE_THP_HUGE));
264264
}
265265

266-
static inline int hash__pmd_same(pmd_t pmd_a, pmd_t pmd_b)
267-
{
268-
return (((pmd_raw(pmd_a) ^ pmd_raw(pmd_b)) & ~cpu_to_be64(_PAGE_HPTEFLAGS)) == 0);
269-
}
270-
271266
static inline pmd_t hash__pmd_mkhuge(pmd_t pmd)
272267
{
273268
return __pmd(pmd_val(pmd) | (_PAGE_PTE | H_PAGE_THP_HUGE));

‎arch/powerpc/include/asm/book3s/64/hash.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ static inline int get_region_id(unsigned long ea)
132132
return region_id;
133133
}
134134

135+
static inline int hash__pmd_same(pmd_t pmd_a, pmd_t pmd_b)
136+
{
137+
return (((pmd_raw(pmd_a) ^ pmd_raw(pmd_b)) & ~cpu_to_be64(_PAGE_HPTEFLAGS)) == 0);
138+
}
139+
135140
#define hash__pmd_bad(pmd) (pmd_val(pmd) & H_PMD_BAD_BITS)
136141
#define hash__pud_bad(pud) (pud_val(pud) & H_PUD_BAD_BITS)
137142
static inline int hash__p4d_bad(p4d_t p4d)

‎arch/powerpc/kernel/exceptions-64e.S

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Copyright (C) 2007 Ben. Herrenschmidt ([email protected]), IBM Corp.
66
*/
77

8+
#include <linux/linkage.h>
89
#include <linux/threads.h>
910
#include <asm/reg.h>
1011
#include <asm/page.h>
@@ -66,7 +67,7 @@
6667
#define SPECIAL_EXC_LOAD(reg, name) \
6768
ld reg, (SPECIAL_EXC_##name * 8 + SPECIAL_EXC_FRAME_OFFS)(r1)
6869

69-
special_reg_save:
70+
SYM_CODE_START_LOCAL(special_reg_save)
7071
/*
7172
* We only need (or have stack space) to save this stuff if
7273
* we interrupted the kernel.
@@ -131,8 +132,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
131132
SPECIAL_EXC_STORE(r10,CSRR1)
132133

133134
blr
135+
SYM_CODE_END(special_reg_save)
134136

135-
ret_from_level_except:
137+
SYM_CODE_START_LOCAL(ret_from_level_except)
136138
ld r3,_MSR(r1)
137139
andi. r3,r3,MSR_PR
138140
beq 1f
@@ -206,6 +208,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
206208
mtxer r11
207209

208210
blr
211+
SYM_CODE_END(ret_from_level_except)
209212

210213
.macro ret_from_level srr0 srr1 paca_ex scratch
211214
bl ret_from_level_except
@@ -232,13 +235,15 @@ END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
232235
mfspr r13,\scratch
233236
.endm
234237

235-
ret_from_crit_except:
238+
SYM_CODE_START_LOCAL(ret_from_crit_except)
236239
ret_from_level SPRN_CSRR0 SPRN_CSRR1 PACA_EXCRIT SPRN_SPRG_CRIT_SCRATCH
237240
rfci
241+
SYM_CODE_END(ret_from_crit_except)
238242

239-
ret_from_mc_except:
243+
SYM_CODE_START_LOCAL(ret_from_mc_except)
240244
ret_from_level SPRN_MCSRR0 SPRN_MCSRR1 PACA_EXMC SPRN_SPRG_MC_SCRATCH
241245
rfmci
246+
SYM_CODE_END(ret_from_mc_except)
242247

243248
/* Exception prolog code for all exceptions */
244249
#define EXCEPTION_PROLOG(n, intnum, type, addition) \
@@ -978,20 +983,22 @@ masked_interrupt_book3e_0x2c0:
978983
* r14 and r15 containing the fault address and error code, with the
979984
* original values stashed away in the PACA
980985
*/
981-
storage_fault_common:
986+
SYM_CODE_START_LOCAL(storage_fault_common)
982987
addi r3,r1,STACK_INT_FRAME_REGS
983988
bl do_page_fault
984989
b interrupt_return
990+
SYM_CODE_END(storage_fault_common)
985991

986992
/*
987993
* Alignment exception doesn't fit entirely in the 0x100 bytes so it
988994
* continues here.
989995
*/
990-
alignment_more:
996+
SYM_CODE_START_LOCAL(alignment_more)
991997
addi r3,r1,STACK_INT_FRAME_REGS
992998
bl alignment_exception
993999
REST_NVGPRS(r1)
9941000
b interrupt_return
1001+
SYM_CODE_END(alignment_more)
9951002

9961003
/*
9971004
* Trampolines used when spotting a bad kernel stack pointer in
@@ -1030,8 +1037,7 @@ BAD_STACK_TRAMPOLINE(0xe00)
10301037
BAD_STACK_TRAMPOLINE(0xf00)
10311038
BAD_STACK_TRAMPOLINE(0xf20)
10321039

1033-
.globl bad_stack_book3e
1034-
bad_stack_book3e:
1040+
_GLOBAL(bad_stack_book3e)
10351041
/* XXX: Needs to make SPRN_SPRG_GEN depend on exception type */
10361042
mfspr r10,SPRN_SRR0; /* read SRR0 before touching stack */
10371043
ld r1,PACAEMERGSP(r13)
@@ -1285,8 +1291,7 @@ have_hes:
12851291
* ever takes any parameters, the SCOM code must also be updated to
12861292
* provide them.
12871293
*/
1288-
.globl a2_tlbinit_code_start
1289-
a2_tlbinit_code_start:
1294+
_GLOBAL(a2_tlbinit_code_start)
12901295

12911296
ori r11,r3,MAS0_WQ_ALLWAYS
12921297
oris r11,r11,MAS0_ESEL(3)@h /* Use way 3: workaround A2 erratum 376 */
@@ -1479,16 +1484,15 @@ _GLOBAL(book3e_secondary_thread_init)
14791484
mflr r28
14801485
b 3b
14811486

1482-
.globl init_core_book3e
1483-
init_core_book3e:
1487+
_GLOBAL(init_core_book3e)
14841488
/* Establish the interrupt vector base */
14851489
tovirt(r2,r2)
14861490
LOAD_REG_ADDR(r3, interrupt_base_book3e)
14871491
mtspr SPRN_IVPR,r3
14881492
sync
14891493
blr
14901494

1491-
init_thread_book3e:
1495+
SYM_CODE_START_LOCAL(init_thread_book3e)
14921496
lis r3,(SPRN_EPCR_ICM | SPRN_EPCR_GICM)@h
14931497
mtspr SPRN_EPCR,r3
14941498

@@ -1502,6 +1506,7 @@ init_thread_book3e:
15021506
mtspr SPRN_TSR,r3
15031507

15041508
blr
1509+
SYM_CODE_END(init_thread_book3e)
15051510

15061511
_GLOBAL(__setup_base_ivors)
15071512
SET_IVOR(0, 0x020) /* Critical Input */

0 commit comments

Comments
 (0)