Linux 4.19.70
Greg KH
maintainerI'm announcing the release of the 4.19.70 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.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/arm64/kernel/cpufeature.c | 14 +++ 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/bus/hisi_lpc.c | 47 +++++++++++-- drivers/crypto/ccp/ccp-dev.c | 8 ++ drivers/dma/ste_dma40.c | 4 - drivers/dma/stm32-mdma.c | 2 drivers/dma/ti/omap-dma.c | 4 - drivers/fsi/fsi-scom.c | 8 -- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 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_drv.c | 6 + drivers/gpu/drm/i915/i915_vgpu.c | 3 drivers/gpu/drm/i915/intel_device_info.c | 2 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/media/platform/omap/omap_vout_vrfb.c | 3 drivers/misc/mei/hw-me-regs.h | 2 drivers/misc/mei/pci-me.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/net/wireless/mediatek/mt76/mt76x0/init.c | 4 - drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 2 drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 4 - drivers/nvme/host/core.c | 6 + drivers/nvme/host/multipath.c | 30 ++++++++ drivers/nvme/host/nvme.h | 12 +++ drivers/nvme/host/pci.c | 3 drivers/nvme/target/loop.c | 8 ++ drivers/scsi/ufs/unipro.h | 2 drivers/soundwire/cadence_master.c | 8 +- drivers/usb/chipidea/udc.c | 32 ++++++-- drivers/usb/class/cdc-wdm.c | 16 +++- drivers/usb/core/hcd-pci.c | 30 ++------ 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/usb/typec/tcpm.c | 2 drivers/watchdog/bcm2835_wdt.c | 1 fs/afs/cmservice.c | 10 -- fs/afs/dir.c | 3 fs/afs/file.c | 12 +-- fs/afs/vlclient.c | 11 +-- fs/nfs/direct.c | 34 +++++---- fs/nfs/pagelist.c | 32 ++++---- fs/nfs/read.c | 2 fs/nfs/write.c | 11 ++- include/linux/logic_pio.h | 1 include/linux/nfs_page.h | 10 ++ include/linux/nfs_xdr.h | 2 kernel/trace/ftrace.c | 17 ++++ lib/logic_pio.c | 73 +++++++++++++++----- mm/zsmalloc.c | 2 net/core/stream.c | 16 ++-- net/ipv4/icmp.c | 8 +- net/ipv6/addrconf.c | 3 net/ipv6/route.c | 2 net/mac80211/cfg.c | 9 +- net/mac80211/rx.c | 6 - net/smc/smc_tx.c | 6 - net/tls/tls_main.c | 2 net/tls/tls_sw.c | 10 +- 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/pci/hda/patch_conexant.c | 17 ++-- sound/soc/soc-core.c | 7 - sound/usb/line6/pcm.c | 18 ++--- sound/usb/mixer.c | 36 +++++++--- sound/usb/mixer_quirks.c | 8 +- sound/usb/pcm.c | 1 tools/hv/hv_kvp_daemon.c | 2 tools/hv/hv_vss_daemon.c | 2 tools/hv/lsvmbus | 75 +++++++++++---------- 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 + 101 files changed, 700 insertions(+), 341 deletions(-)
Adrian Vladu (2):
tools: hv: fixed Python pep8/flake8 warnings for lsvmbus
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
Anthony Iliopoulos (1):
nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns
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
Colin Ian King (1):
typec: tcpm: fix a typo in the comparison of pdo_max_voltage
David Ahern (1):
ipv6: Default fib6_type to RTN_UNICAST when not set
David Howells (2):
afs: Fix the CB.ProbeUuid service handler to reply correctly
afs: Only update d_fsdata if different in afs_d_revalidate()
Denis Kenzior (2):
mac80211: Don't memset RXCB prior to PAE intercept
mac80211: Correctly set noencrypt for PAE frames
Ding Xiang (1):
stm class: Fix a double free of stm_source_device
Eddie James (1):
fsi: scom: Don't abort operations for minor errors
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.19.70
Hangbin Liu (2):
ipv6/addrconf: allow adding multicast addr if IFA_F_MCAUTOJOIN is set ipv4/icmp: fix rt dst dev null pointer dereference
Hans Ulli Kroll (1):
usb: host: fotg2: restart hcd after port reset
Hans Verkuil (1):
omap-dma/omap_vout_vrfb: fix off-by-one fi value
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"
Jakub Kicinski (1):
net/tls: swap sk_write_space on close
Jason Baron (1):
net/smc: make sure EPOLLOUT is raised
Jeronimo Borque (1):
ALSA: hda - Fixes inverted Conexant GPIO mic mute led
Jia-Ju Bai (2):
fs: afs: Fix a possible null-pointer dereference in afs_put_read()
dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler()
Johannes Berg (1):
mac80211: fix possible sta leak
John Fastabend (1):
net: tls, fix sk_write_space NULL write when tx disabled
John Garry (5):
lib: logic_pio: Fix RCU usage
lib: logic_pio: Avoid possible overlap for unregistering regions
lib: logic_pio: Add logic_pio_unregister_range()
bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free
bus: hisi_lpc: Add .remove method to avoid driver unbind crash
Jyri Sarha (1):
drm/tilcdc: Register cpufreq notifier after we have initialized crtc
Kai-Heng Feng (3):
USB: storage: ums-realtek: Update module parameter description for auto_delink_en
USB: storage: ums-realtek: Whitelist auto-delink support drm/amdgpu: Add APTX quirk for Dell Latitude 5495
Keith Busch (1):
nvme-pci: Fix async probe remove race
Lionel Landwerlin (1):
drm/i915: fix broadwell EU computation
Logan Gunthorpe (1):
nvmet-loop: Flush nvme_delete_wq when removing the port
Lyude Paul (1):
drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe()
Marc Dionne (1):
afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u()
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
Pierre-Louis Bossart (2):
soundwire: cadence_master: fix register definition for SLAVE_STATE
soundwire: cadence_master: fix definitions for INTSTAT0/1
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
Sagi Grimberg (1):
nvme: fix a possible deadlock when passthru commands sent to a multipath device
Schmid, Carsten (1):
usb: hcd: use managed device resources
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
Stanislaw Gruszka (1):
mt76: mt76x0u: do not reset radio on resume
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 (5):
ALSA: usb-audio: Check mixer unit bitmap yet more strictly
ALSA: line6: Fix memory leak at line6_init_pcm() error path
ALSA: seq: Fix potential concurrent access to the deleted pool
ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604
Tomas Winkler (1):
mei: me: add Tiger Lake point LP device ID
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
Vakul Garg (1):
net/tls: Fixed return value when tls_complete_pending_work() fails
Wenwen Wang (1):
xen/blkback: fix memory leaks
Will Deacon (1):
arm64: cpufeature: Don't treat granule sizes as strict
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 = 19 -SUBLEVEL = 69 +SUBLEVEL = 70 EXTRAVERSION = NAME = "People's Front"
arch/arm64/kernel/cpufeature.c +11 -3
@@ -165,9 +165,17 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = { };static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN4_SHIFT ,4 ,ID_AA64MMFR0_TGRAN4_NI ), -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN64_SHIFT ,4 ,ID_AA64MMFR0_TGRAN64_NI ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN16_SHIFT ,4 ,ID_AA64MMFR0_TGRAN16_NI ), +/* +* We already refuse to boot CPUs that don't support our configured +* page size, so we can only detect mismatches for a page size other +* than the one we're currently using. Unfortunately, SoCs like this +* exist in the wild so, even though we don't like it, we'll have to go +* along with it and treat them as non-strict. +*/ +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN4_SHIFT ,4 ,ID_AA64MMFR0_TGRAN4_NI ), +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN64_SHIFT ,4 ,ID_AA64MMFR0_TGRAN64_NI ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN16_SHIFT ,4 ,ID_AA64MMFR0_TGRAN16_NI ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_BIGENDEL0_SHIFT ,4 ,0 ),/* Linux shouldn't care about secure memory */ ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_SNSMEM_SHIFT ,4 ,0 ),
arch/powerpc/kvm/book3s_64_vio.c +4 -2
@@ -602,8 +602,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, stt,
arch/powerpc/kvm/book3s_64_vio_hv.c +4 -2
@@ -528,8 +528,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, stt,
arch/x86/kernel/apic/apic.c +4 -0
@@ -1140,6 +1140,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
@@ -521,9 +521,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)
@@ -534,9 +537,9 @@ static int default_pre_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)static int emulate_push_stack (struct pt_regs *regs,unsigned long val) { -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, &val,sizeof_long ())) +if (copy_to_user ((void __user *)new_sp, &val,sizeof_long (regs)))return -EFAULT ; regs->sp = new_sp;
@@ -569,7 +572,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 (emulate_push_stack (regs, utask->vaddr + auprobe->defparam.ilen))return -ERESTART ; }
@@ -688,7 +691,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 ; }
@@ -1068,7 +1071,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
@@ -6308,12 +6308,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
@@ -1618,6 +1618,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
@@ -974,6 +974,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)
@@ -996,7 +997,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 ;
@@ -1016,8 +1017,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/bus/hisi_lpc.c +41 -6
96 lines not on this page · raw message
drivers/crypto/ccp/ccp-dev.c +8 -0
@@ -543,6 +543,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 ;
@@ -567,6 +571,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/dma/stm32-mdma.c +1 -1
@@ -1376,7 +1376,7 @@ static irqreturn_t stm32_mdma_irq_handler(int irq, void *devid) chan = &dmadev->chan[id];if (!chan) { -dev_err (chan2dev (chan),"MDMA channel not initialized\n" ); +dev_dbg (mdma2dev (dmadev),"MDMA channel not initialized\n" ); goto exit; }
drivers/dma/ti/omap-dma.c +2 -2
@@ -1237,7 +1237,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_interleaved(if (src_icg) { d->ccr |=CCR_SRC_AMODE_DBLIDX ; d->ei =1 ; - d->fi = src_icg; + d->fi = src_icg +1 ; }else if (xt->src_inc) { d->ccr |=CCR_SRC_AMODE_POSTINC ; d->fi =0 ;
@@ -1252,7 +1252,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_interleaved(if (dst_icg) { d->ccr |=CCR_DST_AMODE_DBLIDX ; sg->ei =1 ; - sg->fi = dst_icg; + sg->fi = dst_icg +1 ; }else if (xt->dst_inc) { d->ccr |=CCR_DST_AMODE_POSTINC ; sg->fi =0 ;
drivers/fsi/fsi-scom.c +1 -7
@@ -47,8 +47,7 @@#define SCOM_STATUS_PIB_RESP_MASK 0x00007000#define SCOM_STATUS_PIB_RESP_SHIFT 12 -#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_ERR_SUMMARY | \ - SCOM_STATUS_PROTECTION | \ +#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_PROTECTION | \ SCOM_STATUS_PARITY | \ SCOM_STATUS_PIB_ABORT | \ SCOM_STATUS_PIB_RESP_MASK)
@@ -260,11 +259,6 @@ static int handle_fsi2pib_status(struct scom_device *scom, uint32_t status)/* Return -EBUSY on PIB abort to force a retry */ if (status &SCOM_STATUS_PIB_ABORT )return -EBUSY ; -if (status &SCOM_STATUS_ERR_SUMMARY ) { -fsi_device_write (scom->fsi_dev,SCOM_FSI2PIB_RESET_REG , &dummy, -sizeof (uint32_t )); -return -EIO ; - }return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +1 -0
@@ -575,6 +575,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = { { 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX }, + { 0x1002, 0x699f, 0x1028, 0x0814, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x17AA, 0x3806, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0, 0, 0, 0, 0 },
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_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_drv.c +6 -0
@@ -1120,6 +1120,12 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)pci_set_master (pdev); +/* +* We don't have a max segment size, so set it to the max so sg's +* debugging layer doesn't complain +*/ +dma_set_max_seg_size (&pdev->dev,UINT_MAX ); +/* overlay on gen2 is broken and can't address above 1G */ if (IS_GEN2 (dev_priv)) { ret =dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (30 ));
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/i915/intel_device_info.c +1 -1
@@ -474,7 +474,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)u8 eu_disabled_mask;u32 n_disabled; -if (!(sseu->subslice_mask[ss] &BIT (ss))) +if (!(sseu->subslice_mask[s] &BIT (ss)))/* skip disabled subslice */ continue ;
drivers/gpu/drm/tilcdc/tilcdc_drv.c +17 -17
@@ -184,6 +184,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);
@@ -198,12 +204,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);
@@ -274,17 +274,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 ;
@@ -361,6 +350,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
@@ -140,6 +140,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),
@@ -175,6 +180,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
@@ -1098,7 +1098,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
@@ -69,6 +69,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)
@@ -339,6 +340,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 ;
@@ -355,7 +362,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)
@@ -390,8 +397,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;
@@ -401,7 +408,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
@@ -98,7 +98,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
@@ -362,18 +362,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 { if (!request_muxed_region(SB800_PIIX4_SMB_IDX, 2,
drivers/i2c/busses/i2c-rcar.c +7 -4
@@ -139,6 +139,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)
@@ -859,9 +860,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));
@@ -916,7 +919,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)
@@ -979,10 +982,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
@@ -675,7 +675,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/media/platform/omap/omap_vout_vrfb.c +1 -2
@@ -253,8 +253,7 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout,*/ pixsize = vout->bpp * vout->vrfb_bpp; - dst_icg = ((MAX_PIXELS_PER_LINE * pixsize) - - (vout->pix.width * vout->bpp)) +1 ; + dst_icg =MAX_PIXELS_PER_LINE * pixsize - vout->pix.width * vout->bpp; xt->src_start = vout->buf_phy_addr[vb->i]; xt->dst_start = vout->vrfb_context[vb->i].paddr[0 ];
drivers/misc/mei/hw-me-regs.h +2 -0
@@ -141,6 +141,8 @@#define MEI_DEV_ID_ICP_LP 0x34E0/* Ice Lake Point LP */ +#define MEI_DEV_ID_TGP_LP 0xA0E0/* Tiger Lake Point LP */ +#define MEI_DEV_ID_MCC 0x4B70/* Mule Creek Canyon (EHL) */ #define MEI_DEV_ID_MCC_4 0x4B75/* Mule Creek Canyon 4 (EHL) */
drivers/misc/mei/pci-me.c +2 -0
@@ -107,6 +107,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)},
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
@@ -1277,6 +1277,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
@@ -365,6 +365,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/net/wireless/mediatek/mt76/mt76x0/init.c +2 -2
@@ -369,7 +369,7 @@ static void mt76x0_stop_hardware(struct mt76x0_dev *dev)mt76x0_chip_onoff (dev, false, false); } -int mt76x0_init_hardware (struct mt76x0_dev *dev) +int mt76x0_init_hardware (struct mt76x0_dev *dev,bool reset) {static const u16 beacon_offsets[16 ] = {/* 512 byte per beacon */
@@ -382,7 +382,7 @@ int mt76x0_init_hardware(struct mt76x0_dev *dev) dev->beacon_offsets = beacon_offsets; -mt76x0_chip_onoff (dev, true, true); +mt76x0_chip_onoff (dev, true, reset); ret =mt76x0_wait_asic_ready (dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +1 -1
@@ -279,7 +279,7 @@ void mt76x0_addr_wr(struct mt76x0_dev *dev, const u32 offset, const u8 *addr);/* Init */ struct mt76x0_dev *mt76x0_alloc_device (struct device *dev); -int mt76x0_init_hardware (struct mt76x0_dev *dev); +int mt76x0_init_hardware (struct mt76x0_dev *dev,bool reset);int mt76x0_register_device (struct mt76x0_dev *dev);void mt76x0_cleanup (struct mt76x0_dev *dev);void mt76x0_chip_onoff (struct mt76x0_dev *dev,bool enable,bool reset);
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +2 -2
@@ -300,7 +300,7 @@ static int mt76x0_probe(struct usb_interface *usb_intf,if (!(mt76_rr (dev,MT_EFUSE_CTRL ) &MT_EFUSE_CTRL_SEL ))dev_warn (dev->mt76.dev,"Warning: eFUSE not present\n" ); - ret =mt76x0_init_hardware (dev); + ret =mt76x0_init_hardware (dev, true);if (ret) goto err;
@@ -354,7 +354,7 @@ static int mt76x0_resume(struct usb_interface *usb_intf)struct mt76x0_dev *dev =usb_get_intfdata (usb_intf);int ret; - ret =mt76x0_init_hardware (dev); + ret =mt76x0_init_hardware (dev, false);if (ret)return ret;
drivers/nvme/host/core.c +6 -0
@@ -1183,6 +1183,9 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,*/ if (effects & (NVME_CMD_EFFECTS_LBCC |NVME_CMD_EFFECTS_CSE_MASK )) {mutex_lock (&ctrl->scan_lock); +mutex_lock (&ctrl->subsys->lock); +nvme_mpath_start_freeze (ctrl->subsys); +nvme_mpath_wait_freeze (ctrl->subsys);nvme_start_freeze (ctrl);nvme_wait_freeze (ctrl); }
@@ -1213,6 +1216,8 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects)nvme_update_formats (ctrl);if (effects & (NVME_CMD_EFFECTS_LBCC |NVME_CMD_EFFECTS_CSE_MASK )) {nvme_unfreeze (ctrl); +nvme_mpath_unfreeze (ctrl->subsys); +mutex_unlock (&ctrl->subsys->lock);mutex_unlock (&ctrl->scan_lock); }if (effects &NVME_CMD_EFFECTS_CCC )
@@ -1557,6 +1562,7 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)if (ns->head->disk) {nvme_update_disk_info (ns->head->disk, ns, id);blk_queue_stack_limits (ns->head->disk->queue, ns->queue); +revalidate_disk (ns->head->disk); }#endif }
drivers/nvme/host/multipath.c +30 -0
@@ -20,6 +20,36 @@ module_param(multipath, bool, 0444);MODULE_PARM_DESC (multipath,"turn on native support for multiple controllers per subsystem" ); +void nvme_mpath_unfreeze (struct nvme_subsystem *subsys) +{ +struct nvme_ns_head *h; + +lockdep_assert_held (&subsys->lock); +list_for_each_entry (h, &subsys->nsheads, entry) +if (h->disk) +blk_mq_unfreeze_queue (h->disk->queue); +} + +void nvme_mpath_wait_freeze (struct nvme_subsystem *subsys) +{ +struct nvme_ns_head *h; + +lockdep_assert_held (&subsys->lock); +list_for_each_entry (h, &subsys->nsheads, entry) +if (h->disk) +blk_mq_freeze_queue_wait (h->disk->queue); +} + +void nvme_mpath_start_freeze (struct nvme_subsystem *subsys) +{ +struct nvme_ns_head *h; + +lockdep_assert_held (&subsys->lock); +list_for_each_entry (h, &subsys->nsheads, entry) +if (h->disk) +blk_freeze_queue_start (h->disk->queue); +} +/* * If multipathing is enabled we need to always use the subsystem instance * number for numbering our devices to avoid conflicts between subsystems that
drivers/nvme/host/nvme.h +12 -0
@@ -469,6 +469,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)return ctrl->ana_log_buf !=NULL ; } +void nvme_mpath_unfreeze (struct nvme_subsystem *subsys); +void nvme_mpath_wait_freeze (struct nvme_subsystem *subsys); +void nvme_mpath_start_freeze (struct nvme_subsystem *subsys);void nvme_set_disk_name (char *disk_name,struct nvme_ns *ns,struct nvme_ctrl *ctrl,int *flags);void nvme_failover_req (struct request *req);
@@ -553,6 +556,15 @@ static inline void nvme_mpath_uninit(struct nvme_ctrl *ctrl)static inline void nvme_mpath_stop (struct nvme_ctrl *ctrl) { } +static inline void nvme_mpath_unfreeze (struct nvme_subsystem *subsys) +{ +} +static inline void nvme_mpath_wait_freeze (struct nvme_subsystem *subsys) +{ +} +static inline void nvme_mpath_start_freeze (struct nvme_subsystem *subsys) +{ +}#endif /* CONFIG_NVME_MULTIPATH */ #ifdef CONFIG_NVM
drivers/nvme/host/pci.c +2 -1
@@ -2468,7 +2468,7 @@ static void nvme_async_probe(void *data, async_cookie_t cookie) {struct nvme_dev *dev = data; -nvme_reset_ctrl_sync (&dev->ctrl); +flush_work (&dev->ctrl.reset_work);flush_work (&dev->ctrl.scan_work);nvme_put_ctrl (&dev->ctrl); }
@@ -2535,6 +2535,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)dev_info (dev->ctrl.device,"pci function %s\n" ,dev_name (&pdev->dev)); +nvme_reset_ctrl (&dev->ctrl);nvme_get_ctrl (&dev->ctrl);async_schedule (nvme_async_probe, dev);
drivers/nvme/target/loop.c +8 -0
@@ -678,6 +678,14 @@ static void nvme_loop_remove_port(struct nvmet_port *port)mutex_lock (&nvme_loop_ports_mutex);list_del_init (&port->entry);mutex_unlock (&nvme_loop_ports_mutex); + +/* +* Ensure any ctrls that are in the process of being +* deleted are in fact deleted before we return +* and free the port. This is to prevent active +* ctrls from using a port after it's freed. +*/ +flush_workqueue (nvme_delete_wq); }static const struct nvmet_fabrics_ops nvme_loop_ops = {
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/soundwire/cadence_master.c +4 -4
@@ -81,8 +81,8 @@#define CDNS_MCP_INTSET 0x4C -#define CDNS_SDW_SLAVE_STAT 0x50 -#define CDNS_MCP_SLAVE_STAT_MASK BIT(1, 0) +#define CDNS_MCP_SLAVE_STAT 0x50 +#define CDNS_MCP_SLAVE_STAT_MASK GENMASK(1, 0)#define CDNS_MCP_SLAVE_INTSTAT0 0x54#define CDNS_MCP_SLAVE_INTSTAT1 0x58
@@ -96,8 +96,8 @@#define CDNS_MCP_SLAVE_INTMASK0 0x5C#define CDNS_MCP_SLAVE_INTMASK1 0x60 -#define CDNS_MCP_SLAVE_INTMASK0_MASK GENMASK(30, 0) -#define CDNS_MCP_SLAVE_INTMASK1_MASK GENMASK(16, 0) +#define CDNS_MCP_SLAVE_INTMASK0_MASK GENMASK(31, 0) +#define CDNS_MCP_SLAVE_INTMASK1_MASK GENMASK(15, 0)#define CDNS_MCP_PORT_INTSTAT 0x64#define CDNS_MCP_PDI_STAT 0x6C
drivers/usb/chipidea/udc.c +24 -8
@@ -708,12 +708,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);
@@ -731,6 +725,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 ; }
@@ -1302,6 +1302,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 */
@@ -1391,6 +1395,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;
@@ -1414,8 +1422,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);
@@ -1486,6 +1494,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);
@@ -1558,6 +1570,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
@@ -587,10 +587,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);
@@ -974,8 +984,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/core/hcd-pci.c +8 -22
@@ -216,17 +216,18 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)/* EHCI, OHCI */ hcd->rsrc_start =pci_resource_start (dev,0 ); hcd->rsrc_len =pci_resource_len (dev,0 ); -if (!request_mem_region (hcd->rsrc_start, hcd->rsrc_len, - driver->description)) { +if (!devm_request_mem_region (&dev->dev, hcd->rsrc_start, + hcd->rsrc_len, driver->description)) {dev_dbg (&dev->dev,"controller already in use\n" ); retval = -EBUSY ; goto put_hcd; } - hcd->regs =ioremap_nocache (hcd->rsrc_start, hcd->rsrc_len); + hcd->regs =devm_ioremap_nocache (&dev->dev, hcd->rsrc_start, + hcd->rsrc_len);if (hcd->regs ==NULL ) {dev_dbg (&dev->dev,"error mapping memory\n" ); retval = -EFAULT ; - goto release_mem_region; + goto put_hcd; } }else {
@@ -240,8 +241,8 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) hcd->rsrc_start =pci_resource_start (dev, region); hcd->rsrc_len =pci_resource_len (dev, region); -if (request_region (hcd->rsrc_start, hcd->rsrc_len, - driver->description)) +if (devm_request_region (&dev->dev, hcd->rsrc_start, + hcd->rsrc_len, driver->description))break ; }if (region ==PCI_ROM_RESOURCE ) {
@@ -275,20 +276,13 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) }if (retval !=0 ) - goto unmap_registers; + goto put_hcd;device_wakeup_enable (hcd->self.controller);if (pci_dev_run_wake (dev))pm_runtime_put_noidle (&dev->dev);return retval; -unmap_registers: -if (driver->flags &HCD_MEMORY ) { -iounmap (hcd->regs); -release_mem_region: -release_mem_region (hcd->rsrc_start, hcd->rsrc_len); - }else -release_region (hcd->rsrc_start, hcd->rsrc_len); put_hcd:usb_put_hcd (hcd); disable_pci:
@@ -347,14 +341,6 @@ void usb_hcd_pci_remove(struct pci_dev *dev)dev_set_drvdata (&dev->dev,NULL );up_read (&companions_rwsem); } - -if (hcd->driver->flags &HCD_MEMORY ) { -iounmap (hcd->regs); -release_mem_region (hcd->rsrc_start, hcd->rsrc_len); - }else { -release_region (hcd->rsrc_start, hcd->rsrc_len); - } -usb_put_hcd (hcd);pci_disable_device (dev); }
drivers/usb/gadget/composite.c +1 -0
@@ -1976,6 +1976,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;
@@ -391,7 +392,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;
@@ -404,6 +406,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);
@@ -411,6 +414,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 ); +}/*-------------------------------------------------------------------------*/
@@ -2285,16 +2292,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 ); }
@@ -2307,6 +2314,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
@@ -2360,6 +2368,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 ;
@@ -2413,8 +2422,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 ;
@@ -2989,8 +2998,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
@@ -1627,6 +1627,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
@@ -418,8 +418,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;
@@ -435,6 +434,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(struct timer_list *t) 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
@@ -104,7 +104,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
@@ -38,7 +38,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 ;
@@ -996,12 +996,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
@@ -2100,7 +2100,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/usb/typec/tcpm.c +1 -1
@@ -1445,7 +1445,7 @@ static enum pdo_err tcpm_caps_err(struct tcpm_port *port, const u32 *pdo,else if ((pdo_min_voltage (pdo[i]) ==pdo_min_voltage (pdo[i -1 ])) && (pdo_max_voltage (pdo[i]) == -pdo_min_voltage (pdo[i -1 ]))) +pdo_max_voltage (pdo[i -1 ])))return PDO_ERR_DUPE_PDO ;break ;/*
drivers/watchdog/bcm2835_wdt.c +1 -0
@@ -249,6 +249,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/afs/cmservice.c +3 -7
@@ -423,18 +423,14 @@ static void SRXAFSCB_ProbeUuid(struct work_struct *work) struct afs_call *call = container_of(work, struct afs_call, work);struct afs_uuid *r = call->request; -struct { -__be32 match; - } reply; -_enter ("" );if (memcmp (r, &call->net->uuid,sizeof (call->net->uuid)) ==0 ) - reply.match =htonl (0 ); +afs_send_empty_reply (call);else - reply.match =htonl (1 ); +rxrpc_kernel_abort_call (call->net->socket, call->rxcall, +1 ,1 ,"K-1" ); -afs_send_simple_reply (call, &reply,sizeof (reply));afs_put_call (call);_leave ("" ); }
fs/afs/dir.c +2 -1
@@ -937,7 +937,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) dir_version = (long )dir->status.data_version; de_version = (long )dentry->d_fsdata;if (de_version == dir_version) - goto out_valid; + goto out_valid_noupdate; dir_version = (long )dir->invalid_before;if (de_version - dir_version >=0 )
@@ -1001,6 +1001,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) out_valid: dentry->d_fsdata = (void *)dir_version; +out_valid_noupdate:dput (parent);key_put (key);_leave (" = 1 [valid]" );
fs/afs/file.c +7 -5
@@ -193,11 +193,13 @@ void afs_put_read(struct afs_read *req)int i;if (refcount_dec_and_test (&req->usage)) { -for (i =0 ; i < req->nr_pages; i++) -if (req->pages[i]) -put_page (req->pages[i]); -if (req->pages != req->array) -kfree (req->pages); +if (req->pages) { +for (i =0 ; i < req->nr_pages; i++) +if (req->pages[i]) +put_page (req->pages[i]); +if (req->pages != req->array) +kfree (req->pages); + }kfree (req); } }
fs/afs/vlclient.c +6 -5
@@ -60,23 +60,24 @@ static int afs_deliver_vl_get_entry_by_name_u(struct afs_call *call)struct afs_uuid__xdr *xdr;struct afs_uuid *uuid;int j; +int n = entry->nr_servers; tmp =ntohl (uvldb->serverFlags[i]);if (tmp &AFS_VLSF_DONTUSE || (new_only && !(tmp &AFS_VLSF_NEWREPSITE )))continue ;if (tmp &AFS_VLSF_RWVOL ) { - entry->fs_mask[i] |=AFS_VOL_VTM_RW ; + entry->fs_mask[n] |=AFS_VOL_VTM_RW ;if (vlflags &AFS_VLF_BACKEXISTS ) - entry->fs_mask[i] |=AFS_VOL_VTM_BAK ; + entry->fs_mask[n] |=AFS_VOL_VTM_BAK ; }if (tmp &AFS_VLSF_ROVOL ) - entry->fs_mask[i] |=AFS_VOL_VTM_RO ; -if (!entry->fs_mask[i]) + entry->fs_mask[n] |=AFS_VOL_VTM_RO ; +if (!entry->fs_mask[n])continue ; xdr = &uvldb->serverNumber[i]; - uuid = (struct afs_uuid *)&entry->fs_server[i]; + uuid = (struct afs_uuid *)&entry->fs_server[n]; uuid->time_low = xdr->time_low; uuid->time_mid =htons (ntohl (xdr->time_mid)); uuid->time_hi_and_version =htons (ntohl (xdr->time_hi_and_version));
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
@@ -769,8 +769,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++;
@@ -962,8 +961,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 ; }
@@ -995,9 +993,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); }/**
@@ -1133,7 +1130,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); } }
@@ -1235,21 +1233,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
@@ -1394,20 +1394,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 );filemap_fdatawrite_range (hdr->inode->i_mapping, hdr->args.offset, hdr->args.offset + hdr->args.count -1 ); }
include/linux/logic_pio.h +1 -0
@@ -117,6 +117,7 @@ struct logic_pio_hwaddr *find_io_range_by_fwnode(struct fwnode_handle *fwnode);unsigned long logic_pio_trans_hwaddr (struct fwnode_handle *fwnode,resource_size_t hw_addr,resource_size_t size);int logic_pio_register_range (struct logic_pio_hwaddr *newrange); +void logic_pio_unregister_range (struct logic_pio_hwaddr *range);resource_size_t logic_pio_to_hwaddr (unsigned long pio);unsigned long logic_pio_trans_cpuaddr (resource_size_t hw_addr);
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
@@ -1539,7 +1539,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);
kernel/trace/ftrace.c +17 -0
@@ -3112,6 +3112,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:
@@ -4307,12 +4315,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? */
lib/logic_pio.c +54 -19
137 lines not on this page · raw message
mm/zsmalloc.c +2 -0
@@ -2432,7 +2432,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/ipv4/icmp.c +7 -1
@@ -587,7 +587,13 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,if (!rt) goto out; - net =dev_net (rt->dst.dev); + +if (rt->dst.dev) + net =dev_net (rt->dst.dev); +else if (skb_in->dev) + net =dev_net (skb_in->dev); +else + goto out;/* * Find the original header. It is expected to be valid, of course.
net/ipv6/addrconf.c +2 -1
@@ -995,7 +995,8 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,int err =0 ;if (addr_type ==IPV6_ADDR_ANY || - addr_type &IPV6_ADDR_MULTICAST || + (addr_type &IPV6_ADDR_MULTICAST && + !(cfg->ifa_flags &IFA_F_MCAUTOJOIN )) || (!(idev->dev->flags &IFF_LOOPBACK ) && addr_type &IPV6_ADDR_LOOPBACK ))return ERR_PTR (-EADDRNOTAVAIL );
net/ipv6/route.c +1 -1
@@ -3109,7 +3109,7 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg, rt->fib6_metric = cfg->fc_metric; rt->fib6_nh.nh_weight =1 ; - rt->fib6_type = cfg->fc_type; + rt->fib6_type = cfg->fc_type ? :RTN_UNICAST ;/* We cannot add true routes via loopback here, they would result in kernel looping; promote them to reject routes
net/mac80211/cfg.c +5 -4
@@ -1471,6 +1471,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 ;
@@ -1478,10 +1483,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/mac80211/rx.c +3 -3
@@ -2372,11 +2372,13 @@ static void ieee80211_deliver_skb_to_local_stack(struct sk_buff *skb, skb->protocol == cpu_to_be16(ETH_P_PREAUTH)) && sdata->control_port_over_nl80211)) { struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); - bool noencrypt = status->flag & RX_FLAG_DECRYPTED; + bool noencrypt = !(status->flag & RX_FLAG_DECRYPTED); cfg80211_rx_control_port(dev, skb, noencrypt); dev_kfree_skb(skb); } else { +memset (skb->cb,0 ,sizeof (skb->cb)); +/* deliver to local stack */ if (rx->napi)napi_gro_receive (rx->napi, skb);
@@ -2470,8 +2472,6 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)if (skb) { skb->protocol =eth_type_trans (skb, dev); -memset (skb->cb,0 ,sizeof (skb->cb)); -ieee80211_deliver_skb_to_local_stack (skb, rx); }
net/smc/smc_tx.c +2 -4
@@ -75,13 +75,11 @@ static int smc_tx_wait(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);
@@ -96,8 +94,8 @@ static int smc_tx_wait(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/tls/tls_main.c +2 -0
@@ -301,6 +301,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)#else {#endif +if (sk->sk_write_space == tls_write_space) + sk->sk_write_space = ctx->sk_write_space;tls_ctx_free (ctx); ctx =NULL ; }
net/tls/tls_sw.c +6 -4
@@ -354,7 +354,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) {struct tls_context *tls_ctx =tls_get_ctx (sk);struct tls_sw_context_tx *ctx =tls_sw_ctx_tx (tls_ctx); -int ret =0 ; +int ret;int required_size;long timeo =sock_sndtimeo (sk, msg->msg_flags &MSG_DONTWAIT );bool eor = !(msg->msg_flags &MSG_MORE );
@@ -370,7 +370,8 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)lock_sock (sk); -if (tls_complete_pending_work (sk, tls_ctx, msg->msg_flags, &timeo)) + ret =tls_complete_pending_work (sk, tls_ctx, msg->msg_flags, &timeo); +if (ret) goto send_end;if (unlikely (msg->msg_controllen)) {
@@ -505,7 +506,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page, {struct tls_context *tls_ctx =tls_get_ctx (sk);struct tls_sw_context_tx *ctx =tls_sw_ctx_tx (tls_ctx); -int ret =0 ; +int ret;long timeo =sock_sndtimeo (sk, flags &MSG_DONTWAIT );bool eor;size_t orig_size = size;
@@ -525,7 +526,8 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,sk_clear_bit (SOCKWQ_ASYNC_NOSPACE , sk); -if (tls_complete_pending_work (sk, tls_ctx, flags, &timeo)) + ret =tls_complete_pending_work (sk, tls_ctx, flags, &timeo); +if (ret) goto sendpage_end;/* Call the sk_stream functions to manage the sndbuf mem. */
net/wireless/reg.c +1 -1
@@ -2777,7 +2777,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
@@ -1818,8 +1818,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/pci/hda/patch_conexant.c +9 -8
@@ -624,18 +624,20 @@ static void cxt_fixup_hp_gate_mic_jack(struct hda_codec *codec,/* update LED status via GPIO */ static void cxt_update_gpio_led (struct hda_codec *codec,unsigned int mask, -bool enabled) +bool led_on) {struct conexant_spec *spec = codec->spec;unsigned int oldval = spec->gpio_led;if (spec->mute_led_polarity) - enabled = !enabled; + led_on = !led_on; -if (enabled) - spec->gpio_led &= ~mask; -else +if (led_on) spec->gpio_led |= mask; +else + spec->gpio_led &= ~mask; +codec_dbg (codec,"mask:%d enabled:%d gpio_led:%d\n" , + mask, led_on, spec->gpio_led);if (spec->gpio_led != oldval)snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DATA , spec->gpio_led);
@@ -646,8 +648,8 @@ static void cxt_fixup_gpio_mute_hook(void *private_data, int enabled) {struct hda_codec *codec = private_data;struct conexant_spec *spec = codec->spec; - -cxt_update_gpio_led (codec, spec->gpio_mute_led_mask, enabled); +/* muted -> LED on */ +cxt_update_gpio_led (codec, spec->gpio_mute_led_mask, !enabled); }/* turn on/off mic-mute LED via GPIO per capture hook */
@@ -669,7 +671,6 @@ static void cxt_fixup_mute_led_gpio(struct hda_codec *codec, { 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03 }, {} }; -codec_info (codec,"action: %d gpio_led: %d\n" , action, spec->gpio_led);if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { spec->gen.vmaster_mute.hook = cxt_fixup_gpio_mute_hook;
sound/soc/soc-core.c +2 -5
@@ -1513,11 +1513,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
@@ -554,6 +554,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 );
@@ -566,15 +575,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 +28 -8
@@ -754,7 +754,6 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state, struct uac_mixer_unit_descriptor *desc) {int mu_channels; -void *c;if (desc->bLength <sizeof (*desc))return -EINVAL ;
@@ -777,13 +776,6 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state,break ; } -if (!mu_channels) -return 0 ; - - c =uac_mixer_unit_bmControls (desc, state->mixer->protocol); -if (c - (void *)desc + (mu_channels -1 ) /8 >= desc->bLength) -return 0 ;/* no bmControls -> skip */ -return mu_channels; }
@@ -2028,6 +2020,31 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,* Mixer Unit */ +/* check whether the given in/out overflows bmMixerControls matrix */ +static bool mixer_bitmap_overflow (struct uac_mixer_unit_descriptor *desc, +int protocol,int num_ins,int num_outs) +{ +u8 *hdr = (u8 *)desc; +u8 *c =uac_mixer_unit_bmControls (desc, protocol); +size_t rest;/* remaining bytes after bmMixerControls */ + +switch (protocol) { +case UAC_VERSION_1 : +default : + rest =1 ;/* iMixer */ +break ; +case UAC_VERSION_2 : + rest =2 ;/* bmControls + iMixer */ +break ; +case UAC_VERSION_3 : + rest =6 ;/* bmControls + wMixerDescrStr */ +break ; + } + +/* overflow? */ +return c + (num_ins * num_outs +7 ) /8 + rest > hdr + hdr[0 ]; +} +/* * build a mixer unit control *
@@ -2156,6 +2173,9 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid,if (err <0 )return err; num_ins += iterm.channels; +if (mixer_bitmap_overflow (desc, state->mixer->protocol, + num_ins, num_outs)) +break ;for (; ich < num_ins; ich++) {int och, ich_has_controls =0 ;
sound/usb/mixer_quirks.c +4 -4
@@ -1167,17 +1167,17 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip, {struct usb_mixer_interface *mixer;struct usb_mixer_elem_info *cval; -int unitid =12 ;/* SamleRate ExtensionUnit ID */ +int unitid =12 ;/* SampleRate ExtensionUnit ID */ list_for_each_entry (mixer, &chip->mixer_list, list) { - cval =mixer_elem_list_to_info (mixer->id_elems[unitid]); -if (cval) { +if (mixer->id_elems[unitid]) { + cval =mixer_elem_list_to_info (mixer->id_elems[unitid]);snd_usb_mixer_set_ctl_value (cval,UAC_SET_CUR , cval->control <<8 , samplerate_id);snd_usb_mixer_notify_id (mixer, unitid); +break ; } -break ; } }
sound/usb/pcm.c +1 -0
@@ -350,6 +350,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, ep =0x81 ; ifnum =2 ; goto add_sync_ep_from_ifnum; +case USB_ID (0x1397 ,0x0001 ):/* Behringer UFX1604 */ case USB_ID (0x1397 ,0x0002 ):/* Behringer UFX1204 */ ep =0x81 ; ifnum =1 ;
tools/hv/hv_kvp_daemon.c +2 -0
@@ -1386,6 +1386,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
@@ -229,6 +229,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/lsvmbus +42 -33
113 lines not on this page · raw message
virt/kvm/arm/vgic/vgic-mmio.c +18 -0
@@ -203,6 +203,12 @@ static void vgic_hw_irq_spending(struct kvm_vcpu *vcpu, struct vgic_irq *irq,vgic_irq_set_phys_active (irq, true); } +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)
@@ -215,6 +221,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_irqsave (&irq->irq_lock, flags);if (irq->hw)vgic_hw_irq_spending (vcpu, irq, is_uaccess);
@@ -262,6 +274,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_irqsave (&irq->irq_lock, flags);if (irq->hw)
virt/kvm/arm/vgic/vgic-v2.c +4 -1
@@ -195,7 +195,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
@@ -179,7 +179,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
@@ -244,6 +244,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 );