- Linux-stable-mirror - lists.linaro.org

[PATCH 4.14 000/183] 4.14.37-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.37 release. There are 183 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Fri Apr 27 10:32:04 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.37-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.37-rc1 Benjamin Beichler <benjamin.beichler(a)uni-rostock.de> mac80211_hwsim: fix use-after-free bug in hwsim_exit_net Sean Christopherson <sean.j.christopherson(a)intel.com> Revert "KVM: X86: Fix SMRAM accessing even if VM is shutdown" Leon Romanovsky <leonro(a)mellanox.com> RDMA/mlx5: Fix NULL dereference while accessing XRC_TGT QPs Jiri Olsa <jolsa(a)kernel.org> perf: Return proper values for user stack errors Jiri Olsa <jolsa(a)kernel.org> perf: Fix sample_max_stack maximum check Florian Westphal <fw(a)strlen.de> netfilter: x_tables: limit allocation requests for blob rule heads Florian Westphal <fw(a)strlen.de> netfilter: compat: reject huge allocation requests Florian Westphal <fw(a)strlen.de> netfilter: compat: prepare xt_compat_init_offsets to return errors Florian Westphal <fw(a)strlen.de> netfilter: x_tables: add counters allocation wrapper Florian Westphal <fw(a)strlen.de> netfilter: x_tables: cap allocations at 512 mbyte Thomas Gleixner <tglx(a)linutronix.de> alarmtimer: Init nanosleep alarm timer on stack Max Gurtovoy <maxg(a)mellanox.com> RDMA/core: Reduce poll batch for direct cq polling Mark Salter <msalter(a)redhat.com> irqchip/gic-v3: Change pr_debug message to pr_devel Michael Kelley <mhkelley(a)outlook.com> cpumask: Make for_each_cpu_wrap() available on UP as well Stephen Boyd <sboyd(a)codeaurora.org> irqchip/gic-v3: Ignore disabled ITS nodes Thomas Richter <tmricht(a)linux.vnet.ibm.com> perf test: Fix test trace+probe_libc_inet_pton.sh for s390x Nicholas Piggin <npiggin(a)gmail.com> powerpc/powernv: IMC fix out of bounds memory access at shutdown Will Deacon <will.deacon(a)arm.com> locking/qspinlock: Ensure node->count is updated before initialising node mike.travis(a)hpe.com <mike.travis(a)hpe.com> x86/platform/UV: Fix GAM Range Table entries less than 1GB Aneesh Kumar K.V <aneesh.kumar(a)linux.vnet.ibm.com> powerpc/mm/hash64: Zero PGD pages on allocation Jia Zhang <zhang.jia(a)linux.alibaba.com> vfs/proc/kcore, x86/mm/kcore: Fix SMAP fault when dumping vsyscall user page Tony Lindgren <tony(a)atomide.com> PM / wakeirq: Fix unbalanced IRQ enable for wakeirq Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI / EC: Restore polling during noirq suspend/resume phases Daniel Borkmann <daniel(a)iogearbox.net> bpf: fix rlimit in reuseport net selftest Niklas Cassel <niklas.cassel(a)axis.com> net: stmmac: discard disabled flags in interrupt status register Trond Myklebust <trond.myklebust(a)primarydata.com> SUNRPC: Don't call __UDPX_INC_STATS() from a preemptible context Paul Mackerras <paulus(a)ozlabs.org> KVM: PPC: Book3S HV: Fix handling of secondary HPTEG in HPT resizing code Jesper Dangaard Brouer <brouer(a)redhat.com> tools/libbpf: handle issues with bpf ELF objects containing .eh_frames Mathieu Malaterre <malat(a)debian.org> net: Extra '_get' in declaration of arch_get_platform_mac_address Chuck Lever <chuck.lever(a)oracle.com> svcrdma: Fix Read chunk round-up David Howells <dhowells(a)redhat.com> rxrpc: Don't put crypto buffers on the stack Steven Rostedt (VMware) <rostedt(a)goodmis.org> selftests/ftrace: Add some missing glob checks Chen Yu <yu.c.chen(a)intel.com> cpufreq: intel_pstate: Enable HWP during system resume on CPU0 Tang Junhui <tang.junhui(a)zte.com.cn> bcache: return attach error when no cache set exist Tang Junhui <tang.junhui(a)zte.com.cn> bcache: fix for data collapse after re-attaching an attached device Tang Junhui <tang.junhui(a)zte.com.cn> bcache: fix for allocator and register thread race Coly Li <colyli(a)suse.de> bcache: properly set task state in bch_writeback_thread() Arnd Bergmann <arnd(a)arndb.de> cifs: silence compiler warnings showing up with gcc-8.0.0 Ulf Hansson <ulf.hansson(a)linaro.org> PM / domains: Fix up domain-idle-states OF parsing Alexey Dobriyan <adobriyan(a)gmail.com> proc: fix /proc/*/map_files lookup Will Deacon <will.deacon(a)arm.com> arm64: spinlock: Fix theoretical trylock() A-B-A with LSE atomics Guanglei Li <guanglei.li(a)oracle.com> RDS: IB: Fix null pointer issue John Fastabend <john.fastabend(a)gmail.com> bpf: sockmap, fix leaking maps with attached but not detached progs Ross Lagerwall <ross.lagerwall(a)citrix.com> xen/grant-table: Use put_page instead of free_page Ross Lagerwall <ross.lagerwall(a)citrix.com> xen-netfront: Fix race between device setup and open Jiri Olsa <jolsa(a)kernel.org> perf evsel: Fix period/freq terms setup Matt Redfearn <matt.redfearn(a)mips.com> MIPS: Generic: Support GIC in EIC mode Jiri Olsa <jolsa(a)kernel.org> perf record: Fix period option handling Matt Redfearn <matt.redfearn(a)mips.com> MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS James Hogan <jhogan(a)kernel.org> MIPS: generic: Fix machine compatible matching Yonghong Song <yhs(a)fb.com> bpf: fix selftests/bpf test_kmod.sh failure when CONFIG_BPF_JIT_ALWAYS_ON=y Hans de Goede <hdegoede(a)redhat.com> ACPI / scan: Use acpi_bus_get_status() to initialize ACPI_TYPE_DEVICE devs Hans de Goede <hdegoede(a)redhat.com> ACPI / bus: Do not call _STA on battery devices with unmet dependencies Chen Yu <yu.c.chen(a)intel.com> ACPI: processor_perflib: Do not send _PPC change notification if not ready Jean Delvare <jdelvare(a)suse.de> firmware: dmi_scan: Fix handling of empty DMI strings Arnd Bergmann <arnd(a)arndb.de> x86/dumpstack: Avoid uninitlized variable Arnd Bergmann <arnd(a)arndb.de> x86/power: Fix swsusp_arch_resume prototype Subash Abhinov Kasiviswanathan <subashab(a)codeaurora.org> netfilter: ipv6: nf_defrag: Kill frag queue on RFC2460 failure Sebastian Ott <sebott(a)linux.vnet.ibm.com> s390/eadm: fix CONFIG_BLOCK include dependency Karol Herbst <kherbst(a)redhat.com> drm/nouveau/pmu/fuc: don't use movw directly anymore Don Hiatt <don.hiatt(a)intel.com> IB/core: Map iWarp AH type to undefined in rdma_ah_find_type Alex Estrin <alex.estrin(a)intel.com> IB/ipoib: Fix for potential no-carrier state Alex Estrin <alex.estrin(a)intel.com> IB/hfi1: Fix for potential refcount leak in hfi1_open_file() Michael J. Ruhl <michael.j.ruhl(a)intel.com> IB/hfi1: Re-order IRQ cleanup to address driver cleanup race Jens Axboe <axboe(a)kernel.dk> blk-mq: fix discard merge with scheduler attached Ed Swierk <eswierk(a)skyportsystems.com> openvswitch: Remove padding from packet before L3+ conntrack processing shidao.ytt <shidao.ytt(a)alibaba-inc.com> mm/fadvise: discard partial page if endbyte is also EOF Mel Gorman <mgorman(a)techsingularity.net> mm: pin address_space before dereferencing it while isolating an LRU page Yang Shi <yang.s(a)alibaba-inc.com> mm: thp: use down_read_trylock() in khugepaged to avoid long block Nitin Gupta <nitin.m.gupta(a)oracle.com> sparc64: update pmdp_invalidate() to return old pmd value Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> asm-generic: provide generic_pmdp_establish() Yisheng Xie <xieyisheng1(a)huawei.com> mm/mempolicy: add nodes_empty check in SYSC_migrate_pages Yisheng Xie <xieyisheng1(a)huawei.com> mm/mempolicy: fix the check of nodemask from user piaojun <piaojun(a)huawei.com> ocfs2: return error when we attempt to access a dirty bh in jbd2 piaojun <piaojun(a)huawei.com> ocfs2/acl: use 'ip_xattr_sem' to protect getting extended attribute piaojun <piaojun(a)huawei.com> ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid Jan H. Schönherr <jschoenh(a)amazon.de> fs/dax.c: release PMD lock even when there is no PMD support in DAX Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested KarimAllah Ahmed <karahmed(a)amazon.de> kvm: Map PFN-type memory regions as writable (if possible) Gustavo A. R. Silva <gustavo(a)embeddedor.com> tcp_nv: fix potential integer overflow in tcpnv_acked Dmitry Vyukov <dvyukov(a)google.com> netfilter: x_tables: fix pointer leaks to userspace Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/hyperv: Check for required priviliges in hyperv_init() Andy Spencer <aspencer(a)spacex.com> gianfar: prevent integer wrapping in the rx handler Logan Gunthorpe <logang(a)deltatee.com> ntb_transport: Fix bug with max_mw_size parameter Leon Romanovsky <leonro(a)mellanox.com> RDMA/mlx5: Avoid memory leak in case of XRCD dealloc failure Michael Bringmann <mwb(a)linux.vnet.ibm.com> powerpc/numa: Ensure nodes initialized for hotplug Michael Bringmann <mwb(a)linux.vnet.ibm.com> powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes Mickaël Salaün <mic(a)digikod.net> samples/bpf: Partially fixes the bpf.o build Jacob Keller <jacob.e.keller(a)intel.com> i40e: fix reported mask for ntuple filters Jacob Keller <jacob.e.keller(a)intel.com> i40e: program fragmented IPv4 filter input set Emil Tantilov <emil.s.tantilov(a)intel.com> ixgbe: don't set RXDCTL.RLPML for 82599 Jake Daryll Obina <jake.obina(a)gmail.com> jffs2: Fix use-after-free bug in jffs2_iget()'s error handling path Jason Gunthorpe <jgg(a)mellanox.com> RDMA/uverbs: Use an unambiguous errno for method not supported Corentin LABBE <clabbe.montjoie(a)gmail.com> crypto: artpec6 - remove select on non-existing CRYPTO_SHA384 Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> device property: Define type of PROPERTY_ENRTY_*() macros Aaron Sierra <asierra(a)xes-inc.com> tty: serial: exar: Relocate sleep wake-up handling Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/hyperv: Stop suppressing X86_FEATURE_PCID Ngai-Mint Kwan <ngai-mint.kwan(a)intel.com> fm10k: fix "failed to kill vid" message for VF Daniel Hua <daniel.hua(a)ni.com> igb: Clear TXSTMP when ptp_tx_work() is timeout Corinna Vinschen <vinschen(a)redhat.com> igb: Allow to remove administratively set MAC on VFs Jeffy Chen <jeffy.chen(a)rock-chips.com> ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink Eryu Guan <eguan(a)redhat.com> blk-mq-debugfs: don't allow write on attributes with seq_operations set David Hildenbrand <david(a)redhat.com> KVM: s390: vsie: use READ_ONCE to access some SCB fields David Herrmann <dh.herrmann(a)gmail.com> platform/x86: thinkpad_acpi: suppress warning about palm detection Alan Brady <alan.brady(a)intel.com> i40evf: ignore link up if not running Avinash Dayanand <avinash.dayanand(a)intel.com> i40evf: Don't schedule reset_task when device is being removed Prashant Bhole <bhole_prashant_q7(a)lab.ntt.co.jp> bpf: test_maps: cleanup sockmaps when test ends Goldwyn Rodrigues <rgoldwyn(a)suse.com> block: Set BIO_TRACE_COMPLETION on new bio during split Wei Yongjun <weiyongjun1(a)huawei.com> nfp: fix error return code in nfp_pci_probe() Dan Carpenter <dan.carpenter(a)oracle.com> HID: roccat: prevent an out of bounds read in kovaplus_profile_activated() Andi Shyti <andi.shyti(a)samsung.com> Input: stmfts - set IRQ_NOAUTOEN to the irq flag Arnd Bergmann <arnd(a)arndb.de> scsi: fas216: fix sense buffer initialization Xose Vazquez Perez <xose.vazquez(a)gmail.com> scsi: devinfo: fix format of the device list Sheng Yong <shengyong1(a)huawei.com> f2fs: avoid hungtask when GC encrypted block if io_bits is set Parav Pandit <parav(a)mellanox.com> RDMA/cma: Check existence of netdevice during port validation Liu Bo <bo.li.liu(a)oracle.com> Btrfs: raid56: fix race between merge_bio and rbio_orig_end_io Liu Bo <bo.li.liu(a)oracle.com> Btrfs: fix unexpected EEXIST from btrfs_get_extent Anand Jain <Anand.Jain(a)oracle.com> btrfs: fail mount when sb flag is not in BTRFS_SUPER_FLAG_SUPP Liu Bo <bo.li.liu(a)oracle.com> Btrfs: fix scrub to repair raid6 corruption Nikolay Borisov <nborisov(a)suse.com> btrfs: Fix out of bounds access in btrfs_search_slot Liu Bo <bo.li.liu(a)oracle.com> Btrfs: set plug for fsync Wei Yongjun <weiyongjun1(a)huawei.com> ipmi/powernv: Fix error return code in ipmi_powernv_probe() weiyongjun (A) <weiyongjun1(a)huawei.com> mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl() Ulf Magnusson <ulfalizer(a)gmail.com> kconfig: Fix expr_free() E_NOT leak Ulf Magnusson <ulfalizer(a)gmail.com> kconfig: Fix automatic menu creation mem leak Ulf Magnusson <ulfalizer(a)gmail.com> kconfig: Don't leak main menus during parsing Guenter Roeck <linux(a)roeck-us.net> watchdog: sp5100_tco: Fix watchdog disable bit Niklas Cassel <niklas.cassel(a)axis.com> PCI: Add dummy pci_irqd_intx_xlate() for CONFIG_PCI=n build James Hogan <jhogan(a)kernel.org> MIPS: Fix clean of vmlinuz.{32,ecoff,bin,srec} Jan Chochol <jan(a)chochol.info> nfs: Do not convert nfs_idmap_cache_timeout to jiffies Sagi Grimberg <sagi(a)grimberg.me> IB/cq: Don't force IB_POLL_DIRECT poll context for ib_process_cq_direct Maxime Chevallier <maxime.chevallier(a)smile.fr> spi: a3700: Clear DATA_OUT when performing a read Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: stmmac: dwmac-meson8b: propagate rate changes to the parent clock Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: stmmac: dwmac-meson8b: fix setting the RGMII TX clock on Meson8b Geert Uytterhoeven <geert(a)linux-m68k.org> ubifs: Fix uninitialized variable in search_dh_cookie() Ming Lei <ming.lei(a)redhat.com> blk-mq: turn WARN_ON in __blk_mq_run_hw_queue into printk Ming Lei <ming.lei(a)redhat.com> dm mpath: return DM_MAPIO_REQUEUE on blk-mq rq allocation failure mulhern <amulhern(a)redhat.com> dm thin: fix documentation relative to low water mark threshold Peter Xu <peterx(a)redhat.com> iommu/vt-d: Use domain instead of cache fetching Nicholas Piggin <npiggin(a)gmail.com> powerpc: System reset avoid interleaving oops using die synchronisation Robin Murphy <robin.murphy(a)arm.com> iommu/exynos: Don't unconditionally steal bus ops Thomas Richter <tmricht(a)linux.vnet.ibm.com> perf record: Fix failed memory allocation for get_cpuid_str Steven Rostedt (VMware) <rostedt(a)goodmis.org> tools lib traceevent: Fix get_field_str() for dynamic strings Arnaldo Carvalho de Melo <acme(a)redhat.com> perf callchain: Fix attr.sample_max_stack setting Steven Rostedt (VMware) <rostedt(a)goodmis.org> tools lib traceevent: Simplify pointer print logic and fix %pF Arnaldo Carvalho de Melo <acme(a)redhat.com> perf unwind: Do not look just at the global callchain_param.record_mode himanshu.madhani(a)cavium.com <himanshu.madhani(a)cavium.com> scsi: qla2xxx: Fix warning in qla2x00_async_iocb_timeout() Shiraz Saleem <shiraz.saleem(a)intel.com> i40iw: Zero-out consumer key on allocate stag for FMR Mustafa Ismail <mustafa.ismail(a)intel.com> i40iw: Free IEQ resources Peter Hutterer <peter.hutterer(a)who-t.net> Input: synaptics - reset the ABS_X/Y fuzz after initializing MT axes Jesper Dangaard Brouer <brouer(a)redhat.com> libbpf: Makefile set specified permission mode Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: psmouse - fix Synaptics detection when protocol is disabled Alex Williamson <alex.williamson(a)redhat.com> PCI: Add function 1 DMA alias quirk for Marvell 9128 Masami Hiramatsu <mhiramat(a)kernel.org> selftest: ftrace: Fix to pick text symbols for kprobes Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Fix backchannel allocation of extra rpcrdma_reps Hans de Goede <hdegoede(a)redhat.com> platform/x86: dell-laptop: Filter out spurious keyboard backlight change events Christian Borntraeger <borntraeger(a)de.ibm.com> KVM: s390: use created_vcpus in more places Anna-Maria Gleixner <anna-maria(a)linutronix.de> tracing/hrtimer: Fix tracing bugs by taking all clock bases and modes into account Subash Abhinov Kasiviswanathan <subashab(a)codeaurora.org> netfilter: ipv6: nf_defrag: Pass on packets to stack per RFC2460 Paul Mackerras <paulus(a)ozlabs.org> KVM: PPC: Book3S HV: Enable migration of decrementer register Parav Pandit <parav(a)mellanox.com> RDMA/core: Clarify rdma_ah_find_type Paolo Bonzini <pbonzini(a)redhat.com> kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl Dan Carpenter <dan.carpenter(a)oracle.com> ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read() Takashi Iwai <tiwai(a)suse.de> ALSA: hda - Use IS_REACHABLE() for dependency on input Hans de Goede <hdegoede(a)redhat.com> ACPI / LPSS: Do not instiate platform_dev for devs without MMIO resources NeilBrown <neilb(a)suse.com> NFSv4: always set NFS_LOCK_LOST when a lock is lost. Peter Zijlstra <peterz(a)infradead.org> x86/tsc: Allow TSC calibration without PIT Hector Martin <marcan(a)marcan.st> firewire-ohci: work around oversized DMA reads on JMicron controllers Michael Neuling <mikey(a)neuling.org> powerpc/eeh: Fix race with driver un/bind Merlijn Wajer <merlijn(a)wizzup.org> usb: musb: Fix external abort in musb_remove on omap2430 Merlijn Wajer <merlijn(a)wizzup.org> usb: musb: call pm_runtime_{get,put}_sync before reading vbus registers Andreas Kemnade <andreas(a)kemnade.info> usb: musb: fix enumeration after resume Imre Deak <imre.deak(a)intel.com> drm/i915/bxt, glk: Increase PCODE timeouts during CDCLK freq changing Imre Deak <imre.deak(a)intel.com> drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state Xidong Wang <wangxidong_97(a)163.com> drm/i915: Do no use kfree() to free a kmem_cache_alloc() return value Gaurav K Singh <gaurav.k.singh(a)intel.com> drm/i915/audio: Fix audio detection issue on GLK Gerd Hoffmann <kraxel(a)redhat.com> drm/i915/gvt: throw error on unhandled vfio ioctls Daniel J Blueman <daniel(a)quora.org> drm/vc4: Fix memory leak during BO teardown Xiaoming Gao <gxm.linux.kernel(a)gmail.com> x86/tsc: Prevent 32bit truncation in calc_hpet_ref() Anson Huang <Anson.Huang(a)nxp.com> clocksource/imx-tpm: Correct -ETIME return condition check Dou Liyang <douly.fnst(a)cn.fujitsu.com> x86/acpi: Prevent X2APIC id 0xffffffff from being accounted David Sterba <dsterba(a)suse.com> btrfs: fix unaligned access in readdir Steve French <smfrench(a)gmail.com> cifs: do not allow creating sockets except with SMB1 posix exensions ------------- Diffstat: Documentation/device-mapper/thin-provisioning.txt | 8 +- Documentation/virtual/kvm/api.txt | 1 + Makefile | 4 +- arch/arm64/include/asm/spinlock.h | 4 +- arch/mips/boot/compressed/Makefile | 6 +- arch/mips/generic/irq.c | 18 +- arch/mips/include/asm/machine.h | 2 +- arch/mips/txx9/rbtx4939/setup.c | 4 +- arch/powerpc/include/asm/book3s/64/pgalloc.h | 10 +- arch/powerpc/include/uapi/asm/kvm.h | 2 + arch/powerpc/kernel/eeh_driver.c | 65 +- arch/powerpc/kernel/traps.c | 2 +- arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 +- arch/powerpc/kvm/book3s_hv.c | 8 + arch/powerpc/kvm/powerpc.c | 2 +- arch/powerpc/mm/numa.c | 78 +- arch/powerpc/platforms/powernv/opal-imc.c | 6 +- arch/s390/include/asm/eadm.h | 2 +- arch/s390/kvm/kvm-s390.c | 4 +- arch/s390/kvm/vsie.c | 50 +- arch/sparc/include/asm/pgtable_64.h | 2 +- arch/sparc/mm/tlb.c | 23 +- arch/x86/hyperv/hv_init.c | 9 +- arch/x86/hyperv/mmu.c | 12 +- arch/x86/include/asm/i8259.h | 5 + arch/x86/kernel/acpi/boot.c | 4 + arch/x86/kernel/apic/x2apic_uv_x.c | 15 +- arch/x86/kernel/dumpstack.c | 2 +- arch/x86/kernel/tsc.c | 20 +- arch/x86/kvm/mmu.c | 2 +- arch/x86/kvm/vmx.c | 16 +- arch/x86/kvm/x86.c | 10 +- arch/x86/mm/init_64.c | 3 +- arch/x86/power/hibernate_32.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- block/bio.c | 2 +- block/blk-core.c | 2 + block/blk-merge.c | 29 +- block/blk-mq-debugfs.c | 6 +- block/blk-mq.c | 22 +- drivers/acpi/acpi_lpss.c | 2 + drivers/acpi/bus.c | 6 + drivers/acpi/ec.c | 6 + drivers/acpi/processor_perflib.c | 2 +- drivers/acpi/scan.c | 20 +- drivers/base/power/domain.c | 76 +- drivers/base/power/wakeirq.c | 6 +- drivers/char/ipmi/ipmi_powernv.c | 5 +- drivers/clocksource/timer-imx-tpm.c | 2 +- drivers/cpufreq/intel_pstate.c | 5 + drivers/crypto/Kconfig | 1 - drivers/firewire/ohci.c | 8 +- drivers/firmware/dmi_scan.c | 22 +- drivers/gpu/drm/drm_dp_dual_mode_helper.c | 39 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_cdclk.c | 22 +- drivers/gpu/drm/i915/intel_pm.c | 6 +- .../drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h | 746 +++++++-------- .../drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h | 802 ++++++++-------- .../drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h | 1006 ++++++++++---------- .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/memx.fuc | 30 +- drivers/gpu/drm/vc4/vc4_bo.c | 2 + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 + drivers/hid/hid-roccat-kovaplus.c | 2 + drivers/infiniband/core/cma.c | 8 +- drivers/infiniband/core/cq.c | 30 +- drivers/infiniband/core/uverbs_ioctl.c | 19 +- drivers/infiniband/hw/hfi1/chip.c | 18 +- drivers/infiniband/hw/hfi1/file_ops.c | 4 +- drivers/infiniband/hw/hfi1/hfi.h | 1 + drivers/infiniband/hw/hfi1/init.c | 4 +- drivers/infiniband/hw/i40iw/i40iw_puda.c | 3 +- drivers/infiniband/hw/i40iw/i40iw_puda.h | 1 + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 + drivers/infiniband/hw/mlx5/qp.c | 8 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 + drivers/input/mouse/psmouse-base.c | 34 +- drivers/input/mouse/synaptics.c | 10 + drivers/input/touchscreen/stmfts.c | 11 +- drivers/iommu/exynos-iommu.c | 7 + drivers/iommu/intel-iommu.c | 3 +- drivers/irqchip/irq-gic-v3-its-pci-msi.c | 2 + drivers/irqchip/irq-gic-v3-its-platform-msi.c | 2 + drivers/irqchip/irq-gic-v3-its.c | 2 + drivers/irqchip/irq-gic-v3.c | 2 +- drivers/md/bcache/alloc.c | 4 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/btree.c | 9 +- drivers/md/bcache/super.c | 23 +- drivers/md/bcache/sysfs.c | 11 +- drivers/md/bcache/writeback.c | 7 +- drivers/md/dm-mpath.c | 14 +- drivers/net/ethernet/freescale/gianfar.c | 9 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 14 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 + drivers/net/ethernet/intel/i40evf/i40evf.h | 1 + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 +- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 35 +- drivers/net/ethernet/intel/igb/igb_main.c | 42 +- drivers/net/ethernet/intel/igb/igb_ptp.c | 9 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +- drivers/net/ethernet/netronome/nfp/nfp_main.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 6 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 6 +- drivers/net/wireless/mac80211_hwsim.c | 11 +- drivers/net/xen-netfront.c | 46 +- drivers/ntb/ntb_transport.c | 3 + drivers/pci/quirks.c | 2 + drivers/platform/x86/dell-laptop.c | 24 +- drivers/platform/x86/thinkpad_acpi.c | 10 + drivers/scsi/arm/fas216.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 4 + drivers/scsi/scsi_devinfo.c | 7 +- drivers/spi/spi-armada-3700.c | 5 + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 2 + drivers/tty/serial/8250/8250_exar.c | 34 +- drivers/tty/serial/8250/8250_port.c | 26 - drivers/usb/musb/musb_core.c | 7 +- drivers/watchdog/sp5100_tco.h | 2 +- drivers/xen/grant-table.c | 4 +- fs/btrfs/ctree.c | 12 +- fs/btrfs/disk-io.c | 6 +- fs/btrfs/file.c | 9 + fs/btrfs/inode.c | 37 +- fs/btrfs/raid56.c | 55 +- fs/btrfs/volumes.c | 9 +- fs/cifs/cifssmb.c | 4 +- fs/cifs/dir.c | 9 +- fs/dax.c | 2 +- fs/f2fs/gc.c | 7 +- fs/jffs2/fs.c | 1 - fs/nfs/nfs4proc.c | 12 +- fs/nfs/nfs4state.c | 5 +- fs/nfs/nfs4sysctl.c | 2 +- fs/ocfs2/acl.c | 6 + fs/ocfs2/journal.c | 23 +- fs/ocfs2/super.c | 5 +- fs/ocfs2/xattr.c | 2 + fs/proc/base.c | 29 +- fs/proc/kcore.c | 4 + fs/ubifs/tnc.c | 21 +- include/asm-generic/pgtable.h | 15 + include/linux/cpumask.h | 2 + include/linux/etherdevice.h | 2 +- include/linux/kcore.h | 1 + include/linux/netfilter/x_tables.h | 3 +- include/linux/pci.h | 7 + include/linux/property.h | 10 +- include/linux/suspend.h | 2 + include/rdma/ib_verbs.h | 23 +- include/trace/events/timer.h | 20 +- kernel/bpf/sockmap.c | 19 +- kernel/events/callchain.c | 21 +- kernel/events/core.c | 4 +- kernel/locking/qspinlock.c | 8 + kernel/power/power.h | 3 - kernel/time/alarmtimer.c | 34 +- lib/test_bpf.c | 31 +- mm/fadvise.c | 10 +- mm/khugepaged.c | 12 +- mm/mempolicy.c | 33 +- mm/vmscan.c | 14 +- net/bridge/netfilter/ebtables.c | 10 +- net/ipv4/netfilter/arp_tables.c | 12 +- net/ipv4/netfilter/ip_tables.c | 10 +- net/ipv4/tcp_nv.c | 2 +- net/ipv6/netfilter/ip6_tables.c | 12 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 16 +- net/netfilter/x_tables.c | 51 +- net/netfilter/xt_IDLETIMER.c | 1 + net/netfilter/xt_LED.c | 1 + net/netfilter/xt_limit.c | 3 +- net/netfilter/xt_nfacct.c | 1 + net/netfilter/xt_statistic.c | 1 + net/openvswitch/conntrack.c | 34 + net/rds/ib.c | 3 +- net/rxrpc/conn_event.c | 1 + net/rxrpc/rxkad.c | 92 +- net/sunrpc/xprtrdma/backchannel.c | 12 +- net/sunrpc/xprtrdma/svc_rdma_rw.c | 12 +- net/sunrpc/xprtrdma/verbs.c | 32 +- net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- net/sunrpc/xprtsock.c | 4 +- samples/bpf/Makefile | 5 +- scripts/kconfig/expr.c | 2 +- scripts/kconfig/menu.c | 1 + scripts/kconfig/zconf.y | 33 +- sound/pci/hda/Kconfig | 1 - sound/pci/hda/patch_realtek.c | 5 + sound/soc/au1x/ac97c.c | 6 +- sound/soc/rockchip/rk3399_gru_sound.c | 19 +- tools/lib/bpf/Makefile | 2 +- tools/lib/bpf/libbpf.c | 26 + tools/lib/traceevent/event-parse.c | 17 +- tools/lib/traceevent/parse-filter.c | 10 +- tools/perf/arch/x86/util/header.c | 2 +- tools/perf/builtin-c2c.c | 5 +- tools/perf/builtin-record.c | 3 +- tools/perf/builtin-report.c | 5 +- tools/perf/builtin-script.c | 5 +- tools/perf/perf.h | 1 + tools/perf/tests/dwarf-unwind.c | 1 + .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 21 +- tools/perf/util/callchain.c | 10 + tools/perf/util/callchain.h | 2 + tools/perf/util/evsel.c | 21 +- tools/perf/util/unwind-libunwind-local.c | 9 +- tools/testing/selftests/bpf/test_maps.c | 16 +- .../ftrace/test.d/ftrace/func-filter-glob.tc | 6 + .../ftrace/test.d/kprobe/multiple_kprobes.tc | 4 +- tools/testing/selftests/net/reuseport_bpf.c | 21 +- virt/kvm/kvm_main.c | 7 +- 216 files changed, 3025 insertions(+), 1982 deletions(-)

7 years, 7 months

5
174
0 0

[PATCH 4.16 00/26] 4.16.5-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.16.5 release. There are 26 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Fri Apr 27 10:33:04 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.5-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.16.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.16.5-rc1 Sean Christopherson <sean.j.christopherson(a)intel.com> Revert "KVM: X86: Fix SMRAM accessing even if VM is shutdown" Leon Romanovsky <leonro(a)mellanox.com> RDMA/mlx5: Fix NULL dereference while accessing XRC_TGT QPs Jiri Olsa <jolsa(a)kernel.org> perf: Return proper values for user stack errors Jiri Olsa <jolsa(a)kernel.org> perf: Fix sample_max_stack maximum check Florian Westphal <fw(a)strlen.de> netfilter: x_tables: limit allocation requests for blob rule heads Florian Westphal <fw(a)strlen.de> netfilter: compat: reject huge allocation requests Florian Westphal <fw(a)strlen.de> netfilter: compat: prepare xt_compat_init_offsets to return errors Florian Westphal <fw(a)strlen.de> netfilter: x_tables: add counters allocation wrapper Florian Westphal <fw(a)strlen.de> netfilter: x_tables: cap allocations at 512 mbyte Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> mm,vmscan: Allow preallocating memory for register_shrinker(). Thomas Gleixner <tglx(a)linutronix.de> alarmtimer: Init nanosleep alarm timer on stack Imre Deak <imre.deak(a)intel.com> drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state Xidong Wang <wangxidong_97(a)163.com> drm/i915: Do no use kfree() to free a kmem_cache_alloc() return value Gaurav K Singh <gaurav.k.singh(a)intel.com> drm/i915/audio: Fix audio detection issue on GLK Jani Nikula <jani.nikula(a)intel.com> drm/i915/bios: filter out invalid DDC pins from VBT child devices Tina Zhang <tina.zhang(a)intel.com> drm/i915/gvt: Add drm_format_mod update Gerd Hoffmann <kraxel(a)redhat.com> drm/i915/gvt: throw error on unhandled vfio ioctls Daniel J Blueman <daniel(a)quora.org> drm/vc4: Fix memory leak during BO teardown Xiaoming Gao <gxm.linux.kernel(a)gmail.com> x86/tsc: Prevent 32bit truncation in calc_hpet_ref() Laura Abbott <labbott(a)redhat.com> posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated Anson Huang <Anson.Huang(a)nxp.com> clocksource/imx-tpm: Correct -ETIME return condition check Dou Liyang <douly.fnst(a)cn.fujitsu.com> x86/acpi: Prevent X2APIC id 0xffffffff from being accounted Nikolay Borisov <nborisov(a)suse.com> btrfs: Fix race condition between delayed refs and blockgroup removal David Sterba <dsterba(a)suse.com> btrfs: fix unaligned access in readdir Steve French <smfrench(a)gmail.com> cifs: do not allow creating sockets except with SMB1 posix exensions Long Li <longli(a)microsoft.com> cifs: smbd: Check for iov length on sending the last iov ------------- Diffstat: Makefile | 4 +-- arch/x86/kernel/acpi/boot.c | 4 +++ arch/x86/kernel/tsc.c | 2 +- arch/x86/kvm/mmu.c | 2 +- drivers/clocksource/timer-imx-tpm.c | 2 +- drivers/gpu/drm/drm_dp_dual_mode_helper.c | 39 +++++++++++++++++++---- drivers/gpu/drm/i915/gvt/dmabuf.c | 1 + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_bios.c | 13 +++++--- drivers/gpu/drm/vc4/vc4_bo.c | 2 ++ drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 + drivers/infiniband/hw/mlx5/qp.c | 3 +- fs/btrfs/delayed-ref.c | 19 ++++++++--- fs/btrfs/delayed-ref.h | 1 + fs/btrfs/extent-tree.c | 16 +++++++--- fs/btrfs/inode.c | 20 +++++++----- fs/cifs/dir.c | 9 +++--- fs/cifs/smbdirect.c | 2 ++ fs/super.c | 9 +++--- include/linux/netfilter/x_tables.h | 3 +- include/linux/shrinker.h | 7 ++-- kernel/events/callchain.c | 21 ++++++------ kernel/events/core.c | 4 +-- kernel/time/alarmtimer.c | 34 +++++++++++++++----- kernel/time/posix-cpu-timers.c | 4 ++- mm/vmscan.c | 21 +++++++++++- net/bridge/netfilter/ebtables.c | 10 ++++-- net/ipv4/netfilter/arp_tables.c | 12 ++++--- net/ipv4/netfilter/ip_tables.c | 10 ++++-- net/ipv6/netfilter/ip6_tables.c | 12 ++++--- net/netfilter/x_tables.c | 51 ++++++++++++++++++++++++------ 33 files changed, 250 insertions(+), 94 deletions(-)

7 years, 7 months

4
29
0 0

[PATCH] x86/spectre_v2: Don't check microcode versions when running under hypervisors

by Yi Sun

From: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> commit 36268223c1e9981d6cfc33aff8520b3bde4b8114 upstream. As: 1) It's known that hypervisors lie about the environment anyhow (host mismatch) 2) Even if the hypervisor (Xen, KVM, VMWare, etc) provided a valid "correct" value, it all gets to be very murky when migration happens (do you provide the "new" microcode of the machine?). And in reality the cloud vendors are the ones that should make sure that the microcode that is running is correct and we should just sing lalalala and trust them. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Reviewed-by: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Wanpeng Li <kernellwp(a)gmail.com> Cc: kvm <kvm(a)vger.kernel.org> Cc: Krčmář <rkrcmar(a)redhat.com> Cc: Borislav Petkov <bp(a)alien8.de> CC: "H. Peter Anvin" <hpa(a)zytor.com> CC: stable(a)vger.kernel.org Link: https://lkml.kernel.org/r/20180226213019.GE9497@char.us.oracle.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> [Yi Sun: cherry pick to 4.4] Signed-off-by: Yi Sun <yi.y.sun(a)linux.intel.com> --- arch/x86/kernel/cpu/intel.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index af28610..221c030 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -71,6 +71,13 @@ static bool bad_spectre_microcode(struct cpuinfo_x86 *c) { int i; + /* + * We know that the hypervisor lie to us on the microcode version so + * we may as well hope that it is running the correct version. + */ + if (cpu_has(c, X86_FEATURE_HYPERVISOR)) + return false; + for (i = 0; i < ARRAY_SIZE(spectre_bad_microcodes); i++) { if (c->x86_model == spectre_bad_microcodes[i].model && c->x86_mask == spectre_bad_microcodes[i].stepping) -- 1.9.1

7 years, 7 months

1
1
0 0

[PATCH v2] input/touchscreen: atmel_mxt_ts: Add correct touchpad button mapping for the Caroline Chromebook.

by Vittorio Gambaletta (VittGam)

This patch adds the correct platform data information for the Caroline Chromebook, so that the mouse button does not get stuck in pressed state after the first click. The Samus button keymap and platform data definition are the correct ones for Caroline, so they have been reused here. v2: updated patch offset after 20180409 changes. Cc: stable(a)vger.kernel.org Signed-off-by: Vittorio Gambaletta <linuxbugs(a)vittgam.net> Signed-off-by: Salvatore Bellizzi <lkml(a)seppia.net> --- --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3035,6 +3035,15 @@ .driver_data = samus_platform_data, }, { + /* Samsung Chromebook Pro */ + .ident = "Samsung Chromebook Pro", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), + DMI_MATCH(DMI_PRODUCT_NAME, "Caroline"), + }, + .driver_data = samus_platform_data, + }, + { /* Other Google Chromebooks */ .ident = "Chromebook", .matches = {

7 years, 7 months

2
3
0 0

Re: Linux messages full of `random: get_random_u32 called from`

by Theodore Y. Ts'o

> Hi, > > I've just booted Linux 4.16.4 and I am getting approximately 1900 > `random: get_random_u32 called from` messages at boot time. I can apply > the patch to rate limit them, but thought you may be interested in the > system I am running on, since I saw your message to Paul Menzel on lkml > (I'm not subscribed to lkml so can't simply reply to your message). Thanks for the report. It's become clear to me that we need to have the rate limiting patch backported to stable series ASAP. I'll be pushing the patch to mainline shortly. - Ted

7 years, 7 months

1
0
0 0

patch "ARM: amba: Don't read past the end of sysfs "driver_override" buffer" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ARM: amba: Don't read past the end of sysfs "driver_override" buffer to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From d2ffed5185df9d8d9ccd150e4340e3b6f96a8381 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert+renesas(a)glider.be> Date: Tue, 10 Apr 2018 15:21:45 +0200 Subject: ARM: amba: Don't read past the end of sysfs "driver_override" buffer When printing the driver_override parameter when it is 4095 and 4094 bytes long, the printing code would access invalid memory because we need count + 1 bytes for printing. Cfr. commits 4efe874aace57dba ("PCI: Don't read past the end of sysfs "driver_override" buffer") and bf563b01c2895a4b ("driver core: platform: Don't read past the end of "driver_override" buffer"). Fixes: 3cf385713460eb2b ("ARM: 8256/1: driver coamba: add device binding path 'driver_override'") Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Reviewed-by: Todd Kjos <tkjos(a)google.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/amba/bus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index c77eb6e65646..8e6ac3031662 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -87,7 +87,8 @@ static ssize_t driver_override_store(struct device *_dev, struct amba_device *dev = to_amba_device(_dev); char *driver_override, *old, *cp; - if (count > PATH_MAX) + /* We need to keep extra room for a newline */ + if (count >= (PAGE_SIZE - 1)) return -EINVAL; driver_override = kstrndup(buf, count, GFP_KERNEL); -- 2.17.0

7 years, 7 months

1
0
0 0

[PATCH 00/24] Backport Speculation Control support for 4.4

by Youquan Song

Detail please refer to the email threads and discussion listed: [STABLE 4.9.y PATCH 0/9] Backport of KVM Speculation Control support https://lkml.org/lkml/2018/2/6/546 https://lkml.org/lkml/2018/2/6/739 https://lkml.org/lkml/2018/1/29/855 This patchset is backporting for v4.4 and against latest v4.4.128

7 years, 7 months

3
33
0 0

commit 7dac4a1726a9 ("ext4: add validity checks for bitmap block numbers") for stable

by Guenter Roeck

Hi Greg, I see that commit 7dac4a1726a9 ("ext4: add validity checks for bitmap block numbers") is marked for stable, but I don't see it queued for any stable branches. Other ext4 patches from the same time frame (end of March) already made their way into stable. Did this patch get lost, or is it still in your queue ? Thanks, Guenter

7 years, 7 months

2
2
0 0

[PATCH] net: wireless: ti: wlcore: sdio: allow pm to handle sdio power

by Eyal Reizer

pm_runtime handles sdio power on and power off transitions. An old workaround for trying to control the power explicitly from the driver was in fact causing failures on suspend/resume as the mmc layer already power the module on resume. In case of resume pm_runtime_get sync returns a positive device's usage count causing the driver to try an re-initialize an already initialized device. This was causing sdio bus failure on resume. Remove this manual power on/off sequence as it is in-fact not needed. Signed-off-by: Eyal Reizer <eyalr(a)ti.com> Cc: stable(a)vger.kernel.org --- drivers/net/wireless/ti/wlcore/sdio.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 1f727ba..6dbe61d 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -155,17 +155,11 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) struct mmc_card *card = func->card; ret = pm_runtime_get_sync(&card->dev); - if (ret) { - /* - * Runtime PM might be temporarily disabled, or the device - * might have a positive reference counter. Make sure it is - * really powered on. - */ - ret = mmc_power_restore_host(card->host); - if (ret < 0) { - pm_runtime_put_sync(&card->dev); - goto out; - } + if (ret < 0) { + pm_runtime_put_noidle(&card->dev); + dev_err(glue->dev, "%s: failed to get_sync(%d)\n", + __func__, ret); + goto out; } sdio_claim_host(func); @@ -178,7 +172,6 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue) { - int ret; struct sdio_func *func = dev_to_sdio_func(glue->dev); struct mmc_card *card = func->card; @@ -186,16 +179,8 @@ static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue) sdio_disable_func(func); sdio_release_host(func); - /* Power off the card manually in case it wasn't powered off above */ - ret = mmc_power_save_host(card->host); - if (ret < 0) - goto out; - /* Let runtime PM know the card is powered off */ - pm_runtime_put_sync(&card->dev); - -out: - return ret; + return pm_runtime_put_sync(&card->dev); } static int wl12xx_sdio_set_power(struct device *child, bool enable) -- 2.7.4

7 years, 7 months

2
1
0 0

[PATCH] net: wireless: ti: wlcore: sdio: allow pm to handle sdio power

by Eyal Reizer

pm_runtime handles sdio power on and power off transitions. An old workaround for trying to control the power explicitly from the driver was in fact causing failures on suspend/resume as the mmc layer already power the module on resume. In case of resume pm_runtime_get sync returns a positive device's usage count causing the driver to try an re-initialize an already initialized device. This was causing sdio bus failure on resume. Remove this manual power on/off sequence as it is in-fact not needed. Signed-off-by: Eyal Reizer <eyalr(a)ti.com> Cc: stable(a)vger.kernel.org --- drivers/net/wireless/ti/wlcore/sdio.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 1f727ba..6dbe61d 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -155,17 +155,11 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) struct mmc_card *card = func->card; ret = pm_runtime_get_sync(&card->dev); - if (ret) { - /* - * Runtime PM might be temporarily disabled, or the device - * might have a positive reference counter. Make sure it is - * really powered on. - */ - ret = mmc_power_restore_host(card->host); - if (ret < 0) { - pm_runtime_put_sync(&card->dev); - goto out; - } + if (ret < 0) { + pm_runtime_put_noidle(&card->dev); + dev_err(glue->dev, "%s: failed to get_sync(%d)\n", + __func__, ret); + goto out; } sdio_claim_host(func); @@ -178,7 +172,6 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue) { - int ret; struct sdio_func *func = dev_to_sdio_func(glue->dev); struct mmc_card *card = func->card; @@ -186,16 +179,8 @@ static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue) sdio_disable_func(func); sdio_release_host(func); - /* Power off the card manually in case it wasn't powered off above */ - ret = mmc_power_save_host(card->host); - if (ret < 0) - goto out; - /* Let runtime PM know the card is powered off */ - pm_runtime_put_sync(&card->dev); - -out: - return ret; + return pm_runtime_put_sync(&card->dev); } static int wl12xx_sdio_set_power(struct device *child, bool enable) -- 2.7.4

7 years, 7 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror