Skip to content

Commit 704b2eb

Browse files
ojedaojeda
authored
Merge pull request #506 from ojeda/sync
Sync
2 parents 67e981d + 69557e1 commit 704b2eb

File tree

286 files changed

+3232
-1504
lines changed

Some content is hidden

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

286 files changed

+3232
-1504
lines changed

‎MAINTAINERS

Lines changed: 14 additions & 10 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
@@ -2961,7 +2962,7 @@ F: crypto/async_tx/
29612962
F: include/linux/async_tx.h
29622963

29632964
AT24 EEPROM DRIVER
2964-
M: Bartosz Golaszewski <[email protected]>
2965+
M: Bartosz Golaszewski <[email protected]>
29652966
L: [email protected]
29662967
S: Maintained
29672968
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@ -3384,9 +3385,11 @@ F: Documentation/networking/filter.rst
33843385
F: Documentation/userspace-api/ebpf/
33853386
F: arch/*/net/*
33863387
F: include/linux/bpf*
3388+
F: include/linux/btf*
33873389
F: include/linux/filter.h
33883390
F: include/trace/events/xdp.h
33893391
F: include/uapi/linux/bpf*
3392+
F: include/uapi/linux/btf*
33903393
F: include/uapi/linux/filter.h
33913394
F: kernel/bpf/
33923395
F: kernel/trace/bpf_trace.c
@@ -3820,7 +3823,6 @@ F: drivers/scsi/mpi3mr/
38203823

38213824
BROADCOM NETXTREME-E ROCE DRIVER
38223825
M: Selvin Xavier <[email protected]>
3823-
M: Naresh Kumar PBS <[email protected]>
38243826
L: [email protected]
38253827
S: Supported
38263828
W: http://www.broadcom.com
@@ -7985,7 +7987,7 @@ F: include/linux/gpio/regmap.h
79857987

79867988
GPIO SUBSYSTEM
79877989
M: Linus Walleij <[email protected]>
7988-
M: Bartosz Golaszewski <[email protected]>
7990+
M: Bartosz Golaszewski <[email protected]>
79897991
L: [email protected]
79907992
S: Maintained
79917993
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
@@ -11366,7 +11368,7 @@ F: Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
1136611368
F: drivers/iio/proximity/mb1232.c
1136711369

1136811370
MAXIM MAX77650 PMIC MFD DRIVER
11369-
M: Bartosz Golaszewski <[email protected]>
11371+
M: Bartosz Golaszewski <[email protected]>
1137011372
L: [email protected]
1137111373
S: Maintained
1137211374
F: Documentation/devicetree/bindings/*/*max77650.yaml
@@ -17897,7 +17899,8 @@ M: Olivier Moysan <[email protected]>
1789717899
M: Arnaud Pouliquen <[email protected]>
1789817900
L: [email protected] (moderated for non-subscribers)
1789917901
S: Maintained
17900-
F: Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
17902+
F: Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
17903+
F: Documentation/devicetree/bindings/sound/st,stm32-*.yaml
1790117904
F: sound/soc/stm/
1790217905

1790317906
STM32 TIMER/LPTIMER DRIVERS
@@ -18561,13 +18564,14 @@ T: git git://linuxtv.org/media_tree.git
1856118564
F: drivers/media/radio/radio-raremono.c
1856218565

1856318566
THERMAL
18564-
M: Zhang Rui <[email protected]>
18567+
M: Rafael J. Wysocki <[email protected]>
1856518568
M: Daniel Lezcano <[email protected]>
1856618569
R: Amit Kucheria <[email protected]>
18570+
R: Zhang Rui <[email protected]>
1856718571
L: [email protected]
1856818572
S: Supported
1856918573
Q: https://patchwork.kernel.org/project/linux-pm/list/
18570-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
18574+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
1857118575
F: Documentation/devicetree/bindings/thermal/
1857218576
F: drivers/thermal/
1857318577
F: include/linux/cpu_cooling.h
@@ -18696,7 +18700,7 @@ F: include/linux/clk/ti.h
1869618700

1869718701
TI DAVINCI MACHINE SUPPORT
1869818702
M: Sekhar Nori <[email protected]>
18699-
R: Bartosz Golaszewski <[email protected]>
18703+
R: Bartosz Golaszewski <[email protected]>
1870018704
L: [email protected] (moderated for non-subscribers)
1870118705
S: Supported
1870218706
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git

‎arch/arm64/kvm/hyp/nvhe/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ $(obj)/kvm_nvhe.tmp.o: $(obj)/hyp.lds $(addprefix $(obj)/,$(hyp-obj)) FORCE
5454
# runtime. Because the hypervisor is part of the kernel binary, relocations
5555
# produce a kernel VA. We enumerate relocations targeting hyp at build time
5656
# and convert the kernel VAs at those positions to hyp VAs.
57-
$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel
57+
$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel FORCE
5858
$(call if_changed,hyprel)
5959

6060
# 5) Compile hyp-reloc.S and link it into the existing partially linked object.

‎arch/arm64/kvm/perf.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ static struct perf_guest_info_callbacks kvm_guest_cbs = {
5050

5151
int kvm_perf_init(void)
5252
{
53-
if (kvm_pmu_probe_pmuver() != ID_AA64DFR0_PMUVER_IMP_DEF && !is_protected_kvm_enabled())
54-
static_branch_enable(&kvm_arm_pmu_available);
55-
5653
return perf_register_guest_info_callbacks(&kvm_guest_cbs);
5754
}
5855

‎arch/arm64/kvm/pmu-emul.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,14 @@ void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data,
740740
kvm_pmu_create_perf_event(vcpu, select_idx);
741741
}
742742

743-
int kvm_pmu_probe_pmuver(void)
743+
void kvm_host_pmu_init(struct arm_pmu *pmu)
744+
{
745+
if (pmu->pmuver != 0 && pmu->pmuver != ID_AA64DFR0_PMUVER_IMP_DEF &&
746+
!kvm_arm_support_pmu_v3() && !is_protected_kvm_enabled())
747+
static_branch_enable(&kvm_arm_pmu_available);
748+
}
749+
750+
static int kvm_pmu_probe_pmuver(void)
744751
{
745752
struct perf_event_attr attr = { };
746753
struct perf_event *event;

‎arch/m68k/68000/entry.S

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <asm/unistd.h>
1616
#include <asm/errno.h>
1717
#include <asm/setup.h>
18-
#include <asm/segment.h>
1918
#include <asm/traps.h>
2019
#include <asm/asm-offsets.h>
2120
#include <asm/entry.h>
@@ -25,7 +24,6 @@
2524
.globl system_call
2625
.globl resume
2726
.globl ret_from_exception
28-
.globl ret_from_signal
2927
.globl sys_call_table
3028
.globl bad_interrupt
3129
.globl inthandler1
@@ -59,8 +57,6 @@ do_trace:
5957
subql #4,%sp /* dummy return address */
6058
SAVE_SWITCH_STACK
6159
jbsr syscall_trace_leave
62-
63-
ret_from_signal:
6460
RESTORE_SWITCH_STACK
6561
addql #4,%sp
6662
jra ret_from_exception

‎arch/m68k/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ config M68K
2929
select NO_DMA if !MMU && !COLDFIRE
3030
select OLD_SIGACTION
3131
select OLD_SIGSUSPEND3
32-
select SET_FS
3332
select UACCESS_MEMCPY if !MMU
3433
select VIRT_TO_BUS
3534
select ZONE_DMA

‎arch/m68k/coldfire/entry.S

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <asm/thread_info.h>
3232
#include <asm/errno.h>
3333
#include <asm/setup.h>
34-
#include <asm/segment.h>
3534
#include <asm/asm-offsets.h>
3635
#include <asm/entry.h>
3736

@@ -51,7 +50,6 @@ sw_usp:
5150
.globl system_call
5251
.globl resume
5352
.globl ret_from_exception
54-
.globl ret_from_signal
5553
.globl sys_call_table
5654
.globl inthandler
5755

@@ -98,8 +96,6 @@ ENTRY(system_call)
9896
subql #4,%sp /* dummy return address */
9997
SAVE_SWITCH_STACK
10098
jbsr syscall_trace_leave
101-
102-
ret_from_signal:
10399
RESTORE_SWITCH_STACK
104100
addql #4,%sp
105101

‎arch/m68k/include/asm/processor.h

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#define __ASM_M68K_PROCESSOR_H
1010

1111
#include <linux/thread_info.h>
12-
#include <asm/segment.h>
1312
#include <asm/fpu.h>
1413
#include <asm/ptrace.h>
1514

@@ -75,11 +74,37 @@ static inline void wrusp(unsigned long usp)
7574
#define TASK_UNMAPPED_BASE 0
7675
#endif
7776

77+
/* Address spaces (or Function Codes in Motorola lingo) */
78+
#define USER_DATA 1
79+
#define USER_PROGRAM 2
80+
#define SUPER_DATA 5
81+
#define SUPER_PROGRAM 6
82+
#define CPU_SPACE 7
83+
84+
#ifdef CONFIG_CPU_HAS_ADDRESS_SPACES
85+
/*
86+
* Set the SFC/DFC registers for special MM operations. For most normal
87+
* operation these remain set to USER_DATA for the uaccess routines.
88+
*/
89+
static inline void set_fc(unsigned long val)
90+
{
91+
WARN_ON_ONCE(in_interrupt());
92+
93+
__asm__ __volatile__ ("movec %0,%/sfc\n\t"
94+
"movec %0,%/dfc\n\t"
95+
: /* no outputs */ : "r" (val) : "memory");
96+
}
97+
#else
98+
static inline void set_fc(unsigned long val)
99+
{
100+
}
101+
#endif /* CONFIG_CPU_HAS_ADDRESS_SPACES */
102+
78103
struct thread_struct {
79104
unsigned long ksp; /* kernel stack pointer */
80105
unsigned long usp; /* user stack pointer */
81106
unsigned short sr; /* saved status register */
82-
unsigned short fs; /* saved fs (sfc, dfc) */
107+
unsigned short fc; /* saved fc (sfc, dfc) */
83108
unsigned long crp[2]; /* cpu root pointer */
84109
unsigned long esp0; /* points to SR of stack frame */
85110
unsigned long faddr; /* info about last fault */
@@ -92,7 +117,7 @@ struct thread_struct {
92117
#define INIT_THREAD { \
93118
.ksp = sizeof(init_stack) + (unsigned long) init_stack, \
94119
.sr = PS_S, \
95-
.fs = __KERNEL_DS, \
120+
.fc = USER_DATA, \
96121
}
97122

98123
/*

‎arch/m68k/include/asm/segment.h

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎arch/m68k/include/asm/thread_info.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include <asm/types.h>
66
#include <asm/page.h>
7-
#include <asm/segment.h>
87

98
/*
109
* On machines with 4k pages we default to an 8k thread size, though we
@@ -27,7 +26,6 @@
2726
struct thread_info {
2827
struct task_struct *task; /* main task structure */
2928
unsigned long flags;
30-
mm_segment_t addr_limit; /* thread address space */
3129
int preempt_count; /* 0 => preemptable, <0 => BUG */
3230
__u32 cpu; /* should always be 0 on m68k */
3331
unsigned long tp_value; /* thread pointer */
@@ -37,7 +35,6 @@ struct thread_info {
3735
#define INIT_THREAD_INFO(tsk) \
3836
{ \
3937
.task = &tsk, \
40-
.addr_limit = KERNEL_DS, \
4138
.preempt_count = INIT_PREEMPT_COUNT, \
4239
}
4340

‎arch/m68k/include/asm/tlbflush.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ static inline void flush_tlb_kernel_page(void *addr)
1313
if (CPU_IS_COLDFIRE) {
1414
mmu_write(MMUOR, MMUOR_CNL);
1515
} else if (CPU_IS_040_OR_060) {
16-
mm_segment_t old_fs = get_fs();
17-
set_fs(KERNEL_DS);
16+
set_fc(SUPER_DATA);
1817
__asm__ __volatile__(".chip 68040\n\t"
1918
"pflush (%0)\n\t"
2019
".chip 68k"
2120
: : "a" (addr));
22-
set_fs(old_fs);
21+
set_fc(USER_DATA);
2322
} else if (CPU_IS_020_OR_030)
2423
__asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr));
2524
}
@@ -84,12 +83,8 @@ static inline void flush_tlb_mm(struct mm_struct *mm)
8483

8584
static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
8685
{
87-
if (vma->vm_mm == current->active_mm) {
88-
mm_segment_t old_fs = force_uaccess_begin();
89-
86+
if (vma->vm_mm == current->active_mm)
9087
__flush_tlb_one(addr);
91-
force_uaccess_end(old_fs);
92-
}
9388
}
9489

9590
static inline void flush_tlb_range(struct vm_area_struct *vma,

‎arch/m68k/include/asm/traps.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,10 @@ struct frame {
267267
} un;
268268
};
269269

270+
#ifdef CONFIG_M68040
271+
asmlinkage void berr_040cleanup(struct frame *fp);
272+
#endif
273+
270274
#endif /* __ASSEMBLY__ */
271275

272276
#endif /* _M68K_TRAPS_H */

0 commit comments

Comments
 (0)