Linux 4.14.142
Greg KH
maintainerI'm announcing the release of the 4.14.142 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 - arch/powerpc/kvm/book3s_64_vio.c | 6 +++- arch/powerpc/kvm/book3s_64_vio_hv.c | 6 +++- arch/x86/kernel/apic/apic.c | 4 +++ arch/x86/kernel/apic/bigsmp_32.c | 24 +------------------ arch/x86/kernel/ptrace.c | 3 -- arch/x86/kernel/uprobes.c | 17 +++++++------ arch/x86/kvm/lapic.c | 5 +++ arch/x86/kvm/x86.c | 9 +++---- drivers/auxdisplay/panel.c | 2 + drivers/block/xen-blkback/xenbus.c | 6 ++-- drivers/crypto/ccp/ccp-dev.c | 8 ++++++ drivers/dma/ste_dma40.c | 4 +-- drivers/gpu/drm/ast/ast_main.c | 5 +++ drivers/gpu/drm/ast/ast_mode.c | 2 - drivers/gpu/drm/ast/ast_post.c | 2 - drivers/gpu/drm/bridge/ti-tfp410.c | 7 ++++- drivers/gpu/drm/i915/i915_vgpu.c | 3 ++ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 34 +++++++++++++-------------- drivers/hwtracing/intel_th/pci.c | 10 +++++++ drivers/hwtracing/stm/core.c | 1 drivers/i2c/busses/i2c-emev2.c | 16 +++++++++--- drivers/i2c/busses/i2c-piix4.c | 12 +++------ drivers/i2c/busses/i2c-rcar.c | 11 +++++--- drivers/iommu/dma-iommu.c | 2 - drivers/misc/vmw_vmci/vmci_doorbell.c | 6 +++- drivers/mmc/core/sd.c | 6 ++++ drivers/mmc/host/sdhci-of-at91.c | 3 ++ drivers/scsi/ufs/unipro.h | 2 - drivers/usb/chipidea/udc.c | 32 +++++++++++++++++++------ drivers/usb/class/cdc-wdm.c | 16 +++++++++--- drivers/usb/gadget/composite.c | 1 drivers/usb/gadget/function/f_mass_storage.c | 28 ++++++++++++++-------- drivers/usb/host/fotg210-hcd.c | 4 +++ drivers/usb/host/ohci-hcd.c | 15 +++++++++-- drivers/usb/host/xhci-rcar.c | 2 - drivers/usb/storage/realtek_cr.c | 15 +++++++---- drivers/usb/storage/unusual_devs.h | 2 - drivers/watchdog/bcm2835_wdt.c | 1 fs/nfs/direct.c | 34 ++++++++++++++++----------- fs/nfs/pagelist.c | 32 ++++++++++++------------- fs/nfs/read.c | 2 - fs/nfs/write.c | 11 +++++++- include/linux/nfs_page.h | 10 +++++++ include/linux/nfs_xdr.h | 2 - include/net/tcp.h | 4 +++ kernel/trace/ftrace.c | 17 +++++++++++++ mm/zsmalloc.c | 2 + net/core/stream.c | 16 +++++++----- net/mac80211/cfg.c | 9 +++---- net/smc/smc_tx.c | 6 +--- net/wireless/reg.c | 2 - sound/core/seq/seq_clientmgr.c | 3 -- sound/core/seq/seq_fifo.c | 17 +++++++++++++ sound/core/seq/seq_fifo.h | 2 + sound/soc/soc-core.c | 7 +---- sound/usb/line6/pcm.c | 18 +++++++------- sound/usb/mixer.c | 30 +++++++++++++++++++---- tools/hv/hv_kvp_daemon.c | 2 + tools/hv/hv_vss_daemon.c | 2 + virt/kvm/arm/vgic/vgic-mmio.c | 18 ++++++++++++++ virt/kvm/arm/vgic/vgic-v2.c | 5 +++ virt/kvm/arm/vgic/vgic-v3.c | 5 +++ virt/kvm/arm/vgic/vgic.c | 7 +++++ 64 files changed, 406 insertions(+), 191 deletions(-)
Adrian Vladu (1):
tools: hv: fix KVP and VSS daemons exit code
Alexander Shishkin (2):
intel_th: pci: Add support for another Lewisburg PCH
intel_th: pci: Add Tiger Lake support
Alexey Kardashevskiy (1):
KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling
Andrew Cooks (1):
i2c: piix4: Fix port selection for AMD Family 16h Model 30h
Andrew Morton (1):
mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
Arnd Bergmann (1):
dmaengine: ste_dma40: fix unneeded variable warning
Bandan Das (2):
x86/apic: Do not initialize LDR and DFR for bigsmp x86/apic: Include the LDR when clearing out APIC registers
Benjamin Herrenschmidt (2):
usb: gadget: composite: Clear "suspended" on reset/disconnect
usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt
Ding Xiang (1):
stm class: Fix a double free of stm_source_device
Eric Dumazet (1):
tcp: make sure EPOLLOUT wont be missed
Eugen Hristev (1):
mmc: sdhci-of-at91: add quirk for broken HS200
Gary R Hook (1):
crypto: ccp - Ignore unconfigured CCP device on suspend/resume
Geert Uytterhoeven (1):
usb: host: xhci: rcar: Fix typo in compatible string matching
Greg Kroah-Hartman (3):
x86/ptrace: fix up botched merge of spectrev1 fix Revert "ASoC: Fail card instantiation if DAI format setup fails" Linux 4.14.142
Hans Ulli Kroll (1):
usb: host: fotg2: restart hcd after port reset
Henk van der Laan (1):
usb-storage: Add new JMS567 revision to unusual_devs
Heyi Guo (1):
KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long
Hodaszi, Robert (1):
Revert "cfg80211: fix processing world regdomain when non modular"
Hui Peng (2):
ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term
ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit
Jason Baron (1):
net/smc: make sure EPOLLOUT is raised
Johannes Berg (1):
mac80211: fix possible sta leak
Jyri Sarha (1):
drm/tilcdc: Register cpufreq notifier after we have initialized crtc
Kai-Heng Feng (2):
USB: storage: ums-realtek: Update module parameter description for auto_delink_en
USB: storage: ums-realtek: Whitelist auto-delink support
Marc Zyngier (1):
KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI
Nadav Amit (1):
VMCI: Release resource if the work is already queued
Naveen N. Rao (2):
ftrace: Fix NULL pointer dereference in t_probe_next()
ftrace: Check for successful allocation of hash
Oliver Neukum (1):
USB: cdc-wdm: fix race between write and disconnect due to flag abuse
Pedro Sousa (1):
scsi: ufs: Fix RX_TERMINATION_FORCE_ENABLE define value
Peter Chen (1):
usb: chipidea: udc: don't do hardware access if gadget has stopped
Radim Krcmar (1):
kvm: x86: skip populating logical dest map if apic is not sw enabled
Robin Murphy (1):
iommu/dma: Handle SG length overflow better
Sean Christopherson (1):
KVM: x86: Don't update RIP or do single-step on faulting emulation
Sebastian Mayr (1):
uprobes/x86: Fix detection of 32-bit user mode
Stefan Wahren (1):
watchdog: bcm2835_wdt: Fix module autoload
Steven Rostedt (VMware) (1):
ftrace: Check for empty hash and comment the race with registering probes
Takashi Iwai (2):
ALSA: line6: Fix memory leak at line6_init_pcm() error path
ALSA: seq: Fix potential concurrent access to the deleted pool
Tim Froidcoeur (1):
tcp: fix tcp_rtx_queue_tail in case of empty retransmit queue
Tomi Valkeinen (1):
drm/bridge: tfp410: fix memleak in get_modes()
Trond Myklebust (4):
NFS: Clean up list moves of struct nfs_page
NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend()
NFS: Pass error information to the pgio error cleanup routine
NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0
Ulf Hansson (1):
mmc: core: Fix init of SD cards reporting an invalid VDD range
Wenwen Wang (1):
xen/blkback: fix memory leaks
Wolfram Sang (2):
i2c: rcar: avoid race when unregistering slave client
i2c: emev2: avoid race when unregistering slave client
Xiong Zhang (1):
drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest
Y.C. Chen (1):
drm/ast: Fixed reboot test may cause system hanged
Yoshihiro Shimoda (1):
usb: host: ohci: fix a race condition between shutdown and irq
zhengbin (1):
auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 141 +SUBLEVEL = 142 EXTRAVERSION = NAME = Petit Gorille
arch/powerpc/kvm/book3s_64_vio.c +4 -2
@@ -566,8 +566,10 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,if (kvmppc_gpa_to_ua (vcpu->kvm, tce & ~(TCE_PCI_READ |TCE_PCI_WRITE ), - &ua,NULL )) -return H_PARAMETER ; + &ua,NULL )) { + ret =H_PARAMETER ; + goto unlock_exit; + }list_for_each_entry_lockless (stit, &stt->iommu_tables, next) { ret = kvmppc_tce_iommu_map(vcpu->kvm,
arch/powerpc/kvm/book3s_64_vio_hv.c +4 -2
@@ -475,8 +475,10 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu, ua =0 ;if (kvmppc_gpa_to_ua (vcpu->kvm, tce & ~(TCE_PCI_READ |TCE_PCI_WRITE ), - &ua,NULL )) -return H_PARAMETER ; + &ua,NULL )) { + ret =H_PARAMETER ; + goto unlock_exit; + }list_for_each_entry_lockless (stit, &stt->iommu_tables, next) { ret = kvmppc_rm_tce_iommu_map(vcpu->kvm,
arch/x86/kernel/apic/apic.c +4 -0
@@ -1148,6 +1148,10 @@ void clear_local_APIC(void)apic_write (APIC_LVT0 , v |APIC_LVT_MASKED ); v =apic_read (APIC_LVT1 );apic_write (APIC_LVT1 , v |APIC_LVT_MASKED ); +if (!x2apic_enabled ()) { + v =apic_read (APIC_LDR ) & ~APIC_LDR_MASK ; +apic_write (APIC_LDR , v); + }if (maxlvt >=4 ) { v =apic_read (APIC_LVTPC );apic_write (APIC_LVTPC , v |APIC_LVT_MASKED );
arch/x86/kernel/apic/bigsmp_32.c +2 -22
@@ -38,32 +38,12 @@ static int bigsmp_early_logical_apicid(int cpu)return early_per_cpu (x86_cpu_to_apicid, cpu); } -static inline unsigned long calculate_ldr (int cpu) -{ -unsigned long val, id; - - val =apic_read (APIC_LDR ) & ~APIC_LDR_MASK ; - id =per_cpu (x86_bios_cpu_apicid, cpu); - val |=SET_APIC_LOGICAL_ID (id); - -return val; -} -/* -* Set up the logical destination ID. -* -* Intel recommends to set DFR, LDR and TPR before enabling -* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel -* document number 292116). So here it goes... +* bigsmp enables physical destination mode +* and doesn't use LDR and DFR */ static void bigsmp_init_apic_ldr (void ) { -unsigned long val; -int cpu =smp_processor_id (); - -apic_write (APIC_DFR ,APIC_DFR_FLAT ); - val =calculate_ldr (cpu); -apic_write (APIC_LDR , val); }static void bigsmp_setup_apic_routing (void )
arch/x86/kernel/ptrace.c +1 -2
@@ -652,11 +652,10 @@ static unsigned long ptrace_get_debugreg(struct task_struct *tsk, int n) {struct thread_struct *thread = &tsk->thread;unsigned long val =0 ; -int index = n;if (n <HBP_NUM ) { +int index =array_index_nospec (n,HBP_NUM );struct perf_event *bp = thread->ptrace_bps[index]; - index =array_index_nospec (index,HBP_NUM );if (bp) val = bp->hw.info.address;
arch/x86/kernel/uprobes.c +10 -7
@@ -518,9 +518,12 @@ struct uprobe_xol_ops {void (*abort)(struct arch_uprobe *,struct pt_regs *); }; -static inline int sizeof_long (void ) +static inline int sizeof_long (struct pt_regs *regs) { -return in_ia32_syscall () ?4 :8 ; +/* +* Check registers for mode as in_xxx_syscall() does not apply here. +*/ +return user_64bit_mode (regs) ?8 :4 ; }static int default_pre_xol_op (struct arch_uprobe *auprobe,struct pt_regs *regs)
@@ -531,9 +534,9 @@ static int default_pre_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)static int push_ret_address (struct pt_regs *regs,unsigned long ip) { -unsigned long new_sp = regs->sp -sizeof_long (); +unsigned long new_sp = regs->sp -sizeof_long (regs); -if (copy_to_user ((void __user *)new_sp, &ip,sizeof_long ())) +if (copy_to_user ((void __user *)new_sp, &ip,sizeof_long (regs)))return -EFAULT ; regs->sp = new_sp;
@@ -566,7 +569,7 @@ static int default_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regslong correction = utask->vaddr - utask->xol_vaddr; regs->ip += correction; }else if (auprobe->defparam.fixups &UPROBE_FIX_CALL ) { - regs->sp +=sizeof_long ();/* Pop incorrect return address */ + regs->sp +=sizeof_long (regs);/* Pop incorrect return address */ if (push_ret_address (regs, utask->vaddr + auprobe->defparam.ilen))return -ERESTART ; }
@@ -675,7 +678,7 @@ static int branch_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)* "call" insn was executed out-of-line. Just restore ->sp and restart. * We could also restore ->ip and try to call branch_emulate_op() again. */ - regs->sp +=sizeof_long (); + regs->sp +=sizeof_long (regs);return -ERESTART ; }
@@ -966,7 +969,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)unsigned long arch_uretprobe_hijack_return_addr (unsigned long trampoline_vaddr,struct pt_regs *regs) { -int rasize =sizeof_long (), nleft; +int rasize =sizeof_long (regs), nleft;unsigned long orig_ret_vaddr =0 ;/* clear high bits for 32-bit apps */ if (copy_from_user (&orig_ret_vaddr, (void __user *)regs->sp, rasize))
arch/x86/kvm/lapic.c +5 -0
@@ -209,6 +209,9 @@ static void recalculate_apic_map(struct kvm *kvm)if (!apic_x2apic_mode (apic) && !new->phys_map[xapic_id]) new->phys_map[xapic_id] = apic; +if (!kvm_apic_sw_enabled (apic)) +continue ; + ldr =kvm_lapic_get_reg (apic,APIC_LDR );if (apic_x2apic_mode (apic)) {
@@ -252,6 +255,8 @@ static inline void apic_set_spiv(struct kvm_lapic *apic, u32 val)recalculate_apic_map (apic->vcpu->kvm); }else static_key_slow_inc (&apic_sw_disabled.key); + +recalculate_apic_map (apic->vcpu->kvm); } }
arch/x86/kvm/x86.c +5 -4
@@ -5954,12 +5954,13 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,unsigned long rflags = kvm_x86_ops->get_rflags (vcpu);toggle_interruptibility (vcpu, ctxt->interruptibility); vcpu->arch.emulate_regs_need_sync_to_vcpu = false; -kvm_rip_write (vcpu, ctxt->eip); -if (r ==EMULATE_DONE && ctxt->tf) -kvm_vcpu_do_singlestep (vcpu, &r);if (!ctxt->have_exception || -exception_type (ctxt->exception.vector) ==EXCPT_TRAP ) +exception_type (ctxt->exception.vector) ==EXCPT_TRAP ) { +kvm_rip_write (vcpu, ctxt->eip); +if (r ==EMULATE_DONE && ctxt->tf) +kvm_vcpu_do_singlestep (vcpu, &r);__kvm_set_rflags (vcpu, ctxt->eflags); + }/* * For STI, interrupts are shadowed; so KVM_REQ_EVENT will
drivers/auxdisplay/panel.c +2 -0
@@ -1622,6 +1622,8 @@ static void panel_attach(struct parport *port)return ; err_lcd_unreg: +if (scan_timer.function) +del_timer_sync (&scan_timer);if (lcd.enabled)charlcd_unregister (lcd.charlcd); err_unreg_device:
drivers/block/xen-blkback/xenbus.c +3 -3
@@ -973,6 +973,7 @@ static int read_per_ring_refs(struct xen_blkif_ring *ring, const char *dir) } blkif->nr_ring_pages = nr_grefs; + err = -ENOMEM ;for (i =0 ; i < nr_grefs *XEN_BLKIF_REQS_PER_PAGE ; i++) { req =kzalloc (sizeof (*req),GFP_KERNEL );if (!req)
@@ -995,7 +996,7 @@ static int read_per_ring_refs(struct xen_blkif_ring *ring, const char *dir) err =xen_blkif_map (ring, ring_ref, nr_grefs, evtchn);if (err) {xenbus_dev_fatal (dev, err,"mapping ring-ref port %u" , evtchn); -return err; + goto fail; }return 0 ;
@@ -1015,8 +1016,7 @@ static int read_per_ring_refs(struct xen_blkif_ring *ring, const char *dir) }kfree (req); } -return -ENOMEM ; - +return err; }static int connect_ring (struct backend_info *be)
drivers/crypto/ccp/ccp-dev.c +8 -0
@@ -540,6 +540,10 @@ int ccp_dev_suspend(struct sp_device *sp, pm_message_t state)unsigned long flags;unsigned int i; +/* If there's no device there's nothing to do */ +if (!ccp) +return 0 ; +spin_lock_irqsave (&ccp->cmd_lock, flags); ccp->suspending =1 ;
@@ -564,6 +568,10 @@ int ccp_dev_resume(struct sp_device *sp)unsigned long flags;unsigned int i; +/* If there's no device there's nothing to do */ +if (!ccp) +return 0 ; +spin_lock_irqsave (&ccp->cmd_lock, flags); ccp->suspending =0 ;
drivers/dma/ste_dma40.c +2 -2
@@ -142,7 +142,7 @@ enum d40_events {* when the DMA hw is powered off. * TODO: Add save/restore of D40_DREG_GCC on dma40 v3 or later, if that works. */ -static u32 d40_backup_regs[] = { +static __maybe_unused u32 d40_backup_regs[] = {D40_DREG_LCPA ,D40_DREG_LCLA ,D40_DREG_PRMSE ,
@@ -211,7 +211,7 @@ static u32 d40_backup_regs_v4b[] = {#define BACKUP_REGS_SZ_V4B ARRAY_SIZE(d40_backup_regs_v4b) -static u32 d40_backup_regs_chan[] = { +static __maybe_unused u32 d40_backup_regs_chan[] = {D40_CHAN_REG_SSCFG ,D40_CHAN_REG_SSELT ,D40_CHAN_REG_SSPTR ,
drivers/gpu/drm/ast/ast_main.c +4 -1
@@ -131,8 +131,8 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)/* Enable extended register access */ -ast_enable_mmio (dev);ast_open_key (ast); +ast_enable_mmio (dev);/* Find out whether P2A works or whether to use device-tree */ ast_detect_config_mode (dev, &scu_rev);
@@ -576,6 +576,9 @@ void ast_driver_unload(struct drm_device *dev) {struct ast_private *ast = dev->dev_private; +/* enable standard VGA decode */ +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 ); +ast_release_firmware (dev);kfree (ast->dp501_fw_addr);ast_mode_fini (dev);
drivers/gpu/drm/ast/ast_mode.c +1 -1
@@ -600,7 +600,7 @@ static int ast_crtc_mode_set(struct drm_crtc *crtc,return -EINVAL ;ast_open_key (ast); -ast_set_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xa1 ,0xff ,0x04 ); +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x06 );ast_set_std_reg (crtc, adjusted_mode, &vbios_mode);ast_set_crtc_reg (crtc, adjusted_mode, &vbios_mode);
drivers/gpu/drm/ast/ast_post.c +1 -1
@@ -46,7 +46,7 @@ void ast_enable_mmio(struct drm_device *dev) {struct ast_private *ast = dev->dev_private; -ast_set_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xa1 ,0xff ,0x04 ); +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x06 ); }
drivers/gpu/drm/bridge/ti-tfp410.c +6 -1
@@ -64,7 +64,12 @@ static int tfp410_get_modes(struct drm_connector *connector)drm_mode_connector_update_edid_property (connector, edid); -return drm_add_edid_modes (connector, edid); + ret =drm_add_edid_modes (connector, edid); + +kfree (edid); + +return ret; + fallback:/* No EDID, fallback on the XGA standard modes */ ret =drm_add_modes_noedid (connector,1920 ,1200 );
drivers/gpu/drm/i915/i915_vgpu.c +3 -0
@@ -100,6 +100,9 @@ static struct _balloon_info_ bl_info;static void vgt_deballoon_space (struct i915_ggtt *ggtt,struct drm_mm_node *node) { +if (!drm_mm_node_allocated (node)) +return ; + DRM_DEBUG_DRIVER("deballoon space: range [0x%llx - 0x%llx] %llu KiB.\n", node->start, node->start + node->size,
drivers/gpu/drm/tilcdc/tilcdc_drv.c +17 -17
@@ -189,6 +189,12 @@ static void tilcdc_fini(struct drm_device *dev) {struct tilcdc_drm_private *priv = dev->dev_private; +#ifdef CONFIG_CPU_FREQ +if (priv->freq_transition.notifier_call) +cpufreq_unregister_notifier (&priv->freq_transition, +CPUFREQ_TRANSITION_NOTIFIER ); +#endif +if (priv->crtc)tilcdc_crtc_shutdown (priv->crtc);
@@ -204,12 +210,6 @@ static void tilcdc_fini(struct drm_device *dev)drm_mode_config_cleanup (dev);tilcdc_remove_external_device (dev); -#ifdef CONFIG_CPU_FREQ -if (priv->freq_transition.notifier_call) -cpufreq_unregister_notifier (&priv->freq_transition, -CPUFREQ_TRANSITION_NOTIFIER ); -#endif -if (priv->clk)clk_put (priv->clk);
@@ -282,17 +282,6 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) goto init_failed; } -#ifdef CONFIG_CPU_FREQ - priv->freq_transition.notifier_call = cpufreq_transition; - ret =cpufreq_register_notifier (&priv->freq_transition, -CPUFREQ_TRANSITION_NOTIFIER ); -if (ret) { -dev_err (dev,"failed to register cpufreq notifier\n" ); - priv->freq_transition.notifier_call =NULL ; - goto init_failed; - } -#endif -if (of_property_read_u32 (node,"max-bandwidth" , &priv->max_bandwidth)) priv->max_bandwidth =TILCDC_DEFAULT_MAX_BANDWIDTH ;
@@ -369,6 +358,17 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) }modeset_init (ddev); +#ifdef CONFIG_CPU_FREQ + priv->freq_transition.notifier_call = cpufreq_transition; + ret =cpufreq_register_notifier (&priv->freq_transition, +CPUFREQ_TRANSITION_NOTIFIER ); +if (ret) { +dev_err (dev,"failed to register cpufreq notifier\n" ); + priv->freq_transition.notifier_call =NULL ; + goto init_failed; + } +#endif +if (priv->is_componentized) { ret =component_bind_all (dev, ddev);if (ret <0 )
drivers/hwtracing/intel_th/pci.c +10 -0
@@ -148,6 +148,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa1a6), .driver_data = (kernel_ulong_t )0 , }, + { +/* Lewisburg PCH */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xa226 ), + .driver_data = (kernel_ulong_t)0, + }, {/* Gemini Lake */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e),
@@ -183,6 +188,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x45c5), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Tiger Lake PCH */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa0a6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
drivers/hwtracing/stm/core.c +0 -1
@@ -1107,7 +1107,6 @@ int stm_source_register_device(struct device *parent, err:put_device (&src->dev); -kfree (src);return err; }
drivers/i2c/busses/i2c-emev2.c +12 -4
@@ -72,6 +72,7 @@ struct em_i2c_device {struct completion msg_done;struct clk *sclk;struct i2c_client *slave; +int irq; };static inline void em_clear_set_bit (struct em_i2c_device *priv,u8 clear,u8 set,u8 reg)
@@ -342,6 +343,12 @@ static int em_i2c_unreg_slave(struct i2c_client *slave)writeb (0 , priv->base +I2C_OFS_SVA0 ); +/* +* Wait for interrupt to finish. New slave irqs cannot happen because we +* cleared the slave address and, thus, only extension codes will be +* detected which do not use the slave ptr. +*/ +synchronize_irq (priv->irq); priv->slave =NULL ;return 0 ;
@@ -358,7 +365,7 @@ static int em_i2c_probe(struct platform_device *pdev) {struct em_i2c_device *priv;struct resource *r; -int irq, ret; +int ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -393,8 +400,8 @@ static int em_i2c_probe(struct platform_device *pdev)em_i2c_reset (&priv->adap); - irq =platform_get_irq (pdev,0 ); - ret =devm_request_irq (&pdev->dev, irq, em_i2c_irq_handler,0 , + priv->irq =platform_get_irq (pdev,0 ); + ret =devm_request_irq (&pdev->dev, priv->irq, em_i2c_irq_handler,0 ,"em_i2c" , priv);if (ret) goto err_clk;
@@ -404,7 +411,8 @@ static int em_i2c_probe(struct platform_device *pdev)if (ret) goto err_clk; -dev_info (&pdev->dev,"Added i2c controller %d, irq %d\n" , priv->adap.nr, irq); +dev_info (&pdev->dev,"Added i2c controller %d, irq %d\n" , priv->adap.nr, + priv->irq);return 0 ;
drivers/i2c/busses/i2c-piix4.c +5 -7
@@ -99,7 +99,7 @@#define SB800_PIIX4_PORT_IDX_MASK 0x06#define SB800_PIIX4_PORT_IDX_SHIFT 1 -/* On kerncz, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */ +/* On kerncz and Hudson2, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */ #define SB800_PIIX4_PORT_IDX_KERNCZ 0x02#define SB800_PIIX4_PORT_IDX_MASK_KERNCZ 0x18#define SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ 3
@@ -359,18 +359,16 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,/* Find which register is used for port selection */ if (PIIX4_dev->vendor ==PCI_VENDOR_ID_AMD ) { -switch (PIIX4_dev->device) { -case PCI_DEVICE_ID_AMD_KERNCZ_SMBUS : +if (PIIX4_dev->device ==PCI_DEVICE_ID_AMD_KERNCZ_SMBUS || + (PIIX4_dev->device ==PCI_DEVICE_ID_AMD_HUDSON2_SMBUS && + PIIX4_dev->revision >=0x1F )) { piix4_port_sel_sb800 =SB800_PIIX4_PORT_IDX_KERNCZ ; piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK_KERNCZ ; piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ ; -break ; -case PCI_DEVICE_ID_AMD_HUDSON2_SMBUS : -default : + }else { piix4_port_sel_sb800 =SB800_PIIX4_PORT_IDX_ALT ; piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK ; piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; -break ; } }else {mutex_lock (&piix4_mutex_sb800);
drivers/i2c/busses/i2c-rcar.c +7 -4
@@ -144,6 +144,7 @@ struct rcar_i2c_priv {enum dma_data_direction dma_direction;struct reset_control *rstc; +int irq; };#define rcar_i2c_priv_to_dev (p) ((p)->adap.dev.parent)
@@ -813,9 +814,11 @@ static int rcar_unreg_slave(struct i2c_client *slave)WARN_ON (!priv->slave); +/* disable irqs and ensure none is running before clearing ptr */ rcar_i2c_write (priv,ICSIER ,0 );rcar_i2c_write (priv,ICSCR ,0 ); +synchronize_irq (priv->irq); priv->slave =NULL ;pm_runtime_put (rcar_i2c_priv_to_dev (priv));
@@ -866,7 +869,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)struct i2c_adapter *adap;struct device *dev = &pdev->dev;struct i2c_timings i2c_t; -int irq, ret; +int ret; priv =devm_kzalloc (dev,sizeof (struct rcar_i2c_priv ),GFP_KERNEL );if (!priv)
@@ -927,10 +930,10 @@ static int rcar_i2c_probe(struct platform_device *pdev)pm_runtime_put (dev); - irq =platform_get_irq (pdev,0 ); - ret =devm_request_irq (dev, irq, rcar_i2c_irq,0 ,dev_name (dev), priv); + priv->irq =platform_get_irq (pdev,0 ); + ret =devm_request_irq (dev, priv->irq, rcar_i2c_irq,0 ,dev_name (dev), priv);if (ret <0 ) { -dev_err (dev,"cannot get irq %d\n" , irq); +dev_err (dev,"cannot get irq %d\n" , priv->irq); goto out_pm_disable; }
drivers/iommu/dma-iommu.c +1 -1
@@ -684,7 +684,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents,* - and wouldn't make the resulting output segment too long */ if (cur_len && !s_iova_off && (dma_addr & seg_mask) && - (cur_len + s_length <= max_len)) { + (max_len - cur_len >= s_length)) {/* ...then concatenate it with the previous one */ cur_len += s_length; }else {
drivers/misc/vmw_vmci/vmci_doorbell.c +4 -2
@@ -318,7 +318,8 @@ int vmci_dbell_host_context_notify(u32 src_cid, struct vmci_handle handle) entry = container_of(resource, struct dbell_entry, resource);if (entry->run_delayed) { -schedule_work (&entry->work); +if (!schedule_work (&entry->work)) +vmci_resource_put (resource); }else { entry->notify_cb (entry->client_data);vmci_resource_put (resource);
@@ -366,7 +367,8 @@ static void dbell_fire_entries(u32 notify_idx) atomic_read(&dbell->active) == 1) {if (dbell->run_delayed) {vmci_resource_get (&dbell->resource); -schedule_work (&dbell->work); +if (!schedule_work (&dbell->work)) +vmci_resource_put (&dbell->resource); }else { dbell->notify_cb (dbell->client_data); }
drivers/mmc/core/sd.c +6 -0
@@ -1232,6 +1232,12 @@ int mmc_attach_sd(struct mmc_host *host) goto err; } +/* +* Some SD cards claims an out of spec VDD voltage range. Let's treat +* these bits as being in-valid and especially also bit7. +*/ + ocr &= ~0x7FFF ; + rocr =mmc_select_voltage (host, ocr);/*
drivers/mmc/host/sdhci-of-at91.c +3 -0
@@ -364,6 +364,9 @@ static int sdhci_at91_probe(struct platform_device *pdev)pm_runtime_set_autosuspend_delay (&pdev->dev,50 );pm_runtime_use_autosuspend (&pdev->dev); +/* HS200 is broken at this moment */ + host->quirks2 =SDHCI_QUIRK2_BROKEN_HS200 ; + ret =sdhci_add_host (host);if (ret) goto pm_runtime_disable;
drivers/scsi/ufs/unipro.h +1 -1
@@ -52,7 +52,7 @@#define RX_HS_UNTERMINATED_ENABLE 0x00A6#define RX_ENTER_HIBERN8 0x00A7#define RX_BYPASS_8B10B_ENABLE 0x00A8 -#define RX_TERMINATION_FORCE_ENABLE 0x0089 +#define RX_TERMINATION_FORCE_ENABLE 0x00A9#define RX_MIN_ACTIVATETIME_CAPABILITY 0x008F#define RX_HIBERN8TIME_CAPABILITY 0x0092#define RX_REFCLKFREQ 0x00EB
drivers/usb/chipidea/udc.c +24 -8
@@ -711,12 +711,6 @@ static int _gadget_stop_activity(struct usb_gadget *gadget) struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget);unsigned long flags; -spin_lock_irqsave (&ci->lock, flags); - ci->gadget.speed =USB_SPEED_UNKNOWN ; - ci->remote_wakeup =0 ; - ci->suspended =0 ; -spin_unlock_irqrestore (&ci->lock, flags); -/* flush all endpoints */ gadget_for_each_ep (ep, gadget) {usb_ep_fifo_flush (ep);
@@ -734,6 +728,12 @@ static int _gadget_stop_activity(struct usb_gadget *gadget) ci->status =NULL ; } +spin_lock_irqsave (&ci->lock, flags); + ci->gadget.speed =USB_SPEED_UNKNOWN ; + ci->remote_wakeup =0 ; + ci->suspended =0 ; +spin_unlock_irqrestore (&ci->lock, flags); +return 0 ; }
@@ -1305,6 +1305,10 @@ static int ep_disable(struct usb_ep *ep)return -EBUSY ;spin_lock_irqsave (hwep->lock, flags); +if (hwep->ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (hwep->lock, flags); +return 0 ; + }/* only internal SW should disable ctrl endpts */
@@ -1394,6 +1398,10 @@ static int ep_queue(struct usb_ep *ep, struct usb_request *req,return -EINVAL ;spin_lock_irqsave (hwep->lock, flags); +if (hwep->ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (hwep->lock, flags); +return 0 ; + } retval =_ep_queue (ep, req, gfp_flags);spin_unlock_irqrestore (hwep->lock, flags);return retval;
@@ -1417,8 +1425,8 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req)return -EINVAL ;spin_lock_irqsave (hwep->lock, flags); - -hw_ep_flush (hwep->ci, hwep->num, hwep->dir); +if (hwep->ci->gadget.speed !=USB_SPEED_UNKNOWN ) +hw_ep_flush (hwep->ci, hwep->num, hwep->dir);list_for_each_entry_safe (node, tmpnode, &hwreq->tds, td) {dma_pool_free (hwep->td_pool, node->ptr, node->dma);
@@ -1489,6 +1497,10 @@ static void ep_fifo_flush(struct usb_ep *ep) }spin_lock_irqsave (hwep->lock, flags); +if (hwep->ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (hwep->lock, flags); +return ; + }hw_ep_flush (hwep->ci, hwep->num, hwep->dir);
@@ -1557,6 +1569,10 @@ static int ci_udc_wakeup(struct usb_gadget *_gadget)int ret =0 ;spin_lock_irqsave (&ci->lock, flags); +if (ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (&ci->lock, flags); +return 0 ; + }if (!ci->remote_wakeup) { ret = -EOPNOTSUPP ; goto out;
drivers/usb/class/cdc-wdm.c +12 -4
@@ -584,10 +584,20 @@ static int wdm_flush(struct file *file, fl_owner_t id) {struct wdm_device *desc = file->private_data; -wait_event (desc->wait, !test_bit (WDM_IN_USE , &desc->flags)); +wait_event (desc->wait, +/* +* needs both flags. We cannot do with one +* because resetting it would cause a race +* with write() yet we need to signal +* a disconnect +*/ + !test_bit (WDM_IN_USE , &desc->flags) || +test_bit (WDM_DISCONNECTING , &desc->flags));/* cannot dereference desc->intf if WDM_DISCONNECTING */ -if (desc->werr <0 && !test_bit (WDM_DISCONNECTING , &desc->flags)) +if (test_bit (WDM_DISCONNECTING , &desc->flags)) +return -ENODEV ; +if (desc->werr <0 )dev_err (&desc->intf->dev,"Error in flush path: %d\n" , desc->werr);
@@ -955,8 +965,6 @@ static void wdm_disconnect(struct usb_interface *intf)spin_lock_irqsave (&desc->iuspin, flags);set_bit (WDM_DISCONNECTING , &desc->flags);set_bit (WDM_READ , &desc->flags); -/* to terminate pending flushes */ -clear_bit (WDM_IN_USE , &desc->flags);spin_unlock_irqrestore (&desc->iuspin, flags);wake_up_all (&desc->wait);mutex_lock (&desc->rlock);
drivers/usb/gadget/composite.c +1 -0
@@ -2008,6 +2008,7 @@ void composite_disconnect(struct usb_gadget *gadget)* disconnect callbacks? */ spin_lock_irqsave (&cdev->lock, flags); + cdev->suspended =0 ;if (cdev->config)reset_config (cdev);if (cdev->driver->disconnect)
drivers/usb/gadget/function/f_mass_storage.c +18 -10
@@ -261,7 +261,7 @@ struct fsg_common;struct fsg_common {struct usb_gadget *gadget;struct usb_composite_dev *cdev; -struct fsg_dev *fsg, *new_fsg; +struct fsg_dev *fsg;wait_queue_head_t io_wait;wait_queue_head_t fsg_wait;
@@ -290,6 +290,7 @@ struct fsg_common {unsigned int bulk_out_maxpacket;enum fsg_state state;/* For exception handling */ unsigned int exception_req_tag; +void *exception_arg;enum data_direction data_dir;u32 data_size;
@@ -393,7 +394,8 @@ static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)/* These routines may be called in process context or in_irq */ -static void raise_exception (struct fsg_common *common,enum fsg_state new_state) +static void __raise_exception (struct fsg_common *common,enum fsg_state new_state, +void *arg) {unsigned long flags;
@@ -406,6 +408,7 @@ static void raise_exception(struct fsg_common *common, enum fsg_state new_state)if (common->state <= new_state) { common->exception_req_tag = common->ep0_req_tag; common->state = new_state; + common->exception_arg = arg;if (common->thread_task)send_sig_info (SIGUSR1 ,SEND_SIG_FORCED , common->thread_task);
@@ -413,6 +416,10 @@ static void raise_exception(struct fsg_common *common, enum fsg_state new_state)spin_unlock_irqrestore (&common->lock, flags); } +static void raise_exception (struct fsg_common *common,enum fsg_state new_state) +{ +__raise_exception (common, new_state,NULL ); +}/*-------------------------------------------------------------------------*/
@@ -2287,16 +2294,16 @@ static int do_set_interface(struct fsg_common *common, struct fsg_dev *new_fsg)static int fsg_set_alt (struct usb_function *f,unsigned intf,unsigned alt) {struct fsg_dev *fsg =fsg_from_func (f); - fsg->common->new_fsg = fsg; -raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ); + +__raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE , fsg);return USB_GADGET_DELAYED_STATUS ; }static void fsg_disable (struct usb_function *f) {struct fsg_dev *fsg =fsg_from_func (f); - fsg->common->new_fsg =NULL ; -raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ); + +__raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ,NULL ); }
@@ -2309,6 +2316,7 @@ static void handle_exception(struct fsg_common *common)enum fsg_state old_state;struct fsg_lun *curlun;unsigned int exception_req_tag; +struct fsg_dev *new_fsg;/* * Clear the existing signals. Anything but SIGUSR1 is converted
@@ -2362,6 +2370,7 @@ static void handle_exception(struct fsg_common *common) common->next_buffhd_to_fill = &common->buffhds[0 ]; common->next_buffhd_to_drain = &common->buffhds[0 ]; exception_req_tag = common->exception_req_tag; + new_fsg = common->exception_arg; old_state = common->state; common->state =FSG_STATE_NORMAL ;
@@ -2415,8 +2424,8 @@ static void handle_exception(struct fsg_common *common)break ;case FSG_STATE_CONFIG_CHANGE : -do_set_interface (common, common->new_fsg); -if (common->new_fsg) +do_set_interface (common, new_fsg); +if (new_fsg)usb_composite_setup_continue (common->cdev);break ;
@@ -3007,8 +3016,7 @@ static void fsg_unbind(struct usb_configuration *c, struct usb_function *f)DBG (fsg,"unbind\n" );if (fsg->common->fsg == fsg) { - fsg->common->new_fsg =NULL ; -raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ); +__raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ,NULL );/* FIXME: make interruptible or killable somehow? */ wait_event (common->fsg_wait, common->fsg != fsg); }
drivers/usb/host/fotg210-hcd.c +4 -0
@@ -1652,6 +1652,10 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,/* see what we found out */ temp =check_reset_complete (fotg210, wIndex, status_reg,fotg210_readl (fotg210, status_reg)); + +/* restart schedule */ + fotg210->command |=CMD_RUN ; +fotg210_writel (fotg210, fotg210->command, &fotg210->regs->command); }if (!(temp & (PORT_RESUME |PORT_RESET ))) {
drivers/usb/host/ohci-hcd.c +12 -3
@@ -417,8 +417,7 @@ static void ohci_usb_reset (struct ohci_hcd *ohci)* other cases where the next software may expect clean state from the * "firmware". this is bus-neutral, unlike shutdown() methods. */ -static void -ohci_shutdown (struct usb_hcd *hcd) +static void _ohci_shutdown (struct usb_hcd *hcd) {struct ohci_hcd *ohci;
@@ -434,6 +433,16 @@ ohci_shutdown (struct usb_hcd *hcd) ohci->rh_state =OHCI_RH_HALTED ; } +static void ohci_shutdown (struct usb_hcd *hcd) +{ +struct ohci_hcd *ohci =hcd_to_ohci (hcd); +unsigned long flags; + +spin_lock_irqsave (&ohci->lock, flags); +_ohci_shutdown (hcd); +spin_unlock_irqrestore (&ohci->lock, flags); +} +/*-------------------------------------------------------------------------* * HC functions *-------------------------------------------------------------------------*/
@@ -752,7 +761,7 @@ static void io_watchdog_func(unsigned long _ohci) died:usb_hc_died (ohci_to_hcd (ohci));ohci_dump (ohci); -ohci_shutdown (ohci_to_hcd (ohci)); +_ohci_shutdown (ohci_to_hcd (ohci)); goto done; }else {/* No write back because the done queue was empty */
drivers/usb/host/xhci-rcar.c +1 -1
@@ -113,7 +113,7 @@ static int xhci_rcar_is_gen2(struct device *dev)return of_device_is_compatible (node,"renesas,xhci-r8a7790" ) ||of_device_is_compatible (node,"renesas,xhci-r8a7791" ) ||of_device_is_compatible (node,"renesas,xhci-r8a7793" ) || -of_device_is_compatible (node,"renensas,rcar-gen2-xhci" ); +of_device_is_compatible (node,"renesas,rcar-gen2-xhci" ); }static int xhci_rcar_is_gen3 (struct device *dev)
drivers/usb/storage/realtek_cr.c +9 -6
@@ -50,7 +50,7 @@ MODULE_LICENSE("GPL");static int auto_delink_en =1 ;module_param (auto_delink_en, int,S_IRUGO |S_IWUSR ); -MODULE_PARM_DESC (auto_delink_en,"enable auto delink" ); +MODULE_PARM_DESC (auto_delink_en,"auto delink mode (0=firmware, 1=software [default])" );#ifdef CONFIG_REALTEK_AUTOPM static int ss_en =1 ;
@@ -1009,12 +1009,15 @@ static int init_realtek_cr(struct us_data *us) goto INIT_FAIL; } -if (CHECK_FW_VER (chip,0x5888 ) ||CHECK_FW_VER (chip,0x5889 ) || -CHECK_FW_VER (chip,0x5901 )) -SET_AUTO_DELINK (chip); -if (STATUS_LEN (chip) ==16 ) { -if (SUPPORT_AUTO_DELINK (chip)) +if (CHECK_PID (chip,0x0138 ) ||CHECK_PID (chip,0x0158 ) || +CHECK_PID (chip,0x0159 )) { +if (CHECK_FW_VER (chip,0x5888 ) ||CHECK_FW_VER (chip,0x5889 ) || +CHECK_FW_VER (chip,0x5901 ))SET_AUTO_DELINK (chip); +if (STATUS_LEN (chip) ==16 ) { +if (SUPPORT_AUTO_DELINK (chip)) +SET_AUTO_DELINK (chip); + } }#ifdef CONFIG_REALTEK_AUTOPM if (ss_en)
drivers/usb/storage/unusual_devs.h +1 -1
@@ -2119,7 +2119,7 @@ UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x0201, US_FL_IGNORE_RESIDUE ),/* Reported by Michael Büsch <[email protected]> */ -UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0116, +UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0117, "JMicron", "USB to ATA/ATAPI Bridge", USB_SC_DEVICE, USB_PR_DEVICE, NULL,
drivers/watchdog/bcm2835_wdt.c +1 -0
@@ -252,6 +252,7 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); +MODULE_ALIAS ("platform:bcm2835-wdt" );MODULE_AUTHOR ("Lubomir Rintel <[email protected]>" );MODULE_DESCRIPTION ("Driver for Broadcom BCM2835 watchdog timer" );MODULE_LICENSE ("GPL" );
fs/nfs/direct.c +21 -13
@@ -400,15 +400,21 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)unsigned long bytes =0 ;struct nfs_direct_req *dreq = hdr->dreq; -if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) - goto out_put; -spin_lock (&dreq->lock); -if (test_bit (NFS_IOHDR_ERROR , &hdr->flags) && (hdr->good_bytes ==0 )) +if (test_bit (NFS_IOHDR_ERROR , &hdr->flags)) dreq->error = hdr->error; -else + +if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) { +spin_unlock (&dreq->lock); + goto out_put; + } + +if (hdr->good_bytes !=0 )nfs_direct_good_bytes (dreq, hdr); +if (test_bit (NFS_IOHDR_EOF , &hdr->flags)) + dreq->error =0 ; +spin_unlock (&dreq->lock);while (!list_empty (&hdr->pages)) {
@@ -428,7 +434,7 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr) hdr->release (hdr); } -static void nfs_read_sync_pgio_error (struct list_head *head) +static void nfs_read_sync_pgio_error (struct list_head *head,int error) {struct nfs_page *req;
@@ -664,8 +670,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)list_for_each_entry_safe (req, tmp, &reqs, wb_list) {if (!nfs_pageio_add_request (&desc, req)) { -nfs_list_remove_request (req); -nfs_list_add_request (req, &failed); +nfs_list_move_request (req, &failed);spin_lock (&cinfo.inode->i_lock); dreq->flags =0 ;if (desc.pg_error <0 )
@@ -775,16 +780,19 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)bool request_commit = false;struct nfs_page *req =nfs_list_entry (hdr->pages.next); -if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) - goto out_put; -nfs_init_cinfo_from_dreq (&cinfo, dreq);spin_lock (&dreq->lock);if (test_bit (NFS_IOHDR_ERROR , &hdr->flags)) dreq->error = hdr->error; -if (dreq->error ==0 ) { + +if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) { +spin_unlock (&dreq->lock); + goto out_put; + } + +if (hdr->good_bytes !=0 ) {nfs_direct_good_bytes (dreq, hdr);if (nfs_write_need_commit (hdr)) {if (dreq->flags ==NFS_ODIRECT_RESCHED_WRITES )
@@ -821,7 +829,7 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) hdr->release (hdr); } -static void nfs_write_sync_pgio_error (struct list_head *head) +static void nfs_write_sync_pgio_error (struct list_head *head,int error) {struct nfs_page *req;
fs/nfs/pagelist.c +16 -16
@@ -768,8 +768,7 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, pageused =0 ;while (!list_empty (head)) { req =nfs_list_entry (head->next); -nfs_list_remove_request (req); -nfs_list_add_request (req, &hdr->pages); +nfs_list_move_request (req, &hdr->pages);if (!last_page || last_page != req->wb_page) { pageused++;
@@ -961,8 +960,7 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc, }if (!nfs_can_coalesce_requests (prev, req, desc))return 0 ; -nfs_list_remove_request (req); -nfs_list_add_request (req, &mirror->pg_list); +nfs_list_move_request (req, &mirror->pg_list); mirror->pg_count += req->wb_bytes;return 1 ; }
@@ -994,9 +992,8 @@ nfs_pageio_cleanup_request(struct nfs_pageio_descriptor *desc, {LIST_HEAD (head); -nfs_list_remove_request (req); -nfs_list_add_request (req, &head); - desc->pg_completion_ops->error_cleanup (&head); +nfs_list_move_request (req, &head); + desc->pg_completion_ops->error_cleanup (&head, desc->pg_error); }/**
@@ -1132,7 +1129,8 @@ static void nfs_pageio_error_cleanup(struct nfs_pageio_descriptor *desc)for (midx =0 ; midx < desc->pg_mirror_count; midx++) { mirror = &desc->pg_mirrors[midx]; - desc->pg_completion_ops->error_cleanup (&mirror->pg_list); + desc->pg_completion_ops->error_cleanup (&mirror->pg_list, + desc->pg_error); } }
@@ -1234,21 +1232,23 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc,int nfs_pageio_resend (struct nfs_pageio_descriptor *desc,struct nfs_pgio_header *hdr) { -LIST_HEAD (failed); +LIST_HEAD (pages); desc->pg_io_completion = hdr->io_completion; desc->pg_dreq = hdr->dreq; -while (!list_empty (&hdr->pages)) { -struct nfs_page *req =nfs_list_entry (hdr->pages.next); +list_splice_init (&hdr->pages, &pages); +while (!list_empty (&pages)) { +struct nfs_page *req =nfs_list_entry (pages.next); -nfs_list_remove_request (req);if (!nfs_pageio_add_request (desc, req)) -nfs_list_add_request (req, &failed); +break ; }nfs_pageio_complete (desc); -if (!list_empty (&failed)) { -list_move (&failed, &hdr->pages); -return desc->pg_error <0 ? desc->pg_error : -EIO ; +if (!list_empty (&pages)) { +int err = desc->pg_error <0 ? desc->pg_error : -EIO ; + hdr->completion_ops->error_cleanup (&pages, err); +nfs_set_pgio_error (hdr, err, hdr->io_start); +return err; }return 0 ; }
fs/nfs/read.c +1 -1
@@ -205,7 +205,7 @@ static void nfs_initiate_read(struct nfs_pgio_header *hdr, }static void -nfs_async_read_error (struct list_head *head) +nfs_async_read_error (struct list_head *head,int error) {struct nfs_page *req;
fs/nfs/write.c +9 -2
@@ -1397,20 +1397,27 @@ static void nfs_redirty_request(struct nfs_page *req)nfs_release_request (req); } -static void nfs_async_write_error (struct list_head *head) +static void nfs_async_write_error (struct list_head *head,int error) {struct nfs_page *req;while (!list_empty (head)) { req =nfs_list_entry (head->next);nfs_list_remove_request (req); +if (nfs_error_is_fatal (error)) { +nfs_context_set_write_error (req->wb_context, error); +if (nfs_error_is_fatal_on_server (error)) { +nfs_write_error_remove_page (req); +continue ; + } + }nfs_redirty_request (req); } }static void nfs_async_write_reschedule_io (struct nfs_pgio_header *hdr) { -nfs_async_write_error (&hdr->pages); +nfs_async_write_error (&hdr->pages,0 ); }static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops = {
include/linux/nfs_page.h +10 -0
@@ -164,6 +164,16 @@ nfs_list_add_request(struct nfs_page *req, struct list_head *head)list_add_tail (&req->wb_list, head); } +/** +* nfs_list_move_request - Move a request to a new list +* @req: request +* @head: head of list into which to insert the request. +*/ +static inline void +nfs_list_move_request (struct nfs_page *req,struct list_head *head) +{ +list_move_tail (&req->wb_list, head); +}/** * nfs_list_remove_request - Remove a request from its wb_list
include/linux/nfs_xdr.h +1 -1
@@ -1520,7 +1520,7 @@ struct nfs_commit_data { };struct nfs_pgio_completion_ops { -void (*error_cleanup)(struct list_head *head); +void (*error_cleanup)(struct list_head *head,int );void (*init_hdr)(struct nfs_pgio_header *hdr);void (*completion)(struct nfs_pgio_header *hdr);void (*reschedule_io)(struct nfs_pgio_header *hdr);
include/net/tcp.h +4 -0
@@ -1702,6 +1702,10 @@ static inline struct sk_buff *tcp_rtx_queue_tail(const struct sock *sk) {struct sk_buff *skb =tcp_send_head (sk); +/* empty retransmit queue, for example due to zero window */ +if (skb ==tcp_write_queue_head (sk)) +return NULL ; +return skb ?tcp_write_queue_prev (sk, skb) :tcp_write_queue_tail (sk); }
kernel/trace/ftrace.c +17 -0
@@ -3184,6 +3184,14 @@ t_probe_next(struct seq_file *m, loff_t *pos) hnd = &iter->probe_entry->hlist; hash = iter->probe->ops.func_hash->filter_hash; + +/* +* A probe being registered may temporarily have an empty hash +* and it's at the end of the func_probes list. +*/ +if (!hash || hash ==EMPTY_HASH ) +return NULL ; + size =1 << hash->size_bits; retry:
@@ -4380,12 +4388,21 @@ register_ftrace_function_probe(char *glob, struct trace_array *tr,mutex_unlock (&ftrace_lock); +/* +* Note, there's a small window here that the func_hash->filter_hash +* may be NULL or empty. Need to be carefule when reading the loop. +*/ mutex_lock (&probe->ops.func_hash->regex_lock); orig_hash = &probe->ops.func_hash->filter_hash; old_hash = *orig_hash; hash =alloc_and_copy_ftrace_hash (FTRACE_HASH_DEFAULT_BITS , old_hash); +if (!hash) { + ret = -ENOMEM ; + goto out; + } + ret =ftrace_match_records (hash, glob,strlen (glob));/* Nothing found? */
mm/zsmalloc.c +2 -0
@@ -2431,7 +2431,9 @@ struct zs_pool *zs_create_pool(const char *name)if (!pool->name) goto err; +#ifdef CONFIG_COMPACTION init_waitqueue_head (&pool->migration_wait); +#endif if (create_cache (pool)) goto err;
net/core/stream.c +9 -7
@@ -120,7 +120,6 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)int err =0 ;long vm_wait =0 ;long current_timeo = *timeo_p; -bool noblock = (*timeo_p ? false : true);DEFINE_WAIT_FUNC (wait, woken_wake_function);if (sk_stream_memory_free (sk))
@@ -133,11 +132,8 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)if (sk->sk_err || (sk->sk_shutdown &SEND_SHUTDOWN )) goto do_error; -if (!*timeo_p) { -if (noblock) -set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); - goto do_nonblock; - } +if (!*timeo_p) + goto do_eagain;if (signal_pending (current)) goto do_interrupted;sk_clear_bit (SOCKWQ_ASYNC_NOSPACE , sk);
@@ -169,7 +165,13 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p) do_error: err = -EPIPE ; goto out; -do_nonblock: +do_eagain: +/* Make sure that whenever EAGAIN is returned, EPOLLOUT event can +* be generated later. +* When TCP receives ACK packets that make room, tcp_check_space() +* only calls tcp_new_space() if SOCK_NOSPACE is set. +*/ +set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); err = -EAGAIN ; goto out; do_interrupted:
net/mac80211/cfg.c +5 -4
@@ -1459,6 +1459,11 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,if (is_multicast_ether_addr (mac))return -EINVAL ; +if (params->sta_flags_set &BIT (NL80211_STA_FLAG_TDLS_PEER ) && + sdata->vif.type ==NL80211_IFTYPE_STATION && + !sdata->u.mgd.associated) +return -EINVAL ; + sta =sta_info_alloc (sdata, mac,GFP_KERNEL );if (!sta)return -ENOMEM ;
@@ -1466,10 +1471,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,if (params->sta_flags_set &BIT (NL80211_STA_FLAG_TDLS_PEER )) sta->sta.tdls = true; -if (sta->sta.tdls && sdata->vif.type ==NL80211_IFTYPE_STATION && - !sdata->u.mgd.associated) -return -EINVAL ; - err =sta_apply_parameters (local, sta, params);if (err) {sta_info_free (local, sta);
net/smc/smc_tx.c +2 -4
@@ -70,13 +70,11 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags)DEFINE_WAIT_FUNC (wait, woken_wake_function);struct smc_connection *conn = &smc->conn;struct sock *sk = &smc->sk; -bool noblock;long timeo;int rc =0 ;/* similar to sk_stream_wait_memory */ timeo =sock_sndtimeo (sk, flags &MSG_DONTWAIT ); - noblock = timeo ? false : true;add_wait_queue (sk_sleep (sk), &wait);while (1 ) {sk_set_bit (SOCKWQ_ASYNC_NOSPACE , sk);
@@ -91,8 +89,8 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags)break ; }if (!timeo) { -if (noblock) -set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); +/* ensure EPOLLOUT is subsequently generated */ +set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); rc = -EAGAIN ;break ; }
net/wireless/reg.c +1 -1
@@ -2252,7 +2252,7 @@ static void reg_process_pending_hints(void)/* When last_request->processed becomes true this will be rescheduled */ if (lr && !lr->processed) { -reg_process_hint (lr); +pr_debug ("Pending regulatory request, waiting for it to be processed...\n" );return ; }
sound/core/seq/seq_clientmgr.c +1 -2
@@ -1821,8 +1821,7 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client,if (cptr->type ==USER_CLIENT ) { info->input_pool = cptr->data.user.fifo_pool_size; info->input_free = info->input_pool; -if (cptr->data.user.fifo) - info->input_free =snd_seq_unused_cells (cptr->data.user.fifo->pool); + info->input_free =snd_seq_fifo_unused_cells (cptr->data.user.fifo); }else { info->input_pool =0 ; info->input_free =0 ;
sound/core/seq/seq_fifo.c +17 -0
@@ -280,3 +280,20 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize)return 0 ; } + +/* get the number of unused cells safely */ +int snd_seq_fifo_unused_cells (struct snd_seq_fifo *f) +{ +unsigned long flags; +int cells; + +if (!f) +return 0 ; + +snd_use_lock_use (&f->use_lock); +spin_lock_irqsave (&f->lock, flags); + cells =snd_seq_unused_cells (f->pool); +spin_unlock_irqrestore (&f->lock, flags); +snd_use_lock_free (&f->use_lock); +return cells; +}
sound/core/seq/seq_fifo.h +2 -0
@@ -68,5 +68,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file, poll_table/* resize pool in fifo */ int snd_seq_fifo_resize (struct snd_seq_fifo *f,int poolsize); +/* get the number of unused cells safely */ +int snd_seq_fifo_unused_cells (struct snd_seq_fifo *f);#endif
sound/soc/soc-core.c +2 -5
@@ -1757,11 +1757,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, } } -if (dai_link->dai_fmt) { - ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); -if (ret) -return ret; - } +if (dai_link->dai_fmt) +snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); ret =soc_post_component_init (rtd, dai_link->name);if (ret)
sound/usb/line6/pcm.c +9 -9
@@ -552,6 +552,15 @@ int line6_init_pcm(struct usb_line6 *line6, line6pcm->volume_monitor =255 ; line6pcm->line6 = line6; +spin_lock_init (&line6pcm->out.lock); +spin_lock_init (&line6pcm->in.lock); + line6pcm->impulse_period =LINE6_IMPULSE_DEFAULT_PERIOD ; + + line6->line6pcm = line6pcm; + + pcm->private_data = line6pcm; + pcm->private_free = line6_cleanup_pcm; + line6pcm->max_packet_size_in =usb_maxpacket (line6->usbdev,usb_rcvisocpipe (line6->usbdev, ep_read),0 );
@@ -564,15 +573,6 @@ int line6_init_pcm(struct usb_line6 *line6,return -EINVAL ; } -spin_lock_init (&line6pcm->out.lock); -spin_lock_init (&line6pcm->in.lock); - line6pcm->impulse_period =LINE6_IMPULSE_DEFAULT_PERIOD ; - - line6->line6pcm = line6pcm; - - pcm->private_data = line6pcm; - pcm->private_free = line6_cleanup_pcm; - err =line6_create_audio_out_urbs (line6pcm);if (err <0 )return err;
sound/usb/mixer.c +25 -5
@@ -82,6 +82,7 @@ struct mixer_build {unsigned char *buffer;unsigned int buflen;DECLARE_BITMAP (unitbitmap,MAX_ID_ELEMS ); +DECLARE_BITMAP (termbitmap,MAX_ID_ELEMS );struct usb_audio_term oterm;const struct usbmix_name_map *map;const struct usbmix_selector_map *selector_map;
@@ -716,15 +717,24 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm* parse the source unit recursively until it reaches to a terminal * or a branched unit. */ -static int check_input_term (struct mixer_build *state,int id, +static int __check_input_term (struct mixer_build *state,int id,struct usb_audio_term *term) {int err;void *p1; +unsigned char *hdr;memset (term,0 ,sizeof (*term)); -while ((p1 =find_audio_control_unit (state, id)) !=NULL ) { -unsigned char *hdr = p1; +for (;;) { +/* a loop in the terminal chain? */ +if (test_and_set_bit (id, state->termbitmap)) +return -EINVAL ; + + p1 =find_audio_control_unit (state, id); +if (!p1) +break ; + + hdr = p1; term->id = id;switch (hdr[2 ]) {case UAC_INPUT_TERMINAL :
@@ -739,7 +749,7 @@ static int check_input_term(struct mixer_build *state, int id,/* call recursively to verify that the * referenced clock entity is valid */ - err =check_input_term (state, d->bCSourceID, term); + err =__check_input_term (state, d->bCSourceID, term);if (err <0 )return err;
@@ -771,7 +781,7 @@ static int check_input_term(struct mixer_build *state, int id,case UAC2_CLOCK_SELECTOR : {struct uac_selector_unit_descriptor *d = p1;/* call recursively to retrieve the channel info */ - err =check_input_term (state, d->baSourceID[0 ], term); + err =__check_input_term (state, d->baSourceID[0 ], term);if (err <0 )return err; term->type = d->bDescriptorSubtype <<16 ;/* virtual type */
@@ -818,6 +828,15 @@ static int check_input_term(struct mixer_build *state, int id,return -ENODEV ; } + +static int check_input_term (struct mixer_build *state,int id, +struct usb_audio_term *term) +{ +memset (term,0 ,sizeof (*term)); +memset (state->termbitmap,0 ,sizeof (state->termbitmap)); +return __check_input_term (state, id, term); +} +/* * Feature Unit */
@@ -1700,6 +1719,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid,int pin, ich, err;if (desc->bLength <11 || !(input_pins = desc->bNrInPins) || + desc->bLength <sizeof (*desc) + desc->bNrInPins || !(num_outs =uac_mixer_unit_bNrChannels (desc))) { usb_audio_err(state->chip, "invalid MIXER UNIT descriptor %d\n",
tools/hv/hv_kvp_daemon.c +2 -0
@@ -1380,6 +1380,8 @@ int main(int argc, char *argv[]) daemonize =0 ;break ;case 'h' : +print_usage (argv); +exit (0 );default :print_usage (argv);exit (EXIT_FAILURE );
tools/hv/hv_vss_daemon.c +2 -0
@@ -172,6 +172,8 @@ int main(int argc, char *argv[]) daemonize =0 ;break ;case 'h' : +print_usage (argv); +exit (0 );default :print_usage (argv);exit (EXIT_FAILURE );
virt/kvm/arm/vgic/vgic-mmio.c +18 -0
@@ -123,6 +123,12 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,return value; } +static bool is_vgic_v2_sgi (struct kvm_vcpu *vcpu,struct vgic_irq *irq) +{ +return (vgic_irq_is_sgi (irq->intid) && + vcpu->kvm->arch.vgic.vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V2 ); +} +void vgic_mmio_write_spending (struct kvm_vcpu *vcpu,gpa_t addr,unsigned int len,unsigned long val)
@@ -133,6 +139,12 @@ void vgic_mmio_write_spending(struct kvm_vcpu *vcpu,for_each_set_bit (i, &val, len *8 ) {struct vgic_irq *irq =vgic_get_irq (vcpu->kvm, vcpu, intid + i); +/* GICD_ISPENDR0 SGI bits are WI */ +if (is_vgic_v2_sgi (vcpu, irq)) { +vgic_put_irq (vcpu->kvm, irq); +continue ; + } +spin_lock (&irq->irq_lock); irq->pending_latch = true;
@@ -151,6 +163,12 @@ void vgic_mmio_write_cpending(struct kvm_vcpu *vcpu,for_each_set_bit (i, &val, len *8 ) {struct vgic_irq *irq =vgic_get_irq (vcpu->kvm, vcpu, intid + i); +/* GICD_ICPENDR0 SGI bits are WI */ +if (is_vgic_v2_sgi (vcpu, irq)) { +vgic_put_irq (vcpu->kvm, irq); +continue ; + } +spin_lock (&irq->irq_lock); irq->pending_latch = false;
virt/kvm/arm/vgic/vgic-v2.c +4 -1
@@ -142,7 +142,10 @@ void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)if (vgic_irq_is_sgi (irq->intid)) {u32 src =ffs (irq->source); -BUG_ON (!src); +if (WARN_RATELIMIT (!src,"No SGI source for INTID %d\n" , + irq->intid)) +return ; + val |= (src -1 ) <<GICH_LR_PHYSID_CPUID_SHIFT ; irq->source &= ~(1 << (src -1 ));if (irq->source)
virt/kvm/arm/vgic/vgic-v3.c +4 -1
@@ -124,7 +124,10 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr) model == KVM_DEV_TYPE_ARM_VGIC_V2) {u32 src =ffs (irq->source); -BUG_ON (!src); +if (WARN_RATELIMIT (!src,"No SGI source for INTID %d\n" , + irq->intid)) +return ; + val |= (src -1 ) <<GICH_LR_PHYSID_CPUID_SHIFT ; irq->source &= ~(1 << (src -1 ));if (irq->source)
virt/kvm/arm/vgic/vgic.c +7 -0
@@ -199,6 +199,13 @@ static int vgic_irq_cmp(void *priv, struct list_head *a, struct list_head *b)bool penda, pendb;int ret; +/* +* list_sort may call this function with the same element when +* the list is fairly long. +*/ +if (unlikely (irqa == irqb)) +return 0 ; +spin_lock (&irqa->irq_lock);spin_lock_nested (&irqb->irq_lock,SINGLE_DEPTH_NESTING );