From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACFBE1396D0 for ; Mon, 7 Aug 2017 10:27:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E95CEE0B7D; Mon, 7 Aug 2017 10:27:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9671E0B7D for ; Mon, 7 Aug 2017 10:27:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F1DB34186C for ; Mon, 7 Aug 2017 10:27:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22CA774A9 for ; Mon, 7 Aug 2017 10:26:59 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1502101611.75b675050b8c4ce31c20d14ab334f93a025e145d.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.9 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 1040_linux-4.9.41.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 75b675050b8c4ce31c20d14ab334f93a025e145d X-VCS-Branch: 4.9 Date: Mon, 7 Aug 2017 10:26:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d2e2b376-d7cf-4d83-875e-1e68ed5a5168 X-Archives-Hash: 81df1bae83038eb009df4b0b2b75b0e8 commit: 75b675050b8c4ce31c20d14ab334f93a025e145d Author: Mike Pagano gentoo org> AuthorDate: Mon Aug 7 10:26:51 2017 +0000 Commit: Mike Pagano gentoo org> CommitDate: Mon Aug 7 10:26:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=75b67505 Linux patch 4.9.41 0000_README | 4 + 1040_linux-4.9.41.patch | 3462 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3466 insertions(+) diff --git a/0000_README b/0000_README index 82eac05..eacc709 100644 --- a/0000_README +++ b/0000_README @@ -203,6 +203,10 @@ Patch: 1039_linux-4.9.40.patch From: http://www.kernel.org Desc: Linux 4.9.40 +Patch: 1040_linux-4.9.41.patch +From: http://www.kernel.org +Desc: Linux 4.9.41 + 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/1040_linux-4.9.41.patch b/1040_linux-4.9.41.patch new file mode 100644 index 0000000..a43b44b --- /dev/null +++ b/1040_linux-4.9.41.patch @@ -0,0 +1,3462 @@ +diff --git a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt +index 3e5b9793341f..8682ab6d4a50 100644 +--- a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt ++++ b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt +@@ -8,8 +8,9 @@ This driver provides a simple power button event via an Interrupt. + Required properties: + - compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton" + +-Required properties for TPS65218: ++Required properties: + - interrupts: should be one of the following ++ - <2>: For controllers compatible with tps65217 + - <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218 + + Examples: +@@ -17,6 +18,7 @@ Examples: + &tps { + tps65217-pwrbutton { + compatible = "ti,tps65217-pwrbutton"; ++ interrupts = <2>; + }; + }; + +diff --git a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt +index 98d131acee95..a11072c5a866 100644 +--- a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt ++++ b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt +@@ -2,11 +2,16 @@ TPS65217 Charger + + Required Properties: + -compatible: "ti,tps65217-charger" ++-interrupts: TPS65217 interrupt numbers for the AC and USB charger input change. ++ Should be <0> for the USB charger and <1> for the AC adapter. ++-interrupt-names: Should be "USB" and "AC" + + This node is a subnode of the tps65217 PMIC. + + Example: + + tps65217-charger { +- compatible = "ti,tps65090-charger"; ++ compatible = "ti,tps65217-charger"; ++ interrupts = <0>, <1>; ++ interrupt-names = "USB", "AC"; + }; +diff --git a/Makefile b/Makefile +index d9397a912c31..82eb3d1ee801 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 9 +-SUBLEVEL = 40 ++SUBLEVEL = 41 + EXTRAVERSION = + NAME = Roaring Lionus + +diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c +index f39142acc89e..be131b296a55 100644 +--- a/arch/arc/kernel/mcip.c ++++ b/arch/arc/kernel/mcip.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -221,10 +222,13 @@ static irq_hw_number_t idu_first_hwirq; + static void idu_cascade_isr(struct irq_desc *desc) + { + struct irq_domain *idu_domain = irq_desc_get_handler_data(desc); ++ struct irq_chip *core_chip = irq_desc_get_chip(desc); + irq_hw_number_t core_hwirq = irqd_to_hwirq(irq_desc_get_irq_data(desc)); + irq_hw_number_t idu_hwirq = core_hwirq - idu_first_hwirq; + ++ chained_irq_enter(core_chip, desc); + generic_handle_irq(irq_find_mapping(idu_domain, idu_hwirq)); ++ chained_irq_exit(core_chip, desc); + } + + static int idu_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t hwirq) +diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi +index 03cec62260e1..db858fff4e18 100644 +--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi ++++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi +@@ -294,7 +294,7 @@ + }; + + &usb2 { +- dr_mode = "otg"; ++ dr_mode = "peripheral"; + }; + + &mmc2 { +diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts +index 87ca50b53002..4d448f145ed1 100644 +--- a/arch/arm/boot/dts/omap3-n900.dts ++++ b/arch/arm/boot/dts/omap3-n900.dts +@@ -734,6 +734,8 @@ + vmmc_aux-supply = <&vsim>; + bus-width = <8>; + non-removable; ++ no-sdio; ++ no-sd; + }; + + &mmc3 { +diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig +index bc4bfe02e611..60d3fecd7a22 100644 +--- a/arch/arm/configs/s3c2410_defconfig ++++ b/arch/arm/configs/s3c2410_defconfig +@@ -86,9 +86,9 @@ CONFIG_IPV6_TUNNEL=m + CONFIG_NETFILTER=y + CONFIG_NF_CONNTRACK=m + CONFIG_NF_CONNTRACK_EVENTS=y +-CONFIG_NF_CT_PROTO_DCCP=m +-CONFIG_NF_CT_PROTO_SCTP=m +-CONFIG_NF_CT_PROTO_UDPLITE=m ++CONFIG_NF_CT_PROTO_DCCP=y ++CONFIG_NF_CT_PROTO_SCTP=y ++CONFIG_NF_CT_PROTO_UDPLITE=y + CONFIG_NF_CONNTRACK_AMANDA=m + CONFIG_NF_CONNTRACK_FTP=m + CONFIG_NF_CONNTRACK_H323=m +diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c +index 1052b29697b8..b5c1714ebfdd 100644 +--- a/arch/arm/mach-omap2/omap_hwmod.c ++++ b/arch/arm/mach-omap2/omap_hwmod.c +@@ -790,14 +790,14 @@ static int _init_main_clk(struct omap_hwmod *oh) + int ret = 0; + char name[MOD_CLK_MAX_NAME_LEN]; + struct clk *clk; ++ static const char modck[] = "_mod_ck"; + +- /* +7 magic comes from '_mod_ck' suffix */ +- if (strlen(oh->name) + 7 > MOD_CLK_MAX_NAME_LEN) ++ if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck)) + pr_warn("%s: warning: cropping name for %s\n", __func__, + oh->name); + +- strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 7); +- strcat(name, "_mod_ck"); ++ strlcpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - strlen(modck)); ++ strlcat(name, modck, MOD_CLK_MAX_NAME_LEN); + + clk = clk_get(NULL, name); + if (!IS_ERR(clk)) { +diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts +index 358089687a69..ef1b9e573af0 100644 +--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts ++++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts +@@ -27,7 +27,7 @@ + stdout-path = "serial0:115200n8"; + }; + +- memory { ++ memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x40000000>; + }; +diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +index 68a908334c7b..54dc28351c8c 100644 +--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi ++++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +@@ -72,7 +72,7 @@ + <1 10 0xf08>; + }; + +- amba_apu { ++ amba_apu: amba_apu@0 { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; +@@ -175,7 +175,7 @@ + }; + + i2c0: i2c@ff020000 { +- compatible = "cdns,i2c-r1p10"; ++ compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; + status = "disabled"; + interrupt-parent = <&gic>; + interrupts = <0 17 4>; +@@ -185,7 +185,7 @@ + }; + + i2c1: i2c@ff030000 { +- compatible = "cdns,i2c-r1p10"; ++ compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; + status = "disabled"; + interrupt-parent = <&gic>; + interrupts = <0 18 4>; +diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c +index 8b8ac3db4092..0e90c7e0279c 100644 +--- a/arch/arm64/mm/fault.c ++++ b/arch/arm64/mm/fault.c +@@ -101,21 +101,21 @@ void show_pte(struct mm_struct *mm, unsigned long addr) + break; + + pud = pud_offset(pgd, addr); +- printk(", *pud=%016llx", pud_val(*pud)); ++ pr_cont(", *pud=%016llx", pud_val(*pud)); + if (pud_none(*pud) || pud_bad(*pud)) + break; + + pmd = pmd_offset(pud, addr); +- printk(", *pmd=%016llx", pmd_val(*pmd)); ++ pr_cont(", *pmd=%016llx", pmd_val(*pmd)); + if (pmd_none(*pmd) || pmd_bad(*pmd)) + break; + + pte = pte_offset_map(pmd, addr); +- printk(", *pte=%016llx", pte_val(*pte)); ++ pr_cont(", *pte=%016llx", pte_val(*pte)); + pte_unmap(pte); + } while(0); + +- printk("\n"); ++ pr_cont("\n"); + } + + #ifdef CONFIG_ARM64_HW_AFDBM +diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S +index d68b9ede8423..c50609aead35 100644 +--- a/arch/openrisc/kernel/vmlinux.lds.S ++++ b/arch/openrisc/kernel/vmlinux.lds.S +@@ -38,6 +38,8 @@ SECTIONS + /* Read-only sections, merged into text segment: */ + . = LOAD_BASE ; + ++ _text = .; ++ + /* _s_kernel_ro must be page aligned */ + . = ALIGN(PAGE_SIZE); + _s_kernel_ro = .; +diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c +index 53ec75f8e237..c721ea2fdbd8 100644 +--- a/arch/parisc/kernel/cache.c ++++ b/arch/parisc/kernel/cache.c +@@ -452,8 +452,8 @@ void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, + before it can be accessed through the kernel mapping. */ + preempt_disable(); + flush_dcache_page_asm(__pa(vfrom), vaddr); +- preempt_enable(); + copy_page_asm(vto, vfrom); ++ preempt_enable(); + } + EXPORT_SYMBOL(copy_user_page); + +@@ -538,6 +538,10 @@ void flush_cache_mm(struct mm_struct *mm) + struct vm_area_struct *vma; + pgd_t *pgd; + ++ /* Flush the TLB to avoid speculation if coherency is required. */ ++ if (parisc_requires_coherency()) ++ flush_tlb_all(); ++ + /* Flushing the whole cache on each cpu takes forever on + rp3440, etc. So, avoid it if the mm isn't too big. */ + if (mm_total_size(mm) >= parisc_cache_flush_threshold) { +@@ -594,33 +598,22 @@ flush_user_icache_range(unsigned long start, unsigned long end) + void flush_cache_range(struct vm_area_struct *vma, + unsigned long start, unsigned long end) + { +- unsigned long addr; +- pgd_t *pgd; +- + BUG_ON(!vma->vm_mm->context); + ++ /* Flush the TLB to avoid speculation if coherency is required. */ ++ if (parisc_requires_coherency()) ++ flush_tlb_range(vma, start, end); ++ + if ((end - start) >= parisc_cache_flush_threshold) { + flush_cache_all(); + return; + } + +- if (vma->vm_mm->context == mfsp(3)) { +- flush_user_dcache_range_asm(start, end); +- if (vma->vm_flags & VM_EXEC) +- flush_user_icache_range_asm(start, end); +- return; +- } ++ BUG_ON(vma->vm_mm->context != mfsp(3)); + +- pgd = vma->vm_mm->pgd; +- for (addr = start & PAGE_MASK; addr < end; addr += PAGE_SIZE) { +- unsigned long pfn; +- pte_t *ptep = get_ptep(pgd, addr); +- if (!ptep) +- continue; +- pfn = pte_pfn(*ptep); +- if (pfn_valid(pfn)) +- __flush_cache_page(vma, addr, PFN_PHYS(pfn)); +- } ++ flush_user_dcache_range_asm(start, end); ++ if (vma->vm_flags & VM_EXEC) ++ flush_user_icache_range_asm(start, end); + } + + void +@@ -629,7 +622,8 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long + BUG_ON(!vma->vm_mm->context); + + if (pfn_valid(pfn)) { +- flush_tlb_page(vma, vmaddr); ++ if (parisc_requires_coherency()) ++ flush_tlb_page(vma, vmaddr); + __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn)); + } + } +diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c +index e7ffde2758fc..7593787ed4c3 100644 +--- a/arch/parisc/kernel/process.c ++++ b/arch/parisc/kernel/process.c +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -142,6 +143,7 @@ void machine_power_off(void) + + /* prevent soft lockup/stalled CPU messages for endless loop. */ + rcu_sysrq_start(); ++ lockup_detector_suspend(); + for (;;); + } + +diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h +index 329771559cbb..8b3b46b7b0f2 100644 +--- a/arch/powerpc/include/asm/topology.h ++++ b/arch/powerpc/include/asm/topology.h +@@ -44,22 +44,8 @@ extern void __init dump_numa_cpu_topology(void); + extern int sysfs_add_device_to_node(struct device *dev, int nid); + extern void sysfs_remove_device_from_node(struct device *dev, int nid); + +-static inline int early_cpu_to_node(int cpu) +-{ +- int nid; +- +- nid = numa_cpu_lookup_table[cpu]; +- +- /* +- * Fall back to node 0 if nid is unset (it should be, except bugs). +- * This allows callers to safely do NODE_DATA(early_cpu_to_node(cpu)). +- */ +- return (nid < 0) ? 0 : nid; +-} + #else + +-static inline int early_cpu_to_node(int cpu) { return 0; } +- + static inline void dump_numa_cpu_topology(void) {} + + static inline int sysfs_add_device_to_node(struct device *dev, int nid) +diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c +index ada71bee176d..a12be60181bf 100644 +--- a/arch/powerpc/kernel/setup_64.c ++++ b/arch/powerpc/kernel/setup_64.c +@@ -595,7 +595,7 @@ void __init emergency_stack_init(void) + + static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) + { +- return __alloc_bootmem_node(NODE_DATA(early_cpu_to_node(cpu)), size, align, ++ return __alloc_bootmem_node(NODE_DATA(cpu_to_node(cpu)), size, align, + __pa(MAX_DMA_ADDRESS)); + } + +@@ -606,7 +606,7 @@ static void __init pcpu_fc_free(void *ptr, size_t size) + + static int pcpu_cpu_distance(unsigned int from, unsigned int to) + { +- if (early_cpu_to_node(from) == early_cpu_to_node(to)) ++ if (cpu_to_node(from) == cpu_to_node(to)) + return LOCAL_DISTANCE; + else + return REMOTE_DISTANCE; +diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c +index 5c0298422300..218cba2f5699 100644 +--- a/arch/powerpc/kvm/book3s_hv.c ++++ b/arch/powerpc/kvm/book3s_hv.c +@@ -2808,6 +2808,8 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) + int r; + int srcu_idx; + unsigned long ebb_regs[3] = {}; /* shut up GCC */ ++ unsigned long user_tar = 0; ++ unsigned int user_vrsave; + + if (!vcpu->arch.sane) { + run->exit_reason = KVM_EXIT_INTERNAL_ERROR; +@@ -2828,6 +2830,8 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) + run->fail_entry.hardware_entry_failure_reason = 0; + return -EINVAL; + } ++ /* Enable TM so we can read the TM SPRs */ ++ mtmsr(mfmsr() | MSR_TM); + current->thread.tm_tfhar = mfspr(SPRN_TFHAR); + current->thread.tm_tfiar = mfspr(SPRN_TFIAR); + current->thread.tm_texasr = mfspr(SPRN_TEXASR); +@@ -2856,12 +2860,14 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) + + flush_all_to_thread(current); + +- /* Save userspace EBB register values */ ++ /* Save userspace EBB and other register values */ + if (cpu_has_feature(CPU_FTR_ARCH_207S)) { + ebb_regs[0] = mfspr(SPRN_EBBHR); + ebb_regs[1] = mfspr(SPRN_EBBRR); + ebb_regs[2] = mfspr(SPRN_BESCR); ++ user_tar = mfspr(SPRN_TAR); + } ++ user_vrsave = mfspr(SPRN_VRSAVE); + + vcpu->arch.wqp = &vcpu->arch.vcore->wq; + vcpu->arch.pgdir = current->mm->pgd; +@@ -2885,12 +2891,15 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) + r = kvmppc_xics_rm_complete(vcpu, 0); + } while (is_kvmppc_resume_guest(r)); + +- /* Restore userspace EBB register values */ ++ /* Restore userspace EBB and other register values */ + if (cpu_has_feature(CPU_FTR_ARCH_207S)) { + mtspr(SPRN_EBBHR, ebb_regs[0]); + mtspr(SPRN_EBBRR, ebb_regs[1]); + mtspr(SPRN_BESCR, ebb_regs[2]); ++ mtspr(SPRN_TAR, user_tar); ++ mtspr(SPRN_FSCR, current->thread.fscr); + } ++ mtspr(SPRN_VRSAVE, user_vrsave); + + out: + vcpu->arch.state = KVMPPC_VCPU_NOTREADY; +diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S +index 6f81adb112f1..0447a22a4df6 100644 +--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S ++++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S +@@ -37,6 +37,13 @@ + #define NAPPING_CEDE 1 + #define NAPPING_NOVCPU 2 + ++/* Stack frame offsets for kvmppc_hv_entry */ ++#define SFS 112 ++#define STACK_SLOT_TRAP (SFS-4) ++#define STACK_SLOT_CIABR (SFS-16) ++#define STACK_SLOT_DAWR (SFS-24) ++#define STACK_SLOT_DAWRX (SFS-32) ++ + /* + * Call kvmppc_hv_entry in real mode. + * Must be called with interrupts hard-disabled. +@@ -289,10 +296,10 @@ kvm_novcpu_exit: + bl kvmhv_accumulate_time + #endif + 13: mr r3, r12 +- stw r12, 112-4(r1) ++ stw r12, STACK_SLOT_TRAP(r1) + bl kvmhv_commence_exit + nop +- lwz r12, 112-4(r1) ++ lwz r12, STACK_SLOT_TRAP(r1) + b kvmhv_switch_to_host + + /* +@@ -537,7 +544,7 @@ kvmppc_hv_entry: + */ + mflr r0 + std r0, PPC_LR_STKOFF(r1) +- stdu r1, -112(r1) ++ stdu r1, -SFS(r1) + + /* Save R1 in the PACA */ + std r1, HSTATE_HOST_R1(r13) +@@ -698,6 +705,16 @@ kvmppc_got_guest: + mtspr SPRN_PURR,r7 + mtspr SPRN_SPURR,r8 + ++ /* Save host values of some registers */ ++BEGIN_FTR_SECTION ++ mfspr r5, SPRN_CIABR ++ mfspr r6, SPRN_DAWR ++ mfspr r7, SPRN_DAWRX ++ std r5, STACK_SLOT_CIABR(r1) ++ std r6, STACK_SLOT_DAWR(r1) ++ std r7, STACK_SLOT_DAWRX(r1) ++END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) ++ + BEGIN_FTR_SECTION + /* Set partition DABR */ + /* Do this before re-enabling PMU to avoid P7 DABR corruption bug */ +@@ -1361,8 +1378,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) + */ + li r0, 0 + mtspr SPRN_IAMR, r0 +- mtspr SPRN_CIABR, r0 +- mtspr SPRN_DAWRX, r0 ++ mtspr SPRN_PSPB, r0 + mtspr SPRN_TCSCR, r0 + mtspr SPRN_WORT, r0 + /* Set MMCRS to 1<<31 to freeze and disable the SPMC counters */ +@@ -1378,6 +1394,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) + std r6,VCPU_UAMOR(r9) + li r6,0 + mtspr SPRN_AMR,r6 ++ mtspr SPRN_UAMOR, r6 + + /* Switch DSCR back to host value */ + mfspr r8, SPRN_DSCR +@@ -1519,6 +1536,16 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) + slbia + ptesync + ++ /* Restore host values of some registers */ ++BEGIN_FTR_SECTION ++ ld r5, STACK_SLOT_CIABR(r1) ++ ld r6, STACK_SLOT_DAWR(r1) ++ ld r7, STACK_SLOT_DAWRX(r1) ++ mtspr SPRN_CIABR, r5 ++ mtspr SPRN_DAWR, r6 ++ mtspr SPRN_DAWRX, r7 ++END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) ++ + /* + * POWER7/POWER8 guest -> host partition switch code. + * We don't have to lock against tlbies but we do +@@ -1652,8 +1679,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) + li r0, KVM_GUEST_MODE_NONE + stb r0, HSTATE_IN_GUEST(r13) + +- ld r0, 112+PPC_LR_STKOFF(r1) +- addi r1, r1, 112 ++ ld r0, SFS+PPC_LR_STKOFF(r1) ++ addi r1, r1, SFS + mtlr r0 + blr + +diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c +index cc66c49f07aa..666ad0611e63 100644 +--- a/arch/powerpc/platforms/pseries/reconfig.c ++++ b/arch/powerpc/platforms/pseries/reconfig.c +@@ -82,7 +82,6 @@ static int pSeries_reconfig_remove_node(struct device_node *np) + + of_detach_node(np); + of_node_put(parent); +- of_node_put(np); /* Must decrement the refcount */ + return 0; + } + +diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c +index fec8a461bdef..1076c9a77292 100644 +--- a/arch/x86/events/intel/cstate.c ++++ b/arch/x86/events/intel/cstate.c +@@ -434,6 +434,7 @@ static struct pmu cstate_core_pmu = { + .stop = cstate_pmu_event_stop, + .read = cstate_pmu_event_update, + .capabilities = PERF_PMU_CAP_NO_INTERRUPT, ++ .module = THIS_MODULE, + }; + + static struct pmu cstate_pkg_pmu = { +@@ -447,6 +448,7 @@ static struct pmu cstate_pkg_pmu = { + .stop = cstate_pmu_event_stop, + .read = cstate_pmu_event_update, + .capabilities = PERF_PMU_CAP_NO_INTERRUPT, ++ .module = THIS_MODULE, + }; + + static const struct cstate_model nhm_cstates __initconst = { +diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c +index 8b902b67342a..970c1de3b86e 100644 +--- a/arch/x86/events/intel/rapl.c ++++ b/arch/x86/events/intel/rapl.c +@@ -697,6 +697,7 @@ static int __init init_rapl_pmus(void) + rapl_pmus->pmu.start = rapl_pmu_event_start; + rapl_pmus->pmu.stop = rapl_pmu_event_stop; + rapl_pmus->pmu.read = rapl_pmu_event_read; ++ rapl_pmus->pmu.module = THIS_MODULE; + return 0; + } + +diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c +index 19d646a783fd..aec6cc925af8 100644 +--- a/arch/x86/events/intel/uncore.c ++++ b/arch/x86/events/intel/uncore.c +@@ -733,6 +733,7 @@ static int uncore_pmu_register(struct intel_uncore_pmu *pmu) + .start = uncore_pmu_event_start, + .stop = uncore_pmu_event_stop, + .read = uncore_pmu_event_read, ++ .module = THIS_MODULE, + }; + } else { + pmu->pmu = *pmu->type->pmu; +diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c +index 3dfca7b302dc..a5b47c1361a0 100644 +--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c ++++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c +@@ -955,6 +955,9 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank) + const char *name = get_name(bank, NULL); + int err = 0; + ++ if (!dev) ++ return -ENODEV; ++ + if (is_shared_bank(bank)) { + nb = node_to_amd_nb(amd_get_nb_id(cpu)); + +diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile +index dd6cfa4ad3ac..75029d0cfa15 100644 +--- a/arch/x86/platform/intel-mid/device_libs/Makefile ++++ b/arch/x86/platform/intel-mid/device_libs/Makefile +@@ -15,7 +15,7 @@ obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o + obj-$(subst m,y,$(CONFIG_GPIO_INTEL_PMIC)) += platform_pmic_gpio.o + obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o + # SPI Devices +-obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_spidev.o ++obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o + # I2C Devices + obj-$(subst m,y,$(CONFIG_SENSORS_EMC1403)) += platform_emc1403.o + obj-$(subst m,y,$(CONFIG_SENSORS_LIS3LV02D)) += platform_lis331.o +diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c +new file mode 100644 +index 000000000000..27186ad654c9 +--- /dev/null ++++ b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c +@@ -0,0 +1,54 @@ ++/* ++ * spidev platform data initilization file ++ * ++ * (C) Copyright 2014, 2016 Intel Corporation ++ * Authors: Andy Shevchenko ++ * Dan O'Donovan ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; version 2 ++ * of the License. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#define MRFLD_SPI_DEFAULT_DMA_BURST 8 ++#define MRFLD_SPI_DEFAULT_TIMEOUT 500 ++ ++/* GPIO pin for spidev chipselect */ ++#define MRFLD_SPIDEV_GPIO_CS 111 ++ ++static struct pxa2xx_spi_chip spidev_spi_chip = { ++ .dma_burst_size = MRFLD_SPI_DEFAULT_DMA_BURST, ++ .timeout = MRFLD_SPI_DEFAULT_TIMEOUT, ++ .gpio_cs = MRFLD_SPIDEV_GPIO_CS, ++}; ++ ++static void __init *spidev_platform_data(void *info) ++{ ++ struct spi_board_info *spi_info = info; ++ ++ if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER) ++ return ERR_PTR(-ENODEV); ++ ++ spi_info->mode = SPI_MODE_0; ++ spi_info->controller_data = &spidev_spi_chip; ++ ++ return NULL; ++} ++ ++static const struct devs_id spidev_dev_id __initconst = { ++ .name = "spidev", ++ .type = SFI_DEV_TYPE_SPI, ++ .delay = 0, ++ .get_platform_data = &spidev_platform_data, ++}; ++ ++sfi_device(spidev_dev_id); +diff --git a/arch/x86/platform/intel-mid/device_libs/platform_spidev.c b/arch/x86/platform/intel-mid/device_libs/platform_spidev.c +deleted file mode 100644 +index 30c601b399ee..000000000000 +--- a/arch/x86/platform/intel-mid/device_libs/platform_spidev.c ++++ /dev/null +@@ -1,50 +0,0 @@ +-/* +- * spidev platform data initilization file +- * +- * (C) Copyright 2014, 2016 Intel Corporation +- * Authors: Andy Shevchenko +- * Dan O'Donovan +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; version 2 +- * of the License. +- */ +- +-#include +-#include +-#include +-#include +- +-#include +- +-#define MRFLD_SPI_DEFAULT_DMA_BURST 8 +-#define MRFLD_SPI_DEFAULT_TIMEOUT 500 +- +-/* GPIO pin for spidev chipselect */ +-#define MRFLD_SPIDEV_GPIO_CS 111 +- +-static struct pxa2xx_spi_chip spidev_spi_chip = { +- .dma_burst_size = MRFLD_SPI_DEFAULT_DMA_BURST, +- .timeout = MRFLD_SPI_DEFAULT_TIMEOUT, +- .gpio_cs = MRFLD_SPIDEV_GPIO_CS, +-}; +- +-static void __init *spidev_platform_data(void *info) +-{ +- struct spi_board_info *spi_info = info; +- +- spi_info->mode = SPI_MODE_0; +- spi_info->controller_data = &spidev_spi_chip; +- +- return NULL; +-} +- +-static const struct devs_id spidev_dev_id __initconst = { +- .name = "spidev", +- .type = SFI_DEV_TYPE_SPI, +- .delay = 0, +- .get_platform_data = &spidev_platform_data, +-}; +- +-sfi_device(spidev_dev_id); +diff --git a/crypto/authencesn.c b/crypto/authencesn.c +index 121010ac9962..18c94e1c31d1 100644 +--- a/crypto/authencesn.c ++++ b/crypto/authencesn.c +@@ -248,6 +248,9 @@ static int crypto_authenc_esn_decrypt_tail(struct aead_request *req, + u8 *ihash = ohash + crypto_ahash_digestsize(auth); + u32 tmp[2]; + ++ if (!authsize) ++ goto decrypt; ++ + /* Move high-order bits of sequence number back. */ + scatterwalk_map_and_copy(tmp, dst, 4, 4, 0); + scatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen, 4, 0); +@@ -256,6 +259,8 @@ static int crypto_authenc_esn_decrypt_tail(struct aead_request *req, + if (crypto_memneq(ihash, ohash, authsize)) + return -EBADMSG; + ++decrypt: ++ + sg_init_table(areq_ctx->dst, 2); + dst = scatterwalk_ffwd(areq_ctx->dst, dst, assoclen); + +diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c +index 5ea5dc219f56..73c9c7fa9001 100644 +--- a/drivers/acpi/glue.c ++++ b/drivers/acpi/glue.c +@@ -98,7 +98,15 @@ static int find_child_checks(struct acpi_device *adev, bool check_children) + if (check_children && list_empty(&adev->children)) + return -ENODEV; + +- return sta_present ? FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE; ++ /* ++ * If the device has a _HID (or _CID) returning a valid ACPI/PNP ++ * device ID, it is better to make it look less attractive here, so that ++ * the other device with the same _ADR value (that may not have a valid ++ * device ID) can be matched going forward. [This means a second spec ++ * violation in a row, so whatever we do here is best effort anyway.] ++ */ ++ return sta_present && list_empty(&adev->pnp.ids) ? ++ FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE; + } + + struct acpi_device *acpi_find_child_device(struct acpi_device *parent, +diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c +index 4facc7517a6a..909311016108 100644 +--- a/drivers/char/ipmi/ipmi_watchdog.c ++++ b/drivers/char/ipmi/ipmi_watchdog.c +@@ -1162,10 +1162,11 @@ static int wdog_reboot_handler(struct notifier_block *this, + ipmi_watchdog_state = WDOG_TIMEOUT_NONE; + ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB); + } else if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) { +- /* Set a long timer to let the reboot happens, but +- reboot if it hangs, but only if the watchdog ++ /* Set a long timer to let the reboot happen or ++ reset if it hangs, but only if the watchdog + timer was already running. */ +- timeout = 120; ++ if (timeout < 120) ++ timeout = 120; + pretimeout = 0; + ipmi_watchdog_state = WDOG_TIMEOUT_RESET; + ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB); +diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c +index 586f9543de73..40be3747724d 100644 +--- a/drivers/dax/dax.c ++++ b/drivers/dax/dax.c +@@ -546,7 +546,8 @@ static void dax_dev_release(struct device *dev) + struct dax_dev *dax_dev = to_dax_dev(dev); + struct dax_region *dax_region = dax_dev->region; + +- ida_simple_remove(&dax_region->ida, dax_dev->id); ++ if (dax_dev->id >= 0) ++ ida_simple_remove(&dax_region->ida, dax_dev->id); + ida_simple_remove(&dax_minor_ida, MINOR(dev->devt)); + dax_region_put(dax_region); + iput(dax_dev->inode); +@@ -581,7 +582,7 @@ static void unregister_dax_dev(void *dev) + } + + struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, +- struct resource *res, int count) ++ int id, struct resource *res, int count) + { + struct device *parent = dax_region->dev; + struct dax_dev *dax_dev; +@@ -608,10 +609,16 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, + if (i < count) + goto err_id; + +- dax_dev->id = ida_simple_get(&dax_region->ida, 0, 0, GFP_KERNEL); +- if (dax_dev->id < 0) { +- rc = dax_dev->id; +- goto err_id; ++ if (id < 0) { ++ id = ida_simple_get(&dax_region->ida, 0, 0, GFP_KERNEL); ++ dax_dev->id = id; ++ if (id < 0) { ++ rc = id; ++ goto err_id; ++ } ++ } else { ++ /* region provider owns @id lifetime */ ++ dax_dev->id = -1; + } + + minor = ida_simple_get(&dax_minor_ida, 0, 0, GFP_KERNEL); +@@ -650,7 +657,7 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, + dev->parent = parent; + dev->groups = dax_attribute_groups; + dev->release = dax_dev_release; +- dev_set_name(dev, "dax%d.%d", dax_region->id, dax_dev->id); ++ dev_set_name(dev, "dax%d.%d", dax_region->id, id); + rc = device_add(dev); + if (rc) { + kill_dax_dev(dax_dev); +@@ -669,7 +676,8 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, + err_inode: + ida_simple_remove(&dax_minor_ida, minor); + err_minor: +- ida_simple_remove(&dax_region->ida, dax_dev->id); ++ if (dax_dev->id >= 0) ++ ida_simple_remove(&dax_region->ida, dax_dev->id); + err_id: + kfree(dax_dev); + +diff --git a/drivers/dax/dax.h b/drivers/dax/dax.h +index ddd829ab58c0..b5ed85036b2a 100644 +--- a/drivers/dax/dax.h ++++ b/drivers/dax/dax.h +@@ -21,5 +21,5 @@ struct dax_region *alloc_dax_region(struct device *parent, + int region_id, struct resource *res, unsigned int align, + void *addr, unsigned long flags); + struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, +- struct resource *res, int count); ++ int id, struct resource *res, int count); + #endif /* __DAX_H__ */ +diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c +index 73c6ce93a0d9..eebb35720398 100644 +--- a/drivers/dax/pmem.c ++++ b/drivers/dax/pmem.c +@@ -58,13 +58,12 @@ static void dax_pmem_percpu_kill(void *data) + + static int dax_pmem_probe(struct device *dev) + { +- int rc; + void *addr; + struct resource res; + struct dax_dev *dax_dev; ++ int rc, id, region_id; + struct nd_pfn_sb *pfn_sb; + struct dax_pmem *dax_pmem; +- struct nd_region *nd_region; + struct nd_namespace_io *nsio; + struct dax_region *dax_region; + struct nd_namespace_common *ndns; +@@ -122,14 +121,17 @@ static int dax_pmem_probe(struct device *dev) + /* adjust the dax_region resource to the start of data */ + res.start += le64_to_cpu(pfn_sb->dataoff); + +- nd_region = to_nd_region(dev->parent); +- dax_region = alloc_dax_region(dev, nd_region->id, &res, ++ rc = sscanf(dev_name(&ndns->dev), "namespace%d.%d", ®ion_id, &id); ++ if (rc != 2) ++ return -EINVAL; ++ ++ dax_region = alloc_dax_region(dev, region_id, &res, + le32_to_cpu(pfn_sb->align), addr, PFN_DEV|PFN_MAP); + if (!dax_region) + return -ENOMEM; + + /* TODO: support for subdividing a dax region... */ +- dax_dev = devm_create_dax_dev(dax_region, &res, 1); ++ dax_dev = devm_create_dax_dev(dax_region, id, &res, 1); + + /* child dax_dev instances now own the lifetime of the dax_region */ + dax_region_put(dax_region); +diff --git a/drivers/dma/ioat/hw.h b/drivers/dma/ioat/hw.h +index 8e67895bcca3..abcc51b343ce 100644 +--- a/drivers/dma/ioat/hw.h ++++ b/drivers/dma/ioat/hw.h +@@ -64,6 +64,8 @@ + #define PCI_DEVICE_ID_INTEL_IOAT_BDX8 0x6f2e + #define PCI_DEVICE_ID_INTEL_IOAT_BDX9 0x6f2f + ++#define PCI_DEVICE_ID_INTEL_IOAT_SKX 0x2021 ++ + #define IOAT_VER_1_2 0x12 /* Version 1.2 */ + #define IOAT_VER_2_0 0x20 /* Version 2.0 */ + #define IOAT_VER_3_0 0x30 /* Version 3.0 */ +diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c +index d235fbe2564f..0dea6d55f0ff 100644 +--- a/drivers/dma/ioat/init.c ++++ b/drivers/dma/ioat/init.c +@@ -106,6 +106,8 @@ static struct pci_device_id ioat_pci_tbl[] = { + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_BDX8) }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_BDX9) }, + ++ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SKX) }, ++ + /* I/OAT v3.3 platforms */ + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_BWD0) }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_BWD1) }, +@@ -243,10 +245,15 @@ static bool is_bdx_ioat(struct pci_dev *pdev) + } + } + ++static inline bool is_skx_ioat(struct pci_dev *pdev) ++{ ++ return (pdev->device == PCI_DEVICE_ID_INTEL_IOAT_SKX) ? true : false; ++} ++ + static bool is_xeon_cb32(struct pci_dev *pdev) + { + return is_jf_ioat(pdev) || is_snb_ioat(pdev) || is_ivb_ioat(pdev) || +- is_hsw_ioat(pdev) || is_bdx_ioat(pdev); ++ is_hsw_ioat(pdev) || is_bdx_ioat(pdev) || is_skx_ioat(pdev); + } + + bool is_bwd_ioat(struct pci_dev *pdev) +@@ -1350,6 +1357,8 @@ static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) + + device->version = readb(device->reg_base + IOAT_VER_OFFSET); + if (device->version >= IOAT_VER_3_0) { ++ if (is_skx_ioat(pdev)) ++ device->version = IOAT_VER_3_2; + err = ioat3_dma_probe(device, ioat_dca_enabled); + + if (device->version >= IOAT_VER_3_3) +diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c +index 3f24aeb48c0e..2403475a37cf 100644 +--- a/drivers/dma/ti-dma-crossbar.c ++++ b/drivers/dma/ti-dma-crossbar.c +@@ -149,6 +149,7 @@ static int ti_am335x_xbar_probe(struct platform_device *pdev) + match = of_match_node(ti_am335x_master_match, dma_node); + if (!match) { + dev_err(&pdev->dev, "DMA master is not supported\n"); ++ of_node_put(dma_node); + return -EINVAL; + } + +@@ -339,6 +340,7 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev) + match = of_match_node(ti_dra7_master_match, dma_node); + if (!match) { + dev_err(&pdev->dev, "DMA master is not supported\n"); ++ of_node_put(dma_node); + return -EINVAL; + } + +diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c +index f386f463278d..a904082ed206 100644 +--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c ++++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c +@@ -210,7 +210,14 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, + void adreno_flush(struct msm_gpu *gpu) + { + struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); +- uint32_t wptr = get_wptr(gpu->rb); ++ uint32_t wptr; ++ ++ /* ++ * Mask wptr value that we calculate to fit in the HW range. This is ++ * to account for the possibility that the last command fit exactly into ++ * the ringbuffer and rb->next hasn't wrapped to zero yet ++ */ ++ wptr = get_wptr(gpu->rb) & ((gpu->rb->size / 4) - 1); + + /* ensure writes to ringbuffer have hit system memory: */ + mb(); +diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c +index b6a0f37a65f3..393973016b52 100644 +--- a/drivers/gpu/drm/msm/msm_gem_submit.c ++++ b/drivers/gpu/drm/msm/msm_gem_submit.c +@@ -106,7 +106,8 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, + pagefault_disable(); + } + +- if (submit_bo.flags & ~MSM_SUBMIT_BO_FLAGS) { ++ if ((submit_bo.flags & ~MSM_SUBMIT_BO_FLAGS) || ++ !(submit_bo.flags & MSM_SUBMIT_BO_FLAGS)) { + DRM_ERROR("invalid flags: %x\n", submit_bo.flags); + ret = -EINVAL; + goto out_unlock; +@@ -290,7 +291,7 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob + { + uint32_t i, last_offset = 0; + uint32_t *ptr; +- int ret; ++ int ret = 0; + + if (offset % 4) { + DRM_ERROR("non-aligned cmdstream buffer: %u\n", offset); +@@ -317,12 +318,13 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob + + ret = copy_from_user(&submit_reloc, userptr, sizeof(submit_reloc)); + if (ret) +- return -EFAULT; ++ goto out; + + if (submit_reloc.submit_offset % 4) { + DRM_ERROR("non-aligned reloc offset: %u\n", + submit_reloc.submit_offset); +- return -EINVAL; ++ ret = -EINVAL; ++ goto out; + } + + /* offset in dwords: */ +@@ -331,12 +333,13 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob + if ((off >= (obj->base.size / 4)) || + (off < last_offset)) { + DRM_ERROR("invalid offset %u at reloc %u\n", off, i); +- return -EINVAL; ++ ret = -EINVAL; ++ goto out; + } + + ret = submit_bo(submit, submit_reloc.reloc_idx, NULL, &iova, &valid); + if (ret) +- return ret; ++ goto out; + + if (valid) + continue; +@@ -353,9 +356,10 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob + last_offset = off; + } + ++out: + msm_gem_put_vaddr_locked(&obj->base); + +- return 0; ++ return ret; + } + + static void submit_cleanup(struct msm_gem_submit *submit) +diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c +index f326cf6a32e6..67b34e069abf 100644 +--- a/drivers/gpu/drm/msm/msm_ringbuffer.c ++++ b/drivers/gpu/drm/msm/msm_ringbuffer.c +@@ -23,7 +23,8 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int size) + struct msm_ringbuffer *ring; + int ret; + +- size = ALIGN(size, 4); /* size should be dword aligned */ ++ if (WARN_ON(!is_power_of_2(size))) ++ return ERR_PTR(-EINVAL); + + ring = kzalloc(sizeof(*ring), GFP_KERNEL); + if (!ring) { +diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h +index 1e1de6bfe85a..5893be9788d3 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h ++++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h +@@ -27,7 +27,7 @@ struct nv50_disp { + u8 type[3]; + } pior; + +- struct nv50_disp_chan *chan[17]; ++ struct nv50_disp_chan *chan[21]; + }; + + int nv50_disp_root_scanoutpos(NV50_DISP_MTHD_V0); +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c +index c794b2c2d21e..6d8f21290aa2 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c +@@ -129,7 +129,7 @@ gf100_bar_init(struct nvkm_bar *base) + + if (bar->bar[0].mem) { + addr = nvkm_memory_addr(bar->bar[0].mem) >> 12; +- nvkm_wr32(device, 0x001714, 0xc0000000 | addr); ++ nvkm_wr32(device, 0x001714, 0x80000000 | addr); + } + + return 0; +diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c +index 73c971e39b1c..ae125d070212 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c +@@ -285,7 +285,6 @@ static int rcar_du_remove(struct platform_device *pdev) + + drm_kms_helper_poll_fini(ddev); + drm_mode_config_cleanup(ddev); +- drm_vblank_cleanup(ddev); + + drm_dev_unref(ddev); + +@@ -305,7 +304,7 @@ static int rcar_du_probe(struct platform_device *pdev) + return -ENODEV; + } + +- /* Allocate and initialize the DRM and R-Car device structures. */ ++ /* Allocate and initialize the R-Car device structure. */ + rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); + if (rcdu == NULL) + return -ENOMEM; +@@ -315,31 +314,22 @@ static int rcar_du_probe(struct platform_device *pdev) + rcdu->dev = &pdev->dev; + rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data; + +- ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev); +- if (IS_ERR(ddev)) +- return PTR_ERR(ddev); +- +- rcdu->ddev = ddev; +- ddev->dev_private = rcdu; +- + platform_set_drvdata(pdev, rcdu); + + /* I/O resources */ + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem); +- if (IS_ERR(rcdu->mmio)) { +- ret = PTR_ERR(rcdu->mmio); +- goto error; +- } +- +- /* Initialize vertical blanking interrupts handling. Start with vblank +- * disabled for all CRTCs. +- */ +- ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1); +- if (ret < 0) +- goto error; ++ if (IS_ERR(rcdu->mmio)) ++ return PTR_ERR(rcdu->mmio); + + /* DRM/KMS objects */ ++ ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev); ++ if (IS_ERR(ddev)) ++ return PTR_ERR(ddev); ++ ++ rcdu->ddev = ddev; ++ ddev->dev_private = rcdu; ++ + ret = rcar_du_modeset_init(rcdu); + if (ret < 0) { + if (ret != -EPROBE_DEFER) +diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c +index 392c7e6de042..cfc302c65b0b 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c +@@ -567,6 +567,13 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) + if (ret < 0) + return ret; + ++ /* Initialize vertical blanking interrupts handling. Start with vblank ++ * disabled for all CRTCs. ++ */ ++ ret = drm_vblank_init(dev, (1 << rcdu->info->num_crtcs) - 1); ++ if (ret < 0) ++ return ret; ++ + /* Initialize the groups. */ + num_groups = DIV_ROUND_UP(rcdu->num_crtcs, 2); + +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +index c7b53d987f06..fefb9d995d2c 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +@@ -519,7 +519,7 @@ static int vmw_cmd_invalid(struct vmw_private *dev_priv, + struct vmw_sw_context *sw_context, + SVGA3dCmdHeader *header) + { +- return capable(CAP_SYS_ADMIN) ? : -EINVAL; ++ return -EINVAL; + } + + static int vmw_cmd_ok(struct vmw_private *dev_priv, +diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c +index a5dd7e63ada3..4f3f5749b0c1 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -2484,6 +2484,7 @@ static const struct hid_device_id hid_ignore_list[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0002) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_PETZL, USB_DEVICE_ID_PETZL_HEADLAMP) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) }, + { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) }, + #if IS_ENABLED(CONFIG_MOUSE_SYNAPTICS_USB) +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index cfca43f635a6..08fd3f831d62 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -819,6 +819,9 @@ + #define USB_VENDOR_ID_PETALYNX 0x18b1 + #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037 + ++#define USB_VENDOR_ID_PETZL 0x2122 ++#define USB_DEVICE_ID_PETZL_HEADLAMP 0x1234 ++ + #define USB_VENDOR_ID_PHILIPS 0x0471 + #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617 + +diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c +index 01e3a37b0aef..d118ffe0bfb6 100644 +--- a/drivers/infiniband/core/uverbs_cmd.c ++++ b/drivers/infiniband/core/uverbs_cmd.c +@@ -2342,8 +2342,9 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file, + if (copy_from_user(&cmd, buf, sizeof cmd)) + return -EFAULT; + +- if (cmd.port_num < rdma_start_port(ib_dev) || +- cmd.port_num > rdma_end_port(ib_dev)) ++ if ((cmd.attr_mask & IB_QP_PORT) && ++ (cmd.port_num < rdma_start_port(ib_dev) || ++ cmd.port_num > rdma_end_port(ib_dev))) + return -EINVAL; + + INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd, +diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c +index f2a885eee4bb..8059b7eaf3a8 100644 +--- a/drivers/infiniband/hw/mlx4/main.c ++++ b/drivers/infiniband/hw/mlx4/main.c +@@ -1680,9 +1680,19 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att + size += ret; + } + ++ if (mlx4_is_master(mdev->dev) && flow_type == MLX4_FS_REGULAR && ++ flow_attr->num_of_specs == 1) { ++ struct _rule_hw *rule_header = (struct _rule_hw *)(ctrl + 1); ++ enum ib_flow_spec_type header_spec = ++ ((union ib_flow_spec *)(flow_attr + 1))->type; ++ ++ if (header_spec == IB_FLOW_SPEC_ETH) ++ mlx4_handle_eth_header_mcast_prio(ctrl, rule_header); ++ } ++ + ret = mlx4_cmd_imm(mdev->dev, mailbox->dma, reg_id, size >> 2, 0, + MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A, +- MLX4_CMD_WRAPPED); ++ MLX4_CMD_NATIVE); + if (ret == -ENOMEM) + pr_err("mcg table is full. Fail to register network rule.\n"); + else if (ret == -ENXIO) +@@ -1699,7 +1709,7 @@ static int __mlx4_ib_destroy_flow(struct mlx4_dev *dev, u64 reg_id) + int err; + err = mlx4_cmd(dev, reg_id, 0, 0, + MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A, +- MLX4_CMD_WRAPPED); ++ MLX4_CMD_NATIVE); + if (err) + pr_err("Fail to detach network rule. registration id = 0x%llx\n", + reg_id); +diff --git a/drivers/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c +index 54a5e870a8f5..efbcf8435185 100644 +--- a/drivers/irqchip/irq-keystone.c ++++ b/drivers/irqchip/irq-keystone.c +@@ -19,9 +19,9 @@ + #include + #include + #include ++#include + #include + #include +-#include + #include + #include + #include +@@ -39,6 +39,7 @@ struct keystone_irq_device { + struct irq_domain *irqd; + struct regmap *devctrl_regs; + u32 devctrl_offset; ++ raw_spinlock_t wa_lock; + }; + + static inline u32 keystone_irq_readl(struct keystone_irq_device *kirq) +@@ -83,17 +84,15 @@ static void keystone_irq_ack(struct irq_data *d) + /* nothing to do here */ + } + +-static void keystone_irq_handler(struct irq_desc *desc) ++static irqreturn_t keystone_irq_handler(int irq, void *keystone_irq) + { +- unsigned int irq = irq_desc_get_irq(desc); +- struct keystone_irq_device *kirq = irq_desc_get_handler_data(desc); ++ struct keystone_irq_device *kirq = keystone_irq; ++ unsigned long wa_lock_flags; + unsigned long pending; + int src, virq; + + dev_dbg(kirq->dev, "start irq %d\n", irq); + +- chained_irq_enter(irq_desc_get_chip(desc), desc); +- + pending = keystone_irq_readl(kirq); + keystone_irq_writel(kirq, pending); + +@@ -111,13 +110,15 @@ static void keystone_irq_handler(struct irq_desc *desc) + if (!virq) + dev_warn(kirq->dev, "spurious irq detected hwirq %d, virq %d\n", + src, virq); ++ raw_spin_lock_irqsave(&kirq->wa_lock, wa_lock_flags); + generic_handle_irq(virq); ++ raw_spin_unlock_irqrestore(&kirq->wa_lock, ++ wa_lock_flags); + } + } + +- chained_irq_exit(irq_desc_get_chip(desc), desc); +- + dev_dbg(kirq->dev, "end irq %d\n", irq); ++ return IRQ_HANDLED; + } + + static int keystone_irq_map(struct irq_domain *h, unsigned int virq, +@@ -182,9 +183,16 @@ static int keystone_irq_probe(struct platform_device *pdev) + return -ENODEV; + } + ++ raw_spin_lock_init(&kirq->wa_lock); ++ + platform_set_drvdata(pdev, kirq); + +- irq_set_chained_handler_and_data(kirq->irq, keystone_irq_handler, kirq); ++ ret = request_irq(kirq->irq, keystone_irq_handler, ++ 0, dev_name(dev), kirq); ++ if (ret) { ++ irq_domain_remove(kirq->irqd); ++ return ret; ++ } + + /* clear all source bits */ + keystone_irq_writel(kirq, ~0x0); +@@ -199,6 +207,8 @@ static int keystone_irq_remove(struct platform_device *pdev) + struct keystone_irq_device *kirq = platform_get_drvdata(pdev); + int hwirq; + ++ free_irq(kirq->irq, kirq); ++ + for (hwirq = 0; hwirq < KEYSTONE_N_IRQ; hwirq++) + irq_dispose_mapping(irq_find_mapping(kirq->irqd, hwirq)); + +diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c +index 17304705f2cf..05fa9f7af53c 100644 +--- a/drivers/irqchip/irq-mxs.c ++++ b/drivers/irqchip/irq-mxs.c +@@ -131,12 +131,16 @@ static struct irq_chip mxs_icoll_chip = { + .irq_ack = icoll_ack_irq, + .irq_mask = icoll_mask_irq, + .irq_unmask = icoll_unmask_irq, ++ .flags = IRQCHIP_MASK_ON_SUSPEND | ++ IRQCHIP_SKIP_SET_WAKE, + }; + + static struct irq_chip asm9260_icoll_chip = { + .irq_ack = icoll_ack_irq, + .irq_mask = asm9260_mask_irq, + .irq_unmask = asm9260_unmask_irq, ++ .flags = IRQCHIP_MASK_ON_SUSPEND | ++ IRQCHIP_SKIP_SET_WAKE, + }; + + asmlinkage void __exception_irq_entry icoll_handle_irq(struct pt_regs *regs) +diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c +index 9b856e1890d1..e4c43a17b333 100644 +--- a/drivers/isdn/i4l/isdn_common.c ++++ b/drivers/isdn/i4l/isdn_common.c +@@ -1379,6 +1379,7 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) + if (arg) { + if (copy_from_user(bname, argp, sizeof(bname) - 1)) + return -EFAULT; ++ bname[sizeof(bname)-1] = 0; + } else + return -EINVAL; + ret = mutex_lock_interruptible(&dev->mtx); +diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c +index c151c6daa67e..f63a110b7bcb 100644 +--- a/drivers/isdn/i4l/isdn_net.c ++++ b/drivers/isdn/i4l/isdn_net.c +@@ -2611,10 +2611,9 @@ isdn_net_newslave(char *parm) + char newname[10]; + + if (p) { +- /* Slave-Name MUST not be empty */ +- if (!strlen(p + 1)) ++ /* Slave-Name MUST not be empty or overflow 'newname' */ ++ if (strscpy(newname, p + 1, sizeof(newname)) <= 0) + return NULL; +- strcpy(newname, p + 1); + *p = 0; + /* Master must already exist */ + if (!(n = isdn_net_findif(parm))) +diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c +index 9c1e8adaf4fc..bf3fbd00a091 100644 +--- a/drivers/isdn/i4l/isdn_ppp.c ++++ b/drivers/isdn/i4l/isdn_ppp.c +@@ -2364,7 +2364,7 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s + id); + return NULL; + } else { +- rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL); ++ rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_ATOMIC); + if (!rs) + return NULL; + rs->state = CCPResetIdle; +diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c +index 4a36632c236f..87ef465c6947 100644 +--- a/drivers/mailbox/mailbox.c ++++ b/drivers/mailbox/mailbox.c +@@ -104,11 +104,14 @@ static void tx_tick(struct mbox_chan *chan, int r) + /* Submit next message */ + msg_submit(chan); + ++ if (!mssg) ++ return; ++ + /* Notify the client */ +- if (mssg && chan->cl->tx_done) ++ if (chan->cl->tx_done) + chan->cl->tx_done(chan->cl, mssg, r); + +- if (chan->cl->tx_block) ++ if (r != -ETIME && chan->cl->tx_block) + complete(&chan->tx_complete); + } + +@@ -261,7 +264,7 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg) + + msg_submit(chan); + +- if (chan->cl->tx_block && chan->active_req) { ++ if (chan->cl->tx_block) { + unsigned long wait; + int ret; + +@@ -272,8 +275,8 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg) + + ret = wait_for_completion_timeout(&chan->tx_complete, wait); + if (ret == 0) { +- t = -EIO; +- tx_tick(chan, -EIO); ++ t = -ETIME; ++ tx_tick(chan, t); + } + } + +diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c +index 8f117d6372c9..383f19c6bf24 100644 +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -5843,6 +5843,8 @@ static void raid5_do_work(struct work_struct *work) + pr_debug("%d stripes handled\n", handled); + + spin_unlock_irq(&conf->device_lock); ++ ++ async_tx_issue_pending_all(); + blk_finish_plug(&plug); + + pr_debug("--- raid5worker inactive\n"); +diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c +index 0a060339e516..2e7185030741 100644 +--- a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c ++++ b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c +@@ -211,7 +211,7 @@ static int s5c73m3_3a_lock(struct s5c73m3 *state, struct v4l2_ctrl *ctrl) + } + + if ((ctrl->val ^ ctrl->cur.val) & V4L2_LOCK_FOCUS) +- ret = s5c73m3_af_run(state, ~af_lock); ++ ret = s5c73m3_af_run(state, !af_lock); + + return ret; + } +diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c +index b3c9cbef766e..5626908f3f7a 100644 +--- a/drivers/net/ethernet/emulex/benet/be_main.c ++++ b/drivers/net/ethernet/emulex/benet/be_main.c +@@ -5186,7 +5186,9 @@ static netdev_features_t be_features_check(struct sk_buff *skb, + skb->inner_protocol_type != ENCAP_TYPE_ETHER || + skb->inner_protocol != htons(ETH_P_TEB) || + skb_inner_mac_header(skb) - skb_transport_header(skb) != +- sizeof(struct udphdr) + sizeof(struct vxlanhdr)) ++ sizeof(struct udphdr) + sizeof(struct vxlanhdr) || ++ !adapter->vxlan_port || ++ udp_hdr(skb)->dest != adapter->vxlan_port) + return features & ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK); + + return features; +diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c +index 2a9dd460a95f..e1f9e7cebf8f 100644 +--- a/drivers/net/ethernet/mellanox/mlx4/icm.c ++++ b/drivers/net/ethernet/mellanox/mlx4/icm.c +@@ -118,8 +118,13 @@ static int mlx4_alloc_icm_coherent(struct device *dev, struct scatterlist *mem, + if (!buf) + return -ENOMEM; + ++ if (offset_in_page(buf)) { ++ dma_free_coherent(dev, PAGE_SIZE << order, ++ buf, sg_dma_address(mem)); ++ return -ENOMEM; ++ } ++ + sg_set_buf(mem, buf, PAGE_SIZE << order); +- BUG_ON(mem->offset); + sg_dma_len(mem) = PAGE_SIZE << order; + return 0; + } +diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c +index b2ca8a635b2e..551786f58e59 100644 +--- a/drivers/net/ethernet/mellanox/mlx4/main.c ++++ b/drivers/net/ethernet/mellanox/mlx4/main.c +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -782,6 +783,23 @@ int mlx4_is_slave_active(struct mlx4_dev *dev, int slave) + } + EXPORT_SYMBOL(mlx4_is_slave_active); + ++void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl, ++ struct _rule_hw *eth_header) ++{ ++ if (is_multicast_ether_addr(eth_header->eth.dst_mac) || ++ is_broadcast_ether_addr(eth_header->eth.dst_mac)) { ++ struct mlx4_net_trans_rule_hw_eth *eth = ++ (struct mlx4_net_trans_rule_hw_eth *)eth_header; ++ struct _rule_hw *next_rule = (struct _rule_hw *)(eth + 1); ++ bool last_rule = next_rule->size == 0 && next_rule->id == 0 && ++ next_rule->rsvd == 0; ++ ++ if (last_rule) ++ ctrl->prio = cpu_to_be16(MLX4_DOMAIN_NIC); ++ } ++} ++EXPORT_SYMBOL(mlx4_handle_eth_header_mcast_prio); ++ + static void slave_adjust_steering_mode(struct mlx4_dev *dev, + struct mlx4_dev_cap *dev_cap, + struct mlx4_init_hca_param *hca_param) +diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +index 32f76bf018c3..1822382212ee 100644 +--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c ++++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +@@ -4165,22 +4165,6 @@ static int validate_eth_header_mac(int slave, struct _rule_hw *eth_header, + return 0; + } + +-static void handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl, +- struct _rule_hw *eth_header) +-{ +- if (is_multicast_ether_addr(eth_header->eth.dst_mac) || +- is_broadcast_ether_addr(eth_header->eth.dst_mac)) { +- struct mlx4_net_trans_rule_hw_eth *eth = +- (struct mlx4_net_trans_rule_hw_eth *)eth_header; +- struct _rule_hw *next_rule = (struct _rule_hw *)(eth + 1); +- bool last_rule = next_rule->size == 0 && next_rule->id == 0 && +- next_rule->rsvd == 0; +- +- if (last_rule) +- ctrl->prio = cpu_to_be16(MLX4_DOMAIN_NIC); +- } +-} +- + /* + * In case of missing eth header, append eth header with a MAC address + * assigned to the VF. +@@ -4364,10 +4348,7 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave, + header_id = map_hw_to_sw_id(be16_to_cpu(rule_header->id)); + + if (header_id == MLX4_NET_TRANS_RULE_ID_ETH) +- handle_eth_header_mcast_prio(ctrl, rule_header); +- +- if (slave == dev->caps.function) +- goto execute; ++ mlx4_handle_eth_header_mcast_prio(ctrl, rule_header); + + switch (header_id) { + case MLX4_NET_TRANS_RULE_ID_ETH: +@@ -4395,7 +4376,6 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave, + goto err_put_qp; + } + +-execute: + err = mlx4_cmd_imm(dev, inbox->dma, &vhcr->out_param, + vhcr->in_modifier, 0, + MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A, +@@ -4474,6 +4454,7 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave, + struct res_qp *rqp; + struct res_fs_rule *rrule; + u64 mirr_reg_id; ++ int qpn; + + if (dev->caps.steering_mode != + MLX4_STEERING_MODE_DEVICE_MANAGED) +@@ -4490,10 +4471,11 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave, + } + mirr_reg_id = rrule->mirr_rule_id; + kfree(rrule->mirr_mbox); ++ qpn = rrule->qpn; + + /* Release the rule form busy state before removal */ + put_res(dev, slave, vhcr->in_param, RES_FS_RULE); +- err = get_res(dev, slave, rrule->qpn, RES_QP, &rqp); ++ err = get_res(dev, slave, qpn, RES_QP, &rqp); + if (err) + return err; + +@@ -4518,7 +4500,7 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave, + if (!err) + atomic_dec(&rqp->ref_count); + out: +- put_res(dev, slave, rrule->qpn, RES_QP); ++ put_res(dev, slave, qpn, RES_QP); + return err; + } + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +index b08b9e2c6a76..6ffd5d2a70aa 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +@@ -672,6 +672,12 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports) + if (err) + goto err_reps; + } ++ ++ /* disable PF RoCE so missed packets don't go through RoCE steering */ ++ mlx5_dev_list_lock(); ++ mlx5_remove_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB); ++ mlx5_dev_list_unlock(); ++ + return 0; + + err_reps: +@@ -695,6 +701,11 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw) + { + int err, err1, num_vfs = esw->dev->priv.sriov.num_vfs; + ++ /* enable back PF RoCE */ ++ mlx5_dev_list_lock(); ++ mlx5_add_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB); ++ mlx5_dev_list_unlock(); ++ + mlx5_eswitch_disable_sriov(esw); + err = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_LEGACY); + if (err) { +diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c +index bf000d819a21..2c4350a1c629 100644 +--- a/drivers/net/ethernet/realtek/r8169.c ++++ b/drivers/net/ethernet/realtek/r8169.c +@@ -326,6 +326,7 @@ enum cfg_version { + static const struct pci_device_id rtl8169_pci_tbl[] = { + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 }, ++ { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8161), 0, 0, RTL_CFG_1 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, +diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c +index a2d218b28c0e..12be259394c6 100644 +--- a/drivers/net/ethernet/renesas/sh_eth.c ++++ b/drivers/net/ethernet/renesas/sh_eth.c +@@ -819,6 +819,7 @@ static struct sh_eth_cpu_data sh7734_data = { + .tsu = 1, + .hw_crc = 1, + .select_mii = 1, ++ .shift_rd0 = 1, + }; + + /* SH7763 */ +diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c +index 32b555a72e13..9e7b7836774f 100644 +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -1792,7 +1792,7 @@ static struct phy_driver genphy_driver[] = { + .phy_id = 0xffffffff, + .phy_id_mask = 0xffffffff, + .name = "Generic PHY", +- .soft_reset = genphy_soft_reset, ++ .soft_reset = genphy_no_soft_reset, + .config_init = genphy_config_init, + .features = PHY_GBIT_FEATURES | SUPPORTED_MII | + SUPPORTED_AUI | SUPPORTED_FIBRE | +diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c +index dc7b6392e75a..50737def774c 100644 +--- a/drivers/net/usb/asix_devices.c ++++ b/drivers/net/usb/asix_devices.c +@@ -1369,6 +1369,7 @@ static struct usb_driver asix_driver = { + .probe = usbnet_probe, + .suspend = asix_suspend, + .resume = asix_resume, ++ .reset_resume = asix_resume, + .disconnect = usbnet_disconnect, + .supports_autosuspend = 1, + .disable_hub_initiated_lpm = 1, +diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h +index c9a8bb1186f2..c7956e181f80 100644 +--- a/drivers/net/wireless/ath/ath10k/wmi-ops.h ++++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h +@@ -660,6 +660,9 @@ ath10k_wmi_vdev_spectral_conf(struct ath10k *ar, + struct sk_buff *skb; + u32 cmd_id; + ++ if (!ar->wmi.ops->gen_vdev_spectral_conf) ++ return -EOPNOTSUPP; ++ + skb = ar->wmi.ops->gen_vdev_spectral_conf(ar, arg); + if (IS_ERR(skb)) + return PTR_ERR(skb); +@@ -675,6 +678,9 @@ ath10k_wmi_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id, u32 trigger, + struct sk_buff *skb; + u32 cmd_id; + ++ if (!ar->wmi.ops->gen_vdev_spectral_enable) ++ return -EOPNOTSUPP; ++ + skb = ar->wmi.ops->gen_vdev_spectral_enable(ar, vdev_id, trigger, + enable); + if (IS_ERR(skb)) +diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c +index e7130b54d1d8..24b07a0ce6f7 100644 +--- a/drivers/net/wireless/ath/wil6210/main.c ++++ b/drivers/net/wireless/ath/wil6210/main.c +@@ -384,18 +384,19 @@ static void wil_fw_error_worker(struct work_struct *work) + + wil->last_fw_recovery = jiffies; + ++ wil_info(wil, "fw error recovery requested (try %d)...\n", ++ wil->recovery_count); ++ if (!no_fw_recovery) ++ wil->recovery_state = fw_recovery_running; ++ if (wil_wait_for_recovery(wil) != 0) ++ return; ++ + mutex_lock(&wil->mutex); + switch (wdev->iftype) { + case NL80211_IFTYPE_STATION: + case NL80211_IFTYPE_P2P_CLIENT: + case NL80211_IFTYPE_MONITOR: +- wil_info(wil, "fw error recovery requested (try %d)...\n", +- wil->recovery_count); +- if (!no_fw_recovery) +- wil->recovery_state = fw_recovery_running; +- if (0 != wil_wait_for_recovery(wil)) +- break; +- ++ /* silent recovery, upper layers will see disconnect */ + __wil_down(wil); + __wil_up(wil); + break; +diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c +index 5e797d5c38ed..712936f5d2d6 100644 +--- a/drivers/nfc/fdp/i2c.c ++++ b/drivers/nfc/fdp/i2c.c +@@ -210,14 +210,14 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id) + struct sk_buff *skb; + int r; + +- client = phy->i2c_dev; +- dev_dbg(&client->dev, "%s\n", __func__); +- + if (!phy || irq != phy->i2c_dev->irq) { + WARN_ON_ONCE(1); + return IRQ_NONE; + } + ++ client = phy->i2c_dev; ++ dev_dbg(&client->dev, "%s\n", __func__); ++ + r = fdp_nci_i2c_read(phy, &skb); + + if (r == -EREMOTEIO) +diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c +index 2b2330b235e6..073e4a478c89 100644 +--- a/drivers/nfc/port100.c ++++ b/drivers/nfc/port100.c +@@ -725,23 +725,33 @@ static int port100_submit_urb_for_ack(struct port100 *dev, gfp_t flags) + + static int port100_send_ack(struct port100 *dev) + { +- int rc; ++ int rc = 0; + + mutex_lock(&dev->out_urb_lock); + +- init_completion(&dev->cmd_cancel_done); ++ /* ++ * If prior cancel is in-flight (dev->cmd_cancel == true), we ++ * can skip to send cancel. Then this will wait the prior ++ * cancel, or merged into the next cancel rarely if next ++ * cancel was started before waiting done. In any case, this ++ * will be waked up soon or later. ++ */ ++ if (!dev->cmd_cancel) { ++ reinit_completion(&dev->cmd_cancel_done); + +- usb_kill_urb(dev->out_urb); ++ usb_kill_urb(dev->out_urb); + +- dev->out_urb->transfer_buffer = ack_frame; +- dev->out_urb->transfer_buffer_length = sizeof(ack_frame); +- rc = usb_submit_urb(dev->out_urb, GFP_KERNEL); ++ dev->out_urb->transfer_buffer = ack_frame; ++ dev->out_urb->transfer_buffer_length = sizeof(ack_frame); ++ rc = usb_submit_urb(dev->out_urb, GFP_KERNEL); + +- /* Set the cmd_cancel flag only if the URB has been successfully +- * submitted. It will be reset by the out URB completion callback +- * port100_send_complete(). +- */ +- dev->cmd_cancel = !rc; ++ /* ++ * Set the cmd_cancel flag only if the URB has been ++ * successfully submitted. It will be reset by the out ++ * URB completion callback port100_send_complete(). ++ */ ++ dev->cmd_cancel = !rc; ++ } + + mutex_unlock(&dev->out_urb_lock); + +@@ -928,8 +938,8 @@ static void port100_send_complete(struct urb *urb) + struct port100 *dev = urb->context; + + if (dev->cmd_cancel) { ++ complete_all(&dev->cmd_cancel_done); + dev->cmd_cancel = false; +- complete(&dev->cmd_cancel_done); + } + + switch (urb->status) { +@@ -1543,6 +1553,7 @@ static int port100_probe(struct usb_interface *interface, + PORT100_COMM_RF_HEAD_MAX_LEN; + dev->skb_tailroom = PORT100_FRAME_TAIL_LEN; + ++ init_completion(&dev->cmd_cancel_done); + INIT_WORK(&dev->cmd_complete_work, port100_wq_cmd_complete); + + /* The first thing to do with the Port-100 is to set the command type +diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c +index ac27b9bac3b9..8e7b120696fa 100644 +--- a/drivers/nvmem/imx-ocotp.c ++++ b/drivers/nvmem/imx-ocotp.c +@@ -71,7 +71,7 @@ static struct nvmem_config imx_ocotp_nvmem_config = { + + static const struct of_device_id imx_ocotp_dt_ids[] = { + { .compatible = "fsl,imx6q-ocotp", (void *)128 }, +- { .compatible = "fsl,imx6sl-ocotp", (void *)32 }, ++ { .compatible = "fsl,imx6sl-ocotp", (void *)64 }, + { .compatible = "fsl,imx6sx-ocotp", (void *)128 }, + { }, + }; +diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c +index 9d253cb83ee7..e70410beb83a 100644 +--- a/drivers/scsi/bfa/bfad.c ++++ b/drivers/scsi/bfa/bfad.c +@@ -64,9 +64,9 @@ int max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS; + u32 bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size; + u32 *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2; + +-#define BFAD_FW_FILE_CB "cbfw-3.2.3.0.bin" +-#define BFAD_FW_FILE_CT "ctfw-3.2.3.0.bin" +-#define BFAD_FW_FILE_CT2 "ct2fw-3.2.3.0.bin" ++#define BFAD_FW_FILE_CB "cbfw-3.2.5.1.bin" ++#define BFAD_FW_FILE_CT "ctfw-3.2.5.1.bin" ++#define BFAD_FW_FILE_CT2 "ct2fw-3.2.5.1.bin" + + static u32 *bfad_load_fwimg(struct pci_dev *pdev); + static void bfad_free_fwimg(void); +diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h +index f9e862093a25..cfcfff48e8e1 100644 +--- a/drivers/scsi/bfa/bfad_drv.h ++++ b/drivers/scsi/bfa/bfad_drv.h +@@ -58,7 +58,7 @@ + #ifdef BFA_DRIVER_VERSION + #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION + #else +-#define BFAD_DRIVER_VERSION "3.2.25.0" ++#define BFAD_DRIVER_VERSION "3.2.25.1" + #endif + + #define BFAD_PROTO_NAME FCPI_NAME +diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h +index 9ddc9200e0a4..9e4b7709043e 100644 +--- a/drivers/scsi/fnic/fnic.h ++++ b/drivers/scsi/fnic/fnic.h +@@ -248,6 +248,7 @@ struct fnic { + struct completion *remove_wait; /* device remove thread blocks */ + + atomic_t in_flight; /* io counter */ ++ bool internal_reset_inprogress; + u32 _reserved; /* fill hole */ + unsigned long state_flags; /* protected by host lock */ + enum fnic_state state; +diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c +index d9fd2f841585..44dd372aa7d3 100644 +--- a/drivers/scsi/fnic/fnic_scsi.c ++++ b/drivers/scsi/fnic/fnic_scsi.c +@@ -2573,6 +2573,19 @@ int fnic_host_reset(struct scsi_cmnd *sc) + unsigned long wait_host_tmo; + struct Scsi_Host *shost = sc->device->host; + struct fc_lport *lp = shost_priv(shost); ++ struct fnic *fnic = lport_priv(lp); ++ unsigned long flags; ++ ++ spin_lock_irqsave(&fnic->fnic_lock, flags); ++ if (fnic->internal_reset_inprogress == 0) { ++ fnic->internal_reset_inprogress = 1; ++ } else { ++ spin_unlock_irqrestore(&fnic->fnic_lock, flags); ++ FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, ++ "host reset in progress skipping another host reset\n"); ++ return SUCCESS; ++ } ++ spin_unlock_irqrestore(&fnic->fnic_lock, flags); + + /* + * If fnic_reset is successful, wait for fabric login to complete +@@ -2593,6 +2606,9 @@ int fnic_host_reset(struct scsi_cmnd *sc) + } + } + ++ spin_lock_irqsave(&fnic->fnic_lock, flags); ++ fnic->internal_reset_inprogress = 0; ++ spin_unlock_irqrestore(&fnic->fnic_lock, flags); + return ret; + } + +diff --git a/drivers/scsi/snic/snic_main.c b/drivers/scsi/snic/snic_main.c +index 396b32dca074..7cf70aaec0ba 100644 +--- a/drivers/scsi/snic/snic_main.c ++++ b/drivers/scsi/snic/snic_main.c +@@ -591,6 +591,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if (!pool) { + SNIC_HOST_ERR(shost, "dflt sgl pool creation failed\n"); + ++ ret = -ENOMEM; + goto err_free_res; + } + +@@ -601,6 +602,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if (!pool) { + SNIC_HOST_ERR(shost, "max sgl pool creation failed\n"); + ++ ret = -ENOMEM; + goto err_free_dflt_sgl_pool; + } + +@@ -611,6 +613,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if (!pool) { + SNIC_HOST_ERR(shost, "snic tmreq info pool creation failed.\n"); + ++ ret = -ENOMEM; + goto err_free_max_sgl_pool; + } + +diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c +index 27960e46135d..c4226c07e091 100644 +--- a/drivers/spi/spi-dw.c ++++ b/drivers/spi/spi-dw.c +@@ -107,7 +107,10 @@ static const struct file_operations dw_spi_regs_ops = { + + static int dw_spi_debugfs_init(struct dw_spi *dws) + { +- dws->debugfs = debugfs_create_dir("dw_spi", NULL); ++ char name[128]; ++ ++ snprintf(name, 128, "dw_spi-%s", dev_name(&dws->master->dev)); ++ dws->debugfs = debugfs_create_dir(name, NULL); + if (!dws->debugfs) + return -ENOMEM; + +diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c +index a34fd5afb9a8..ec9979070479 100644 +--- a/drivers/staging/comedi/comedi_fops.c ++++ b/drivers/staging/comedi/comedi_fops.c +@@ -2898,9 +2898,6 @@ static int __init comedi_init(void) + + comedi_class->dev_groups = comedi_dev_groups; + +- /* XXX requires /proc interface */ +- comedi_proc_init(); +- + /* create devices files for legacy/manual use */ + for (i = 0; i < comedi_num_legacy_minors; i++) { + struct comedi_device *dev; +@@ -2918,6 +2915,9 @@ static int __init comedi_init(void) + mutex_unlock(&dev->mutex); + } + ++ /* XXX requires /proc interface */ ++ comedi_proc_init(); ++ + return 0; + } + module_init(comedi_init); +diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c +index 5dd1832564c7..35b63518baf6 100644 +--- a/drivers/usb/dwc3/dwc3-omap.c ++++ b/drivers/usb/dwc3/dwc3-omap.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -511,7 +512,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) + + /* check the DMA Status */ + reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG); +- ++ irq_set_status_flags(omap->irq, IRQ_NOAUTOEN); + ret = devm_request_threaded_irq(dev, omap->irq, dwc3_omap_interrupt, + dwc3_omap_interrupt_thread, IRQF_SHARED, + "dwc3-omap", omap); +@@ -532,7 +533,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) + } + + dwc3_omap_enable_irqs(omap); +- ++ enable_irq(omap->irq); + return 0; + + err2: +@@ -553,6 +554,7 @@ static int dwc3_omap_remove(struct platform_device *pdev) + extcon_unregister_notifier(omap->edev, EXTCON_USB, &omap->vbus_nb); + extcon_unregister_notifier(omap->edev, EXTCON_USB_HOST, &omap->id_nb); + dwc3_omap_disable_irqs(omap); ++ disable_irq(omap->irq); + of_platform_depopulate(omap->dev); + pm_runtime_put_sync(&pdev->dev); + pm_runtime_disable(&pdev->dev); +diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c +index b0f71957d00b..b6d4b484c51a 100644 +--- a/drivers/usb/gadget/function/f_hid.c ++++ b/drivers/usb/gadget/function/f_hid.c +@@ -582,7 +582,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) + } + status = usb_ep_enable(hidg->out_ep); + if (status < 0) { +- ERROR(cdev, "Enable IN endpoint FAILED!\n"); ++ ERROR(cdev, "Enable OUT endpoint FAILED!\n"); + goto fail; + } + hidg->out_ep->driver_data = hidg; +diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c +index 031bc08d000d..43559bed7822 100644 +--- a/drivers/vfio/pci/vfio_pci.c ++++ b/drivers/vfio/pci/vfio_pci.c +@@ -1173,6 +1173,10 @@ static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma) + return ret; + + vdev->barmap[index] = pci_iomap(pdev, index, 0); ++ if (!vdev->barmap[index]) { ++ pci_release_selected_regions(pdev, 1 << index); ++ return -ENOMEM; ++ } + } + + vma->vm_private_data = vdev; +diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c +index 5ffd1d9ad4bd..357243d76f10 100644 +--- a/drivers/vfio/pci/vfio_pci_rdwr.c ++++ b/drivers/vfio/pci/vfio_pci_rdwr.c +@@ -193,7 +193,10 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf, + if (!vdev->has_vga) + return -EINVAL; + +- switch (pos) { ++ if (pos > 0xbfffful) ++ return -EINVAL; ++ ++ switch ((u32)pos) { + case 0xa0000 ... 0xbffff: + count = min(count, (size_t)(0xc0000 - pos)); + iomem = ioremap_nocache(0xa0000, 0xbffff - 0xa0000 + 1); +diff --git a/drivers/video/fbdev/cobalt_lcdfb.c b/drivers/video/fbdev/cobalt_lcdfb.c +index 2d3b691f3fc4..038ac6934fe9 100644 +--- a/drivers/video/fbdev/cobalt_lcdfb.c ++++ b/drivers/video/fbdev/cobalt_lcdfb.c +@@ -308,6 +308,11 @@ static int cobalt_lcdfb_probe(struct platform_device *dev) + info->screen_size = resource_size(res); + info->screen_base = devm_ioremap(&dev->dev, res->start, + info->screen_size); ++ if (!info->screen_base) { ++ framebuffer_release(info); ++ return -ENOMEM; ++ } ++ + info->fbops = &cobalt_lcd_fbops; + info->fix = cobalt_lcdfb_fix; + info->fix.smem_start = res->start; +diff --git a/drivers/xen/arm-device.c b/drivers/xen/arm-device.c +index 778acf80aacb..85dd20e05726 100644 +--- a/drivers/xen/arm-device.c ++++ b/drivers/xen/arm-device.c +@@ -58,9 +58,13 @@ static int xen_map_device_mmio(const struct resource *resources, + xen_pfn_t *gpfns; + xen_ulong_t *idxs; + int *errs; +- struct xen_add_to_physmap_range xatp; + + for (i = 0; i < count; i++) { ++ struct xen_add_to_physmap_range xatp = { ++ .domid = DOMID_SELF, ++ .space = XENMAPSPACE_dev_mmio ++ }; ++ + r = &resources[i]; + nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE); + if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0)) +@@ -87,9 +91,7 @@ static int xen_map_device_mmio(const struct resource *resources, + idxs[j] = XEN_PFN_DOWN(r->start) + j; + } + +- xatp.domid = DOMID_SELF; + xatp.size = nr; +- xatp.space = XENMAPSPACE_dev_mmio; + + set_xen_guest_handle(xatp.gpfns, gpfns); + set_xen_guest_handle(xatp.idxs, idxs); +diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c +index e46e7fbe1b34..14a37ff0b9e3 100644 +--- a/fs/btrfs/extent-tree.c ++++ b/fs/btrfs/extent-tree.c +@@ -7401,7 +7401,8 @@ btrfs_lock_cluster(struct btrfs_block_group_cache *block_group, + + spin_unlock(&cluster->refill_lock); + +- down_read(&used_bg->data_rwsem); ++ /* We should only have one-level nested. */ ++ down_read_nested(&used_bg->data_rwsem, SINGLE_DEPTH_NESTING); + + spin_lock(&cluster->refill_lock); + if (used_bg == cluster->block_group) +diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c +index a2a014b19f18..8a05fa7e2152 100644 +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -7648,11 +7648,18 @@ static void adjust_dio_outstanding_extents(struct inode *inode, + * within our reservation, otherwise we need to adjust our inode + * counter appropriately. + */ +- if (dio_data->outstanding_extents) { ++ if (dio_data->outstanding_extents >= num_extents) { + dio_data->outstanding_extents -= num_extents; + } else { ++ /* ++ * If dio write length has been split due to no large enough ++ * contiguous space, we need to compensate our inode counter ++ * appropriately. ++ */ ++ u64 num_needed = num_extents - dio_data->outstanding_extents; ++ + spin_lock(&BTRFS_I(inode)->lock); +- BTRFS_I(inode)->outstanding_extents += num_extents; ++ BTRFS_I(inode)->outstanding_extents += num_needed; + spin_unlock(&BTRFS_I(inode)->lock); + } + } +diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c +index b89004513c09..309313b71617 100644 +--- a/fs/btrfs/tree-log.c ++++ b/fs/btrfs/tree-log.c +@@ -37,6 +37,7 @@ + */ + #define LOG_INODE_ALL 0 + #define LOG_INODE_EXISTS 1 ++#define LOG_OTHER_INODE 2 + + /* + * directory trouble cases +@@ -4623,7 +4624,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, + if (S_ISDIR(inode->i_mode) || + (!test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, + &BTRFS_I(inode)->runtime_flags) && +- inode_only == LOG_INODE_EXISTS)) ++ inode_only >= LOG_INODE_EXISTS)) + max_key.type = BTRFS_XATTR_ITEM_KEY; + else + max_key.type = (u8)-1; +@@ -4647,7 +4648,13 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, + return ret; + } + +- mutex_lock(&BTRFS_I(inode)->log_mutex); ++ if (inode_only == LOG_OTHER_INODE) { ++ inode_only = LOG_INODE_EXISTS; ++ mutex_lock_nested(&BTRFS_I(inode)->log_mutex, ++ SINGLE_DEPTH_NESTING); ++ } else { ++ mutex_lock(&BTRFS_I(inode)->log_mutex); ++ } + + /* + * a brute force approach to making sure we get the most uptodate +@@ -4799,7 +4806,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, + * unpin it. + */ + err = btrfs_log_inode(trans, root, other_inode, +- LOG_INODE_EXISTS, ++ LOG_OTHER_INODE, + 0, LLONG_MAX, ctx); + iput(other_inode); + if (err) +diff --git a/fs/dcache.c b/fs/dcache.c +index 1dbc6b560fef..67957f5b325c 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -277,6 +277,33 @@ static inline int dname_external(const struct dentry *dentry) + return dentry->d_name.name != dentry->d_iname; + } + ++void take_dentry_name_snapshot(struct name_snapshot *name, struct dentry *dentry) ++{ ++ spin_lock(&dentry->d_lock); ++ if (unlikely(dname_external(dentry))) { ++ struct external_name *p = external_name(dentry); ++ atomic_inc(&p->u.count); ++ spin_unlock(&dentry->d_lock); ++ name->name = p->name; ++ } else { ++ memcpy(name->inline_name, dentry->d_iname, DNAME_INLINE_LEN); ++ spin_unlock(&dentry->d_lock); ++ name->name = name->inline_name; ++ } ++} ++EXPORT_SYMBOL(take_dentry_name_snapshot); ++ ++void release_dentry_name_snapshot(struct name_snapshot *name) ++{ ++ if (unlikely(name->name != name->inline_name)) { ++ struct external_name *p; ++ p = container_of(name->name, struct external_name, name[0]); ++ if (unlikely(atomic_dec_and_test(&p->u.count))) ++ kfree_rcu(p, u.head); ++ } ++} ++EXPORT_SYMBOL(release_dentry_name_snapshot); ++ + static inline void __d_set_inode_and_type(struct dentry *dentry, + struct inode *inode, + unsigned type_flags) +diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c +index 1e30f74a9527..3d7de9f4f545 100644 +--- a/fs/debugfs/inode.c ++++ b/fs/debugfs/inode.c +@@ -730,7 +730,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, + { + int error; + struct dentry *dentry = NULL, *trap; +- const char *old_name; ++ struct name_snapshot old_name; + + trap = lock_rename(new_dir, old_dir); + /* Source or destination directories don't exist? */ +@@ -745,19 +745,19 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, + if (IS_ERR(dentry) || dentry == trap || d_really_is_positive(dentry)) + goto exit; + +- old_name = fsnotify_oldname_init(old_dentry->d_name.name); ++ take_dentry_name_snapshot(&old_name, old_dentry); + + error = simple_rename(d_inode(old_dir), old_dentry, d_inode(new_dir), + dentry, 0); + if (error) { +- fsnotify_oldname_free(old_name); ++ release_dentry_name_snapshot(&old_name); + goto exit; + } + d_move(old_dentry, dentry); +- fsnotify_move(d_inode(old_dir), d_inode(new_dir), old_name, ++ fsnotify_move(d_inode(old_dir), d_inode(new_dir), old_name.name, + d_is_dir(old_dentry), + NULL, old_dentry); +- fsnotify_oldname_free(old_name); ++ release_dentry_name_snapshot(&old_name); + unlock_rename(new_dir, old_dir); + dput(dentry); + return old_dentry; +diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c +index 7bc186f4ed4d..1be45c8d460d 100644 +--- a/fs/jfs/acl.c ++++ b/fs/jfs/acl.c +@@ -77,13 +77,6 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type, + switch (type) { + case ACL_TYPE_ACCESS: + ea_name = XATTR_NAME_POSIX_ACL_ACCESS; +- if (acl) { +- rc = posix_acl_update_mode(inode, &inode->i_mode, &acl); +- if (rc) +- return rc; +- inode->i_ctime = current_time(inode); +- mark_inode_dirty(inode); +- } + break; + case ACL_TYPE_DEFAULT: + ea_name = XATTR_NAME_POSIX_ACL_DEFAULT; +@@ -118,9 +111,17 @@ int jfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) + + tid = txBegin(inode->i_sb, 0); + mutex_lock(&JFS_IP(inode)->commit_mutex); ++ if (type == ACL_TYPE_ACCESS && acl) { ++ rc = posix_acl_update_mode(inode, &inode->i_mode, &acl); ++ if (rc) ++ goto end_tx; ++ inode->i_ctime = current_time(inode); ++ mark_inode_dirty(inode); ++ } + rc = __jfs_set_acl(tid, inode, type, acl); + if (!rc) + rc = txCommit(tid, 1, &inode, 0); ++end_tx: + txEnd(tid); + mutex_unlock(&JFS_IP(inode)->commit_mutex); + return rc; +diff --git a/fs/namei.c b/fs/namei.c +index d5e5140c1045..66209f720146 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -4336,11 +4336,11 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, + { + int error; + bool is_dir = d_is_dir(old_dentry); +- const unsigned char *old_name; + struct inode *source = old_dentry->d_inode; + struct inode *target = new_dentry->d_inode; + bool new_is_dir = false; + unsigned max_links = new_dir->i_sb->s_max_links; ++ struct name_snapshot old_name; + + /* + * Check source == target. +@@ -4391,7 +4391,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, + if (error) + return error; + +- old_name = fsnotify_oldname_init(old_dentry->d_name.name); ++ take_dentry_name_snapshot(&old_name, old_dentry); + dget(new_dentry); + if (!is_dir || (flags & RENAME_EXCHANGE)) + lock_two_nondirectories(source, target); +@@ -4446,14 +4446,14 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, + inode_unlock(target); + dput(new_dentry); + if (!error) { +- fsnotify_move(old_dir, new_dir, old_name, is_dir, ++ fsnotify_move(old_dir, new_dir, old_name.name, is_dir, + !(flags & RENAME_EXCHANGE) ? target : NULL, old_dentry); + if (flags & RENAME_EXCHANGE) { + fsnotify_move(new_dir, old_dir, old_dentry->d_name.name, + new_is_dir, NULL, new_dentry); + } + } +- fsnotify_oldname_free(old_name); ++ release_dentry_name_snapshot(&old_name); + + return error; + } +diff --git a/fs/nfs/file.c b/fs/nfs/file.c +index a1de8ef63e56..84c1cb9237d0 100644 +--- a/fs/nfs/file.c ++++ b/fs/nfs/file.c +@@ -757,7 +757,7 @@ do_setlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) + */ + nfs_sync_mapping(filp->f_mapping); + if (!NFS_PROTO(inode)->have_delegation(inode, FMODE_READ)) +- nfs_zap_mapping(inode, filp->f_mapping); ++ nfs_zap_caches(inode); + out: + return status; + } +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index 401ea6e4cab8..46ca7881d80d 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -6419,7 +6419,7 @@ nfs4_retry_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) + set_current_state(TASK_INTERRUPTIBLE); + spin_unlock_irqrestore(&q->lock, flags); + +- freezable_schedule_timeout_interruptible(NFS4_LOCK_MAXTIMEOUT); ++ freezable_schedule_timeout(NFS4_LOCK_MAXTIMEOUT); + } + + finish_wait(q, &wait); +diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c +index db39de2dd4cb..a64adc2fced9 100644 +--- a/fs/notify/fsnotify.c ++++ b/fs/notify/fsnotify.c +@@ -104,16 +104,20 @@ int __fsnotify_parent(struct path *path, struct dentry *dentry, __u32 mask) + if (unlikely(!fsnotify_inode_watches_children(p_inode))) + __fsnotify_update_child_dentry_flags(p_inode); + else if (p_inode->i_fsnotify_mask & mask) { ++ struct name_snapshot name; ++ + /* we are notifying a parent so come up with the new mask which + * specifies these are events which came from a child. */ + mask |= FS_EVENT_ON_CHILD; + ++ take_dentry_name_snapshot(&name, dentry); + if (path) + ret = fsnotify(p_inode, mask, path, FSNOTIFY_EVENT_PATH, +- dentry->d_name.name, 0); ++ name.name, 0); + else + ret = fsnotify(p_inode, mask, dentry->d_inode, FSNOTIFY_EVENT_INODE, +- dentry->d_name.name, 0); ++ name.name, 0); ++ release_dentry_name_snapshot(&name); + } + + dput(parent); +diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c +index 6ad831b9d1b8..8b09271e5d66 100644 +--- a/fs/pstore/ram.c ++++ b/fs/pstore/ram.c +@@ -434,7 +434,7 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt, + for (i = 0; i < cxt->max_dump_cnt; i++) { + cxt->przs[i] = persistent_ram_new(*paddr, cxt->record_size, 0, + &cxt->ecc_info, +- cxt->memtype); ++ cxt->memtype, 0); + if (IS_ERR(cxt->przs[i])) { + err = PTR_ERR(cxt->przs[i]); + dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n", +@@ -471,7 +471,8 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt, + return -ENOMEM; + } + +- *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info, cxt->memtype); ++ *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info, ++ cxt->memtype, 0); + if (IS_ERR(*prz)) { + int err = PTR_ERR(*prz); + +diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c +index 3975deec02f8..e11672aa4575 100644 +--- a/fs/pstore/ram_core.c ++++ b/fs/pstore/ram_core.c +@@ -48,16 +48,15 @@ static inline size_t buffer_start(struct persistent_ram_zone *prz) + return atomic_read(&prz->buffer->start); + } + +-static DEFINE_RAW_SPINLOCK(buffer_lock); +- + /* increase and wrap the start pointer, returning the old value */ + static size_t buffer_start_add(struct persistent_ram_zone *prz, size_t a) + { + int old; + int new; +- unsigned long flags; ++ unsigned long flags = 0; + +- raw_spin_lock_irqsave(&buffer_lock, flags); ++ if (!(prz->flags & PRZ_FLAG_NO_LOCK)) ++ raw_spin_lock_irqsave(&prz->buffer_lock, flags); + + old = atomic_read(&prz->buffer->start); + new = old + a; +@@ -65,7 +64,8 @@ static size_t buffer_start_add(struct persistent_ram_zone *prz, size_t a) + new -= prz->buffer_size; + atomic_set(&prz->buffer->start, new); + +- raw_spin_unlock_irqrestore(&buffer_lock, flags); ++ if (!(prz->flags & PRZ_FLAG_NO_LOCK)) ++ raw_spin_unlock_irqrestore(&prz->buffer_lock, flags); + + return old; + } +@@ -75,9 +75,10 @@ static void buffer_size_add(struct persistent_ram_zone *prz, size_t a) + { + size_t old; + size_t new; +- unsigned long flags; ++ unsigned long flags = 0; + +- raw_spin_lock_irqsave(&buffer_lock, flags); ++ if (!(prz->flags & PRZ_FLAG_NO_LOCK)) ++ raw_spin_lock_irqsave(&prz->buffer_lock, flags); + + old = atomic_read(&prz->buffer->size); + if (old == prz->buffer_size) +@@ -89,7 +90,8 @@ static void buffer_size_add(struct persistent_ram_zone *prz, size_t a) + atomic_set(&prz->buffer->size, new); + + exit: +- raw_spin_unlock_irqrestore(&buffer_lock, flags); ++ if (!(prz->flags & PRZ_FLAG_NO_LOCK)) ++ raw_spin_unlock_irqrestore(&prz->buffer_lock, flags); + } + + static void notrace persistent_ram_encode_rs8(struct persistent_ram_zone *prz, +@@ -491,6 +493,7 @@ static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig, + prz->buffer->sig); + } + ++ /* Rewind missing or invalid memory area. */ + prz->buffer->sig = sig; + persistent_ram_zap(prz); + +@@ -517,7 +520,7 @@ void persistent_ram_free(struct persistent_ram_zone *prz) + + struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, + u32 sig, struct persistent_ram_ecc_info *ecc_info, +- unsigned int memtype) ++ unsigned int memtype, u32 flags) + { + struct persistent_ram_zone *prz; + int ret = -ENOMEM; +@@ -528,6 +531,10 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, + goto err; + } + ++ /* Initialize general buffer state. */ ++ raw_spin_lock_init(&prz->buffer_lock); ++ prz->flags = flags; ++ + ret = persistent_ram_buffer_map(start, size, prz, memtype); + if (ret) + goto err; +diff --git a/include/linux/dcache.h b/include/linux/dcache.h +index 5beed7b30561..ff295e166b2c 100644 +--- a/include/linux/dcache.h ++++ b/include/linux/dcache.h +@@ -590,5 +590,11 @@ static inline struct inode *d_real_inode(const struct dentry *dentry) + return d_backing_inode(d_real((struct dentry *) dentry, NULL, 0)); + } + ++struct name_snapshot { ++ const char *name; ++ char inline_name[DNAME_INLINE_LEN]; ++}; ++void take_dentry_name_snapshot(struct name_snapshot *, struct dentry *); ++void release_dentry_name_snapshot(struct name_snapshot *); + + #endif /* __LINUX_DCACHE_H */ +diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h +index b8bcc058e031..e5f03a4d8430 100644 +--- a/include/linux/fsnotify.h ++++ b/include/linux/fsnotify.h +@@ -293,35 +293,4 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid) + } + } + +-#if defined(CONFIG_FSNOTIFY) /* notify helpers */ +- +-/* +- * fsnotify_oldname_init - save off the old filename before we change it +- */ +-static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name) +-{ +- return kstrdup(name, GFP_KERNEL); +-} +- +-/* +- * fsnotify_oldname_free - free the name we got from fsnotify_oldname_init +- */ +-static inline void fsnotify_oldname_free(const unsigned char *old_name) +-{ +- kfree(old_name); +-} +- +-#else /* CONFIG_FSNOTIFY */ +- +-static inline const char *fsnotify_oldname_init(const unsigned char *name) +-{ +- return NULL; +-} +- +-static inline void fsnotify_oldname_free(const unsigned char *old_name) +-{ +-} +- +-#endif /* CONFIG_FSNOTIFY */ +- + #endif /* _LINUX_FS_NOTIFY_H */ +diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h +index c9f379689dd0..80faf44b8887 100644 +--- a/include/linux/mlx4/device.h ++++ b/include/linux/mlx4/device.h +@@ -1384,6 +1384,8 @@ int set_phv_bit(struct mlx4_dev *dev, u8 port, int new_val); + int get_phv_bit(struct mlx4_dev *dev, u8 port, int *phv); + int mlx4_get_is_vlan_offload_disabled(struct mlx4_dev *dev, u8 port, + bool *vlan_offload_disabled); ++void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl, ++ struct _rule_hw *eth_header); + int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx); + int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx); + int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index); +diff --git a/include/linux/phy.h b/include/linux/phy.h +index 6c9b1e0006ee..8431c8c0c320 100644 +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -799,6 +799,10 @@ int genphy_read_status(struct phy_device *phydev); + int genphy_suspend(struct phy_device *phydev); + int genphy_resume(struct phy_device *phydev); + int genphy_soft_reset(struct phy_device *phydev); ++static inline int genphy_no_soft_reset(struct phy_device *phydev) ++{ ++ return 0; ++} + void phy_driver_unregister(struct phy_driver *drv); + void phy_drivers_unregister(struct phy_driver *drv, int n); + int phy_driver_register(struct phy_driver *new_driver, struct module *owner); +diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h +index c668c861c96c..4058bf991868 100644 +--- a/include/linux/pstore_ram.h ++++ b/include/linux/pstore_ram.h +@@ -24,6 +24,13 @@ + #include + #include + ++/* ++ * Choose whether access to the RAM zone requires locking or not. If a zone ++ * can be written to from different CPUs like with ftrace for example, then ++ * PRZ_FLAG_NO_LOCK is used. For all other cases, locking is required. ++ */ ++#define PRZ_FLAG_NO_LOCK BIT(0) ++ + struct persistent_ram_buffer; + struct rs_control; + +@@ -40,6 +47,8 @@ struct persistent_ram_zone { + void *vaddr; + struct persistent_ram_buffer *buffer; + size_t buffer_size; ++ u32 flags; ++ raw_spinlock_t buffer_lock; + + /* ECC correction */ + char *par_buffer; +@@ -55,7 +64,7 @@ struct persistent_ram_zone { + + struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, + u32 sig, struct persistent_ram_ecc_info *ecc_info, +- unsigned int memtype); ++ unsigned int memtype, u32 flags); + void persistent_ram_free(struct persistent_ram_zone *prz); + void persistent_ram_zap(struct persistent_ram_zone *prz); + +diff --git a/kernel/cpu.c b/kernel/cpu.c +index 8f52977aad59..26a4f74bff83 100644 +--- a/kernel/cpu.c ++++ b/kernel/cpu.c +@@ -410,11 +410,26 @@ static int notify_online(unsigned int cpu) + return 0; + } + ++static void __cpuhp_kick_ap_work(struct cpuhp_cpu_state *st); ++ + static int bringup_wait_for_ap(unsigned int cpu) + { + struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu); + ++ /* Wait for the CPU to reach CPUHP_AP_ONLINE_IDLE */ + wait_for_completion(&st->done); ++ if (WARN_ON_ONCE((!cpu_online(cpu)))) ++ return -ECANCELED; ++ ++ /* Unpark the stopper thread and the hotplug thread of the target cpu */ ++ stop_machine_unpark(cpu); ++ kthread_unpark(st->thread); ++ ++ /* Should we go further up ? */ ++ if (st->target > CPUHP_AP_ONLINE_IDLE) { ++ __cpuhp_kick_ap_work(st); ++ wait_for_completion(&st->done); ++ } + return st->result; + } + +@@ -437,9 +452,7 @@ static int bringup_cpu(unsigned int cpu) + cpu_notify(CPU_UP_CANCELED, cpu); + return ret; + } +- ret = bringup_wait_for_ap(cpu); +- BUG_ON(!cpu_online(cpu)); +- return ret; ++ return bringup_wait_for_ap(cpu); + } + + /* +@@ -974,31 +987,20 @@ void notify_cpu_starting(unsigned int cpu) + } + + /* +- * Called from the idle task. We need to set active here, so we can kick off +- * the stopper thread and unpark the smpboot threads. If the target state is +- * beyond CPUHP_AP_ONLINE_IDLE we kick cpuhp thread and let it bring up the +- * cpu further. ++ * Called from the idle task. Wake up the controlling task which brings the ++ * stopper and the hotplug thread of the upcoming CPU up and then delegates ++ * the rest of the online bringup to the hotplug thread. + */ + void cpuhp_online_idle(enum cpuhp_state state) + { + struct cpuhp_cpu_state *st = this_cpu_ptr(&cpuhp_state); +- unsigned int cpu = smp_processor_id(); + + /* Happens for the boot cpu */ + if (state != CPUHP_AP_ONLINE_IDLE) + return; + + st->state = CPUHP_AP_ONLINE_IDLE; +- +- /* Unpark the stopper thread and the hotplug thread of this cpu */ +- stop_machine_unpark(cpu); +- kthread_unpark(st->thread); +- +- /* Should we go further up ? */ +- if (st->target > CPUHP_AP_ONLINE_IDLE) +- __cpuhp_kick_ap_work(st); +- else +- complete(&st->done); ++ complete(&st->done); + } + + /* Requires cpu_add_remove_lock to be held */ +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index d177b21d04ce..2098954c690f 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -8376,11 +8376,20 @@ cpu_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) + if (IS_ERR(tg)) + return ERR_PTR(-ENOMEM); + +- sched_online_group(tg, parent); +- + return &tg->css; + } + ++/* Expose task group only after completing cgroup initialization */ ++static int cpu_cgroup_css_online(struct cgroup_subsys_state *css) ++{ ++ struct task_group *tg = css_tg(css); ++ struct task_group *parent = css_tg(css->parent); ++ ++ if (parent) ++ sched_online_group(tg, parent); ++ return 0; ++} ++ + static void cpu_cgroup_css_released(struct cgroup_subsys_state *css) + { + struct task_group *tg = css_tg(css); +@@ -8783,6 +8792,7 @@ static struct cftype cpu_files[] = { + + struct cgroup_subsys cpu_cgrp_subsys = { + .css_alloc = cpu_cgroup_css_alloc, ++ .css_online = cpu_cgroup_css_online, + .css_released = cpu_cgroup_css_released, + .css_free = cpu_cgroup_css_free, + .fork = cpu_cgroup_fork, +diff --git a/net/core/dev.c b/net/core/dev.c +index c17952b6e0b6..0af019dfe846 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2702,9 +2702,10 @@ EXPORT_SYMBOL(skb_mac_gso_segment); + static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path) + { + if (tx_path) +- return skb->ip_summed != CHECKSUM_PARTIAL; +- else +- return skb->ip_summed == CHECKSUM_NONE; ++ return skb->ip_summed != CHECKSUM_PARTIAL && ++ skb->ip_summed != CHECKSUM_NONE; ++ ++ return skb->ip_summed == CHECKSUM_NONE; + } + + /** +@@ -2723,11 +2724,12 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path) + struct sk_buff *__skb_gso_segment(struct sk_buff *skb, + netdev_features_t features, bool tx_path) + { ++ struct sk_buff *segs; ++ + if (unlikely(skb_needs_check(skb, tx_path))) { + int err; + +- skb_warn_bad_offload(skb); +- ++ /* We're going to init ->check field in TCP or UDP header */ + err = skb_cow_head(skb, 0); + if (err < 0) + return ERR_PTR(err); +@@ -2755,7 +2757,12 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb, + skb_reset_mac_header(skb); + skb_reset_mac_len(skb); + +- return skb_mac_gso_segment(skb, features); ++ segs = skb_mac_gso_segment(skb, features); ++ ++ if (unlikely(skb_needs_check(skb, tx_path))) ++ skb_warn_bad_offload(skb); ++ ++ return segs; + } + EXPORT_SYMBOL(__skb_gso_segment); + +diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c +index fd649599620e..5a4b8e7bcedd 100644 +--- a/net/ipv6/ip6_output.c ++++ b/net/ipv6/ip6_output.c +@@ -1376,7 +1376,7 @@ static int __ip6_append_data(struct sock *sk, + */ + + cork->length += length; +- if (((length > mtu) || ++ if ((((length + fragheaderlen) > mtu) || + (skb && skb_is_gso(skb))) && + (sk->sk_protocol == IPPROTO_UDP) && + (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len && +diff --git a/net/key/af_key.c b/net/key/af_key.c +index d8d95b6415e4..2e1050ec2cf0 100644 +--- a/net/key/af_key.c ++++ b/net/key/af_key.c +@@ -63,6 +63,7 @@ struct pfkey_sock { + } u; + struct sk_buff *skb; + } dump; ++ struct mutex dump_lock; + }; + + static int parse_sockaddr_pair(struct sockaddr *sa, int ext_len, +@@ -143,6 +144,7 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol, + { + struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id); + struct sock *sk; ++ struct pfkey_sock *pfk; + int err; + + if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) +@@ -157,6 +159,9 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol, + if (sk == NULL) + goto out; + ++ pfk = pfkey_sk(sk); ++ mutex_init(&pfk->dump_lock); ++ + sock->ops = &pfkey_ops; + sock_init_data(sock, sk); + +@@ -285,13 +290,23 @@ static int pfkey_do_dump(struct pfkey_sock *pfk) + struct sadb_msg *hdr; + int rc; + ++ mutex_lock(&pfk->dump_lock); ++ if (!pfk->dump.dump) { ++ rc = 0; ++ goto out; ++ } ++ + rc = pfk->dump.dump(pfk); +- if (rc == -ENOBUFS) +- return 0; ++ if (rc == -ENOBUFS) { ++ rc = 0; ++ goto out; ++ } + + if (pfk->dump.skb) { +- if (!pfkey_can_dump(&pfk->sk)) +- return 0; ++ if (!pfkey_can_dump(&pfk->sk)) { ++ rc = 0; ++ goto out; ++ } + + hdr = (struct sadb_msg *) pfk->dump.skb->data; + hdr->sadb_msg_seq = 0; +@@ -302,6 +317,9 @@ static int pfkey_do_dump(struct pfkey_sock *pfk) + } + + pfkey_terminate_dump(pfk); ++ ++out: ++ mutex_unlock(&pfk->dump_lock); + return rc; + } + +@@ -1806,19 +1824,26 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_ms + struct xfrm_address_filter *filter = NULL; + struct pfkey_sock *pfk = pfkey_sk(sk); + +- if (pfk->dump.dump != NULL) ++ mutex_lock(&pfk->dump_lock); ++ if (pfk->dump.dump != NULL) { ++ mutex_unlock(&pfk->dump_lock); + return -EBUSY; ++ } + + proto = pfkey_satype2proto(hdr->sadb_msg_satype); +- if (proto == 0) ++ if (proto == 0) { ++ mutex_unlock(&pfk->dump_lock); + return -EINVAL; ++ } + + if (ext_hdrs[SADB_X_EXT_FILTER - 1]) { + struct sadb_x_filter *xfilter = ext_hdrs[SADB_X_EXT_FILTER - 1]; + + filter = kmalloc(sizeof(*filter), GFP_KERNEL); +- if (filter == NULL) ++ if (filter == NULL) { ++ mutex_unlock(&pfk->dump_lock); + return -ENOMEM; ++ } + + memcpy(&filter->saddr, &xfilter->sadb_x_filter_saddr, + sizeof(xfrm_address_t)); +@@ -1834,6 +1859,7 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_ms + pfk->dump.dump = pfkey_dump_sa; + pfk->dump.done = pfkey_dump_sa_done; + xfrm_state_walk_init(&pfk->dump.u.state, proto, filter); ++ mutex_unlock(&pfk->dump_lock); + + return pfkey_do_dump(pfk); + } +@@ -2693,14 +2719,18 @@ static int pfkey_spddump(struct sock *sk, struct sk_buff *skb, const struct sadb + { + struct pfkey_sock *pfk = pfkey_sk(sk); + +- if (pfk->dump.dump != NULL) ++ mutex_lock(&pfk->dump_lock); ++ if (pfk->dump.dump != NULL) { ++ mutex_unlock(&pfk->dump_lock); + return -EBUSY; ++ } + + pfk->dump.msg_version = hdr->sadb_msg_version; + pfk->dump.msg_portid = hdr->sadb_msg_pid; + pfk->dump.dump = pfkey_dump_sp; + pfk->dump.done = pfkey_dump_sp_done; + xfrm_policy_walk_init(&pfk->dump.u.policy, XFRM_POLICY_TYPE_MAIN); ++ mutex_unlock(&pfk->dump_lock); + + return pfkey_do_dump(pfk); + } +diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c +index b10abef6b0a0..1d522ce833e6 100644 +--- a/net/l2tp/l2tp_ip6.c ++++ b/net/l2tp/l2tp_ip6.c +@@ -64,7 +64,7 @@ static struct sock *__l2tp_ip6_bind_lookup(struct net *net, + struct sock *sk; + + sk_for_each_bound(sk, &l2tp_ip6_bind_table) { +- const struct in6_addr *addr = inet6_rcv_saddr(sk); ++ const struct in6_addr *sk_laddr = inet6_rcv_saddr(sk); + struct l2tp_ip6_sock *l2tp = l2tp_ip6_sk(sk); + + if (l2tp == NULL) +@@ -72,7 +72,7 @@ static struct sock *__l2tp_ip6_bind_lookup(struct net *net, + + if ((l2tp->conn_id == tunnel_id) && + net_eq(sock_net(sk), net) && +- (!addr || ipv6_addr_equal(addr, laddr)) && ++ (!sk_laddr || ipv6_addr_any(sk_laddr) || ipv6_addr_equal(sk_laddr, laddr)) && + (!sk->sk_bound_dev_if || !dif || + sk->sk_bound_dev_if == dif)) + goto found; +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 8da67f7c9c5a..e26b515f7794 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1248,7 +1248,7 @@ static inline int policy_to_flow_dir(int dir) + } + + static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, +- const struct flowi *fl) ++ const struct flowi *fl, u16 family) + { + struct xfrm_policy *pol; + +@@ -1256,8 +1256,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, + again: + pol = rcu_dereference(sk->sk_policy[dir]); + if (pol != NULL) { +- bool match = xfrm_selector_match(&pol->selector, fl, +- sk->sk_family); ++ bool match = xfrm_selector_match(&pol->selector, fl, family); + int err = 0; + + if (match) { +@@ -2206,7 +2205,7 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, + sk = sk_const_to_full_sk(sk); + if (sk && sk->sk_policy[XFRM_POLICY_OUT]) { + num_pols = 1; +- pols[0] = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl); ++ pols[0] = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl, family); + err = xfrm_expand_policies(fl, family, pols, + &num_pols, &num_xfrms); + if (err < 0) +@@ -2485,7 +2484,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, + pol = NULL; + sk = sk_to_full_sk(sk); + if (sk && sk->sk_policy[dir]) { +- pol = xfrm_sk_policy_lookup(sk, dir, &fl); ++ pol = xfrm_sk_policy_lookup(sk, dir, &fl, family); + if (IS_ERR(pol)) { + XFRM_INC_STATS(net, LINUX_MIB_XFRMINPOLERROR); + return 0; +diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c +index c47287d79306..a178e0d03088 100644 +--- a/sound/pci/fm801.c ++++ b/sound/pci/fm801.c +@@ -1235,8 +1235,6 @@ static int snd_fm801_create(struct snd_card *card, + } + } + +- snd_fm801_chip_init(chip); +- + if ((chip->tea575x_tuner & TUNER_ONLY) == 0) { + if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt, + IRQF_SHARED, KBUILD_MODNAME, chip)) { +@@ -1248,6 +1246,8 @@ static int snd_fm801_create(struct snd_card *card, + pci_set_master(pci); + } + ++ snd_fm801_chip_init(chip); ++ + if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { + snd_fm801_free(chip); + return err; +diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c +index 4bf48336b0fc..775c67818bf1 100644 +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -3600,11 +3600,15 @@ HDA_CODEC_ENTRY(0x1002aa01, "R6xx HDMI", patch_atihdmi), + HDA_CODEC_ENTRY(0x10951390, "SiI1390 HDMI", patch_generic_hdmi), + HDA_CODEC_ENTRY(0x10951392, "SiI1392 HDMI", patch_generic_hdmi), + HDA_CODEC_ENTRY(0x17e80047, "Chrontel HDMI", patch_generic_hdmi), ++HDA_CODEC_ENTRY(0x10de0001, "MCP73 HDMI", patch_nvhdmi_2ch), + HDA_CODEC_ENTRY(0x10de0002, "MCP77/78 HDMI", patch_nvhdmi_8ch_7x), + HDA_CODEC_ENTRY(0x10de0003, "MCP77/78 HDMI", patch_nvhdmi_8ch_7x), ++HDA_CODEC_ENTRY(0x10de0004, "GPU 04 HDMI", patch_nvhdmi_8ch_7x), + HDA_CODEC_ENTRY(0x10de0005, "MCP77/78 HDMI", patch_nvhdmi_8ch_7x), + HDA_CODEC_ENTRY(0x10de0006, "MCP77/78 HDMI", patch_nvhdmi_8ch_7x), + HDA_CODEC_ENTRY(0x10de0007, "MCP79/7A HDMI", patch_nvhdmi_8ch_7x), ++HDA_CODEC_ENTRY(0x10de0008, "GPU 08 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0009, "GPU 09 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de000a, "GPU 0a HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de000b, "GPU 0b HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de000c, "MCP89 HDMI", patch_nvhdmi), +@@ -3631,17 +3635,40 @@ HDA_CODEC_ENTRY(0x10de0041, "GPU 41 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0042, "GPU 42 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0043, "GPU 43 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0044, "GPU 44 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0045, "GPU 45 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0050, "GPU 50 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0051, "GPU 51 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0052, "GPU 52 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0060, "GPU 60 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0061, "GPU 61 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0062, "GPU 62 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0067, "MCP67 HDMI", patch_nvhdmi_2ch), + HDA_CODEC_ENTRY(0x10de0070, "GPU 70 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0071, "GPU 71 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0072, "GPU 72 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0073, "GPU 73 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0074, "GPU 74 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0076, "GPU 76 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de007b, "GPU 7b HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de007c, "GPU 7c HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de007d, "GPU 7d HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de007e, "GPU 7e HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0080, "GPU 80 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0081, "GPU 81 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0082, "GPU 82 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0083, "GPU 83 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0084, "GPU 84 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0090, "GPU 90 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0091, "GPU 91 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0092, "GPU 92 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0093, "GPU 93 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0094, "GPU 94 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch), ++HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch), + HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi), + HDA_CODEC_ENTRY(0x11069f81, "VX900 HDMI/DP", patch_via_hdmi), + HDA_CODEC_ENTRY(0x11069f84, "VX11 HDMI/DP", patch_generic_hdmi), +diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c +index e643be91d762..f9f2737c4ad2 100644 +--- a/sound/soc/codecs/nau8825.c ++++ b/sound/soc/codecs/nau8825.c +@@ -1928,7 +1928,8 @@ static void nau8825_fll_apply(struct nau8825 *nau8825, + NAU8825_FLL_INTEGER_MASK, fll_param->fll_int); + /* FLL pre-scaler */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL4, +- NAU8825_FLL_REF_DIV_MASK, fll_param->clk_ref_div); ++ NAU8825_FLL_REF_DIV_MASK, ++ fll_param->clk_ref_div << NAU8825_FLL_REF_DIV_SFT); + /* select divided VCO input */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL5, + NAU8825_FLL_CLK_SW_MASK, NAU8825_FLL_CLK_SW_REF); +diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h +index 1c63e2abafa9..574d6f936135 100644 +--- a/sound/soc/codecs/nau8825.h ++++ b/sound/soc/codecs/nau8825.h +@@ -129,7 +129,8 @@ + #define NAU8825_FLL_CLK_SRC_FS (0x3 << NAU8825_FLL_CLK_SRC_SFT) + + /* FLL4 (0x07) */ +-#define NAU8825_FLL_REF_DIV_MASK (0x3 << 10) ++#define NAU8825_FLL_REF_DIV_SFT 10 ++#define NAU8825_FLL_REF_DIV_MASK (0x3 << NAU8825_FLL_REF_DIV_SFT) + + /* FLL5 (0x08) */ + #define NAU8825_FLL_PDB_DAC_EN (0x1 << 15) +diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c +index 5a8d96ec058c..fe45a16a5142 100644 +--- a/sound/soc/codecs/tlv320aic3x.c ++++ b/sound/soc/codecs/tlv320aic3x.c +@@ -126,6 +126,16 @@ static const struct reg_default aic3x_reg[] = { + { 108, 0x00 }, { 109, 0x00 }, + }; + ++static bool aic3x_volatile_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case AIC3X_RESET: ++ return true; ++ default: ++ return false; ++ } ++} ++ + static const struct regmap_config aic3x_regmap = { + .reg_bits = 8, + .val_bits = 8, +@@ -133,6 +143,9 @@ static const struct regmap_config aic3x_regmap = { + .max_register = DAC_ICC_ADJ, + .reg_defaults = aic3x_reg, + .num_reg_defaults = ARRAY_SIZE(aic3x_reg), ++ ++ .volatile_reg = aic3x_volatile_reg, ++ + .cache_type = REGCACHE_RBTREE, + }; + +diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c +index 50349437d961..fde08660b63b 100644 +--- a/sound/soc/fsl/fsl_ssi.c ++++ b/sound/soc/fsl/fsl_ssi.c +@@ -224,6 +224,12 @@ struct fsl_ssi_soc_data { + * @dbg_stats: Debugging statistics + * + * @soc: SoC specific data ++ * ++ * @fifo_watermark: the FIFO watermark setting. Notifies DMA when ++ * there are @fifo_watermark or fewer words in TX fifo or ++ * @fifo_watermark or more empty words in RX fifo. ++ * @dma_maxburst: max number of words to transfer in one go. So far, ++ * this is always the same as fifo_watermark. + */ + struct fsl_ssi_private { + struct regmap *regs; +@@ -263,6 +269,9 @@ struct fsl_ssi_private { + + const struct fsl_ssi_soc_data *soc; + struct device *dev; ++ ++ u32 fifo_watermark; ++ u32 dma_maxburst; + }; + + /* +@@ -1051,21 +1060,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, + regmap_write(regs, CCSR_SSI_SRCR, srcr); + regmap_write(regs, CCSR_SSI_SCR, scr); + +- /* +- * Set the watermark for transmit FIFI 0 and receive FIFO 0. We don't +- * use FIFO 1. We program the transmit water to signal a DMA transfer +- * if there are only two (or fewer) elements left in the FIFO. Two +- * elements equals one frame (left channel, right channel). This value, +- * however, depends on the depth of the transmit buffer. +- * +- * We set the watermark on the same level as the DMA burstsize. For +- * fiq it is probably better to use the biggest possible watermark +- * size. +- */ +- if (ssi_private->use_dma) +- wm = ssi_private->fifo_depth - 2; +- else +- wm = ssi_private->fifo_depth; ++ wm = ssi_private->fifo_watermark; + + regmap_write(regs, CCSR_SSI_SFCSR, + CCSR_SSI_SFCSR_TFWM0(wm) | CCSR_SSI_SFCSR_RFWM0(wm) | +@@ -1373,12 +1368,8 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev, + dev_dbg(&pdev->dev, "could not get baud clock: %ld\n", + PTR_ERR(ssi_private->baudclk)); + +- /* +- * We have burstsize be "fifo_depth - 2" to match the SSI +- * watermark setting in fsl_ssi_startup(). +- */ +- ssi_private->dma_params_tx.maxburst = ssi_private->fifo_depth - 2; +- ssi_private->dma_params_rx.maxburst = ssi_private->fifo_depth - 2; ++ ssi_private->dma_params_tx.maxburst = ssi_private->dma_maxburst; ++ ssi_private->dma_params_rx.maxburst = ssi_private->dma_maxburst; + ssi_private->dma_params_tx.addr = ssi_private->ssi_phys + CCSR_SSI_STX0; + ssi_private->dma_params_rx.addr = ssi_private->ssi_phys + CCSR_SSI_SRX0; + +@@ -1543,6 +1534,47 @@ static int fsl_ssi_probe(struct platform_device *pdev) + /* Older 8610 DTs didn't have the fifo-depth property */ + ssi_private->fifo_depth = 8; + ++ /* ++ * Set the watermark for transmit FIFO 0 and receive FIFO 0. We don't ++ * use FIFO 1 but set the watermark appropriately nontheless. ++ * We program the transmit water to signal a DMA transfer ++ * if there are N elements left in the FIFO. For chips with 15-deep ++ * FIFOs, set watermark to 8. This allows the SSI to operate at a ++ * high data rate without channel slipping. Behavior is unchanged ++ * for the older chips with a fifo depth of only 8. A value of 4 ++ * might be appropriate for the older chips, but is left at ++ * fifo_depth-2 until sombody has a chance to test. ++ * ++ * We set the watermark on the same level as the DMA burstsize. For ++ * fiq it is probably better to use the biggest possible watermark ++ * size. ++ */ ++ switch (ssi_private->fifo_depth) { ++ case 15: ++ /* ++ * 2 samples is not enough when running at high data ++ * rates (like 48kHz @ 16 bits/channel, 16 channels) ++ * 8 seems to split things evenly and leave enough time ++ * for the DMA to fill the FIFO before it's over/under ++ * run. ++ */ ++ ssi_private->fifo_watermark = 8; ++ ssi_private->dma_maxburst = 8; ++ break; ++ case 8: ++ default: ++ /* ++ * maintain old behavior for older chips. ++ * Keeping it the same because I don't have an older ++ * board to test with. ++ * I suspect this could be changed to be something to ++ * leave some more space in the fifo. ++ */ ++ ssi_private->fifo_watermark = ssi_private->fifo_depth - 2; ++ ssi_private->dma_maxburst = ssi_private->fifo_depth - 2; ++ break; ++ } ++ + dev_set_drvdata(&pdev->dev, ssi_private); + + if (ssi_private->soc->imx) { +diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c +index d5873eeae1aa..bd19fad2d91b 100644 +--- a/sound/soc/intel/boards/bytcr_rt5640.c ++++ b/sound/soc/intel/boards/bytcr_rt5640.c +@@ -142,7 +142,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, + * for Jack detection and button press + */ + ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_RCCLK, +- 0, ++ 48000 * 512, + SND_SOC_CLOCK_IN); + if (!ret) { + if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && priv->mclk) +diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c +index 8fc3178bc79c..b30bd384c8d3 100644 +--- a/sound/soc/intel/skylake/skl-sst.c ++++ b/sound/soc/intel/skylake/skl-sst.c +@@ -515,6 +515,9 @@ EXPORT_SYMBOL_GPL(skl_sst_init_fw); + + void skl_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx) + { ++ ++ if (ctx->dsp->fw) ++ release_firmware(ctx->dsp->fw); + skl_clear_module_table(ctx->dsp); + skl_freeup_uuid_list(ctx); + skl_ipc_free(&ctx->ipc); +diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c +index d56a16a0f6fa..21c3ef01c438 100644 +--- a/sound/soc/soc-pcm.c ++++ b/sound/soc/soc-pcm.c +@@ -2184,9 +2184,11 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: +- case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + fe->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP; + break; ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PAUSED; ++ break; + } + + out: +diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c +index c5251aaad844..b8044c6034b3 100644 +--- a/sound/usb/endpoint.c ++++ b/sound/usb/endpoint.c +@@ -384,6 +384,9 @@ static void snd_complete_urb(struct urb *urb) + if (unlikely(atomic_read(&ep->chip->shutdown))) + goto exit_clear; + ++ if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags))) ++ goto exit_clear; ++ + if (usb_pipeout(ep->pipe)) { + retire_outbound_urb(ep, ctx); + /* can be stopped during retire callback */ +diff --git a/tools/lib/traceevent/plugin_sched_switch.c b/tools/lib/traceevent/plugin_sched_switch.c +index f1ce60065258..ec30c2fcbac0 100644 +--- a/tools/lib/traceevent/plugin_sched_switch.c ++++ b/tools/lib/traceevent/plugin_sched_switch.c +@@ -111,7 +111,7 @@ static int sched_switch_handler(struct trace_seq *s, + trace_seq_printf(s, "%lld ", val); + + if (pevent_get_field_val(s, event, "prev_prio", record, &val, 0) == 0) +- trace_seq_printf(s, "[%lld] ", val); ++ trace_seq_printf(s, "[%d] ", (int) val); + + if (pevent_get_field_val(s, event, "prev_state", record, &val, 0) == 0) + write_state(s, val); +@@ -129,7 +129,7 @@ static int sched_switch_handler(struct trace_seq *s, + trace_seq_printf(s, "%lld", val); + + if (pevent_get_field_val(s, event, "next_prio", record, &val, 0) == 0) +- trace_seq_printf(s, " [%lld]", val); ++ trace_seq_printf(s, " [%d]", (int) val); + + return 0; + } +diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf +index 982d6439bb07..ef52d1e3d431 100644 +--- a/tools/perf/Makefile.perf ++++ b/tools/perf/Makefile.perf +@@ -729,9 +729,9 @@ install-tests: all install-gtk + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ + $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' + +-install-bin: install-tools install-tests ++install-bin: install-tools install-tests install-traceevent-plugins + +-install: install-bin try-install-man install-traceevent-plugins ++install: install-bin try-install-man + + install-python_ext: + $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)' +diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c +index 7ea13f44178d..6c50d9f8e210 100644 +--- a/tools/perf/util/probe-event.c ++++ b/tools/perf/util/probe-event.c +@@ -268,21 +268,6 @@ static bool kprobe_warn_out_range(const char *symbol, unsigned long address) + } + + /* +- * NOTE: +- * '.gnu.linkonce.this_module' section of kernel module elf directly +- * maps to 'struct module' from linux/module.h. This section contains +- * actual module name which will be used by kernel after loading it. +- * But, we cannot use 'struct module' here since linux/module.h is not +- * exposed to user-space. Offset of 'name' has remained same from long +- * time, so hardcoding it here. +- */ +-#ifdef __LP64__ +-#define MOD_NAME_OFFSET 24 +-#else +-#define MOD_NAME_OFFSET 12 +-#endif +- +-/* + * @module can be module name of module file path. In case of path, + * inspect elf and find out what is actual module name. + * Caller has to free mod_name after using it. +@@ -296,6 +281,7 @@ static char *find_module_name(const char *module) + Elf_Data *data; + Elf_Scn *sec; + char *mod_name = NULL; ++ int name_offset; + + fd = open(module, O_RDONLY); + if (fd < 0) +@@ -317,7 +303,21 @@ static char *find_module_name(const char *module) + if (!data || !data->d_buf) + goto ret_err; + +- mod_name = strdup((char *)data->d_buf + MOD_NAME_OFFSET); ++ /* ++ * NOTE: ++ * '.gnu.linkonce.this_module' section of kernel module elf directly ++ * maps to 'struct module' from linux/module.h. This section contains ++ * actual module name which will be used by kernel after loading it. ++ * But, we cannot use 'struct module' here since linux/module.h is not ++ * exposed to user-space. Offset of 'name' has remained same from long ++ * time, so hardcoding it here. ++ */ ++ if (ehdr.e_ident[EI_CLASS] == ELFCLASS32) ++ name_offset = 12; ++ else /* expect ELFCLASS64 by default */ ++ name_offset = 24; ++ ++ mod_name = strdup((char *)data->d_buf + name_offset); + + ret_err: + elf_end(elf); +diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c +index 99400b0e8f2a..adbc6c02c3aa 100644 +--- a/tools/perf/util/symbol-elf.c ++++ b/tools/perf/util/symbol-elf.c +@@ -537,6 +537,12 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size) + break; + } else { + int n = namesz + descsz; ++ ++ if (n > (int)sizeof(bf)) { ++ n = sizeof(bf); ++ pr_debug("%s: truncating reading of build id in sysfs file %s: n_namesz=%u, n_descsz=%u.\n", ++ __func__, filename, nhdr.n_namesz, nhdr.n_descsz); ++ } + if (read(fd, bf, n) != n) + break; + }