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 614E81396D0 for ; Mon, 7 Aug 2017 10:25:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95C9EE0B73; Mon, 7 Aug 2017 10:25:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 62678E0B73 for ; Mon, 7 Aug 2017 10:25:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 45315341884 for ; Mon, 7 Aug 2017 10:25:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA0A074A9 for ; Mon, 7 Aug 2017 10:25:51 +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: <1502101543.fd803648f495a130c6e667d35a20294307f534bb.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.4 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 1079_linux-4.4.80.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: fd803648f495a130c6e667d35a20294307f534bb X-VCS-Branch: 4.4 Date: Mon, 7 Aug 2017 10:25:51 +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: fa8c56e1-5ee5-4740-8b6a-51879b91ee7b X-Archives-Hash: 18fd597d5726ce5f5cb1d7e3e175ebe4 commit: fd803648f495a130c6e667d35a20294307f534bb Author: Mike Pagano gentoo org> AuthorDate: Mon Aug 7 10:25:43 2017 +0000 Commit: Mike Pagano gentoo org> CommitDate: Mon Aug 7 10:25:43 2017 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=fd803648 Linux patch 4.4.80 0000_README | 4 + 1079_linux-4.4.80.patch | 3287 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3291 insertions(+) diff --git a/0000_README b/0000_README index 2986ab7..82594ae 100644 --- a/0000_README +++ b/0000_README @@ -359,6 +359,10 @@ Patch: 1078_linux-4.4.79.patch From: http://www.kernel.org Desc: Linux 4.4.79 +Patch: 1079_linux-4.4.80.patch +From: http://www.kernel.org +Desc: Linux 4.4.80 + 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/1079_linux-4.4.80.patch b/1079_linux-4.4.80.patch new file mode 100644 index 0000000..3594fbc --- /dev/null +++ b/1079_linux-4.4.80.patch @@ -0,0 +1,3287 @@ +diff --git a/Makefile b/Makefile +index 1440a94b2474..dddd55adde24 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 4 +-SUBLEVEL = 79 ++SUBLEVEL = 80 + EXTRAVERSION = + NAME = Blurry Fish Butt + +diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts +index 5f5e0f3d5b64..27cd4abfc74d 100644 +--- a/arch/arm/boot/dts/omap3-n900.dts ++++ b/arch/arm/boot/dts/omap3-n900.dts +@@ -697,6 +697,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 f3142369f594..01116ee1284b 100644 +--- a/arch/arm/configs/s3c2410_defconfig ++++ b/arch/arm/configs/s3c2410_defconfig +@@ -87,9 +87,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/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts +index ce5d848251fa..7b34822d61e9 100644 +--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts ++++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts +@@ -26,7 +26,7 @@ + stdout-path = "serial0:115200n8"; + }; + +- memory { ++ memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x40000000>; + }; +diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +index 857eda5c7217..172402cc1a0f 100644 +--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi ++++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +@@ -71,7 +71,7 @@ + <1 10 0xf01>; + }; + +- amba_apu { ++ amba_apu: amba_apu@0 { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; +@@ -191,7 +191,7 @@ + }; + + i2c0: i2c@ff020000 { +- compatible = "cdns,i2c-r1p10"; ++ compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; + status = "disabled"; + interrupt-parent = <&gic>; + interrupts = <0 17 4>; +@@ -202,7 +202,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 247bae758e1e..a4b466424a32 100644 +--- a/arch/arm64/mm/fault.c ++++ b/arch/arm64/mm/fault.c +@@ -66,21 +66,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 2d69a853b742..3a08b55609b6 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/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 fe6e800c1357..a20823210ac0 100644 +--- a/arch/powerpc/kernel/setup_64.c ++++ b/arch/powerpc/kernel/setup_64.c +@@ -751,7 +751,7 @@ void __init setup_arch(char **cmdline_p) + + 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)); + } + +@@ -762,7 +762,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 396dc44e783b..428563b195c3 100644 +--- a/arch/powerpc/kvm/book3s_hv.c ++++ b/arch/powerpc/kvm/book3s_hv.c +@@ -2687,6 +2687,10 @@ 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 long proc_fscr = 0; ++ unsigned int user_vrsave; + + if (!vcpu->arch.sane) { + run->exit_reason = KVM_EXIT_INTERNAL_ERROR; +@@ -2707,10 +2711,11 @@ 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); +- current->thread.regs->msr &= ~MSR_TM; + } + #endif + +@@ -2736,6 +2741,17 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) + flush_fp_to_thread(current); + flush_altivec_to_thread(current); + flush_vsx_to_thread(current); ++ ++ /* 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); ++ proc_fscr = mfspr(SPRN_FSCR); ++ } ++ user_vrsave = mfspr(SPRN_VRSAVE); ++ + vcpu->arch.wqp = &vcpu->arch.vcore->wq; + vcpu->arch.pgdir = current->mm->pgd; + vcpu->arch.state = KVMPPC_VCPU_BUSY_IN_HOST; +@@ -2757,6 +2773,29 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) + } + } while (is_kvmppc_resume_guest(r)); + ++ /* 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, proc_fscr); ++ } ++ mtspr(SPRN_VRSAVE, user_vrsave); ++ ++ /* ++ * Since we don't do lazy TM reload, we need to reload ++ * the TM registers here. ++ */ ++#ifdef CONFIG_PPC_TRANSACTIONAL_MEM ++ if (cpu_has_feature(CPU_FTR_TM) && current->thread.regs && ++ (current->thread.regs->msr & MSR_TM)) { ++ mtspr(SPRN_TFHAR, current->thread.tm_tfhar); ++ mtspr(SPRN_TFIAR, current->thread.tm_tfiar); ++ mtspr(SPRN_TEXASR, current->thread.tm_texasr); ++ } ++#endif ++ + out: + vcpu->arch.state = KVMPPC_VCPU_NOTREADY; + atomic_dec(&vcpu->kvm->arch.vcpus_running); +diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S +index 1a743f87b37d..ffab9269bfe4 100644 +--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S ++++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S +@@ -36,6 +36,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. +@@ -274,10 +281,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 + + /* +@@ -489,7 +496,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) +@@ -643,6 +650,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 */ +@@ -1266,8 +1283,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 */ +@@ -1283,6 +1299,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 +@@ -1424,6 +1441,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 +@@ -1533,8 +1560,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 7c7fcc042549..fb695f142563 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/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c +index 62aca448726a..2116176c1721 100644 +--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c ++++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c +@@ -682,6 +682,9 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank) + const char *name = th_names[bank]; + 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/crypto/authencesn.c b/crypto/authencesn.c +index 0c0468869e25..52154ef21b5e 100644 +--- a/crypto/authencesn.c ++++ b/crypto/authencesn.c +@@ -245,6 +245,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); +@@ -253,6 +256,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/base/power/domain.c b/drivers/base/power/domain.c +index 3f94e5fc110a..78b0ece0c867 100644 +--- a/drivers/base/power/domain.c ++++ b/drivers/base/power/domain.c +@@ -1188,7 +1188,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev, + } + + dev->power.subsys_data->domain_data = &gpd_data->base; +- dev->pm_domain = &genpd->domain; + + spin_unlock_irq(&dev->power.lock); + +@@ -1207,7 +1206,6 @@ static void genpd_free_dev_data(struct device *dev, + { + spin_lock_irq(&dev->power.lock); + +- dev->pm_domain = NULL; + dev->power.subsys_data->domain_data = NULL; + + spin_unlock_irq(&dev->power.lock); +@@ -1248,6 +1246,8 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, + if (ret) + goto out; + ++ dev->pm_domain = &genpd->domain; ++ + genpd->device_count++; + genpd->max_off_time_changed = true; + +@@ -1299,6 +1299,8 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, + if (genpd->detach_dev) + genpd->detach_dev(genpd, dev); + ++ dev->pm_domain = NULL; ++ + list_del_init(&pdd->list_node); + + mutex_unlock(&genpd->lock); +diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c +index 41fb1a917b17..33e23a7a691f 100644 +--- a/drivers/block/xen-blkback/blkback.c ++++ b/drivers/block/xen-blkback/blkback.c +@@ -595,8 +595,6 @@ int xen_blkif_schedule(void *arg) + unsigned long timeout; + int ret; + +- xen_blkif_get(blkif); +- + while (!kthread_should_stop()) { + if (try_to_freeze()) + continue; +@@ -650,7 +648,6 @@ purge_gnt_list: + print_stats(blkif); + + blkif->xenblkd = NULL; +- xen_blkif_put(blkif); + + return 0; + } +diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c +index f53cff42f8da..923308201375 100644 +--- a/drivers/block/xen-blkback/xenbus.c ++++ b/drivers/block/xen-blkback/xenbus.c +@@ -221,7 +221,6 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif) + if (blkif->xenblkd) { + kthread_stop(blkif->xenblkd); + wake_up(&blkif->shutdown_wq); +- blkif->xenblkd = NULL; + } + + /* The above kthread_stop() guarantees that at this point we +@@ -266,9 +265,10 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif) + + static void xen_blkif_free(struct xen_blkif *blkif) + { +- +- xen_blkif_disconnect(blkif); ++ WARN_ON(xen_blkif_disconnect(blkif)); + xen_vbd_free(&blkif->vbd); ++ kfree(blkif->be->mode); ++ kfree(blkif->be); + + /* Make sure everything is drained before shutting down */ + BUG_ON(blkif->persistent_gnt_c != 0); +@@ -445,8 +445,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev) + xen_blkif_put(be->blkif); + } + +- kfree(be->mode); +- kfree(be); + return 0; + } + +diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c +index 096f0cef4da1..40d400fe5bb7 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/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c +index 6d56877b2e0a..a0d9ac6b6cc9 100644 +--- a/drivers/char/tpm/tpm-chip.c ++++ b/drivers/char/tpm/tpm-chip.c +@@ -29,9 +29,8 @@ + #include "tpm.h" + #include "tpm_eventlog.h" + +-static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES); +-static LIST_HEAD(tpm_chip_list); +-static DEFINE_SPINLOCK(driver_lock); ++DEFINE_IDR(dev_nums_idr); ++static DEFINE_MUTEX(idr_lock); + + struct class *tpm_class; + dev_t tpm_devt; +@@ -92,20 +91,30 @@ EXPORT_SYMBOL_GPL(tpm_put_ops); + */ + struct tpm_chip *tpm_chip_find_get(int chip_num) + { +- struct tpm_chip *pos, *chip = NULL; ++ struct tpm_chip *chip, *res = NULL; ++ int chip_prev; ++ ++ mutex_lock(&idr_lock); ++ ++ if (chip_num == TPM_ANY_NUM) { ++ chip_num = 0; ++ do { ++ chip_prev = chip_num; ++ chip = idr_get_next(&dev_nums_idr, &chip_num); ++ if (chip && !tpm_try_get_ops(chip)) { ++ res = chip; ++ break; ++ } ++ } while (chip_prev != chip_num); ++ } else { ++ chip = idr_find_slowpath(&dev_nums_idr, chip_num); ++ if (chip && !tpm_try_get_ops(chip)) ++ res = chip; ++ } + +- rcu_read_lock(); +- list_for_each_entry_rcu(pos, &tpm_chip_list, list) { +- if (chip_num != TPM_ANY_NUM && chip_num != pos->dev_num) +- continue; ++ mutex_unlock(&idr_lock); + +- /* rcu prevents chip from being free'd */ +- if (!tpm_try_get_ops(pos)) +- chip = pos; +- break; +- } +- rcu_read_unlock(); +- return chip; ++ return res; + } + + /** +@@ -118,9 +127,10 @@ static void tpm_dev_release(struct device *dev) + { + struct tpm_chip *chip = container_of(dev, struct tpm_chip, dev); + +- spin_lock(&driver_lock); +- clear_bit(chip->dev_num, dev_mask); +- spin_unlock(&driver_lock); ++ mutex_lock(&idr_lock); ++ idr_remove(&dev_nums_idr, chip->dev_num); ++ mutex_unlock(&idr_lock); ++ + kfree(chip); + } + +@@ -173,6 +183,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, + const struct tpm_class_ops *ops) + { + struct tpm_chip *chip; ++ int rc; + + chip = kzalloc(sizeof(*chip), GFP_KERNEL); + if (chip == NULL) +@@ -180,21 +191,18 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, + + mutex_init(&chip->tpm_mutex); + init_rwsem(&chip->ops_sem); +- INIT_LIST_HEAD(&chip->list); + + chip->ops = ops; + +- spin_lock(&driver_lock); +- chip->dev_num = find_first_zero_bit(dev_mask, TPM_NUM_DEVICES); +- spin_unlock(&driver_lock); +- +- if (chip->dev_num >= TPM_NUM_DEVICES) { ++ mutex_lock(&idr_lock); ++ rc = idr_alloc(&dev_nums_idr, NULL, 0, TPM_NUM_DEVICES, GFP_KERNEL); ++ mutex_unlock(&idr_lock); ++ if (rc < 0) { + dev_err(dev, "No available tpm device numbers\n"); + kfree(chip); +- return ERR_PTR(-ENOMEM); ++ return ERR_PTR(rc); + } +- +- set_bit(chip->dev_num, dev_mask); ++ chip->dev_num = rc; + + scnprintf(chip->devname, sizeof(chip->devname), "tpm%d", chip->dev_num); + +@@ -252,19 +260,28 @@ static int tpm_add_char_device(struct tpm_chip *chip) + return rc; + } + ++ /* Make the chip available. */ ++ mutex_lock(&idr_lock); ++ idr_replace(&dev_nums_idr, chip, chip->dev_num); ++ mutex_unlock(&idr_lock); ++ + return rc; + } + + static void tpm_del_char_device(struct tpm_chip *chip) + { + cdev_del(&chip->cdev); ++ device_del(&chip->dev); ++ ++ /* Make the chip unavailable. */ ++ mutex_lock(&idr_lock); ++ idr_replace(&dev_nums_idr, NULL, chip->dev_num); ++ mutex_unlock(&idr_lock); + + /* Make the driver uncallable. */ + down_write(&chip->ops_sem); + chip->ops = NULL; + up_write(&chip->ops_sem); +- +- device_del(&chip->dev); + } + + static int tpm1_chip_register(struct tpm_chip *chip) +@@ -319,11 +336,6 @@ int tpm_chip_register(struct tpm_chip *chip) + if (rc) + goto out_err; + +- /* Make the chip available. */ +- spin_lock(&driver_lock); +- list_add_tail_rcu(&chip->list, &tpm_chip_list); +- spin_unlock(&driver_lock); +- + chip->flags |= TPM_CHIP_FLAG_REGISTERED; + + if (!(chip->flags & TPM_CHIP_FLAG_TPM2)) { +@@ -360,11 +372,6 @@ void tpm_chip_unregister(struct tpm_chip *chip) + if (!(chip->flags & TPM_CHIP_FLAG_REGISTERED)) + return; + +- spin_lock(&driver_lock); +- list_del_rcu(&chip->list); +- spin_unlock(&driver_lock); +- synchronize_rcu(); +- + if (!(chip->flags & TPM_CHIP_FLAG_TPM2)) + sysfs_remove_link(&chip->dev.parent->kobj, "ppi"); + +diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c +index 8588f2e4b9af..aaa5fa95dede 100644 +--- a/drivers/char/tpm/tpm-interface.c ++++ b/drivers/char/tpm/tpm-interface.c +@@ -1127,6 +1127,7 @@ static int __init tpm_init(void) + + static void __exit tpm_exit(void) + { ++ idr_destroy(&dev_nums_idr); + class_destroy(tpm_class); + unregister_chrdev_region(tpm_devt, TPM_NUM_DEVICES); + } +diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c +index 6a4056a3f7ee..06ac6e9657d2 100644 +--- a/drivers/char/tpm/tpm-sysfs.c ++++ b/drivers/char/tpm/tpm-sysfs.c +@@ -38,6 +38,8 @@ static ssize_t pubek_show(struct device *dev, struct device_attribute *attr, + + struct tpm_chip *chip = dev_get_drvdata(dev); + ++ memset(&tpm_cmd, 0, sizeof(tpm_cmd)); ++ + tpm_cmd.header.in = tpm_readpubek_header; + err = tpm_transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, 0, + "attempting to read the PUBEK"); +diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h +index e21e2c599e66..772d99b3a8e4 100644 +--- a/drivers/char/tpm/tpm.h ++++ b/drivers/char/tpm/tpm.h +@@ -34,7 +34,7 @@ + enum tpm_const { + TPM_MINOR = 224, /* officially assigned */ + TPM_BUFSIZE = 4096, +- TPM_NUM_DEVICES = 256, ++ TPM_NUM_DEVICES = 65536, + TPM_RETRY = 50, /* 5 seconds */ + }; + +@@ -200,8 +200,6 @@ struct tpm_chip { + acpi_handle acpi_dev_handle; + char ppi_version[TPM_PPI_VERSION_LEN + 1]; + #endif /* CONFIG_ACPI */ +- +- struct list_head list; + }; + + #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev) +@@ -497,6 +495,7 @@ static inline void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value) + extern struct class *tpm_class; + extern dev_t tpm_devt; + extern const struct file_operations tpm_fops; ++extern struct idr dev_nums_idr; + + enum tpm_transmit_flags { + TPM_TRANSMIT_UNLOCKED = BIT(0), +diff --git a/drivers/dma/ioat/hw.h b/drivers/dma/ioat/hw.h +index 690e3b4f8202..b36da3c1073f 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 4ef0c5e07912..abb75ebd65ea 100644 +--- a/drivers/dma/ioat/init.c ++++ b/drivers/dma/ioat/init.c +@@ -105,6 +105,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) }, +@@ -250,10 +252,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 a415edbe61b1..149ec2bd9bc6 100644 +--- a/drivers/dma/ti-dma-crossbar.c ++++ b/drivers/dma/ti-dma-crossbar.c +@@ -146,6 +146,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; + } + +@@ -310,6 +311,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 a3b54cc76495..b66ffd44ff26 100644 +--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c ++++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c +@@ -204,7 +204,14 @@ int 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 1847f83b1e33..fed44d4e5b72 100644 +--- a/drivers/gpu/drm/msm/msm_gem_submit.c ++++ b/drivers/gpu/drm/msm/msm_gem_submit.c +@@ -90,7 +90,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; +diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c +index 1f14b908b221..ae317271cf81 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/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_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +index 48cb19949ca3..9255b9c096b6 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +@@ -282,26 +282,6 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc) + * Page Flip + */ + +-void rcar_du_crtc_cancel_page_flip(struct rcar_du_crtc *rcrtc, +- struct drm_file *file) +-{ +- struct drm_pending_vblank_event *event; +- struct drm_device *dev = rcrtc->crtc.dev; +- unsigned long flags; +- +- /* Destroy the pending vertical blanking event associated with the +- * pending page flip, if any, and disable vertical blanking interrupts. +- */ +- spin_lock_irqsave(&dev->event_lock, flags); +- event = rcrtc->event; +- if (event && event->base.file_priv == file) { +- rcrtc->event = NULL; +- event->base.destroy(&event->base); +- drm_crtc_vblank_put(&rcrtc->crtc); +- } +- spin_unlock_irqrestore(&dev->event_lock, flags); +-} +- + static void rcar_du_crtc_finish_page_flip(struct rcar_du_crtc *rcrtc) + { + struct drm_pending_vblank_event *event; +diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h +index 4b95d9d08c49..2bbe3f5aab65 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h ++++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h +@@ -67,8 +67,6 @@ enum rcar_du_output { + + int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index); + void rcar_du_crtc_enable_vblank(struct rcar_du_crtc *rcrtc, bool enable); +-void rcar_du_crtc_cancel_page_flip(struct rcar_du_crtc *rcrtc, +- struct drm_file *file); + void rcar_du_crtc_suspend(struct rcar_du_crtc *rcrtc); + void rcar_du_crtc_resume(struct rcar_du_crtc *rcrtc); + +diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c +index 40422f6b645e..bf4674aa6405 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c +@@ -144,91 +144,6 @@ MODULE_DEVICE_TABLE(of, rcar_du_of_table); + * DRM operations + */ + +-static int rcar_du_unload(struct drm_device *dev) +-{ +- struct rcar_du_device *rcdu = dev->dev_private; +- +- if (rcdu->fbdev) +- drm_fbdev_cma_fini(rcdu->fbdev); +- +- drm_kms_helper_poll_fini(dev); +- drm_mode_config_cleanup(dev); +- drm_vblank_cleanup(dev); +- +- dev->irq_enabled = 0; +- dev->dev_private = NULL; +- +- return 0; +-} +- +-static int rcar_du_load(struct drm_device *dev, unsigned long flags) +-{ +- struct platform_device *pdev = dev->platformdev; +- struct device_node *np = pdev->dev.of_node; +- struct rcar_du_device *rcdu; +- struct resource *mem; +- int ret; +- +- if (np == NULL) { +- dev_err(dev->dev, "no platform data\n"); +- return -ENODEV; +- } +- +- rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); +- if (rcdu == NULL) { +- dev_err(dev->dev, "failed to allocate private data\n"); +- return -ENOMEM; +- } +- +- init_waitqueue_head(&rcdu->commit.wait); +- +- rcdu->dev = &pdev->dev; +- rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data; +- rcdu->ddev = dev; +- dev->dev_private = 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)) +- return PTR_ERR(rcdu->mmio); +- +- /* 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) { +- dev_err(&pdev->dev, "failed to initialize vblank\n"); +- goto done; +- } +- +- /* DRM/KMS objects */ +- ret = rcar_du_modeset_init(rcdu); +- if (ret < 0) { +- dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret); +- goto done; +- } +- +- dev->irq_enabled = 1; +- +- platform_set_drvdata(pdev, rcdu); +- +-done: +- if (ret) +- rcar_du_unload(dev); +- +- return ret; +-} +- +-static void rcar_du_preclose(struct drm_device *dev, struct drm_file *file) +-{ +- struct rcar_du_device *rcdu = dev->dev_private; +- unsigned int i; +- +- for (i = 0; i < rcdu->num_crtcs; ++i) +- rcar_du_crtc_cancel_page_flip(&rcdu->crtcs[i], file); +-} +- + static void rcar_du_lastclose(struct drm_device *dev) + { + struct rcar_du_device *rcdu = dev->dev_private; +@@ -269,11 +184,7 @@ static const struct file_operations rcar_du_fops = { + static struct drm_driver rcar_du_driver = { + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME + | DRIVER_ATOMIC, +- .load = rcar_du_load, +- .unload = rcar_du_unload, +- .preclose = rcar_du_preclose, + .lastclose = rcar_du_lastclose, +- .set_busid = drm_platform_set_busid, + .get_vblank_counter = drm_vblank_no_hw_counter, + .enable_vblank = rcar_du_enable_vblank, + .disable_vblank = rcar_du_disable_vblank, +@@ -333,18 +244,104 @@ static const struct dev_pm_ops rcar_du_pm_ops = { + * Platform driver + */ + +-static int rcar_du_probe(struct platform_device *pdev) ++static int rcar_du_remove(struct platform_device *pdev) + { +- return drm_platform_init(&rcar_du_driver, pdev); ++ struct rcar_du_device *rcdu = platform_get_drvdata(pdev); ++ struct drm_device *ddev = rcdu->ddev; ++ ++ mutex_lock(&ddev->mode_config.mutex); ++ drm_connector_unplug_all(ddev); ++ mutex_unlock(&ddev->mode_config.mutex); ++ ++ drm_dev_unregister(ddev); ++ ++ if (rcdu->fbdev) ++ drm_fbdev_cma_fini(rcdu->fbdev); ++ ++ drm_kms_helper_poll_fini(ddev); ++ drm_mode_config_cleanup(ddev); ++ ++ drm_dev_unref(ddev); ++ ++ return 0; + } + +-static int rcar_du_remove(struct platform_device *pdev) ++static int rcar_du_probe(struct platform_device *pdev) + { +- struct rcar_du_device *rcdu = platform_get_drvdata(pdev); ++ struct device_node *np = pdev->dev.of_node; ++ struct rcar_du_device *rcdu; ++ struct drm_connector *connector; ++ struct drm_device *ddev; ++ struct resource *mem; ++ int ret; ++ ++ if (np == NULL) { ++ dev_err(&pdev->dev, "no device tree node\n"); ++ return -ENODEV; ++ } ++ ++ /* Allocate and initialize the DRM and R-Car device structures. */ ++ rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); ++ if (rcdu == NULL) ++ return -ENOMEM; ++ ++ init_waitqueue_head(&rcdu->commit.wait); ++ ++ rcdu->dev = &pdev->dev; ++ rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data; ++ ++ platform_set_drvdata(pdev, rcdu); + +- drm_put_dev(rcdu->ddev); ++ /* 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); ++ ++ /* DRM/KMS objects */ ++ ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev); ++ if (!ddev) ++ return -ENOMEM; ++ ++ drm_dev_set_unique(ddev, dev_name(&pdev->dev)); ++ ++ rcdu->ddev = ddev; ++ ddev->dev_private = rcdu; ++ ++ ret = rcar_du_modeset_init(rcdu); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret); ++ goto error; ++ } ++ ++ ddev->irq_enabled = 1; ++ ++ /* Register the DRM device with the core and the connectors with ++ * sysfs. ++ */ ++ ret = drm_dev_register(ddev, 0); ++ if (ret) ++ goto error; ++ ++ mutex_lock(&ddev->mode_config.mutex); ++ drm_for_each_connector(connector, ddev) { ++ ret = drm_connector_register(connector); ++ if (ret < 0) ++ break; ++ } ++ mutex_unlock(&ddev->mode_config.mutex); ++ ++ if (ret < 0) ++ goto error; ++ ++ DRM_INFO("Device %s probed\n", dev_name(&pdev->dev)); + + return 0; ++ ++error: ++ rcar_du_remove(pdev); ++ ++ return ret; + } + + static struct platform_driver rcar_du_platform_driver = { +diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c +index 96f2eb43713c..6038be93c58d 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c +@@ -55,12 +55,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = { + .best_encoder = rcar_du_connector_best_encoder, + }; + +-static void rcar_du_hdmi_connector_destroy(struct drm_connector *connector) +-{ +- drm_connector_unregister(connector); +- drm_connector_cleanup(connector); +-} +- + static enum drm_connector_status + rcar_du_hdmi_connector_detect(struct drm_connector *connector, bool force) + { +@@ -79,7 +73,7 @@ static const struct drm_connector_funcs connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .detect = rcar_du_hdmi_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, +- .destroy = rcar_du_hdmi_connector_destroy, ++ .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + }; +@@ -108,9 +102,6 @@ int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu, + return ret; + + drm_connector_helper_add(connector, &connector_helper_funcs); +- ret = drm_connector_register(connector); +- if (ret < 0) +- return ret; + + connector->dpms = DRM_MODE_DPMS_OFF; + drm_object_property_set_value(&connector->base, +diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c +index ca12e8ca5552..46429c4be8e5 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c +@@ -761,6 +761,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/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +index 0c43032fc693..e905f5da7aaa 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +@@ -62,12 +62,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = { + .best_encoder = rcar_du_connector_best_encoder, + }; + +-static void rcar_du_lvds_connector_destroy(struct drm_connector *connector) +-{ +- drm_connector_unregister(connector); +- drm_connector_cleanup(connector); +-} +- + static enum drm_connector_status + rcar_du_lvds_connector_detect(struct drm_connector *connector, bool force) + { +@@ -79,7 +73,7 @@ static const struct drm_connector_funcs connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .detect = rcar_du_lvds_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, +- .destroy = rcar_du_lvds_connector_destroy, ++ .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + }; +@@ -117,9 +111,6 @@ int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu, + return ret; + + drm_connector_helper_add(connector, &connector_helper_funcs); +- ret = drm_connector_register(connector); +- if (ret < 0) +- return ret; + + connector->dpms = DRM_MODE_DPMS_OFF; + drm_object_property_set_value(&connector->base, +diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c +index e0a5d8f93963..9d7e5c99caf6 100644 +--- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c ++++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c +@@ -31,12 +31,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = { + .best_encoder = rcar_du_connector_best_encoder, + }; + +-static void rcar_du_vga_connector_destroy(struct drm_connector *connector) +-{ +- drm_connector_unregister(connector); +- drm_connector_cleanup(connector); +-} +- + static enum drm_connector_status + rcar_du_vga_connector_detect(struct drm_connector *connector, bool force) + { +@@ -48,7 +42,7 @@ static const struct drm_connector_funcs connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .detect = rcar_du_vga_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, +- .destroy = rcar_du_vga_connector_destroy, ++ .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + }; +@@ -76,9 +70,6 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu, + return ret; + + drm_connector_helper_add(connector, &connector_helper_funcs); +- ret = drm_connector_register(connector); +- if (ret < 0) +- return ret; + + connector->dpms = DRM_MODE_DPMS_OFF; + drm_object_property_set_value(&connector->base, +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +index ecf15cf0c3fd..04fd0f2b6af0 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +@@ -471,7 +471,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 936960202cf4..11a051bd8a8b 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -2427,6 +2427,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 defined(CONFIG_MOUSE_SYNAPTICS_USB) || defined(CONFIG_MOUSE_SYNAPTICS_USB_MODULE) +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index c7f8b70d15ee..37cbc2ecfc5f 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -777,6 +777,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 9eca4b41fa0a..b7a73f1a8beb 100644 +--- a/drivers/infiniband/core/uverbs_cmd.c ++++ b/drivers/infiniband/core/uverbs_cmd.c +@@ -2287,8 +2287,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/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c +index deb89d63a728..e684be1bb7c0 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, "sporious 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 aa5dd5668528..dbad5c431bcb 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 6a4811f85705..9cf826df89b1 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 fc182c4f2619..8f60520c8392 100644 +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -5821,6 +5821,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 8001cde1db1e..503135a4f47a 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/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/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c +index 79ef799f88ab..c5ea1018cb47 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 480f3dae0780..4296066a7ad3 100644 +--- a/drivers/net/ethernet/renesas/sh_eth.c ++++ b/drivers/net/ethernet/renesas/sh_eth.c +@@ -750,6 +750,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 0bfbabad4431..1d1e5f7723ab 100644 +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -1442,7 +1442,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/kaweth.c b/drivers/net/usb/kaweth.c +index f64b25c221e8..cd93220c9b45 100644 +--- a/drivers/net/usb/kaweth.c ++++ b/drivers/net/usb/kaweth.c +@@ -1009,6 +1009,7 @@ static int kaweth_probe( + struct net_device *netdev; + const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + int result = 0; ++ int rv = -EIO; + + dev_dbg(dev, + "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n", +@@ -1029,6 +1030,7 @@ static int kaweth_probe( + kaweth = netdev_priv(netdev); + kaweth->dev = udev; + kaweth->net = netdev; ++ kaweth->intf = intf; + + spin_lock_init(&kaweth->device_lock); + init_waitqueue_head(&kaweth->term_wait); +@@ -1048,6 +1050,10 @@ static int kaweth_probe( + /* Download the firmware */ + dev_info(dev, "Downloading firmware...\n"); + kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL); ++ if (!kaweth->firmware_buf) { ++ rv = -ENOMEM; ++ goto err_free_netdev; ++ } + if ((result = kaweth_download_firmware(kaweth, + "kaweth/new_code.bin", + 100, +@@ -1139,8 +1145,6 @@ err_fw: + + dev_dbg(dev, "Initializing net device.\n"); + +- kaweth->intf = intf; +- + kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL); + if (!kaweth->tx_urb) + goto err_free_netdev; +@@ -1204,7 +1208,7 @@ err_only_tx: + err_free_netdev: + free_netdev(netdev); + +- return -EIO; ++ return rv; + } + + /**************************************************************** +diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h +index 8f4f6a892581..cfed5808bc4e 100644 +--- a/drivers/net/wireless/ath/ath10k/wmi-ops.h ++++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h +@@ -639,6 +639,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); +@@ -654,6 +657,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 bb69a5949aea..85bca557a339 100644 +--- a/drivers/net/wireless/ath/wil6210/main.c ++++ b/drivers/net/wireless/ath/wil6210/main.c +@@ -330,18 +330,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 532db28145c7..a5d7332dfce5 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/nvdimm/btt.c b/drivers/nvdimm/btt.c +index efb2c1ceef98..957234272ef7 100644 +--- a/drivers/nvdimm/btt.c ++++ b/drivers/nvdimm/btt.c +@@ -1205,10 +1205,13 @@ static int btt_rw_page(struct block_device *bdev, sector_t sector, + struct page *page, int rw) + { + struct btt *btt = bdev->bd_disk->private_data; ++ int rc; + +- btt_do_bvec(btt, NULL, page, PAGE_CACHE_SIZE, 0, rw, sector); +- page_endio(page, rw & WRITE, 0); +- return 0; ++ rc = btt_do_bvec(btt, NULL, page, PAGE_CACHE_SIZE, 0, rw, sector); ++ if (rc == 0) ++ page_endio(page, rw & WRITE, 0); ++ ++ return rc; + } + + +diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c +index b7971d410b60..74e5360c53f0 100644 +--- a/drivers/nvmem/imx-ocotp.c ++++ b/drivers/nvmem/imx-ocotp.c +@@ -88,7 +88,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/fnic/fnic.h b/drivers/scsi/fnic/fnic.h +index ce129e595b55..5c935847599c 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 266b909fe854..82e4bc8c11c5 100644 +--- a/drivers/scsi/fnic/fnic_scsi.c ++++ b/drivers/scsi/fnic/fnic_scsi.c +@@ -2533,6 +2533,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 +@@ -2553,6 +2566,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/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c +index 5b2c37f1e908..9b5367294116 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_base.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_base.c +@@ -4981,15 +4981,14 @@ _base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, int sleep_flag, + static int + _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag) + { +- int r, i; ++ int r, i, index; + unsigned long flags; + u32 reply_address; + u16 smid; + struct _tr_list *delayed_tr, *delayed_tr_next; + u8 hide_flag; + struct adapter_reply_queue *reply_q; +- long reply_post_free; +- u32 reply_post_free_sz, index = 0; ++ Mpi2ReplyDescriptorsUnion_t *reply_post_free_contig; + + dinitprintk(ioc, pr_info(MPT3SAS_FMT "%s\n", ioc->name, + __func__)); +@@ -5061,27 +5060,27 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag) + _base_assign_reply_queues(ioc); + + /* initialize Reply Post Free Queue */ +- reply_post_free_sz = ioc->reply_post_queue_depth * +- sizeof(Mpi2DefaultReplyDescriptor_t); +- reply_post_free = (long)ioc->reply_post[index].reply_post_free; ++ index = 0; ++ reply_post_free_contig = ioc->reply_post[0].reply_post_free; + list_for_each_entry(reply_q, &ioc->reply_queue_list, list) { ++ /* ++ * If RDPQ is enabled, switch to the next allocation. ++ * Otherwise advance within the contiguous region. ++ */ ++ if (ioc->rdpq_array_enable) { ++ reply_q->reply_post_free = ++ ioc->reply_post[index++].reply_post_free; ++ } else { ++ reply_q->reply_post_free = reply_post_free_contig; ++ reply_post_free_contig += ioc->reply_post_queue_depth; ++ } ++ + reply_q->reply_post_host_index = 0; +- reply_q->reply_post_free = (Mpi2ReplyDescriptorsUnion_t *) +- reply_post_free; + for (i = 0; i < ioc->reply_post_queue_depth; i++) + reply_q->reply_post_free[i].Words = + cpu_to_le64(ULLONG_MAX); + if (!_base_is_controller_msix_enabled(ioc)) + goto skip_init_reply_post_free_queue; +- /* +- * If RDPQ is enabled, switch to the next allocation. +- * Otherwise advance within the contiguous region. +- */ +- if (ioc->rdpq_array_enable) +- reply_post_free = (long) +- ioc->reply_post[++index].reply_post_free; +- else +- reply_post_free += reply_post_free_sz; + } + skip_init_reply_post_free_queue: + +diff --git a/drivers/scsi/snic/snic_main.c b/drivers/scsi/snic/snic_main.c +index 2b3c25371d76..8175f997e82c 100644 +--- a/drivers/scsi/snic/snic_main.c ++++ b/drivers/scsi/snic/snic_main.c +@@ -584,6 +584,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; + } + +@@ -594,6 +595,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; + } + +@@ -604,6 +606,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 882cd6618cd5..87a0e47eeae6 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 8fed55342b0f..b831f08e2769 100644 +--- a/drivers/staging/comedi/comedi_fops.c ++++ b/drivers/staging/comedi/comedi_fops.c +@@ -2901,9 +2901,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; +@@ -2921,6 +2918,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/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c +index 99285b416308..ee579ba2b59e 100644 +--- a/drivers/usb/gadget/function/f_hid.c ++++ b/drivers/usb/gadget/function/f_hid.c +@@ -539,7 +539,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 830e2fd47642..b31b84f56e8f 100644 +--- a/drivers/vfio/pci/vfio_pci.c ++++ b/drivers/vfio/pci/vfio_pci.c +@@ -902,6 +902,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 210db24d2204..4d39f7959adf 100644 +--- a/drivers/vfio/pci/vfio_pci_rdwr.c ++++ b/drivers/vfio/pci/vfio_pci_rdwr.c +@@ -190,7 +190,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 07675d6f323e..d4530b54479c 100644 +--- a/drivers/video/fbdev/cobalt_lcdfb.c ++++ b/drivers/video/fbdev/cobalt_lcdfb.c +@@ -350,6 +350,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/fs/btrfs/inode.c b/fs/btrfs/inode.c +index a61926cb01c0..bebd6517355d 100644 +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -7521,11 +7521,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/dcache.c b/fs/dcache.c +index 3000cbb54949..3ed642e0a0c2 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -269,6 +269,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 0f5d05bf2131..e49ba072bd64 100644 +--- a/fs/debugfs/inode.c ++++ b/fs/debugfs/inode.c +@@ -669,7 +669,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? */ +@@ -684,19 +684,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); + 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/namei.c b/fs/namei.c +index 0b0acba72a71..3f96ae087488 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -4179,11 +4179,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. +@@ -4237,7 +4237,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); +@@ -4298,14 +4298,14 @@ out: + mutex_unlock(&target->i_mutex); + 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/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 905caba36529..59d93acc29c7 100644 +--- a/fs/pstore/ram.c ++++ b/fs/pstore/ram.c +@@ -413,7 +413,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", +@@ -450,7 +450,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 364d2dffe5a6..27300533c2dd 100644 +--- a/fs/pstore/ram_core.c ++++ b/fs/pstore/ram_core.c +@@ -47,16 +47,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; +@@ -64,7 +63,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; + } +@@ -74,9 +74,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) +@@ -88,7 +89,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, +@@ -448,6 +450,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); + +@@ -474,7 +477,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; +@@ -485,6 +488,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/fs/seq_file.c b/fs/seq_file.c +index d672e2fec459..6dc4296eed62 100644 +--- a/fs/seq_file.c ++++ b/fs/seq_file.c +@@ -72,9 +72,10 @@ int seq_open(struct file *file, const struct seq_operations *op) + + mutex_init(&p->lock); + p->op = op; +-#ifdef CONFIG_USER_NS +- p->user_ns = file->f_cred->user_ns; +-#endif ++ ++ // No refcounting: the lifetime of 'p' is constrained ++ // to the lifetime of the file. ++ p->file = file; + + /* + * Wrappers around seq_open(e.g. swaps_open) need to be +diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c +index 187b80267ff9..a9063ac50c4e 100644 +--- a/fs/xfs/xfs_aops.c ++++ b/fs/xfs/xfs_aops.c +@@ -1426,6 +1426,26 @@ __xfs_get_blocks( + if (error) + goto out_unlock; + ++ /* ++ * The only time we can ever safely find delalloc blocks on direct I/O ++ * is a dio write to post-eof speculative preallocation. All other ++ * scenarios are indicative of a problem or misuse (such as mixing ++ * direct and mapped I/O). ++ * ++ * The file may be unmapped by the time we get here so we cannot ++ * reliably fail the I/O based on mapping. Instead, fail the I/O if this ++ * is a read or a write within eof. Otherwise, carry on but warn as a ++ * precuation if the file happens to be mapped. ++ */ ++ if (direct && imap.br_startblock == DELAYSTARTBLOCK) { ++ if (!create || offset < i_size_read(VFS_I(ip))) { ++ WARN_ON_ONCE(1); ++ error = -EIO; ++ goto out_unlock; ++ } ++ WARN_ON_ONCE(mapping_mapped(VFS_I(ip)->i_mapping)); ++ } ++ + /* for DAX, we convert unwritten extents directly */ + if (create && + (!nimaps || +@@ -1525,7 +1545,6 @@ __xfs_get_blocks( + set_buffer_new(bh_result); + + if (imap.br_startblock == DELAYSTARTBLOCK) { +- BUG_ON(direct); + if (create) { + set_buffer_uptodate(bh_result); + set_buffer_mapped(bh_result); +diff --git a/include/linux/dcache.h b/include/linux/dcache.h +index 8d7151eb6ceb..d516847e0fae 100644 +--- a/include/linux/dcache.h ++++ b/include/linux/dcache.h +@@ -615,5 +615,11 @@ static inline struct inode *d_real_inode(struct dentry *dentry) + return d_backing_inode(d_real(dentry)); + } + ++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 7ee1774edee5..a7789559078b 100644 +--- a/include/linux/fsnotify.h ++++ b/include/linux/fsnotify.h +@@ -310,35 +310,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/phy.h b/include/linux/phy.h +index 05fde31b6dc6..b64825d6ad26 100644 +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -785,6 +785,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); +diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h +index 9c9d6c154c8e..6f4520a82197 100644 +--- a/include/linux/pstore_ram.h ++++ b/include/linux/pstore_ram.h +@@ -23,6 +23,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; + +@@ -39,6 +46,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; +@@ -54,7 +63,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/include/linux/seq_file.h b/include/linux/seq_file.h +index dde00defbaa5..f3d45dd42695 100644 +--- a/include/linux/seq_file.h ++++ b/include/linux/seq_file.h +@@ -7,13 +7,10 @@ + #include + #include + #include ++#include ++#include + + struct seq_operations; +-struct file; +-struct path; +-struct inode; +-struct dentry; +-struct user_namespace; + + struct seq_file { + char *buf; +@@ -27,9 +24,7 @@ struct seq_file { + struct mutex lock; + const struct seq_operations *op; + int poll_event; +-#ifdef CONFIG_USER_NS +- struct user_namespace *user_ns; +-#endif ++ const struct file *file; + void *private; + }; + +@@ -147,7 +142,7 @@ int seq_release_private(struct inode *, struct file *); + static inline struct user_namespace *seq_user_ns(struct seq_file *seq) + { + #ifdef CONFIG_USER_NS +- return seq->user_ns; ++ return seq->file->f_cred->user_ns; + #else + extern struct user_namespace init_user_ns; + return &init_user_ns; +diff --git a/kernel/resource.c b/kernel/resource.c +index 249b1eb1e6e1..a4a94e700fb9 100644 +--- a/kernel/resource.c ++++ b/kernel/resource.c +@@ -105,16 +105,25 @@ static int r_show(struct seq_file *m, void *v) + { + struct resource *root = m->private; + struct resource *r = v, *p; ++ unsigned long long start, end; + int width = root->end < 0x10000 ? 4 : 8; + int depth; + + for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent) + if (p->parent == root) + break; ++ ++ if (file_ns_capable(m->file, &init_user_ns, CAP_SYS_ADMIN)) { ++ start = r->start; ++ end = r->end; ++ } else { ++ start = end = 0; ++ } ++ + seq_printf(m, "%*s%0*llx-%0*llx : %s\n", + depth * 2, "", +- width, (unsigned long long) r->start, +- width, (unsigned long long) r->end, ++ width, start, ++ width, end, + r->name ? r->name : ""); + return 0; + } +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index c436426a80dd..dece705b7f8c 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -5553,7 +5553,6 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) + + case CPU_UP_PREPARE: + rq->calc_load_update = calc_load_update; +- account_reset_rq(rq); + break; + + case CPU_ONLINE: +@@ -8253,11 +8252,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); +@@ -8632,6 +8640,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/kernel/sched/sched.h b/kernel/sched/sched.h +index 4e5db65d1aab..55d92a1ca070 100644 +--- a/kernel/sched/sched.h ++++ b/kernel/sched/sched.h +@@ -1770,16 +1770,3 @@ static inline u64 irq_time_read(int cpu) + } + #endif /* CONFIG_64BIT */ + #endif /* CONFIG_IRQ_TIME_ACCOUNTING */ +- +-static inline void account_reset_rq(struct rq *rq) +-{ +-#ifdef CONFIG_IRQ_TIME_ACCOUNTING +- rq->prev_irq_time = 0; +-#endif +-#ifdef CONFIG_PARAVIRT +- rq->prev_steal_time = 0; +-#endif +-#ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING +- rq->prev_steal_time_rq = 0; +-#endif +-} +diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c +index e20ae2d3c498..5e4199d5a388 100644 +--- a/net/8021q/vlan.c ++++ b/net/8021q/vlan.c +@@ -292,6 +292,10 @@ static void vlan_sync_address(struct net_device *dev, + if (ether_addr_equal(vlan->real_dev_addr, dev->dev_addr)) + return; + ++ /* vlan continues to inherit address of lower device */ ++ if (vlan_dev_inherit_address(vlandev, dev)) ++ goto out; ++ + /* vlan address was different from the old address and is equal to + * the new address */ + if (!ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) && +@@ -304,6 +308,7 @@ static void vlan_sync_address(struct net_device *dev, + !ether_addr_equal(vlandev->dev_addr, dev->dev_addr)) + dev_uc_add(dev, vlandev->dev_addr); + ++out: + ether_addr_copy(vlan->real_dev_addr, dev->dev_addr); + } + +diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h +index 9d010a09ab98..cc1557978066 100644 +--- a/net/8021q/vlan.h ++++ b/net/8021q/vlan.h +@@ -109,6 +109,8 @@ int vlan_check_real_dev(struct net_device *real_dev, + void vlan_setup(struct net_device *dev); + int register_vlan_dev(struct net_device *dev); + void unregister_vlan_dev(struct net_device *dev, struct list_head *head); ++bool vlan_dev_inherit_address(struct net_device *dev, ++ struct net_device *real_dev); + + static inline u32 vlan_get_ingress_priority(struct net_device *dev, + u16 vlan_tci) +diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c +index fded86508117..ca4dc9031073 100644 +--- a/net/8021q/vlan_dev.c ++++ b/net/8021q/vlan_dev.c +@@ -244,6 +244,17 @@ void vlan_dev_get_realdev_name(const struct net_device *dev, char *result) + strncpy(result, vlan_dev_priv(dev)->real_dev->name, 23); + } + ++bool vlan_dev_inherit_address(struct net_device *dev, ++ struct net_device *real_dev) ++{ ++ if (dev->addr_assign_type != NET_ADDR_STOLEN) ++ return false; ++ ++ ether_addr_copy(dev->dev_addr, real_dev->dev_addr); ++ call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); ++ return true; ++} ++ + static int vlan_dev_open(struct net_device *dev) + { + struct vlan_dev_priv *vlan = vlan_dev_priv(dev); +@@ -254,7 +265,8 @@ static int vlan_dev_open(struct net_device *dev) + !(vlan->flags & VLAN_FLAG_LOOSE_BINDING)) + return -ENETDOWN; + +- if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) { ++ if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr) && ++ !vlan_dev_inherit_address(dev, real_dev)) { + err = dev_uc_add(real_dev, dev->dev_addr); + if (err < 0) + goto out; +@@ -558,8 +570,10 @@ static int vlan_dev_init(struct net_device *dev) + /* ipv6 shared card related stuff */ + dev->dev_id = real_dev->dev_id; + +- if (is_zero_ether_addr(dev->dev_addr)) +- eth_hw_addr_inherit(dev, real_dev); ++ if (is_zero_ether_addr(dev->dev_addr)) { ++ ether_addr_copy(dev->dev_addr, real_dev->dev_addr); ++ dev->addr_assign_type = NET_ADDR_STOLEN; ++ } + if (is_zero_ether_addr(dev->broadcast)) + memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len); + +diff --git a/net/core/dev.c b/net/core/dev.c +index dc5d3d546150..4b0853194a03 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2550,9 +2550,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; + } + + /** +@@ -2571,11 +2572,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); +@@ -2590,7 +2592,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 7d339fc1057f..150b4923fb72 100644 +--- a/net/ipv6/ip6_output.c ++++ b/net/ipv6/ip6_output.c +@@ -1361,7 +1361,7 @@ emsgsize: + */ + + 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) && +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/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 8a0fdd870395..77055a362041 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1216,7 +1216,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; + struct net *net = sock_net(sk); +@@ -1225,8 +1225,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, + read_lock_bh(&net->xfrm.xfrm_policy_lock); + 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) { +@@ -2174,7 +2173,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) +@@ -2453,7 +2452,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/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c +index c1b87c5800b1..b3fddba4c084 100644 +--- a/sound/soc/codecs/nau8825.c ++++ b/sound/soc/codecs/nau8825.c +@@ -936,7 +936,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_FILTER_SW_MASK, 0x0000); +diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h +index dff8edb83bfd..a0b220726a63 100644 +--- a/sound/soc/codecs/nau8825.h ++++ b/sound/soc/codecs/nau8825.h +@@ -114,7 +114,8 @@ + #define NAU8825_FLL_INTEGER_MASK (0x3ff << 0) + + /* 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_FILTER_SW_MASK (0x1 << 14) +diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c +index a564759845f9..5a3f544bb3a8 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/soc-pcm.c b/sound/soc/soc-pcm.c +index 65b936e251ea..a1e605bbc465 100644 +--- a/sound/soc/soc-pcm.c ++++ b/sound/soc/soc-pcm.c +@@ -2073,9 +2073,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 be1f511e4f54..ae2981460cd8 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 929a32ba15f5..b67e006d56cc 100644 +--- a/tools/perf/Makefile.perf ++++ b/tools/perf/Makefile.perf +@@ -563,9 +563,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/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +index 67282a759496..eeeae0629ad3 100644 +--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c ++++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +@@ -110,6 +110,7 @@ struct intel_pt_decoder { + bool have_tma; + bool have_cyc; + bool fixup_last_mtc; ++ bool have_last_ip; + uint64_t pos; + uint64_t last_ip; + uint64_t ip; +@@ -145,8 +146,6 @@ struct intel_pt_decoder { + bool have_calc_cyc_to_tsc; + int exec_mode; + unsigned int insn_bytes; +- uint64_t sign_bit; +- uint64_t sign_bits; + uint64_t period; + enum intel_pt_period_type period_type; + uint64_t tot_insn_cnt; +@@ -214,9 +213,6 @@ struct intel_pt_decoder *intel_pt_decoder_new(struct intel_pt_params *params) + decoder->data = params->data; + decoder->return_compression = params->return_compression; + +- decoder->sign_bit = (uint64_t)1 << 47; +- decoder->sign_bits = ~(((uint64_t)1 << 48) - 1); +- + decoder->period = params->period; + decoder->period_type = params->period_type; + +@@ -385,21 +381,30 @@ int intel_pt__strerror(int code, char *buf, size_t buflen) + return 0; + } + +-static uint64_t intel_pt_calc_ip(struct intel_pt_decoder *decoder, +- const struct intel_pt_pkt *packet, ++static uint64_t intel_pt_calc_ip(const struct intel_pt_pkt *packet, + uint64_t last_ip) + { + uint64_t ip; + + switch (packet->count) { +- case 2: ++ case 1: + ip = (last_ip & (uint64_t)0xffffffffffff0000ULL) | + packet->payload; + break; +- case 4: ++ case 2: + ip = (last_ip & (uint64_t)0xffffffff00000000ULL) | + packet->payload; + break; ++ case 3: ++ ip = packet->payload; ++ /* Sign-extend 6-byte ip */ ++ if (ip & (uint64_t)0x800000000000ULL) ++ ip |= (uint64_t)0xffff000000000000ULL; ++ break; ++ case 4: ++ ip = (last_ip & (uint64_t)0xffff000000000000ULL) | ++ packet->payload; ++ break; + case 6: + ip = packet->payload; + break; +@@ -407,16 +412,13 @@ static uint64_t intel_pt_calc_ip(struct intel_pt_decoder *decoder, + return 0; + } + +- if (ip & decoder->sign_bit) +- return ip | decoder->sign_bits; +- + return ip; + } + + static inline void intel_pt_set_last_ip(struct intel_pt_decoder *decoder) + { +- decoder->last_ip = intel_pt_calc_ip(decoder, &decoder->packet, +- decoder->last_ip); ++ decoder->last_ip = intel_pt_calc_ip(&decoder->packet, decoder->last_ip); ++ decoder->have_last_ip = true; + } + + static inline void intel_pt_set_ip(struct intel_pt_decoder *decoder) +@@ -1436,7 +1438,8 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder) + + case INTEL_PT_FUP: + decoder->pge = true; +- intel_pt_set_last_ip(decoder); ++ if (decoder->packet.count) ++ intel_pt_set_last_ip(decoder); + break; + + case INTEL_PT_MODE_TSX: +@@ -1640,6 +1643,8 @@ next: + break; + + case INTEL_PT_PSB: ++ decoder->last_ip = 0; ++ decoder->have_last_ip = true; + intel_pt_clear_stack(&decoder->stack); + err = intel_pt_walk_psbend(decoder); + if (err == -EAGAIN) +@@ -1718,6 +1723,13 @@ next: + } + } + ++static inline bool intel_pt_have_ip(struct intel_pt_decoder *decoder) ++{ ++ return decoder->packet.count && ++ (decoder->have_last_ip || decoder->packet.count == 3 || ++ decoder->packet.count == 6); ++} ++ + /* Walk PSB+ packets to get in sync. */ + static int intel_pt_walk_psb(struct intel_pt_decoder *decoder) + { +@@ -1739,8 +1751,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder) + + case INTEL_PT_FUP: + decoder->pge = true; +- if (decoder->last_ip || decoder->packet.count == 6 || +- decoder->packet.count == 0) { ++ if (intel_pt_have_ip(decoder)) { + uint64_t current_ip = decoder->ip; + + intel_pt_set_ip(decoder); +@@ -1832,24 +1843,17 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder) + case INTEL_PT_TIP_PGE: + case INTEL_PT_TIP: + decoder->pge = decoder->packet.type != INTEL_PT_TIP_PGD; +- if (decoder->last_ip || decoder->packet.count == 6 || +- decoder->packet.count == 0) ++ if (intel_pt_have_ip(decoder)) + intel_pt_set_ip(decoder); + if (decoder->ip) + return 0; + break; + + case INTEL_PT_FUP: +- if (decoder->overflow) { +- if (decoder->last_ip || +- decoder->packet.count == 6 || +- decoder->packet.count == 0) +- intel_pt_set_ip(decoder); +- if (decoder->ip) +- return 0; +- } +- if (decoder->packet.count) +- intel_pt_set_last_ip(decoder); ++ if (intel_pt_have_ip(decoder)) ++ intel_pt_set_ip(decoder); ++ if (decoder->ip) ++ return 0; + break; + + case INTEL_PT_MTC: +@@ -1898,6 +1902,8 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder) + break; + + case INTEL_PT_PSB: ++ decoder->last_ip = 0; ++ decoder->have_last_ip = true; + intel_pt_clear_stack(&decoder->stack); + err = intel_pt_walk_psb(decoder); + if (err) +@@ -2034,6 +2040,7 @@ static int intel_pt_sync(struct intel_pt_decoder *decoder) + + decoder->pge = false; + decoder->continuous_period = false; ++ decoder->have_last_ip = false; + decoder->last_ip = 0; + decoder->ip = 0; + intel_pt_clear_stack(&decoder->stack); +@@ -2042,6 +2049,7 @@ static int intel_pt_sync(struct intel_pt_decoder *decoder) + if (err) + return err; + ++ decoder->have_last_ip = true; + decoder->pkt_state = INTEL_PT_STATE_NO_IP; + + err = intel_pt_walk_psb(decoder); +@@ -2084,6 +2092,7 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder) + err = intel_pt_sync(decoder); + break; + case INTEL_PT_STATE_NO_IP: ++ decoder->have_last_ip = false; + decoder->last_ip = 0; + decoder->ip = 0; + /* Fall through */ +diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c +index 9b2fce25162b..7528ae4f7e28 100644 +--- a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c ++++ b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c +@@ -293,36 +293,46 @@ static int intel_pt_get_ip(enum intel_pt_pkt_type type, unsigned int byte, + const unsigned char *buf, size_t len, + struct intel_pt_pkt *packet) + { +- switch (byte >> 5) { ++ int ip_len; ++ ++ packet->count = byte >> 5; ++ ++ switch (packet->count) { + case 0: +- packet->count = 0; ++ ip_len = 0; + break; + case 1: + if (len < 3) + return INTEL_PT_NEED_MORE_BYTES; +- packet->count = 2; ++ ip_len = 2; + packet->payload = le16_to_cpu(*(uint16_t *)(buf + 1)); + break; + case 2: + if (len < 5) + return INTEL_PT_NEED_MORE_BYTES; +- packet->count = 4; ++ ip_len = 4; + packet->payload = le32_to_cpu(*(uint32_t *)(buf + 1)); + break; + case 3: +- case 6: ++ case 4: + if (len < 7) + return INTEL_PT_NEED_MORE_BYTES; +- packet->count = 6; ++ ip_len = 6; + memcpy_le64(&packet->payload, buf + 1, 6); + break; ++ case 6: ++ if (len < 9) ++ return INTEL_PT_NEED_MORE_BYTES; ++ ip_len = 8; ++ packet->payload = le64_to_cpu(*(uint64_t *)(buf + 1)); ++ break; + default: + return INTEL_PT_BAD_PACKET; + } + + packet->type = type; + +- return packet->count + 1; ++ return ip_len + 1; + } + + static int intel_pt_get_mode(const unsigned char *buf, size_t len, +diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c +index 27ae382feb2d..7c97ecaeae48 100644 +--- a/tools/perf/util/symbol-elf.c ++++ b/tools/perf/util/symbol-elf.c +@@ -488,6 +488,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; + }