diff options
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1004_linux-5.1.5.patch | 4948 |
2 files changed, 4952 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 7dd08668..24316998 100644 --- a/0000_README +++ b/0000_README @@ -59,6 +59,10 @@ Patch: 1003_linux-5.1.4.patch From: http://www.kernel.org Desc: Linux 5.1.4 +Patch: 1004_linux-5.1.5.patch +From: http://www.kernel.org +Desc: Linux 5.1.5 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1004_linux-5.1.5.patch b/1004_linux-5.1.5.patch new file mode 100644 index 00000000..db0c77c2 --- /dev/null +++ b/1004_linux-5.1.5.patch @@ -0,0 +1,4948 @@ +diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting +index cf43bc4dbf31..a60fa516d4cb 100644 +--- a/Documentation/filesystems/porting ++++ b/Documentation/filesystems/porting +@@ -638,3 +638,8 @@ in your dentry operations instead. + inode to d_splice_alias() will also do the right thing (equivalent of + d_add(dentry, NULL); return NULL;), so that kind of special cases + also doesn't need a separate treatment. ++-- ++[mandatory] ++ DCACHE_RCUACCESS is gone; having an RCU delay on dentry freeing is the ++ default. DCACHE_NORCU opts out, and only d_alloc_pseudo() has any ++ business doing so. +diff --git a/Makefile b/Makefile +index acab93537f63..24a16a544ffd 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 1 +-SUBLEVEL = 4 ++SUBLEVEL = 5 + EXTRAVERSION = + NAME = Shy Crocodile + +diff --git a/arch/Kconfig b/arch/Kconfig +index 33687dddd86a..9092e0ffe4d3 100644 +--- a/arch/Kconfig ++++ b/arch/Kconfig +@@ -764,7 +764,7 @@ config COMPAT_OLD_SIGACTION + bool + + config 64BIT_TIME +- def_bool ARCH_HAS_64BIT_TIME ++ def_bool y + help + This should be selected by all architectures that need to support + new system calls with a 64-bit time_t. This is relevant on all 32-bit +diff --git a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi +index 3cae139e6396..c40a7af6ebee 100644 +--- a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi ++++ b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi +@@ -88,6 +88,7 @@ + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; ++ startup-delay-us = <70000>; + enable-active-high; + }; + +@@ -99,6 +100,7 @@ + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>; ++ startup-delay-us = <70000>; + enable-active-high; + regulator-always-on; + }; +diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c +index 413863508f6f..d67fb64e908c 100644 +--- a/arch/mips/kernel/perf_event_mipsxx.c ++++ b/arch/mips/kernel/perf_event_mipsxx.c +@@ -64,17 +64,11 @@ struct mips_perf_event { + #define CNTR_EVEN 0x55555555 + #define CNTR_ODD 0xaaaaaaaa + #define CNTR_ALL 0xffffffff +-#ifdef CONFIG_MIPS_MT_SMP + enum { + T = 0, + V = 1, + P = 2, + } range; +-#else +- #define T +- #define V +- #define P +-#endif + }; + + static struct mips_perf_event raw_event; +@@ -325,9 +319,7 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) + { + struct perf_event *event = container_of(evt, struct perf_event, hw); + struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events); +-#ifdef CONFIG_MIPS_MT_SMP + unsigned int range = evt->event_base >> 24; +-#endif /* CONFIG_MIPS_MT_SMP */ + + WARN_ON(idx < 0 || idx >= mipspmu.num_counters); + +@@ -336,21 +328,15 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) + /* Make sure interrupt enabled. */ + MIPS_PERFCTRL_IE; + +-#ifdef CONFIG_CPU_BMIPS5000 +- { ++ if (IS_ENABLED(CONFIG_CPU_BMIPS5000)) { + /* enable the counter for the calling thread */ + cpuc->saved_ctrl[idx] |= + (1 << (12 + vpe_id())) | BRCM_PERFCTRL_TC; +- } +-#else +-#ifdef CONFIG_MIPS_MT_SMP +- if (range > V) { ++ } else if (IS_ENABLED(CONFIG_MIPS_MT_SMP) && range > V) { + /* The counter is processor wide. Set it up to count all TCs. */ + pr_debug("Enabling perf counter for all TCs\n"); + cpuc->saved_ctrl[idx] |= M_TC_EN_ALL; +- } else +-#endif /* CONFIG_MIPS_MT_SMP */ +- { ++ } else { + unsigned int cpu, ctrl; + + /* +@@ -365,7 +351,6 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) + cpuc->saved_ctrl[idx] |= ctrl; + pr_debug("Enabling perf counter for CPU%d\n", cpu); + } +-#endif /* CONFIG_CPU_BMIPS5000 */ + /* + * We do not actually let the counter run. Leave it until start(). + */ +diff --git a/arch/parisc/boot/compressed/head.S b/arch/parisc/boot/compressed/head.S +index 5aba20fa48aa..e8b798fd0cf0 100644 +--- a/arch/parisc/boot/compressed/head.S ++++ b/arch/parisc/boot/compressed/head.S +@@ -22,7 +22,7 @@ + __HEAD + + ENTRY(startup) +- .level LEVEL ++ .level PA_ASM_LEVEL + + #define PSW_W_SM 0x200 + #define PSW_W_BIT 36 +@@ -63,7 +63,7 @@ $bss_loop: + load32 BOOTADDR(decompress_kernel),%r3 + + #ifdef CONFIG_64BIT +- .level LEVEL ++ .level PA_ASM_LEVEL + ssm PSW_W_SM, %r0 /* set W-bit */ + depdi 0, 31, 32, %r3 + #endif +@@ -72,7 +72,7 @@ $bss_loop: + + startup_continue: + #ifdef CONFIG_64BIT +- .level LEVEL ++ .level PA_ASM_LEVEL + rsm PSW_W_SM, %r0 /* clear W-bit */ + #endif + +diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h +index c17ec0ee6e7c..d85738a7bbe6 100644 +--- a/arch/parisc/include/asm/assembly.h ++++ b/arch/parisc/include/asm/assembly.h +@@ -61,14 +61,14 @@ + #define LDCW ldcw,co + #define BL b,l + # ifdef CONFIG_64BIT +-# define LEVEL 2.0w ++# define PA_ASM_LEVEL 2.0w + # else +-# define LEVEL 2.0 ++# define PA_ASM_LEVEL 2.0 + # endif + #else + #define LDCW ldcw + #define BL bl +-#define LEVEL 1.1 ++#define PA_ASM_LEVEL 1.1 + #endif + + #ifdef __ASSEMBLY__ +diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h +index 006fb939cac8..4016fe1c65a9 100644 +--- a/arch/parisc/include/asm/cache.h ++++ b/arch/parisc/include/asm/cache.h +@@ -44,22 +44,22 @@ void parisc_setup_cache_timing(void); + + #define pdtlb(addr) asm volatile("pdtlb 0(%%sr1,%0)" \ + ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ +- : : "r" (addr)) ++ : : "r" (addr) : "memory") + #define pitlb(addr) asm volatile("pitlb 0(%%sr1,%0)" \ + ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ + ALTERNATIVE(ALT_COND_NO_SPLIT_TLB, INSN_NOP) \ +- : : "r" (addr)) ++ : : "r" (addr) : "memory") + #define pdtlb_kernel(addr) asm volatile("pdtlb 0(%0)" \ + ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ +- : : "r" (addr)) ++ : : "r" (addr) : "memory") + + #define asm_io_fdc(addr) asm volatile("fdc %%r0(%0)" \ + ALTERNATIVE(ALT_COND_NO_DCACHE, INSN_NOP) \ + ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) \ +- : : "r" (addr)) ++ : : "r" (addr) : "memory") + #define asm_io_sync() asm volatile("sync" \ + ALTERNATIVE(ALT_COND_NO_DCACHE, INSN_NOP) \ +- ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :: ) ++ ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :::"memory") + + #endif /* ! __ASSEMBLY__ */ + +diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S +index fbb4e43fda05..f56cbab64ac1 100644 +--- a/arch/parisc/kernel/head.S ++++ b/arch/parisc/kernel/head.S +@@ -22,7 +22,7 @@ + #include <linux/linkage.h> + #include <linux/init.h> + +- .level LEVEL ++ .level PA_ASM_LEVEL + + __INITDATA + ENTRY(boot_args) +@@ -258,7 +258,7 @@ stext_pdc_ret: + ldo R%PA(fault_vector_11)(%r10),%r10 + + $is_pa20: +- .level LEVEL /* restore 1.1 || 2.0w */ ++ .level PA_ASM_LEVEL /* restore 1.1 || 2.0w */ + #endif /*!CONFIG_64BIT*/ + load32 PA(fault_vector_20),%r10 + +diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c +index 841db71958cd..97c206734e24 100644 +--- a/arch/parisc/kernel/process.c ++++ b/arch/parisc/kernel/process.c +@@ -193,6 +193,7 @@ int dump_task_fpu (struct task_struct *tsk, elf_fpregset_t *r) + */ + + int running_on_qemu __read_mostly; ++EXPORT_SYMBOL(running_on_qemu); + + void __cpuidle arch_cpu_idle_dead(void) + { +diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S +index 4f77bd9be66b..93cc36d98875 100644 +--- a/arch/parisc/kernel/syscall.S ++++ b/arch/parisc/kernel/syscall.S +@@ -48,7 +48,7 @@ registers). + */ + #define KILL_INSN break 0,0 + +- .level LEVEL ++ .level PA_ASM_LEVEL + + .text + +diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c +index d0b166256f1a..14147eb7a142 100644 +--- a/arch/parisc/mm/init.c ++++ b/arch/parisc/mm/init.c +@@ -495,7 +495,7 @@ static void __init map_pages(unsigned long start_vaddr, + + void __init set_kernel_text_rw(int enable_read_write) + { +- unsigned long start = (unsigned long) _text; ++ unsigned long start = (unsigned long) __init_begin; + unsigned long end = (unsigned long) &data_start; + + map_pages(start, __pa(start), end-start, +diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h +index 6ee8195a2ffb..4a6dd3ba0b0b 100644 +--- a/arch/powerpc/include/asm/mmu_context.h ++++ b/arch/powerpc/include/asm/mmu_context.h +@@ -237,7 +237,6 @@ extern void arch_exit_mmap(struct mm_struct *mm); + #endif + + static inline void arch_unmap(struct mm_struct *mm, +- struct vm_area_struct *vma, + unsigned long start, unsigned long end) + { + if (start <= mm->context.vdso_base && mm->context.vdso_base < end) +diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h +index fca34b2177e2..9f4b4bb78120 100644 +--- a/arch/um/include/asm/mmu_context.h ++++ b/arch/um/include/asm/mmu_context.h +@@ -22,7 +22,6 @@ static inline int arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm) + } + extern void arch_exit_mmap(struct mm_struct *mm); + static inline void arch_unmap(struct mm_struct *mm, +- struct vm_area_struct *vma, + unsigned long start, unsigned long end) + { + } +diff --git a/arch/unicore32/include/asm/mmu_context.h b/arch/unicore32/include/asm/mmu_context.h +index 5c205a9cb5a6..9f06ea5466dd 100644 +--- a/arch/unicore32/include/asm/mmu_context.h ++++ b/arch/unicore32/include/asm/mmu_context.h +@@ -88,7 +88,6 @@ static inline int arch_dup_mmap(struct mm_struct *oldmm, + } + + static inline void arch_unmap(struct mm_struct *mm, +- struct vm_area_struct *vma, + unsigned long start, unsigned long end) + { + } +diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S +index 4fe27b67d7e2..b1d59a7c556e 100644 +--- a/arch/x86/entry/entry_64.S ++++ b/arch/x86/entry/entry_64.S +@@ -881,7 +881,7 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt + * @paranoid == 2 is special: the stub will never switch stacks. This is for + * #DF: if the thread stack is somehow unusable, we'll still get a useful OOPS. + */ +-.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 ++.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1 create_gap=0 + ENTRY(\sym) + UNWIND_HINT_IRET_REGS offset=\has_error_code*8 + +@@ -901,6 +901,20 @@ ENTRY(\sym) + jnz .Lfrom_usermode_switch_stack_\@ + .endif + ++ .if \create_gap == 1 ++ /* ++ * If coming from kernel space, create a 6-word gap to allow the ++ * int3 handler to emulate a call instruction. ++ */ ++ testb $3, CS-ORIG_RAX(%rsp) ++ jnz .Lfrom_usermode_no_gap_\@ ++ .rept 6 ++ pushq 5*8(%rsp) ++ .endr ++ UNWIND_HINT_IRET_REGS offset=8 ++.Lfrom_usermode_no_gap_\@: ++ .endif ++ + .if \paranoid + call paranoid_entry + .else +@@ -1132,7 +1146,7 @@ apicinterrupt3 HYPERV_STIMER0_VECTOR \ + #endif /* CONFIG_HYPERV */ + + idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK +-idtentry int3 do_int3 has_error_code=0 ++idtentry int3 do_int3 has_error_code=0 create_gap=1 + idtentry stack_segment do_stack_segment has_error_code=1 + + #ifdef CONFIG_XEN_PV +diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h +index 19d18fae6ec6..41019af68adf 100644 +--- a/arch/x86/include/asm/mmu_context.h ++++ b/arch/x86/include/asm/mmu_context.h +@@ -277,8 +277,8 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm, + mpx_mm_init(mm); + } + +-static inline void arch_unmap(struct mm_struct *mm, struct vm_area_struct *vma, +- unsigned long start, unsigned long end) ++static inline void arch_unmap(struct mm_struct *mm, unsigned long start, ++ unsigned long end) + { + /* + * mpx_notify_unmap() goes and reads a rarely-hot +@@ -298,7 +298,7 @@ static inline void arch_unmap(struct mm_struct *mm, struct vm_area_struct *vma, + * consistently wrong. + */ + if (unlikely(cpu_feature_enabled(X86_FEATURE_MPX))) +- mpx_notify_unmap(mm, vma, start, end); ++ mpx_notify_unmap(mm, start, end); + } + + /* +diff --git a/arch/x86/include/asm/mpx.h b/arch/x86/include/asm/mpx.h +index d0b1434fb0b6..143a5c193ed3 100644 +--- a/arch/x86/include/asm/mpx.h ++++ b/arch/x86/include/asm/mpx.h +@@ -64,12 +64,15 @@ struct mpx_fault_info { + }; + + #ifdef CONFIG_X86_INTEL_MPX +-int mpx_fault_info(struct mpx_fault_info *info, struct pt_regs *regs); +-int mpx_handle_bd_fault(void); ++ ++extern int mpx_fault_info(struct mpx_fault_info *info, struct pt_regs *regs); ++extern int mpx_handle_bd_fault(void); ++ + static inline int kernel_managing_mpx_tables(struct mm_struct *mm) + { + return (mm->context.bd_addr != MPX_INVALID_BOUNDS_DIR); + } ++ + static inline void mpx_mm_init(struct mm_struct *mm) + { + /* +@@ -78,11 +81,10 @@ static inline void mpx_mm_init(struct mm_struct *mm) + */ + mm->context.bd_addr = MPX_INVALID_BOUNDS_DIR; + } +-void mpx_notify_unmap(struct mm_struct *mm, struct vm_area_struct *vma, +- unsigned long start, unsigned long end); + +-unsigned long mpx_unmapped_area_check(unsigned long addr, unsigned long len, +- unsigned long flags); ++extern void mpx_notify_unmap(struct mm_struct *mm, unsigned long start, unsigned long end); ++extern unsigned long mpx_unmapped_area_check(unsigned long addr, unsigned long len, unsigned long flags); ++ + #else + static inline int mpx_fault_info(struct mpx_fault_info *info, struct pt_regs *regs) + { +@@ -100,7 +102,6 @@ static inline void mpx_mm_init(struct mm_struct *mm) + { + } + static inline void mpx_notify_unmap(struct mm_struct *mm, +- struct vm_area_struct *vma, + unsigned long start, unsigned long end) + { + } +diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h +index e85ff65c43c3..05861cc08787 100644 +--- a/arch/x86/include/asm/text-patching.h ++++ b/arch/x86/include/asm/text-patching.h +@@ -39,4 +39,32 @@ extern int poke_int3_handler(struct pt_regs *regs); + extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler); + extern int after_bootmem; + ++static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned long ip) ++{ ++ regs->ip = ip; ++} ++ ++#define INT3_INSN_SIZE 1 ++#define CALL_INSN_SIZE 5 ++ ++#ifdef CONFIG_X86_64 ++static inline void int3_emulate_push(struct pt_regs *regs, unsigned long val) ++{ ++ /* ++ * The int3 handler in entry_64.S adds a gap between the ++ * stack where the break point happened, and the saving of ++ * pt_regs. We can extend the original stack because of ++ * this gap. See the idtentry macro's create_gap option. ++ */ ++ regs->sp -= sizeof(unsigned long); ++ *(unsigned long *)regs->sp = val; ++} ++ ++static inline void int3_emulate_call(struct pt_regs *regs, unsigned long func) ++{ ++ int3_emulate_push(regs, regs->ip - INT3_INSN_SIZE + CALL_INSN_SIZE); ++ int3_emulate_jmp(regs, func); ++} ++#endif ++ + #endif /* _ASM_X86_TEXT_PATCHING_H */ +diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c +index ef49517f6bb2..bd553b3af22e 100644 +--- a/arch/x86/kernel/ftrace.c ++++ b/arch/x86/kernel/ftrace.c +@@ -29,6 +29,7 @@ + #include <asm/kprobes.h> + #include <asm/ftrace.h> + #include <asm/nops.h> ++#include <asm/text-patching.h> + + #ifdef CONFIG_DYNAMIC_FTRACE + +@@ -231,6 +232,7 @@ int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr, + } + + static unsigned long ftrace_update_func; ++static unsigned long ftrace_update_func_call; + + static int update_ftrace_func(unsigned long ip, void *new) + { +@@ -259,6 +261,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func) + unsigned char *new; + int ret; + ++ ftrace_update_func_call = (unsigned long)func; ++ + new = ftrace_call_replace(ip, (unsigned long)func); + ret = update_ftrace_func(ip, new); + +@@ -294,13 +298,28 @@ int ftrace_int3_handler(struct pt_regs *regs) + if (WARN_ON_ONCE(!regs)) + return 0; + +- ip = regs->ip - 1; +- if (!ftrace_location(ip) && !is_ftrace_caller(ip)) +- return 0; ++ ip = regs->ip - INT3_INSN_SIZE; + +- regs->ip += MCOUNT_INSN_SIZE - 1; ++#ifdef CONFIG_X86_64 ++ if (ftrace_location(ip)) { ++ int3_emulate_call(regs, (unsigned long)ftrace_regs_caller); ++ return 1; ++ } else if (is_ftrace_caller(ip)) { ++ if (!ftrace_update_func_call) { ++ int3_emulate_jmp(regs, ip + CALL_INSN_SIZE); ++ return 1; ++ } ++ int3_emulate_call(regs, ftrace_update_func_call); ++ return 1; ++ } ++#else ++ if (ftrace_location(ip) || is_ftrace_caller(ip)) { ++ int3_emulate_jmp(regs, ip + CALL_INSN_SIZE); ++ return 1; ++ } ++#endif + +- return 1; ++ return 0; + } + NOKPROBE_SYMBOL(ftrace_int3_handler); + +@@ -859,6 +878,8 @@ void arch_ftrace_update_trampoline(struct ftrace_ops *ops) + + func = ftrace_ops_get_func(ops); + ++ ftrace_update_func_call = (unsigned long)func; ++ + /* Do a safe modify in case the trampoline is executing */ + new = ftrace_call_replace(ip, (unsigned long)func); + ret = update_ftrace_func(ip, new); +@@ -960,6 +981,7 @@ static int ftrace_mod_jmp(unsigned long ip, void *func) + { + unsigned char *new; + ++ ftrace_update_func_call = 0UL; + new = ftrace_jmp_replace(ip, (unsigned long)func); + + return update_ftrace_func(ip, new); +diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c +index c805db6236b4..7aeb9fe2955f 100644 +--- a/arch/x86/mm/mpx.c ++++ b/arch/x86/mm/mpx.c +@@ -881,9 +881,10 @@ static int mpx_unmap_tables(struct mm_struct *mm, + * the virtual address region start...end have already been split if + * necessary, and the 'vma' is the first vma in this range (start -> end). + */ +-void mpx_notify_unmap(struct mm_struct *mm, struct vm_area_struct *vma, +- unsigned long start, unsigned long end) ++void mpx_notify_unmap(struct mm_struct *mm, unsigned long start, ++ unsigned long end) + { ++ struct vm_area_struct *vma; + int ret; + + /* +@@ -902,11 +903,12 @@ void mpx_notify_unmap(struct mm_struct *mm, struct vm_area_struct *vma, + * which should not occur normally. Being strict about it here + * helps ensure that we do not have an exploitable stack overflow. + */ +- do { ++ vma = find_vma(mm, start); ++ while (vma && vma->vm_start < end) { + if (vma->vm_flags & VM_MPX) + return; + vma = vma->vm_next; +- } while (vma && vma->vm_start < end); ++ } + + ret = mpx_unmap_tables(mm, start, end); + if (ret) +diff --git a/block/blk-core.c b/block/blk-core.c +index a55389ba8779..b375cfea024c 100644 +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -375,7 +375,7 @@ void blk_cleanup_queue(struct request_queue *q) + blk_exit_queue(q); + + if (queue_is_mq(q)) +- blk_mq_free_queue(q); ++ blk_mq_exit_queue(q); + + percpu_ref_exit(&q->q_usage_counter); + +diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c +index 3f9c3f4ac44c..4040e62c3737 100644 +--- a/block/blk-mq-sysfs.c ++++ b/block/blk-mq-sysfs.c +@@ -10,6 +10,7 @@ + #include <linux/smp.h> + + #include <linux/blk-mq.h> ++#include "blk.h" + #include "blk-mq.h" + #include "blk-mq-tag.h" + +@@ -33,6 +34,11 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj) + { + struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx, + kobj); ++ ++ if (hctx->flags & BLK_MQ_F_BLOCKING) ++ cleanup_srcu_struct(hctx->srcu); ++ blk_free_flush_queue(hctx->fq); ++ sbitmap_free(&hctx->ctx_map); + free_cpumask_var(hctx->cpumask); + kfree(hctx->ctxs); + kfree(hctx); +diff --git a/block/blk-mq.c b/block/blk-mq.c +index fc60ed7e940e..b0e5e67e20a2 100644 +--- a/block/blk-mq.c ++++ b/block/blk-mq.c +@@ -2267,12 +2267,7 @@ static void blk_mq_exit_hctx(struct request_queue *q, + if (set->ops->exit_hctx) + set->ops->exit_hctx(hctx, hctx_idx); + +- if (hctx->flags & BLK_MQ_F_BLOCKING) +- cleanup_srcu_struct(hctx->srcu); +- + blk_mq_remove_cpuhp(hctx); +- blk_free_flush_queue(hctx->fq); +- sbitmap_free(&hctx->ctx_map); + } + + static void blk_mq_exit_hw_queues(struct request_queue *q, +@@ -2905,7 +2900,8 @@ err_exit: + } + EXPORT_SYMBOL(blk_mq_init_allocated_queue); + +-void blk_mq_free_queue(struct request_queue *q) ++/* tags can _not_ be used after returning from blk_mq_exit_queue */ ++void blk_mq_exit_queue(struct request_queue *q) + { + struct blk_mq_tag_set *set = q->tag_set; + +diff --git a/block/blk-mq.h b/block/blk-mq.h +index 423ea88ab6fb..633a5a77ee8b 100644 +--- a/block/blk-mq.h ++++ b/block/blk-mq.h +@@ -37,7 +37,7 @@ struct blk_mq_ctx { + struct kobject kobj; + } ____cacheline_aligned_in_smp; + +-void blk_mq_free_queue(struct request_queue *q); ++void blk_mq_exit_queue(struct request_queue *q); + int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr); + void blk_mq_wake_waiters(struct request_queue *q); + bool blk_mq_dispatch_rq_list(struct request_queue *, struct list_head *, bool); +diff --git a/drivers/base/dd.c b/drivers/base/dd.c +index a823f469e53f..0df9b4461766 100644 +--- a/drivers/base/dd.c ++++ b/drivers/base/dd.c +@@ -490,7 +490,7 @@ re_probe: + if (dev->bus->dma_configure) { + ret = dev->bus->dma_configure(dev); + if (ret) +- goto dma_failed; ++ goto probe_failed; + } + + if (driver_sysfs_add(dev)) { +@@ -546,14 +546,13 @@ re_probe: + goto done; + + probe_failed: +- arch_teardown_dma_ops(dev); +-dma_failed: + if (dev->bus) + blocking_notifier_call_chain(&dev->bus->p->bus_notifier, + BUS_NOTIFY_DRIVER_NOT_BOUND, dev); + pinctrl_bind_failed: + device_links_no_driver(dev); + devres_release_all(dev); ++ arch_teardown_dma_ops(dev); + driver_sysfs_remove(dev); + dev->driver = NULL; + dev_set_drvdata(dev, NULL); +diff --git a/drivers/block/brd.c b/drivers/block/brd.c +index c18586fccb6f..17defbf4f332 100644 +--- a/drivers/block/brd.c ++++ b/drivers/block/brd.c +@@ -96,13 +96,8 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector) + /* + * Must use NOIO because we don't want to recurse back into the + * block or filesystem layers from page reclaim. +- * +- * Cannot support DAX and highmem, because our ->direct_access +- * routine for DAX must return memory that is always addressable. +- * If DAX was reworked to use pfns and kmap throughout, this +- * restriction might be able to be lifted. + */ +- gfp_flags = GFP_NOIO | __GFP_ZERO; ++ gfp_flags = GFP_NOIO | __GFP_ZERO | __GFP_HIGHMEM; + page = alloc_page(gfp_flags); + if (!page) + return NULL; +diff --git a/drivers/clk/hisilicon/clk-hi3660.c b/drivers/clk/hisilicon/clk-hi3660.c +index f40419959656..794eeff0d5d2 100644 +--- a/drivers/clk/hisilicon/clk-hi3660.c ++++ b/drivers/clk/hisilicon/clk-hi3660.c +@@ -163,8 +163,12 @@ static const struct hisi_gate_clock hi3660_crgctrl_gate_sep_clks[] = { + "clk_isp_snclk_mux", CLK_SET_RATE_PARENT, 0x50, 17, 0, }, + { HI3660_CLK_GATE_ISP_SNCLK2, "clk_gate_isp_snclk2", + "clk_isp_snclk_mux", CLK_SET_RATE_PARENT, 0x50, 18, 0, }, ++ /* ++ * clk_gate_ufs_subsys is a system bus clock, mark it as critical ++ * clock and keep it on for system suspend and resume. ++ */ + { HI3660_CLK_GATE_UFS_SUBSYS, "clk_gate_ufs_subsys", "clk_div_sysbus", +- CLK_SET_RATE_PARENT, 0x50, 21, 0, }, ++ CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0x50, 21, 0, }, + { HI3660_PCLK_GATE_DSI0, "pclk_gate_dsi0", "clk_div_cfgbus", + CLK_SET_RATE_PARENT, 0x50, 28, 0, }, + { HI3660_PCLK_GATE_DSI1, "pclk_gate_dsi1", "clk_div_cfgbus", +diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c +index f54e4015b0b1..18842d660317 100644 +--- a/drivers/clk/mediatek/clk-pll.c ++++ b/drivers/clk/mediatek/clk-pll.c +@@ -88,6 +88,32 @@ static unsigned long __mtk_pll_recalc_rate(struct mtk_clk_pll *pll, u32 fin, + return ((unsigned long)vco + postdiv - 1) / postdiv; + } + ++static void __mtk_pll_tuner_enable(struct mtk_clk_pll *pll) ++{ ++ u32 r; ++ ++ if (pll->tuner_en_addr) { ++ r = readl(pll->tuner_en_addr) | BIT(pll->data->tuner_en_bit); ++ writel(r, pll->tuner_en_addr); ++ } else if (pll->tuner_addr) { ++ r = readl(pll->tuner_addr) | AUDPLL_TUNER_EN; ++ writel(r, pll->tuner_addr); ++ } ++} ++ ++static void __mtk_pll_tuner_disable(struct mtk_clk_pll *pll) ++{ ++ u32 r; ++ ++ if (pll->tuner_en_addr) { ++ r = readl(pll->tuner_en_addr) & ~BIT(pll->data->tuner_en_bit); ++ writel(r, pll->tuner_en_addr); ++ } else if (pll->tuner_addr) { ++ r = readl(pll->tuner_addr) & ~AUDPLL_TUNER_EN; ++ writel(r, pll->tuner_addr); ++ } ++} ++ + static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, + int postdiv) + { +@@ -96,6 +122,9 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, + + pll_en = readl(pll->base_addr + REG_CON0) & CON0_BASE_EN; + ++ /* disable tuner */ ++ __mtk_pll_tuner_disable(pll); ++ + /* set postdiv */ + val = readl(pll->pd_addr); + val &= ~(POSTDIV_MASK << pll->data->pd_shift); +@@ -122,6 +151,9 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, + if (pll->tuner_addr) + writel(con1 + 1, pll->tuner_addr); + ++ /* restore tuner_en */ ++ __mtk_pll_tuner_enable(pll); ++ + if (pll_en) + udelay(20); + } +@@ -228,13 +260,7 @@ static int mtk_pll_prepare(struct clk_hw *hw) + r |= pll->data->en_mask; + writel(r, pll->base_addr + REG_CON0); + +- if (pll->tuner_en_addr) { +- r = readl(pll->tuner_en_addr) | BIT(pll->data->tuner_en_bit); +- writel(r, pll->tuner_en_addr); +- } else if (pll->tuner_addr) { +- r = readl(pll->tuner_addr) | AUDPLL_TUNER_EN; +- writel(r, pll->tuner_addr); +- } ++ __mtk_pll_tuner_enable(pll); + + udelay(20); + +@@ -258,13 +284,7 @@ static void mtk_pll_unprepare(struct clk_hw *hw) + writel(r, pll->base_addr + REG_CON0); + } + +- if (pll->tuner_en_addr) { +- r = readl(pll->tuner_en_addr) & ~BIT(pll->data->tuner_en_bit); +- writel(r, pll->tuner_en_addr); +- } else if (pll->tuner_addr) { +- r = readl(pll->tuner_addr) & ~AUDPLL_TUNER_EN; +- writel(r, pll->tuner_addr); +- } ++ __mtk_pll_tuner_disable(pll); + + r = readl(pll->base_addr + REG_CON0); + r &= ~CON0_BASE_EN; +diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c +index 65ab5c2f48b0..f12142d9cea2 100644 +--- a/drivers/clk/rockchip/clk-rk3328.c ++++ b/drivers/clk/rockchip/clk-rk3328.c +@@ -458,7 +458,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { + RK3328_CLKSEL_CON(35), 15, 1, MFLAGS, 8, 7, DFLAGS, + RK3328_CLKGATE_CON(2), 12, GFLAGS), + COMPOSITE(SCLK_CRYPTO, "clk_crypto", mux_2plls_p, 0, +- RK3328_CLKSEL_CON(20), 7, 1, MFLAGS, 0, 7, DFLAGS, ++ RK3328_CLKSEL_CON(20), 7, 1, MFLAGS, 0, 5, DFLAGS, + RK3328_CLKGATE_CON(2), 4, GFLAGS), + COMPOSITE_NOMUX(SCLK_TSADC, "clk_tsadc", "clk_24m", 0, + RK3328_CLKSEL_CON(22), 0, 10, DFLAGS, +@@ -550,15 +550,15 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { + GATE(0, "hclk_rkvenc_niu", "hclk_rkvenc", 0, + RK3328_CLKGATE_CON(25), 1, GFLAGS), + GATE(ACLK_H265, "aclk_h265", "aclk_rkvenc", 0, +- RK3328_CLKGATE_CON(25), 0, GFLAGS), ++ RK3328_CLKGATE_CON(25), 2, GFLAGS), + GATE(PCLK_H265, "pclk_h265", "hclk_rkvenc", 0, +- RK3328_CLKGATE_CON(25), 1, GFLAGS), ++ RK3328_CLKGATE_CON(25), 3, GFLAGS), + GATE(ACLK_H264, "aclk_h264", "aclk_rkvenc", 0, +- RK3328_CLKGATE_CON(25), 0, GFLAGS), ++ RK3328_CLKGATE_CON(25), 4, GFLAGS), + GATE(HCLK_H264, "hclk_h264", "hclk_rkvenc", 0, +- RK3328_CLKGATE_CON(25), 1, GFLAGS), ++ RK3328_CLKGATE_CON(25), 5, GFLAGS), + GATE(ACLK_AXISRAM, "aclk_axisram", "aclk_rkvenc", CLK_IGNORE_UNUSED, +- RK3328_CLKGATE_CON(25), 0, GFLAGS), ++ RK3328_CLKGATE_CON(25), 6, GFLAGS), + + COMPOSITE(SCLK_VENC_CORE, "sclk_venc_core", mux_4plls_p, 0, + RK3328_CLKSEL_CON(51), 14, 2, MFLAGS, 8, 5, DFLAGS, +@@ -663,7 +663,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { + + /* PD_GMAC */ + COMPOSITE(ACLK_GMAC, "aclk_gmac", mux_2plls_hdmiphy_p, 0, +- RK3328_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS, ++ RK3328_CLKSEL_CON(25), 6, 2, MFLAGS, 0, 5, DFLAGS, + RK3328_CLKGATE_CON(3), 2, GFLAGS), + COMPOSITE_NOMUX(PCLK_GMAC, "pclk_gmac", "aclk_gmac", 0, + RK3328_CLKSEL_CON(25), 8, 3, DFLAGS, +@@ -733,7 +733,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { + + /* PD_PERI */ + GATE(0, "aclk_peri_noc", "aclk_peri", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(19), 11, GFLAGS), +- GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0, RK3328_CLKGATE_CON(19), 4, GFLAGS), ++ GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0, RK3328_CLKGATE_CON(19), 14, GFLAGS), + + GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 0, GFLAGS), + GATE(HCLK_SDIO, "hclk_sdio", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 1, GFLAGS), +@@ -913,7 +913,7 @@ static void __init rk3328_clk_init(struct device_node *np) + &rk3328_cpuclk_data, rk3328_cpuclk_rates, + ARRAY_SIZE(rk3328_cpuclk_rates)); + +- rockchip_register_softrst(np, 11, reg_base + RK3328_SOFTRST_CON(0), ++ rockchip_register_softrst(np, 12, reg_base + RK3328_SOFTRST_CON(0), + ROCKCHIP_SOFTRST_HIWORD_MASK); + + rockchip_register_restart_notifier(ctx, RK3328_GLB_SRST_FST, NULL); +diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c +index b50b7460014b..3e67cbcd80da 100644 +--- a/drivers/clk/tegra/clk-pll.c ++++ b/drivers/clk/tegra/clk-pll.c +@@ -663,8 +663,8 @@ static void _update_pll_mnp(struct tegra_clk_pll *pll, + pll_override_writel(val, params->pmc_divp_reg, pll); + + val = pll_override_readl(params->pmc_divnm_reg, pll); +- val &= ~(divm_mask(pll) << div_nmp->override_divm_shift) | +- ~(divn_mask(pll) << div_nmp->override_divn_shift); ++ val &= ~((divm_mask(pll) << div_nmp->override_divm_shift) | ++ (divn_mask(pll) << div_nmp->override_divn_shift)); + val |= (cfg->m << div_nmp->override_divm_shift) | + (cfg->n << div_nmp->override_divn_shift); + pll_override_writel(val, params->pmc_divnm_reg, pll); +diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c +index 5f3c1378b90e..99d9f431ae2c 100644 +--- a/drivers/dma/imx-sdma.c ++++ b/drivers/dma/imx-sdma.c +@@ -419,6 +419,7 @@ struct sdma_driver_data { + int chnenbl0; + int num_events; + struct sdma_script_start_addrs *script_addrs; ++ bool check_ratio; + }; + + struct sdma_engine { +@@ -557,6 +558,13 @@ static struct sdma_driver_data sdma_imx7d = { + .script_addrs = &sdma_script_imx7d, + }; + ++static struct sdma_driver_data sdma_imx8mq = { ++ .chnenbl0 = SDMA_CHNENBL0_IMX35, ++ .num_events = 48, ++ .script_addrs = &sdma_script_imx7d, ++ .check_ratio = 1, ++}; ++ + static const struct platform_device_id sdma_devtypes[] = { + { + .name = "imx25-sdma", +@@ -579,6 +587,9 @@ static const struct platform_device_id sdma_devtypes[] = { + }, { + .name = "imx7d-sdma", + .driver_data = (unsigned long)&sdma_imx7d, ++ }, { ++ .name = "imx8mq-sdma", ++ .driver_data = (unsigned long)&sdma_imx8mq, + }, { + /* sentinel */ + } +@@ -593,6 +604,7 @@ static const struct of_device_id sdma_dt_ids[] = { + { .compatible = "fsl,imx31-sdma", .data = &sdma_imx31, }, + { .compatible = "fsl,imx25-sdma", .data = &sdma_imx25, }, + { .compatible = "fsl,imx7d-sdma", .data = &sdma_imx7d, }, ++ { .compatible = "fsl,imx8mq-sdma", .data = &sdma_imx8mq, }, + { /* sentinel */ } + }; + MODULE_DEVICE_TABLE(of, sdma_dt_ids); +@@ -1852,7 +1864,8 @@ static int sdma_init(struct sdma_engine *sdma) + if (ret) + goto disable_clk_ipg; + +- if (clk_get_rate(sdma->clk_ahb) == clk_get_rate(sdma->clk_ipg)) ++ if (sdma->drvdata->check_ratio && ++ (clk_get_rate(sdma->clk_ahb) == clk_get_rate(sdma->clk_ipg))) + sdma->clk_ratio = 1; + + /* Be sure SDMA has not started yet */ +diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c +index ba7aaf421f36..8ff326c0c406 100644 +--- a/drivers/hwtracing/intel_th/msu.c ++++ b/drivers/hwtracing/intel_th/msu.c +@@ -84,6 +84,7 @@ struct msc_iter { + * @reg_base: register window base address + * @thdev: intel_th_device pointer + * @win_list: list of windows in multiblock mode ++ * @single_sgt: single mode buffer + * @nr_pages: total number of pages allocated for this buffer + * @single_sz: amount of data in single mode + * @single_wrap: single mode wrap occurred +@@ -104,6 +105,7 @@ struct msc { + struct intel_th_device *thdev; + + struct list_head win_list; ++ struct sg_table single_sgt; + unsigned long nr_pages; + unsigned long single_sz; + unsigned int single_wrap : 1; +@@ -617,22 +619,45 @@ static void intel_th_msc_deactivate(struct intel_th_device *thdev) + */ + static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size) + { ++ unsigned long nr_pages = size >> PAGE_SHIFT; + unsigned int order = get_order(size); + struct page *page; ++ int ret; + + if (!size) + return 0; + ++ ret = sg_alloc_table(&msc->single_sgt, 1, GFP_KERNEL); ++ if (ret) ++ goto err_out; ++ ++ ret = -ENOMEM; + page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); + if (!page) +- return -ENOMEM; ++ goto err_free_sgt; + + split_page(page, order); +- msc->nr_pages = size >> PAGE_SHIFT; ++ sg_set_buf(msc->single_sgt.sgl, page_address(page), size); ++ ++ ret = dma_map_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, 1, ++ DMA_FROM_DEVICE); ++ if (ret < 0) ++ goto err_free_pages; ++ ++ msc->nr_pages = nr_pages; + msc->base = page_address(page); +- msc->base_addr = page_to_phys(page); ++ msc->base_addr = sg_dma_address(msc->single_sgt.sgl); + + return 0; ++ ++err_free_pages: ++ __free_pages(page, order); ++ ++err_free_sgt: ++ sg_free_table(&msc->single_sgt); ++ ++err_out: ++ return ret; + } + + /** +@@ -643,6 +668,10 @@ static void msc_buffer_contig_free(struct msc *msc) + { + unsigned long off; + ++ dma_unmap_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, ++ 1, DMA_FROM_DEVICE); ++ sg_free_table(&msc->single_sgt); ++ + for (off = 0; off < msc->nr_pages << PAGE_SHIFT; off += PAGE_SIZE) { + struct page *page = virt_to_page(msc->base + off); + +diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c +index c7ba8acfd4d5..e55b902560de 100644 +--- a/drivers/hwtracing/stm/core.c ++++ b/drivers/hwtracing/stm/core.c +@@ -166,11 +166,10 @@ stm_master(struct stm_device *stm, unsigned int idx) + static int stp_master_alloc(struct stm_device *stm, unsigned int idx) + { + struct stp_master *master; +- size_t size; + +- size = ALIGN(stm->data->sw_nchannels, 8) / 8; +- size += sizeof(struct stp_master); +- master = kzalloc(size, GFP_ATOMIC); ++ master = kzalloc(struct_size(master, chan_map, ++ BITS_TO_LONGS(stm->data->sw_nchannels)), ++ GFP_ATOMIC); + if (!master) + return -ENOMEM; + +@@ -218,8 +217,8 @@ stm_output_disclaim(struct stm_device *stm, struct stm_output *output) + bitmap_release_region(&master->chan_map[0], output->channel, + ilog2(output->nr_chans)); + +- output->nr_chans = 0; + master->nr_free += output->nr_chans; ++ output->nr_chans = 0; + } + + /* +diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c +index d3dd290ae1b1..da81402992bc 100644 +--- a/drivers/infiniband/hw/mlx5/main.c ++++ b/drivers/infiniband/hw/mlx5/main.c +@@ -2070,11 +2070,12 @@ static int mlx5_ib_mmap_clock_info_page(struct mlx5_ib_dev *dev, + return -EPERM; + vma->vm_flags &= ~VM_MAYWRITE; + +- if (!dev->mdev->clock_info_page) ++ if (!dev->mdev->clock_info) + return -EOPNOTSUPP; + + return rdma_user_mmap_page(&context->ibucontext, vma, +- dev->mdev->clock_info_page, PAGE_SIZE); ++ virt_to_page(dev->mdev->clock_info), ++ PAGE_SIZE); + } + + static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5_ib_mmap_cmd cmd, +diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c +index 48eda16db1a7..9b5e11d3fb85 100644 +--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c ++++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c +@@ -2402,7 +2402,18 @@ static ssize_t dev_id_show(struct device *dev, + { + struct net_device *ndev = to_net_dev(dev); + +- if (ndev->dev_id == ndev->dev_port) ++ /* ++ * ndev->dev_port will be equal to 0 in old kernel prior to commit ++ * 9b8b2a323008 ("IB/ipoib: Use dev_port to expose network interface ++ * port numbers") Zero was chosen as special case for user space ++ * applications to fallback and query dev_id to check if it has ++ * different value or not. ++ * ++ * Don't print warning in such scenario. ++ * ++ * https://github.com/systemd/systemd/blob/master/src/udev/udev-builtin-net_id.c#L358 ++ */ ++ if (ndev->dev_port && ndev->dev_id == ndev->dev_port) + netdev_info_once(ndev, + "\"%s\" wants to know my dev_id. Should it look at dev_port instead? See Documentation/ABI/testing/sysfs-class-net for more info.\n", + current->comm); +diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c +index 5182c7d6171e..8d30653cd13a 100644 +--- a/drivers/iommu/tegra-smmu.c ++++ b/drivers/iommu/tegra-smmu.c +@@ -102,7 +102,6 @@ static inline u32 smmu_readl(struct tegra_smmu *smmu, unsigned long offset) + #define SMMU_TLB_FLUSH_VA_MATCH_ALL (0 << 0) + #define SMMU_TLB_FLUSH_VA_MATCH_SECTION (2 << 0) + #define SMMU_TLB_FLUSH_VA_MATCH_GROUP (3 << 0) +-#define SMMU_TLB_FLUSH_ASID(x) (((x) & 0x7f) << 24) + #define SMMU_TLB_FLUSH_VA_SECTION(addr) ((((addr) & 0xffc00000) >> 12) | \ + SMMU_TLB_FLUSH_VA_MATCH_SECTION) + #define SMMU_TLB_FLUSH_VA_GROUP(addr) ((((addr) & 0xffffc000) >> 12) | \ +@@ -205,8 +204,12 @@ static inline void smmu_flush_tlb_asid(struct tegra_smmu *smmu, + { + u32 value; + +- value = SMMU_TLB_FLUSH_ASID_MATCH | SMMU_TLB_FLUSH_ASID(asid) | +- SMMU_TLB_FLUSH_VA_MATCH_ALL; ++ if (smmu->soc->num_asids == 4) ++ value = (asid & 0x3) << 29; ++ else ++ value = (asid & 0x7f) << 24; ++ ++ value |= SMMU_TLB_FLUSH_ASID_MATCH | SMMU_TLB_FLUSH_VA_MATCH_ALL; + smmu_writel(smmu, value, SMMU_TLB_FLUSH); + } + +@@ -216,8 +219,12 @@ static inline void smmu_flush_tlb_section(struct tegra_smmu *smmu, + { + u32 value; + +- value = SMMU_TLB_FLUSH_ASID_MATCH | SMMU_TLB_FLUSH_ASID(asid) | +- SMMU_TLB_FLUSH_VA_SECTION(iova); ++ if (smmu->soc->num_asids == 4) ++ value = (asid & 0x3) << 29; ++ else ++ value = (asid & 0x7f) << 24; ++ ++ value |= SMMU_TLB_FLUSH_ASID_MATCH | SMMU_TLB_FLUSH_VA_SECTION(iova); + smmu_writel(smmu, value, SMMU_TLB_FLUSH); + } + +@@ -227,8 +234,12 @@ static inline void smmu_flush_tlb_group(struct tegra_smmu *smmu, + { + u32 value; + +- value = SMMU_TLB_FLUSH_ASID_MATCH | SMMU_TLB_FLUSH_ASID(asid) | +- SMMU_TLB_FLUSH_VA_GROUP(iova); ++ if (smmu->soc->num_asids == 4) ++ value = (asid & 0x3) << 29; ++ else ++ value = (asid & 0x7f) << 24; ++ ++ value |= SMMU_TLB_FLUSH_ASID_MATCH | SMMU_TLB_FLUSH_VA_GROUP(iova); + smmu_writel(smmu, value, SMMU_TLB_FLUSH); + } + +diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c +index 6fc93834da44..151aa95775be 100644 +--- a/drivers/md/dm-cache-metadata.c ++++ b/drivers/md/dm-cache-metadata.c +@@ -1167,11 +1167,18 @@ static int __load_discards(struct dm_cache_metadata *cmd, + if (r) + return r; + +- for (b = 0; b < from_dblock(cmd->discard_nr_blocks); b++) { ++ for (b = 0; ; b++) { + r = fn(context, cmd->discard_block_size, to_dblock(b), + dm_bitset_cursor_get_value(&c)); + if (r) + break; ++ ++ if (b >= (from_dblock(cmd->discard_nr_blocks) - 1)) ++ break; ++ ++ r = dm_bitset_cursor_next(&c); ++ if (r) ++ break; + } + + dm_bitset_cursor_end(&c); +diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c +index dd6565798778..86fd2d0fa975 100644 +--- a/drivers/md/dm-crypt.c ++++ b/drivers/md/dm-crypt.c +@@ -949,6 +949,7 @@ static int crypt_integrity_ctr(struct crypt_config *cc, struct dm_target *ti) + { + #ifdef CONFIG_BLK_DEV_INTEGRITY + struct blk_integrity *bi = blk_get_integrity(cc->dev->bdev->bd_disk); ++ struct mapped_device *md = dm_table_get_md(ti->table); + + /* From now we require underlying device with our integrity profile */ + if (!bi || strcasecmp(bi->profile->name, "DM-DIF-EXT-TAG")) { +@@ -968,7 +969,7 @@ static int crypt_integrity_ctr(struct crypt_config *cc, struct dm_target *ti) + + if (crypt_integrity_aead(cc)) { + cc->integrity_tag_size = cc->on_disk_tag_size - cc->integrity_iv_size; +- DMINFO("Integrity AEAD, tag size %u, IV size %u.", ++ DMDEBUG("%s: Integrity AEAD, tag size %u, IV size %u.", dm_device_name(md), + cc->integrity_tag_size, cc->integrity_iv_size); + + if (crypto_aead_setauthsize(any_tfm_aead(cc), cc->integrity_tag_size)) { +@@ -976,7 +977,7 @@ static int crypt_integrity_ctr(struct crypt_config *cc, struct dm_target *ti) + return -EINVAL; + } + } else if (cc->integrity_iv_size) +- DMINFO("Additional per-sector space %u bytes for IV.", ++ DMDEBUG("%s: Additional per-sector space %u bytes for IV.", dm_device_name(md), + cc->integrity_iv_size); + + if ((cc->integrity_tag_size + cc->integrity_iv_size) != bi->tag_size) { +@@ -1891,7 +1892,7 @@ static int crypt_alloc_tfms_skcipher(struct crypt_config *cc, char *ciphermode) + * algorithm implementation is used. Help people debug performance + * problems by logging the ->cra_driver_name. + */ +- DMINFO("%s using implementation \"%s\"", ciphermode, ++ DMDEBUG_LIMIT("%s using implementation \"%s\"", ciphermode, + crypto_skcipher_alg(any_tfm(cc))->base.cra_driver_name); + return 0; + } +@@ -1911,7 +1912,7 @@ static int crypt_alloc_tfms_aead(struct crypt_config *cc, char *ciphermode) + return err; + } + +- DMINFO("%s using implementation \"%s\"", ciphermode, ++ DMDEBUG_LIMIT("%s using implementation \"%s\"", ciphermode, + crypto_aead_alg(any_tfm_aead(cc))->base.cra_driver_name); + return 0; + } +diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c +index fddffe251bf6..f496213f8b67 100644 +--- a/drivers/md/dm-delay.c ++++ b/drivers/md/dm-delay.c +@@ -121,7 +121,8 @@ static void delay_dtr(struct dm_target *ti) + { + struct delay_c *dc = ti->private; + +- destroy_workqueue(dc->kdelayd_wq); ++ if (dc->kdelayd_wq) ++ destroy_workqueue(dc->kdelayd_wq); + + if (dc->read.dev) + dm_put_device(ti, dc->read.dev); +diff --git a/drivers/md/dm-init.c b/drivers/md/dm-init.c +index 4b76f84424c3..352e803f566e 100644 +--- a/drivers/md/dm-init.c ++++ b/drivers/md/dm-init.c +@@ -160,7 +160,7 @@ static int __init dm_parse_table(struct dm_device *dev, char *str) + + while (table_entry) { + DMDEBUG("parsing table \"%s\"", str); +- if (++dev->dmi.target_count >= DM_MAX_TARGETS) { ++ if (++dev->dmi.target_count > DM_MAX_TARGETS) { + DMERR("too many targets %u > %d", + dev->dmi.target_count, DM_MAX_TARGETS); + return -EINVAL; +@@ -242,9 +242,9 @@ static int __init dm_parse_devices(struct list_head *devices, char *str) + return -ENOMEM; + list_add_tail(&dev->list, devices); + +- if (++ndev >= DM_MAX_DEVICES) { +- DMERR("too many targets %u > %d", +- dev->dmi.target_count, DM_MAX_TARGETS); ++ if (++ndev > DM_MAX_DEVICES) { ++ DMERR("too many devices %lu > %d", ++ ndev, DM_MAX_DEVICES); + return -EINVAL; + } + +diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c +index 7c678f50aaa3..7848ef019880 100644 +--- a/drivers/md/dm-integrity.c ++++ b/drivers/md/dm-integrity.c +@@ -2568,7 +2568,7 @@ static int calculate_device_limits(struct dm_integrity_c *ic) + if (last_sector < ic->start || last_sector >= ic->meta_device_sectors) + return -EINVAL; + } else { +- __u64 meta_size = ic->provided_data_sectors * ic->tag_size; ++ __u64 meta_size = (ic->provided_data_sectors >> ic->sb->log2_sectors_per_block) * ic->tag_size; + meta_size = (meta_size + ((1U << (ic->log2_buffer_sectors + SECTOR_SHIFT)) - 1)) + >> (ic->log2_buffer_sectors + SECTOR_SHIFT); + meta_size <<= ic->log2_buffer_sectors; +@@ -3439,7 +3439,7 @@ try_smaller_buffer: + DEBUG_print(" journal_sections %u\n", (unsigned)le32_to_cpu(ic->sb->journal_sections)); + DEBUG_print(" journal_entries %u\n", ic->journal_entries); + DEBUG_print(" log2_interleave_sectors %d\n", ic->sb->log2_interleave_sectors); +- DEBUG_print(" device_sectors 0x%llx\n", (unsigned long long)ic->device_sectors); ++ DEBUG_print(" data_device_sectors 0x%llx\n", (unsigned long long)ic->data_device_sectors); + DEBUG_print(" initial_sectors 0x%x\n", ic->initial_sectors); + DEBUG_print(" metadata_run 0x%x\n", ic->metadata_run); + DEBUG_print(" log2_metadata_run %d\n", ic->log2_metadata_run); +diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c +index c740153b4e52..1e03bc89e20f 100644 +--- a/drivers/md/dm-ioctl.c ++++ b/drivers/md/dm-ioctl.c +@@ -2069,7 +2069,7 @@ int __init dm_early_create(struct dm_ioctl *dmi, + /* alloc table */ + r = dm_table_create(&t, get_mode(dmi), dmi->target_count, md); + if (r) +- goto err_destroy_dm; ++ goto err_hash_remove; + + /* add targets */ + for (i = 0; i < dmi->target_count; i++) { +@@ -2116,6 +2116,10 @@ int __init dm_early_create(struct dm_ioctl *dmi, + + err_destroy_table: + dm_table_destroy(t); ++err_hash_remove: ++ (void) __hash_remove(__get_name_cell(dmi->name)); ++ /* release reference from __get_name_cell */ ++ dm_put(md); + err_destroy_dm: + dm_put(md); + dm_destroy(md); +diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c +index 2ee5e357a0a7..cc5173dfd466 100644 +--- a/drivers/md/dm-mpath.c ++++ b/drivers/md/dm-mpath.c +@@ -882,6 +882,7 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps + if (attached_handler_name || m->hw_handler_name) { + INIT_DELAYED_WORK(&p->activate_path, activate_path_work); + r = setup_scsi_dh(p->path.dev->bdev, m, &attached_handler_name, &ti->error); ++ kfree(attached_handler_name); + if (r) { + dm_put_device(ti, p->path.dev); + goto bad; +@@ -896,7 +897,6 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps + + return p; + bad: +- kfree(attached_handler_name); + free_pgpath(p); + return ERR_PTR(r); + } +diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c +index fa68336560c3..d8334cd45d7c 100644 +--- a/drivers/md/dm-zoned-metadata.c ++++ b/drivers/md/dm-zoned-metadata.c +@@ -1169,6 +1169,9 @@ static int dmz_init_zones(struct dmz_metadata *zmd) + goto out; + } + ++ if (!nr_blkz) ++ break; ++ + /* Process report */ + for (i = 0; i < nr_blkz; i++) { + ret = dmz_init_zone(zmd, zone, &blkz[i]); +@@ -1204,6 +1207,8 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone) + /* Get zone information from disk */ + ret = blkdev_report_zones(zmd->dev->bdev, dmz_start_sect(zmd, zone), + &blkz, &nr_blkz, GFP_NOIO); ++ if (!nr_blkz) ++ ret = -EIO; + if (ret) { + dmz_dev_err(zmd->dev, "Get zone %u report failed", + dmz_id(zmd, zone)); +diff --git a/drivers/md/dm.c b/drivers/md/dm.c +index 043f0761e4a0..08e7d412af95 100644 +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -1467,7 +1467,7 @@ static unsigned get_num_write_zeroes_bios(struct dm_target *ti) + static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *ti, + unsigned num_bios) + { +- unsigned len = ci->sector_count; ++ unsigned len; + + /* + * Even though the device advertised support for this type of +@@ -1478,6 +1478,8 @@ static int __send_changing_extent_only(struct clone_info *ci, struct dm_target * + if (!num_bios) + return -EOPNOTSUPP; + ++ len = min((sector_t)ci->sector_count, max_io_len_target_boundary(ci->sector, ti)); ++ + __send_duplicate_bios(ci, ti, num_bios, &len); + + ci->sector += len; +diff --git a/drivers/md/md.c b/drivers/md/md.c +index 05ffffb8b769..295ff09cff4c 100644 +--- a/drivers/md/md.c ++++ b/drivers/md/md.c +@@ -132,24 +132,6 @@ static inline int speed_max(struct mddev *mddev) + mddev->sync_speed_max : sysctl_speed_limit_max; + } + +-static void * flush_info_alloc(gfp_t gfp_flags, void *data) +-{ +- return kzalloc(sizeof(struct flush_info), gfp_flags); +-} +-static void flush_info_free(void *flush_info, void *data) +-{ +- kfree(flush_info); +-} +- +-static void * flush_bio_alloc(gfp_t gfp_flags, void *data) +-{ +- return kzalloc(sizeof(struct flush_bio), gfp_flags); +-} +-static void flush_bio_free(void *flush_bio, void *data) +-{ +- kfree(flush_bio); +-} +- + static struct ctl_table_header *raid_table_header; + + static struct ctl_table raid_table[] = { +@@ -423,54 +405,31 @@ static int md_congested(void *data, int bits) + /* + * Generic flush handling for md + */ +-static void submit_flushes(struct work_struct *ws) +-{ +- struct flush_info *fi = container_of(ws, struct flush_info, flush_work); +- struct mddev *mddev = fi->mddev; +- struct bio *bio = fi->bio; +- +- bio->bi_opf &= ~REQ_PREFLUSH; +- md_handle_request(mddev, bio); +- +- mempool_free(fi, mddev->flush_pool); +-} + +-static void md_end_flush(struct bio *fbio) ++static void md_end_flush(struct bio *bio) + { +- struct flush_bio *fb = fbio->bi_private; +- struct md_rdev *rdev = fb->rdev; +- struct flush_info *fi = fb->fi; +- struct bio *bio = fi->bio; +- struct mddev *mddev = fi->mddev; ++ struct md_rdev *rdev = bio->bi_private; ++ struct mddev *mddev = rdev->mddev; + + rdev_dec_pending(rdev, mddev); + +- if (atomic_dec_and_test(&fi->flush_pending)) { +- if (bio->bi_iter.bi_size == 0) { +- /* an empty barrier - all done */ +- bio_endio(bio); +- mempool_free(fi, mddev->flush_pool); +- } else { +- INIT_WORK(&fi->flush_work, submit_flushes); +- queue_work(md_wq, &fi->flush_work); +- } ++ if (atomic_dec_and_test(&mddev->flush_pending)) { ++ /* The pre-request flush has finished */ ++ queue_work(md_wq, &mddev->flush_work); + } +- +- mempool_free(fb, mddev->flush_bio_pool); +- bio_put(fbio); ++ bio_put(bio); + } + +-void md_flush_request(struct mddev *mddev, struct bio *bio) ++static void md_submit_flush_data(struct work_struct *ws); ++ ++static void submit_flushes(struct work_struct *ws) + { ++ struct mddev *mddev = container_of(ws, struct mddev, flush_work); + struct md_rdev *rdev; +- struct flush_info *fi; +- +- fi = mempool_alloc(mddev->flush_pool, GFP_NOIO); +- +- fi->bio = bio; +- fi->mddev = mddev; +- atomic_set(&fi->flush_pending, 1); + ++ mddev->start_flush = ktime_get_boottime(); ++ INIT_WORK(&mddev->flush_work, md_submit_flush_data); ++ atomic_set(&mddev->flush_pending, 1); + rcu_read_lock(); + rdev_for_each_rcu(rdev, mddev) + if (rdev->raid_disk >= 0 && +@@ -480,37 +439,74 @@ void md_flush_request(struct mddev *mddev, struct bio *bio) + * we reclaim rcu_read_lock + */ + struct bio *bi; +- struct flush_bio *fb; + atomic_inc(&rdev->nr_pending); + atomic_inc(&rdev->nr_pending); + rcu_read_unlock(); +- +- fb = mempool_alloc(mddev->flush_bio_pool, GFP_NOIO); +- fb->fi = fi; +- fb->rdev = rdev; +- + bi = bio_alloc_mddev(GFP_NOIO, 0, mddev); +- bio_set_dev(bi, rdev->bdev); + bi->bi_end_io = md_end_flush; +- bi->bi_private = fb; ++ bi->bi_private = rdev; ++ bio_set_dev(bi, rdev->bdev); + bi->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH; +- +- atomic_inc(&fi->flush_pending); ++ atomic_inc(&mddev->flush_pending); + submit_bio(bi); +- + rcu_read_lock(); + rdev_dec_pending(rdev, mddev); + } + rcu_read_unlock(); ++ if (atomic_dec_and_test(&mddev->flush_pending)) ++ queue_work(md_wq, &mddev->flush_work); ++} ++ ++static void md_submit_flush_data(struct work_struct *ws) ++{ ++ struct mddev *mddev = container_of(ws, struct mddev, flush_work); ++ struct bio *bio = mddev->flush_bio; ++ ++ /* ++ * must reset flush_bio before calling into md_handle_request to avoid a ++ * deadlock, because other bios passed md_handle_request suspend check ++ * could wait for this and below md_handle_request could wait for those ++ * bios because of suspend check ++ */ ++ mddev->last_flush = mddev->start_flush; ++ mddev->flush_bio = NULL; ++ wake_up(&mddev->sb_wait); ++ ++ if (bio->bi_iter.bi_size == 0) { ++ /* an empty barrier - all done */ ++ bio_endio(bio); ++ } else { ++ bio->bi_opf &= ~REQ_PREFLUSH; ++ md_handle_request(mddev, bio); ++ } ++} + +- if (atomic_dec_and_test(&fi->flush_pending)) { +- if (bio->bi_iter.bi_size == 0) { ++void md_flush_request(struct mddev *mddev, struct bio *bio) ++{ ++ ktime_t start = ktime_get_boottime(); ++ spin_lock_irq(&mddev->lock); ++ wait_event_lock_irq(mddev->sb_wait, ++ !mddev->flush_bio || ++ ktime_after(mddev->last_flush, start), ++ mddev->lock); ++ if (!ktime_after(mddev->last_flush, start)) { ++ WARN_ON(mddev->flush_bio); ++ mddev->flush_bio = bio; ++ bio = NULL; ++ } ++ spin_unlock_irq(&mddev->lock); ++ ++ if (!bio) { ++ INIT_WORK(&mddev->flush_work, submit_flushes); ++ queue_work(md_wq, &mddev->flush_work); ++ } else { ++ /* flush was performed for some other bio while we waited. */ ++ if (bio->bi_iter.bi_size == 0) + /* an empty barrier - all done */ + bio_endio(bio); +- mempool_free(fi, mddev->flush_pool); +- } else { +- INIT_WORK(&fi->flush_work, submit_flushes); +- queue_work(md_wq, &fi->flush_work); ++ else { ++ bio->bi_opf &= ~REQ_PREFLUSH; ++ mddev->pers->make_request(mddev, bio); + } + } + } +@@ -560,6 +556,7 @@ void mddev_init(struct mddev *mddev) + atomic_set(&mddev->openers, 0); + atomic_set(&mddev->active_io, 0); + spin_lock_init(&mddev->lock); ++ atomic_set(&mddev->flush_pending, 0); + init_waitqueue_head(&mddev->sb_wait); + init_waitqueue_head(&mddev->recovery_wait); + mddev->reshape_position = MaxSector; +@@ -2855,8 +2852,10 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len) + err = 0; + } + } else if (cmd_match(buf, "re-add")) { +- if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && +- rdev->saved_raid_disk >= 0) { ++ if (!rdev->mddev->pers) ++ err = -EINVAL; ++ else if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && ++ rdev->saved_raid_disk >= 0) { + /* clear_bit is performed _after_ all the devices + * have their local Faulty bit cleared. If any writes + * happen in the meantime in the local node, they +@@ -5511,22 +5510,6 @@ int md_run(struct mddev *mddev) + if (err) + return err; + } +- if (mddev->flush_pool == NULL) { +- mddev->flush_pool = mempool_create(NR_FLUSH_INFOS, flush_info_alloc, +- flush_info_free, mddev); +- if (!mddev->flush_pool) { +- err = -ENOMEM; +- goto abort; +- } +- } +- if (mddev->flush_bio_pool == NULL) { +- mddev->flush_bio_pool = mempool_create(NR_FLUSH_BIOS, flush_bio_alloc, +- flush_bio_free, mddev); +- if (!mddev->flush_bio_pool) { +- err = -ENOMEM; +- goto abort; +- } +- } + + spin_lock(&pers_lock); + pers = find_pers(mddev->level, mddev->clevel); +@@ -5686,11 +5669,8 @@ int md_run(struct mddev *mddev) + return 0; + + abort: +- mempool_destroy(mddev->flush_bio_pool); +- mddev->flush_bio_pool = NULL; +- mempool_destroy(mddev->flush_pool); +- mddev->flush_pool = NULL; +- ++ bioset_exit(&mddev->bio_set); ++ bioset_exit(&mddev->sync_set); + return err; + } + EXPORT_SYMBOL_GPL(md_run); +@@ -5894,14 +5874,6 @@ static void __md_stop(struct mddev *mddev) + mddev->to_remove = &md_redundancy_group; + module_put(pers->owner); + clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); +- if (mddev->flush_bio_pool) { +- mempool_destroy(mddev->flush_bio_pool); +- mddev->flush_bio_pool = NULL; +- } +- if (mddev->flush_pool) { +- mempool_destroy(mddev->flush_pool); +- mddev->flush_pool = NULL; +- } + } + + void md_stop(struct mddev *mddev) +@@ -9257,7 +9229,7 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev) + * reshape is happening in the remote node, we need to + * update reshape_position and call start_reshape. + */ +- mddev->reshape_position = sb->reshape_position; ++ mddev->reshape_position = le64_to_cpu(sb->reshape_position); + if (mddev->pers->update_reshape_pos) + mddev->pers->update_reshape_pos(mddev); + if (mddev->pers->start_reshape) +diff --git a/drivers/md/md.h b/drivers/md/md.h +index c52afb52c776..257cb4c9e22b 100644 +--- a/drivers/md/md.h ++++ b/drivers/md/md.h +@@ -252,19 +252,6 @@ enum mddev_sb_flags { + MD_SB_NEED_REWRITE, /* metadata write needs to be repeated */ + }; + +-#define NR_FLUSH_INFOS 8 +-#define NR_FLUSH_BIOS 64 +-struct flush_info { +- struct bio *bio; +- struct mddev *mddev; +- struct work_struct flush_work; +- atomic_t flush_pending; +-}; +-struct flush_bio { +- struct flush_info *fi; +- struct md_rdev *rdev; +-}; +- + struct mddev { + void *private; + struct md_personality *pers; +@@ -470,8 +457,16 @@ struct mddev { + * metadata and bitmap writes + */ + +- mempool_t *flush_pool; +- mempool_t *flush_bio_pool; ++ /* Generic flush handling. ++ * The last to finish preflush schedules a worker to submit ++ * the rest of the request (without the REQ_PREFLUSH flag). ++ */ ++ struct bio *flush_bio; ++ atomic_t flush_pending; ++ ktime_t start_flush, last_flush; /* last_flush is when the last completed ++ * flush was started. ++ */ ++ struct work_struct flush_work; + struct work_struct event_work; /* used by dm to report failure event */ + void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev); + struct md_cluster_info *cluster_info; +diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c +index 364dd2f6fa1b..a4d2f552c8ab 100644 +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -4187,7 +4187,7 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh, + /* now write out any block on a failed drive, + * or P or Q if they were recomputed + */ +- BUG_ON(s->uptodate < disks - 1); /* We don't need Q to recover */ ++ dev = NULL; + if (s->failed == 2) { + dev = &sh->dev[s->failed_num[1]]; + s->locked++; +@@ -4212,6 +4212,14 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh, + set_bit(R5_LOCKED, &dev->flags); + set_bit(R5_Wantwrite, &dev->flags); + } ++ if (WARN_ONCE(dev && !test_bit(R5_UPTODATE, &dev->flags), ++ "%s: disk%td not up to date\n", ++ mdname(conf->mddev), ++ dev - (struct r5dev *) &sh->dev)) { ++ clear_bit(R5_LOCKED, &dev->flags); ++ clear_bit(R5_Wantwrite, &dev->flags); ++ s->locked--; ++ } + clear_bit(STRIPE_DEGRADED, &sh->state); + + set_bit(STRIPE_INSYNC, &sh->state); +@@ -4223,15 +4231,26 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh, + case check_state_check_result: + sh->check_state = check_state_idle; + +- if (s->failed > 1) +- break; + /* handle a successful check operation, if parity is correct + * we are done. Otherwise update the mismatch count and repair + * parity if !MD_RECOVERY_CHECK + */ + if (sh->ops.zero_sum_result == 0) { +- /* Any parity checked was correct */ +- set_bit(STRIPE_INSYNC, &sh->state); ++ /* both parities are correct */ ++ if (!s->failed) ++ set_bit(STRIPE_INSYNC, &sh->state); ++ else { ++ /* in contrast to the raid5 case we can validate ++ * parity, but still have a failure to write ++ * back ++ */ ++ sh->check_state = check_state_compute_result; ++ /* Returning at this point means that we may go ++ * off and bring p and/or q uptodate again so ++ * we make sure to check zero_sum_result again ++ * to verify if p or q need writeback ++ */ ++ } + } else { + atomic64_add(STRIPE_SECTORS, &conf->mddev->resync_mismatches); + if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery)) { +diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c +index c33fd584cb44..f9359b11fa5c 100644 +--- a/drivers/media/i2c/ov6650.c ++++ b/drivers/media/i2c/ov6650.c +@@ -814,6 +814,8 @@ static int ov6650_video_probe(struct i2c_client *client) + if (ret < 0) + return ret; + ++ msleep(20); ++ + /* + * check and show product ID and manufacturer ID + */ +diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig +index 4acbed189644..67e48ff10532 100644 +--- a/drivers/media/platform/Kconfig ++++ b/drivers/media/platform/Kconfig +@@ -649,7 +649,7 @@ config VIDEO_SECO_CEC + config VIDEO_SECO_RC + bool "SECO Boards IR RC5 support" + depends on VIDEO_SECO_CEC +- depends on RC_CORE ++ depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC + help + If you say yes here you will get support for the + SECO Boards Consumer-IR in seco-cec driver. +diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c +index 0a53598d982f..5bd8df926052 100644 +--- a/drivers/memory/tegra/mc.c ++++ b/drivers/memory/tegra/mc.c +@@ -282,7 +282,7 @@ static int tegra_mc_setup_latency_allowance(struct tegra_mc *mc) + u32 value; + + /* compute the number of MC clock cycles per tick */ +- tick = mc->tick * clk_get_rate(mc->clk); ++ tick = (unsigned long long)mc->tick * clk_get_rate(mc->clk); + do_div(tick, NSEC_PER_SEC); + + value = readl(mc->regs + MC_EMEM_ARB_CFG); +diff --git a/drivers/net/Makefile b/drivers/net/Makefile +index 21cde7e78621..0d3ba056cda3 100644 +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile +@@ -40,7 +40,7 @@ obj-$(CONFIG_ARCNET) += arcnet/ + obj-$(CONFIG_DEV_APPLETALK) += appletalk/ + obj-$(CONFIG_CAIF) += caif/ + obj-$(CONFIG_CAN) += can/ +-obj-$(CONFIG_NET_DSA) += dsa/ ++obj-y += dsa/ + obj-$(CONFIG_ETHERNET) += ethernet/ + obj-$(CONFIG_FDDI) += fddi/ + obj-$(CONFIG_HIPPI) += hippi/ +diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c +index ffed2d4c9403..9c481823b3e8 100644 +--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c ++++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c +@@ -1492,7 +1492,7 @@ int mlx4_flow_steer_promisc_add(struct mlx4_dev *dev, u8 port, + rule.port = port; + rule.qpn = qpn; + INIT_LIST_HEAD(&rule.list); +- mlx4_err(dev, "going promisc on %x\n", port); ++ mlx4_info(dev, "going promisc on %x\n", port); + + return mlx4_flow_attach(dev, &rule, regid_p); + } +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +index 6debffb8336b..430c2eab6fc3 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig ++++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +@@ -7,6 +7,7 @@ config MLX5_CORE + depends on PCI + imply PTP_1588_CLOCK + imply VXLAN ++ imply MLXFW + default n + ---help--- + Core driver for low level functionality of the ConnectX-4 and +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c b/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c +index 4746f2d28fb6..0ccd6d40baf7 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c +@@ -26,7 +26,7 @@ static int mlx5_peer_pf_disable_hca(struct mlx5_core_dev *dev) + + MLX5_SET(disable_hca_in, in, opcode, MLX5_CMD_OP_DISABLE_HCA); + MLX5_SET(disable_hca_in, in, function_id, 0); +- MLX5_SET(enable_hca_in, in, embedded_cpu_function, 0); ++ MLX5_SET(disable_hca_in, in, embedded_cpu_function, 0); + return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out)); + } + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +index 78dc8fe2a83c..2821208119c0 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +@@ -1901,6 +1901,22 @@ static int mlx5e_flash_device(struct net_device *dev, + return mlx5e_ethtool_flash_device(priv, flash); + } + ++#ifndef CONFIG_MLX5_EN_RXNFC ++/* When CONFIG_MLX5_EN_RXNFC=n we only support ETHTOOL_GRXRINGS ++ * otherwise this function will be defined from en_fs_ethtool.c ++ */ ++static int mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rule_locs) ++{ ++ struct mlx5e_priv *priv = netdev_priv(dev); ++ ++ if (info->cmd != ETHTOOL_GRXRINGS) ++ return -EOPNOTSUPP; ++ /* ring_count is needed by ethtool -x */ ++ info->data = priv->channels.params.num_channels; ++ return 0; ++} ++#endif ++ + const struct ethtool_ops mlx5e_ethtool_ops = { + .get_drvinfo = mlx5e_get_drvinfo, + .get_link = ethtool_op_get_link, +@@ -1919,8 +1935,8 @@ const struct ethtool_ops mlx5e_ethtool_ops = { + .get_rxfh_indir_size = mlx5e_get_rxfh_indir_size, + .get_rxfh = mlx5e_get_rxfh, + .set_rxfh = mlx5e_set_rxfh, +-#ifdef CONFIG_MLX5_EN_RXNFC + .get_rxnfc = mlx5e_get_rxnfc, ++#ifdef CONFIG_MLX5_EN_RXNFC + .set_rxnfc = mlx5e_set_rxnfc, + #endif + .flash_device = mlx5e_flash_device, +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +index a66b6ed80b30..0b09fa91019d 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +@@ -65,9 +65,26 @@ static void mlx5e_rep_indr_unregister_block(struct mlx5e_rep_priv *rpriv, + static void mlx5e_rep_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *drvinfo) + { ++ struct mlx5e_priv *priv = netdev_priv(dev); ++ struct mlx5_core_dev *mdev = priv->mdev; ++ + strlcpy(drvinfo->driver, mlx5e_rep_driver_name, + sizeof(drvinfo->driver)); + strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version)); ++ snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), ++ "%d.%d.%04d (%.16s)", ++ fw_rev_maj(mdev), fw_rev_min(mdev), ++ fw_rev_sub(mdev), mdev->board_id); ++} ++ ++static void mlx5e_uplink_rep_get_drvinfo(struct net_device *dev, ++ struct ethtool_drvinfo *drvinfo) ++{ ++ struct mlx5e_priv *priv = netdev_priv(dev); ++ ++ mlx5e_rep_get_drvinfo(dev, drvinfo); ++ strlcpy(drvinfo->bus_info, pci_name(priv->mdev->pdev), ++ sizeof(drvinfo->bus_info)); + } + + static const struct counter_desc sw_rep_stats_desc[] = { +@@ -363,7 +380,7 @@ static const struct ethtool_ops mlx5e_vf_rep_ethtool_ops = { + }; + + static const struct ethtool_ops mlx5e_uplink_rep_ethtool_ops = { +- .get_drvinfo = mlx5e_rep_get_drvinfo, ++ .get_drvinfo = mlx5e_uplink_rep_get_drvinfo, + .get_link = ethtool_op_get_link, + .get_strings = mlx5e_rep_get_strings, + .get_sset_count = mlx5e_rep_get_sset_count, +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +index d75dc44eb2ff..4cb23631616b 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +@@ -1561,7 +1561,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv, + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CVLAN)) { + struct flow_match_vlan match; + +- flow_rule_match_vlan(rule, &match); ++ flow_rule_match_cvlan(rule, &match); + if (match.mask->vlan_id || + match.mask->vlan_priority || + match.mask->vlan_tpid) { +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +index 0be3eb86dd84..581cc145795d 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +@@ -1386,6 +1386,8 @@ static bool mlx5_flow_dests_cmp(struct mlx5_flow_destination *d1, + if ((d1->type == MLX5_FLOW_DESTINATION_TYPE_VPORT && + d1->vport.num == d2->vport.num && + d1->vport.flags == d2->vport.flags && ++ ((d1->vport.flags & MLX5_FLOW_DEST_VPORT_VHCA_ID) ? ++ (d1->vport.vhca_id == d2->vport.vhca_id) : true) && + ((d1->vport.flags & MLX5_FLOW_DEST_VPORT_REFORMAT_ID) ? + (d1->vport.reformat_id == d2->vport.reformat_id) : true)) || + (d1->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE && +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +index ca0ee9916e9e..0059b290e095 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +@@ -535,23 +535,16 @@ void mlx5_init_clock(struct mlx5_core_dev *mdev) + do_div(ns, NSEC_PER_SEC / HZ); + clock->overflow_period = ns; + +- mdev->clock_info_page = alloc_page(GFP_KERNEL); +- if (mdev->clock_info_page) { +- mdev->clock_info = kmap(mdev->clock_info_page); +- if (!mdev->clock_info) { +- __free_page(mdev->clock_info_page); +- mlx5_core_warn(mdev, "failed to map clock page\n"); +- } else { +- mdev->clock_info->sign = 0; +- mdev->clock_info->nsec = clock->tc.nsec; +- mdev->clock_info->cycles = clock->tc.cycle_last; +- mdev->clock_info->mask = clock->cycles.mask; +- mdev->clock_info->mult = clock->nominal_c_mult; +- mdev->clock_info->shift = clock->cycles.shift; +- mdev->clock_info->frac = clock->tc.frac; +- mdev->clock_info->overflow_period = +- clock->overflow_period; +- } ++ mdev->clock_info = ++ (struct mlx5_ib_clock_info *)get_zeroed_page(GFP_KERNEL); ++ if (mdev->clock_info) { ++ mdev->clock_info->nsec = clock->tc.nsec; ++ mdev->clock_info->cycles = clock->tc.cycle_last; ++ mdev->clock_info->mask = clock->cycles.mask; ++ mdev->clock_info->mult = clock->nominal_c_mult; ++ mdev->clock_info->shift = clock->cycles.shift; ++ mdev->clock_info->frac = clock->tc.frac; ++ mdev->clock_info->overflow_period = clock->overflow_period; + } + + INIT_WORK(&clock->pps_info.out_work, mlx5_pps_out); +@@ -599,8 +592,7 @@ void mlx5_cleanup_clock(struct mlx5_core_dev *mdev) + cancel_delayed_work_sync(&clock->overflow_work); + + if (mdev->clock_info) { +- kunmap(mdev->clock_info_page); +- __free_page(mdev->clock_info_page); ++ free_page((unsigned long)mdev->clock_info); + mdev->clock_info = NULL; + } + +diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c +index f26a4ca29363..0b56291d22c6 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/core.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/core.c +@@ -122,6 +122,12 @@ void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core) + } + EXPORT_SYMBOL(mlxsw_core_driver_priv); + ++bool mlxsw_core_res_query_enabled(const struct mlxsw_core *mlxsw_core) ++{ ++ return mlxsw_core->driver->res_query_enabled; ++} ++EXPORT_SYMBOL(mlxsw_core_res_query_enabled); ++ + struct mlxsw_rx_listener_item { + struct list_head list; + struct mlxsw_rx_listener rxl; +diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h +index 8ec53f027575..62b8de9305af 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/core.h ++++ b/drivers/net/ethernet/mellanox/mlxsw/core.h +@@ -28,6 +28,8 @@ unsigned int mlxsw_core_max_ports(const struct mlxsw_core *mlxsw_core); + + void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core); + ++bool mlxsw_core_res_query_enabled(const struct mlxsw_core *mlxsw_core); ++ + int mlxsw_core_driver_register(struct mlxsw_driver *mlxsw_driver); + void mlxsw_core_driver_unregister(struct mlxsw_driver *mlxsw_driver); + +diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c +index c1c1965d7acc..72539a9a3847 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c +@@ -3,6 +3,7 @@ + + #include <linux/kernel.h> + #include <linux/err.h> ++#include <linux/sfp.h> + + #include "core.h" + #include "core_env.h" +@@ -162,7 +163,7 @@ int mlxsw_env_get_module_info(struct mlxsw_core *mlxsw_core, int module, + { + u8 module_info[MLXSW_REG_MCIA_EEPROM_MODULE_INFO_SIZE]; + u16 offset = MLXSW_REG_MCIA_EEPROM_MODULE_INFO_SIZE; +- u8 module_rev_id, module_id; ++ u8 module_rev_id, module_id, diag_mon; + unsigned int read_size; + int err; + +@@ -195,8 +196,21 @@ int mlxsw_env_get_module_info(struct mlxsw_core *mlxsw_core, int module, + } + break; + case MLXSW_REG_MCIA_EEPROM_MODULE_INFO_ID_SFP: ++ /* Verify if transceiver provides diagnostic monitoring page */ ++ err = mlxsw_env_query_module_eeprom(mlxsw_core, module, ++ SFP_DIAGMON, 1, &diag_mon, ++ &read_size); ++ if (err) ++ return err; ++ ++ if (read_size < 1) ++ return -EIO; ++ + modinfo->type = ETH_MODULE_SFF_8472; +- modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN; ++ if (diag_mon) ++ modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN; ++ else ++ modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN / 2; + break; + default: + return -EINVAL; +diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c b/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c +index 6956bbebe2f1..496dc904c5ed 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c +@@ -518,6 +518,9 @@ static int mlxsw_hwmon_module_init(struct mlxsw_hwmon *mlxsw_hwmon) + u8 width; + int err; + ++ if (!mlxsw_core_res_query_enabled(mlxsw_hwmon->core)) ++ return 0; ++ + /* Add extra attributes for module temperature. Sensor index is + * assigned to sensor_count value, while all indexed before + * sensor_count are already utilized by the sensors connected through +diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +index 472f63f9fac5..d3e851e7ca72 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +@@ -740,6 +740,9 @@ mlxsw_thermal_modules_init(struct device *dev, struct mlxsw_core *core, + struct mlxsw_thermal_module *module_tz; + int i, err; + ++ if (!mlxsw_core_res_query_enabled(core)) ++ return 0; ++ + thermal->tz_module_arr = kcalloc(module_count, + sizeof(*thermal->tz_module_arr), + GFP_KERNEL); +@@ -776,6 +779,9 @@ mlxsw_thermal_modules_fini(struct mlxsw_thermal *thermal) + unsigned int module_count = mlxsw_core_max_ports(thermal->core); + int i; + ++ if (!mlxsw_core_res_query_enabled(thermal->core)) ++ return; ++ + for (i = module_count - 1; i >= 0; i--) + mlxsw_thermal_module_fini(&thermal->tz_module_arr[i]); + kfree(thermal->tz_module_arr); +diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +index 4d78be4ec4e9..843ddf548f26 100644 +--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c ++++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +@@ -168,6 +168,7 @@ void nfp_tunnel_keep_alive(struct nfp_app *app, struct sk_buff *skb) + return; + } + ++ rcu_read_lock(); + for (i = 0; i < count; i++) { + ipv4_addr = payload->tun_info[i].ipv4; + port = be32_to_cpu(payload->tun_info[i].egress_port); +@@ -183,6 +184,7 @@ void nfp_tunnel_keep_alive(struct nfp_app *app, struct sk_buff *skb) + neigh_event_send(n, NULL); + neigh_release(n); + } ++ rcu_read_unlock(); + } + + static int +@@ -366,9 +368,10 @@ void nfp_tunnel_request_route(struct nfp_app *app, struct sk_buff *skb) + + payload = nfp_flower_cmsg_get_data(skb); + ++ rcu_read_lock(); + netdev = nfp_app_repr_get(app, be32_to_cpu(payload->ingress_port)); + if (!netdev) +- goto route_fail_warning; ++ goto fail_rcu_unlock; + + flow.daddr = payload->ipv4_addr; + flow.flowi4_proto = IPPROTO_UDP; +@@ -378,21 +381,23 @@ void nfp_tunnel_request_route(struct nfp_app *app, struct sk_buff *skb) + rt = ip_route_output_key(dev_net(netdev), &flow); + err = PTR_ERR_OR_ZERO(rt); + if (err) +- goto route_fail_warning; ++ goto fail_rcu_unlock; + #else +- goto route_fail_warning; ++ goto fail_rcu_unlock; + #endif + + /* Get the neighbour entry for the lookup */ + n = dst_neigh_lookup(&rt->dst, &flow.daddr); + ip_rt_put(rt); + if (!n) +- goto route_fail_warning; +- nfp_tun_write_neigh(n->dev, app, &flow, n, GFP_KERNEL); ++ goto fail_rcu_unlock; ++ nfp_tun_write_neigh(n->dev, app, &flow, n, GFP_ATOMIC); + neigh_release(n); ++ rcu_read_unlock(); + return; + +-route_fail_warning: ++fail_rcu_unlock: ++ rcu_read_unlock(); + nfp_flower_cmsg_warn(app, "Requested route not found.\n"); + } + +diff --git a/drivers/net/ppp/ppp_deflate.c b/drivers/net/ppp/ppp_deflate.c +index b5edc7f96a39..685e875f5164 100644 +--- a/drivers/net/ppp/ppp_deflate.c ++++ b/drivers/net/ppp/ppp_deflate.c +@@ -610,12 +610,20 @@ static struct compressor ppp_deflate_draft = { + + static int __init deflate_init(void) + { +- int answer = ppp_register_compressor(&ppp_deflate); +- if (answer == 0) +- printk(KERN_INFO +- "PPP Deflate Compression module registered\n"); +- ppp_register_compressor(&ppp_deflate_draft); +- return answer; ++ int rc; ++ ++ rc = ppp_register_compressor(&ppp_deflate); ++ if (rc) ++ return rc; ++ ++ rc = ppp_register_compressor(&ppp_deflate_draft); ++ if (rc) { ++ ppp_unregister_compressor(&ppp_deflate); ++ return rc; ++ } ++ ++ pr_info("PPP Deflate Compression module registered\n"); ++ return 0; + } + + static void __exit deflate_cleanup(void) +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index 679e404a5224..366217263d70 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1250,6 +1250,8 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x1bc7, 0x1101, 3)}, /* Telit ME910 dual modem */ + {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x1201, 2)}, /* Telit LE920, LE920A4 */ ++ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1260, 2)}, /* Telit LE910Cx */ ++ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1261, 2)}, /* Telit LE910Cx */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x1900, 1)}, /* Telit LN940 series */ + {QMI_FIXED_INTF(0x1c9e, 0x9801, 3)}, /* Telewell TW-3G HSPA+ */ + {QMI_FIXED_INTF(0x1c9e, 0x9803, 4)}, /* Telewell TW-3G HSPA+ */ +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c +index 7535cb0d4ac0..9f1417e00073 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c +@@ -31,6 +31,10 @@ struct brcmf_dmi_data { + + /* NOTE: Please keep all entries sorted alphabetically */ + ++static const struct brcmf_dmi_data acepc_t8_data = { ++ BRCM_CC_4345_CHIP_ID, 6, "acepc-t8" ++}; ++ + static const struct brcmf_dmi_data gpd_win_pocket_data = { + BRCM_CC_4356_CHIP_ID, 2, "gpd-win-pocket" + }; +@@ -48,6 +52,28 @@ static const struct brcmf_dmi_data pov_tab_p1006w_data = { + }; + + static const struct dmi_system_id dmi_platform_data[] = { ++ { ++ /* ACEPC T8 Cherry Trail Z8350 mini PC */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."), ++ DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T8"), ++ /* also match on somewhat unique bios-version */ ++ DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"), ++ }, ++ .driver_data = (void *)&acepc_t8_data, ++ }, ++ { ++ /* ACEPC T11 Cherry Trail Z8350 mini PC, same wifi as the T8 */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."), ++ DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T11"), ++ /* also match on somewhat unique bios-version */ ++ DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"), ++ }, ++ .driver_data = (void *)&acepc_t8_data, ++ }, + { + /* Match for the GPDwin which unfortunately uses somewhat + * generic dmi strings, which is why we test for 4 strings. +diff --git a/drivers/net/wireless/intersil/p54/p54pci.c b/drivers/net/wireless/intersil/p54/p54pci.c +index 27a49068d32d..57ad56435dda 100644 +--- a/drivers/net/wireless/intersil/p54/p54pci.c ++++ b/drivers/net/wireless/intersil/p54/p54pci.c +@@ -554,7 +554,7 @@ static int p54p_probe(struct pci_dev *pdev, + err = pci_enable_device(pdev); + if (err) { + dev_err(&pdev->dev, "Cannot enable new PCI device\n"); +- return err; ++ goto err_put; + } + + mem_addr = pci_resource_start(pdev, 0); +@@ -639,6 +639,7 @@ static int p54p_probe(struct pci_dev *pdev, + pci_release_regions(pdev); + err_disable_dev: + pci_disable_device(pdev); ++err_put: + pci_dev_put(pdev); + return err; + } +diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c +index 0c6e8b44b4ed..c60b465f6fe4 100644 +--- a/drivers/parisc/led.c ++++ b/drivers/parisc/led.c +@@ -568,6 +568,9 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d + break; + + case DISPLAY_MODEL_LASI: ++ /* Skip to register LED in QEMU */ ++ if (running_on_qemu) ++ return 1; + LED_DATA_REG = data_reg; + led_func_ptr = led_LASI_driver; + printk(KERN_INFO "LED display at %lx registered\n", LED_DATA_REG); +diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c +index c8febb009454..6a4e435bd35f 100644 +--- a/drivers/pci/controller/pcie-rcar.c ++++ b/drivers/pci/controller/pcie-rcar.c +@@ -46,6 +46,7 @@ + + /* Transfer control */ + #define PCIETCTLR 0x02000 ++#define DL_DOWN BIT(3) + #define CFINIT 1 + #define PCIETSTR 0x02004 + #define DATA_LINK_ACTIVE 1 +@@ -94,6 +95,7 @@ + #define MACCTLR 0x011058 + #define SPEED_CHANGE BIT(24) + #define SCRAMBLE_DISABLE BIT(27) ++#define PMSR 0x01105c + #define MACS2R 0x011078 + #define MACCGSPSETR 0x011084 + #define SPCNGRSN BIT(31) +@@ -1130,6 +1132,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) + pcie = pci_host_bridge_priv(bridge); + + pcie->dev = dev; ++ platform_set_drvdata(pdev, pcie); + + err = pci_parse_request_of_pci_ranges(dev, &pcie->resources, NULL); + if (err) +@@ -1221,10 +1224,28 @@ err_free_bridge: + return err; + } + ++static int rcar_pcie_resume_noirq(struct device *dev) ++{ ++ struct rcar_pcie *pcie = dev_get_drvdata(dev); ++ ++ if (rcar_pci_read_reg(pcie, PMSR) && ++ !(rcar_pci_read_reg(pcie, PCIETCTLR) & DL_DOWN)) ++ return 0; ++ ++ /* Re-establish the PCIe link */ ++ rcar_pci_write_reg(pcie, CFINIT, PCIETCTLR); ++ return rcar_pcie_wait_for_dl(pcie); ++} ++ ++static const struct dev_pm_ops rcar_pcie_pm_ops = { ++ .resume_noirq = rcar_pcie_resume_noirq, ++}; ++ + static struct platform_driver rcar_pcie_driver = { + .driver = { + .name = "rcar-pcie", + .of_match_table = rcar_pcie_of_match, ++ .pm = &rcar_pcie_pm_ops, + .suppress_bind_attrs = true, + }, + .probe = rcar_pcie_probe, +diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h +index d994839a3e24..9cb99380c61e 100644 +--- a/drivers/pci/pci.h ++++ b/drivers/pci/pci.h +@@ -597,7 +597,7 @@ void pci_aer_clear_fatal_status(struct pci_dev *dev); + void pci_aer_clear_device_status(struct pci_dev *dev); + #else + static inline void pci_no_aer(void) { } +-static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; } ++static inline void pci_aer_init(struct pci_dev *d) { } + static inline void pci_aer_exit(struct pci_dev *d) { } + static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { } + static inline void pci_aer_clear_device_status(struct pci_dev *dev) { } +diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c +index 727e3c1ef9a4..38e7017478b5 100644 +--- a/drivers/pci/pcie/aspm.c ++++ b/drivers/pci/pcie/aspm.c +@@ -196,6 +196,38 @@ static void pcie_clkpm_cap_init(struct pcie_link_state *link, int blacklist) + link->clkpm_capable = (blacklist) ? 0 : capable; + } + ++static bool pcie_retrain_link(struct pcie_link_state *link) ++{ ++ struct pci_dev *parent = link->pdev; ++ unsigned long start_jiffies; ++ u16 reg16; ++ ++ pcie_capability_read_word(parent, PCI_EXP_LNKCTL, ®16); ++ reg16 |= PCI_EXP_LNKCTL_RL; ++ pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16); ++ if (parent->clear_retrain_link) { ++ /* ++ * Due to an erratum in some devices the Retrain Link bit ++ * needs to be cleared again manually to allow the link ++ * training to succeed. ++ */ ++ reg16 &= ~PCI_EXP_LNKCTL_RL; ++ pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16); ++ } ++ ++ /* Wait for link training end. Break out after waiting for timeout */ ++ start_jiffies = jiffies; ++ for (;;) { ++ pcie_capability_read_word(parent, PCI_EXP_LNKSTA, ®16); ++ if (!(reg16 & PCI_EXP_LNKSTA_LT)) ++ break; ++ if (time_after(jiffies, start_jiffies + LINK_RETRAIN_TIMEOUT)) ++ break; ++ msleep(1); ++ } ++ return !(reg16 & PCI_EXP_LNKSTA_LT); ++} ++ + /* + * pcie_aspm_configure_common_clock: check if the 2 ends of a link + * could use common clock. If they are, configure them to use the +@@ -205,7 +237,6 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link) + { + int same_clock = 1; + u16 reg16, parent_reg, child_reg[8]; +- unsigned long start_jiffies; + struct pci_dev *child, *parent = link->pdev; + struct pci_bus *linkbus = parent->subordinate; + /* +@@ -263,21 +294,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link) + reg16 &= ~PCI_EXP_LNKCTL_CCC; + pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16); + +- /* Retrain link */ +- reg16 |= PCI_EXP_LNKCTL_RL; +- pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16); +- +- /* Wait for link training end. Break out after waiting for timeout */ +- start_jiffies = jiffies; +- for (;;) { +- pcie_capability_read_word(parent, PCI_EXP_LNKSTA, ®16); +- if (!(reg16 & PCI_EXP_LNKSTA_LT)) +- break; +- if (time_after(jiffies, start_jiffies + LINK_RETRAIN_TIMEOUT)) +- break; +- msleep(1); +- } +- if (!(reg16 & PCI_EXP_LNKSTA_LT)) ++ if (pcie_retrain_link(link)) + return; + + /* Training failed. Restore common clock configurations */ +diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c +index 7e12d0163863..eea78477d311 100644 +--- a/drivers/pci/probe.c ++++ b/drivers/pci/probe.c +@@ -586,16 +586,9 @@ static void pci_release_host_bridge_dev(struct device *dev) + kfree(to_pci_host_bridge(dev)); + } + +-struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) ++static void pci_init_host_bridge(struct pci_host_bridge *bridge) + { +- struct pci_host_bridge *bridge; +- +- bridge = kzalloc(sizeof(*bridge) + priv, GFP_KERNEL); +- if (!bridge) +- return NULL; +- + INIT_LIST_HEAD(&bridge->windows); +- bridge->dev.release = pci_release_host_bridge_dev; + + /* + * We assume we can manage these PCIe features. Some systems may +@@ -608,6 +601,18 @@ struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) + bridge->native_shpc_hotplug = 1; + bridge->native_pme = 1; + bridge->native_ltr = 1; ++} ++ ++struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) ++{ ++ struct pci_host_bridge *bridge; ++ ++ bridge = kzalloc(sizeof(*bridge) + priv, GFP_KERNEL); ++ if (!bridge) ++ return NULL; ++ ++ pci_init_host_bridge(bridge); ++ bridge->dev.release = pci_release_host_bridge_dev; + + return bridge; + } +@@ -622,7 +627,7 @@ struct pci_host_bridge *devm_pci_alloc_host_bridge(struct device *dev, + if (!bridge) + return NULL; + +- INIT_LIST_HEAD(&bridge->windows); ++ pci_init_host_bridge(bridge); + bridge->dev.release = devm_pci_release_host_bridge_dev; + + return bridge; +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index a077f67fe1da..cc616a5f6a8f 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -2245,6 +2245,23 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x10f1, quirk_disable_aspm_l0s); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x10f4, quirk_disable_aspm_l0s); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1508, quirk_disable_aspm_l0s); + ++/* ++ * Some Pericom PCIe-to-PCI bridges in reverse mode need the PCIe Retrain ++ * Link bit cleared after starting the link retrain process to allow this ++ * process to finish. ++ * ++ * Affected devices: PI7C9X110, PI7C9X111SL, PI7C9X130. See also the ++ * Pericom Errata Sheet PI7C9X111SLB_errata_rev1.2_102711.pdf. ++ */ ++static void quirk_enable_clear_retrain_link(struct pci_dev *dev) ++{ ++ dev->clear_retrain_link = 1; ++ pci_info(dev, "Enable PCIe Retrain Link quirk\n"); ++} ++DECLARE_PCI_FIXUP_HEADER(0x12d8, 0xe110, quirk_enable_clear_retrain_link); ++DECLARE_PCI_FIXUP_HEADER(0x12d8, 0xe111, quirk_enable_clear_retrain_link); ++DECLARE_PCI_FIXUP_HEADER(0x12d8, 0xe130, quirk_enable_clear_retrain_link); ++ + static void fixup_rev1_53c810(struct pci_dev *dev) + { + u32 class = dev->class; +@@ -3408,6 +3425,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0030, quirk_no_bus_reset); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0032, quirk_no_bus_reset); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, quirk_no_bus_reset); + + /* + * Root port on some Cavium CN8xxx chips do not successfully complete a bus +@@ -4905,6 +4923,7 @@ static void quirk_no_ats(struct pci_dev *pdev) + + /* AMD Stoney platform GPU */ + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_no_ats); + #endif /* CONFIG_PCI_ATS */ + + /* Freescale PCIe doesn't support MSI in RC mode */ +@@ -5122,3 +5141,61 @@ SWITCHTEC_QUIRK(0x8573); /* PFXI 48XG3 */ + SWITCHTEC_QUIRK(0x8574); /* PFXI 64XG3 */ + SWITCHTEC_QUIRK(0x8575); /* PFXI 80XG3 */ + SWITCHTEC_QUIRK(0x8576); /* PFXI 96XG3 */ ++ ++/* ++ * On Lenovo Thinkpad P50 SKUs with a Nvidia Quadro M1000M, the BIOS does ++ * not always reset the secondary Nvidia GPU between reboots if the system ++ * is configured to use Hybrid Graphics mode. This results in the GPU ++ * being left in whatever state it was in during the *previous* boot, which ++ * causes spurious interrupts from the GPU, which in turn causes us to ++ * disable the wrong IRQ and end up breaking the touchpad. Unsurprisingly, ++ * this also completely breaks nouveau. ++ * ++ * Luckily, it seems a simple reset of the Nvidia GPU brings it back to a ++ * clean state and fixes all these issues. ++ * ++ * When the machine is configured in Dedicated display mode, the issue ++ * doesn't occur. Fortunately the GPU advertises NoReset+ when in this ++ * mode, so we can detect that and avoid resetting it. ++ */ ++static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev) ++{ ++ void __iomem *map; ++ int ret; ++ ++ if (pdev->subsystem_vendor != PCI_VENDOR_ID_LENOVO || ++ pdev->subsystem_device != 0x222e || ++ !pdev->reset_fn) ++ return; ++ ++ if (pci_enable_device_mem(pdev)) ++ return; ++ ++ /* ++ * Based on nvkm_device_ctor() in ++ * drivers/gpu/drm/nouveau/nvkm/engine/device/base.c ++ */ ++ map = pci_iomap(pdev, 0, 0x23000); ++ if (!map) { ++ pci_err(pdev, "Can't map MMIO space\n"); ++ goto out_disable; ++ } ++ ++ /* ++ * Make sure the GPU looks like it's been POSTed before resetting ++ * it. ++ */ ++ if (ioread32(map + 0x2240c) & 0x2) { ++ pci_info(pdev, FW_BUG "GPU left initialized by EFI, resetting\n"); ++ ret = pci_reset_function(pdev); ++ if (ret < 0) ++ pci_err(pdev, "Failed to reset GPU: %d\n", ret); ++ } ++ ++ iounmap(map); ++out_disable: ++ pci_disable_device(pdev); ++} ++DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, 0x13b1, ++ PCI_CLASS_DISPLAY_VGA, 8, ++ quirk_reset_lenovo_thinkpad_p50_nvgpu); +diff --git a/drivers/phy/ti/phy-ti-pipe3.c b/drivers/phy/ti/phy-ti-pipe3.c +index 68ce4a082b9b..693acc167351 100644 +--- a/drivers/phy/ti/phy-ti-pipe3.c ++++ b/drivers/phy/ti/phy-ti-pipe3.c +@@ -303,7 +303,7 @@ static void ti_pipe3_calibrate(struct ti_pipe3 *phy) + + val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY); + val &= ~(INTERFACE_MASK | LOSD_MASK | MEM_PLLDIV); +- val = (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT); ++ val |= (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT); + ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY, val); + + val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_DIGITAL_MODES); +diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c +index 68473d0cc57e..968dcd9d7a07 100644 +--- a/drivers/regulator/core.c ++++ b/drivers/regulator/core.c +@@ -3322,15 +3322,12 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, + + /* for not coupled regulators this will just set the voltage */ + ret = regulator_balance_voltage(rdev, state); +- if (ret < 0) +- goto out2; ++ if (ret < 0) { ++ voltage->min_uV = old_min_uV; ++ voltage->max_uV = old_max_uV; ++ } + + out: +- return 0; +-out2: +- voltage->min_uV = old_min_uV; +- voltage->max_uV = old_max_uV; +- + return ret; + } + +diff --git a/drivers/staging/media/imx/imx-ic-common.c b/drivers/staging/media/imx/imx-ic-common.c +index 765919487a73..90a926891eb9 100644 +--- a/drivers/staging/media/imx/imx-ic-common.c ++++ b/drivers/staging/media/imx/imx-ic-common.c +@@ -26,7 +26,7 @@ static struct imx_ic_ops *ic_ops[IC_NUM_OPS] = { + + static int imx_ic_probe(struct platform_device *pdev) + { +- struct imx_media_internal_sd_platformdata *pdata; ++ struct imx_media_ipu_internal_sd_pdata *pdata; + struct imx_ic_priv *priv; + int ret; + +diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c +index 3b7517348666..41965d8b56c4 100644 +--- a/drivers/staging/media/imx/imx-media-csi.c ++++ b/drivers/staging/media/imx/imx-media-csi.c +@@ -154,9 +154,10 @@ static inline bool requires_passthrough(struct v4l2_fwnode_endpoint *ep, + /* + * Parses the fwnode endpoint from the source pad of the entity + * connected to this CSI. This will either be the entity directly +- * upstream from the CSI-2 receiver, or directly upstream from the +- * video mux. The endpoint is needed to determine the bus type and +- * bus config coming into the CSI. ++ * upstream from the CSI-2 receiver, directly upstream from the ++ * video mux, or directly upstream from the CSI itself. The endpoint ++ * is needed to determine the bus type and bus config coming into ++ * the CSI. + */ + static int csi_get_upstream_endpoint(struct csi_priv *priv, + struct v4l2_fwnode_endpoint *ep) +@@ -172,7 +173,8 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, + if (!priv->src_sd) + return -EPIPE; + +- src = &priv->src_sd->entity; ++ sd = priv->src_sd; ++ src = &sd->entity; + + if (src->function == MEDIA_ENT_F_VID_MUX) { + /* +@@ -186,6 +188,14 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, + src = &sd->entity; + } + ++ /* ++ * If the source is neither the video mux nor the CSI-2 receiver, ++ * get the source pad directly upstream from CSI itself. ++ */ ++ if (src->function != MEDIA_ENT_F_VID_MUX && ++ sd->grp_id != IMX_MEDIA_GRP_ID_CSI2) ++ src = &priv->sd.entity; ++ + /* get source pad of entity directly upstream from src */ + pad = imx_media_find_upstream_pad(priv->md, src, 0); + if (IS_ERR(pad)) +diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c +index 28a3d23aad5b..10a63a4fa90b 100644 +--- a/drivers/staging/media/imx/imx-media-dev.c ++++ b/drivers/staging/media/imx/imx-media-dev.c +@@ -477,13 +477,6 @@ static int imx_media_probe(struct platform_device *pdev) + goto cleanup; + } + +- ret = imx_media_add_internal_subdevs(imxmd); +- if (ret) { +- v4l2_err(&imxmd->v4l2_dev, +- "add_internal_subdevs failed with %d\n", ret); +- goto cleanup; +- } +- + ret = imx_media_dev_notifier_register(imxmd); + if (ret) + goto del_int; +@@ -491,7 +484,7 @@ static int imx_media_probe(struct platform_device *pdev) + return 0; + + del_int: +- imx_media_remove_internal_subdevs(imxmd); ++ imx_media_remove_ipu_internal_subdevs(imxmd); + cleanup: + v4l2_async_notifier_cleanup(&imxmd->notifier); + v4l2_device_unregister(&imxmd->v4l2_dev); +@@ -508,7 +501,7 @@ static int imx_media_remove(struct platform_device *pdev) + v4l2_info(&imxmd->v4l2_dev, "Removing imx-media\n"); + + v4l2_async_notifier_unregister(&imxmd->notifier); +- imx_media_remove_internal_subdevs(imxmd); ++ imx_media_remove_ipu_internal_subdevs(imxmd); + v4l2_async_notifier_cleanup(&imxmd->notifier); + media_device_unregister(&imxmd->md); + v4l2_device_unregister(&imxmd->v4l2_dev); +diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c +index 5e10d95e5529..dc510dcfe160 100644 +--- a/drivers/staging/media/imx/imx-media-internal-sd.c ++++ b/drivers/staging/media/imx/imx-media-internal-sd.c +@@ -1,7 +1,7 @@ + /* + * Media driver for Freescale i.MX5/6 SOC + * +- * Adds the internal subdevices and the media links between them. ++ * Adds the IPU internal subdevices and the media links between them. + * + * Copyright (c) 2016 Mentor Graphics Inc. + * +@@ -192,7 +192,7 @@ static struct v4l2_subdev *find_sink(struct imx_media_dev *imxmd, + + /* + * retrieve IPU id from subdev name, note: can't get this from +- * struct imx_media_internal_sd_platformdata because if src is ++ * struct imx_media_ipu_internal_sd_pdata because if src is + * a CSI, it has different struct ipu_client_platformdata which + * does not contain IPU id. + */ +@@ -270,7 +270,7 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, + const struct internal_subdev *isd, + int ipu_id) + { +- struct imx_media_internal_sd_platformdata pdata; ++ struct imx_media_ipu_internal_sd_pdata pdata; + struct platform_device_info pdevinfo = {}; + struct platform_device *pdev; + +@@ -298,13 +298,14 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, + } + + /* adds the internal subdevs in one ipu */ +-static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) ++int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, ++ int ipu_id) + { + enum isd_enum i; ++ int ret; + + for (i = 0; i < num_isd; i++) { + const struct internal_subdev *isd = &int_subdev[i]; +- int ret; + + /* + * the CSIs are represented in the device-tree, so those +@@ -322,32 +323,17 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) + } + + if (ret) +- return ret; ++ goto remove; + } + + return 0; +-} +- +-int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd) +-{ +- int ret; +- +- ret = add_ipu_internal_subdevs(imxmd, 0); +- if (ret) +- goto remove; +- +- ret = add_ipu_internal_subdevs(imxmd, 1); +- if (ret) +- goto remove; +- +- return 0; + + remove: +- imx_media_remove_internal_subdevs(imxmd); ++ imx_media_remove_ipu_internal_subdevs(imxmd); + return ret; + } + +-void imx_media_remove_internal_subdevs(struct imx_media_dev *imxmd) ++void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd) + { + struct imx_media_async_subdev *imxasd; + struct v4l2_async_subdev *asd; +diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c +index 03446335ac03..12383f4785ad 100644 +--- a/drivers/staging/media/imx/imx-media-of.c ++++ b/drivers/staging/media/imx/imx-media-of.c +@@ -23,36 +23,25 @@ + int imx_media_of_add_csi(struct imx_media_dev *imxmd, + struct device_node *csi_np) + { +- int ret; +- + if (!of_device_is_available(csi_np)) { + dev_dbg(imxmd->md.dev, "%s: %pOFn not enabled\n", __func__, + csi_np); +- /* unavailable is not an error */ +- return 0; ++ return -ENODEV; + } + + /* add CSI fwnode to async notifier */ +- ret = imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), NULL); +- if (ret) { +- if (ret == -EEXIST) { +- /* already added, everything is fine */ +- return 0; +- } +- +- /* other error, can't continue */ +- return ret; +- } +- +- return 0; ++ return imx_media_add_async_subdev(imxmd, of_fwnode_handle(csi_np), ++ NULL); + } + EXPORT_SYMBOL_GPL(imx_media_of_add_csi); + + int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, + struct device_node *np) + { ++ bool ipu_found[2] = {false, false}; + struct device_node *csi_np; + int i, ret; ++ u32 ipu_id; + + for (i = 0; ; i++) { + csi_np = of_parse_phandle(np, "ports", i); +@@ -60,12 +49,43 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, + break; + + ret = imx_media_of_add_csi(imxmd, csi_np); +- of_node_put(csi_np); +- if (ret) +- return ret; ++ if (ret) { ++ /* unavailable or already added is not an error */ ++ if (ret == -ENODEV || ret == -EEXIST) { ++ of_node_put(csi_np); ++ continue; ++ } ++ ++ /* other error, can't continue */ ++ goto err_out; ++ } ++ ++ ret = of_alias_get_id(csi_np->parent, "ipu"); ++ if (ret < 0) ++ goto err_out; ++ if (ret > 1) { ++ ret = -EINVAL; ++ goto err_out; ++ } ++ ++ ipu_id = ret; ++ ++ if (!ipu_found[ipu_id]) { ++ ret = imx_media_add_ipu_internal_subdevs(imxmd, ++ ipu_id); ++ if (ret) ++ goto err_out; ++ } ++ ++ ipu_found[ipu_id] = true; + } + + return 0; ++ ++err_out: ++ imx_media_remove_ipu_internal_subdevs(imxmd); ++ of_node_put(csi_np); ++ return ret; + } + + /* +@@ -145,15 +165,18 @@ int imx_media_create_csi_of_links(struct imx_media_dev *imxmd, + struct v4l2_subdev *csi) + { + struct device_node *csi_np = csi->dev->of_node; +- struct fwnode_handle *fwnode, *csi_ep; +- struct v4l2_fwnode_link link; + struct device_node *ep; +- int ret; +- +- link.local_node = of_fwnode_handle(csi_np); +- link.local_port = CSI_SINK_PAD; + + for_each_child_of_node(csi_np, ep) { ++ struct fwnode_handle *fwnode, *csi_ep; ++ struct v4l2_fwnode_link link; ++ int ret; ++ ++ memset(&link, 0, sizeof(link)); ++ ++ link.local_node = of_fwnode_handle(csi_np); ++ link.local_port = CSI_SINK_PAD; ++ + csi_ep = of_fwnode_handle(ep); + + fwnode = fwnode_graph_get_remote_endpoint(csi_ep); +diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c +index 2808662e2597..8a9af4688fd4 100644 +--- a/drivers/staging/media/imx/imx-media-vdic.c ++++ b/drivers/staging/media/imx/imx-media-vdic.c +@@ -934,7 +934,7 @@ static const struct v4l2_subdev_internal_ops vdic_internal_ops = { + + static int imx_vdic_probe(struct platform_device *pdev) + { +- struct imx_media_internal_sd_platformdata *pdata; ++ struct imx_media_ipu_internal_sd_pdata *pdata; + struct vdic_priv *priv; + int ret; + +diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h +index ae964c8d5be1..dd603a6b3a70 100644 +--- a/drivers/staging/media/imx/imx-media.h ++++ b/drivers/staging/media/imx/imx-media.h +@@ -115,7 +115,7 @@ struct imx_media_pad_vdev { + struct list_head list; + }; + +-struct imx_media_internal_sd_platformdata { ++struct imx_media_ipu_internal_sd_pdata { + char sd_name[V4L2_SUBDEV_NAME_SIZE]; + u32 grp_id; + int ipu_id; +@@ -252,10 +252,11 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd); + void imx_media_fim_free(struct imx_media_fim *fim); + + /* imx-media-internal-sd.c */ +-int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd); ++int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd, ++ int ipu_id); + int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd, + struct v4l2_subdev *sd); +-void imx_media_remove_internal_subdevs(struct imx_media_dev *imxmd); ++void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd); + + /* imx-media-of.c */ + int imx_media_add_of_subdevs(struct imx_media_dev *dev, +diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c +index 3fba7c27c0ec..1ba62fcdcae8 100644 +--- a/drivers/staging/media/imx/imx7-media-csi.c ++++ b/drivers/staging/media/imx/imx7-media-csi.c +@@ -1271,7 +1271,7 @@ static int imx7_csi_probe(struct platform_device *pdev) + platform_set_drvdata(pdev, &csi->sd); + + ret = imx_media_of_add_csi(imxmd, node); +- if (ret < 0) ++ if (ret < 0 && ret != -ENODEV && ret != -EEXIST) + goto cleanup; + + ret = imx_media_dev_notifier_register(imxmd); +diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c +index ba906876cc45..fd02e8a4841d 100644 +--- a/drivers/video/fbdev/efifb.c ++++ b/drivers/video/fbdev/efifb.c +@@ -476,8 +476,12 @@ static int efifb_probe(struct platform_device *dev) + * If the UEFI memory map covers the efifb region, we may only + * remap it using the attributes the memory map prescribes. + */ +- mem_flags |= EFI_MEMORY_WT | EFI_MEMORY_WB; +- mem_flags &= md.attribute; ++ md.attribute &= EFI_MEMORY_UC | EFI_MEMORY_WC | ++ EFI_MEMORY_WT | EFI_MEMORY_WB; ++ if (md.attribute) { ++ mem_flags |= EFI_MEMORY_WT | EFI_MEMORY_WB; ++ mem_flags &= md.attribute; ++ } + } + if (mem_flags & EFI_MEMORY_WC) + info->screen_base = ioremap_wc(efifb_fix.smem_start, +diff --git a/drivers/video/fbdev/sm712.h b/drivers/video/fbdev/sm712.h +index aad1cc4be34a..c7ebf03b8d53 100644 +--- a/drivers/video/fbdev/sm712.h ++++ b/drivers/video/fbdev/sm712.h +@@ -15,14 +15,10 @@ + + #define FB_ACCEL_SMI_LYNX 88 + +-#define SCREEN_X_RES 1024 +-#define SCREEN_Y_RES 600 +-#define SCREEN_BPP 16 +- +-/*Assume SM712 graphics chip has 4MB VRAM */ +-#define SM712_VIDEOMEMORYSIZE 0x00400000 +-/*Assume SM722 graphics chip has 8MB VRAM */ +-#define SM722_VIDEOMEMORYSIZE 0x00800000 ++#define SCREEN_X_RES 1024 ++#define SCREEN_Y_RES_PC 768 ++#define SCREEN_Y_RES_NETBOOK 600 ++#define SCREEN_BPP 16 + + #define dac_reg (0x3c8) + #define dac_val (0x3c9) +diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c +index 502d0de2feec..f1dcc6766d1e 100644 +--- a/drivers/video/fbdev/sm712fb.c ++++ b/drivers/video/fbdev/sm712fb.c +@@ -530,6 +530,65 @@ static const struct modeinit vgamode[] = { + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x15, 0x03, + }, + }, ++ { /* 1024 x 768 16Bpp 60Hz */ ++ 1024, 768, 16, 60, ++ /* Init_MISC */ ++ 0xEB, ++ { /* Init_SR0_SR4 */ ++ 0x03, 0x01, 0x0F, 0x03, 0x0E, ++ }, ++ { /* Init_SR10_SR24 */ ++ 0xF3, 0xB6, 0xC0, 0xDD, 0x00, 0x0E, 0x17, 0x2C, ++ 0x99, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0xC4, 0x30, 0x02, 0x01, 0x01, ++ }, ++ { /* Init_SR30_SR75 */ ++ 0x38, 0x03, 0x20, 0x09, 0xC0, 0x3A, 0x3A, 0x3A, ++ 0x3A, 0x3A, 0x3A, 0x3A, 0x00, 0x00, 0x03, 0xFF, ++ 0x00, 0xFC, 0x00, 0x00, 0x20, 0x18, 0x00, 0xFC, ++ 0x20, 0x0C, 0x44, 0x20, 0x00, 0x00, 0x00, 0x3A, ++ 0x06, 0x68, 0xA7, 0x7F, 0x83, 0x24, 0xFF, 0x03, ++ 0x0F, 0x60, 0x59, 0x3A, 0x3A, 0x00, 0x00, 0x3A, ++ 0x01, 0x80, 0x7E, 0x1A, 0x1A, 0x00, 0x00, 0x00, ++ 0x50, 0x03, 0x74, 0x14, 0x3B, 0x0D, 0x09, 0x02, ++ 0x04, 0x45, 0x30, 0x30, 0x40, 0x20, ++ }, ++ { /* Init_SR80_SR93 */ ++ 0xFF, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x3A, ++ 0xF7, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x3A, 0x3A, ++ 0x00, 0x00, 0x00, 0x00, ++ }, ++ { /* Init_SRA0_SRAF */ ++ 0x00, 0xFB, 0x9F, 0x01, 0x00, 0xED, 0xED, 0xED, ++ 0x7B, 0xFB, 0xFF, 0xFF, 0x97, 0xEF, 0xBF, 0xDF, ++ }, ++ { /* Init_GR00_GR08 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, ++ 0xFF, ++ }, ++ { /* Init_AR00_AR14 */ ++ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, ++ 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, ++ 0x41, 0x00, 0x0F, 0x00, 0x00, ++ }, ++ { /* Init_CR00_CR18 */ ++ 0xA3, 0x7F, 0x7F, 0x00, 0x85, 0x16, 0x24, 0xF5, ++ 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x03, 0x09, 0xFF, 0x80, 0x40, 0xFF, 0x00, 0xE3, ++ 0xFF, ++ }, ++ { /* Init_CR30_CR4D */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x20, ++ 0x00, 0x00, 0x00, 0x40, 0x00, 0xFF, 0xBF, 0xFF, ++ 0xA3, 0x7F, 0x00, 0x86, 0x15, 0x24, 0xFF, 0x00, ++ 0x01, 0x07, 0xE5, 0x20, 0x7F, 0xFF, ++ }, ++ { /* Init_CR90_CRA7 */ ++ 0x55, 0xD9, 0x5D, 0xE1, 0x86, 0x1B, 0x8E, 0x26, ++ 0xDA, 0x8D, 0xDE, 0x94, 0x00, 0x00, 0x18, 0x00, ++ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x15, 0x03, ++ }, ++ }, + { /* mode#5: 1024 x 768 24Bpp 60Hz */ + 1024, 768, 24, 60, + /* Init_MISC */ +@@ -827,67 +886,80 @@ static inline unsigned int chan_to_field(unsigned int chan, + + static int smtc_blank(int blank_mode, struct fb_info *info) + { ++ struct smtcfb_info *sfb = info->par; ++ + /* clear DPMS setting */ + switch (blank_mode) { + case FB_BLANK_UNBLANK: + /* Screen On: HSync: On, VSync : On */ ++ ++ switch (sfb->chip_id) { ++ case 0x710: ++ case 0x712: ++ smtc_seqw(0x6a, 0x16); ++ smtc_seqw(0x6b, 0x02); ++ break; ++ case 0x720: ++ smtc_seqw(0x6a, 0x0d); ++ smtc_seqw(0x6b, 0x02); ++ break; ++ } ++ ++ smtc_seqw(0x23, (smtc_seqr(0x23) & (~0xc0))); + smtc_seqw(0x01, (smtc_seqr(0x01) & (~0x20))); +- smtc_seqw(0x6a, 0x16); +- smtc_seqw(0x6b, 0x02); + smtc_seqw(0x21, (smtc_seqr(0x21) & 0x77)); + smtc_seqw(0x22, (smtc_seqr(0x22) & (~0x30))); +- smtc_seqw(0x23, (smtc_seqr(0x23) & (~0xc0))); +- smtc_seqw(0x24, (smtc_seqr(0x24) | 0x01)); + smtc_seqw(0x31, (smtc_seqr(0x31) | 0x03)); ++ smtc_seqw(0x24, (smtc_seqr(0x24) | 0x01)); + break; + case FB_BLANK_NORMAL: + /* Screen Off: HSync: On, VSync : On Soft blank */ ++ smtc_seqw(0x24, (smtc_seqr(0x24) | 0x01)); ++ smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); ++ smtc_seqw(0x23, (smtc_seqr(0x23) & (~0xc0))); + smtc_seqw(0x01, (smtc_seqr(0x01) & (~0x20))); ++ smtc_seqw(0x22, (smtc_seqr(0x22) & (~0x30))); + smtc_seqw(0x6a, 0x16); + smtc_seqw(0x6b, 0x02); +- smtc_seqw(0x22, (smtc_seqr(0x22) & (~0x30))); +- smtc_seqw(0x23, (smtc_seqr(0x23) & (~0xc0))); +- smtc_seqw(0x24, (smtc_seqr(0x24) | 0x01)); +- smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); + break; + case FB_BLANK_VSYNC_SUSPEND: + /* Screen On: HSync: On, VSync : Off */ ++ smtc_seqw(0x24, (smtc_seqr(0x24) & (~0x01))); ++ smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); ++ smtc_seqw(0x23, ((smtc_seqr(0x23) & (~0xc0)) | 0x20)); + smtc_seqw(0x01, (smtc_seqr(0x01) | 0x20)); +- smtc_seqw(0x20, (smtc_seqr(0x20) & (~0xB0))); +- smtc_seqw(0x6a, 0x0c); +- smtc_seqw(0x6b, 0x02); + smtc_seqw(0x21, (smtc_seqr(0x21) | 0x88)); ++ smtc_seqw(0x20, (smtc_seqr(0x20) & (~0xB0))); + smtc_seqw(0x22, ((smtc_seqr(0x22) & (~0x30)) | 0x20)); +- smtc_seqw(0x23, ((smtc_seqr(0x23) & (~0xc0)) | 0x20)); +- smtc_seqw(0x24, (smtc_seqr(0x24) & (~0x01))); +- smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); + smtc_seqw(0x34, (smtc_seqr(0x34) | 0x80)); ++ smtc_seqw(0x6a, 0x0c); ++ smtc_seqw(0x6b, 0x02); + break; + case FB_BLANK_HSYNC_SUSPEND: + /* Screen On: HSync: Off, VSync : On */ ++ smtc_seqw(0x24, (smtc_seqr(0x24) & (~0x01))); ++ smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); ++ smtc_seqw(0x23, ((smtc_seqr(0x23) & (~0xc0)) | 0xD8)); + smtc_seqw(0x01, (smtc_seqr(0x01) | 0x20)); +- smtc_seqw(0x20, (smtc_seqr(0x20) & (~0xB0))); +- smtc_seqw(0x6a, 0x0c); +- smtc_seqw(0x6b, 0x02); + smtc_seqw(0x21, (smtc_seqr(0x21) | 0x88)); ++ smtc_seqw(0x20, (smtc_seqr(0x20) & (~0xB0))); + smtc_seqw(0x22, ((smtc_seqr(0x22) & (~0x30)) | 0x10)); +- smtc_seqw(0x23, ((smtc_seqr(0x23) & (~0xc0)) | 0xD8)); +- smtc_seqw(0x24, (smtc_seqr(0x24) & (~0x01))); +- smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); + smtc_seqw(0x34, (smtc_seqr(0x34) | 0x80)); ++ smtc_seqw(0x6a, 0x0c); ++ smtc_seqw(0x6b, 0x02); + break; + case FB_BLANK_POWERDOWN: + /* Screen On: HSync: Off, VSync : Off */ ++ smtc_seqw(0x24, (smtc_seqr(0x24) & (~0x01))); ++ smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); ++ smtc_seqw(0x23, ((smtc_seqr(0x23) & (~0xc0)) | 0xD8)); + smtc_seqw(0x01, (smtc_seqr(0x01) | 0x20)); +- smtc_seqw(0x20, (smtc_seqr(0x20) & (~0xB0))); +- smtc_seqw(0x6a, 0x0c); +- smtc_seqw(0x6b, 0x02); + smtc_seqw(0x21, (smtc_seqr(0x21) | 0x88)); ++ smtc_seqw(0x20, (smtc_seqr(0x20) & (~0xB0))); + smtc_seqw(0x22, ((smtc_seqr(0x22) & (~0x30)) | 0x30)); +- smtc_seqw(0x23, ((smtc_seqr(0x23) & (~0xc0)) | 0xD8)); +- smtc_seqw(0x24, (smtc_seqr(0x24) & (~0x01))); +- smtc_seqw(0x31, ((smtc_seqr(0x31) & (~0x07)) | 0x00)); + smtc_seqw(0x34, (smtc_seqr(0x34) | 0x80)); ++ smtc_seqw(0x6a, 0x0c); ++ smtc_seqw(0x6b, 0x02); + break; + default: + return -EINVAL; +@@ -1145,8 +1217,10 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb) + + /* init SEQ register SR30 - SR75 */ + for (i = 0; i < SIZE_SR30_SR75; i++) +- if ((i + 0x30) != 0x62 && (i + 0x30) != 0x6a && +- (i + 0x30) != 0x6b) ++ if ((i + 0x30) != 0x30 && (i + 0x30) != 0x62 && ++ (i + 0x30) != 0x6a && (i + 0x30) != 0x6b && ++ (i + 0x30) != 0x70 && (i + 0x30) != 0x71 && ++ (i + 0x30) != 0x74 && (i + 0x30) != 0x75) + smtc_seqw(i + 0x30, + vgamode[j].init_sr30_sr75[i]); + +@@ -1171,8 +1245,12 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb) + smtc_crtcw(i, vgamode[j].init_cr00_cr18[i]); + + /* init CRTC register CR30 - CR4D */ +- for (i = 0; i < SIZE_CR30_CR4D; i++) ++ for (i = 0; i < SIZE_CR30_CR4D; i++) { ++ if ((i + 0x30) >= 0x3B && (i + 0x30) <= 0x3F) ++ /* side-effect, don't write to CR3B-CR3F */ ++ continue; + smtc_crtcw(i + 0x30, vgamode[j].init_cr30_cr4d[i]); ++ } + + /* init CRTC register CR90 - CRA7 */ + for (i = 0; i < SIZE_CR90_CRA7; i++) +@@ -1323,6 +1401,11 @@ static int smtc_map_smem(struct smtcfb_info *sfb, + { + sfb->fb->fix.smem_start = pci_resource_start(pdev, 0); + ++ if (sfb->chip_id == 0x720) ++ /* on SM720, the framebuffer starts at the 1 MB offset */ ++ sfb->fb->fix.smem_start += 0x00200000; ++ ++ /* XXX: is it safe for SM720 on Big-Endian? */ + if (sfb->fb->var.bits_per_pixel == 32) + sfb->fb->fix.smem_start += big_addr; + +@@ -1360,12 +1443,82 @@ static inline void sm7xx_init_hw(void) + outb_p(0x11, 0x3c5); + } + ++static u_long sm7xx_vram_probe(struct smtcfb_info *sfb) ++{ ++ u8 vram; ++ ++ switch (sfb->chip_id) { ++ case 0x710: ++ case 0x712: ++ /* ++ * Assume SM712 graphics chip has 4MB VRAM. ++ * ++ * FIXME: SM712 can have 2MB VRAM, which is used on earlier ++ * laptops, such as IBM Thinkpad 240X. This driver would ++ * probably crash on those machines. If anyone gets one of ++ * those and is willing to help, run "git blame" and send me ++ * an E-mail. ++ */ ++ return 0x00400000; ++ case 0x720: ++ outb_p(0x76, 0x3c4); ++ vram = inb_p(0x3c5) >> 6; ++ ++ if (vram == 0x00) ++ return 0x00800000; /* 8 MB */ ++ else if (vram == 0x01) ++ return 0x01000000; /* 16 MB */ ++ else if (vram == 0x02) ++ return 0x00400000; /* illegal, fallback to 4 MB */ ++ else if (vram == 0x03) ++ return 0x00400000; /* 4 MB */ ++ } ++ return 0; /* unknown hardware */ ++} ++ ++static void sm7xx_resolution_probe(struct smtcfb_info *sfb) ++{ ++ /* get mode parameter from smtc_scr_info */ ++ if (smtc_scr_info.lfb_width != 0) { ++ sfb->fb->var.xres = smtc_scr_info.lfb_width; ++ sfb->fb->var.yres = smtc_scr_info.lfb_height; ++ sfb->fb->var.bits_per_pixel = smtc_scr_info.lfb_depth; ++ goto final; ++ } ++ ++ /* ++ * No parameter, default resolution is 1024x768-16. ++ * ++ * FIXME: earlier laptops, such as IBM Thinkpad 240X, has a 800x600 ++ * panel, also see the comments about Thinkpad 240X above. ++ */ ++ sfb->fb->var.xres = SCREEN_X_RES; ++ sfb->fb->var.yres = SCREEN_Y_RES_PC; ++ sfb->fb->var.bits_per_pixel = SCREEN_BPP; ++ ++#ifdef CONFIG_MIPS ++ /* ++ * Loongson MIPS netbooks use 1024x600 LCD panels, which is the original ++ * target platform of this driver, but nearly all old x86 laptops have ++ * 1024x768. Lighting 768 panels using 600's timings would partially ++ * garble the display, so we don't want that. But it's not possible to ++ * distinguish them reliably. ++ * ++ * So we change the default to 768, but keep 600 as-is on MIPS. ++ */ ++ sfb->fb->var.yres = SCREEN_Y_RES_NETBOOK; ++#endif ++ ++final: ++ big_pixel_depth(sfb->fb->var.bits_per_pixel, smtc_scr_info.lfb_depth); ++} ++ + static int smtcfb_pci_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) + { + struct smtcfb_info *sfb; + struct fb_info *info; +- u_long smem_size = 0x00800000; /* default 8MB */ ++ u_long smem_size; + int err; + unsigned long mmio_base; + +@@ -1405,29 +1558,19 @@ static int smtcfb_pci_probe(struct pci_dev *pdev, + + sm7xx_init_hw(); + +- /* get mode parameter from smtc_scr_info */ +- if (smtc_scr_info.lfb_width != 0) { +- sfb->fb->var.xres = smtc_scr_info.lfb_width; +- sfb->fb->var.yres = smtc_scr_info.lfb_height; +- sfb->fb->var.bits_per_pixel = smtc_scr_info.lfb_depth; +- } else { +- /* default resolution 1024x600 16bit mode */ +- sfb->fb->var.xres = SCREEN_X_RES; +- sfb->fb->var.yres = SCREEN_Y_RES; +- sfb->fb->var.bits_per_pixel = SCREEN_BPP; +- } +- +- big_pixel_depth(sfb->fb->var.bits_per_pixel, smtc_scr_info.lfb_depth); + /* Map address and memory detection */ + mmio_base = pci_resource_start(pdev, 0); + pci_read_config_byte(pdev, PCI_REVISION_ID, &sfb->chip_rev_id); + ++ smem_size = sm7xx_vram_probe(sfb); ++ dev_info(&pdev->dev, "%lu MiB of VRAM detected.\n", ++ smem_size / 1048576); ++ + switch (sfb->chip_id) { + case 0x710: + case 0x712: + sfb->fb->fix.mmio_start = mmio_base + 0x00400000; + sfb->fb->fix.mmio_len = 0x00400000; +- smem_size = SM712_VIDEOMEMORYSIZE; + sfb->lfb = ioremap(mmio_base, mmio_addr); + if (!sfb->lfb) { + dev_err(&pdev->dev, +@@ -1459,8 +1602,7 @@ static int smtcfb_pci_probe(struct pci_dev *pdev, + case 0x720: + sfb->fb->fix.mmio_start = mmio_base; + sfb->fb->fix.mmio_len = 0x00200000; +- smem_size = SM722_VIDEOMEMORYSIZE; +- sfb->dp_regs = ioremap(mmio_base, 0x00a00000); ++ sfb->dp_regs = ioremap(mmio_base, 0x00200000 + smem_size); + sfb->lfb = sfb->dp_regs + 0x00200000; + sfb->mmio = (smtc_regbaseaddress = + sfb->dp_regs + 0x000c0000); +@@ -1477,6 +1619,9 @@ static int smtcfb_pci_probe(struct pci_dev *pdev, + goto failed_fb; + } + ++ /* probe and decide resolution */ ++ sm7xx_resolution_probe(sfb); ++ + /* can support 32 bpp */ + if (sfb->fb->var.bits_per_pixel == 15) + sfb->fb->var.bits_per_pixel = 16; +@@ -1487,7 +1632,11 @@ static int smtcfb_pci_probe(struct pci_dev *pdev, + if (err) + goto failed; + +- smtcfb_setmode(sfb); ++ /* ++ * The screen would be temporarily garbled when sm712fb takes over ++ * vesafb or VGA text mode. Zero the framebuffer. ++ */ ++ memset_io(sfb->lfb, 0, sfb->fb->fix.smem_len); + + err = register_framebuffer(info); + if (err < 0) +diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c +index 1d034dddc556..5a0d6fb02bbc 100644 +--- a/drivers/video/fbdev/udlfb.c ++++ b/drivers/video/fbdev/udlfb.c +@@ -594,8 +594,7 @@ static int dlfb_render_hline(struct dlfb_data *dlfb, struct urb **urb_ptr, + return 0; + } + +-static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, +- int width, int height, char *data) ++static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, int width, int height) + { + int i, ret; + char *cmd; +@@ -607,21 +606,29 @@ static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, + + start_cycles = get_cycles(); + ++ mutex_lock(&dlfb->render_mutex); ++ + aligned_x = DL_ALIGN_DOWN(x, sizeof(unsigned long)); + width = DL_ALIGN_UP(width + (x-aligned_x), sizeof(unsigned long)); + x = aligned_x; + + if ((width <= 0) || + (x + width > dlfb->info->var.xres) || +- (y + height > dlfb->info->var.yres)) +- return -EINVAL; ++ (y + height > dlfb->info->var.yres)) { ++ ret = -EINVAL; ++ goto unlock_ret; ++ } + +- if (!atomic_read(&dlfb->usb_active)) +- return 0; ++ if (!atomic_read(&dlfb->usb_active)) { ++ ret = 0; ++ goto unlock_ret; ++ } + + urb = dlfb_get_urb(dlfb); +- if (!urb) +- return 0; ++ if (!urb) { ++ ret = 0; ++ goto unlock_ret; ++ } + cmd = urb->transfer_buffer; + + for (i = y; i < y + height ; i++) { +@@ -641,7 +648,7 @@ static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, + *cmd++ = 0xAF; + /* Send partial buffer remaining before exiting */ + len = cmd - (char *) urb->transfer_buffer; +- ret = dlfb_submit_urb(dlfb, urb, len); ++ dlfb_submit_urb(dlfb, urb, len); + bytes_sent += len; + } else + dlfb_urb_completion(urb); +@@ -655,7 +662,55 @@ error: + >> 10)), /* Kcycles */ + &dlfb->cpu_kcycles_used); + +- return 0; ++ ret = 0; ++ ++unlock_ret: ++ mutex_unlock(&dlfb->render_mutex); ++ return ret; ++} ++ ++static void dlfb_init_damage(struct dlfb_data *dlfb) ++{ ++ dlfb->damage_x = INT_MAX; ++ dlfb->damage_x2 = 0; ++ dlfb->damage_y = INT_MAX; ++ dlfb->damage_y2 = 0; ++} ++ ++static void dlfb_damage_work(struct work_struct *w) ++{ ++ struct dlfb_data *dlfb = container_of(w, struct dlfb_data, damage_work); ++ int x, x2, y, y2; ++ ++ spin_lock_irq(&dlfb->damage_lock); ++ x = dlfb->damage_x; ++ x2 = dlfb->damage_x2; ++ y = dlfb->damage_y; ++ y2 = dlfb->damage_y2; ++ dlfb_init_damage(dlfb); ++ spin_unlock_irq(&dlfb->damage_lock); ++ ++ if (x < x2 && y < y2) ++ dlfb_handle_damage(dlfb, x, y, x2 - x, y2 - y); ++} ++ ++static void dlfb_offload_damage(struct dlfb_data *dlfb, int x, int y, int width, int height) ++{ ++ unsigned long flags; ++ int x2 = x + width; ++ int y2 = y + height; ++ ++ if (x >= x2 || y >= y2) ++ return; ++ ++ spin_lock_irqsave(&dlfb->damage_lock, flags); ++ dlfb->damage_x = min(x, dlfb->damage_x); ++ dlfb->damage_x2 = max(x2, dlfb->damage_x2); ++ dlfb->damage_y = min(y, dlfb->damage_y); ++ dlfb->damage_y2 = max(y2, dlfb->damage_y2); ++ spin_unlock_irqrestore(&dlfb->damage_lock, flags); ++ ++ schedule_work(&dlfb->damage_work); + } + + /* +@@ -679,7 +734,7 @@ static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf, + (u32)info->var.yres); + + dlfb_handle_damage(dlfb, 0, start, info->var.xres, +- lines, info->screen_base); ++ lines); + } + + return result; +@@ -694,8 +749,8 @@ static void dlfb_ops_copyarea(struct fb_info *info, + + sys_copyarea(info, area); + +- dlfb_handle_damage(dlfb, area->dx, area->dy, +- area->width, area->height, info->screen_base); ++ dlfb_offload_damage(dlfb, area->dx, area->dy, ++ area->width, area->height); + } + + static void dlfb_ops_imageblit(struct fb_info *info, +@@ -705,8 +760,8 @@ static void dlfb_ops_imageblit(struct fb_info *info, + + sys_imageblit(info, image); + +- dlfb_handle_damage(dlfb, image->dx, image->dy, +- image->width, image->height, info->screen_base); ++ dlfb_offload_damage(dlfb, image->dx, image->dy, ++ image->width, image->height); + } + + static void dlfb_ops_fillrect(struct fb_info *info, +@@ -716,8 +771,8 @@ static void dlfb_ops_fillrect(struct fb_info *info, + + sys_fillrect(info, rect); + +- dlfb_handle_damage(dlfb, rect->dx, rect->dy, rect->width, +- rect->height, info->screen_base); ++ dlfb_offload_damage(dlfb, rect->dx, rect->dy, rect->width, ++ rect->height); + } + + /* +@@ -739,17 +794,19 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, + int bytes_identical = 0; + int bytes_rendered = 0; + ++ mutex_lock(&dlfb->render_mutex); ++ + if (!fb_defio) +- return; ++ goto unlock_ret; + + if (!atomic_read(&dlfb->usb_active)) +- return; ++ goto unlock_ret; + + start_cycles = get_cycles(); + + urb = dlfb_get_urb(dlfb); + if (!urb) +- return; ++ goto unlock_ret; + + cmd = urb->transfer_buffer; + +@@ -782,6 +839,8 @@ error: + atomic_add(((unsigned int) ((end_cycles - start_cycles) + >> 10)), /* Kcycles */ + &dlfb->cpu_kcycles_used); ++unlock_ret: ++ mutex_unlock(&dlfb->render_mutex); + } + + static int dlfb_get_edid(struct dlfb_data *dlfb, char *edid, int len) +@@ -859,8 +918,7 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd, + if (area.y > info->var.yres) + area.y = info->var.yres; + +- dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h, +- info->screen_base); ++ dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h); + } + + return 0; +@@ -942,6 +1000,10 @@ static void dlfb_ops_destroy(struct fb_info *info) + { + struct dlfb_data *dlfb = info->par; + ++ cancel_work_sync(&dlfb->damage_work); ++ ++ mutex_destroy(&dlfb->render_mutex); ++ + if (info->cmap.len != 0) + fb_dealloc_cmap(&info->cmap); + if (info->monspecs.modedb) +@@ -1065,8 +1127,7 @@ static int dlfb_ops_set_par(struct fb_info *info) + pix_framebuffer[i] = 0x37e6; + } + +- dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres, +- info->screen_base); ++ dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres); + + return 0; + } +@@ -1639,6 +1700,11 @@ static int dlfb_usb_probe(struct usb_interface *intf, + dlfb->ops = dlfb_ops; + info->fbops = &dlfb->ops; + ++ mutex_init(&dlfb->render_mutex); ++ dlfb_init_damage(dlfb); ++ spin_lock_init(&dlfb->damage_lock); ++ INIT_WORK(&dlfb->damage_work, dlfb_damage_work); ++ + INIT_LIST_HEAD(&info->modelist); + + if (!dlfb_alloc_urb_list(dlfb, WRITES_IN_FLIGHT, MAX_TRANSFER)) { +diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c +index ddf028509931..351fa506dc9b 100644 +--- a/fs/btrfs/relocation.c ++++ b/fs/btrfs/relocation.c +@@ -4667,14 +4667,12 @@ int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans, + void btrfs_reloc_pre_snapshot(struct btrfs_pending_snapshot *pending, + u64 *bytes_to_reserve) + { +- struct btrfs_root *root; +- struct reloc_control *rc; ++ struct btrfs_root *root = pending->root; ++ struct reloc_control *rc = root->fs_info->reloc_ctl; + +- root = pending->root; +- if (!root->reloc_root) ++ if (!root->reloc_root || !rc) + return; + +- rc = root->fs_info->reloc_ctl; + if (!rc->merge_reloc_tree) + return; + +@@ -4703,10 +4701,10 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans, + struct btrfs_root *root = pending->root; + struct btrfs_root *reloc_root; + struct btrfs_root *new_root; +- struct reloc_control *rc; ++ struct reloc_control *rc = root->fs_info->reloc_ctl; + int ret; + +- if (!root->reloc_root) ++ if (!root->reloc_root || !rc) + return 0; + + rc = root->fs_info->reloc_ctl; +diff --git a/fs/ceph/super.c b/fs/ceph/super.c +index 6d5bb2f74612..01113c86e469 100644 +--- a/fs/ceph/super.c ++++ b/fs/ceph/super.c +@@ -845,6 +845,12 @@ static void ceph_umount_begin(struct super_block *sb) + return; + } + ++static int ceph_remount(struct super_block *sb, int *flags, char *data) ++{ ++ sync_filesystem(sb); ++ return 0; ++} ++ + static const struct super_operations ceph_super_ops = { + .alloc_inode = ceph_alloc_inode, + .destroy_inode = ceph_destroy_inode, +@@ -852,6 +858,7 @@ static const struct super_operations ceph_super_ops = { + .drop_inode = ceph_drop_inode, + .sync_fs = ceph_sync_fs, + .put_super = ceph_put_super, ++ .remount_fs = ceph_remount, + .show_options = ceph_show_options, + .statfs = ceph_statfs, + .umount_begin = ceph_umount_begin, +diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h +index 585ad3207cb1..607468948f72 100644 +--- a/fs/cifs/cifsglob.h ++++ b/fs/cifs/cifsglob.h +@@ -1687,6 +1687,7 @@ static inline bool is_retryable_error(int error) + + #define CIFS_HAS_CREDITS 0x0400 /* already has credits */ + #define CIFS_TRANSFORM_REQ 0x0800 /* transform request before sending */ ++#define CIFS_NO_SRV_RSP 0x1000 /* there is no server response */ + + /* Security Flags: indicate type of session setup needed */ + #define CIFSSEC_MAY_SIGN 0x00001 +diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c +index f43747c062a7..6050851edcb8 100644 +--- a/fs/cifs/cifssmb.c ++++ b/fs/cifs/cifssmb.c +@@ -2540,7 +2540,7 @@ CIFSSMBLock(const unsigned int xid, struct cifs_tcon *tcon, + + if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) { + /* no response expected */ +- flags = CIFS_ASYNC_OP | CIFS_OBREAK_OP; ++ flags = CIFS_NO_SRV_RSP | CIFS_ASYNC_OP | CIFS_OBREAK_OP; + pSMB->Timeout = 0; + } else if (waitFlag) { + flags = CIFS_BLOCKING_OP; /* blocking operation, no timeout */ +diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c +index c36ff0d1fe2a..aa61dcf471b3 100644 +--- a/fs/cifs/smb2ops.c ++++ b/fs/cifs/smb2ops.c +@@ -2917,26 +2917,28 @@ smb21_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock, + unsigned int epoch, bool *purge_cache) + { + char message[5] = {0}; ++ unsigned int new_oplock = 0; + + oplock &= 0xFF; + if (oplock == SMB2_OPLOCK_LEVEL_NOCHANGE) + return; + +- cinode->oplock = 0; + if (oplock & SMB2_LEASE_READ_CACHING_HE) { +- cinode->oplock |= CIFS_CACHE_READ_FLG; ++ new_oplock |= CIFS_CACHE_READ_FLG; + strcat(message, "R"); + } + if (oplock & SMB2_LEASE_HANDLE_CACHING_HE) { +- cinode->oplock |= CIFS_CACHE_HANDLE_FLG; ++ new_oplock |= CIFS_CACHE_HANDLE_FLG; + strcat(message, "H"); + } + if (oplock & SMB2_LEASE_WRITE_CACHING_HE) { +- cinode->oplock |= CIFS_CACHE_WRITE_FLG; ++ new_oplock |= CIFS_CACHE_WRITE_FLG; + strcat(message, "W"); + } +- if (!cinode->oplock) +- strcat(message, "None"); ++ if (!new_oplock) ++ strncpy(message, "None", sizeof(message)); ++ ++ cinode->oplock = new_oplock; + cifs_dbg(FYI, "%s Lease granted on inode %p\n", message, + &cinode->vfs_inode); + } +diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c +index 1de8e996e566..72e242c49ca1 100644 +--- a/fs/cifs/transport.c ++++ b/fs/cifs/transport.c +@@ -1054,8 +1054,11 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, + + mutex_unlock(&ses->server->srv_mutex); + +- if (rc < 0) { +- /* Sending failed for some reason - return credits back */ ++ /* ++ * If sending failed for some reason or it is an oplock break that we ++ * will not receive a response to - return credits back ++ */ ++ if (rc < 0 || (flags & CIFS_NO_SRV_RSP)) { + for (i = 0; i < num_rqst; i++) + add_credits(ses->server, &credits[i], optype); + goto out; +@@ -1076,9 +1079,6 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, + smb311_update_preauth_hash(ses, rqst[0].rq_iov, + rqst[0].rq_nvec); + +- if ((flags & CIFS_TIMEOUT_MASK) == CIFS_ASYNC_OP) +- goto out; +- + for (i = 0; i < num_rqst; i++) { + rc = wait_for_response(ses->server, midQ[i]); + if (rc != 0) +diff --git a/fs/dcache.c b/fs/dcache.c +index aac41adf4743..c663c602f9ef 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -344,7 +344,7 @@ static void dentry_free(struct dentry *dentry) + } + } + /* if dentry was never visible to RCU, immediate free is OK */ +- if (!(dentry->d_flags & DCACHE_RCUACCESS)) ++ if (dentry->d_flags & DCACHE_NORCU) + __d_free(&dentry->d_u.d_rcu); + else + call_rcu(&dentry->d_u.d_rcu, __d_free); +@@ -1701,7 +1701,6 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name) + struct dentry *dentry = __d_alloc(parent->d_sb, name); + if (!dentry) + return NULL; +- dentry->d_flags |= DCACHE_RCUACCESS; + spin_lock(&parent->d_lock); + /* + * don't need child lock because it is not subject +@@ -1726,7 +1725,7 @@ struct dentry *d_alloc_cursor(struct dentry * parent) + { + struct dentry *dentry = d_alloc_anon(parent->d_sb); + if (dentry) { +- dentry->d_flags |= DCACHE_RCUACCESS | DCACHE_DENTRY_CURSOR; ++ dentry->d_flags |= DCACHE_DENTRY_CURSOR; + dentry->d_parent = dget(parent); + } + return dentry; +@@ -1739,10 +1738,17 @@ struct dentry *d_alloc_cursor(struct dentry * parent) + * + * For a filesystem that just pins its dentries in memory and never + * performs lookups at all, return an unhashed IS_ROOT dentry. ++ * This is used for pipes, sockets et.al. - the stuff that should ++ * never be anyone's children or parents. Unlike all other ++ * dentries, these will not have RCU delay between dropping the ++ * last reference and freeing them. + */ + struct dentry *d_alloc_pseudo(struct super_block *sb, const struct qstr *name) + { +- return __d_alloc(sb, name); ++ struct dentry *dentry = __d_alloc(sb, name); ++ if (likely(dentry)) ++ dentry->d_flags |= DCACHE_NORCU; ++ return dentry; + } + EXPORT_SYMBOL(d_alloc_pseudo); + +@@ -1911,12 +1917,10 @@ struct dentry *d_make_root(struct inode *root_inode) + + if (root_inode) { + res = d_alloc_anon(root_inode->i_sb); +- if (res) { +- res->d_flags |= DCACHE_RCUACCESS; ++ if (res) + d_instantiate(res, root_inode); +- } else { ++ else + iput(root_inode); +- } + } + return res; + } +@@ -2781,9 +2785,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target, + copy_name(dentry, target); + target->d_hash.pprev = NULL; + dentry->d_parent->d_lockref.count++; +- if (dentry == old_parent) +- dentry->d_flags |= DCACHE_RCUACCESS; +- else ++ if (dentry != old_parent) /* wasn't IS_ROOT */ + WARN_ON(!--old_parent->d_lockref.count); + } else { + target->d_parent = old_parent; +diff --git a/fs/fuse/file.c b/fs/fuse/file.c +index 06096b60f1df..92ee15dda4c7 100644 +--- a/fs/fuse/file.c ++++ b/fs/fuse/file.c +@@ -178,7 +178,9 @@ void fuse_finish_open(struct inode *inode, struct file *file) + + if (!(ff->open_flags & FOPEN_KEEP_CACHE)) + invalidate_inode_pages2(inode->i_mapping); +- if (ff->open_flags & FOPEN_NONSEEKABLE) ++ if (ff->open_flags & FOPEN_STREAM) ++ stream_open(inode, file); ++ else if (ff->open_flags & FOPEN_NONSEEKABLE) + nonseekable_open(inode, file); + if (fc->atomic_o_trunc && (file->f_flags & O_TRUNC)) { + struct fuse_inode *fi = get_fuse_inode(inode); +@@ -1586,7 +1588,7 @@ __acquires(fi->lock) + { + struct fuse_conn *fc = get_fuse_conn(inode); + struct fuse_inode *fi = get_fuse_inode(inode); +- size_t crop = i_size_read(inode); ++ loff_t crop = i_size_read(inode); + struct fuse_req *req; + + while (fi->writectr >= 0 && !list_empty(&fi->queued_writes)) { +@@ -3044,6 +3046,13 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, + } + } + ++ if (!(mode & FALLOC_FL_KEEP_SIZE) && ++ offset + length > i_size_read(inode)) { ++ err = inode_newsize_ok(inode, offset + length); ++ if (err) ++ return err; ++ } ++ + if (!(mode & FALLOC_FL_KEEP_SIZE)) + set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state); + +diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c +index 61f46facb39c..b3e8ba3bd654 100644 +--- a/fs/nfs/filelayout/filelayout.c ++++ b/fs/nfs/filelayout/filelayout.c +@@ -904,7 +904,7 @@ fl_pnfs_update_layout(struct inode *ino, + status = filelayout_check_deviceid(lo, fl, gfp_flags); + if (status) { + pnfs_put_lseg(lseg); +- lseg = ERR_PTR(status); ++ lseg = NULL; + } + out: + return lseg; +diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c +index 3de36479ed7a..f502f1c054cf 100644 +--- a/fs/nfs/nfs4state.c ++++ b/fs/nfs/nfs4state.c +@@ -159,6 +159,10 @@ int nfs40_discover_server_trunking(struct nfs_client *clp, + /* Sustain the lease, even if it's empty. If the clientid4 + * goes stale it's of no use for trunking discovery. */ + nfs4_schedule_state_renewal(*result); ++ ++ /* If the client state need to recover, do it. */ ++ if (clp->cl_state) ++ nfs4_schedule_state_manager(clp); + } + out: + return status; +diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c +index df06f3da166c..e8d3f349b7f2 100644 +--- a/fs/notify/fsnotify.c ++++ b/fs/notify/fsnotify.c +@@ -107,6 +107,47 @@ void fsnotify_sb_delete(struct super_block *sb) + fsnotify_clear_marks_by_sb(sb); + } + ++/* ++ * fsnotify_nameremove - a filename was removed from a directory ++ * ++ * This is mostly called under parent vfs inode lock so name and ++ * dentry->d_parent should be stable. However there are some corner cases where ++ * inode lock is not held. So to be on the safe side and be reselient to future ++ * callers and out of tree users of d_delete(), we do not assume that d_parent ++ * and d_name are stable and we use dget_parent() and ++ * take_dentry_name_snapshot() to grab stable references. ++ */ ++void fsnotify_nameremove(struct dentry *dentry, int isdir) ++{ ++ struct dentry *parent; ++ struct name_snapshot name; ++ __u32 mask = FS_DELETE; ++ ++ /* d_delete() of pseudo inode? (e.g. __ns_get_path() playing tricks) */ ++ if (IS_ROOT(dentry)) ++ return; ++ ++ if (isdir) ++ mask |= FS_ISDIR; ++ ++ parent = dget_parent(dentry); ++ /* Avoid unneeded take_dentry_name_snapshot() */ ++ if (!(d_inode(parent)->i_fsnotify_mask & FS_DELETE) && ++ !(dentry->d_sb->s_fsnotify_mask & FS_DELETE)) ++ goto out_dput; ++ ++ take_dentry_name_snapshot(&name, dentry); ++ ++ fsnotify(d_inode(parent), mask, d_inode(dentry), FSNOTIFY_EVENT_INODE, ++ name.name, 0); ++ ++ release_dentry_name_snapshot(&name); ++ ++out_dput: ++ dput(parent); ++} ++EXPORT_SYMBOL(fsnotify_nameremove); ++ + /* + * Given an inode, first check if we care what happens to our children. Inotify + * and dnotify both tell their parents about events. If we care about any event +diff --git a/fs/nsfs.c b/fs/nsfs.c +index 60702d677bd4..30d150a4f0c6 100644 +--- a/fs/nsfs.c ++++ b/fs/nsfs.c +@@ -85,13 +85,12 @@ slow: + inode->i_fop = &ns_file_operations; + inode->i_private = ns; + +- dentry = d_alloc_pseudo(mnt->mnt_sb, &empty_name); ++ dentry = d_alloc_anon(mnt->mnt_sb); + if (!dentry) { + iput(inode); + return ERR_PTR(-ENOMEM); + } + d_instantiate(dentry, inode); +- dentry->d_flags |= DCACHE_RCUACCESS; + dentry->d_fsdata = (void *)ns->ops; + d = atomic_long_cmpxchg(&ns->stashed, 0, (unsigned long)dentry); + if (d) { +diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c +index 68b3303e4b46..56feaa739979 100644 +--- a/fs/overlayfs/copy_up.c ++++ b/fs/overlayfs/copy_up.c +@@ -909,14 +909,14 @@ static bool ovl_open_need_copy_up(struct dentry *dentry, int flags) + return true; + } + +-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags) ++int ovl_maybe_copy_up(struct dentry *dentry, int flags) + { + int err = 0; + +- if (ovl_open_need_copy_up(dentry, file_flags)) { ++ if (ovl_open_need_copy_up(dentry, flags)) { + err = ovl_want_write(dentry); + if (!err) { +- err = ovl_copy_up_flags(dentry, file_flags); ++ err = ovl_copy_up_flags(dentry, flags); + ovl_drop_write(dentry); + } + } +diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c +index 84dd957efa24..50e4407398d8 100644 +--- a/fs/overlayfs/file.c ++++ b/fs/overlayfs/file.c +@@ -116,11 +116,10 @@ static int ovl_real_fdget(const struct file *file, struct fd *real) + + static int ovl_open(struct inode *inode, struct file *file) + { +- struct dentry *dentry = file_dentry(file); + struct file *realfile; + int err; + +- err = ovl_open_maybe_copy_up(dentry, file->f_flags); ++ err = ovl_maybe_copy_up(file_dentry(file), file->f_flags); + if (err) + return err; + +@@ -390,7 +389,7 @@ static long ovl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) + if (ret) + return ret; + +- ret = ovl_copy_up_with_data(file_dentry(file)); ++ ret = ovl_maybe_copy_up(file_dentry(file), O_WRONLY); + if (!ret) { + ret = ovl_real_ioctl(file, cmd, arg); + +diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h +index 9c6018287d57..d26efed9f80a 100644 +--- a/fs/overlayfs/overlayfs.h ++++ b/fs/overlayfs/overlayfs.h +@@ -421,7 +421,7 @@ extern const struct file_operations ovl_file_operations; + int ovl_copy_up(struct dentry *dentry); + int ovl_copy_up_with_data(struct dentry *dentry); + int ovl_copy_up_flags(struct dentry *dentry, int flags); +-int ovl_open_maybe_copy_up(struct dentry *dentry, unsigned int file_flags); ++int ovl_maybe_copy_up(struct dentry *dentry, int flags); + int ovl_copy_xattr(struct dentry *old, struct dentry *new); + int ovl_set_attr(struct dentry *upper, struct kstat *stat); + struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper); +diff --git a/fs/proc/base.c b/fs/proc/base.c +index 6a803a0b75df..0c9bef89ac43 100644 +--- a/fs/proc/base.c ++++ b/fs/proc/base.c +@@ -2540,6 +2540,11 @@ static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf, + rcu_read_unlock(); + return -EACCES; + } ++ /* Prevent changes to overridden credentials. */ ++ if (current_cred() != current_real_cred()) { ++ rcu_read_unlock(); ++ return -EBUSY; ++ } + rcu_read_unlock(); + + if (count > PAGE_SIZE) +diff --git a/include/asm-generic/mm_hooks.h b/include/asm-generic/mm_hooks.h +index 8ac4e68a12f0..6736ed2f632b 100644 +--- a/include/asm-generic/mm_hooks.h ++++ b/include/asm-generic/mm_hooks.h +@@ -18,7 +18,6 @@ static inline void arch_exit_mmap(struct mm_struct *mm) + } + + static inline void arch_unmap(struct mm_struct *mm, +- struct vm_area_struct *vma, + unsigned long start, unsigned long end) + { + } +diff --git a/include/linux/bpf.h b/include/linux/bpf.h +index 944ccc310201..ac721fc5f95e 100644 +--- a/include/linux/bpf.h ++++ b/include/linux/bpf.h +@@ -36,6 +36,7 @@ struct bpf_map_ops { + void (*map_free)(struct bpf_map *map); + int (*map_get_next_key)(struct bpf_map *map, void *key, void *next_key); + void (*map_release_uref)(struct bpf_map *map); ++ void *(*map_lookup_elem_sys_only)(struct bpf_map *map, void *key); + + /* funcs callable from userspace and from eBPF programs */ + void *(*map_lookup_elem)(struct bpf_map *map, void *key); +diff --git a/include/linux/dcache.h b/include/linux/dcache.h +index 60996e64c579..6e1e8e6602c6 100644 +--- a/include/linux/dcache.h ++++ b/include/linux/dcache.h +@@ -176,7 +176,6 @@ struct dentry_operations { + * typically using d_splice_alias. */ + + #define DCACHE_REFERENCED 0x00000040 /* Recently used, don't discard. */ +-#define DCACHE_RCUACCESS 0x00000080 /* Entry has ever been RCU-visible */ + + #define DCACHE_CANT_MOUNT 0x00000100 + #define DCACHE_GENOCIDE 0x00000200 +@@ -217,6 +216,7 @@ struct dentry_operations { + + #define DCACHE_PAR_LOOKUP 0x10000000 /* being looked up (with parent locked shared) */ + #define DCACHE_DENTRY_CURSOR 0x20000000 ++#define DCACHE_NORCU 0x40000000 /* No RCU delay for freeing */ + + extern seqlock_t rename_lock; + +diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h +index 09587e2860b5..e30d6132c633 100644 +--- a/include/linux/fsnotify.h ++++ b/include/linux/fsnotify.h +@@ -151,39 +151,6 @@ static inline void fsnotify_vfsmount_delete(struct vfsmount *mnt) + __fsnotify_vfsmount_delete(mnt); + } + +-/* +- * fsnotify_nameremove - a filename was removed from a directory +- * +- * This is mostly called under parent vfs inode lock so name and +- * dentry->d_parent should be stable. However there are some corner cases where +- * inode lock is not held. So to be on the safe side and be reselient to future +- * callers and out of tree users of d_delete(), we do not assume that d_parent +- * and d_name are stable and we use dget_parent() and +- * take_dentry_name_snapshot() to grab stable references. +- */ +-static inline void fsnotify_nameremove(struct dentry *dentry, int isdir) +-{ +- struct dentry *parent; +- struct name_snapshot name; +- __u32 mask = FS_DELETE; +- +- /* d_delete() of pseudo inode? (e.g. __ns_get_path() playing tricks) */ +- if (IS_ROOT(dentry)) +- return; +- +- if (isdir) +- mask |= FS_ISDIR; +- +- parent = dget_parent(dentry); +- take_dentry_name_snapshot(&name, dentry); +- +- fsnotify(d_inode(parent), mask, d_inode(dentry), FSNOTIFY_EVENT_INODE, +- name.name, 0); +- +- release_dentry_name_snapshot(&name); +- dput(parent); +-} +- + /* + * fsnotify_inoderemove - an inode is going away + */ +diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h +index dfc28fcb4de8..094b38f2d9a1 100644 +--- a/include/linux/fsnotify_backend.h ++++ b/include/linux/fsnotify_backend.h +@@ -355,6 +355,7 @@ extern int __fsnotify_parent(const struct path *path, struct dentry *dentry, __u + extern void __fsnotify_inode_delete(struct inode *inode); + extern void __fsnotify_vfsmount_delete(struct vfsmount *mnt); + extern void fsnotify_sb_delete(struct super_block *sb); ++extern void fsnotify_nameremove(struct dentry *dentry, int isdir); + extern u32 fsnotify_get_cookie(void); + + static inline int fsnotify_inode_watches_children(struct inode *inode) +@@ -524,6 +525,9 @@ static inline void __fsnotify_vfsmount_delete(struct vfsmount *mnt) + static inline void fsnotify_sb_delete(struct super_block *sb) + {} + ++static inline void fsnotify_nameremove(struct dentry *dentry, int isdir) ++{} ++ + static inline void fsnotify_update_flags(struct dentry *dentry) + {} + +diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h +index 0d0729648844..9ffc53acaec1 100644 +--- a/include/linux/mlx5/driver.h ++++ b/include/linux/mlx5/driver.h +@@ -681,7 +681,6 @@ struct mlx5_core_dev { + #endif + struct mlx5_clock clock; + struct mlx5_ib_clock_info *clock_info; +- struct page *clock_info_page; + struct mlx5_fw_tracer *tracer; + }; + +diff --git a/include/linux/of.h b/include/linux/of.h +index e240992e5cb6..074913002e39 100644 +--- a/include/linux/of.h ++++ b/include/linux/of.h +@@ -234,8 +234,8 @@ extern struct device_node *of_find_all_nodes(struct device_node *prev); + static inline u64 of_read_number(const __be32 *cell, int size) + { + u64 r = 0; +- while (size--) +- r = (r << 32) | be32_to_cpu(*(cell++)); ++ for (; size--; cell++) ++ r = (r << 32) | be32_to_cpu(*cell); + return r; + } + +diff --git a/include/linux/pci.h b/include/linux/pci.h +index 77448215ef5b..2c056a7a728a 100644 +--- a/include/linux/pci.h ++++ b/include/linux/pci.h +@@ -348,6 +348,8 @@ struct pci_dev { + unsigned int hotplug_user_indicators:1; /* SlotCtl indicators + controlled exclusively by + user sysfs */ ++ unsigned int clear_retrain_link:1; /* Need to clear Retrain Link ++ bit manually */ + unsigned int d3_delay; /* D3->D0 transition time in ms */ + unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */ + +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index 9027a8c4219f..20a4c2280308 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -1425,10 +1425,12 @@ static inline void skb_zcopy_clear(struct sk_buff *skb, bool zerocopy) + struct ubuf_info *uarg = skb_zcopy(skb); + + if (uarg) { +- if (uarg->callback == sock_zerocopy_callback) { ++ if (skb_zcopy_is_nouarg(skb)) { ++ /* no notification callback */ ++ } else if (uarg->callback == sock_zerocopy_callback) { + uarg->zerocopy = uarg->zerocopy && zerocopy; + sock_zerocopy_put(uarg); +- } else if (!skb_zcopy_is_nouarg(skb)) { ++ } else { + uarg->callback(uarg, zerocopy); + } + +@@ -2683,7 +2685,8 @@ static inline int skb_orphan_frags(struct sk_buff *skb, gfp_t gfp_mask) + { + if (likely(!skb_zcopy(skb))) + return 0; +- if (skb_uarg(skb)->callback == sock_zerocopy_callback) ++ if (!skb_zcopy_is_nouarg(skb) && ++ skb_uarg(skb)->callback == sock_zerocopy_callback) + return 0; + return skb_copy_ubufs(skb, gfp_mask); + } +diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h +index d035183c8d03..cc32b9d9ecec 100644 +--- a/include/net/flow_offload.h ++++ b/include/net/flow_offload.h +@@ -71,6 +71,8 @@ void flow_rule_match_eth_addrs(const struct flow_rule *rule, + struct flow_match_eth_addrs *out); + void flow_rule_match_vlan(const struct flow_rule *rule, + struct flow_match_vlan *out); ++void flow_rule_match_cvlan(const struct flow_rule *rule, ++ struct flow_match_vlan *out); + void flow_rule_match_ipv4_addrs(const struct flow_rule *rule, + struct flow_match_ipv4_addrs *out); + void flow_rule_match_ipv6_addrs(const struct flow_rule *rule, +diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h +index 84097010237c..b5e3add90e99 100644 +--- a/include/net/ip6_fib.h ++++ b/include/net/ip6_fib.h +@@ -171,7 +171,8 @@ struct fib6_info { + dst_nocount:1, + dst_nopolicy:1, + dst_host:1, +- unused:3; ++ fib6_destroying:1, ++ unused:2; + + struct fib6_nh fib6_nh; + struct rcu_head rcu; +diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h +index 2ac598614a8f..56a8fb4e1222 100644 +--- a/include/uapi/linux/fuse.h ++++ b/include/uapi/linux/fuse.h +@@ -229,11 +229,13 @@ struct fuse_file_lock { + * FOPEN_KEEP_CACHE: don't invalidate the data cache on open + * FOPEN_NONSEEKABLE: the file is not seekable + * FOPEN_CACHE_DIR: allow caching this directory ++ * FOPEN_STREAM: the file is stream-like (no file position at all) + */ + #define FOPEN_DIRECT_IO (1 << 0) + #define FOPEN_KEEP_CACHE (1 << 1) + #define FOPEN_NONSEEKABLE (1 << 2) + #define FOPEN_CACHE_DIR (1 << 3) ++#define FOPEN_STREAM (1 << 4) + + /** + * INIT request/reply flags +diff --git a/include/video/udlfb.h b/include/video/udlfb.h +index 7d09e54ae54e..58fb5732831a 100644 +--- a/include/video/udlfb.h ++++ b/include/video/udlfb.h +@@ -48,6 +48,13 @@ struct dlfb_data { + int base8; + u32 pseudo_palette[256]; + int blank_mode; /*one of FB_BLANK_ */ ++ struct mutex render_mutex; ++ int damage_x; ++ int damage_y; ++ int damage_x2; ++ int damage_y2; ++ spinlock_t damage_lock; ++ struct work_struct damage_work; + struct fb_ops ops; + /* blit-only rendering path metrics, exposed through sysfs */ + atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */ +diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c +index fed15cf94dca..f79b4aa0a4af 100644 +--- a/kernel/bpf/hashtab.c ++++ b/kernel/bpf/hashtab.c +@@ -527,18 +527,30 @@ static u32 htab_map_gen_lookup(struct bpf_map *map, struct bpf_insn *insn_buf) + return insn - insn_buf; + } + +-static void *htab_lru_map_lookup_elem(struct bpf_map *map, void *key) ++static __always_inline void *__htab_lru_map_lookup_elem(struct bpf_map *map, ++ void *key, const bool mark) + { + struct htab_elem *l = __htab_map_lookup_elem(map, key); + + if (l) { +- bpf_lru_node_set_ref(&l->lru_node); ++ if (mark) ++ bpf_lru_node_set_ref(&l->lru_node); + return l->key + round_up(map->key_size, 8); + } + + return NULL; + } + ++static void *htab_lru_map_lookup_elem(struct bpf_map *map, void *key) ++{ ++ return __htab_lru_map_lookup_elem(map, key, true); ++} ++ ++static void *htab_lru_map_lookup_elem_sys(struct bpf_map *map, void *key) ++{ ++ return __htab_lru_map_lookup_elem(map, key, false); ++} ++ + static u32 htab_lru_map_gen_lookup(struct bpf_map *map, + struct bpf_insn *insn_buf) + { +@@ -1250,6 +1262,7 @@ const struct bpf_map_ops htab_lru_map_ops = { + .map_free = htab_map_free, + .map_get_next_key = htab_map_get_next_key, + .map_lookup_elem = htab_lru_map_lookup_elem, ++ .map_lookup_elem_sys_only = htab_lru_map_lookup_elem_sys, + .map_update_elem = htab_lru_map_update_elem, + .map_delete_elem = htab_lru_map_delete_elem, + .map_gen_lookup = htab_lru_map_gen_lookup, +@@ -1281,7 +1294,6 @@ static void *htab_lru_percpu_map_lookup_elem(struct bpf_map *map, void *key) + + int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value) + { +- struct bpf_htab *htab = container_of(map, struct bpf_htab, map); + struct htab_elem *l; + void __percpu *pptr; + int ret = -ENOENT; +@@ -1297,8 +1309,9 @@ int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value) + l = __htab_map_lookup_elem(map, key); + if (!l) + goto out; +- if (htab_is_lru(htab)) +- bpf_lru_node_set_ref(&l->lru_node); ++ /* We do not mark LRU map element here in order to not mess up ++ * eviction heuristics when user space does a map walk. ++ */ + pptr = htab_elem_get_ptr(l, map->key_size); + for_each_possible_cpu(cpu) { + bpf_long_memcpy(value + off, +diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c +index 4a8f390a2b82..dc9d7ac8228d 100644 +--- a/kernel/bpf/inode.c ++++ b/kernel/bpf/inode.c +@@ -518,7 +518,7 @@ out: + static struct bpf_prog *__get_prog_inode(struct inode *inode, enum bpf_prog_type type) + { + struct bpf_prog *prog; +- int ret = inode_permission(inode, MAY_READ | MAY_WRITE); ++ int ret = inode_permission(inode, MAY_READ); + if (ret) + return ERR_PTR(ret); + +diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c +index afca36f53c49..db6e825e2958 100644 +--- a/kernel/bpf/syscall.c ++++ b/kernel/bpf/syscall.c +@@ -773,7 +773,10 @@ static int map_lookup_elem(union bpf_attr *attr) + err = map->ops->map_peek_elem(map, value); + } else { + rcu_read_lock(); +- ptr = map->ops->map_lookup_elem(map, key); ++ if (map->ops->map_lookup_elem_sys_only) ++ ptr = map->ops->map_lookup_elem_sys_only(map, key); ++ else ++ ptr = map->ops->map_lookup_elem(map, key); + if (IS_ERR(ptr)) { + err = PTR_ERR(ptr); + } else if (!ptr) { +diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c +index 5b3b0c3c8a47..d910e36c34b5 100644 +--- a/kernel/trace/trace_events.c ++++ b/kernel/trace/trace_events.c +@@ -1318,9 +1318,6 @@ event_id_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) + char buf[32]; + int len; + +- if (*ppos) +- return 0; +- + if (unlikely(!id)) + return -ENODEV; + +diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c +index 8f8411e7835f..e41d389b7f49 100644 +--- a/kernel/trace/trace_probe.c ++++ b/kernel/trace/trace_probe.c +@@ -420,13 +420,14 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size, + return -E2BIG; + } + } +- /* +- * The default type of $comm should be "string", and it can't be +- * dereferenced. +- */ +- if (!t && strcmp(arg, "$comm") == 0) ++ ++ /* Since $comm can not be dereferred, we can find $comm by strcmp */ ++ if (strcmp(arg, "$comm") == 0) { ++ /* The type of $comm must be "string", and not an array. */ ++ if (parg->count || (t && strcmp(t, "string"))) ++ return -EINVAL; + parg->type = find_fetch_type("string"); +- else ++ } else + parg->type = find_fetch_type(t); + if (!parg->type) { + pr_info("Unsupported type: %s\n", t); +diff --git a/mm/mmap.c b/mm/mmap.c +index bd7b9f293b39..2d6a6662edb9 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -2735,9 +2735,17 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, + return -EINVAL; + + len = PAGE_ALIGN(len); ++ end = start + len; + if (len == 0) + return -EINVAL; + ++ /* ++ * arch_unmap() might do unmaps itself. It must be called ++ * and finish any rbtree manipulation before this code ++ * runs and also starts to manipulate the rbtree. ++ */ ++ arch_unmap(mm, start, end); ++ + /* Find the first overlapping VMA */ + vma = find_vma(mm, start); + if (!vma) +@@ -2746,7 +2754,6 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, + /* we have start < vma->vm_end */ + + /* if it doesn't overlap, we have nothing.. */ +- end = start + len; + if (vma->vm_start >= end) + return 0; + +@@ -2816,12 +2823,6 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, + /* Detach vmas from rbtree */ + detach_vmas_to_be_unmapped(mm, vma, prev, end); + +- /* +- * mpx unmap needs to be called with mmap_sem held for write. +- * It is safe to call it before unmap_region(). +- */ +- arch_unmap(mm, vma, start, end); +- + if (downgrade) + downgrade_write(&mm->mmap_sem); + +diff --git a/net/core/dev.c b/net/core/dev.c +index f409406254dd..255f99cb7c48 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -8911,7 +8911,7 @@ static void netdev_wait_allrefs(struct net_device *dev) + + refcnt = netdev_refcnt_read(dev); + +- if (time_after(jiffies, warning_time + 10 * HZ)) { ++ if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) { + pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n", + dev->name, refcnt); + warning_time = jiffies; +diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c +index c3a00eac4804..5ce7d47a960e 100644 +--- a/net/core/flow_offload.c ++++ b/net/core/flow_offload.c +@@ -54,6 +54,13 @@ void flow_rule_match_vlan(const struct flow_rule *rule, + } + EXPORT_SYMBOL(flow_rule_match_vlan); + ++void flow_rule_match_cvlan(const struct flow_rule *rule, ++ struct flow_match_vlan *out) ++{ ++ FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_CVLAN, out); ++} ++EXPORT_SYMBOL(flow_rule_match_cvlan); ++ + void flow_rule_match_ipv4_addrs(const struct flow_rule *rule, + struct flow_match_ipv4_addrs *out) + { +diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c +index 220c56e93659..467d771ac6ba 100644 +--- a/net/core/rtnetlink.c ++++ b/net/core/rtnetlink.c +@@ -1496,14 +1496,15 @@ static int put_master_ifindex(struct sk_buff *skb, struct net_device *dev) + return ret; + } + +-static int nla_put_iflink(struct sk_buff *skb, const struct net_device *dev) ++static int nla_put_iflink(struct sk_buff *skb, const struct net_device *dev, ++ bool force) + { + int ifindex = dev_get_iflink(dev); + +- if (dev->ifindex == ifindex) +- return 0; ++ if (force || dev->ifindex != ifindex) ++ return nla_put_u32(skb, IFLA_LINK, ifindex); + +- return nla_put_u32(skb, IFLA_LINK, ifindex); ++ return 0; + } + + static noinline_for_stack int nla_put_ifalias(struct sk_buff *skb, +@@ -1520,6 +1521,8 @@ static int rtnl_fill_link_netnsid(struct sk_buff *skb, + const struct net_device *dev, + struct net *src_net) + { ++ bool put_iflink = false; ++ + if (dev->rtnl_link_ops && dev->rtnl_link_ops->get_link_net) { + struct net *link_net = dev->rtnl_link_ops->get_link_net(dev); + +@@ -1528,10 +1531,12 @@ static int rtnl_fill_link_netnsid(struct sk_buff *skb, + + if (nla_put_s32(skb, IFLA_LINK_NETNSID, id)) + return -EMSGSIZE; ++ ++ put_iflink = true; + } + } + +- return 0; ++ return nla_put_iflink(skb, dev, put_iflink); + } + + static int rtnl_fill_link_af(struct sk_buff *skb, +@@ -1617,7 +1622,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, + #ifdef CONFIG_RPS + nla_put_u32(skb, IFLA_NUM_RX_QUEUES, dev->num_rx_queues) || + #endif +- nla_put_iflink(skb, dev) || + put_master_ifindex(skb, dev) || + nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) || + (dev->qdisc && +diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c +index 91247a6fc67f..9915f64b38a0 100644 +--- a/net/ipv6/ip6_fib.c ++++ b/net/ipv6/ip6_fib.c +@@ -909,6 +909,12 @@ static void fib6_drop_pcpu_from(struct fib6_info *f6i, + { + int cpu; + ++ /* Make sure rt6_make_pcpu_route() wont add other percpu routes ++ * while we are cleaning them here. ++ */ ++ f6i->fib6_destroying = 1; ++ mb(); /* paired with the cmpxchg() in rt6_make_pcpu_route() */ ++ + /* release the reference to this fib entry from + * all of its cached pcpu routes + */ +@@ -932,6 +938,9 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn, + { + struct fib6_table *table = rt->fib6_table; + ++ if (rt->rt6i_pcpu) ++ fib6_drop_pcpu_from(rt, table); ++ + if (atomic_read(&rt->fib6_ref) != 1) { + /* This route is used as dummy address holder in some split + * nodes. It is not leaked, but it still holds other resources, +@@ -953,9 +962,6 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn, + fn = rcu_dereference_protected(fn->parent, + lockdep_is_held(&table->tb6_lock)); + } +- +- if (rt->rt6i_pcpu) +- fib6_drop_pcpu_from(rt, table); + } + } + +diff --git a/net/ipv6/route.c b/net/ipv6/route.c +index 0520aca3354b..e470589fb93b 100644 +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -110,8 +110,8 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb, + int iif, int type, u32 portid, u32 seq, + unsigned int flags); + static struct rt6_info *rt6_find_cached_rt(struct fib6_info *rt, +- struct in6_addr *daddr, +- struct in6_addr *saddr); ++ const struct in6_addr *daddr, ++ const struct in6_addr *saddr); + + #ifdef CONFIG_IPV6_ROUTE_INFO + static struct fib6_info *rt6_add_route_info(struct net *net, +@@ -1260,6 +1260,13 @@ static struct rt6_info *rt6_make_pcpu_route(struct net *net, + prev = cmpxchg(p, NULL, pcpu_rt); + BUG_ON(prev); + ++ if (rt->fib6_destroying) { ++ struct fib6_info *from; ++ ++ from = xchg((__force struct fib6_info **)&pcpu_rt->from, NULL); ++ fib6_info_release(from); ++ } ++ + return pcpu_rt; + } + +@@ -1529,31 +1536,44 @@ out: + * Caller has to hold rcu_read_lock() + */ + static struct rt6_info *rt6_find_cached_rt(struct fib6_info *rt, +- struct in6_addr *daddr, +- struct in6_addr *saddr) ++ const struct in6_addr *daddr, ++ const struct in6_addr *saddr) + { ++ const struct in6_addr *src_key = NULL; + struct rt6_exception_bucket *bucket; +- struct in6_addr *src_key = NULL; + struct rt6_exception *rt6_ex; + struct rt6_info *res = NULL; + +- bucket = rcu_dereference(rt->rt6i_exception_bucket); +- + #ifdef CONFIG_IPV6_SUBTREES + /* rt6i_src.plen != 0 indicates rt is in subtree + * and exception table is indexed by a hash of + * both rt6i_dst and rt6i_src. +- * Otherwise, the exception table is indexed by +- * a hash of only rt6i_dst. ++ * However, the src addr used to create the hash ++ * might not be exactly the passed in saddr which ++ * is a /128 addr from the flow. ++ * So we need to use f6i->fib6_src to redo lookup ++ * if the passed in saddr does not find anything. ++ * (See the logic in ip6_rt_cache_alloc() on how ++ * rt->rt6i_src is updated.) + */ + if (rt->fib6_src.plen) + src_key = saddr; ++find_ex: + #endif ++ bucket = rcu_dereference(rt->rt6i_exception_bucket); + rt6_ex = __rt6_find_exception_rcu(&bucket, daddr, src_key); + + if (rt6_ex && !rt6_check_expired(rt6_ex->rt6i)) + res = rt6_ex->rt6i; + ++#ifdef CONFIG_IPV6_SUBTREES ++ /* Use fib6_src as src_key and redo lookup */ ++ if (!res && src_key && src_key != &rt->fib6_src.addr) { ++ src_key = &rt->fib6_src.addr; ++ goto find_ex; ++ } ++#endif ++ + return res; + } + +@@ -2608,10 +2628,8 @@ out: + u32 ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr, + struct in6_addr *saddr) + { +- struct rt6_exception_bucket *bucket; +- struct rt6_exception *rt6_ex; +- struct in6_addr *src_key; + struct inet6_dev *idev; ++ struct rt6_info *rt; + u32 mtu = 0; + + if (unlikely(fib6_metric_locked(f6i, RTAX_MTU))) { +@@ -2620,18 +2638,10 @@ u32 ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr, + goto out; + } + +- src_key = NULL; +-#ifdef CONFIG_IPV6_SUBTREES +- if (f6i->fib6_src.plen) +- src_key = saddr; +-#endif +- +- bucket = rcu_dereference(f6i->rt6i_exception_bucket); +- rt6_ex = __rt6_find_exception_rcu(&bucket, daddr, src_key); +- if (rt6_ex && !rt6_check_expired(rt6_ex->rt6i)) +- mtu = dst_metric_raw(&rt6_ex->rt6i->dst, RTAX_MTU); +- +- if (likely(!mtu)) { ++ rt = rt6_find_cached_rt(f6i, daddr, saddr); ++ if (unlikely(rt)) { ++ mtu = dst_metric_raw(&rt->dst, RTAX_MTU); ++ } else { + struct net_device *dev = fib6_info_nh_dev(f6i); + + mtu = IPV6_MIN_MTU; +diff --git a/net/tipc/core.c b/net/tipc/core.c +index 5b38f5164281..d7b0688c98dd 100644 +--- a/net/tipc/core.c ++++ b/net/tipc/core.c +@@ -66,6 +66,10 @@ static int __net_init tipc_init_net(struct net *net) + INIT_LIST_HEAD(&tn->node_list); + spin_lock_init(&tn->node_list_lock); + ++ err = tipc_socket_init(); ++ if (err) ++ goto out_socket; ++ + err = tipc_sk_rht_init(net); + if (err) + goto out_sk_rht; +@@ -92,6 +96,8 @@ out_subscr: + out_nametbl: + tipc_sk_rht_destroy(net); + out_sk_rht: ++ tipc_socket_stop(); ++out_socket: + return err; + } + +@@ -102,6 +108,7 @@ static void __net_exit tipc_exit_net(struct net *net) + tipc_bcast_stop(net); + tipc_nametbl_stop(net); + tipc_sk_rht_destroy(net); ++ tipc_socket_stop(); + } + + static struct pernet_operations tipc_net_ops = { +@@ -129,10 +136,6 @@ static int __init tipc_init(void) + if (err) + goto out_netlink_compat; + +- err = tipc_socket_init(); +- if (err) +- goto out_socket; +- + err = tipc_register_sysctl(); + if (err) + goto out_sysctl; +@@ -152,8 +155,6 @@ out_bearer: + out_pernet: + tipc_unregister_sysctl(); + out_sysctl: +- tipc_socket_stop(); +-out_socket: + tipc_netlink_compat_stop(); + out_netlink_compat: + tipc_netlink_stop(); +@@ -168,7 +169,6 @@ static void __exit tipc_exit(void) + unregister_pernet_subsys(&tipc_net_ops); + tipc_netlink_stop(); + tipc_netlink_compat_stop(); +- tipc_socket_stop(); + tipc_unregister_sysctl(); + + pr_info("Deactivated\n"); +diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c +index 15eb5d3d4750..96ab344f17bb 100644 +--- a/net/vmw_vsock/virtio_transport.c ++++ b/net/vmw_vsock/virtio_transport.c +@@ -702,28 +702,27 @@ static int __init virtio_vsock_init(void) + if (!virtio_vsock_workqueue) + return -ENOMEM; + +- ret = register_virtio_driver(&virtio_vsock_driver); ++ ret = vsock_core_init(&virtio_transport.transport); + if (ret) + goto out_wq; + +- ret = vsock_core_init(&virtio_transport.transport); ++ ret = register_virtio_driver(&virtio_vsock_driver); + if (ret) +- goto out_vdr; ++ goto out_vci; + + return 0; + +-out_vdr: +- unregister_virtio_driver(&virtio_vsock_driver); ++out_vci: ++ vsock_core_exit(); + out_wq: + destroy_workqueue(virtio_vsock_workqueue); + return ret; +- + } + + static void __exit virtio_vsock_exit(void) + { +- vsock_core_exit(); + unregister_virtio_driver(&virtio_vsock_driver); ++ vsock_core_exit(); + destroy_workqueue(virtio_vsock_workqueue); + } + +diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c +index 602715fc9a75..f3f3d06cb6d8 100644 +--- a/net/vmw_vsock/virtio_transport_common.c ++++ b/net/vmw_vsock/virtio_transport_common.c +@@ -786,12 +786,19 @@ static bool virtio_transport_close(struct vsock_sock *vsk) + + void virtio_transport_release(struct vsock_sock *vsk) + { ++ struct virtio_vsock_sock *vvs = vsk->trans; ++ struct virtio_vsock_pkt *pkt, *tmp; + struct sock *sk = &vsk->sk; + bool remove_sock = true; + + lock_sock(sk); + if (sk->sk_type == SOCK_STREAM) + remove_sock = virtio_transport_close(vsk); ++ ++ list_for_each_entry_safe(pkt, tmp, &vvs->rx_queue, list) { ++ list_del(&pkt->list); ++ virtio_transport_free_pkt(pkt); ++ } + release_sock(sk); + + if (remove_sock) +diff --git a/scripts/gcc-plugins/arm_ssp_per_task_plugin.c b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c +index 89c47f57d1ce..8c1af9bdcb1b 100644 +--- a/scripts/gcc-plugins/arm_ssp_per_task_plugin.c ++++ b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c +@@ -36,7 +36,7 @@ static unsigned int arm_pertask_ssp_rtl_execute(void) + mask = GEN_INT(sext_hwi(sp_mask, GET_MODE_PRECISION(Pmode))); + masked_sp = gen_reg_rtx(Pmode); + +- emit_insn_before(gen_rtx_SET(masked_sp, ++ emit_insn_before(gen_rtx_set(masked_sp, + gen_rtx_AND(Pmode, + stack_pointer_rtx, + mask)), +diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile +index 53f8be0f4a1f..88158239622b 100644 +--- a/tools/objtool/Makefile ++++ b/tools/objtool/Makefile +@@ -7,11 +7,12 @@ ARCH := x86 + endif + + # always use the host compiler ++HOSTAR ?= ar + HOSTCC ?= gcc + HOSTLD ?= ld ++AR = $(HOSTAR) + CC = $(HOSTCC) + LD = $(HOSTLD) +-AR = ar + + ifeq ($(srctree),) + srctree := $(patsubst %/,%,$(dir $(CURDIR))) +diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +index 872fab163585..f4c3c84b090f 100644 +--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c ++++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +@@ -58,6 +58,7 @@ enum intel_pt_pkt_state { + INTEL_PT_STATE_NO_IP, + INTEL_PT_STATE_ERR_RESYNC, + INTEL_PT_STATE_IN_SYNC, ++ INTEL_PT_STATE_TNT_CONT, + INTEL_PT_STATE_TNT, + INTEL_PT_STATE_TIP, + INTEL_PT_STATE_TIP_PGD, +@@ -72,8 +73,9 @@ static inline bool intel_pt_sample_time(enum intel_pt_pkt_state pkt_state) + case INTEL_PT_STATE_NO_IP: + case INTEL_PT_STATE_ERR_RESYNC: + case INTEL_PT_STATE_IN_SYNC: +- case INTEL_PT_STATE_TNT: ++ case INTEL_PT_STATE_TNT_CONT: + return true; ++ case INTEL_PT_STATE_TNT: + case INTEL_PT_STATE_TIP: + case INTEL_PT_STATE_TIP_PGD: + case INTEL_PT_STATE_FUP: +@@ -888,16 +890,20 @@ static uint64_t intel_pt_next_period(struct intel_pt_decoder *decoder) + timestamp = decoder->timestamp + decoder->timestamp_insn_cnt; + masked_timestamp = timestamp & decoder->period_mask; + if (decoder->continuous_period) { +- if (masked_timestamp != decoder->last_masked_timestamp) ++ if (masked_timestamp > decoder->last_masked_timestamp) + return 1; + } else { + timestamp += 1; + masked_timestamp = timestamp & decoder->period_mask; +- if (masked_timestamp != decoder->last_masked_timestamp) { ++ if (masked_timestamp > decoder->last_masked_timestamp) { + decoder->last_masked_timestamp = masked_timestamp; + decoder->continuous_period = true; + } + } ++ ++ if (masked_timestamp < decoder->last_masked_timestamp) ++ return decoder->period_ticks; ++ + return decoder->period_ticks - (timestamp - masked_timestamp); + } + +@@ -926,7 +932,10 @@ static void intel_pt_sample_insn(struct intel_pt_decoder *decoder) + case INTEL_PT_PERIOD_TICKS: + timestamp = decoder->timestamp + decoder->timestamp_insn_cnt; + masked_timestamp = timestamp & decoder->period_mask; +- decoder->last_masked_timestamp = masked_timestamp; ++ if (masked_timestamp > decoder->last_masked_timestamp) ++ decoder->last_masked_timestamp = masked_timestamp; ++ else ++ decoder->last_masked_timestamp += decoder->period_ticks; + break; + case INTEL_PT_PERIOD_NONE: + case INTEL_PT_PERIOD_MTC: +@@ -1254,7 +1263,9 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder) + return -ENOENT; + } + decoder->tnt.count -= 1; +- if (!decoder->tnt.count) ++ if (decoder->tnt.count) ++ decoder->pkt_state = INTEL_PT_STATE_TNT_CONT; ++ else + decoder->pkt_state = INTEL_PT_STATE_IN_SYNC; + decoder->tnt.payload <<= 1; + decoder->state.from_ip = decoder->ip; +@@ -1285,7 +1296,9 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder) + + if (intel_pt_insn.branch == INTEL_PT_BR_CONDITIONAL) { + decoder->tnt.count -= 1; +- if (!decoder->tnt.count) ++ if (decoder->tnt.count) ++ decoder->pkt_state = INTEL_PT_STATE_TNT_CONT; ++ else + decoder->pkt_state = INTEL_PT_STATE_IN_SYNC; + if (decoder->tnt.payload & BIT63) { + decoder->tnt.payload <<= 1; +@@ -1305,8 +1318,11 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder) + return 0; + } + decoder->ip += intel_pt_insn.length; +- if (!decoder->tnt.count) ++ if (!decoder->tnt.count) { ++ decoder->sample_timestamp = decoder->timestamp; ++ decoder->sample_insn_cnt = decoder->timestamp_insn_cnt; + return -EAGAIN; ++ } + decoder->tnt.payload <<= 1; + continue; + } +@@ -2365,6 +2381,7 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder) + err = intel_pt_walk_trace(decoder); + break; + case INTEL_PT_STATE_TNT: ++ case INTEL_PT_STATE_TNT_CONT: + err = intel_pt_walk_tnt(decoder); + if (err == -EAGAIN) + err = intel_pt_walk_trace(decoder); |