diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2017-10-08 10:23:34 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2017-10-08 10:23:34 -0400 |
| commit | e159d9558c542321dd5ae77d239bdf1b897190e6 (patch) | |
| tree | f53446d638f2dc4150dea83886f50fdc09d29fb4 | |
| parent | Revert "Linux patch 4.9.54" (diff) | |
| download | linux-patches-4.9-56.tar.gz linux-patches-4.9-56.tar.bz2 linux-patches-4.9-56.zip | |
Linux patch 4.9.544.9-56
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1053_linux-4.9.54.patch | 4457 |
2 files changed, 4461 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 8c1812a1..b6fac137 100644 --- a/0000_README +++ b/0000_README @@ -255,6 +255,10 @@ Patch: 1052_linux-4.9.53.patch From: http://www.kernel.org Desc: Linux 4.9.53 +Patch: 1053_linux-4.9.54.patch +From: http://www.kernel.org +Desc: Linux 4.9.54 + 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/1053_linux-4.9.54.patch b/1053_linux-4.9.54.patch new file mode 100644 index 00000000..c50c95c2 --- /dev/null +++ b/1053_linux-4.9.54.patch @@ -0,0 +1,4457 @@ +diff --git a/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt b/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt +new file mode 100644 +index 000000000000..6ec1a880ac18 +--- /dev/null ++++ b/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt +@@ -0,0 +1,46 @@ ++THS8135 Video DAC ++----------------- ++ ++This is the binding for Texas Instruments THS8135 Video DAC bridge. ++ ++Required properties: ++ ++- compatible: Must be "ti,ths8135" ++ ++Required nodes: ++ ++This device has two video ports. Their connections are modelled using the OF ++graph bindings specified in Documentation/devicetree/bindings/graph.txt. ++ ++- Video port 0 for RGB input ++- Video port 1 for VGA output ++ ++Example ++------- ++ ++vga-bridge { ++ compatible = "ti,ths8135"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ ++ vga_bridge_in: endpoint { ++ remote-endpoint = <&lcdc_out_vga>; ++ }; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ ++ vga_bridge_out: endpoint { ++ remote-endpoint = <&vga_con_in>; ++ }; ++ }; ++ }; ++}; +diff --git a/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt b/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt +new file mode 100644 +index 000000000000..b3629405f568 +--- /dev/null ++++ b/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt +@@ -0,0 +1,18 @@ ++* AVIA HX711 ADC chip for weight cells ++ Bit-banging driver ++ ++Required properties: ++ - compatible: Should be "avia,hx711" ++ - sck-gpios: Definition of the GPIO for the clock ++ - dout-gpios: Definition of the GPIO for data-out ++ See Documentation/devicetree/bindings/gpio/gpio.txt ++ - avdd-supply: Definition of the regulator used as analog supply ++ ++Example: ++weight@0 { ++ compatible = "avia,hx711"; ++ sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>; ++ dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; ++ avdd-suppy = <&avdd>; ++}; ++ +diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt +index f0a48ea78659..bceffffb7502 100644 +--- a/Documentation/devicetree/bindings/vendor-prefixes.txt ++++ b/Documentation/devicetree/bindings/vendor-prefixes.txt +@@ -38,6 +38,7 @@ atmel Atmel Corporation + auo AU Optronics Corporation + auvidea Auvidea GmbH + avago Avago Technologies ++avia avia semiconductor + avic Shanghai AVIC Optoelectronics Co., Ltd. + axis Axis Communications AB + boe BOE Technology Group Co., Ltd. +diff --git a/Makefile b/Makefile +index 98e3be659b21..8370937bbb22 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 9 +-SUBLEVEL = 53 ++SUBLEVEL = 54 + EXTRAVERSION = + NAME = Roaring Lionus + +diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu +index aed66d5df7f1..b7576349528c 100644 +--- a/arch/arm/Kconfig-nommu ++++ b/arch/arm/Kconfig-nommu +@@ -34,8 +34,7 @@ config PROCESSOR_ID + used instead of the auto-probing which utilizes the register. + + config REMAP_VECTORS_TO_RAM +- bool 'Install vectors to the beginning of RAM' if DRAM_BASE +- depends on DRAM_BASE ++ bool 'Install vectors to the beginning of RAM' + help + The kernel needs to change the hardware exception vectors. + In nommu mode, the hardware exception vectors are normally +diff --git a/arch/arm/boot/dts/am335x-chilisom.dtsi b/arch/arm/boot/dts/am335x-chilisom.dtsi +index f9ee5859c154..1b43ebd08b38 100644 +--- a/arch/arm/boot/dts/am335x-chilisom.dtsi ++++ b/arch/arm/boot/dts/am335x-chilisom.dtsi +@@ -124,6 +124,14 @@ + + &rtc { + system-power-controller; ++ ++ pinctrl-0 = <&ext_wakeup>; ++ pinctrl-names = "default"; ++ ++ ext_wakeup: ext-wakeup { ++ pins = "ext_wakeup0"; ++ input-enable; ++ }; + }; + + /* NAND Flash */ +diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts +index 05a985a20378..6208e85acd9d 100644 +--- a/arch/arm/boot/dts/bcm953012k.dts ++++ b/arch/arm/boot/dts/bcm953012k.dts +@@ -48,7 +48,7 @@ + }; + + memory { +- reg = <0x00000000 0x10000000>; ++ reg = <0x80000000 0x10000000>; + }; + }; + +diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +index 8aa19ba14436..5282d69e55bd 100644 +--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi ++++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +@@ -97,11 +97,11 @@ + thermal-zones { + cpu_thermal: cpu-thermal { + cooling-maps { +- map0 { ++ cooling_map0: map0 { + /* Corresponds to 800MHz at freq_table */ + cooling-device = <&cpu0 7 7>; + }; +- map1 { ++ cooling_map1: map1 { + /* Corresponds to 200MHz at freq_table */ + cooling-device = <&cpu0 13 13>; + }; +diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts +index 99634c54dca9..7504a5aa538e 100644 +--- a/arch/arm/boot/dts/exynos4412-odroidu3.dts ++++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts +@@ -13,6 +13,7 @@ + + /dts-v1/; + #include "exynos4412-odroid-common.dtsi" ++#include "exynos4412-prime.dtsi" + + / { + model = "Hardkernel ODROID-U3 board based on Exynos4412"; +@@ -47,11 +48,11 @@ + cooling-maps { + map0 { + trip = <&cpu_alert1>; +- cooling-device = <&cpu0 7 7>; ++ cooling-device = <&cpu0 9 9>; + }; + map1 { + trip = <&cpu_alert2>; +- cooling-device = <&cpu0 13 13>; ++ cooling-device = <&cpu0 15 15>; + }; + map2 { + trip = <&cpu_alert0>; +diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts +index 4d228858f172..d6e92ebc3874 100644 +--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts ++++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts +@@ -12,6 +12,7 @@ + */ + + #include "exynos4412-odroidx.dts" ++#include "exynos4412-prime.dtsi" + + / { + model = "Hardkernel ODROID-X2 board based on Exynos4412"; +diff --git a/arch/arm/boot/dts/exynos4412-prime.dtsi b/arch/arm/boot/dts/exynos4412-prime.dtsi +new file mode 100644 +index 000000000000..e75bc170c89c +--- /dev/null ++++ b/arch/arm/boot/dts/exynos4412-prime.dtsi +@@ -0,0 +1,41 @@ ++/* ++ * Samsung's Exynos4412 Prime SoC device tree source ++ * ++ * Copyright (c) 2016 Samsung Electronics Co., Ltd. ++ * http://www.samsung.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++/* ++ * Exynos4412 Prime SoC revision supports higher CPU frequencies than ++ * non-Prime version. Therefore we need to update OPPs table and ++ * thermal maps accordingly. ++ */ ++ ++&cpu0_opp_1500 { ++ /delete-property/turbo-mode; ++}; ++ ++&cpu0_opp_table { ++ opp@1600000000 { ++ opp-hz = /bits/ 64 <1600000000>; ++ opp-microvolt = <1350000>; ++ clock-latency-ns = <200000>; ++ }; ++ opp@1704000000 { ++ opp-hz = /bits/ 64 <1704000000>; ++ opp-microvolt = <1350000>; ++ clock-latency-ns = <200000>; ++ }; ++}; ++ ++&cooling_map0 { ++ cooling-device = <&cpu0 9 9>; ++}; ++ ++&cooling_map1 { ++ cooling-device = <&cpu0 15 15>; ++}; +diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi +index 40beede46e55..3ebdf01d814c 100644 +--- a/arch/arm/boot/dts/exynos4412.dtsi ++++ b/arch/arm/boot/dts/exynos4412.dtsi +@@ -130,7 +130,7 @@ + opp-microvolt = <1287500>; + clock-latency-ns = <200000>; + }; +- opp@1500000000 { ++ cpu0_opp_1500: opp@1500000000 { + opp-hz = /bits/ 64 <1500000000>; + opp-microvolt = <1350000>; + clock-latency-ns = <200000>; +diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi +index 18596a2c58a1..77c6b931dc24 100644 +--- a/arch/arm/boot/dts/mt2701.dtsi ++++ b/arch/arm/boot/dts/mt2701.dtsi +@@ -174,4 +174,40 @@ + clocks = <&uart_clk>; + status = "disabled"; + }; ++ ++ mmsys: syscon@14000000 { ++ compatible = "mediatek,mt2701-mmsys", "syscon"; ++ reg = <0 0x14000000 0 0x1000>; ++ #clock-cells = <1>; ++ }; ++ ++ imgsys: syscon@15000000 { ++ compatible = "mediatek,mt2701-imgsys", "syscon"; ++ reg = <0 0x15000000 0 0x1000>; ++ #clock-cells = <1>; ++ }; ++ ++ vdecsys: syscon@16000000 { ++ compatible = "mediatek,mt2701-vdecsys", "syscon"; ++ reg = <0 0x16000000 0 0x1000>; ++ #clock-cells = <1>; ++ }; ++ ++ hifsys: syscon@1a000000 { ++ compatible = "mediatek,mt2701-hifsys", "syscon"; ++ reg = <0 0x1a000000 0 0x1000>; ++ #clock-cells = <1>; ++ }; ++ ++ ethsys: syscon@1b000000 { ++ compatible = "mediatek,mt2701-ethsys", "syscon"; ++ reg = <0 0x1b000000 0 0x1000>; ++ #clock-cells = <1>; ++ }; ++ ++ bdpsys: syscon@1c000000 { ++ compatible = "mediatek,mt2701-bdpsys", "syscon"; ++ reg = <0 0x1c000000 0 0x1000>; ++ #clock-cells = <1>; ++ }; + }; +diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi +index 351fcc2f87df..b6c6410ca384 100644 +--- a/arch/arm/boot/dts/r8a7790.dtsi ++++ b/arch/arm/boot/dts/r8a7790.dtsi +@@ -1493,7 +1493,8 @@ + }; + + msiof0: spi@e6e20000 { +- compatible = "renesas,msiof-r8a7790"; ++ compatible = "renesas,msiof-r8a7790", ++ "renesas,rcar-gen2-msiof"; + reg = <0 0xe6e20000 0 0x0064>; + interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp0_clks R8A7790_CLK_MSIOF0>; +@@ -1507,7 +1508,8 @@ + }; + + msiof1: spi@e6e10000 { +- compatible = "renesas,msiof-r8a7790"; ++ compatible = "renesas,msiof-r8a7790", ++ "renesas,rcar-gen2-msiof"; + reg = <0 0xe6e10000 0 0x0064>; + interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A7790_CLK_MSIOF1>; +@@ -1521,7 +1523,8 @@ + }; + + msiof2: spi@e6e00000 { +- compatible = "renesas,msiof-r8a7790"; ++ compatible = "renesas,msiof-r8a7790", ++ "renesas,rcar-gen2-msiof"; + reg = <0 0xe6e00000 0 0x0064>; + interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A7790_CLK_MSIOF2>; +@@ -1535,7 +1538,8 @@ + }; + + msiof3: spi@e6c90000 { +- compatible = "renesas,msiof-r8a7790"; ++ compatible = "renesas,msiof-r8a7790", ++ "renesas,rcar-gen2-msiof"; + reg = <0 0xe6c90000 0 0x0064>; + interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp2_clks R8A7790_CLK_MSIOF3>; +diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c +index 31dde8b6f2ea..8ba0e2e5ad97 100644 +--- a/arch/arm/mach-at91/pm.c ++++ b/arch/arm/mach-at91/pm.c +@@ -335,7 +335,7 @@ static void at91sam9_sdram_standby(void) + at91_ramc_write(1, AT91_SDRAMC_LPR, saved_lpr1); + } + +-static const struct of_device_id const ramc_ids[] __initconst = { ++static const struct of_device_id ramc_ids[] __initconst = { + { .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby }, + { .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby }, + { .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby }, +diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c +index cf3f8658f0e5..a55a7ecf146a 100644 +--- a/arch/arm/mach-bcm/bcm_kona_smc.c ++++ b/arch/arm/mach-bcm/bcm_kona_smc.c +@@ -33,7 +33,7 @@ struct bcm_kona_smc_data { + unsigned result; + }; + +-static const struct of_device_id const bcm_kona_smc_ids[] __initconst = { ++static const struct of_device_id bcm_kona_smc_ids[] __initconst = { + {.compatible = "brcm,kona-smc"}, + {.compatible = "bcm,kona-smc"}, /* deprecated name */ + {}, +diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c +index 03da3813f1ab..7d5a44a06648 100644 +--- a/arch/arm/mach-cns3xxx/core.c ++++ b/arch/arm/mach-cns3xxx/core.c +@@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { + .power_off = csn3xxx_usb_power_off, + }; + +-static const struct of_dev_auxdata const cns3xxx_auxdata[] __initconst = { ++static const struct of_dev_auxdata cns3xxx_auxdata[] __initconst = { + { "intel,usb-ehci", CNS3XXX_USB_BASE, "ehci-platform", &cns3xxx_usb_ehci_pdata }, + { "intel,usb-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata }, + { "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL }, +diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c +index 5b2f5138d938..f1ca9479491b 100644 +--- a/arch/arm/mach-omap2/prm_common.c ++++ b/arch/arm/mach-omap2/prm_common.c +@@ -713,7 +713,7 @@ static struct omap_prcm_init_data scrm_data __initdata = { + }; + #endif + +-static const struct of_device_id const omap_prcm_dt_match_table[] __initconst = { ++static const struct of_device_id omap_prcm_dt_match_table[] __initconst = { + #ifdef CONFIG_SOC_AM33XX + { .compatible = "ti,am3-prcm", .data = &am3_prm_data }, + #endif +diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c +index 2028167fff31..d76b1e5eb8ba 100644 +--- a/arch/arm/mach-omap2/vc.c ++++ b/arch/arm/mach-omap2/vc.c +@@ -559,7 +559,7 @@ struct i2c_init_data { + u8 hsscll_12; + }; + +-static const struct i2c_init_data const omap4_i2c_timing_data[] __initconst = { ++static const struct i2c_init_data omap4_i2c_timing_data[] __initconst = { + { + .load = 50, + .loadbits = 0x3, +diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c +index 9ccffc1d0f28..aaaa6781b9fe 100644 +--- a/arch/arm/mach-spear/time.c ++++ b/arch/arm/mach-spear/time.c +@@ -204,7 +204,7 @@ static void __init spear_clockevent_init(int irq) + setup_irq(irq, &spear_timer_irq); + } + +-static const struct of_device_id const timer_of_match[] __initconst = { ++static const struct of_device_id timer_of_match[] __initconst = { + { .compatible = "st,spear-timer", }, + { }, + }; +diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c +index cc3a1e33a600..7e2bb12b64ea 100644 +--- a/arch/mips/ath79/clock.c ++++ b/arch/mips/ath79/clock.c +@@ -508,16 +508,19 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np) + ar9330_clk_init(ref_clk, pll_base); + else { + pr_err("%s: could not find any appropriate clk_init()\n", dnfn); +- goto err_clk; ++ goto err_iounmap; + } + + if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) { + pr_err("%s: could not register clk provider\n", dnfn); +- goto err_clk; ++ goto err_iounmap; + } + + return; + ++err_iounmap: ++ iounmap(pll_base); ++ + err_clk: + clk_put(ref_clk); + +diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h +index 956db6e201d1..ddd1c918103b 100644 +--- a/arch/mips/include/asm/irq.h ++++ b/arch/mips/include/asm/irq.h +@@ -18,9 +18,24 @@ + #include <irq.h> + + #define IRQ_STACK_SIZE THREAD_SIZE ++#define IRQ_STACK_START (IRQ_STACK_SIZE - sizeof(unsigned long)) + + extern void *irq_stack[NR_CPUS]; + ++/* ++ * The highest address on the IRQ stack contains a dummy frame put down in ++ * genex.S (handle_int & except_vec_vi_handler) which is structured as follows: ++ * ++ * top ------------ ++ * | task sp | <- irq_stack[cpu] + IRQ_STACK_START ++ * ------------ ++ * | | <- First frame of IRQ context ++ * ------------ ++ * ++ * task sp holds a copy of the task stack pointer where the struct pt_regs ++ * from exception entry can be found. ++ */ ++ + static inline bool on_irq_stack(int cpu, unsigned long sp) + { + unsigned long low = (unsigned long)irq_stack[cpu]; +diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c +index 4be2763f835d..bfff6ea45d51 100644 +--- a/arch/mips/kernel/asm-offsets.c ++++ b/arch/mips/kernel/asm-offsets.c +@@ -103,6 +103,7 @@ void output_thread_info_defines(void) + DEFINE(_THREAD_SIZE, THREAD_SIZE); + DEFINE(_THREAD_MASK, THREAD_MASK); + DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE); ++ DEFINE(_IRQ_STACK_START, IRQ_STACK_START); + BLANK(); + } + +diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S +index 59476a607add..a00e87b0256d 100644 +--- a/arch/mips/kernel/cps-vec.S ++++ b/arch/mips/kernel/cps-vec.S +@@ -361,7 +361,7 @@ LEAF(mips_cps_get_bootcfg) + END(mips_cps_get_bootcfg) + + LEAF(mips_cps_boot_vpes) +- PTR_L ta2, COREBOOTCFG_VPEMASK(a0) ++ lw ta2, COREBOOTCFG_VPEMASK(a0) + PTR_L ta3, COREBOOTCFG_VPECONFIG(a0) + + #if defined(CONFIG_CPU_MIPSR6) +diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S +index 2ac6c2625c13..ae810da4d499 100644 +--- a/arch/mips/kernel/genex.S ++++ b/arch/mips/kernel/genex.S +@@ -215,9 +215,11 @@ NESTED(handle_int, PT_SIZE, sp) + beq t0, t1, 2f + + /* Switch to IRQ stack */ +- li t1, _IRQ_STACK_SIZE ++ li t1, _IRQ_STACK_START + PTR_ADD sp, t0, t1 + ++ /* Save task's sp on IRQ stack so that unwinding can follow it */ ++ LONG_S s1, 0(sp) + 2: + jal plat_irq_dispatch + +@@ -325,9 +327,11 @@ NESTED(except_vec_vi_handler, 0, sp) + beq t0, t1, 2f + + /* Switch to IRQ stack */ +- li t1, _IRQ_STACK_SIZE ++ li t1, _IRQ_STACK_START + PTR_ADD sp, t0, t1 + ++ /* Save task's sp on IRQ stack so that unwinding can follow it */ ++ LONG_S s1, 0(sp) + 2: + jalr v0 + +diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c +index fbbf5fcc695a..1b50958a1373 100644 +--- a/arch/mips/kernel/process.c ++++ b/arch/mips/kernel/process.c +@@ -487,31 +487,52 @@ unsigned long notrace unwind_stack_by_address(unsigned long stack_page, + unsigned long pc, + unsigned long *ra) + { ++ unsigned long low, high, irq_stack_high; + struct mips_frame_info info; + unsigned long size, ofs; ++ struct pt_regs *regs; + int leaf; +- extern void ret_from_irq(void); +- extern void ret_from_exception(void); + + if (!stack_page) + return 0; + + /* +- * If we reached the bottom of interrupt context, +- * return saved pc in pt_regs. ++ * IRQ stacks start at IRQ_STACK_START ++ * task stacks at THREAD_SIZE - 32 + */ +- if (pc == (unsigned long)ret_from_irq || +- pc == (unsigned long)ret_from_exception) { +- struct pt_regs *regs; +- if (*sp >= stack_page && +- *sp + sizeof(*regs) <= stack_page + THREAD_SIZE - 32) { +- regs = (struct pt_regs *)*sp; +- pc = regs->cp0_epc; +- if (!user_mode(regs) && __kernel_text_address(pc)) { +- *sp = regs->regs[29]; +- *ra = regs->regs[31]; +- return pc; +- } ++ low = stack_page; ++ if (!preemptible() && on_irq_stack(raw_smp_processor_id(), *sp)) { ++ high = stack_page + IRQ_STACK_START; ++ irq_stack_high = high; ++ } else { ++ high = stack_page + THREAD_SIZE - 32; ++ irq_stack_high = 0; ++ } ++ ++ /* ++ * If we reached the top of the interrupt stack, start unwinding ++ * the interrupted task stack. ++ */ ++ if (unlikely(*sp == irq_stack_high)) { ++ unsigned long task_sp = *(unsigned long *)*sp; ++ ++ /* ++ * Check that the pointer saved in the IRQ stack head points to ++ * something within the stack of the current task ++ */ ++ if (!object_is_on_stack((void *)task_sp)) ++ return 0; ++ ++ /* ++ * Follow pointer to tasks kernel stack frame where interrupted ++ * state was saved. ++ */ ++ regs = (struct pt_regs *)task_sp; ++ pc = regs->cp0_epc; ++ if (!user_mode(regs) && __kernel_text_address(pc)) { ++ *sp = regs->regs[29]; ++ *ra = regs->regs[31]; ++ return pc; + } + return 0; + } +@@ -532,8 +553,7 @@ unsigned long notrace unwind_stack_by_address(unsigned long stack_page, + if (leaf < 0) + return 0; + +- if (*sp < stack_page || +- *sp + info.frame_size > stack_page + THREAD_SIZE - 32) ++ if (*sp < low || *sp + info.frame_size > high) + return 0; + + if (leaf) +diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S +index d5de67591735..f0a0e6d62be3 100644 +--- a/arch/mips/kernel/vmlinux.lds.S ++++ b/arch/mips/kernel/vmlinux.lds.S +@@ -182,7 +182,7 @@ SECTIONS + * Force .bss to 64K alignment so that .bss..swapper_pg_dir + * gets that alignment. .sbss should be empty, so there will be + * no holes after __init_end. */ +- BSS_SECTION(0, 0x10000, 0) ++ BSS_SECTION(0, 0x10000, 8) + + _end = . ; + +diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c +index 90565477dfbd..95bec460b651 100644 +--- a/arch/mips/lantiq/xway/sysctrl.c ++++ b/arch/mips/lantiq/xway/sysctrl.c +@@ -469,8 +469,8 @@ void __init ltq_soc_init(void) + panic("Failed to load xbar nodes from devicetree"); + if (of_address_to_resource(np_xbar, 0, &res_xbar)) + panic("Failed to get xbar resources"); +- if (request_mem_region(res_xbar.start, resource_size(&res_xbar), +- res_xbar.name) < 0) ++ if (!request_mem_region(res_xbar.start, resource_size(&res_xbar), ++ res_xbar.name)) + panic("Failed to get xbar resources"); + + ltq_xbar_membase = ioremap_nocache(res_xbar.start, +diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c +index 3c7c9bf57bf3..6f892c1f3ad7 100644 +--- a/arch/mips/ralink/mt7620.c ++++ b/arch/mips/ralink/mt7620.c +@@ -176,7 +176,7 @@ static struct rt2880_pmx_func spi_cs1_grp_mt7628[] = { + + static struct rt2880_pmx_func spis_grp_mt7628[] = { + FUNC("pwm_uart2", 3, 14, 4), +- FUNC("util", 2, 14, 4), ++ FUNC("utif", 2, 14, 4), + FUNC("gpio", 1, 14, 4), + FUNC("spis", 0, 14, 4), + }; +@@ -190,28 +190,28 @@ static struct rt2880_pmx_func gpio_grp_mt7628[] = { + + static struct rt2880_pmx_func p4led_kn_grp_mt7628[] = { + FUNC("jtag", 3, 30, 1), +- FUNC("util", 2, 30, 1), ++ FUNC("utif", 2, 30, 1), + FUNC("gpio", 1, 30, 1), + FUNC("p4led_kn", 0, 30, 1), + }; + + static struct rt2880_pmx_func p3led_kn_grp_mt7628[] = { + FUNC("jtag", 3, 31, 1), +- FUNC("util", 2, 31, 1), ++ FUNC("utif", 2, 31, 1), + FUNC("gpio", 1, 31, 1), + FUNC("p3led_kn", 0, 31, 1), + }; + + static struct rt2880_pmx_func p2led_kn_grp_mt7628[] = { + FUNC("jtag", 3, 32, 1), +- FUNC("util", 2, 32, 1), ++ FUNC("utif", 2, 32, 1), + FUNC("gpio", 1, 32, 1), + FUNC("p2led_kn", 0, 32, 1), + }; + + static struct rt2880_pmx_func p1led_kn_grp_mt7628[] = { + FUNC("jtag", 3, 33, 1), +- FUNC("util", 2, 33, 1), ++ FUNC("utif", 2, 33, 1), + FUNC("gpio", 1, 33, 1), + FUNC("p1led_kn", 0, 33, 1), + }; +@@ -232,28 +232,28 @@ static struct rt2880_pmx_func wled_kn_grp_mt7628[] = { + + static struct rt2880_pmx_func p4led_an_grp_mt7628[] = { + FUNC("jtag", 3, 39, 1), +- FUNC("util", 2, 39, 1), ++ FUNC("utif", 2, 39, 1), + FUNC("gpio", 1, 39, 1), + FUNC("p4led_an", 0, 39, 1), + }; + + static struct rt2880_pmx_func p3led_an_grp_mt7628[] = { + FUNC("jtag", 3, 40, 1), +- FUNC("util", 2, 40, 1), ++ FUNC("utif", 2, 40, 1), + FUNC("gpio", 1, 40, 1), + FUNC("p3led_an", 0, 40, 1), + }; + + static struct rt2880_pmx_func p2led_an_grp_mt7628[] = { + FUNC("jtag", 3, 41, 1), +- FUNC("util", 2, 41, 1), ++ FUNC("utif", 2, 41, 1), + FUNC("gpio", 1, 41, 1), + FUNC("p2led_an", 0, 41, 1), + }; + + static struct rt2880_pmx_func p1led_an_grp_mt7628[] = { + FUNC("jtag", 3, 42, 1), +- FUNC("util", 2, 42, 1), ++ FUNC("utif", 2, 42, 1), + FUNC("gpio", 1, 42, 1), + FUNC("p1led_an", 0, 42, 1), + }; +diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c +index 9e4631acfcb5..3e68e35daf21 100644 +--- a/arch/mips/ralink/rt3883.c ++++ b/arch/mips/ralink/rt3883.c +@@ -145,5 +145,5 @@ void prom_soc_init(struct ralink_soc_info *soc_info) + + rt2880_pinmux_data = rt3883_pinmux_data; + +- ralink_soc == RT3883_SOC; ++ ralink_soc = RT3883_SOC; + } +diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c +index 518f4f5f1f43..d63d42533133 100644 +--- a/arch/parisc/kernel/perf.c ++++ b/arch/parisc/kernel/perf.c +@@ -39,7 +39,7 @@ + * the PDC INTRIGUE calls. This is done to eliminate bugs introduced + * in various PDC revisions. The code is much more maintainable + * and reliable this way vs having to debug on every version of PDC +- * on every box. ++ * on every box. + */ + + #include <linux/capability.h> +@@ -195,8 +195,8 @@ static int perf_config(uint32_t *image_ptr); + static int perf_release(struct inode *inode, struct file *file); + static int perf_open(struct inode *inode, struct file *file); + static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t *ppos); +-static ssize_t perf_write(struct file *file, const char __user *buf, size_t count, +- loff_t *ppos); ++static ssize_t perf_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos); + static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg); + static void perf_start_counters(void); + static int perf_stop_counters(uint32_t *raddr); +@@ -222,7 +222,7 @@ extern void perf_intrigue_disable_perf_counters (void); + /* + * configure: + * +- * Configure the cpu with a given data image. First turn off the counters, ++ * Configure the cpu with a given data image. First turn off the counters, + * then download the image, then turn the counters back on. + */ + static int perf_config(uint32_t *image_ptr) +@@ -234,7 +234,7 @@ static int perf_config(uint32_t *image_ptr) + error = perf_stop_counters(raddr); + if (error != 0) { + printk("perf_config: perf_stop_counters = %ld\n", error); +- return -EINVAL; ++ return -EINVAL; + } + + printk("Preparing to write image\n"); +@@ -242,7 +242,7 @@ printk("Preparing to write image\n"); + error = perf_write_image((uint64_t *)image_ptr); + if (error != 0) { + printk("perf_config: DOWNLOAD = %ld\n", error); +- return -EINVAL; ++ return -EINVAL; + } + + printk("Preparing to start counters\n"); +@@ -254,7 +254,7 @@ printk("Preparing to start counters\n"); + } + + /* +- * Open the device and initialize all of its memory. The device is only ++ * Open the device and initialize all of its memory. The device is only + * opened once, but can be "queried" by multiple processes that know its + * file descriptor. + */ +@@ -298,8 +298,8 @@ static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t + * called on the processor that the download should happen + * on. + */ +-static ssize_t perf_write(struct file *file, const char __user *buf, size_t count, +- loff_t *ppos) ++static ssize_t perf_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) + { + int err; + size_t image_size; +@@ -307,11 +307,11 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun + uint32_t interface_type; + uint32_t test; + +- if (perf_processor_interface == ONYX_INTF) ++ if (perf_processor_interface == ONYX_INTF) + image_size = PCXU_IMAGE_SIZE; +- else if (perf_processor_interface == CUDA_INTF) ++ else if (perf_processor_interface == CUDA_INTF) + image_size = PCXW_IMAGE_SIZE; +- else ++ else + return -EFAULT; + + if (!capable(CAP_SYS_ADMIN)) +@@ -331,22 +331,22 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun + + /* First check the machine type is correct for + the requested image */ +- if (((perf_processor_interface == CUDA_INTF) && +- (interface_type != CUDA_INTF)) || +- ((perf_processor_interface == ONYX_INTF) && +- (interface_type != ONYX_INTF))) ++ if (((perf_processor_interface == CUDA_INTF) && ++ (interface_type != CUDA_INTF)) || ++ ((perf_processor_interface == ONYX_INTF) && ++ (interface_type != ONYX_INTF))) + return -EINVAL; + + /* Next check to make sure the requested image + is valid */ +- if (((interface_type == CUDA_INTF) && ++ if (((interface_type == CUDA_INTF) && + (test >= MAX_CUDA_IMAGES)) || +- ((interface_type == ONYX_INTF) && +- (test >= MAX_ONYX_IMAGES))) ++ ((interface_type == ONYX_INTF) && ++ (test >= MAX_ONYX_IMAGES))) + return -EINVAL; + + /* Copy the image into the processor */ +- if (interface_type == CUDA_INTF) ++ if (interface_type == CUDA_INTF) + return perf_config(cuda_images[test]); + else + return perf_config(onyx_images[test]); +@@ -360,7 +360,7 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun + static void perf_patch_images(void) + { + #if 0 /* FIXME!! */ +-/* ++/* + * NOTE: this routine is VERY specific to the current TLB image. + * If the image is changed, this routine might also need to be changed. + */ +@@ -368,9 +368,9 @@ static void perf_patch_images(void) + extern void $i_dtlb_miss_2_0(); + extern void PA2_0_iva(); + +- /* ++ /* + * We can only use the lower 32-bits, the upper 32-bits should be 0 +- * anyway given this is in the kernel ++ * anyway given this is in the kernel + */ + uint32_t itlb_addr = (uint32_t)&($i_itlb_miss_2_0); + uint32_t dtlb_addr = (uint32_t)&($i_dtlb_miss_2_0); +@@ -378,21 +378,21 @@ static void perf_patch_images(void) + + if (perf_processor_interface == ONYX_INTF) { + /* clear last 2 bytes */ +- onyx_images[TLBMISS][15] &= 0xffffff00; ++ onyx_images[TLBMISS][15] &= 0xffffff00; + /* set 2 bytes */ + onyx_images[TLBMISS][15] |= (0x000000ff&((dtlb_addr) >> 24)); + onyx_images[TLBMISS][16] = (dtlb_addr << 8)&0xffffff00; + onyx_images[TLBMISS][17] = itlb_addr; + + /* clear last 2 bytes */ +- onyx_images[TLBHANDMISS][15] &= 0xffffff00; ++ onyx_images[TLBHANDMISS][15] &= 0xffffff00; + /* set 2 bytes */ + onyx_images[TLBHANDMISS][15] |= (0x000000ff&((dtlb_addr) >> 24)); + onyx_images[TLBHANDMISS][16] = (dtlb_addr << 8)&0xffffff00; + onyx_images[TLBHANDMISS][17] = itlb_addr; + + /* clear last 2 bytes */ +- onyx_images[BIG_CPI][15] &= 0xffffff00; ++ onyx_images[BIG_CPI][15] &= 0xffffff00; + /* set 2 bytes */ + onyx_images[BIG_CPI][15] |= (0x000000ff&((dtlb_addr) >> 24)); + onyx_images[BIG_CPI][16] = (dtlb_addr << 8)&0xffffff00; +@@ -405,24 +405,24 @@ static void perf_patch_images(void) + + } else if (perf_processor_interface == CUDA_INTF) { + /* Cuda interface */ +- cuda_images[TLBMISS][16] = ++ cuda_images[TLBMISS][16] = + (cuda_images[TLBMISS][16]&0xffff0000) | + ((dtlb_addr >> 8)&0x0000ffff); +- cuda_images[TLBMISS][17] = ++ cuda_images[TLBMISS][17] = + ((dtlb_addr << 24)&0xff000000) | ((itlb_addr >> 16)&0x000000ff); + cuda_images[TLBMISS][18] = (itlb_addr << 16)&0xffff0000; + +- cuda_images[TLBHANDMISS][16] = ++ cuda_images[TLBHANDMISS][16] = + (cuda_images[TLBHANDMISS][16]&0xffff0000) | + ((dtlb_addr >> 8)&0x0000ffff); +- cuda_images[TLBHANDMISS][17] = ++ cuda_images[TLBHANDMISS][17] = + ((dtlb_addr << 24)&0xff000000) | ((itlb_addr >> 16)&0x000000ff); + cuda_images[TLBHANDMISS][18] = (itlb_addr << 16)&0xffff0000; + +- cuda_images[BIG_CPI][16] = ++ cuda_images[BIG_CPI][16] = + (cuda_images[BIG_CPI][16]&0xffff0000) | + ((dtlb_addr >> 8)&0x0000ffff); +- cuda_images[BIG_CPI][17] = ++ cuda_images[BIG_CPI][17] = + ((dtlb_addr << 24)&0xff000000) | ((itlb_addr >> 16)&0x000000ff); + cuda_images[BIG_CPI][18] = (itlb_addr << 16)&0xffff0000; + } else { +@@ -434,7 +434,7 @@ static void perf_patch_images(void) + + /* + * ioctl routine +- * All routines effect the processor that they are executed on. Thus you ++ * All routines effect the processor that they are executed on. Thus you + * must be running on the processor that you wish to change. + */ + +@@ -460,7 +460,7 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg) + } + + /* copy out the Counters */ +- if (copy_to_user((void __user *)arg, raddr, ++ if (copy_to_user((void __user *)arg, raddr, + sizeof (raddr)) != 0) { + error = -EFAULT; + break; +@@ -488,7 +488,7 @@ static const struct file_operations perf_fops = { + .open = perf_open, + .release = perf_release + }; +- ++ + static struct miscdevice perf_dev = { + MISC_DYNAMIC_MINOR, + PA_PERF_DEV, +@@ -596,7 +596,7 @@ static int perf_stop_counters(uint32_t *raddr) + /* OR sticky2 (bit 1496) to counter2 bit 32 */ + tmp64 |= (userbuf[23] >> 8) & 0x0000000080000000; + raddr[2] = (uint32_t)tmp64; +- ++ + /* Counter3 is bits 1497 to 1528 */ + tmp64 = (userbuf[23] >> 7) & 0x00000000ffffffff; + /* OR sticky3 (bit 1529) to counter3 bit 32 */ +@@ -618,7 +618,7 @@ static int perf_stop_counters(uint32_t *raddr) + userbuf[22] = 0; + userbuf[23] = 0; + +- /* ++ /* + * Write back the zeroed bytes + the image given + * the read was destructive. + */ +@@ -626,13 +626,13 @@ static int perf_stop_counters(uint32_t *raddr) + } else { + + /* +- * Read RDR-15 which contains the counters and sticky bits ++ * Read RDR-15 which contains the counters and sticky bits + */ + if (!perf_rdr_read_ubuf(15, userbuf)) { + return -13; + } + +- /* ++ /* + * Clear out the counters + */ + perf_rdr_clear(15); +@@ -645,7 +645,7 @@ static int perf_stop_counters(uint32_t *raddr) + raddr[2] = (uint32_t)((userbuf[1] >> 32) & 0x00000000ffffffffUL); + raddr[3] = (uint32_t)(userbuf[1] & 0x00000000ffffffffUL); + } +- ++ + return 0; + } + +@@ -683,7 +683,7 @@ static int perf_rdr_read_ubuf(uint32_t rdr_num, uint64_t *buffer) + i = tentry->num_words; + while (i--) { + buffer[i] = 0; +- } ++ } + + /* Check for bits an even number of 64 */ + if ((xbits = width & 0x03f) != 0) { +@@ -809,18 +809,22 @@ static int perf_write_image(uint64_t *memaddr) + } + + runway = ioremap_nocache(cpu_device->hpa.start, 4096); ++ if (!runway) { ++ pr_err("perf_write_image: ioremap failed!\n"); ++ return -ENOMEM; ++ } + + /* Merge intrigue bits into Runway STATUS 0 */ + tmp64 = __raw_readq(runway + RUNWAY_STATUS) & 0xffecfffffffffffful; +- __raw_writeq(tmp64 | (*memaddr++ & 0x0013000000000000ul), ++ __raw_writeq(tmp64 | (*memaddr++ & 0x0013000000000000ul), + runway + RUNWAY_STATUS); +- ++ + /* Write RUNWAY DEBUG registers */ + for (i = 0; i < 8; i++) { + __raw_writeq(*memaddr++, runway + RUNWAY_DEBUG); + } + +- return 0; ++ return 0; + } + + /* +@@ -844,7 +848,7 @@ printk("perf_rdr_write\n"); + perf_rdr_shift_out_U(rdr_num, buffer[i]); + } else { + perf_rdr_shift_out_W(rdr_num, buffer[i]); +- } ++ } + } + printk("perf_rdr_write done\n"); + } +diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h +index d33f245af5e9..db74d398a443 100644 +--- a/arch/s390/include/asm/pgtable.h ++++ b/arch/s390/include/asm/pgtable.h +@@ -1359,7 +1359,9 @@ static inline pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma, + static inline void pmdp_invalidate(struct vm_area_struct *vma, + unsigned long addr, pmd_t *pmdp) + { +- pmdp_xchg_direct(vma->vm_mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_INVALID)); ++ pmd_t pmd = __pmd(pmd_val(*pmdp) | _SEGMENT_ENTRY_INVALID); ++ ++ pmdp_xchg_direct(vma->vm_mm, addr, pmdp, pmd); + } + + #define __HAVE_ARCH_PMDP_SET_WRPROTECT +diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c +index d3e0d049a0c2..b89bef95f63b 100644 +--- a/arch/x86/kernel/acpi/boot.c ++++ b/arch/x86/kernel/acpi/boot.c +@@ -176,10 +176,15 @@ static int acpi_register_lapic(int id, u32 acpiid, u8 enabled) + return -EINVAL; + } + ++ if (!enabled) { ++ ++disabled_cpus; ++ return -EINVAL; ++ } ++ + if (boot_cpu_physical_apicid != -1U) + ver = boot_cpu_apic_version; + +- cpu = __generic_processor_info(id, ver, enabled); ++ cpu = generic_processor_info(id, ver); + if (cpu >= 0) + early_per_cpu(x86_cpu_to_acpiid, cpu) = acpiid; + +diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c +index f2234918e494..e2ead34da465 100644 +--- a/arch/x86/kernel/apic/apic.c ++++ b/arch/x86/kernel/apic/apic.c +@@ -2070,7 +2070,7 @@ static int allocate_logical_cpuid(int apicid) + return nr_logical_cpuids++; + } + +-int __generic_processor_info(int apicid, int version, bool enabled) ++int generic_processor_info(int apicid, int version) + { + int cpu, max = nr_cpu_ids; + bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid, +@@ -2128,11 +2128,9 @@ int __generic_processor_info(int apicid, int version, bool enabled) + if (num_processors >= nr_cpu_ids) { + int thiscpu = max + disabled_cpus; + +- if (enabled) { +- pr_warning("APIC: NR_CPUS/possible_cpus limit of %i " +- "reached. Processor %d/0x%x ignored.\n", +- max, thiscpu, apicid); +- } ++ pr_warning("APIC: NR_CPUS/possible_cpus limit of %i " ++ "reached. Processor %d/0x%x ignored.\n", ++ max, thiscpu, apicid); + + disabled_cpus++; + return -EINVAL; +@@ -2184,23 +2182,13 @@ int __generic_processor_info(int apicid, int version, bool enabled) + apic->x86_32_early_logical_apicid(cpu); + #endif + set_cpu_possible(cpu, true); +- +- if (enabled) { +- num_processors++; +- physid_set(apicid, phys_cpu_present_map); +- set_cpu_present(cpu, true); +- } else { +- disabled_cpus++; +- } ++ physid_set(apicid, phys_cpu_present_map); ++ set_cpu_present(cpu, true); ++ num_processors++; + + return cpu; + } + +-int generic_processor_info(int apicid, int version) +-{ +- return __generic_processor_info(apicid, version, true); +-} +- + int hard_smp_processor_id(void) + { + return read_apic_id(); +diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile +index 555b9fa0ad43..7dbdb780264d 100644 +--- a/arch/x86/purgatory/Makefile ++++ b/arch/x86/purgatory/Makefile +@@ -8,6 +8,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) + LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib + targets += purgatory.ro + ++KASAN_SANITIZE := n + KCOV_INSTRUMENT := n + + # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That +diff --git a/block/partitions/efi.c b/block/partitions/efi.c +index bcd86e5cd546..39f70d968754 100644 +--- a/block/partitions/efi.c ++++ b/block/partitions/efi.c +@@ -293,7 +293,7 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state, + if (!gpt) + return NULL; + +- count = le32_to_cpu(gpt->num_partition_entries) * ++ count = (size_t)le32_to_cpu(gpt->num_partition_entries) * + le32_to_cpu(gpt->sizeof_partition_entry); + if (!count) + return NULL; +@@ -352,7 +352,7 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba, + gpt_header **gpt, gpt_entry **ptes) + { + u32 crc, origcrc; +- u64 lastlba; ++ u64 lastlba, pt_size; + + if (!ptes) + return 0; +@@ -434,13 +434,20 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba, + goto fail; + } + ++ /* Sanity check partition table size */ ++ pt_size = (u64)le32_to_cpu((*gpt)->num_partition_entries) * ++ le32_to_cpu((*gpt)->sizeof_partition_entry); ++ if (pt_size > KMALLOC_MAX_SIZE) { ++ pr_debug("GUID Partition Table is too large: %llu > %lu bytes\n", ++ (unsigned long long)pt_size, KMALLOC_MAX_SIZE); ++ goto fail; ++ } ++ + if (!(*ptes = alloc_read_gpt_entries(state, *gpt))) + goto fail; + + /* Check the GUID Partition Entry Array CRC */ +- crc = efi_crc32((const unsigned char *) (*ptes), +- le32_to_cpu((*gpt)->num_partition_entries) * +- le32_to_cpu((*gpt)->sizeof_partition_entry)); ++ crc = efi_crc32((const unsigned char *) (*ptes), pt_size); + + if (crc != le32_to_cpu((*gpt)->partition_entry_array_crc32)) { + pr_debug("GUID Partition Entry Array CRC check failed.\n"); +diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c +index 7ef16c085058..20e2b7ad8925 100644 +--- a/drivers/ata/libata-transport.c ++++ b/drivers/ata/libata-transport.c +@@ -224,7 +224,6 @@ static DECLARE_TRANSPORT_CLASS(ata_port_class, + + static void ata_tport_release(struct device *dev) + { +- put_device(dev->parent); + } + + /** +@@ -284,7 +283,7 @@ int ata_tport_add(struct device *parent, + device_initialize(dev); + dev->type = &ata_port_type; + +- dev->parent = get_device(parent); ++ dev->parent = parent; + dev->release = ata_tport_release; + dev_set_name(dev, "ata%d", ap->print_id); + transport_setup_device(dev); +@@ -348,7 +347,6 @@ static DECLARE_TRANSPORT_CLASS(ata_link_class, + + static void ata_tlink_release(struct device *dev) + { +- put_device(dev->parent); + } + + /** +@@ -410,7 +408,7 @@ int ata_tlink_add(struct ata_link *link) + int error; + + device_initialize(dev); +- dev->parent = get_device(&ap->tdev); ++ dev->parent = &ap->tdev; + dev->release = ata_tlink_release; + if (ata_is_host_link(link)) + dev_set_name(dev, "link%d", ap->print_id); +@@ -589,7 +587,6 @@ static DECLARE_TRANSPORT_CLASS(ata_dev_class, + + static void ata_tdev_release(struct device *dev) + { +- put_device(dev->parent); + } + + /** +@@ -662,7 +659,7 @@ static int ata_tdev_add(struct ata_device *ata_dev) + int error; + + device_initialize(dev); +- dev->parent = get_device(&link->tdev); ++ dev->parent = &link->tdev; + dev->release = ata_tdev_release; + if (ata_is_host_link(link)) + dev_set_name(dev, "dev%d.%d", ap->print_id,ata_dev->devno); +diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c +index 0636d84fbefe..f3f538eec7b3 100644 +--- a/drivers/ata/sata_via.c ++++ b/drivers/ata/sata_via.c +@@ -644,14 +644,16 @@ static void svia_configure(struct pci_dev *pdev, int board_id, + pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8); + } + +- /* enable IRQ on hotplug */ +- pci_read_config_byte(pdev, SVIA_MISC_3, &tmp8); +- if ((tmp8 & SATA_HOTPLUG) != SATA_HOTPLUG) { +- dev_dbg(&pdev->dev, +- "enabling SATA hotplug (0x%x)\n", +- (int) tmp8); +- tmp8 |= SATA_HOTPLUG; +- pci_write_config_byte(pdev, SVIA_MISC_3, tmp8); ++ if (board_id == vt6421) { ++ /* enable IRQ on hotplug */ ++ pci_read_config_byte(pdev, SVIA_MISC_3, &tmp8); ++ if ((tmp8 & SATA_HOTPLUG) != SATA_HOTPLUG) { ++ dev_dbg(&pdev->dev, ++ "enabling SATA hotplug (0x%x)\n", ++ (int) tmp8); ++ tmp8 |= SATA_HOTPLUG; ++ pci_write_config_byte(pdev, SVIA_MISC_3, tmp8); ++ } + } + + /* +diff --git a/drivers/clk/axs10x/i2s_pll_clock.c b/drivers/clk/axs10x/i2s_pll_clock.c +index 411310d29581..02d3bcd6216c 100644 +--- a/drivers/clk/axs10x/i2s_pll_clock.c ++++ b/drivers/clk/axs10x/i2s_pll_clock.c +@@ -182,6 +182,7 @@ static int i2s_pll_clk_probe(struct platform_device *pdev) + if (IS_ERR(pll_clk->base)) + return PTR_ERR(pll_clk->base); + ++ memset(&init, 0, sizeof(init)); + clk_name = node->name; + init.name = clk_name; + init.ops = &i2s_pll_ops; +diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c +index 21c427d86f28..a26c8a19fe93 100644 +--- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c ++++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c +@@ -803,6 +803,13 @@ static const struct sunxi_ccu_desc sun8i_h3_ccu_desc = { + .num_resets = ARRAY_SIZE(sun8i_h3_ccu_resets), + }; + ++static struct ccu_mux_nb sun8i_h3_cpu_nb = { ++ .common = &cpux_clk.common, ++ .cm = &cpux_clk.mux, ++ .delay_us = 1, /* > 8 clock cycles at 24 MHz */ ++ .bypass_index = 1, /* index of 24 MHz oscillator */ ++}; ++ + static void __init sun8i_h3_ccu_setup(struct device_node *node) + { + void __iomem *reg; +@@ -821,6 +828,9 @@ static void __init sun8i_h3_ccu_setup(struct device_node *node) + writel(val | (3 << 16), reg + SUN8I_H3_PLL_AUDIO_REG); + + sunxi_ccu_probe(node, reg, &sun8i_h3_ccu_desc); ++ ++ ccu_mux_notifier_register(pll_cpux_clk.common.hw.clk, ++ &sun8i_h3_cpu_nb); + } + CLK_OF_DECLARE(sun8i_h3_ccu, "allwinner,sun8i-h3-ccu", + sun8i_h3_ccu_setup); +diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c +index 80fa656da5ab..a59ae8e24d3d 100644 +--- a/drivers/cpufreq/intel_pstate.c ++++ b/drivers/cpufreq/intel_pstate.c +@@ -609,6 +609,7 @@ static void intel_pstate_hwp_set_online_cpus(void) + static int pid_param_set(void *data, u64 val) + { + *(u32 *)data = val; ++ pid_params.sample_rate_ns = pid_params.sample_rate_ms * NSEC_PER_MSEC; + intel_pstate_reset_all_pid(); + return 0; + } +diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c +index 42f41e808292..27f67c28e700 100644 +--- a/drivers/extcon/extcon-axp288.c ++++ b/drivers/extcon/extcon-axp288.c +@@ -168,7 +168,7 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) + return ret; + } + +- vbus_attach = (pwr_stat & PS_STAT_VBUS_PRESENT); ++ vbus_attach = (pwr_stat & PS_STAT_VBUS_VALID); + if (!vbus_attach) + goto notify_otg; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +index a6a4b2b1c0d9..6a3470f84998 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +@@ -739,8 +739,10 @@ int kfd_wait_on_events(struct kfd_process *p, + struct kfd_event_data event_data; + + if (copy_from_user(&event_data, &events[i], +- sizeof(struct kfd_event_data))) ++ sizeof(struct kfd_event_data))) { ++ ret = -EFAULT; + goto fail; ++ } + + ret = init_event_waiter(p, &event_waiters[i], + event_data.event_id, i); +diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c +index 82c193e5e0d6..afe0480d95c9 100644 +--- a/drivers/gpu/drm/arm/malidp_planes.c ++++ b/drivers/gpu/drm/arm/malidp_planes.c +@@ -150,13 +150,8 @@ static void malidp_de_plane_update(struct drm_plane *plane, + /* convert src values from Q16 fixed point to integer */ + src_w = plane->state->src_w >> 16; + src_h = plane->state->src_h >> 16; +- if (plane->state->rotation & MALIDP_ROTATED_MASK) { +- dest_w = plane->state->crtc_h; +- dest_h = plane->state->crtc_w; +- } else { +- dest_w = plane->state->crtc_w; +- dest_h = plane->state->crtc_h; +- } ++ dest_w = plane->state->crtc_w; ++ dest_h = plane->state->crtc_h; + + malidp_hw_write(mp->hwdev, format_id, mp->layer->base); + +@@ -189,9 +184,9 @@ static void malidp_de_plane_update(struct drm_plane *plane, + if (plane->state->rotation & DRM_ROTATE_MASK) + val = ilog2(plane->state->rotation & DRM_ROTATE_MASK) << LAYER_ROT_OFFSET; + if (plane->state->rotation & DRM_REFLECT_X) +- val |= LAYER_V_FLIP; +- if (plane->state->rotation & DRM_REFLECT_Y) + val |= LAYER_H_FLIP; ++ if (plane->state->rotation & DRM_REFLECT_Y) ++ val |= LAYER_V_FLIP; + + /* set the 'enable layer' bit */ + val |= LAYER_ENABLE; +diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c +index a2655cd5a84e..8ab6f30dc23c 100644 +--- a/drivers/gpu/drm/i915/intel_overlay.c ++++ b/drivers/gpu/drm/i915/intel_overlay.c +@@ -272,8 +272,30 @@ static int intel_overlay_on(struct intel_overlay *overlay) + return intel_overlay_do_wait_request(overlay, req, NULL); + } + ++static void intel_overlay_flip_prepare(struct intel_overlay *overlay, ++ struct i915_vma *vma) ++{ ++ enum pipe pipe = overlay->crtc->pipe; ++ ++ WARN_ON(overlay->old_vma); ++ ++ i915_gem_track_fb(overlay->vma ? overlay->vma->obj : NULL, ++ vma ? vma->obj : NULL, ++ INTEL_FRONTBUFFER_OVERLAY(pipe)); ++ ++ intel_frontbuffer_flip_prepare(overlay->i915, ++ INTEL_FRONTBUFFER_OVERLAY(pipe)); ++ ++ overlay->old_vma = overlay->vma; ++ if (vma) ++ overlay->vma = i915_vma_get(vma); ++ else ++ overlay->vma = NULL; ++} ++ + /* overlay needs to be enabled in OCMD reg */ + static int intel_overlay_continue(struct intel_overlay *overlay, ++ struct i915_vma *vma, + bool load_polyphase_filter) + { + struct drm_i915_private *dev_priv = overlay->i915; +@@ -308,43 +330,44 @@ static int intel_overlay_continue(struct intel_overlay *overlay, + intel_ring_emit(ring, flip_addr); + intel_ring_advance(ring); + ++ intel_overlay_flip_prepare(overlay, vma); ++ + intel_overlay_submit_request(overlay, req, NULL); + + return 0; + } + +-static void intel_overlay_release_old_vid_tail(struct i915_gem_active *active, +- struct drm_i915_gem_request *req) ++static void intel_overlay_release_old_vma(struct intel_overlay *overlay) + { +- struct intel_overlay *overlay = +- container_of(active, typeof(*overlay), last_flip); + struct i915_vma *vma; + + vma = fetch_and_zero(&overlay->old_vma); + if (WARN_ON(!vma)) + return; + +- i915_gem_track_fb(vma->obj, NULL, +- INTEL_FRONTBUFFER_OVERLAY(overlay->crtc->pipe)); ++ intel_frontbuffer_flip_complete(overlay->i915, ++ INTEL_FRONTBUFFER_OVERLAY(overlay->crtc->pipe)); + + i915_gem_object_unpin_from_display_plane(vma); + i915_vma_put(vma); + } + ++static void intel_overlay_release_old_vid_tail(struct i915_gem_active *active, ++ struct drm_i915_gem_request *req) ++{ ++ struct intel_overlay *overlay = ++ container_of(active, typeof(*overlay), last_flip); ++ ++ intel_overlay_release_old_vma(overlay); ++} ++ + static void intel_overlay_off_tail(struct i915_gem_active *active, + struct drm_i915_gem_request *req) + { + struct intel_overlay *overlay = + container_of(active, typeof(*overlay), last_flip); +- struct i915_vma *vma; +- +- /* never have the overlay hw on without showing a frame */ +- vma = fetch_and_zero(&overlay->vma); +- if (WARN_ON(!vma)) +- return; + +- i915_gem_object_unpin_from_display_plane(vma); +- i915_vma_put(vma); ++ intel_overlay_release_old_vma(overlay); + + overlay->crtc->overlay = NULL; + overlay->crtc = NULL; +@@ -398,6 +421,8 @@ static int intel_overlay_off(struct intel_overlay *overlay) + } + intel_ring_advance(ring); + ++ intel_overlay_flip_prepare(overlay, NULL); ++ + return intel_overlay_do_wait_request(overlay, req, + intel_overlay_off_tail); + } +@@ -836,18 +861,10 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, + + intel_overlay_unmap_regs(overlay, regs); + +- ret = intel_overlay_continue(overlay, scale_changed); ++ ret = intel_overlay_continue(overlay, vma, scale_changed); + if (ret) + goto out_unpin; + +- i915_gem_track_fb(overlay->vma ? overlay->vma->obj : NULL, +- vma->obj, INTEL_FRONTBUFFER_OVERLAY(pipe)); +- +- overlay->old_vma = overlay->vma; +- overlay->vma = vma; +- +- intel_frontbuffer_flip(dev_priv, INTEL_FRONTBUFFER_OVERLAY(pipe)); +- + return 0; + + out_unpin: +@@ -1215,6 +1232,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data, + + mutex_unlock(&dev->struct_mutex); + drm_modeset_unlock_all(dev); ++ i915_gem_object_put(new_bo); + + kfree(params); + +diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c +index 9b307cee3008..dff478498f05 100644 +--- a/drivers/gpu/drm/i915/intel_psr.c ++++ b/drivers/gpu/drm/i915/intel_psr.c +@@ -387,6 +387,13 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp) + return false; + } + ++ /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ ++ if (intel_crtc->config->pipe_src_w > 3200 || ++ intel_crtc->config->pipe_src_h > 2000) { ++ dev_priv->psr.psr2_support = false; ++ return false; ++ } ++ + dev_priv->psr.source_ok = true; + return true; + } +@@ -425,7 +432,6 @@ void intel_psr_enable(struct intel_dp *intel_dp) + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); + struct drm_device *dev = intel_dig_port->base.base.dev; + struct drm_i915_private *dev_priv = to_i915(dev); +- struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc); + + if (!HAS_PSR(dev)) { + DRM_DEBUG_KMS("PSR not supported on this platform\n"); +@@ -452,12 +458,7 @@ void intel_psr_enable(struct intel_dp *intel_dp) + hsw_psr_setup_vsc(intel_dp); + + if (dev_priv->psr.psr2_support) { +- /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ +- if (crtc->config->pipe_src_w > 3200 || +- crtc->config->pipe_src_h > 2000) +- dev_priv->psr.psr2_support = false; +- else +- skl_psr_setup_su_vsc(intel_dp); ++ skl_psr_setup_su_vsc(intel_dp); + } + + /* +diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c +index 0c535d0f3b95..53ac19b3727a 100644 +--- a/drivers/hid/wacom_sys.c ++++ b/drivers/hid/wacom_sys.c +@@ -2433,6 +2433,8 @@ static void wacom_remove(struct hid_device *hdev) + if (hdev->bus == BUS_BLUETOOTH) + device_remove_file(&hdev->dev, &dev_attr_speed); + ++ wacom_release_resources(wacom); ++ + hid_set_drvdata(hdev, NULL); + } + +diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c +index dee93ec87d02..84e0994aafdd 100644 +--- a/drivers/hwmon/gl520sm.c ++++ b/drivers/hwmon/gl520sm.c +@@ -208,11 +208,13 @@ static ssize_t get_cpu_vid(struct device *dev, struct device_attribute *attr, + } + static DEVICE_ATTR(cpu0_vid, S_IRUGO, get_cpu_vid, NULL); + +-#define VDD_FROM_REG(val) (((val) * 95 + 2) / 4) +-#define VDD_TO_REG(val) clamp_val((((val) * 4 + 47) / 95), 0, 255) ++#define VDD_FROM_REG(val) DIV_ROUND_CLOSEST((val) * 95, 4) ++#define VDD_CLAMP(val) clamp_val(val, 0, 255 * 95 / 4) ++#define VDD_TO_REG(val) DIV_ROUND_CLOSEST(VDD_CLAMP(val) * 4, 95) + +-#define IN_FROM_REG(val) ((val) * 19) +-#define IN_TO_REG(val) clamp_val((((val) + 9) / 19), 0, 255) ++#define IN_FROM_REG(val) ((val) * 19) ++#define IN_CLAMP(val) clamp_val(val, 0, 255 * 19) ++#define IN_TO_REG(val) DIV_ROUND_CLOSEST(IN_CLAMP(val), 19) + + static ssize_t get_in_input(struct device *dev, struct device_attribute *attr, + char *buf) +@@ -349,8 +351,13 @@ static SENSOR_DEVICE_ATTR(in4_max, S_IRUGO | S_IWUSR, + + #define DIV_FROM_REG(val) (1 << (val)) + #define FAN_FROM_REG(val, div) ((val) == 0 ? 0 : (480000 / ((val) << (div)))) +-#define FAN_TO_REG(val, div) ((val) <= 0 ? 0 : \ +- clamp_val((480000 + ((val) << ((div)-1))) / ((val) << (div)), 1, 255)) ++ ++#define FAN_BASE(div) (480000 >> (div)) ++#define FAN_CLAMP(val, div) clamp_val(val, FAN_BASE(div) / 255, \ ++ FAN_BASE(div)) ++#define FAN_TO_REG(val, div) ((val) == 0 ? 0 : \ ++ DIV_ROUND_CLOSEST(480000, \ ++ FAN_CLAMP(val, div) << (div))) + + static ssize_t get_fan_input(struct device *dev, struct device_attribute *attr, + char *buf) +@@ -513,9 +520,9 @@ static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR, + static DEVICE_ATTR(fan1_off, S_IRUGO | S_IWUSR, + get_fan_off, set_fan_off); + +-#define TEMP_FROM_REG(val) (((val) - 130) * 1000) +-#define TEMP_TO_REG(val) clamp_val(((((val) < 0 ? \ +- (val) - 500 : (val) + 500) / 1000) + 130), 0, 255) ++#define TEMP_FROM_REG(val) (((val) - 130) * 1000) ++#define TEMP_CLAMP(val) clamp_val(val, -130000, 125000) ++#define TEMP_TO_REG(val) (DIV_ROUND_CLOSEST(TEMP_CLAMP(val), 1000) + 130) + + static ssize_t get_temp_input(struct device *dev, struct device_attribute *attr, + char *buf) +diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c +index 2aa61bbbd307..73b97c71a484 100644 +--- a/drivers/i2c/busses/i2c-meson.c ++++ b/drivers/i2c/busses/i2c-meson.c +@@ -175,7 +175,7 @@ static void meson_i2c_put_data(struct meson_i2c *i2c, char *buf, int len) + wdata1 |= *buf++ << ((i - 4) * 8); + + writel(wdata0, i2c->regs + REG_TOK_WDATA0); +- writel(wdata0, i2c->regs + REG_TOK_WDATA1); ++ writel(wdata1, i2c->regs + REG_TOK_WDATA1); + + dev_dbg(i2c->dev, "%s: data %08x %08x len %d\n", __func__, + wdata0, wdata1, len); +diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c +index 7fd24949c0c1..64799ad7ebad 100644 +--- a/drivers/iio/adc/axp288_adc.c ++++ b/drivers/iio/adc/axp288_adc.c +@@ -28,8 +28,6 @@ + #include <linux/iio/driver.h> + + #define AXP288_ADC_EN_MASK 0xF1 +-#define AXP288_ADC_TS_PIN_GPADC 0xF2 +-#define AXP288_ADC_TS_PIN_ON 0xF3 + + enum axp288_adc_id { + AXP288_ADC_TS, +@@ -123,16 +121,6 @@ static int axp288_adc_read_channel(int *val, unsigned long address, + return IIO_VAL_INT; + } + +-static int axp288_adc_set_ts(struct regmap *regmap, unsigned int mode, +- unsigned long address) +-{ +- /* channels other than GPADC do not need to switch TS pin */ +- if (address != AXP288_GP_ADC_H) +- return 0; +- +- return regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, mode); +-} +- + static int axp288_adc_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +@@ -143,16 +131,7 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev, + mutex_lock(&indio_dev->mlock); + switch (mask) { + case IIO_CHAN_INFO_RAW: +- if (axp288_adc_set_ts(info->regmap, AXP288_ADC_TS_PIN_GPADC, +- chan->address)) { +- dev_err(&indio_dev->dev, "GPADC mode\n"); +- ret = -EINVAL; +- break; +- } + ret = axp288_adc_read_channel(val, chan->address, info->regmap); +- if (axp288_adc_set_ts(info->regmap, AXP288_ADC_TS_PIN_ON, +- chan->address)) +- dev_err(&indio_dev->dev, "TS pin restore\n"); + break; + default: + ret = -EINVAL; +@@ -162,15 +141,6 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev, + return ret; + } + +-static int axp288_adc_set_state(struct regmap *regmap) +-{ +- /* ADC should be always enabled for internal FG to function */ +- if (regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, AXP288_ADC_TS_PIN_ON)) +- return -EIO; +- +- return regmap_write(regmap, AXP20X_ADC_EN1, AXP288_ADC_EN_MASK); +-} +- + static const struct iio_info axp288_adc_iio_info = { + .read_raw = &axp288_adc_read_raw, + .driver_module = THIS_MODULE, +@@ -199,7 +169,7 @@ static int axp288_adc_probe(struct platform_device *pdev) + * Set ADC to enabled state at all time, including system suspend. + * otherwise internal fuel gauge functionality may be affected. + */ +- ret = axp288_adc_set_state(axp20x->regmap); ++ ret = regmap_write(info->regmap, AXP20X_ADC_EN1, AXP288_ADC_EN_MASK); + if (ret) { + dev_err(&pdev->dev, "unable to enable ADC device\n"); + return ret; +diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c +index 72b32c1ab257..ea264fa9e567 100644 +--- a/drivers/iio/adc/fsl-imx25-gcq.c ++++ b/drivers/iio/adc/fsl-imx25-gcq.c +@@ -401,6 +401,7 @@ static const struct of_device_id mx25_gcq_ids[] = { + { .compatible = "fsl,imx25-gcq", }, + { /* Sentinel */ } + }; ++MODULE_DEVICE_TABLE(of, mx25_gcq_ids); + + static struct platform_driver mx25_gcq_driver = { + .driver = { +diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c +index ded27172320e..cedb447d0162 100644 +--- a/drivers/infiniband/hw/qib/qib_iba7322.c ++++ b/drivers/infiniband/hw/qib/qib_iba7322.c +@@ -7080,7 +7080,7 @@ static void qib_7322_txchk_change(struct qib_devdata *dd, u32 start, + unsigned long flags; + + while (wait) { +- unsigned long shadow; ++ unsigned long shadow = 0; + int cstart, previ = -1; + + /* +diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c +index 6bac0717c540..ee26a1b1b4ed 100644 +--- a/drivers/infiniband/sw/rxe/rxe_pool.c ++++ b/drivers/infiniband/sw/rxe/rxe_pool.c +@@ -274,6 +274,7 @@ static u32 alloc_index(struct rxe_pool *pool) + if (index >= range) + index = find_first_zero_bit(pool->table, range); + ++ WARN_ON_ONCE(index >= range); + set_bit(index, pool->table); + pool->last = index; + return index + pool->min_index; +diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c +index ccf624763565..69ed4e0d7a0d 100644 +--- a/drivers/infiniband/sw/rxe/rxe_resp.c ++++ b/drivers/infiniband/sw/rxe/rxe_resp.c +@@ -418,7 +418,7 @@ static enum resp_states check_length(struct rxe_qp *qp, + static enum resp_states check_rkey(struct rxe_qp *qp, + struct rxe_pkt_info *pkt) + { +- struct rxe_mem *mem; ++ struct rxe_mem *mem = NULL; + u64 va; + u32 rkey; + u32 resid; +@@ -452,38 +452,38 @@ static enum resp_states check_rkey(struct rxe_qp *qp, + mem = lookup_mem(qp->pd, access, rkey, lookup_remote); + if (!mem) { + state = RESPST_ERR_RKEY_VIOLATION; +- goto err1; ++ goto err; + } + + if (unlikely(mem->state == RXE_MEM_STATE_FREE)) { + state = RESPST_ERR_RKEY_VIOLATION; +- goto err1; ++ goto err; + } + + if (mem_check_range(mem, va, resid)) { + state = RESPST_ERR_RKEY_VIOLATION; +- goto err2; ++ goto err; + } + + if (pkt->mask & RXE_WRITE_MASK) { + if (resid > mtu) { + if (pktlen != mtu || bth_pad(pkt)) { + state = RESPST_ERR_LENGTH; +- goto err2; ++ goto err; + } + + qp->resp.resid = mtu; + } else { + if (pktlen != resid) { + state = RESPST_ERR_LENGTH; +- goto err2; ++ goto err; + } + if ((bth_pad(pkt) != (0x3 & (-resid)))) { + /* This case may not be exactly that + * but nothing else fits. + */ + state = RESPST_ERR_LENGTH; +- goto err2; ++ goto err; + } + } + } +@@ -493,9 +493,9 @@ static enum resp_states check_rkey(struct rxe_qp *qp, + qp->resp.mr = mem; + return RESPST_EXECUTE; + +-err2: +- rxe_drop_ref(mem); +-err1: ++err: ++ if (mem) ++ rxe_drop_ref(mem); + return state; + } + +diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c +index 08c4b0287304..183db0cd849e 100644 +--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c ++++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c +@@ -1302,7 +1302,7 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) + rcu_dereference_protected(neigh->hnext, + lockdep_is_held(&priv->lock))); + /* remove from path/mc list */ +- list_del(&neigh->list); ++ list_del_init(&neigh->list); + call_rcu(&neigh->rcu, ipoib_neigh_reclaim); + } else { + np = &neigh->hnext; +@@ -1466,7 +1466,7 @@ void ipoib_neigh_free(struct ipoib_neigh *neigh) + rcu_dereference_protected(neigh->hnext, + lockdep_is_held(&priv->lock))); + /* remove from parent list */ +- list_del(&neigh->list); ++ list_del_init(&neigh->list); + call_rcu(&neigh->rcu, ipoib_neigh_reclaim); + return; + } else { +@@ -1551,7 +1551,7 @@ void ipoib_del_neighs_by_gid(struct net_device *dev, u8 *gid) + rcu_dereference_protected(neigh->hnext, + lockdep_is_held(&priv->lock))); + /* remove from parent list */ +- list_del(&neigh->list); ++ list_del_init(&neigh->list); + call_rcu(&neigh->rcu, ipoib_neigh_reclaim); + } else { + np = &neigh->hnext; +@@ -1593,7 +1593,7 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv) + rcu_dereference_protected(neigh->hnext, + lockdep_is_held(&priv->lock))); + /* remove from path/mc list */ +- list_del(&neigh->list); ++ list_del_init(&neigh->list); + call_rcu(&neigh->rcu, ipoib_neigh_reclaim); + } + } +diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +index 57eadd2b7a71..93b50be14438 100644 +--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c ++++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +@@ -165,11 +165,11 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey) + out: + up_write(&ppriv->vlan_rwsem); + ++ rtnl_unlock(); ++ + if (result) + free_netdev(priv->dev); + +- rtnl_unlock(); +- + return result; + } + +@@ -193,7 +193,6 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey) + list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) { + if (priv->pkey == pkey && + priv->child_type == IPOIB_LEGACY_CHILD) { +- unregister_netdevice(priv->dev); + list_del(&priv->list); + dev = priv->dev; + break; +@@ -201,6 +200,11 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey) + } + up_write(&ppriv->vlan_rwsem); + ++ if (dev) { ++ ipoib_dbg(ppriv, "delete child vlan %s\n", dev->name); ++ unregister_netdevice(dev); ++ } ++ + rtnl_unlock(); + + if (dev) { +diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c +index 8f7281444551..5a9a4416f467 100644 +--- a/drivers/iommu/arm-smmu.c ++++ b/drivers/iommu/arm-smmu.c +@@ -1211,7 +1211,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, + continue; + + s2cr[idx].type = type; +- s2cr[idx].privcfg = S2CR_PRIVCFG_UNPRIV; ++ s2cr[idx].privcfg = S2CR_PRIVCFG_DEFAULT; + s2cr[idx].cbndx = cbndx; + arm_smmu_write_s2cr(smmu, idx); + } +diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c +index 30808e91b775..c7820b3ea80e 100644 +--- a/drivers/iommu/exynos-iommu.c ++++ b/drivers/iommu/exynos-iommu.c +@@ -542,7 +542,10 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, + spin_lock_irqsave(&data->lock, flags); + if (is_sysmmu_active(data) && data->version >= MAKE_MMU_VER(3, 3)) { + clk_enable(data->clk_master); +- __sysmmu_tlb_invalidate_entry(data, iova, 1); ++ if (sysmmu_block(data)) { ++ __sysmmu_tlb_invalidate_entry(data, iova, 1); ++ sysmmu_unblock(data); ++ } + clk_disable(data->clk_master); + } + spin_unlock_irqrestore(&data->lock, flags); +diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c +index f5c90e1366ce..7c9d632f1d09 100644 +--- a/drivers/iommu/io-pgtable-arm.c ++++ b/drivers/iommu/io-pgtable-arm.c +@@ -335,8 +335,12 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova, + if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS) + pte |= ARM_LPAE_PTE_NSTABLE; + __arm_lpae_set_pte(ptep, pte, cfg); +- } else { ++ } else if (!iopte_leaf(pte, lvl)) { + cptep = iopte_deref(pte, data); ++ } else { ++ /* We require an unmap first */ ++ WARN_ON(!selftest_running); ++ return -EEXIST; + } + + /* Rinse, repeat */ +diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c +index 4c4aab02e311..b19b551bb34b 100644 +--- a/drivers/md/raid10.c ++++ b/drivers/md/raid10.c +@@ -1407,11 +1407,24 @@ static void __make_request(struct mddev *mddev, struct bio *bio) + mbio->bi_private = r10_bio; + + atomic_inc(&r10_bio->remaining); ++ ++ cb = blk_check_plugged(raid10_unplug, mddev, ++ sizeof(*plug)); ++ if (cb) ++ plug = container_of(cb, struct raid10_plug_cb, ++ cb); ++ else ++ plug = NULL; + spin_lock_irqsave(&conf->device_lock, flags); +- bio_list_add(&conf->pending_bio_list, mbio); +- conf->pending_count++; ++ if (plug) { ++ bio_list_add(&plug->pending, mbio); ++ plug->pending_cnt++; ++ } else { ++ bio_list_add(&conf->pending_bio_list, mbio); ++ conf->pending_count++; ++ } + spin_unlock_irqrestore(&conf->device_lock, flags); +- if (!mddev_check_plugged(mddev)) ++ if (!plug) + md_wakeup_thread(mddev->thread); + } + } +diff --git a/drivers/media/pci/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c +index 0583d56ef5ef..41ba8489db34 100644 +--- a/drivers/media/pci/ttpci/av7110_hw.c ++++ b/drivers/media/pci/ttpci/av7110_hw.c +@@ -56,11 +56,11 @@ + by Nathan Laredo <laredo@gnu.org> */ + + int av7110_debiwrite(struct av7110 *av7110, u32 config, +- int addr, u32 val, int count) ++ int addr, u32 val, unsigned int count) + { + struct saa7146_dev *dev = av7110->dev; + +- if (count <= 0 || count > 32764) { ++ if (count > 32764) { + printk("%s: invalid count %d\n", __func__, count); + return -1; + } +@@ -78,12 +78,12 @@ int av7110_debiwrite(struct av7110 *av7110, u32 config, + return 0; + } + +-u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count) ++u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int count) + { + struct saa7146_dev *dev = av7110->dev; + u32 result = 0; + +- if (count > 32764 || count <= 0) { ++ if (count > 32764) { + printk("%s: invalid count %d\n", __func__, count); + return 0; + } +diff --git a/drivers/media/pci/ttpci/av7110_hw.h b/drivers/media/pci/ttpci/av7110_hw.h +index 1634aba5cb84..ccb148059406 100644 +--- a/drivers/media/pci/ttpci/av7110_hw.h ++++ b/drivers/media/pci/ttpci/av7110_hw.h +@@ -377,14 +377,14 @@ extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, + + /* DEBI (saa7146 data extension bus interface) access */ + extern int av7110_debiwrite(struct av7110 *av7110, u32 config, +- int addr, u32 val, int count); ++ int addr, u32 val, unsigned int count); + extern u32 av7110_debiread(struct av7110 *av7110, u32 config, +- int addr, int count); ++ int addr, unsigned int count); + + + /* DEBI during interrupt */ + /* single word writes */ +-static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) ++static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count) + { + av7110_debiwrite(av7110, config, addr, val, count); + } +@@ -397,7 +397,7 @@ static inline void mwdebi(struct av7110 *av7110, u32 config, int addr, + av7110_debiwrite(av7110, config, addr, 0, count); + } + +-static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) ++static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count) + { + u32 res; + +@@ -408,7 +408,7 @@ static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, i + } + + /* DEBI outside interrupts, only for count <= 4! */ +-static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) ++static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count) + { + unsigned long flags; + +@@ -417,7 +417,7 @@ static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, i + spin_unlock_irqrestore(&av7110->debilock, flags); + } + +-static inline u32 rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) ++static inline u32 rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count) + { + unsigned long flags; + u32 res; +diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c +index 787bd16c19e5..bbb5feef8308 100644 +--- a/drivers/media/platform/exynos-gsc/gsc-core.c ++++ b/drivers/media/platform/exynos-gsc/gsc-core.c +@@ -849,9 +849,7 @@ int gsc_prepare_addr(struct gsc_ctx *ctx, struct vb2_buffer *vb, + + if ((frame->fmt->pixelformat == V4L2_PIX_FMT_VYUY) || + (frame->fmt->pixelformat == V4L2_PIX_FMT_YVYU) || +- (frame->fmt->pixelformat == V4L2_PIX_FMT_NV61) || + (frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420) || +- (frame->fmt->pixelformat == V4L2_PIX_FMT_NV21) || + (frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420M)) + swap(addr->cb, addr->cr); + +diff --git a/drivers/misc/lkdtm_core.c b/drivers/misc/lkdtm_core.c +index f9154b8d67f6..b2989f2d3126 100644 +--- a/drivers/misc/lkdtm_core.c ++++ b/drivers/misc/lkdtm_core.c +@@ -533,7 +533,9 @@ static void __exit lkdtm_module_exit(void) + /* Handle test-specific clean-up. */ + lkdtm_usercopy_exit(); + +- unregister_jprobe(lkdtm_jprobe); ++ if (lkdtm_jprobe != NULL) ++ unregister_jprobe(lkdtm_jprobe); ++ + pr_info("Crash point unregistered\n"); + } + +diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c +index 86f5b3223aae..d56a3b6c2fb9 100644 +--- a/drivers/mmc/core/sdio_bus.c ++++ b/drivers/mmc/core/sdio_bus.c +@@ -266,7 +266,7 @@ static void sdio_release_func(struct device *dev) + sdio_free_func_cis(func); + + kfree(func->info); +- ++ kfree(func->tmpbuf); + kfree(func); + } + +@@ -281,6 +281,16 @@ struct sdio_func *sdio_alloc_func(struct mmc_card *card) + if (!func) + return ERR_PTR(-ENOMEM); + ++ /* ++ * allocate buffer separately to make sure it's properly aligned for ++ * DMA usage (incl. 64 bit DMA) ++ */ ++ func->tmpbuf = kmalloc(4, GFP_KERNEL); ++ if (!func->tmpbuf) { ++ kfree(func); ++ return ERR_PTR(-ENOMEM); ++ } ++ + func->card = card; + + device_initialize(&func->dev); +diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c +index 3ec573c13dac..c26debc531ee 100644 +--- a/drivers/net/dsa/b53/b53_common.c ++++ b/drivers/net/dsa/b53/b53_common.c +@@ -326,6 +326,7 @@ static void b53_get_vlan_entry(struct b53_device *dev, u16 vid, + + static void b53_set_forwarding(struct b53_device *dev, int enable) + { ++ struct dsa_switch *ds = dev->ds; + u8 mgmt; + + b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt); +@@ -336,6 +337,15 @@ static void b53_set_forwarding(struct b53_device *dev, int enable) + mgmt &= ~SM_SW_FWD_EN; + + b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt); ++ ++ /* Include IMP port in dumb forwarding mode when no tagging protocol is ++ * set ++ */ ++ if (ds->ops->get_tag_protocol(ds) == DSA_TAG_PROTO_NONE) { ++ b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt); ++ mgmt |= B53_MII_DUMB_FWDG_EN; ++ b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt); ++ } + } + + static void b53_enable_vlan(struct b53_device *dev, bool enable) +diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h +index dac0af4e2cd0..81044000ce75 100644 +--- a/drivers/net/dsa/b53/b53_regs.h ++++ b/drivers/net/dsa/b53/b53_regs.h +@@ -104,6 +104,10 @@ + #define B53_UC_FWD_EN BIT(6) + #define B53_MC_FWD_EN BIT(7) + ++/* Switch control (8 bit) */ ++#define B53_SWITCH_CTRL 0x22 ++#define B53_MII_DUMB_FWDG_EN BIT(6) ++ + /* (16 bit) */ + #define B53_UC_FLOOD_MASK 0x32 + #define B53_MC_FLOOD_MASK 0x34 +diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c +index 9f2184be55dc..b8778e7b1f79 100644 +--- a/drivers/net/ethernet/ibm/ibmvnic.c ++++ b/drivers/net/ethernet/ibm/ibmvnic.c +@@ -1253,6 +1253,7 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter) + release_sub_crq_queue(adapter, + adapter->tx_scrq[i]); + } ++ kfree(adapter->tx_scrq); + adapter->tx_scrq = NULL; + } + +@@ -1265,6 +1266,7 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter) + release_sub_crq_queue(adapter, + adapter->rx_scrq[i]); + } ++ kfree(adapter->rx_scrq); + adapter->rx_scrq = NULL; + } + +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index 9affd7c198bd..6a62447fe377 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -7882,6 +7882,11 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); + ++ /* In case of PCI error, adapter lose its HW address ++ * so we should re-assign it here. ++ */ ++ hw->hw_addr = adapter->io_addr; ++ + igb_reset(adapter); + wr32(E1000_WUS, ~0); + result = PCI_ERS_RESULT_RECOVERED; +diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +index a4789a93b692..9d59cb85c012 100644 +--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c ++++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +@@ -1222,7 +1222,7 @@ static struct qed_dcbx_get *qed_dcbnl_get_dcbx(struct qed_hwfn *hwfn, + { + struct qed_dcbx_get *dcbx_info; + +- dcbx_info = kzalloc(sizeof(*dcbx_info), GFP_KERNEL); ++ dcbx_info = kmalloc(sizeof(*dcbx_info), GFP_ATOMIC); + if (!dcbx_info) + return NULL; + +diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h +index d050f37f3e0f..5024280f5af2 100644 +--- a/drivers/net/ethernet/renesas/sh_eth.h ++++ b/drivers/net/ethernet/renesas/sh_eth.h +@@ -339,7 +339,7 @@ enum FELIC_MODE_BIT { + ECMR_DPAD = 0x00200000, ECMR_RZPF = 0x00100000, + ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000, + ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000, +- ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020, ++ ECMR_MPDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020, + ECMR_RTM = 0x00000010, ECMR_ILB = 0x00000008, ECMR_ELB = 0x00000004, + ECMR_DM = 0x00000002, ECMR_PRM = 0x00000001, + }; +diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c +index c4ada7227f40..1d85109cb8ed 100644 +--- a/drivers/net/ethernet/sfc/ef10.c ++++ b/drivers/net/ethernet/sfc/ef10.c +@@ -197,11 +197,15 @@ static int efx_ef10_init_datapath_caps(struct efx_nic *efx) + nic_data->datapath_caps = + MCDI_DWORD(outbuf, GET_CAPABILITIES_OUT_FLAGS1); + +- if (outlen >= MC_CMD_GET_CAPABILITIES_V2_OUT_LEN) ++ if (outlen >= MC_CMD_GET_CAPABILITIES_V2_OUT_LEN) { + nic_data->datapath_caps2 = MCDI_DWORD(outbuf, + GET_CAPABILITIES_V2_OUT_FLAGS2); +- else ++ nic_data->piobuf_size = MCDI_WORD(outbuf, ++ GET_CAPABILITIES_V2_OUT_SIZE_PIO_BUFF); ++ } else { + nic_data->datapath_caps2 = 0; ++ nic_data->piobuf_size = ER_DZ_TX_PIOBUF_SIZE; ++ } + + /* record the DPCPU firmware IDs to determine VEB vswitching support. + */ +@@ -825,8 +829,8 @@ static int efx_ef10_link_piobufs(struct efx_nic *efx) + offset = ((efx->tx_channel_offset + efx->n_tx_channels - + tx_queue->channel->channel - 1) * + efx_piobuf_size); +- index = offset / ER_DZ_TX_PIOBUF_SIZE; +- offset = offset % ER_DZ_TX_PIOBUF_SIZE; ++ index = offset / nic_data->piobuf_size; ++ offset = offset % nic_data->piobuf_size; + + /* When the host page size is 4K, the first + * host page in the WC mapping may be within +@@ -1161,11 +1165,11 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx) + * functions of the controller. + */ + if (efx_piobuf_size != 0 && +- ER_DZ_TX_PIOBUF_SIZE / efx_piobuf_size * EF10_TX_PIOBUF_COUNT >= ++ nic_data->piobuf_size / efx_piobuf_size * EF10_TX_PIOBUF_COUNT >= + efx->n_tx_channels) { + unsigned int n_piobufs = + DIV_ROUND_UP(efx->n_tx_channels, +- ER_DZ_TX_PIOBUF_SIZE / efx_piobuf_size); ++ nic_data->piobuf_size / efx_piobuf_size); + + rc = efx_ef10_alloc_piobufs(efx, n_piobufs); + if (rc) +diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h +index 73bee7ea332a..73028f21a2d7 100644 +--- a/drivers/net/ethernet/sfc/nic.h ++++ b/drivers/net/ethernet/sfc/nic.h +@@ -500,6 +500,7 @@ enum { + * @pio_write_base: Base address for writing PIO buffers + * @pio_write_vi_base: Relative VI number for @pio_write_base + * @piobuf_handle: Handle of each PIO buffer allocated ++ * @piobuf_size: size of a single PIO buffer + * @must_restore_piobufs: Flag: PIO buffers have yet to be restored after MC + * reboot + * @rx_rss_context: Firmware handle for our RSS context +@@ -537,6 +538,7 @@ struct efx_ef10_nic_data { + void __iomem *wc_membase, *pio_write_base; + unsigned int pio_write_vi_base; + unsigned int piobuf_handle[EF10_TX_PIOBUF_COUNT]; ++ u16 piobuf_size; + bool must_restore_piobufs; + u32 rx_rss_context; + bool rx_rss_context_exclusive; +diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c +index 233778911557..6f26acd0aa61 100644 +--- a/drivers/net/ethernet/sfc/tx.c ++++ b/drivers/net/ethernet/sfc/tx.c +@@ -27,7 +27,6 @@ + + #ifdef EFX_USE_PIO + +-#define EFX_PIOBUF_SIZE_MAX ER_DZ_TX_PIOBUF_SIZE + #define EFX_PIOBUF_SIZE_DEF ALIGN(256, L1_CACHE_BYTES) + unsigned int efx_piobuf_size __read_mostly = EFX_PIOBUF_SIZE_DEF; + +diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c +index a380649bf6b5..26681707fc7a 100644 +--- a/drivers/net/team/team.c ++++ b/drivers/net/team/team.c +@@ -2366,8 +2366,10 @@ static int team_nl_send_options_get(struct team *team, u32 portid, u32 seq, + + hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags | NLM_F_MULTI, + TEAM_CMD_OPTIONS_GET); +- if (!hdr) ++ if (!hdr) { ++ nlmsg_free(skb); + return -EMSGSIZE; ++ } + + if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) + goto nla_put_failure; +@@ -2639,8 +2641,10 @@ static int team_nl_send_port_list_get(struct team *team, u32 portid, u32 seq, + + hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags | NLM_F_MULTI, + TEAM_CMD_PORT_LIST_GET); +- if (!hdr) ++ if (!hdr) { ++ nlmsg_free(skb); + return -EMSGSIZE; ++ } + + if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) + goto nla_put_failure; +diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig +index cdde59089f72..3a7286256db0 100644 +--- a/drivers/net/usb/Kconfig ++++ b/drivers/net/usb/Kconfig +@@ -364,7 +364,7 @@ config USB_NET_NET1080 + optionally with LEDs that indicate traffic + + config USB_NET_PLUSB +- tristate "Prolific PL-2301/2302/25A1 based cables" ++ tristate "Prolific PL-2301/2302/25A1/27A1 based cables" + # if the handshake/init/reset problems, from original 'plusb', + # are ever resolved ... then remove "experimental" + depends on USB_USBNET +diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c +index 22e1a9a99a7d..6fe59373cba9 100644 +--- a/drivers/net/usb/plusb.c ++++ b/drivers/net/usb/plusb.c +@@ -102,7 +102,7 @@ static int pl_reset(struct usbnet *dev) + } + + static const struct driver_info prolific_info = { +- .description = "Prolific PL-2301/PL-2302/PL-25A1", ++ .description = "Prolific PL-2301/PL-2302/PL-25A1/PL-27A1", + .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT, + /* some PL-2302 versions seem to fail usb_set_interface() */ + .reset = pl_reset, +@@ -139,6 +139,17 @@ static const struct usb_device_id products [] = { + * Host-to-Host Cable + */ + .driver_info = (unsigned long) &prolific_info, ++ ++}, ++ ++/* super speed cables */ ++{ ++ USB_DEVICE(0x067b, 0x27a1), /* PL-27A1, no eeprom ++ * also: goobay Active USB 3.0 ++ * Data Link, ++ * Unitek Y-3501 ++ */ ++ .driver_info = (unsigned long) &prolific_info, + }, + + { }, // END +@@ -158,5 +169,5 @@ static struct usb_driver plusb_driver = { + module_usb_driver(plusb_driver); + + MODULE_AUTHOR("David Brownell"); +-MODULE_DESCRIPTION("Prolific PL-2301/2302/25A1 USB Host to Host Link Driver"); ++MODULE_DESCRIPTION("Prolific PL-2301/2302/25A1/27A1 USB Host to Host Link Driver"); + MODULE_LICENSE("GPL"); +diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h +index be5b527472f9..90c0c4a7175d 100644 +--- a/drivers/net/wireless/ath/ath10k/core.h ++++ b/drivers/net/wireless/ath/ath10k/core.h +@@ -314,6 +314,7 @@ struct ath10k_peer { + struct ieee80211_vif *vif; + struct ieee80211_sta *sta; + ++ bool removed; + int vdev_id; + u8 addr[ETH_ALEN]; + DECLARE_BITMAP(peer_ids, ATH10K_MAX_NUM_PEER_IDS); +diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c +index f2e85eb22afe..30e98afa2e68 100644 +--- a/drivers/net/wireless/ath/ath10k/mac.c ++++ b/drivers/net/wireless/ath/ath10k/mac.c +@@ -3738,6 +3738,9 @@ struct ieee80211_txq *ath10k_mac_txq_lookup(struct ath10k *ar, + if (!peer) + return NULL; + ++ if (peer->removed) ++ return NULL; ++ + if (peer->sta) + return peer->sta->txq[tid]; + else if (peer->vif) +@@ -7422,6 +7425,20 @@ ath10k_mac_op_switch_vif_chanctx(struct ieee80211_hw *hw, + return 0; + } + ++static void ath10k_mac_op_sta_pre_rcu_remove(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ struct ieee80211_sta *sta) ++{ ++ struct ath10k *ar; ++ struct ath10k_peer *peer; ++ ++ ar = hw->priv; ++ ++ list_for_each_entry(peer, &ar->peers, list) ++ if (peer->sta == sta) ++ peer->removed = true; ++} ++ + static const struct ieee80211_ops ath10k_ops = { + .tx = ath10k_mac_op_tx, + .wake_tx_queue = ath10k_mac_op_wake_tx_queue, +@@ -7462,6 +7479,7 @@ static const struct ieee80211_ops ath10k_ops = { + .assign_vif_chanctx = ath10k_mac_op_assign_vif_chanctx, + .unassign_vif_chanctx = ath10k_mac_op_unassign_vif_chanctx, + .switch_vif_chanctx = ath10k_mac_op_switch_vif_chanctx, ++ .sta_pre_rcu_remove = ath10k_mac_op_sta_pre_rcu_remove, + + CFG80211_TESTMODE_CMD(ath10k_tm_cmd) + +diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +index 82d949ede294..4e725d165aa6 100644 +--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c ++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +@@ -6316,6 +6316,13 @@ static struct usb_device_id dev_table[] = { + .driver_info = (unsigned long)&rtl8192cu_fops}, + {USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0x7822, 0xff, 0xff, 0xff), + .driver_info = (unsigned long)&rtl8192cu_fops}, ++/* found in rtl8192eu vendor driver */ ++{USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0107, 0xff, 0xff, 0xff), ++ .driver_info = (unsigned long)&rtl8192eu_fops}, ++{USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xab33, 0xff, 0xff, 0xff), ++ .driver_info = (unsigned long)&rtl8192eu_fops}, ++{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x818c, 0xff, 0xff, 0xff), ++ .driver_info = (unsigned long)&rtl8192eu_fops}, + #endif + { } + }; +diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c +index 286fda4ee100..ab4f8db2a8ca 100644 +--- a/drivers/nvme/host/rdma.c ++++ b/drivers/nvme/host/rdma.c +@@ -337,8 +337,6 @@ static int __nvme_rdma_init_request(struct nvme_rdma_ctrl *ctrl, + struct ib_device *ibdev = dev->dev; + int ret; + +- BUG_ON(queue_idx >= ctrl->queue_count); +- + ret = nvme_rdma_alloc_qe(ibdev, &req->sqe, sizeof(struct nvme_command), + DMA_TO_DEVICE); + if (ret) +@@ -643,8 +641,22 @@ static int nvme_rdma_connect_io_queues(struct nvme_rdma_ctrl *ctrl) + + static int nvme_rdma_init_io_queues(struct nvme_rdma_ctrl *ctrl) + { ++ struct nvmf_ctrl_options *opts = ctrl->ctrl.opts; ++ unsigned int nr_io_queues; + int i, ret; + ++ nr_io_queues = min(opts->nr_io_queues, num_online_cpus()); ++ ret = nvme_set_queue_count(&ctrl->ctrl, &nr_io_queues); ++ if (ret) ++ return ret; ++ ++ ctrl->queue_count = nr_io_queues + 1; ++ if (ctrl->queue_count < 2) ++ return 0; ++ ++ dev_info(ctrl->ctrl.device, ++ "creating %d I/O queues.\n", nr_io_queues); ++ + for (i = 1; i < ctrl->queue_count; i++) { + ret = nvme_rdma_init_queue(ctrl, i, + ctrl->ctrl.opts->queue_size); +@@ -1795,20 +1807,8 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { + + static int nvme_rdma_create_io_queues(struct nvme_rdma_ctrl *ctrl) + { +- struct nvmf_ctrl_options *opts = ctrl->ctrl.opts; + int ret; + +- ret = nvme_set_queue_count(&ctrl->ctrl, &opts->nr_io_queues); +- if (ret) +- return ret; +- +- ctrl->queue_count = opts->nr_io_queues + 1; +- if (ctrl->queue_count < 2) +- return 0; +- +- dev_info(ctrl->ctrl.device, +- "creating %d I/O queues.\n", opts->nr_io_queues); +- + ret = nvme_rdma_init_io_queues(ctrl); + if (ret) + return ret; +diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c +index 5bdde692f724..f62f9dfea984 100644 +--- a/drivers/power/supply/axp288_fuel_gauge.c ++++ b/drivers/power/supply/axp288_fuel_gauge.c +@@ -169,8 +169,10 @@ static int fuel_gauge_reg_readb(struct axp288_fg_info *info, int reg) + break; + } + +- if (ret < 0) ++ if (ret < 0) { + dev_err(&info->pdev->dev, "axp288 reg read err:%d\n", ret); ++ return ret; ++ } + + return val; + } +diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c +index 9d19b9a62011..315a4be8dc1e 100644 +--- a/drivers/rapidio/devices/tsi721.c ++++ b/drivers/rapidio/devices/tsi721.c +@@ -37,8 +37,8 @@ + #include "tsi721.h" + + #ifdef DEBUG +-u32 dbg_level; +-module_param(dbg_level, uint, S_IWUSR | S_IRUGO); ++u32 tsi_dbg_level; ++module_param_named(dbg_level, tsi_dbg_level, uint, S_IWUSR | S_IRUGO); + MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)"); + #endif + +diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h +index 5941437cbdd1..957eadc58150 100644 +--- a/drivers/rapidio/devices/tsi721.h ++++ b/drivers/rapidio/devices/tsi721.h +@@ -40,11 +40,11 @@ enum { + }; + + #ifdef DEBUG +-extern u32 dbg_level; ++extern u32 tsi_dbg_level; + + #define tsi_debug(level, dev, fmt, arg...) \ + do { \ +- if (DBG_##level & dbg_level) \ ++ if (DBG_##level & tsi_dbg_level) \ + dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \ + } while (0) + #else +diff --git a/drivers/reset/reset-ti-syscon.c b/drivers/reset/reset-ti-syscon.c +index 47f0ffd3b013..1799fd423901 100644 +--- a/drivers/reset/reset-ti-syscon.c ++++ b/drivers/reset/reset-ti-syscon.c +@@ -154,8 +154,8 @@ static int ti_syscon_reset_status(struct reset_controller_dev *rcdev, + if (ret) + return ret; + +- return (reset_state & BIT(control->status_bit)) && +- (control->flags & STATUS_SET); ++ return !(reset_state & BIT(control->status_bit)) == ++ !(control->flags & STATUS_SET); + } + + static struct reset_control_ops ti_syscon_reset_ops = { +diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c +index ba258217614e..963c732a3d24 100644 +--- a/drivers/scsi/be2iscsi/be_iscsi.c ++++ b/drivers/scsi/be2iscsi/be_iscsi.c +@@ -165,33 +165,6 @@ beiscsi_conn_create(struct iscsi_cls_session *cls_session, u32 cid) + return cls_conn; + } + +-/** +- * beiscsi_bindconn_cid - Bind the beiscsi_conn with phba connection table +- * @beiscsi_conn: The pointer to beiscsi_conn structure +- * @phba: The phba instance +- * @cid: The cid to free +- */ +-static int beiscsi_bindconn_cid(struct beiscsi_hba *phba, +- struct beiscsi_conn *beiscsi_conn, +- unsigned int cid) +-{ +- uint16_t cri_index = BE_GET_CRI_FROM_CID(cid); +- +- if (phba->conn_table[cri_index]) { +- beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, +- "BS_%d : Connection table already occupied. Detected clash\n"); +- +- return -EINVAL; +- } else { +- beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG, +- "BS_%d : phba->conn_table[%d]=%p(beiscsi_conn)\n", +- cri_index, beiscsi_conn); +- +- phba->conn_table[cri_index] = beiscsi_conn; +- } +- return 0; +-} +- + /** + * beiscsi_conn_bind - Binds iscsi session/connection with TCP connection + * @cls_session: pointer to iscsi cls session +@@ -212,6 +185,7 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session, + struct hwi_wrb_context *pwrb_context; + struct beiscsi_endpoint *beiscsi_ep; + struct iscsi_endpoint *ep; ++ uint16_t cri_index; + + ep = iscsi_lookup_endpoint(transport_fd); + if (!ep) +@@ -229,20 +203,34 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session, + + return -EEXIST; + } +- +- pwrb_context = &phwi_ctrlr->wrb_context[BE_GET_CRI_FROM_CID( +- beiscsi_ep->ep_cid)]; ++ cri_index = BE_GET_CRI_FROM_CID(beiscsi_ep->ep_cid); ++ if (phba->conn_table[cri_index]) { ++ if (beiscsi_conn != phba->conn_table[cri_index] || ++ beiscsi_ep != phba->conn_table[cri_index]->ep) { ++ __beiscsi_log(phba, KERN_ERR, ++ "BS_%d : conn_table not empty at %u: cid %u conn %p:%p\n", ++ cri_index, ++ beiscsi_ep->ep_cid, ++ beiscsi_conn, ++ phba->conn_table[cri_index]); ++ return -EINVAL; ++ } ++ } + + beiscsi_conn->beiscsi_conn_cid = beiscsi_ep->ep_cid; + beiscsi_conn->ep = beiscsi_ep; + beiscsi_ep->conn = beiscsi_conn; ++ /** ++ * Each connection is associated with a WRBQ kept in wrb_context. ++ * Store doorbell offset for transmit path. ++ */ ++ pwrb_context = &phwi_ctrlr->wrb_context[cri_index]; + beiscsi_conn->doorbell_offset = pwrb_context->doorbell_offset; +- + beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG, +- "BS_%d : beiscsi_conn=%p conn=%p ep_cid=%d\n", +- beiscsi_conn, conn, beiscsi_ep->ep_cid); +- +- return beiscsi_bindconn_cid(phba, beiscsi_conn, beiscsi_ep->ep_cid); ++ "BS_%d : cid %d phba->conn_table[%u]=%p\n", ++ beiscsi_ep->ep_cid, cri_index, beiscsi_conn); ++ phba->conn_table[cri_index] = beiscsi_conn; ++ return 0; + } + + static int beiscsi_iface_create_ipv4(struct beiscsi_hba *phba) +@@ -973,9 +961,9 @@ int beiscsi_conn_start(struct iscsi_cls_conn *cls_conn) + */ + static int beiscsi_get_cid(struct beiscsi_hba *phba) + { +- unsigned short cid = 0xFFFF, cid_from_ulp; +- struct ulp_cid_info *cid_info = NULL; + uint16_t cid_avlbl_ulp0, cid_avlbl_ulp1; ++ unsigned short cid, cid_from_ulp; ++ struct ulp_cid_info *cid_info; + + /* Find the ULP which has more CID available */ + cid_avlbl_ulp0 = (phba->cid_array_info[BEISCSI_ULP0]) ? +@@ -984,20 +972,27 @@ static int beiscsi_get_cid(struct beiscsi_hba *phba) + BEISCSI_ULP1_AVLBL_CID(phba) : 0; + cid_from_ulp = (cid_avlbl_ulp0 > cid_avlbl_ulp1) ? + BEISCSI_ULP0 : BEISCSI_ULP1; +- +- if (test_bit(cid_from_ulp, (void *)&phba->fw_config.ulp_supported)) { +- cid_info = phba->cid_array_info[cid_from_ulp]; +- if (!cid_info->avlbl_cids) +- return cid; +- +- cid = cid_info->cid_array[cid_info->cid_alloc++]; +- +- if (cid_info->cid_alloc == BEISCSI_GET_CID_COUNT( +- phba, cid_from_ulp)) +- cid_info->cid_alloc = 0; +- +- cid_info->avlbl_cids--; ++ /** ++ * If iSCSI protocol is loaded only on ULP 0, and when cid_avlbl_ulp ++ * is ZERO for both, ULP 1 is returned. ++ * Check if ULP is loaded before getting new CID. ++ */ ++ if (!test_bit(cid_from_ulp, (void *)&phba->fw_config.ulp_supported)) ++ return BE_INVALID_CID; ++ ++ cid_info = phba->cid_array_info[cid_from_ulp]; ++ cid = cid_info->cid_array[cid_info->cid_alloc]; ++ if (!cid_info->avlbl_cids || cid == BE_INVALID_CID) { ++ __beiscsi_log(phba, KERN_ERR, ++ "BS_%d : failed to get cid: available %u:%u\n", ++ cid_info->avlbl_cids, cid_info->cid_free); ++ return BE_INVALID_CID; + } ++ /* empty the slot */ ++ cid_info->cid_array[cid_info->cid_alloc++] = BE_INVALID_CID; ++ if (cid_info->cid_alloc == BEISCSI_GET_CID_COUNT(phba, cid_from_ulp)) ++ cid_info->cid_alloc = 0; ++ cid_info->avlbl_cids--; + return cid; + } + +@@ -1008,22 +1003,28 @@ static int beiscsi_get_cid(struct beiscsi_hba *phba) + */ + static void beiscsi_put_cid(struct beiscsi_hba *phba, unsigned short cid) + { +- uint16_t cid_post_ulp; +- struct hwi_controller *phwi_ctrlr; +- struct hwi_wrb_context *pwrb_context; +- struct ulp_cid_info *cid_info = NULL; + uint16_t cri_index = BE_GET_CRI_FROM_CID(cid); ++ struct hwi_wrb_context *pwrb_context; ++ struct hwi_controller *phwi_ctrlr; ++ struct ulp_cid_info *cid_info; ++ uint16_t cid_post_ulp; + + phwi_ctrlr = phba->phwi_ctrlr; + pwrb_context = &phwi_ctrlr->wrb_context[cri_index]; + cid_post_ulp = pwrb_context->ulp_num; + + cid_info = phba->cid_array_info[cid_post_ulp]; +- cid_info->avlbl_cids++; +- ++ /* fill only in empty slot */ ++ if (cid_info->cid_array[cid_info->cid_free] != BE_INVALID_CID) { ++ __beiscsi_log(phba, KERN_ERR, ++ "BS_%d : failed to put cid %u: available %u:%u\n", ++ cid, cid_info->avlbl_cids, cid_info->cid_free); ++ return; ++ } + cid_info->cid_array[cid_info->cid_free++] = cid; + if (cid_info->cid_free == BEISCSI_GET_CID_COUNT(phba, cid_post_ulp)) + cid_info->cid_free = 0; ++ cid_info->avlbl_cids++; + } + + /** +@@ -1037,8 +1038,8 @@ static void beiscsi_free_ep(struct beiscsi_endpoint *beiscsi_ep) + + beiscsi_put_cid(phba, beiscsi_ep->ep_cid); + beiscsi_ep->phba = NULL; +- phba->ep_array[BE_GET_CRI_FROM_CID +- (beiscsi_ep->ep_cid)] = NULL; ++ /* clear this to track freeing in beiscsi_ep_disconnect */ ++ phba->ep_array[BE_GET_CRI_FROM_CID(beiscsi_ep->ep_cid)] = NULL; + + /** + * Check if any connection resource allocated by driver +@@ -1049,6 +1050,11 @@ static void beiscsi_free_ep(struct beiscsi_endpoint *beiscsi_ep) + return; + + beiscsi_conn = beiscsi_ep->conn; ++ /** ++ * Break ep->conn link here so that completions after ++ * this are ignored. ++ */ ++ beiscsi_ep->conn = NULL; + if (beiscsi_conn->login_in_progress) { + beiscsi_free_mgmt_task_handles(beiscsi_conn, + beiscsi_conn->task); +@@ -1079,7 +1085,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep, + "BS_%d : In beiscsi_open_conn\n"); + + beiscsi_ep->ep_cid = beiscsi_get_cid(phba); +- if (beiscsi_ep->ep_cid == 0xFFFF) { ++ if (beiscsi_ep->ep_cid == BE_INVALID_CID) { + beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, + "BS_%d : No free cid available\n"); + return ret; +@@ -1284,26 +1290,6 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag) + return ret; + } + +-/** +- * beiscsi_unbind_conn_to_cid - Unbind the beiscsi_conn from phba conn table +- * @phba: The phba instance +- * @cid: The cid to free +- */ +-static int beiscsi_unbind_conn_to_cid(struct beiscsi_hba *phba, +- unsigned int cid) +-{ +- uint16_t cri_index = BE_GET_CRI_FROM_CID(cid); +- +- if (phba->conn_table[cri_index]) +- phba->conn_table[cri_index] = NULL; +- else { +- beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG, +- "BS_%d : Connection table Not occupied.\n"); +- return -EINVAL; +- } +- return 0; +-} +- + /** + * beiscsi_ep_disconnect - Tears down the TCP connection + * @ep: endpoint to be used +@@ -1318,13 +1304,23 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep) + unsigned int tag; + uint8_t mgmt_invalidate_flag, tcp_upload_flag; + unsigned short savecfg_flag = CMD_ISCSI_SESSION_SAVE_CFG_ON_FLASH; ++ uint16_t cri_index; + + beiscsi_ep = ep->dd_data; + phba = beiscsi_ep->phba; + beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG, +- "BS_%d : In beiscsi_ep_disconnect for ep_cid = %d\n", ++ "BS_%d : In beiscsi_ep_disconnect for ep_cid = %u\n", + beiscsi_ep->ep_cid); + ++ cri_index = BE_GET_CRI_FROM_CID(beiscsi_ep->ep_cid); ++ if (!phba->ep_array[cri_index]) { ++ __beiscsi_log(phba, KERN_ERR, ++ "BS_%d : ep_array at %u cid %u empty\n", ++ cri_index, ++ beiscsi_ep->ep_cid); ++ return; ++ } ++ + if (beiscsi_ep->conn) { + beiscsi_conn = beiscsi_ep->conn; + iscsi_suspend_queue(beiscsi_conn->conn); +@@ -1356,7 +1352,12 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep) + free_ep: + msleep(BEISCSI_LOGOUT_SYNC_DELAY); + beiscsi_free_ep(beiscsi_ep); +- beiscsi_unbind_conn_to_cid(phba, beiscsi_ep->ep_cid); ++ if (!phba->conn_table[cri_index]) ++ __beiscsi_log(phba, KERN_ERR, ++ "BS_%d : conn_table empty at %u: cid %u\n", ++ cri_index, ++ beiscsi_ep->ep_cid); ++ phba->conn_table[cri_index] = NULL; + iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep); + } + +diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c +index d9239c2d49b1..741cc96379cb 100644 +--- a/drivers/scsi/be2iscsi/be_main.c ++++ b/drivers/scsi/be2iscsi/be_main.c +@@ -4085,9 +4085,10 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) + } + + /* Allocate memory for CID array */ +- ptr_cid_info->cid_array = kzalloc(sizeof(void *) * +- BEISCSI_GET_CID_COUNT(phba, +- ulp_num), GFP_KERNEL); ++ ptr_cid_info->cid_array = ++ kcalloc(BEISCSI_GET_CID_COUNT(phba, ulp_num), ++ sizeof(*ptr_cid_info->cid_array), ++ GFP_KERNEL); + if (!ptr_cid_info->cid_array) { + beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT, + "BM_%d : Failed to allocate memory" +diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h +index 6376657e45f7..02d00ab6d981 100644 +--- a/drivers/scsi/be2iscsi/be_main.h ++++ b/drivers/scsi/be2iscsi/be_main.h +@@ -358,6 +358,7 @@ struct beiscsi_hba { + unsigned int age; + struct list_head hba_queue; + #define BE_MAX_SESSION 2048 ++#define BE_INVALID_CID 0xffff + #define BE_SET_CID_TO_CRI(cri_index, cid) \ + (phba->cid_to_cri_map[cid] = cri_index) + #define BE_GET_CRI_FROM_CID(cid) (phba->cid_to_cri_map[cid]) +diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c +index d6239fa718be..3f3751e2b521 100644 +--- a/drivers/spi/spi-pxa2xx.c ++++ b/drivers/spi/spi-pxa2xx.c +@@ -1458,6 +1458,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { + { PCI_VDEVICE(INTEL, 0x1ac2), LPSS_BXT_SSP }, + { PCI_VDEVICE(INTEL, 0x1ac4), LPSS_BXT_SSP }, + { PCI_VDEVICE(INTEL, 0x1ac6), LPSS_BXT_SSP }, ++ /* GLK */ ++ { PCI_VDEVICE(INTEL, 0x31c2), LPSS_BXT_SSP }, ++ { PCI_VDEVICE(INTEL, 0x31c4), LPSS_BXT_SSP }, ++ { PCI_VDEVICE(INTEL, 0x31c6), LPSS_BXT_SSP }, + /* APL */ + { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, + { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP }, +diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c +index 3fc912373adf..996bd473dd03 100644 +--- a/drivers/tty/goldfish.c ++++ b/drivers/tty/goldfish.c +@@ -300,7 +300,7 @@ static int goldfish_tty_probe(struct platform_device *pdev) + return 0; + + err_tty_register_device_failed: +- free_irq(irq, pdev); ++ free_irq(irq, qtty); + err_request_irq_failed: + goldfish_tty_current_line_count--; + if (goldfish_tty_current_line_count == 0) +diff --git a/drivers/tty/serial/8250/8250_moxa.c b/drivers/tty/serial/8250/8250_moxa.c +index 26eb5393a263..d5069b2d4d79 100644 +--- a/drivers/tty/serial/8250/8250_moxa.c ++++ b/drivers/tty/serial/8250/8250_moxa.c +@@ -68,6 +68,7 @@ static int moxa8250_probe(struct pci_dev *pdev, const struct pci_device_id *id) + sizeof(unsigned int) * nr_ports, GFP_KERNEL); + if (!brd) + return -ENOMEM; ++ brd->num_ports = nr_ports; + + memset(&uart, 0, sizeof(struct uart_8250_port)); + +diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c +index f24d3030b98c..1ef31e3ee4a1 100644 +--- a/drivers/tty/serial/8250/8250_port.c ++++ b/drivers/tty/serial/8250/8250_port.c +@@ -1751,8 +1751,6 @@ void serial8250_tx_chars(struct uart_8250_port *up) + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(port); + +- pr_debug("%s: THRE\n", __func__); +- + /* + * With RPM enabled, we have to wait until the FIFO is empty before the + * HW can go idle. So we get here once again with empty FIFO and disable +@@ -1817,8 +1815,6 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) + + status = serial_port_in(port, UART_LSR); + +- pr_debug("%s: status = %x\n", __func__, status); +- + if (status & (UART_LSR_DR | UART_LSR_BI)) { + if (!up->dma || handle_rx_dma(up, iir)) + status = serial8250_rx_chars(up, status); +diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c +index 0cf149edddd8..f36a1ac3bfbd 100644 +--- a/drivers/usb/chipidea/otg.c ++++ b/drivers/usb/chipidea/otg.c +@@ -134,9 +134,9 @@ void ci_handle_vbus_change(struct ci_hdrc *ci) + if (!ci->is_otg) + return; + +- if (hw_read_otgsc(ci, OTGSC_BSV)) ++ if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active) + usb_gadget_vbus_connect(&ci->gadget); +- else ++ else if (!hw_read_otgsc(ci, OTGSC_BSV) && ci->vbus_active) + usb_gadget_vbus_disconnect(&ci->gadget); + } + +@@ -175,14 +175,21 @@ static void ci_handle_id_switch(struct ci_hdrc *ci) + + ci_role_stop(ci); + +- if (role == CI_ROLE_GADGET) ++ if (role == CI_ROLE_GADGET && ++ IS_ERR(ci->platdata->vbus_extcon.edev)) + /* +- * wait vbus lower than OTGSC_BSV before connecting +- * to host ++ * Wait vbus lower than OTGSC_BSV before connecting ++ * to host. If connecting status is from an external ++ * connector instead of register, we don't need to ++ * care vbus on the board, since it will not affect ++ * external connector status. + */ + hw_wait_vbus_lower_bsv(ci); + + ci_role_start(ci, role); ++ /* vbus change may have already occurred */ ++ if (role == CI_ROLE_GADGET) ++ ci_handle_vbus_change(ci); + } + } + /** +diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig +index 0b80cee30da4..eb121b2a55d4 100644 +--- a/drivers/usb/host/Kconfig ++++ b/drivers/usb/host/Kconfig +@@ -45,9 +45,9 @@ config USB_XHCI_PLATFORM + If unsure, say N. + + config USB_XHCI_MTK +- tristate "xHCI support for Mediatek MT65xx" ++ tristate "xHCI support for Mediatek MT65xx/MT7621" + select MFD_SYSCON +- depends on ARCH_MEDIATEK || COMPILE_TEST ++ depends on (MIPS && SOC_MT7621) || ARCH_MEDIATEK || COMPILE_TEST + ---help--- + Say 'Y' to enable the support for the xHCI host controller + found in Mediatek MT65xx SoCs. +diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c +index 136ff5e1b7c1..135eb04368f9 100644 +--- a/drivers/usb/serial/mos7720.c ++++ b/drivers/usb/serial/mos7720.c +@@ -234,11 +234,16 @@ static int read_mos_reg(struct usb_serial *serial, unsigned int serial_portnum, + + status = usb_control_msg(usbdev, pipe, request, requesttype, value, + index, buf, 1, MOS_WDR_TIMEOUT); +- if (status == 1) ++ if (status == 1) { + *data = *buf; +- else if (status < 0) ++ } else { + dev_err(&usbdev->dev, + "mos7720: usb_control_msg() failed: %d\n", status); ++ if (status >= 0) ++ status = -EIO; ++ *data = 0; ++ } ++ + kfree(buf); + + return status; +diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c +index 5c4fc3abf6a7..6baacf64b21e 100644 +--- a/drivers/usb/serial/mos7840.c ++++ b/drivers/usb/serial/mos7840.c +@@ -285,9 +285,15 @@ static int mos7840_get_reg_sync(struct usb_serial_port *port, __u16 reg, + ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), MCS_RDREQ, + MCS_RD_RTYPE, 0, reg, buf, VENDOR_READ_LENGTH, + MOS_WDR_TIMEOUT); ++ if (ret < VENDOR_READ_LENGTH) { ++ if (ret >= 0) ++ ret = -EIO; ++ goto out; ++ } ++ + *val = buf[0]; + dev_dbg(&port->dev, "%s offset is %x, return val %x\n", __func__, reg, *val); +- ++out: + kfree(buf); + return ret; + } +@@ -353,8 +359,13 @@ static int mos7840_get_uart_reg(struct usb_serial_port *port, __u16 reg, + ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), MCS_RDREQ, + MCS_RD_RTYPE, Wval, reg, buf, VENDOR_READ_LENGTH, + MOS_WDR_TIMEOUT); ++ if (ret < VENDOR_READ_LENGTH) { ++ if (ret >= 0) ++ ret = -EIO; ++ goto out; ++ } + *val = buf[0]; +- ++out: + kfree(buf); + return ret; + } +@@ -1490,10 +1501,10 @@ static int mos7840_tiocmget(struct tty_struct *tty) + return -ENODEV; + + status = mos7840_get_uart_reg(port, MODEM_STATUS_REGISTER, &msr); +- if (status != 1) ++ if (status < 0) + return -EIO; + status = mos7840_get_uart_reg(port, MODEM_CONTROL_REGISTER, &mcr); +- if (status != 1) ++ if (status < 0) + return -EIO; + result = ((mcr & MCR_DTR) ? TIOCM_DTR : 0) + | ((mcr & MCR_RTS) ? TIOCM_RTS : 0) +diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c +index 8a05fa7e2152..f089d7d8afe7 100644 +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -8050,8 +8050,10 @@ static int __btrfs_correct_data_nocsum(struct inode *inode, + + start += sectorsize; + +- if (nr_sectors--) { ++ nr_sectors--; ++ if (nr_sectors) { + pgoff += sectorsize; ++ ASSERT(pgoff < PAGE_SIZE); + goto next_block_or_try_again; + } + } +@@ -8157,8 +8159,10 @@ static int __btrfs_subio_endio_read(struct inode *inode, + + ASSERT(nr_sectors); + +- if (--nr_sectors) { ++ nr_sectors--; ++ if (nr_sectors) { + pgoff += sectorsize; ++ ASSERT(pgoff < PAGE_SIZE); + goto next_block; + } + } +diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c +index 71a60cc01451..06a77e47957d 100644 +--- a/fs/btrfs/volumes.c ++++ b/fs/btrfs/volumes.c +@@ -6226,7 +6226,7 @@ int btrfs_map_bio(struct btrfs_root *root, struct bio *bio, + for (dev_nr = 0; dev_nr < total_devs; dev_nr++) { + dev = bbio->stripes[dev_nr].dev; + if (!dev || !dev->bdev || +- (bio_op(bio) == REQ_OP_WRITE && !dev->writeable)) { ++ (bio_op(first_bio) == REQ_OP_WRITE && !dev->writeable)) { + bbio_error(bbio, first_bio, logical); + continue; + } +diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c +index f7cae1629c6c..7a8b1d72e3d9 100644 +--- a/fs/gfs2/glock.c ++++ b/fs/gfs2/glock.c +@@ -1820,16 +1820,18 @@ void gfs2_glock_exit(void) + + static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi) + { +- do { +- gi->gl = rhashtable_walk_next(&gi->hti); ++ while ((gi->gl = rhashtable_walk_next(&gi->hti))) { + if (IS_ERR(gi->gl)) { + if (PTR_ERR(gi->gl) == -EAGAIN) + continue; + gi->gl = NULL; ++ return; + } +- /* Skip entries for other sb and dead entries */ +- } while ((gi->gl) && ((gi->sdp != gi->gl->gl_name.ln_sbd) || +- __lockref_is_dead(&gi->gl->gl_lockref))); ++ /* Skip entries for other sb and dead entries */ ++ if (gi->sdp == gi->gl->gl_name.ln_sbd && ++ !__lockref_is_dead(&gi->gl->gl_lockref)) ++ return; ++ } + } + + static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos) +diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c +index 704fa0b17309..2c2f182cde03 100644 +--- a/fs/hugetlbfs/inode.c ++++ b/fs/hugetlbfs/inode.c +@@ -695,14 +695,11 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb, + + inode = new_inode(sb); + if (inode) { +- struct hugetlbfs_inode_info *info; + inode->i_ino = get_next_ino(); + inode->i_mode = S_IFDIR | config->mode; + inode->i_uid = config->uid; + inode->i_gid = config->gid; + inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); +- info = HUGETLBFS_I(inode); +- mpol_shared_policy_init(&info->policy, NULL); + inode->i_op = &hugetlbfs_dir_inode_operations; + inode->i_fop = &simple_dir_operations; + /* directory inodes start off with i_nlink == 2 (for "." entry) */ +@@ -733,7 +730,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, + + inode = new_inode(sb); + if (inode) { +- struct hugetlbfs_inode_info *info; + inode->i_ino = get_next_ino(); + inode_init_owner(inode, dir, mode); + lockdep_set_class(&inode->i_mapping->i_mmap_rwsem, +@@ -741,15 +737,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, + inode->i_mapping->a_ops = &hugetlbfs_aops; + inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_mapping->private_data = resv_map; +- info = HUGETLBFS_I(inode); +- /* +- * The policy is initialized here even if we are creating a +- * private inode because initialization simply creates an +- * an empty rb tree and calls rwlock_init(), later when we +- * call mpol_free_shared_policy() it will just return because +- * the rb tree will still be empty. +- */ +- mpol_shared_policy_init(&info->policy, NULL); + switch (mode & S_IFMT) { + default: + init_special_inode(inode, mode, dev); +@@ -937,6 +924,18 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb) + hugetlbfs_inc_free_inodes(sbinfo); + return NULL; + } ++ ++ /* ++ * Any time after allocation, hugetlbfs_destroy_inode can be called ++ * for the inode. mpol_free_shared_policy is unconditionally called ++ * as part of hugetlbfs_destroy_inode. So, initialize policy here ++ * in case of a quick call to destroy. ++ * ++ * Note that the policy is initialized even if we are creating a ++ * private inode. This simplifies hugetlbfs_destroy_inode. ++ */ ++ mpol_shared_policy_init(&p->policy, NULL); ++ + return &p->vfs_inode; + } + +diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c +index 582bfee40345..af84a92cb142 100644 +--- a/fs/nfs/callback.c ++++ b/fs/nfs/callback.c +@@ -239,12 +239,12 @@ static struct svc_serv_ops nfs41_cb_sv_ops = { + .svo_module = THIS_MODULE, + }; + +-struct svc_serv_ops *nfs4_cb_sv_ops[] = { ++static struct svc_serv_ops *nfs4_cb_sv_ops[] = { + [0] = &nfs40_cb_sv_ops, + [1] = &nfs41_cb_sv_ops, + }; + #else +-struct svc_serv_ops *nfs4_cb_sv_ops[] = { ++static struct svc_serv_ops *nfs4_cb_sv_ops[] = { + [0] = &nfs40_cb_sv_ops, + [1] = NULL, + }; +diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c +index 339c696bbc01..bb2beaef531a 100644 +--- a/fs/xfs/kmem.c ++++ b/fs/xfs/kmem.c +@@ -24,24 +24,6 @@ + #include "kmem.h" + #include "xfs_message.h" + +-/* +- * Greedy allocation. May fail and may return vmalloced memory. +- */ +-void * +-kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize) +-{ +- void *ptr; +- size_t kmsize = maxsize; +- +- while (!(ptr = vzalloc(kmsize))) { +- if ((kmsize >>= 1) <= minsize) +- kmsize = minsize; +- } +- if (ptr) +- *size = kmsize; +- return ptr; +-} +- + void * + kmem_alloc(size_t size, xfs_km_flags_t flags) + { +diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h +index 689f746224e7..f0fc84fcaac2 100644 +--- a/fs/xfs/kmem.h ++++ b/fs/xfs/kmem.h +@@ -69,8 +69,6 @@ static inline void kmem_free(const void *ptr) + } + + +-extern void *kmem_zalloc_greedy(size_t *, size_t, size_t); +- + static inline void * + kmem_zalloc(size_t size, xfs_km_flags_t flags) + { +diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c +index d8a77dbf4e3a..26d67ce3c18d 100644 +--- a/fs/xfs/xfs_itable.c ++++ b/fs/xfs/xfs_itable.c +@@ -361,7 +361,6 @@ xfs_bulkstat( + xfs_agino_t agino; /* inode # in allocation group */ + xfs_agnumber_t agno; /* allocation group number */ + xfs_btree_cur_t *cur; /* btree cursor for ialloc btree */ +- size_t irbsize; /* size of irec buffer in bytes */ + xfs_inobt_rec_incore_t *irbuf; /* start of irec buffer */ + int nirbuf; /* size of irbuf */ + int ubcount; /* size of user's buffer */ +@@ -388,11 +387,10 @@ xfs_bulkstat( + *ubcountp = 0; + *done = 0; + +- irbuf = kmem_zalloc_greedy(&irbsize, PAGE_SIZE, PAGE_SIZE * 4); ++ irbuf = kmem_zalloc_large(PAGE_SIZE * 4, KM_SLEEP); + if (!irbuf) + return -ENOMEM; +- +- nirbuf = irbsize / sizeof(*irbuf); ++ nirbuf = (PAGE_SIZE * 4) / sizeof(*irbuf); + + /* + * Loop over the allocation groups, starting from the last +diff --git a/include/linux/audit.h b/include/linux/audit.h +index 9d4443f93db6..2be99b276d29 100644 +--- a/include/linux/audit.h ++++ b/include/linux/audit.h +@@ -387,6 +387,20 @@ static inline int audit_socketcall(int nargs, unsigned long *args) + return __audit_socketcall(nargs, args); + return 0; + } ++ ++static inline int audit_socketcall_compat(int nargs, u32 *args) ++{ ++ unsigned long a[AUDITSC_ARGS]; ++ int i; ++ ++ if (audit_dummy_context()) ++ return 0; ++ ++ for (i = 0; i < nargs; i++) ++ a[i] = (unsigned long)args[i]; ++ return __audit_socketcall(nargs, a); ++} ++ + static inline int audit_sockaddr(int len, void *addr) + { + if (unlikely(!audit_dummy_context())) +@@ -513,6 +527,12 @@ static inline int audit_socketcall(int nargs, unsigned long *args) + { + return 0; + } ++ ++static inline int audit_socketcall_compat(int nargs, u32 *args) ++{ ++ return 0; ++} ++ + static inline void audit_fd_pair(int fd1, int fd2) + { } + static inline int audit_sockaddr(int len, void *addr) +diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h +index aab032a6ae61..97ca105347a6 100644 +--- a/include/linux/mmc/sdio_func.h ++++ b/include/linux/mmc/sdio_func.h +@@ -53,7 +53,7 @@ struct sdio_func { + unsigned int state; /* function state */ + #define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */ + +- u8 tmpbuf[4]; /* DMA:able scratch buffer */ ++ u8 *tmpbuf; /* DMA:able scratch buffer */ + + unsigned num_info; /* number of info strings */ + const char **info; /* info strings */ +diff --git a/include/net/netfilter/nf_tables_ipv6.h b/include/net/netfilter/nf_tables_ipv6.h +index d150b5066201..97983d1c05e4 100644 +--- a/include/net/netfilter/nf_tables_ipv6.h ++++ b/include/net/netfilter/nf_tables_ipv6.h +@@ -9,12 +9,13 @@ nft_set_pktinfo_ipv6(struct nft_pktinfo *pkt, + struct sk_buff *skb, + const struct nf_hook_state *state) + { ++ unsigned int flags = IP6_FH_F_AUTH; + int protohdr, thoff = 0; + unsigned short frag_off; + + nft_set_pktinfo(pkt, skb, state); + +- protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, NULL); ++ protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, &flags); + if (protohdr < 0) { + nft_set_pktinfo_proto_unspec(pkt, skb); + return; +@@ -32,6 +33,7 @@ __nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt, + const struct nf_hook_state *state) + { + #if IS_ENABLED(CONFIG_IPV6) ++ unsigned int flags = IP6_FH_F_AUTH; + struct ipv6hdr *ip6h, _ip6h; + unsigned int thoff = 0; + unsigned short frag_off; +@@ -50,7 +52,7 @@ __nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt, + if (pkt_len + sizeof(*ip6h) > skb->len) + return -1; + +- protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, NULL); ++ protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, &flags); + if (protohdr < 0) + return -1; + +diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h +index a5890bf44c0a..d1601a621929 100644 +--- a/include/uapi/drm/drm_fourcc.h ++++ b/include/uapi/drm/drm_fourcc.h +@@ -154,6 +154,7 @@ extern "C" { + + /* Vendor Ids: */ + #define DRM_FORMAT_MOD_NONE 0 ++#define DRM_FORMAT_MOD_VENDOR_NONE 0 + #define DRM_FORMAT_MOD_VENDOR_INTEL 0x01 + #define DRM_FORMAT_MOD_VENDOR_AMD 0x02 + #define DRM_FORMAT_MOD_VENDOR_NV 0x03 +diff --git a/mm/memcontrol.c b/mm/memcontrol.c +index 47559cc0cdcc..2a800c4a39bd 100644 +--- a/mm/memcontrol.c ++++ b/mm/memcontrol.c +@@ -462,6 +462,8 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page) + struct mem_cgroup_tree_per_node *mctz; + + mctz = soft_limit_tree_from_page(page); ++ if (!mctz) ++ return; + /* + * Necessary to update all ancestors when hierarchy is used. + * because their event counter is not touched. +@@ -499,7 +501,8 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg) + for_each_node(nid) { + mz = mem_cgroup_nodeinfo(memcg, nid); + mctz = soft_limit_tree_node(nid); +- mem_cgroup_remove_exceeded(mz, mctz); ++ if (mctz) ++ mem_cgroup_remove_exceeded(mz, mctz); + } + } + +@@ -2565,7 +2568,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, + * is empty. Do it lockless to prevent lock bouncing. Races + * are acceptable as soft limit is best effort anyway. + */ +- if (RB_EMPTY_ROOT(&mctz->rb_root)) ++ if (!mctz || RB_EMPTY_ROOT(&mctz->rb_root)) + return 0; + + /* +diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c +index 7625ec8458de..5d4006e589cb 100644 +--- a/net/bridge/br_netlink.c ++++ b/net/bridge/br_netlink.c +@@ -1098,11 +1098,14 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev, + spin_unlock_bh(&br->lock); + } + +- err = br_changelink(dev, tb, data); ++ err = register_netdevice(dev); + if (err) + return err; + +- return register_netdevice(dev); ++ err = br_changelink(dev, tb, data); ++ if (err) ++ unregister_netdevice(dev); ++ return err; + } + + static size_t br_get_size(const struct net_device *brdev) +diff --git a/net/compat.c b/net/compat.c +index 1cd2ec046164..a96fd2f3507b 100644 +--- a/net/compat.c ++++ b/net/compat.c +@@ -22,6 +22,7 @@ + #include <linux/filter.h> + #include <linux/compat.h> + #include <linux/security.h> ++#include <linux/audit.h> + #include <linux/export.h> + + #include <net/scm.h> +@@ -781,14 +782,24 @@ COMPAT_SYSCALL_DEFINE5(recvmmsg, int, fd, struct compat_mmsghdr __user *, mmsg, + + COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args) + { +- int ret; +- u32 a[6]; ++ u32 a[AUDITSC_ARGS]; ++ unsigned int len; + u32 a0, a1; ++ int ret; + + if (call < SYS_SOCKET || call > SYS_SENDMMSG) + return -EINVAL; +- if (copy_from_user(a, args, nas[call])) ++ len = nas[call]; ++ if (len > sizeof(a)) ++ return -EINVAL; ++ ++ if (copy_from_user(a, args, len)) + return -EFAULT; ++ ++ ret = audit_socketcall_compat(len / sizeof(a[0]), a); ++ if (ret) ++ return ret; ++ + a0 = a[0]; + a1 = a[1]; + +diff --git a/net/core/dev.c b/net/core/dev.c +index ba7b8121a414..7f2caad46a3d 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2355,6 +2355,9 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason) + { + unsigned long flags; + ++ if (unlikely(!skb)) ++ return; ++ + if (likely(atomic_read(&skb->users) == 1)) { + smp_rmb(); + atomic_set(&skb->users, 0); +diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c +index c9b52c361da2..5a8f7c360887 100644 +--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c ++++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c +@@ -1304,6 +1304,7 @@ static int __init nf_nat_snmp_basic_init(void) + static void __exit nf_nat_snmp_basic_fini(void) + { + RCU_INIT_POINTER(nf_nat_snmp_hook, NULL); ++ synchronize_rcu(); + nf_conntrack_helper_unregister(&snmp_trap_helper); + } + +diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c +index 6de016f80f17..0932c85b42af 100644 +--- a/net/ipv4/udp_offload.c ++++ b/net/ipv4/udp_offload.c +@@ -29,6 +29,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, + u16 mac_len = skb->mac_len; + int udp_offset, outer_hlen; + __wsum partial; ++ bool need_ipsec; + + if (unlikely(!pskb_may_pull(skb, tnl_hlen))) + goto out; +@@ -62,8 +63,10 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, + + ufo = !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP); + ++ need_ipsec = skb_dst(skb) && dst_xfrm(skb_dst(skb)); + /* Try to offload checksum if possible */ + offload_csum = !!(need_csum && ++ !need_ipsec && + (skb->dev->features & + (is_ipv6 ? (NETIF_F_HW_CSUM | NETIF_F_IPV6_CSUM) : + (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM)))); +diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c +index da9df2d56e66..22fc32143e9c 100644 +--- a/net/netfilter/nf_conntrack_ecache.c ++++ b/net/netfilter/nf_conntrack_ecache.c +@@ -290,6 +290,7 @@ void nf_conntrack_unregister_notifier(struct net *net, + BUG_ON(notify != new); + RCU_INIT_POINTER(net->ct.nf_conntrack_event_cb, NULL); + mutex_unlock(&nf_ct_ecache_mutex); ++ /* synchronize_rcu() is called from ctnetlink_exit. */ + } + EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier); + +@@ -326,6 +327,7 @@ void nf_ct_expect_unregister_notifier(struct net *net, + BUG_ON(notify != new); + RCU_INIT_POINTER(net->ct.nf_expect_event_cb, NULL); + mutex_unlock(&nf_ct_ecache_mutex); ++ /* synchronize_rcu() is called from ctnetlink_exit. */ + } + EXPORT_SYMBOL_GPL(nf_ct_expect_unregister_notifier); + +diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c +index 04111c1c3988..d5caed5bcfb1 100644 +--- a/net/netfilter/nf_conntrack_netlink.c ++++ b/net/netfilter/nf_conntrack_netlink.c +@@ -3413,6 +3413,7 @@ static void __exit ctnetlink_exit(void) + #ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT + RCU_INIT_POINTER(nfnl_ct_hook, NULL); + #endif ++ synchronize_rcu(); + } + + module_init(ctnetlink_init); +diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c +index dde64c4565d2..2916f4815c9c 100644 +--- a/net/netfilter/nf_nat_core.c ++++ b/net/netfilter/nf_nat_core.c +@@ -892,6 +892,8 @@ static void __exit nf_nat_cleanup(void) + #ifdef CONFIG_XFRM + RCU_INIT_POINTER(nf_nat_decode_session_hook, NULL); + #endif ++ synchronize_rcu(); ++ + for (i = 0; i < NFPROTO_NUMPROTO; i++) + kfree(nf_nat_l4protos[i]); + +diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c +index 3b79f34b5095..b1fcfa08f0b4 100644 +--- a/net/netfilter/nfnetlink_cthelper.c ++++ b/net/netfilter/nfnetlink_cthelper.c +@@ -161,6 +161,7 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper, + int i, ret; + struct nf_conntrack_expect_policy *expect_policy; + struct nlattr *tb[NFCTH_POLICY_SET_MAX+1]; ++ unsigned int class_max; + + ret = nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr, + nfnl_cthelper_expect_policy_set); +@@ -170,19 +171,18 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper, + if (!tb[NFCTH_POLICY_SET_NUM]) + return -EINVAL; + +- helper->expect_class_max = +- ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM])); +- +- if (helper->expect_class_max != 0 && +- helper->expect_class_max > NF_CT_MAX_EXPECT_CLASSES) ++ class_max = ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM])); ++ if (class_max == 0) ++ return -EINVAL; ++ if (class_max > NF_CT_MAX_EXPECT_CLASSES) + return -EOVERFLOW; + + expect_policy = kzalloc(sizeof(struct nf_conntrack_expect_policy) * +- helper->expect_class_max, GFP_KERNEL); ++ class_max, GFP_KERNEL); + if (expect_policy == NULL) + return -ENOMEM; + +- for (i=0; i<helper->expect_class_max; i++) { ++ for (i = 0; i < class_max; i++) { + if (!tb[NFCTH_POLICY_SET+i]) + goto err; + +@@ -191,6 +191,8 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper, + if (ret < 0) + goto err; + } ++ ++ helper->expect_class_max = class_max - 1; + helper->expect_policy = expect_policy; + return 0; + err: +@@ -377,10 +379,10 @@ nfnl_cthelper_dump_policy(struct sk_buff *skb, + goto nla_put_failure; + + if (nla_put_be32(skb, NFCTH_POLICY_SET_NUM, +- htonl(helper->expect_class_max))) ++ htonl(helper->expect_class_max + 1))) + goto nla_put_failure; + +- for (i=0; i<helper->expect_class_max; i++) { ++ for (i = 0; i < helper->expect_class_max + 1; i++) { + nest_parms2 = nla_nest_start(skb, + (NFCTH_POLICY_SET+i) | NLA_F_NESTED); + if (nest_parms2 == NULL) +diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c +index 139e0867e56e..47d6656c9119 100644 +--- a/net/netfilter/nfnetlink_cttimeout.c ++++ b/net/netfilter/nfnetlink_cttimeout.c +@@ -646,8 +646,8 @@ static void __exit cttimeout_exit(void) + #ifdef CONFIG_NF_CONNTRACK_TIMEOUT + RCU_INIT_POINTER(nf_ct_timeout_find_get_hook, NULL); + RCU_INIT_POINTER(nf_ct_timeout_put_hook, NULL); ++ synchronize_rcu(); + #endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ +- rcu_barrier(); + } + + module_init(cttimeout_init); +diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c +index 35ba4b60d927..9c92c6cb6a4f 100644 +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -3884,6 +3884,8 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, + case PACKET_HDRLEN: + if (len > sizeof(int)) + len = sizeof(int); ++ if (len < sizeof(int)) ++ return -EINVAL; + if (copy_from_user(&val, optval, len)) + return -EFAULT; + switch (val) { +diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c +index 5b2ab95afa07..169156cfd4c8 100644 +--- a/net/rds/ib_cm.c ++++ b/net/rds/ib_cm.c +@@ -405,7 +405,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + ret = PTR_ERR(ic->i_send_cq); + ic->i_send_cq = NULL; + rdsdebug("ib_create_cq send failed: %d\n", ret); +- goto out; ++ goto rds_ibdev_out; + } + + cq_attr.cqe = ic->i_recv_ring.w_nr; +@@ -416,19 +416,19 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + ret = PTR_ERR(ic->i_recv_cq); + ic->i_recv_cq = NULL; + rdsdebug("ib_create_cq recv failed: %d\n", ret); +- goto out; ++ goto send_cq_out; + } + + ret = ib_req_notify_cq(ic->i_send_cq, IB_CQ_NEXT_COMP); + if (ret) { + rdsdebug("ib_req_notify_cq send failed: %d\n", ret); +- goto out; ++ goto recv_cq_out; + } + + ret = ib_req_notify_cq(ic->i_recv_cq, IB_CQ_SOLICITED); + if (ret) { + rdsdebug("ib_req_notify_cq recv failed: %d\n", ret); +- goto out; ++ goto recv_cq_out; + } + + /* XXX negotiate max send/recv with remote? */ +@@ -453,7 +453,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + ret = rdma_create_qp(ic->i_cm_id, ic->i_pd, &attr); + if (ret) { + rdsdebug("rdma_create_qp failed: %d\n", ret); +- goto out; ++ goto recv_cq_out; + } + + ic->i_send_hdrs = ib_dma_alloc_coherent(dev, +@@ -463,7 +463,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + if (!ic->i_send_hdrs) { + ret = -ENOMEM; + rdsdebug("ib_dma_alloc_coherent send failed\n"); +- goto out; ++ goto qp_out; + } + + ic->i_recv_hdrs = ib_dma_alloc_coherent(dev, +@@ -473,7 +473,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + if (!ic->i_recv_hdrs) { + ret = -ENOMEM; + rdsdebug("ib_dma_alloc_coherent recv failed\n"); +- goto out; ++ goto send_hdrs_dma_out; + } + + ic->i_ack = ib_dma_alloc_coherent(dev, sizeof(struct rds_header), +@@ -481,7 +481,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + if (!ic->i_ack) { + ret = -ENOMEM; + rdsdebug("ib_dma_alloc_coherent ack failed\n"); +- goto out; ++ goto recv_hdrs_dma_out; + } + + ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), +@@ -489,7 +489,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + if (!ic->i_sends) { + ret = -ENOMEM; + rdsdebug("send allocation failed\n"); +- goto out; ++ goto ack_dma_out; + } + + ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), +@@ -497,7 +497,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + if (!ic->i_recvs) { + ret = -ENOMEM; + rdsdebug("recv allocation failed\n"); +- goto out; ++ goto sends_out; + } + + rds_ib_recv_init_ack(ic); +@@ -505,8 +505,33 @@ static int rds_ib_setup_qp(struct rds_connection *conn) + rdsdebug("conn %p pd %p cq %p %p\n", conn, ic->i_pd, + ic->i_send_cq, ic->i_recv_cq); + +-out: ++ return ret; ++ ++sends_out: ++ vfree(ic->i_sends); ++ack_dma_out: ++ ib_dma_free_coherent(dev, sizeof(struct rds_header), ++ ic->i_ack, ic->i_ack_dma); ++recv_hdrs_dma_out: ++ ib_dma_free_coherent(dev, ic->i_recv_ring.w_nr * ++ sizeof(struct rds_header), ++ ic->i_recv_hdrs, ic->i_recv_hdrs_dma); ++send_hdrs_dma_out: ++ ib_dma_free_coherent(dev, ic->i_send_ring.w_nr * ++ sizeof(struct rds_header), ++ ic->i_send_hdrs, ic->i_send_hdrs_dma); ++qp_out: ++ rdma_destroy_qp(ic->i_cm_id); ++recv_cq_out: ++ if (!ib_destroy_cq(ic->i_recv_cq)) ++ ic->i_recv_cq = NULL; ++send_cq_out: ++ if (!ib_destroy_cq(ic->i_send_cq)) ++ ic->i_send_cq = NULL; ++rds_ibdev_out: ++ rds_ib_remove_conn(rds_ibdev, conn); + rds_ib_dev_put(rds_ibdev); ++ + return ret; + } + +diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c +index 84d90c97332f..191098173018 100644 +--- a/net/rds/ib_send.c ++++ b/net/rds/ib_send.c +@@ -69,16 +69,6 @@ static void rds_ib_send_complete(struct rds_message *rm, + complete(rm, notify_status); + } + +-static void rds_ib_send_unmap_data(struct rds_ib_connection *ic, +- struct rm_data_op *op, +- int wc_status) +-{ +- if (op->op_nents) +- ib_dma_unmap_sg(ic->i_cm_id->device, +- op->op_sg, op->op_nents, +- DMA_TO_DEVICE); +-} +- + static void rds_ib_send_unmap_rdma(struct rds_ib_connection *ic, + struct rm_rdma_op *op, + int wc_status) +@@ -139,6 +129,21 @@ static void rds_ib_send_unmap_atomic(struct rds_ib_connection *ic, + rds_ib_stats_inc(s_ib_atomic_fadd); + } + ++static void rds_ib_send_unmap_data(struct rds_ib_connection *ic, ++ struct rm_data_op *op, ++ int wc_status) ++{ ++ struct rds_message *rm = container_of(op, struct rds_message, data); ++ ++ if (op->op_nents) ++ ib_dma_unmap_sg(ic->i_cm_id->device, ++ op->op_sg, op->op_nents, ++ DMA_TO_DEVICE); ++ ++ if (rm->rdma.op_active && rm->data.op_notify) ++ rds_ib_send_unmap_rdma(ic, &rm->rdma, wc_status); ++} ++ + /* + * Unmap the resources associated with a struct send_work. + * +diff --git a/net/rds/rdma.c b/net/rds/rdma.c +index 4c93badeabf2..8d3a851a3476 100644 +--- a/net/rds/rdma.c ++++ b/net/rds/rdma.c +@@ -626,6 +626,16 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, + } + op->op_notifier->n_user_token = args->user_token; + op->op_notifier->n_status = RDS_RDMA_SUCCESS; ++ ++ /* Enable rmda notification on data operation for composite ++ * rds messages and make sure notification is enabled only ++ * for the data operation which follows it so that application ++ * gets notified only after full message gets delivered. ++ */ ++ if (rm->data.op_sg) { ++ rm->rdma.op_notify = 0; ++ rm->data.op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME); ++ } + } + + /* The cookie contains the R_Key of the remote memory region, and +diff --git a/net/rds/rds.h b/net/rds/rds.h +index 67ba67c058b1..f107a968ddff 100644 +--- a/net/rds/rds.h ++++ b/net/rds/rds.h +@@ -414,6 +414,7 @@ struct rds_message { + } rdma; + struct rm_data_op { + unsigned int op_active:1; ++ unsigned int op_notify:1; + unsigned int op_nents; + unsigned int op_count; + unsigned int op_dmasg; +diff --git a/net/rds/send.c b/net/rds/send.c +index 896626b9a0ef..f28651b6ae83 100644 +--- a/net/rds/send.c ++++ b/net/rds/send.c +@@ -475,12 +475,14 @@ void rds_rdma_send_complete(struct rds_message *rm, int status) + struct rm_rdma_op *ro; + struct rds_notifier *notifier; + unsigned long flags; ++ unsigned int notify = 0; + + spin_lock_irqsave(&rm->m_rs_lock, flags); + ++ notify = rm->rdma.op_notify | rm->data.op_notify; + ro = &rm->rdma; + if (test_bit(RDS_MSG_ON_SOCK, &rm->m_flags) && +- ro->op_active && ro->op_notify && ro->op_notifier) { ++ ro->op_active && notify && ro->op_notifier) { + notifier = ro->op_notifier; + rs = rm->m_rs; + sock_hold(rds_rs_to_sk(rs)); +diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c +index e1af24f87566..c308a4f70550 100644 +--- a/sound/pci/au88x0/au88x0_core.c ++++ b/sound/pci/au88x0/au88x0_core.c +@@ -2279,6 +2279,9 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, + } else { + int src[2], mix[2]; + ++ if (nr_ch < 1) ++ return -EINVAL; ++ + /* Get SRC and MIXER hardware resources. */ + for (i = 0; i < nr_ch; i++) { + if ((mix[i] = +diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c +index f24b7cfd3a89..e024800213f5 100644 +--- a/sound/soc/codecs/rt5514.c ++++ b/sound/soc/codecs/rt5514.c +@@ -395,14 +395,14 @@ static const char * const rt5514_dmic_src[] = { + "DMIC1", "DMIC2" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5514_stereo1_dmic_enum, RT5514_DIG_SOURCE_CTRL, + RT5514_AD0_DMIC_INPUT_SEL_SFT, rt5514_dmic_src); + + static const struct snd_kcontrol_new rt5514_sto1_dmic_mux = + SOC_DAPM_ENUM("Stereo1 DMIC Source", rt5514_stereo1_dmic_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5514_stereo2_dmic_enum, RT5514_DIG_SOURCE_CTRL, + RT5514_AD1_DMIC_INPUT_SEL_SFT, rt5514_dmic_src); + +diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c +index db54550aed60..635818fcda00 100644 +--- a/sound/soc/codecs/rt5659.c ++++ b/sound/soc/codecs/rt5659.c +@@ -1150,28 +1150,28 @@ static const char * const rt5659_data_select[] = { + "L/R", "R/L", "L/L", "R/R" + }; + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if1_01_adc_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if1_01_adc_enum, + RT5659_TDM_CTRL_2, RT5659_DS_ADC_SLOT01_SFT, rt5659_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if1_23_adc_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if1_23_adc_enum, + RT5659_TDM_CTRL_2, RT5659_DS_ADC_SLOT23_SFT, rt5659_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if1_45_adc_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if1_45_adc_enum, + RT5659_TDM_CTRL_2, RT5659_DS_ADC_SLOT45_SFT, rt5659_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if1_67_adc_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if1_67_adc_enum, + RT5659_TDM_CTRL_2, RT5659_DS_ADC_SLOT67_SFT, rt5659_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if2_dac_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if2_dac_enum, + RT5659_DIG_INF23_DATA, RT5659_IF2_DAC_SEL_SFT, rt5659_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if2_adc_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if2_adc_enum, + RT5659_DIG_INF23_DATA, RT5659_IF2_ADC_SEL_SFT, rt5659_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if3_dac_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if3_dac_enum, + RT5659_DIG_INF23_DATA, RT5659_IF3_DAC_SEL_SFT, rt5659_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5659_if3_adc_enum, ++static SOC_ENUM_SINGLE_DECL(rt5659_if3_adc_enum, + RT5659_DIG_INF23_DATA, RT5659_IF3_ADC_SEL_SFT, rt5659_data_select); + + static const struct snd_kcontrol_new rt5659_if1_01_adc_swap_mux = +@@ -1207,31 +1207,31 @@ static unsigned int rt5659_asrc_clk_map_values[] = { + 0, 1, 2, 3, 5, 6, + }; + +-static const SOC_VALUE_ENUM_SINGLE_DECL( ++static SOC_VALUE_ENUM_SINGLE_DECL( + rt5659_da_sto_asrc_enum, RT5659_ASRC_2, RT5659_DA_STO_T_SFT, 0x7, + rt5659_asrc_clk_src, rt5659_asrc_clk_map_values); + +-static const SOC_VALUE_ENUM_SINGLE_DECL( ++static SOC_VALUE_ENUM_SINGLE_DECL( + rt5659_da_monol_asrc_enum, RT5659_ASRC_2, RT5659_DA_MONO_L_T_SFT, 0x7, + rt5659_asrc_clk_src, rt5659_asrc_clk_map_values); + +-static const SOC_VALUE_ENUM_SINGLE_DECL( ++static SOC_VALUE_ENUM_SINGLE_DECL( + rt5659_da_monor_asrc_enum, RT5659_ASRC_2, RT5659_DA_MONO_R_T_SFT, 0x7, + rt5659_asrc_clk_src, rt5659_asrc_clk_map_values); + +-static const SOC_VALUE_ENUM_SINGLE_DECL( ++static SOC_VALUE_ENUM_SINGLE_DECL( + rt5659_ad_sto1_asrc_enum, RT5659_ASRC_2, RT5659_AD_STO1_T_SFT, 0x7, + rt5659_asrc_clk_src, rt5659_asrc_clk_map_values); + +-static const SOC_VALUE_ENUM_SINGLE_DECL( ++static SOC_VALUE_ENUM_SINGLE_DECL( + rt5659_ad_sto2_asrc_enum, RT5659_ASRC_3, RT5659_AD_STO2_T_SFT, 0x7, + rt5659_asrc_clk_src, rt5659_asrc_clk_map_values); + +-static const SOC_VALUE_ENUM_SINGLE_DECL( ++static SOC_VALUE_ENUM_SINGLE_DECL( + rt5659_ad_monol_asrc_enum, RT5659_ASRC_3, RT5659_AD_MONO_L_T_SFT, 0x7, + rt5659_asrc_clk_src, rt5659_asrc_clk_map_values); + +-static const SOC_VALUE_ENUM_SINGLE_DECL( ++static SOC_VALUE_ENUM_SINGLE_DECL( + rt5659_ad_monor_asrc_enum, RT5659_ASRC_3, RT5659_AD_MONO_R_T_SFT, 0x7, + rt5659_asrc_clk_src, rt5659_asrc_clk_map_values); + +@@ -1930,14 +1930,14 @@ static const char * const rt5659_dac2_src[] = { + "IF1 DAC2", "IF2 DAC", "IF3 DAC", "Mono ADC MIX" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_dac_l2_enum, RT5659_DAC_CTRL, + RT5659_DAC_L2_SEL_SFT, rt5659_dac2_src); + + static const struct snd_kcontrol_new rt5659_dac_l2_mux = + SOC_DAPM_ENUM("DAC L2 Source", rt5659_dac_l2_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_dac_r2_enum, RT5659_DAC_CTRL, + RT5659_DAC_R2_SEL_SFT, rt5659_dac2_src); + +@@ -1951,7 +1951,7 @@ static const char * const rt5659_sto1_adc1_src[] = { + "DAC MIX", "ADC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_sto1_adc1_enum, RT5659_STO1_ADC_MIXER, + RT5659_STO1_ADC1_SRC_SFT, rt5659_sto1_adc1_src); + +@@ -1964,7 +1964,7 @@ static const char * const rt5659_sto1_adc_src[] = { + "ADC1", "ADC2" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_sto1_adc_enum, RT5659_STO1_ADC_MIXER, + RT5659_STO1_ADC_SRC_SFT, rt5659_sto1_adc_src); + +@@ -1977,7 +1977,7 @@ static const char * const rt5659_sto1_adc2_src[] = { + "DAC MIX", "DMIC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_sto1_adc2_enum, RT5659_STO1_ADC_MIXER, + RT5659_STO1_ADC2_SRC_SFT, rt5659_sto1_adc2_src); + +@@ -1990,7 +1990,7 @@ static const char * const rt5659_sto1_dmic_src[] = { + "DMIC1", "DMIC2" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_sto1_dmic_enum, RT5659_STO1_ADC_MIXER, + RT5659_STO1_DMIC_SRC_SFT, rt5659_sto1_dmic_src); + +@@ -2004,7 +2004,7 @@ static const char * const rt5659_mono_adc_l2_src[] = { + "Mono DAC MIXL", "DMIC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_adc_l2_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_ADC_L2_SRC_SFT, rt5659_mono_adc_l2_src); + +@@ -2018,7 +2018,7 @@ static const char * const rt5659_mono_adc_l1_src[] = { + "Mono DAC MIXL", "ADC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_adc_l1_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_ADC_L1_SRC_SFT, rt5659_mono_adc_l1_src); + +@@ -2031,14 +2031,14 @@ static const char * const rt5659_mono_adc_src[] = { + "ADC1 L", "ADC1 R", "ADC2 L", "ADC2 R" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_adc_l_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_ADC_L_SRC_SFT, rt5659_mono_adc_src); + + static const struct snd_kcontrol_new rt5659_mono_adc_l_mux = + SOC_DAPM_ENUM("Mono ADC L Source", rt5659_mono_adc_l_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_adcr_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_ADC_R_SRC_SFT, rt5659_mono_adc_src); + +@@ -2051,7 +2051,7 @@ static const char * const rt5659_mono_dmic_l_src[] = { + "DMIC1 L", "DMIC2 L" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_dmic_l_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_DMIC_L_SRC_SFT, rt5659_mono_dmic_l_src); + +@@ -2064,7 +2064,7 @@ static const char * const rt5659_mono_adc_r2_src[] = { + "Mono DAC MIXR", "DMIC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_adc_r2_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_ADC_R2_SRC_SFT, rt5659_mono_adc_r2_src); + +@@ -2077,7 +2077,7 @@ static const char * const rt5659_mono_adc_r1_src[] = { + "Mono DAC MIXR", "ADC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_adc_r1_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_ADC_R1_SRC_SFT, rt5659_mono_adc_r1_src); + +@@ -2090,7 +2090,7 @@ static const char * const rt5659_mono_dmic_r_src[] = { + "DMIC1 R", "DMIC2 R" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_mono_dmic_r_enum, RT5659_MONO_ADC_MIXER, + RT5659_MONO_DMIC_R_SRC_SFT, rt5659_mono_dmic_r_src); + +@@ -2104,14 +2104,14 @@ static const char * const rt5659_dac1_src[] = { + "IF1 DAC1", "IF2 DAC", "IF3 DAC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_dac_r1_enum, RT5659_AD_DA_MIXER, + RT5659_DAC1_R_SEL_SFT, rt5659_dac1_src); + + static const struct snd_kcontrol_new rt5659_dac_r1_mux = + SOC_DAPM_ENUM("DAC R1 Source", rt5659_dac_r1_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_dac_l1_enum, RT5659_AD_DA_MIXER, + RT5659_DAC1_L_SEL_SFT, rt5659_dac1_src); + +@@ -2124,14 +2124,14 @@ static const char * const rt5659_dig_dac_mix_src[] = { + "Stereo DAC Mixer", "Mono DAC Mixer" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_dig_dac_mixl_enum, RT5659_DIG_MIXER, + RT5659_DAC_MIX_L_SFT, rt5659_dig_dac_mix_src); + + static const struct snd_kcontrol_new rt5659_dig_dac_mixl_mux = + SOC_DAPM_ENUM("DAC Digital Mixer L Source", rt5659_dig_dac_mixl_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_dig_dac_mixr_enum, RT5659_DIG_MIXER, + RT5659_DAC_MIX_R_SFT, rt5659_dig_dac_mix_src); + +@@ -2144,14 +2144,14 @@ static const char * const rt5659_alg_dac1_src[] = { + "DAC", "Stereo DAC Mixer" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_alg_dac_l1_enum, RT5659_A_DAC_MUX, + RT5659_A_DACL1_SFT, rt5659_alg_dac1_src); + + static const struct snd_kcontrol_new rt5659_alg_dac_l1_mux = + SOC_DAPM_ENUM("Analog DACL1 Source", rt5659_alg_dac_l1_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_alg_dac_r1_enum, RT5659_A_DAC_MUX, + RT5659_A_DACR1_SFT, rt5659_alg_dac1_src); + +@@ -2164,14 +2164,14 @@ static const char * const rt5659_alg_dac2_src[] = { + "Stereo DAC Mixer", "Mono DAC Mixer" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_alg_dac_l2_enum, RT5659_A_DAC_MUX, + RT5659_A_DACL2_SFT, rt5659_alg_dac2_src); + + static const struct snd_kcontrol_new rt5659_alg_dac_l2_mux = + SOC_DAPM_ENUM("Analog DAC L2 Source", rt5659_alg_dac_l2_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_alg_dac_r2_enum, RT5659_A_DAC_MUX, + RT5659_A_DACR2_SFT, rt5659_alg_dac2_src); + +@@ -2184,7 +2184,7 @@ static const char * const rt5659_if2_adc_in_src[] = { + "IF_ADC1", "IF_ADC2", "DAC_REF", "IF_ADC3" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_if2_adc_in_enum, RT5659_DIG_INF23_DATA, + RT5659_IF2_ADC_IN_SFT, rt5659_if2_adc_in_src); + +@@ -2197,7 +2197,7 @@ static const char * const rt5659_if3_adc_in_src[] = { + "IF_ADC1", "IF_ADC2", "DAC_REF", "Stereo2_ADC_L/R" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_if3_adc_in_enum, RT5659_DIG_INF23_DATA, + RT5659_IF3_ADC_IN_SFT, rt5659_if3_adc_in_src); + +@@ -2210,14 +2210,14 @@ static const char * const rt5659_pdm_src[] = { + "Mono DAC", "Stereo DAC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_pdm_l_enum, RT5659_PDM_OUT_CTRL, + RT5659_PDM1_L_SFT, rt5659_pdm_src); + + static const struct snd_kcontrol_new rt5659_pdm_l_mux = + SOC_DAPM_ENUM("PDM L Source", rt5659_pdm_l_enum); + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_pdm_r_enum, RT5659_PDM_OUT_CTRL, + RT5659_PDM1_R_SFT, rt5659_pdm_src); + +@@ -2230,7 +2230,7 @@ static const char * const rt5659_spdif_src[] = { + "IF1_DAC1", "IF1_DAC2", "IF2_DAC", "IF3_DAC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_spdif_enum, RT5659_SPDIF_CTRL, + RT5659_SPDIF_SEL_SFT, rt5659_spdif_src); + +@@ -2250,7 +2250,7 @@ static const char * const rt5659_rx_adc_data_src[] = { + "NUL:AD2:DAC:AD1", "NUL:DAC:DAC:AD2", "NUL:DAC:AD2:DAC" + }; + +-static const SOC_ENUM_SINGLE_DECL( ++static SOC_ENUM_SINGLE_DECL( + rt5659_rx_adc_data_enum, RT5659_TDM_CTRL_2, + RT5659_ADCDAT_SRC_SFT, rt5659_rx_adc_data_src); + +diff --git a/sound/soc/codecs/rt5660.c b/sound/soc/codecs/rt5660.c +index 9f0933ced804..e396b7680fa1 100644 +--- a/sound/soc/codecs/rt5660.c ++++ b/sound/soc/codecs/rt5660.c +@@ -526,10 +526,10 @@ static const char * const rt5660_data_select[] = { + "L/R", "R/L", "L/L", "R/R" + }; + +-static const SOC_ENUM_SINGLE_DECL(rt5660_if1_dac_enum, ++static SOC_ENUM_SINGLE_DECL(rt5660_if1_dac_enum, + RT5660_DIG_INF1_DATA, RT5660_IF1_DAC_IN_SFT, rt5660_data_select); + +-static const SOC_ENUM_SINGLE_DECL(rt5660_if1_adc_enum, ++static SOC_ENUM_SINGLE_DECL(rt5660_if1_adc_enum, + RT5660_DIG_INF1_DATA, RT5660_IF1_ADC_IN_SFT, rt5660_data_select); + + static const struct snd_kcontrol_new rt5660_if1_dac_swap_mux = +diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c +index b943dde8dbe5..3bdd81930486 100644 +--- a/sound/soc/codecs/wm_adsp.c ++++ b/sound/soc/codecs/wm_adsp.c +@@ -789,7 +789,10 @@ static int wm_coeff_put(struct snd_kcontrol *kctl, + + mutex_lock(&ctl->dsp->pwr_lock); + +- memcpy(ctl->cache, p, ctl->len); ++ if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) ++ ret = -EPERM; ++ else ++ memcpy(ctl->cache, p, ctl->len); + + ctl->set = 1; + if (ctl->enabled && ctl->dsp->running) +@@ -816,6 +819,8 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, + ctl->set = 1; + if (ctl->enabled && ctl->dsp->running) + ret = wm_coeff_write_control(ctl, ctl->cache, size); ++ else if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) ++ ret = -EPERM; + } + + mutex_unlock(&ctl->dsp->pwr_lock); +diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c +index 3bbe32ee4630..6780eba55ec2 100644 +--- a/sound/soc/soc-dapm.c ++++ b/sound/soc/soc-dapm.c +@@ -358,6 +358,10 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, + snd_soc_dapm_new_control_unlocked(widget->dapm, + &template); + kfree(name); ++ if (IS_ERR(data->widget)) { ++ ret = PTR_ERR(data->widget); ++ goto err_data; ++ } + if (!data->widget) { + ret = -ENOMEM; + goto err_data; +@@ -392,6 +396,10 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, + data->widget = snd_soc_dapm_new_control_unlocked( + widget->dapm, &template); + kfree(name); ++ if (IS_ERR(data->widget)) { ++ ret = PTR_ERR(data->widget); ++ goto err_data; ++ } + if (!data->widget) { + ret = -ENOMEM; + goto err_data; +@@ -3311,11 +3319,22 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, + + mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); + w = snd_soc_dapm_new_control_unlocked(dapm, widget); ++ /* Do not nag about probe deferrals */ ++ if (IS_ERR(w)) { ++ int ret = PTR_ERR(w); ++ ++ if (ret != -EPROBE_DEFER) ++ dev_err(dapm->dev, ++ "ASoC: Failed to create DAPM control %s (%d)\n", ++ widget->name, ret); ++ goto out_unlock; ++ } + if (!w) + dev_err(dapm->dev, + "ASoC: Failed to create DAPM control %s\n", + widget->name); + ++out_unlock: + mutex_unlock(&dapm->card->dapm_mutex); + return w; + } +@@ -3338,6 +3357,8 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, + w->regulator = devm_regulator_get(dapm->dev, w->name); + if (IS_ERR(w->regulator)) { + ret = PTR_ERR(w->regulator); ++ if (ret == -EPROBE_DEFER) ++ return ERR_PTR(ret); + dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", + w->name, ret); + return NULL; +@@ -3356,6 +3377,8 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, + w->clk = devm_clk_get(dapm->dev, w->name); + if (IS_ERR(w->clk)) { + ret = PTR_ERR(w->clk); ++ if (ret == -EPROBE_DEFER) ++ return ERR_PTR(ret); + dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", + w->name, ret); + return NULL; +@@ -3474,6 +3497,16 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, + mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT); + for (i = 0; i < num; i++) { + w = snd_soc_dapm_new_control_unlocked(dapm, widget); ++ if (IS_ERR(w)) { ++ ret = PTR_ERR(w); ++ /* Do not nag about probe deferrals */ ++ if (ret == -EPROBE_DEFER) ++ break; ++ dev_err(dapm->dev, ++ "ASoC: Failed to create DAPM control %s (%d)\n", ++ widget->name, ret); ++ break; ++ } + if (!w) { + dev_err(dapm->dev, + "ASoC: Failed to create DAPM control %s\n", +@@ -3750,6 +3783,15 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, + dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name); + + w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template); ++ if (IS_ERR(w)) { ++ ret = PTR_ERR(w); ++ /* Do not nag about probe deferrals */ ++ if (ret != -EPROBE_DEFER) ++ dev_err(card->dev, ++ "ASoC: Failed to create %s widget (%d)\n", ++ link_name, ret); ++ goto outfree_kcontrol_news; ++ } + if (!w) { + dev_err(card->dev, "ASoC: Failed to create %s widget\n", + link_name); +@@ -3801,6 +3843,16 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, + template.name); + + w = snd_soc_dapm_new_control_unlocked(dapm, &template); ++ if (IS_ERR(w)) { ++ int ret = PTR_ERR(w); ++ ++ /* Do not nag about probe deferrals */ ++ if (ret != -EPROBE_DEFER) ++ dev_err(dapm->dev, ++ "ASoC: Failed to create %s widget (%d)\n", ++ dai->driver->playback.stream_name, ret); ++ return ret; ++ } + if (!w) { + dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", + dai->driver->playback.stream_name); +@@ -3820,6 +3872,16 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, + template.name); + + w = snd_soc_dapm_new_control_unlocked(dapm, &template); ++ if (IS_ERR(w)) { ++ int ret = PTR_ERR(w); ++ ++ /* Do not nag about probe deferrals */ ++ if (ret != -EPROBE_DEFER) ++ dev_err(dapm->dev, ++ "ASoC: Failed to create %s widget (%d)\n", ++ dai->driver->playback.stream_name, ret); ++ return ret; ++ } + if (!w) { + dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", + dai->driver->capture.stream_name); +diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c +index 6b05047a4134..8a758c994506 100644 +--- a/sound/soc/soc-topology.c ++++ b/sound/soc/soc-topology.c +@@ -1473,6 +1473,15 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, + widget = snd_soc_dapm_new_control(dapm, &template); + else + widget = snd_soc_dapm_new_control_unlocked(dapm, &template); ++ if (IS_ERR(widget)) { ++ ret = PTR_ERR(widget); ++ /* Do not nag about probe deferrals */ ++ if (ret != -EPROBE_DEFER) ++ dev_err(tplg->dev, ++ "ASoC: failed to create widget %s controls (%d)\n", ++ w->name, ret); ++ goto hdr_err; ++ } + if (widget == NULL) { + dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n", + w->name); +diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c +index 3e199b508a96..9664b1ff4285 100644 +--- a/tools/power/x86/turbostat/turbostat.c ++++ b/tools/power/x86/turbostat/turbostat.c +@@ -2003,8 +2003,10 @@ int snapshot_gfx_mhz(void) + + if (fp == NULL) + fp = fopen_or_die("/sys/class/graphics/fb0/device/drm/card0/gt_cur_freq_mhz", "r"); +- else ++ else { + rewind(fp); ++ fflush(fp); ++ } + + retval = fscanf(fp, "%d", &gfx_cur_mhz); + if (retval != 1) |