commit: 2cb6fa9babbc792865ddf0f123ca3248196fbb68 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Sun May 26 17:11:23 2019 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sun May 26 17:11:23 2019 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=2cb6fa9b
Linux patch 4.14.122 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 + 1121_linux-4.14.122.patch | 2435 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2439 insertions(+) diff --git a/0000_README b/0000_README index 5301105..ac52010 100644 --- a/0000_README +++ b/0000_README @@ -527,6 +527,10 @@ Patch: 1120_4.14.121.patch From: http://www.kernel.org Desc: Linux 4.14.121 +Patch: 1121_4.14.122.patch +From: http://www.kernel.org +Desc: Linux 4.14.122 + 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/1121_linux-4.14.122.patch b/1121_linux-4.14.122.patch new file mode 100644 index 0000000..cf5208c --- /dev/null +++ b/1121_linux-4.14.122.patch @@ -0,0 +1,2435 @@ +diff --git a/Makefile b/Makefile +index 0e4063e1d0d7..0c4424292649 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 4 + PATCHLEVEL = 14 +-SUBLEVEL = 121 ++SUBLEVEL = 122 + EXTRAVERSION = + NAME = Petit Gorille + +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 60e6f07b7e32..eb83d65153b8 100644 +--- a/arch/parisc/include/asm/assembly.h ++++ b/arch/parisc/include/asm/assembly.h +@@ -59,14 +59,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/kernel/head.S b/arch/parisc/kernel/head.S +index bbbe360b458f..9b99eb0712ad 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) +@@ -254,7 +254,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 4d712c1d64b8..77650dc80830 100644 +--- a/arch/parisc/kernel/process.c ++++ b/arch/parisc/kernel/process.c +@@ -192,6 +192,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 5f7e57fcaeef..0cf379acb5ed 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/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S +index 09896f1c114f..e09ba4bc8b98 100644 +--- a/arch/x86/entry/entry_64.S ++++ b/arch/x86/entry/entry_64.S +@@ -853,7 +853,7 @@ ENTRY(switch_to_thread_stack) + ret + END(switch_to_thread_stack) + +-.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 + +@@ -873,6 +873,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 +@@ -1093,7 +1107,7 @@ apicinterrupt3 HYPERVISOR_CALLBACK_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 +diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h +index 2ecd34e2d46c..ab3b9887e140 100644 +--- a/arch/x86/include/asm/text-patching.h ++++ b/arch/x86/include/asm/text-patching.h +@@ -38,4 +38,32 @@ extern void *text_poke(void *addr, const void *opcode, size_t len); + extern int poke_int3_handler(struct pt_regs *regs); + extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler); + ++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 7acb87cb2da8..c020ba4b7eb6 100644 +--- a/arch/x86/kernel/ftrace.c ++++ b/arch/x86/kernel/ftrace.c +@@ -30,6 +30,7 @@ + #include <asm/sections.h> + #include <asm/ftrace.h> + #include <asm/nops.h> ++#include <asm/text-patching.h> + + #ifdef CONFIG_DYNAMIC_FTRACE + +@@ -229,6 +230,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) + { +@@ -257,6 +259,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); + +@@ -292,13 +296,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; + } + + static int ftrace_write(unsigned long ip, const char *val, int size) +@@ -869,6 +888,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); +@@ -965,6 +986,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/lib/Makefile b/arch/x86/lib/Makefile +index d435c89875c1..60b410ff31e8 100644 +--- a/arch/x86/lib/Makefile ++++ b/arch/x86/lib/Makefile +@@ -6,6 +6,18 @@ + # Produces uninteresting flaky coverage. + KCOV_INSTRUMENT_delay.o := n + ++# Early boot use of cmdline; don't instrument it ++ifdef CONFIG_AMD_MEM_ENCRYPT ++KCOV_INSTRUMENT_cmdline.o := n ++KASAN_SANITIZE_cmdline.o := n ++ ++ifdef CONFIG_FUNCTION_TRACER ++CFLAGS_REMOVE_cmdline.o = -pg ++endif ++ ++CFLAGS_cmdline.o := $(call cc-option, -fno-stack-protector) ++endif ++ + inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk + inat_tables_maps = $(srctree)/arch/x86/lib/x86-opcode-map.txt + quiet_cmd_inat_tables = GEN $@ +diff --git a/drivers/base/dd.c b/drivers/base/dd.c +index cb3672cfdaaa..536c9ac3b848 100644 +--- a/drivers/base/dd.c ++++ b/drivers/base/dd.c +@@ -387,7 +387,7 @@ re_probe: + + ret = dma_configure(dev); + if (ret) +- goto dma_failed; ++ goto probe_failed; + + if (driver_sysfs_add(dev)) { + printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n", +@@ -442,14 +442,13 @@ re_probe: + goto done; + + probe_failed: +- dma_deconfigure(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); ++ dma_deconfigure(dev); + driver_sysfs_remove(dev); + dev->driver = NULL; + dev_set_drvdata(dev, 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/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c +index 559abf76891e..33d1cf4e6d80 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", CLK_IGNORE_UNUSED, + 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), +@@ -894,7 +894,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 830d1c87fa7c..dc87866233b9 100644 +--- a/drivers/clk/tegra/clk-pll.c ++++ b/drivers/clk/tegra/clk-pll.c +@@ -662,8 +662,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/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c +index 82f2b70ca5bf..36016c09dd96 100644 +--- a/drivers/hwtracing/intel_th/msu.c ++++ b/drivers/hwtracing/intel_th/msu.c +@@ -92,6 +92,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 +@@ -112,6 +113,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; +@@ -625,22 +627,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; + } + + /** +@@ -651,6 +676,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 41724d18e712..f4530b08b1e5 100644 +--- a/drivers/hwtracing/stm/core.c ++++ b/drivers/hwtracing/stm/core.c +@@ -226,8 +226,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/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c +index 3b6449e2cbf1..40eb8138546a 100644 +--- a/drivers/iommu/tegra-smmu.c ++++ b/drivers/iommu/tegra-smmu.c +@@ -94,7 +94,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) | \ +@@ -197,8 +196,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); + } + +@@ -208,8 +211,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); + } + +@@ -219,8 +226,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 bc60db87e6f1..394e53afc259 100644 +--- a/drivers/md/dm-cache-metadata.c ++++ b/drivers/md/dm-cache-metadata.c +@@ -1166,11 +1166,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-delay.c b/drivers/md/dm-delay.c +index 2209a9700acd..cb733a5afdc8 100644 +--- a/drivers/md/dm-delay.c ++++ b/drivers/md/dm-delay.c +@@ -222,7 +222,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); + + dm_put_device(ti, dc->dev_read); + +diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c +index 34968ca6b84a..167686189fd2 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/md.c b/drivers/md/md.c +index 5599712d478e..b27a69388dcd 100644 +--- a/drivers/md/md.c ++++ b/drivers/md/md.c +@@ -2845,8 +2845,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 +diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c +index b8f887bfa06a..65608c6b6836 100644 +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -4182,7 +4182,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++; +@@ -4207,6 +4207,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); +@@ -4218,15 +4226,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 768f2950ea36..07bc819f5819 100644 +--- a/drivers/media/i2c/ov6650.c ++++ b/drivers/media/i2c/ov6650.c +@@ -826,6 +826,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/memory/tegra/mc.c b/drivers/memory/tegra/mc.c +index 1d49a8dd4a37..7c040a3b45be 100644 +--- a/drivers/memory/tegra/mc.c ++++ b/drivers/memory/tegra/mc.c +@@ -72,7 +72,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 676a75f4182a..f07c0bae1f67 100644 +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile +@@ -41,7 +41,7 @@ obj-$(CONFIG_DEV_APPLETALK) += appletalk/ + obj-$(CONFIG_CAIF) += caif/ + obj-$(CONFIG_CAN) += can/ + obj-$(CONFIG_ETRAX_ETHERNET) += cris/ +-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 4c5306dbcf11..71fdd23147ea 100644 +--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c ++++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c +@@ -1490,7 +1490,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/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 01abe8eea753..6d39dab497f7 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1225,6 +1225,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/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +index 8ba8c70571fb..7fb8bbaf2142 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +@@ -141,9 +141,9 @@ static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb, + } + + /* iwl_mvm_create_skb Adds the rxb to a new skb */ +-static void iwl_mvm_create_skb(struct sk_buff *skb, struct ieee80211_hdr *hdr, +- u16 len, u8 crypt_len, +- struct iwl_rx_cmd_buffer *rxb) ++static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb, ++ struct ieee80211_hdr *hdr, u16 len, u8 crypt_len, ++ struct iwl_rx_cmd_buffer *rxb) + { + struct iwl_rx_packet *pkt = rxb_addr(rxb); + struct iwl_rx_mpdu_desc *desc = (void *)pkt->data; +@@ -184,6 +184,20 @@ static void iwl_mvm_create_skb(struct sk_buff *skb, struct ieee80211_hdr *hdr, + * present before copying packet data. + */ + hdrlen += crypt_len; ++ ++ if (WARN_ONCE(headlen < hdrlen, ++ "invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n", ++ hdrlen, len, crypt_len)) { ++ /* ++ * We warn and trace because we want to be able to see ++ * it in trace-cmd as well. ++ */ ++ IWL_DEBUG_RX(mvm, ++ "invalid packet lengths (hdrlen=%d, len=%d, crypt_len=%d)\n", ++ hdrlen, len, crypt_len); ++ return -EINVAL; ++ } ++ + skb_put_data(skb, hdr, hdrlen); + skb_put_data(skb, (u8 *)hdr + hdrlen + pad_len, headlen - hdrlen); + +@@ -196,6 +210,8 @@ static void iwl_mvm_create_skb(struct sk_buff *skb, struct ieee80211_hdr *hdr, + skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset, + fraglen, rxb->truesize); + } ++ ++ return 0; + } + + /* iwl_mvm_pass_packet_to_mac80211 - passes the packet for mac80211 */ +@@ -1033,7 +1049,11 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, + rx_status->boottime_ns = ktime_get_boot_ns(); + } + +- iwl_mvm_create_skb(skb, hdr, len, crypt_len, rxb); ++ if (iwl_mvm_create_skb(mvm, skb, hdr, len, crypt_len, rxb)) { ++ kfree_skb(skb); ++ goto out; ++ } ++ + if (!iwl_mvm_reorder(mvm, napi, queue, sta, skb, desc)) + iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue, sta); + out: +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 ff1a332d76e4..665e5de909b0 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/pcie/aspm.c b/drivers/pci/pcie/aspm.c +index c0e1985e4c75..6b4e82a4b64e 100644 +--- a/drivers/pci/pcie/aspm.c ++++ b/drivers/pci/pcie/aspm.c +@@ -211,6 +211,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 +@@ -220,7 +252,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; + /* +@@ -260,21 +291,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/quirks.c b/drivers/pci/quirks.c +index 867056395d48..45c3fbd38f50 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -2085,6 +2085,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; +@@ -3369,6 +3386,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); + + static void quirk_no_pm_reset(struct pci_dev *dev) + { +@@ -4852,4 +4870,5 @@ 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 */ +diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c +index ee71a2b37b12..fe7fcf3a2ad0 100644 +--- a/drivers/power/supply/cpcap-battery.c ++++ b/drivers/power/supply/cpcap-battery.c +@@ -221,6 +221,9 @@ static int cpcap_battery_cc_raw_div(struct cpcap_battery_ddata *ddata, + int avg_current; + u32 cc_lsb; + ++ if (!divider) ++ return 0; ++ + sample &= 0xffffff; /* 24-bits, unsigned */ + offset &= 0x7ff; /* 10-bits, signed */ + +diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c +index 5204f115970f..eb5dc7482053 100644 +--- a/drivers/power/supply/power_supply_sysfs.c ++++ b/drivers/power/supply/power_supply_sysfs.c +@@ -325,15 +325,11 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) + char *prop_buf; + char *attrname; + +- dev_dbg(dev, "uevent\n"); +- + if (!psy || !psy->desc) { + dev_dbg(dev, "No power supply yet\n"); + return ret; + } + +- dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->desc->name); +- + ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->desc->name); + if (ret) + return ret; +@@ -369,8 +365,6 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) + goto out; + } + +- dev_dbg(dev, "prop %s=%s\n", attrname, prop_buf); +- + ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf); + kfree(attrname); + if (ret) +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/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c +index 83791d13c204..54bb5d79723a 100644 +--- a/fs/btrfs/extent-tree.c ++++ b/fs/btrfs/extent-tree.c +@@ -11058,9 +11058,9 @@ int btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info, + * transaction. + */ + static int btrfs_trim_free_extents(struct btrfs_device *device, +- u64 minlen, u64 *trimmed) ++ struct fstrim_range *range, u64 *trimmed) + { +- u64 start = 0, len = 0; ++ u64 start = range->start, len = 0; + int ret; + + *trimmed = 0; +@@ -11096,8 +11096,8 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, + refcount_inc(&trans->use_count); + spin_unlock(&fs_info->trans_lock); + +- ret = find_free_dev_extent_start(trans, device, minlen, start, +- &start, &len); ++ ret = find_free_dev_extent_start(trans, device, range->minlen, ++ start, &start, &len); + if (trans) + btrfs_put_transaction(trans); + +@@ -11109,6 +11109,16 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, + break; + } + ++ /* If we are out of the passed range break */ ++ if (start > range->start + range->len - 1) { ++ mutex_unlock(&fs_info->chunk_mutex); ++ ret = 0; ++ break; ++ } ++ ++ start = max(range->start, start); ++ len = min(range->len, len); ++ + ret = btrfs_issue_discard(device->bdev, start, len, &bytes); + up_read(&fs_info->commit_root_sem); + mutex_unlock(&fs_info->chunk_mutex); +@@ -11119,6 +11129,10 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, + start += len; + *trimmed += bytes; + ++ /* We've trimmed enough */ ++ if (*trimmed >= range->len) ++ break; ++ + if (fatal_signal_pending(current)) { + ret = -ERESTARTSYS; + break; +@@ -11202,8 +11216,7 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) + mutex_lock(&fs_info->fs_devices->device_list_mutex); + devices = &fs_info->fs_devices->devices; + list_for_each_entry(device, devices, dev_list) { +- ret = btrfs_trim_free_extents(device, range->minlen, +- &group_trimmed); ++ ret = btrfs_trim_free_extents(device, range, &group_trimmed); + if (ret) { + dev_failed++; + dev_ret = ret; +diff --git a/fs/ceph/super.c b/fs/ceph/super.c +index b79b1211a2b5..f0694293b31a 100644 +--- a/fs/ceph/super.c ++++ b/fs/ceph/super.c +@@ -768,6 +768,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, +@@ -775,6 +781,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/smb2ops.c b/fs/cifs/smb2ops.c +index 418062c7f040..23326b0cd562 100644 +--- a/fs/cifs/smb2ops.c ++++ b/fs/cifs/smb2ops.c +@@ -1969,26 +1969,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/smb2pdu.c b/fs/cifs/smb2pdu.c +index 7936eac5a38a..fd2d199dd413 100644 +--- a/fs/cifs/smb2pdu.c ++++ b/fs/cifs/smb2pdu.c +@@ -2699,7 +2699,6 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms, + cifs_dbg(VFS, "Send error in read = %d\n", rc); + } + free_rsp_buf(resp_buftype, rsp_iov.iov_base); +- cifs_small_buf_release(req); + return rc == -ENODATA ? 0 : rc; + } + +diff --git a/fs/fuse/file.c b/fs/fuse/file.c +index 19ea122a7d03..7882fc34113c 100644 +--- a/fs/fuse/file.c ++++ b/fs/fuse/file.c +@@ -1525,7 +1525,7 @@ __acquires(fc->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)) { +@@ -2974,6 +2974,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 3db2b7464748..03da4e0b0098 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 e1d88bca815e..85ec07e4aa91 100644 +--- a/fs/nfs/nfs4state.c ++++ b/fs/nfs/nfs4state.c +@@ -143,6 +143,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/ufs/util.h b/fs/ufs/util.h +index 1907be6d5808..f3092d513551 100644 +--- a/fs/ufs/util.h ++++ b/fs/ufs/util.h +@@ -229,7 +229,7 @@ ufs_get_inode_gid(struct super_block *sb, struct ufs_inode *inode) + case UFS_UID_44BSD: + return fs32_to_cpu(sb, inode->ui_u3.ui_44.ui_gid); + case UFS_UID_EFT: +- if (inode->ui_u1.oldids.ui_suid == 0xFFFF) ++ if (inode->ui_u1.oldids.ui_sgid == 0xFFFF) + return fs32_to_cpu(sb, inode->ui_u3.ui_sun.ui_gid); + /* Fall through */ + default: +diff --git a/include/linux/bpf.h b/include/linux/bpf.h +index c9d2a1a3ef11..e9e87599338e 100644 +--- a/include/linux/bpf.h ++++ b/include/linux/bpf.h +@@ -28,6 +28,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/of.h b/include/linux/of.h +index 70b7dacf9238..3c108f9be5e7 100644 +--- a/include/linux/of.h ++++ b/include/linux/of.h +@@ -229,8 +229,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 b1abbcc614cf..59f4d10568c6 100644 +--- a/include/linux/pci.h ++++ b/include/linux/pci.h +@@ -350,6 +350,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 3172e14d9398..fdb0cd0699b6 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -1310,10 +1310,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); + } + +@@ -2572,7 +2574,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/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c +index 84237f640789..505e69854eb8 100644 +--- a/kernel/bpf/hashtab.c ++++ b/kernel/bpf/hashtab.c +@@ -498,18 +498,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) + { +@@ -1160,6 +1172,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, +@@ -1190,7 +1203,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; +@@ -1206,8 +1218,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/syscall.c b/kernel/bpf/syscall.c +index 5c9deed4524e..2d828d346982 100644 +--- a/kernel/bpf/syscall.c ++++ b/kernel/bpf/syscall.c +@@ -493,7 +493,10 @@ static int map_lookup_elem(union bpf_attr *attr) + err = bpf_fd_htab_map_lookup_elem(map, key, 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 (ptr) + memcpy(value, ptr, value_size); + rcu_read_unlock(); +diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c +index b314c9eaa71d..f8c45d30ec6d 100644 +--- a/kernel/sched/cpufreq_schedutil.c ++++ b/kernel/sched/cpufreq_schedutil.c +@@ -600,6 +600,7 @@ out: + return 0; + + fail: ++ kobject_put(&tunables->attr_set.kobj); + policy->governor_data = NULL; + sugov_tunables_free(tunables); + +diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c +index d53268a4e167..654a1587f6dd 100644 +--- a/kernel/trace/trace_events.c ++++ b/kernel/trace/trace_events.c +@@ -1319,9 +1319,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/lib/Makefile b/lib/Makefile +index b1ac45032903..4ea31c2d982d 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -17,6 +17,17 @@ KCOV_INSTRUMENT_list_debug.o := n + KCOV_INSTRUMENT_debugobjects.o := n + KCOV_INSTRUMENT_dynamic_debug.o := n + ++# Early boot use of cmdline, don't instrument it ++ifdef CONFIG_AMD_MEM_ENCRYPT ++KASAN_SANITIZE_string.o := n ++ ++ifdef CONFIG_FUNCTION_TRACER ++CFLAGS_REMOVE_string.o = -pg ++endif ++ ++CFLAGS_string.o := $(call cc-option, -fno-stack-protector) ++endif ++ + lib-y := ctype.o string.o vsprintf.o cmdline.o \ + rbtree.o radix-tree.o dump_stack.o timerqueue.o\ + idr.o int_sqrt.o extable.o \ +diff --git a/net/core/dev.c b/net/core/dev.c +index 90ec30d5b851..1212c814b3bc 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -7852,7 +7852,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/ipv4/esp4.c b/net/ipv4/esp4.c +index d30285c5d52d..c8e32f167ebb 100644 +--- a/net/ipv4/esp4.c ++++ b/net/ipv4/esp4.c +@@ -205,7 +205,7 @@ static void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto) + tail[plen - 1] = proto; + } + +-static void esp_output_udp_encap(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp) ++static int esp_output_udp_encap(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp) + { + int encap_type; + struct udphdr *uh; +@@ -213,6 +213,7 @@ static void esp_output_udp_encap(struct xfrm_state *x, struct sk_buff *skb, stru + __be16 sport, dport; + struct xfrm_encap_tmpl *encap = x->encap; + struct ip_esp_hdr *esph = esp->esph; ++ unsigned int len; + + spin_lock_bh(&x->lock); + sport = encap->encap_sport; +@@ -220,11 +221,14 @@ static void esp_output_udp_encap(struct xfrm_state *x, struct sk_buff *skb, stru + encap_type = encap->encap_type; + spin_unlock_bh(&x->lock); + ++ len = skb->len + esp->tailen - skb_transport_offset(skb); ++ if (len + sizeof(struct iphdr) >= IP_MAX_MTU) ++ return -EMSGSIZE; ++ + uh = (struct udphdr *)esph; + uh->source = sport; + uh->dest = dport; +- uh->len = htons(skb->len + esp->tailen +- - skb_transport_offset(skb)); ++ uh->len = htons(len); + uh->check = 0; + + switch (encap_type) { +@@ -241,6 +245,8 @@ static void esp_output_udp_encap(struct xfrm_state *x, struct sk_buff *skb, stru + + *skb_mac_header(skb) = IPPROTO_UDP; + esp->esph = esph; ++ ++ return 0; + } + + int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp) +@@ -254,8 +260,12 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * + int tailen = esp->tailen; + + /* this is non-NULL only with UDP Encapsulation */ +- if (x->encap) +- esp_output_udp_encap(x, skb, esp); ++ if (x->encap) { ++ int err = esp_output_udp_encap(x, skb, esp); ++ ++ if (err < 0) ++ return err; ++ } + + if (!skb_cloned(skb)) { + if (tailen <= skb_tailroom(skb)) { +diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c +index 306603a7f351..c07065b7e3b0 100644 +--- a/net/ipv4/ip_vti.c ++++ b/net/ipv4/ip_vti.c +@@ -663,9 +663,9 @@ static int __init vti_init(void) + return err; + + rtnl_link_failed: +- xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP); +-xfrm_tunnel_failed: + xfrm4_tunnel_deregister(&ipip_handler, AF_INET); ++xfrm_tunnel_failed: ++ xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP); + xfrm_proto_comp_failed: + xfrm4_protocol_deregister(&vti_ah4_protocol, IPPROTO_AH); + xfrm_proto_ah_failed: +@@ -680,6 +680,7 @@ pernet_dev_failed: + static void __exit vti_fini(void) + { + rtnl_link_unregister(&vti_link_ops); ++ xfrm4_tunnel_deregister(&ipip_handler, AF_INET); + xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP); + xfrm4_protocol_deregister(&vti_ah4_protocol, IPPROTO_AH); + xfrm4_protocol_deregister(&vti_esp4_protocol, IPPROTO_ESP); +diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c +index 4b586e7d5637..5952dca98e6b 100644 +--- a/net/ipv4/xfrm4_policy.c ++++ b/net/ipv4/xfrm4_policy.c +@@ -111,7 +111,8 @@ static void + _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + { + const struct iphdr *iph = ip_hdr(skb); +- u8 *xprth = skb_network_header(skb) + iph->ihl * 4; ++ int ihl = iph->ihl; ++ u8 *xprth = skb_network_header(skb) + ihl * 4; + struct flowi4 *fl4 = &fl->u.ip4; + int oif = 0; + +@@ -122,6 +123,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + fl4->flowi4_mark = skb->mark; + fl4->flowi4_oif = reverse ? skb->skb_iif : oif; + ++ fl4->flowi4_proto = iph->protocol; ++ fl4->daddr = reverse ? iph->saddr : iph->daddr; ++ fl4->saddr = reverse ? iph->daddr : iph->saddr; ++ fl4->flowi4_tos = iph->tos; ++ + if (!ip_is_fragment(iph)) { + switch (iph->protocol) { + case IPPROTO_UDP: +@@ -133,7 +139,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + pskb_may_pull(skb, xprth + 4 - skb->data)) { + __be16 *ports; + +- xprth = skb_network_header(skb) + iph->ihl * 4; ++ xprth = skb_network_header(skb) + ihl * 4; + ports = (__be16 *)xprth; + + fl4->fl4_sport = ports[!!reverse]; +@@ -146,7 +152,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + pskb_may_pull(skb, xprth + 2 - skb->data)) { + u8 *icmp; + +- xprth = skb_network_header(skb) + iph->ihl * 4; ++ xprth = skb_network_header(skb) + ihl * 4; + icmp = xprth; + + fl4->fl4_icmp_type = icmp[0]; +@@ -159,7 +165,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + pskb_may_pull(skb, xprth + 4 - skb->data)) { + __be32 *ehdr; + +- xprth = skb_network_header(skb) + iph->ihl * 4; ++ xprth = skb_network_header(skb) + ihl * 4; + ehdr = (__be32 *)xprth; + + fl4->fl4_ipsec_spi = ehdr[0]; +@@ -171,7 +177,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + pskb_may_pull(skb, xprth + 8 - skb->data)) { + __be32 *ah_hdr; + +- xprth = skb_network_header(skb) + iph->ihl * 4; ++ xprth = skb_network_header(skb) + ihl * 4; + ah_hdr = (__be32 *)xprth; + + fl4->fl4_ipsec_spi = ah_hdr[1]; +@@ -183,7 +189,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + pskb_may_pull(skb, xprth + 4 - skb->data)) { + __be16 *ipcomp_hdr; + +- xprth = skb_network_header(skb) + iph->ihl * 4; ++ xprth = skb_network_header(skb) + ihl * 4; + ipcomp_hdr = (__be16 *)xprth; + + fl4->fl4_ipsec_spi = htonl(ntohs(ipcomp_hdr[1])); +@@ -196,7 +202,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + __be16 *greflags; + __be32 *gre_hdr; + +- xprth = skb_network_header(skb) + iph->ihl * 4; ++ xprth = skb_network_header(skb) + ihl * 4; + greflags = (__be16 *)xprth; + gre_hdr = (__be32 *)xprth; + +@@ -213,10 +219,6 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) + break; + } + } +- fl4->flowi4_proto = iph->protocol; +- fl4->daddr = reverse ? iph->saddr : iph->daddr; +- fl4->saddr = reverse ? iph->daddr : iph->saddr; +- fl4->flowi4_tos = iph->tos; + } + + static void xfrm4_update_pmtu(struct dst_entry *dst, struct sock *sk, +diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c +index c28e3eaad7c2..b51368ebd1e6 100644 +--- a/net/ipv6/xfrm6_tunnel.c ++++ b/net/ipv6/xfrm6_tunnel.c +@@ -391,6 +391,10 @@ static void __exit xfrm6_tunnel_fini(void) + xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6); + xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6); + unregister_pernet_subsys(&xfrm6_tunnel_net_ops); ++ /* Someone maybe has gotten the xfrm6_tunnel_spi. ++ * So need to wait it. ++ */ ++ rcu_barrier(); + kmem_cache_destroy(xfrm6_tunnel_spi_kmem); + } + +diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c +index 222c063244f5..6ce13e976b7a 100644 +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1924,6 +1924,9 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) + list_del_rcu(&sdata->list); + mutex_unlock(&sdata->local->iflist_mtx); + ++ if (sdata->vif.txq) ++ ieee80211_txq_purge(sdata->local, to_txq_info(sdata->vif.txq)); ++ + synchronize_rcu(); + + if (sdata->dev) { +diff --git a/net/tipc/core.c b/net/tipc/core.c +index 0b982d048fb9..297430beaa7f 100644 +--- a/net/tipc/core.c ++++ b/net/tipc/core.c +@@ -62,6 +62,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; +@@ -88,6 +92,8 @@ out_subscr: + out_nametbl: + tipc_sk_rht_destroy(net); + out_sk_rht: ++ tipc_socket_stop(); ++out_socket: + return err; + } + +@@ -98,6 +104,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 = { +@@ -125,10 +132,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; +@@ -148,8 +151,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(); +@@ -164,7 +165,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 2ff751eba037..5ebeef8ae3fa 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 40a8731c663b..84d3c0aadd73 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/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c +index 9ff9255d2191..919b8406028c 100644 +--- a/net/xfrm/xfrm_user.c ++++ b/net/xfrm/xfrm_user.c +@@ -1381,7 +1381,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p) + ret = verify_policy_dir(p->dir); + if (ret) + return ret; +- if (p->index && ((p->index & XFRM_POLICY_MAX) != p->dir)) ++ if (p->index && (xfrm_policy_id2dir(p->index) != p->dir)) + return -EINVAL; + + return 0; +diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c +index 0e03377bb83e..dd746bd69a9b 100644 +--- a/security/apparmor/apparmorfs.c ++++ b/security/apparmor/apparmorfs.c +@@ -126,17 +126,22 @@ static int aafs_show_path(struct seq_file *seq, struct dentry *dentry) + return 0; + } + +-static void aafs_evict_inode(struct inode *inode) ++static void aafs_i_callback(struct rcu_head *head) + { +- truncate_inode_pages_final(&inode->i_data); +- clear_inode(inode); ++ struct inode *inode = container_of(head, struct inode, i_rcu); + if (S_ISLNK(inode->i_mode)) + kfree(inode->i_link); ++ free_inode_nonrcu(inode); ++} ++ ++static void aafs_destroy_inode(struct inode *inode) ++{ ++ call_rcu(&inode->i_rcu, aafs_i_callback); + } + + static const struct super_operations aafs_super_ops = { + .statfs = simple_statfs, +- .evict_inode = aafs_evict_inode, ++ .destroy_inode = aafs_destroy_inode, + .show_path = aafs_show_path, + }; + +diff --git a/security/inode.c b/security/inode.c +index 8dd9ca8848e4..829f15672e01 100644 +--- a/security/inode.c ++++ b/security/inode.c +@@ -26,17 +26,22 @@ + static struct vfsmount *mount; + static int mount_count; + +-static void securityfs_evict_inode(struct inode *inode) ++static void securityfs_i_callback(struct rcu_head *head) + { +- truncate_inode_pages_final(&inode->i_data); +- clear_inode(inode); ++ struct inode *inode = container_of(head, struct inode, i_rcu); + if (S_ISLNK(inode->i_mode)) + kfree(inode->i_link); ++ free_inode_nonrcu(inode); ++} ++ ++static void securityfs_destroy_inode(struct inode *inode) ++{ ++ call_rcu(&inode->i_rcu, securityfs_i_callback); + } + + static const struct super_operations securityfs_super_operations = { + .statfs = simple_statfs, +- .evict_inode = securityfs_evict_inode, ++ .destroy_inode = securityfs_destroy_inode, + }; + + static int fill_super(struct super_block *sb, void *data, int silent) +diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile +index 8ae824dbfca3..884d4f1ed0c1 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/bench/numa.c b/tools/perf/bench/numa.c +index 0afcc7eccc61..997875c770b1 100644 +--- a/tools/perf/bench/numa.c ++++ b/tools/perf/bench/numa.c +@@ -38,6 +38,10 @@ + #include <numa.h> + #include <numaif.h> + ++#ifndef RUSAGE_THREAD ++# define RUSAGE_THREAD 1 ++#endif ++ + /* + * Regular printout to the terminal, supressed if -q is specified: + */ +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 0bc3e6e93c31..4357141c7c92 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: +@@ -1249,7 +1258,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; +@@ -1280,7 +1291,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; +@@ -1300,8 +1313,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; + } +@@ -2349,6 +2365,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); +diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c +index 32aa88c19b8d..4154f98b337c 100644 +--- a/virt/kvm/arm/arm.c ++++ b/virt/kvm/arm/arm.c +@@ -856,7 +856,7 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, + static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, + const struct kvm_vcpu_init *init) + { +- unsigned int i; ++ unsigned int i, ret; + int phys_target = kvm_target_cpu(); + + if (init->target != phys_target) +@@ -891,9 +891,14 @@ static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, + vcpu->arch.target = phys_target; + + /* Now we know what it is, we can reset it. */ +- return kvm_reset_vcpu(vcpu); +-} ++ ret = kvm_reset_vcpu(vcpu); ++ if (ret) { ++ vcpu->arch.target = -1; ++ bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES); ++ } + ++ return ret; ++} + + static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, + struct kvm_vcpu_init *init)
