Linux 4.4.31
Greg KH
maintainerI'm announcing the release of the 4.4.31 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 3 + arch/arm/include/asm/floppy.h | 2 - arch/h8300/include/asm/thread_info.h | 4 -- arch/h8300/kernel/signal.c | 2 - arch/mips/kvm/emulate.c | 8 ++-- arch/parisc/kernel/syscall.S | 11 ++++- arch/powerpc/kernel/ptrace.c | 4 +- arch/x86/include/asm/uaccess.h | 10 ++--- arch/x86/kvm/emulate.c | 2 - arch/x86/kvm/x86.c | 4 +- arch/x86/xen/mmu.c | 2 - drivers/android/binder.c | 35 +++++++++++++---- drivers/char/virtio_console.c | 22 ++++++++--- drivers/firewire/net.c | 59 +++++++++++++++++++----------- drivers/gpu/drm/drm_dp_mst_topology.c | 6 ++- drivers/gpu/drm/exynos/exynos_drm_core.c | 2 - drivers/gpu/drm/radeon/ni.c | 4 -- drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 - drivers/gpu/drm/radeon/si_dpm.c | 53 +++++++++++++++++++++----- drivers/hid/hid-ids.h | 1 drivers/hid/usbhid/hid-quirks.c | 1 drivers/hv/hv_util.c | 10 +++-- drivers/i2c/busses/i2c-xgene-slimpro.c | 2 - drivers/i2c/i2c-core.c | 2 - drivers/input/serio/i8042-x86ia64io.h | 7 +++ drivers/md/dm-raid1.c | 1 drivers/md/dm.c | 4 +- drivers/misc/genwqe/card_utils.c | 12 +++++- drivers/misc/mei/hw-txe.c | 6 ++- drivers/mmc/host/dw_mmc-pltfm.c | 5 +- drivers/mtd/ubi/fastmap.c | 17 ++++---- drivers/net/ethernet/smsc/smc91x.c | 2 - drivers/pwm/core.c | 2 + drivers/pwm/sysfs.c | 18 +++++++++ drivers/scsi/arcmsr/arcmsr_hba.c | 9 ---- drivers/scsi/megaraid/megaraid_sas_base.c | 13 ++---- drivers/scsi/scsi_debug.c | 1 drivers/tty/vt/vt.c | 7 +++ drivers/usb/dwc3/gadget.c | 4 +- drivers/usb/gadget/function/u_ether.c | 5 +- drivers/usb/host/ohci-hcd.c | 2 - drivers/usb/host/xhci-hub.c | 4 +- drivers/usb/host/xhci-pci.c | 4 +- drivers/usb/serial/cp210x.c | 4 +- drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio_ids.h | 5 +- drivers/usb/serial/usb-serial.c | 3 + drivers/virtio/virtio_ring.c | 14 ++++--- fs/btrfs/tree-log.c | 20 +++------- fs/overlayfs/copy_up.c | 2 + fs/ubifs/dir.c | 16 +++++--- fs/xfs/libxfs/xfs_dquot_buf.c | 3 - include/linux/pwm.h | 5 ++ kernel/cgroup.c | 3 + mm/cma.c | 7 ++- mm/list_lru.c | 2 + mm/memcontrol.c | 9 ++++ mm/vmscan.c | 2 + net/mac80211/rx.c | 24 +++++++----- security/keys/proc.c | 2 - sound/pci/hda/hda_controller.c | 7 --- sound/pci/hda/hda_controller.h | 4 +- sound/pci/hda/hda_intel.c | 18 ++++++--- sound/pci/hda/hda_tegra.c | 5 +- sound/pci/hda/patch_realtek.c | 18 +++++++-- sound/usb/quirks-table.h | 17 ++++++++ tools/perf/Makefile.perf | 2 - 67 files changed, 384 insertions(+), 185 deletions(-)
Alex Deucher (1):
drm/radeon/si_dpm: workaround for SI kickers
Alexander Polakov (1):
mm/list_lru.c: avoid error-path NULL pointer deref
Alexander Usyskin (1):
mei: txe: don't clean an unprocessed interrupt cause.
Ard Biesheuvel (1):
ALSA: hda - allow 40 bit DMA mask for NVidia devices
Arnd Bergmann (4):
ARM: 8584/1: floppy: avoid gcc-6 warning drm/exynos: fix error handling in exynos_drm_subdrv_open
cgroup: avoid false positive gcc-6 warning
smc91x: avoid self-comparison warning
Arve Hjønnevåg (2):
ANDROID: binder: Add strong ref checks
ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
Boris Brezillon (2):
UBI: fastmap: scrub PEB when bitflips are detected in a free PEB EC header
ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
Bryan Paluch (1):
usb: increase ohci watchdog delay to 275 msec
Ching Huang (1):
scsi: arcmsr: Send SYNCHRONIZE_CACHE command to firmware
Chris Mason (1):
btrfs: fix races on root_log_ctx lists
Christophe JAILLET (1):
usb: dwc3: Fix size used in dma_free_coherent()
Darrick J. Wong (1):
libxfs: clean up _calc_dquots_per_chunk
David Howells (1):
KEYS: Fix short sprintf buffer in /proc/keys show function
David Hsu (1):
pwm: Unexport children before chip removal
Dmitry Vyukov (1):
tty: limit terminal size to 4M chars
Ewan D. Milne (1):
scsi: scsi_debug: Fix memory leak if LBP enabled and module is unloaded
Felipe Balbi (1):
usb: gadget: function: u_ether: don't starve tx request queue
Gerald Schaefer (1):
GenWQE: Fix bad page access during abort of resource allocation
Greg Kroah-Hartman (1):
Linux 4.4.31
Heinz Mauelshagen (1):
dm mirror: fix read error on recovery after default leg failure
Hoan Tran (1):
i2c: xgene: Avoid dma_buffer overrun
Hui Wang (2):
ALSA: hda - Adding a new group of pin cfg into ALC295 pin quirk table
ALSA: hda - Fix headset mic detection problem for two Dell laptops
Ido Yariv (1):
KVM: x86: fix wbinvd_dirty_mask use-after-free
Jaehoon Chung (1):
mmc: dw_mmc-pltfm: fix the potential NULL pointer dereference
James Hogan (1):
KVM: MIPS: Make ERET handle ERL before EXL
Jiri Olsa (1):
perf build: Fix traceevent plugins build race
Jiri Slaby (1):
tty: vt, fix bogus division in csi_J
Johan Hovold (2):
USB: serial: fix potential NULL-dereference at probe
USB: serial: cp210x: fix tiocmget error handling
Johannes Berg (1):
mac80211: discard multicast and 4-addr A-MSDUs
Johannes Weiner (1):
mm: memcontrol: do not recurse in direct reclaim
John David Anglin (1):
parisc: Ensure consistent state when switching to kernel stack at syscall entry
Juergen Gross (1):
x86/xen: fix upper bound of pmd loop in xen_cleanhighmap()
Kashyap Desai (1):
scsi: megaraid_sas: Fix data integrity failure for JBOD (passthrough) devices
Khem Raj (1):
powerpc/ptrace: Fix out of bounds array access warning
Ladi Prosek (1):
virtio_ring: Make interrupt suppression spec compliant
Linus Torvalds (2):
Fix potential infoleak in older kernels
Disable "frame-address" warning
Long Li (1):
hv: do not lose pending heartbeat vmbus packets
Lucas Stach (1):
drm/radeon: drop register readback in cayman_cp_int_cntl_setup
Marcel Hasler (1):
ALSA: usb-audio: Add quirk for Syntek STK1160
Mark Rutland (1):
h8300: fix syscall restarting
Mathias Nyman (2):
xhci: use default USB_RESUME_TIMEOUT when resuming ports.
xhci: add restart quirk for Intel Wildcatpoint PCH
Matt Redfearn (1):
virtio: console: Unlock vqs while freeing buffers
Michel Dänzer (1):
Revert "drm/radeon: fix DP link training issue with second 4K monitor"
Miklos Szeredi (1):
ovl: fsync after copy-up
Oliver Neukum (1):
HID: usbhid: add ATEN CS962 to list of quirky devices
Owen Hofmann (1):
kvm: x86: Check memopp before dereference (CVE-2016-8630)
Patrick Scheuring (1):
Input: i8042 - add XMG C504 to keyboard reset table
Richard Weinberger (2):
ubifs: Abort readdir upon error
ubifs: Fix regression in ubifs_readdir()
Scot Doyle (1):
vt: clear selection before resizing
Stefan Richter (2):
firewire: net: guard against rx buffer overflows
firewire: net: fix fragmented datagram_size off-by-one
Stefan Tauner (1):
USB: serial: ftdi_sio: add support for Infineon TriBoard TC2X7
Stephen Rothwell (1):
mm/cma: silence warnings due to max() usage
Tahsin Erdogan (1):
dm: free io_barrier after blk_cleanup_queue call
Takashi Iwai (2):
ALSA: hda - Merge RIRB_PRE_DELAY into CTX_WORKAROUND caps
ALSA: hda - Raise AZX_DCAPS_RIRB_DELAY handling into top drivers
Tom St Denis (1):
drm/radeon/si_dpm: Limit clocks on HD86xx part
Ville Syrjälä (2):
drm/dp/mst: Clear port->pdt when tearing down the i2c adapter drm/dp/mst: Check peer device type before attempting EDID read
Vladimir Zapolskiy (1):
i2c: core: fix NULL pointer dereference under race condition
Greg KH
maintainerMakefile +2 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 30 +SUBLEVEL = 31 EXTRAVERSION = NAME = Blurry Fish Butt
@@ -617,6 +617,7 @@ include arch/$(SRCARCH)/Makefile KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) +KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += -Os
arch/arm/include/asm/floppy.h +1 -1
@@ -17,7 +17,7 @@#define fd_outb (val,port) \ do { \ - if ((port) == FD_DOR) \ + if ((port) == (u32)FD_DOR) \ fd_setdor((val)); \ else \ outb((val),(port)); \
arch/h8300/include/asm/thread_info.h +0 -4
@@ -31,7 +31,6 @@ struct thread_info {int cpu;/* cpu we're on */ int preempt_count;/* 0 => preemptable, <0 => BUG */ mm_segment_t addr_limit; -struct restart_block restart_block; };/*
@@ -44,9 +43,6 @@ struct thread_info { .cpu = 0, \ .preempt_count = INIT_PREEMPT_COUNT, \ .addr_limit = KERNEL_DS, \ - .restart_block = { \ - .fn = do_no_restart_syscall, \ - }, \ }#define init_thread_info (init_thread_union.thread_info)
arch/h8300/kernel/signal.c +1 -1
@@ -79,7 +79,7 @@ restore_sigcontext(struct sigcontext *usc, int *pd0)unsigned int er0;/* Always make any pending restarted system calls return -EINTR */ -current_thread_info ()->restart_block.fn = do_no_restart_syscall; + current->restart_block.fn = do_no_restart_syscall;/* restore passed registers */ #define COPY (r) do { err |= get_user(regs->r, &usc->sc_##r); } while (0)
arch/mips/kvm/emulate.c +4 -4
@@ -752,15 +752,15 @@ enum emulation_result kvm_mips_emul_eret(struct kvm_vcpu *vcpu)struct mips_coproc *cop0 = vcpu->arch.cop0;enum emulation_result er =EMULATE_DONE ; -if (kvm_read_c0_guest_status (cop0) &ST0_EXL ) { +if (kvm_read_c0_guest_status (cop0) &ST0_ERL ) { +kvm_clear_c0_guest_status (cop0,ST0_ERL ); + vcpu->arch.pc =kvm_read_c0_guest_errorepc (cop0); + }else if (kvm_read_c0_guest_status (cop0) &ST0_EXL ) {kvm_debug ("[%#lx] ERET to %#lx\n" , vcpu->arch.pc,kvm_read_c0_guest_epc (cop0));kvm_clear_c0_guest_status (cop0,ST0_EXL ); vcpu->arch.pc =kvm_read_c0_guest_epc (cop0); - }else if (kvm_read_c0_guest_status (cop0) &ST0_ERL ) { -kvm_clear_c0_guest_status (cop0,ST0_ERL ); - vcpu->arch.pc =kvm_read_c0_guest_errorepc (cop0); }else {kvm_err ("[%#lx] ERET when MIPS_SR_EXL|MIPS_SR_ERL == 0\n" , vcpu->arch.pc);
arch/parisc/kernel/syscall.S +9 -2
@@ -106,8 +106,6 @@ linux_gateway_entry: mtsp %r0,%sr4 /* get kernel space into sr4 */ mtsp %r0,%sr5 /* get kernel space into sr5 */ mtsp %r0,%sr6 /* get kernel space into sr6 */ - mfsp %sr7,%r1 /* save user sr7 */ - mtsp %r1,%sr3 /* and store it in sr3 */ #ifdef CONFIG_64BIT /* for now we can *always* set the W bit on entry to the syscall
@@ -133,6 +131,14 @@ linux_gateway_entry: depdi 0, 31, 32, %r21 1: #endif + + /* We use a rsm/ssm pair to prevent sr3 from being clobbered + * by external interrupts. + */ + mfsp %sr7,%r1 /* save user sr7 */ + rsm PSW_SM_I, %r0 /* disable interrupts */ + mtsp %r1,%sr3 /* and store it in sr3 */ + mfctl %cr30,%r1 xor %r1,%r30,%r30 /* ye olde xor trick */ xor %r1,%r30,%r1
@@ -147,6 +153,7 @@ linux_gateway_entry: */ mtsp %r0,%sr7 /* get kernel space into sr7 */ + ssm PSW_SM_I, %r0 /* enable interrupts */ STREGM %r1,FRAME_SIZE(%r30) /* save r1 (usp) here for now */ mfctl %cr30,%r1 /* get task ptr in %r1 */ LDREG TI_TASK(%r1),%r1
arch/powerpc/kernel/ptrace.c +2 -2
@@ -376,7 +376,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,#else BUILD_BUG_ON (offsetof(struct thread_fp_state , fpscr) != - offsetof(struct thread_fp_state, fpr[32][0])); + offsetof(struct thread_fp_state, fpr[32]));return user_regset_copyout (&pos, &count, &kbuf, &ubuf, &target->thread.fp_state,0 ,-1 );
@@ -404,7 +404,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,return 0 ;#else BUILD_BUG_ON (offsetof(struct thread_fp_state , fpscr) != - offsetof(struct thread_fp_state, fpr[32][0])); + offsetof(struct thread_fp_state, fpr[32]));return user_regset_copyin (&pos, &count, &kbuf, &ubuf, &target->thread.fp_state,0 ,-1 );
arch/x86/include/asm/uaccess.h +5 -5
@@ -332,7 +332,7 @@ do { \#define __get_user_asm_u64 (x, ptr, retval, errret) \ __get_user_asm(x, ptr, retval, "q", "", "=r", errret)#define __get_user_asm_ex_u64 (x, ptr) \ - __get_user_asm_ex(x, ptr, "q", "", "=r") + __get_user_asm_ex(x, ptr, "q", "", "=&r")#endif #define __get_user_size (x, ptr, size, retval, errret) \
@@ -375,13 +375,13 @@ do { \__chk_user_ptr (ptr); \switch (size) { \case 1 : \ -__get_user_asm_ex (x, ptr,"b" ,"b" ,"=q" ); \ +__get_user_asm_ex (x, ptr,"b" ,"b" ,"=&q" ); \break ; \case 2 : \ -__get_user_asm_ex (x, ptr,"w" ,"w" ,"=r" ); \ +__get_user_asm_ex (x, ptr,"w" ,"w" ,"=&r" ); \break ; \case 4 : \ -__get_user_asm_ex (x, ptr,"l" ,"k" ,"=r" ); \ +__get_user_asm_ex (x, ptr,"l" ,"k" ,"=&r" ); \break ; \case 8 : \__get_user_asm_ex_u64 (x, ptr); \
@@ -395,7 +395,7 @@ do { \ asm volatile("1: mov"itype" %1,%"rtype"0\n" \ "2:\n" \ _ASM_EXTABLE_EX(1b, 2b) \ - : ltype(x) : "m" (__m(addr))) + : ltype(x) : "m" (__m(addr)), "0" (0))#define __put_user_nocheck (x, ptr, size) \ ({ \
arch/x86/kvm/emulate.c +1 -1
@@ -5033,7 +5033,7 @@ done_prefixes:/* Decode and fetch the destination operand: register or memory. */ rc =decode_operand (ctxt, &ctxt->dst, (ctxt->d >> DstShift) & OpMask); -if (ctxt->rip_relative) +if (ctxt->rip_relative &&likely (ctxt->memopp)) ctxt->memopp->addr.mem.ea =address_mask (ctxt, ctxt->memopp->addr.mem.ea + ctxt->_eip);
arch/x86/kvm/x86.c +3 -1
@@ -7252,10 +7252,12 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu) { +void *wbinvd_dirty_mask = vcpu->arch.wbinvd_dirty_mask; +kvmclock_reset (vcpu); -free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); kvm_x86_ops->vcpu_free (vcpu); +free_cpumask_var (wbinvd_dirty_mask); } struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
arch/x86/xen/mmu.c +1 -1
@@ -1113,7 +1113,7 @@ static void __init xen_cleanhighmap(unsigned long vaddr,/* NOTE: The loop is more greedy than the cleanup_highmap variant. * We include the PMD passed in on _both_ boundaries. */ -for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt +PAGE_SIZE )); +for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt +PTRS_PER_PMD )); pmd++, vaddr +=PMD_SIZE ) {if (pmd_none (*pmd))continue ;
drivers/android/binder.c +26 -9
@@ -1003,7 +1003,7 @@ static int binder_dec_node(struct binder_node *node, int strong, int internal)static struct binder_ref *binder_get_ref (struct binder_proc *proc, -uint32_t desc) +u32 desc,bool need_strong_ref) {struct rb_node *n = proc->refs_by_desc.rb_node;struct binder_ref *ref;
@@ -1011,12 +1011,16 @@ static struct binder_ref *binder_get_ref(struct binder_proc *proc,while (n) { ref = rb_entry(n, struct binder_ref, rb_node_desc); -if (desc < ref->desc) +if (desc < ref->desc) { n = n->rb_left; -else if (desc > ref->desc) + }else if (desc > ref->desc) { n = n->rb_right; -else + }else if (need_strong_ref && !ref->strong) { +binder_user_error ("tried to use weak ref as strong ref\n" ); +return NULL ; + }else {return ref; + } }return NULL ; }
@@ -1286,7 +1290,10 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, }break ;case BINDER_TYPE_HANDLE :case BINDER_TYPE_WEAK_HANDLE : { -struct binder_ref *ref =binder_get_ref (proc, fp->handle); +struct binder_ref *ref; + + ref =binder_get_ref (proc, fp->handle, + fp->type ==BINDER_TYPE_HANDLE );if (ref ==NULL ) { pr_err("transaction release %d bad handle %d\n",
@@ -1380,7 +1387,7 @@ static void binder_transaction(struct binder_proc *proc,if (tr->target.handle) {struct binder_ref *ref; - ref =binder_get_ref (proc, tr->target.handle); + ref =binder_get_ref (proc, tr->target.handle, true);if (ref ==NULL ) {binder_user_error ("%d:%d got transaction to invalid handle\n" , proc->pid, thread->pid);
@@ -1571,7 +1578,9 @@ static void binder_transaction(struct binder_proc *proc, fp->type =BINDER_TYPE_HANDLE ; else fp->type = BINDER_TYPE_WEAK_HANDLE; + fp->binder =0 ; fp->handle = ref->desc; + fp->cookie =0 ;binder_inc_ref (ref, fp->type ==BINDER_TYPE_HANDLE , &thread->todo);
@@ -1583,7 +1592,10 @@ static void binder_transaction(struct binder_proc *proc, }break ;case BINDER_TYPE_HANDLE :case BINDER_TYPE_WEAK_HANDLE : { -struct binder_ref *ref =binder_get_ref (proc, fp->handle); +struct binder_ref *ref; + + ref =binder_get_ref (proc, fp->handle, + fp->type ==BINDER_TYPE_HANDLE );if (ref ==NULL ) { binder_user_error("%d:%d got transaction with invalid handle, %d\n",
@@ -1618,7 +1630,9 @@ static void binder_transaction(struct binder_proc *proc, return_error =BR_FAILED_REPLY ; goto err_binder_get_ref_for_node_failed; } + fp->binder =0 ; fp->handle = new_ref->desc; + fp->cookie =0 ;binder_inc_ref (new_ref, fp->type ==BINDER_TYPE_HANDLE ,NULL );trace_binder_transaction_ref_to_ref (t, ref, new_ref);
@@ -1672,6 +1686,7 @@ static void binder_transaction(struct binder_proc *proc,binder_debug (BINDER_DEBUG_TRANSACTION ," fd %d -> %d\n" , fp->handle, target_fd);/* TODO: fput? */ + fp->binder =0 ; fp->handle = target_fd; }break ;
@@ -1794,7 +1809,9 @@ static int binder_thread_write(struct binder_proc *proc, ref->desc); } }else - ref =binder_get_ref (proc, target); + ref =binder_get_ref (proc, target, + cmd ==BC_ACQUIRE || + cmd ==BC_RELEASE );if (ref ==NULL ) {binder_user_error ("%d:%d refcount change on invalid ref %d\n" , proc->pid, thread->pid, target);
@@ -1990,7 +2007,7 @@ static int binder_thread_write(struct binder_proc *proc,if (get_user (cookie, (binder_uintptr_t __user *)ptr))return -EFAULT ; ptr +=sizeof (binder_uintptr_t); - ref =binder_get_ref (proc, target); + ref =binder_get_ref (proc, target, false);if (ref ==NULL ) { binder_user_error("%d:%d %s invalid ref %d\n", proc->pid, thread->pid,
drivers/char/virtio_console.c +16 -6
@@ -1533,19 +1533,29 @@ static void remove_port_data(struct port *port)spin_lock_irq (&port->inbuf_lock);/* Remove unused data this port might have received. */ discard_port_data (port); +spin_unlock_irq (&port->inbuf_lock);/* Remove buffers we queued up for the Host to send us data in. */ -while ((buf =virtqueue_detach_unused_buf (port->in_vq))) -free_buf (buf, true); -spin_unlock_irq (&port->inbuf_lock); +do { +spin_lock_irq (&port->inbuf_lock); + buf =virtqueue_detach_unused_buf (port->in_vq); +spin_unlock_irq (&port->inbuf_lock); +if (buf) +free_buf (buf, true); + }while (buf);spin_lock_irq (&port->outvq_lock);reclaim_consumed_buffers (port); +spin_unlock_irq (&port->outvq_lock);/* Free pending buffers from the out-queue. */ -while ((buf =virtqueue_detach_unused_buf (port->out_vq))) -free_buf (buf, true); -spin_unlock_irq (&port->outvq_lock); +do { +spin_lock_irq (&port->outvq_lock); + buf =virtqueue_detach_unused_buf (port->out_vq); +spin_unlock_irq (&port->outvq_lock); +if (buf) +free_buf (buf, true); + }while (buf); }/*
drivers/firewire/net.c +39 -20
109 lines not on this page · raw message
drivers/gpu/drm/drm_dp_mst_topology.c +5 -1
@@ -909,6 +909,7 @@ static void drm_dp_destroy_port(struct kref *kref)/* no need to clean up vcpi * as if we have no connector we never setup a vcpi */ drm_dp_port_teardown_pdt (port, port->pdt); + port->pdt =DP_PEER_DEVICE_NONE ; }kfree (port); }
@@ -1154,7 +1155,9 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,drm_dp_put_port (port); goto out; } -if (port->port_num >=DP_MST_LOGICAL_PORT_0 ) { +if ((port->pdt ==DP_PEER_DEVICE_DP_LEGACY_CONV || + port->pdt ==DP_PEER_DEVICE_SST_SINK ) && + port->port_num >=DP_MST_LOGICAL_PORT_0 ) { port->cached_edid =drm_get_edid (port->connector, &port->aux.ddc);drm_mode_connector_set_tile_property (port->connector); }
@@ -2872,6 +2875,7 @@ static void drm_dp_destroy_connector_work(struct work_struct *work) mgr->cbs->destroy_connector (mgr, port->connector);drm_dp_port_teardown_pdt (port, port->pdt); + port->pdt =DP_PEER_DEVICE_NONE ;if (!port->input && port->vcpi.vcpi >0 ) {drm_dp_mst_reset_vcpi_slots (mgr, port);
drivers/gpu/drm/exynos/exynos_drm_core.c +1 -1
@@ -101,7 +101,7 @@ int exynos_drm_subdrv_open(struct drm_device *dev, struct drm_file *file)return 0 ; err: -list_for_each_entry_reverse (subdrv, &subdrv->list, list) { +list_for_each_entry_continue_reverse (subdrv, &exynos_drm_subdrv_list, list) {if (subdrv->close) subdrv->close (dev, subdrv->dev, file); }
drivers/gpu/drm/radeon/ni.c +1 -3
@@ -1396,9 +1396,7 @@ static void cayman_pcie_gart_fini(struct radeon_device *rdev)void cayman_cp_int_cntl_setup (struct radeon_device *rdev,int ring,u32 cp_int_cntl) { -u32 srbm_gfx_cntl =RREG32 (SRBM_GFX_CNTL ) & ~3 ; - -WREG32 (SRBM_GFX_CNTL , srbm_gfx_cntl | (ring &3 )); +WREG32 (SRBM_GFX_CNTL ,RINGID (ring));WREG32 (CP_INT_CNTL , cp_int_cntl); }
drivers/gpu/drm/radeon/radeon_dp_auxch.c +1 -1
@@ -105,7 +105,7 @@ radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg tmp &=AUX_HPD_SEL (0x7 ); tmp |=AUX_HPD_SEL (chan->rec.hpd); - tmp |=AUX_EN |AUX_LS_READ_EN |AUX_HPD_DISCON (0x1 ); + tmp |=AUX_EN |AUX_LS_READ_EN ;WREG32 (AUX_CONTROL + aux_offset[instance], tmp);
drivers/gpu/drm/radeon/si_dpm.c +43 -10
65 lines not on this page · raw message
drivers/hid/hid-ids.h +1 -0
@@ -168,6 +168,7 @@#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205#define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208#define USB_DEVICE_ID_ATEN_CS682 0x2213 +#define USB_DEVICE_ID_ATEN_CS692 0x8021#define USB_VENDOR_ID_ATMEL 0x03eb#define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -61,6 +61,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS692, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FIGHTERSTICK, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
drivers/hv/hv_util.c +7 -3
@@ -283,10 +283,14 @@ static void heartbeat_onchannelcallback(void *context)u8 *hbeat_txf_buf = util_heartbeat.recv_buffer;struct icmsg_negotiate *negop =NULL ; -vmbus_recvpacket (channel, hbeat_txf_buf, -PAGE_SIZE , &recvlen, &requestid); +while (1 ) { + +vmbus_recvpacket (channel, hbeat_txf_buf, +PAGE_SIZE , &recvlen, &requestid); + +if (!recvlen) +break ; -if (recvlen >0 ) { icmsghdrp = (struct icmsg_hdr *)&hbeat_txf_buf[sizeof (struct vmbuspipe_hdr )];
drivers/i2c/busses/i2c-xgene-slimpro.c +1 -1
@@ -105,7 +105,7 @@ struct slimpro_i2c_dev {struct mbox_chan *mbox_chan;struct mbox_client mbox_client;struct completion rd_complete; -u8 dma_buffer[I2C_SMBUS_BLOCK_MAX ]; +u8 dma_buffer[I2C_SMBUS_BLOCK_MAX +1 ];/* dma_buffer[0] is used for length */ u32 *resp_msg; };
drivers/i2c/i2c-core.c +1 -1
@@ -1876,6 +1876,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)/* add the driver to the list of i2c drivers in the driver core */ driver->driver.owner = owner; driver->driver.bus = &i2c_bus_type; +INIT_LIST_HEAD (&driver->clients);/* When registration returns, the driver core * will have called probe() for all matching-but-unbound devices.
@@ -1886,7 +1887,6 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)pr_debug ("i2c-core: driver [%s] registered\n" , driver->driver.name); -INIT_LIST_HEAD (&driver->clients);/* Walk the adapters that are already present */ i2c_for_each_dev (driver, __process_new_driver);
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -877,6 +877,13 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "P34"), }, }, + { + /* Schenker XMG C504 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "XMG"), + DMI_MATCH(DMI_PRODUCT_NAME, "C504"), + }, + }, { } };
drivers/md/dm-raid1.c +1 -0
@@ -1288,6 +1288,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, int error)dm_bio_restore (bd, bio); bio_record->details.bi_bdev =NULL ; + bio->bi_error =0 ;queue_bio (ms, bio, rw);return DM_ENDIO_INCOMPLETE ;
drivers/md/dm.c +2 -2
@@ -2260,8 +2260,6 @@ static void cleanup_mapped_device(struct mapped_device *md)if (md->bs)bioset_free (md->bs); -cleanup_srcu_struct (&md->io_barrier); -if (md->disk) {spin_lock (&_minor_lock); md->disk->private_data =NULL ;
@@ -2273,6 +2271,8 @@ static void cleanup_mapped_device(struct mapped_device *md)if (md->queue)blk_cleanup_queue (md->queue); +cleanup_srcu_struct (&md->io_barrier); +if (md->bdev) {bdput (md->bdev); md->bdev =NULL ;
drivers/misc/genwqe/card_utils.c +11 -1
@@ -352,17 +352,27 @@ int genwqe_alloc_sync_sgl(struct genwqe_dev *cd, struct genwqe_sgl *sgl,if (copy_from_user (sgl->lpage, user_addr + user_size - sgl->lpage_size, sgl->lpage_size)) { rc = -EFAULT ; - goto err_out1; + goto err_out2; } }return 0 ; + err_out2: +__genwqe_free_consistent (cd,PAGE_SIZE , sgl->lpage, + sgl->lpage_dma_addr); + sgl->lpage =NULL ; + sgl->lpage_dma_addr =0 ; err_out1:__genwqe_free_consistent (cd,PAGE_SIZE , sgl->fpage, sgl->fpage_dma_addr); + sgl->fpage =NULL ; + sgl->fpage_dma_addr =0 ; err_out:__genwqe_free_consistent (cd, sgl->sgl_size, sgl->sgl, sgl->sgl_dma_addr); + sgl->sgl =NULL ; + sgl->sgl_dma_addr =0 ; + sgl->sgl_size =0 ;return -ENOMEM ; }
drivers/misc/mei/hw-txe.c +4 -2
@@ -972,11 +972,13 @@ static bool mei_txe_check_and_ack_intrs(struct mei_device *dev, bool do_ack) hisr =mei_txe_br_reg_read (hw,HISR_REG ); aliveness =mei_txe_aliveness_get (dev); -if (hhisr &IPC_HHIER_SEC && aliveness) +if (hhisr &IPC_HHIER_SEC && aliveness) { ipc_isr =mei_txe_sec_reg_read_silent (hw,SEC_IPC_HOST_INT_STATUS_REG ); -else + }else { ipc_isr =0 ; + hhisr &= ~IPC_HHIER_SEC ; + } generated = generated || (hisr & HISR_INT_STS_MSK) ||
drivers/mmc/host/dw_mmc-pltfm.c +3 -2
@@ -59,12 +59,13 @@ int dw_mci_pltfm_register(struct platform_device *pdev, host->pdata = pdev->dev.platform_data; regs =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -/* Get registers' physical base address */ - host->phy_regs = regs->start; host->regs =devm_ioremap_resource (&pdev->dev, regs);if (IS_ERR (host->regs))return PTR_ERR (host->regs); +/* Get registers' physical base address */ + host->phy_regs = regs->start; +platform_set_drvdata (pdev, host);return dw_mci_probe (host); }
drivers/mtd/ubi/fastmap.c +9 -8
@@ -513,10 +513,11 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,unsigned long long ec =be64_to_cpu (ech->ec);unmap_peb (ai, pnum);dbg_bld ("Adding PEB to free: %i" , pnum); +if (err ==UBI_IO_FF_BITFLIPS ) -add_aeb (ai, free, pnum, ec,1 ); -else -add_aeb (ai, free, pnum, ec,0 ); + scrub =1 ; + +add_aeb (ai, free, pnum, ec, scrub);continue ; }else if (err ==0 || err ==UBI_IO_BITFLIPS ) {dbg_bld ("Found non empty PEB:%i in pool" , pnum);
@@ -748,11 +749,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, fmvhdr->vol_type, be32_to_cpu(fmvhdr->last_eb_bytes)); -if (!av) - goto fail_bad; -if (PTR_ERR (av) == -EINVAL ) { -ubi_err (ubi,"volume (ID %i) already exists" , - fmvhdr->vol_id); +if (IS_ERR (av)) { +if (PTR_ERR (av) == -EEXIST ) +ubi_err (ubi,"volume (ID %i) already exists" , + fmvhdr->vol_id); + goto fail_bad; }
drivers/net/ethernet/smsc/smc91x.c +1 -1
@@ -540,7 +540,7 @@ static inline void smc_rcv(struct net_device *dev)#define smc_special_lock (lock, flags) spin_lock_irqsave(lock, flags)#define smc_special_unlock (lock, flags) spin_unlock_irqrestore(lock, flags)#else -#define smc_special_trylock (lock, flags) (flags == flags) +#define smc_special_trylock (lock, flags) ((void)flags, true)#define smc_special_lock (lock, flags) do { flags = 0; } while (0)#define smc_special_unlock (lock, flags) do { flags = 0; } while (0)#endif
drivers/pwm/core.c +2 -0
@@ -321,6 +321,8 @@ int pwmchip_remove(struct pwm_chip *chip)unsigned int i;int ret =0 ; +pwmchip_sysfs_unexport_children (chip); +mutex_lock (&pwm_lock);for (i =0 ; i < chip->npwm; i++) {
drivers/pwm/sysfs.c +18 -0
@@ -350,6 +350,24 @@ void pwmchip_sysfs_unexport(struct pwm_chip *chip) } } +void pwmchip_sysfs_unexport_children (struct pwm_chip *chip) +{ +struct device *parent; +unsigned int i; + + parent =class_find_device (&pwm_class,NULL , chip, + pwmchip_sysfs_match); +if (!parent) +return ; + +for (i =0 ; i < chip->npwm; i++) { +struct pwm_device *pwm = &chip->pwms[i]; + +if (test_bit (PWMF_EXPORTED , &pwm->flags)) +pwm_unexport_child (parent, pwm); + } +} +static int __init pwm_sysfs_init (void ) {return class_register (&pwm_class);
drivers/scsi/arcmsr/arcmsr_hba.c +0 -9
@@ -2545,18 +2545,9 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd,struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;struct CommandControlBlock *ccb;int target = cmd->device->id; -int lun = cmd->device->lun; -uint8_t scsicmd = cmd->cmnd[0 ]; cmd->scsi_done = done; cmd->host_scribble =NULL ; cmd->result =0 ; -if ((scsicmd ==SYNCHRONIZE_CACHE ) ||(scsicmd ==SEND_DIAGNOSTIC )){ -if (acb->devstate[target][lun] ==ARECA_RAID_GONE ) { - cmd->result = (DID_NO_CONNECT <<16 ); - } - cmd->scsi_done (cmd); -return 0 ; - }if (target ==16 ) {/* virtual device for iop message transfer */ arcmsr_handle_virtual_command (acb, cmd);
drivers/scsi/megaraid/megaraid_sas_base.c +5 -8
@@ -1688,16 +1688,13 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd) goto out_done; } -switch (scmd->cmnd[0 ]) { -case SYNCHRONIZE_CACHE : -/* -* FW takes care of flush cache on its own -* No need to send it down -*/ +/* +* FW takes care of flush cache on its own for Virtual Disk. +* No need to send it down for VD. For JBOD send SYNCHRONIZE_CACHE to FW. +*/ +if ((scmd->cmnd[0 ] ==SYNCHRONIZE_CACHE ) &&MEGASAS_IS_LOGICAL (scmd)) { scmd->result =DID_OK <<16 ; goto out_done; -default : -break ; }if (instance->instancet->build_and_issue_cmd (instance, scmd)) {
drivers/scsi/scsi_debug.c +1 -0
@@ -4981,6 +4981,7 @@ static void __exit scsi_debug_exit(void)bus_unregister (&pseudo_lld_bus);root_device_unregister (pseudo_primary); +vfree (map_storep);vfree (dif_storep);vfree (fake_storep); }
drivers/tty/vt/vt.c +6 -1
@@ -872,10 +872,15 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)return 0 ; +if (new_screen_size > (4 <<20 )) +return -EINVAL ; newscreen =kmalloc (new_screen_size,GFP_USER );if (!newscreen)return -ENOMEM ; +if (vc == sel_cons) +clear_selection (); + old_rows = vc->vc_rows; old_row_size = vc->vc_size_row;
@@ -1173,7 +1178,7 @@ static void csi_J(struct vc_data *vc, int vpar)break ;case 3 :/* erase scroll-back buffer (and whole display) */ scr_memsetw (vc->vc_screenbuf, vc->vc_video_erase_char, - vc->vc_screenbuf_size >>1 ); + vc->vc_screenbuf_size);set_origin (vc);if (CON_IS_VISIBLE (vc))update_screen (vc);
drivers/usb/dwc3/gadget.c +2 -2
@@ -2845,7 +2845,7 @@ err3:kfree (dwc->setup_buf); err2: -dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb), +dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb) *2 , dwc->ep0_trb, dwc->ep0_trb_addr); err1:
@@ -2869,7 +2869,7 @@ void dwc3_gadget_exit(struct dwc3 *dwc)kfree (dwc->setup_buf); -dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb), +dma_free_coherent (dwc->dev,sizeof (*dwc->ep0_trb) *2 , dwc->ep0_trb, dwc->ep0_trb_addr); dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
drivers/usb/gadget/function/u_ether.c +3 -2
@@ -596,8 +596,9 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,/* throttle high/super speed IRQ rate back slightly */ if (gadget_is_dualspeed (dev->gadget)) - req->no_interrupt = (dev->gadget->speed ==USB_SPEED_HIGH || - dev->gadget->speed ==USB_SPEED_SUPER ) + req->no_interrupt = (((dev->gadget->speed ==USB_SPEED_HIGH || + dev->gadget->speed ==USB_SPEED_SUPER )) && + !list_empty (&dev->tx_reqs)) ? ((atomic_read (&dev->tx_qlen) % dev->qmult) !=0 ) :0 ;
drivers/usb/host/ohci-hcd.c +1 -1
@@ -72,7 +72,7 @@static const char hcd_name [] ="ohci_hcd" ;#define STATECHANGE_DELAY msecs_to_jiffies(300) -#define IO_WATCHDOG_DELAY msecs_to_jiffies(250) +#define IO_WATCHDOG_DELAY msecs_to_jiffies(275)#include "ohci.h" #include "pci-quirks.h"
drivers/usb/host/xhci-hub.c +2 -2
@@ -1157,7 +1157,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,xhci_set_link_state (xhci, port_array, wIndex,XDEV_RESUME );spin_unlock_irqrestore (&xhci->lock, flags); -msleep (20 ); +msleep (USB_RESUME_TIMEOUT );spin_lock_irqsave (&xhci->lock, flags);xhci_set_link_state (xhci, port_array, wIndex,XDEV_U0 );
@@ -1401,7 +1401,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)if (need_usb2_u3_exit) {spin_unlock_irqrestore (&xhci->lock, flags); -msleep (20 ); +msleep (USB_RESUME_TIMEOUT );spin_lock_irqsave (&xhci->lock, flags); }
drivers/usb/host/xhci-pci.c +3 -1
@@ -45,6 +45,7 @@#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 +#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI 0x9cb1#define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI 0x22b5#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI 0xa12f#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI 0x9d2f
@@ -154,7 +155,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |=XHCI_SPURIOUS_REBOOT ; }if (pdev->vendor ==PCI_VENDOR_ID_INTEL && - pdev->device ==PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI ) { + (pdev->device ==PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI || + pdev->device ==PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI )) { xhci->quirks |=XHCI_SPURIOUS_REBOOT ; xhci->quirks |=XHCI_SPURIOUS_WAKEUP ; }
drivers/usb/serial/cp210x.c +3 -1
@@ -845,7 +845,9 @@ static int cp210x_tiocmget(struct tty_struct *tty)unsigned int control;int result; -cp210x_get_config (port,CP210X_GET_MDMSTS , &control,1 ); + result =cp210x_get_config (port,CP210X_GET_MDMSTS , &control,1 ); +if (result) +return result; result = ((control &CONTROL_DTR ) ?TIOCM_DTR :0 ) |((control &CONTROL_RTS ) ?TIOCM_RTS :0 )
drivers/usb/serial/ftdi_sio.c +2 -1
@@ -986,7 +986,8 @@ static const struct usb_device_id id_table_combined[] = {/* ekey Devices */ { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },/* Infineon Devices */ - { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) }, + { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_TC1798_PID, 1) }, + { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_TC2X7_PID, 1) },/* GE Healthcare devices */ { USB_DEVICE(GE_HEALTHCARE_VID, GE_HEALTHCARE_NEMO_TRACKER_PID) },/* Active Research (Actisense) devices */
drivers/usb/serial/ftdi_sio_ids.h +3 -2
@@ -626,8 +626,9 @@/* * Infineon Technologies */ -#define INFINEON_VID 0x058b -#define INFINEON_TRIBOARD_PID 0x0028/* DAS JTAG TriBoard TC1798 V1.0 */ +#define INFINEON_VID 0x058b +#define INFINEON_TRIBOARD_TC1798_PID 0x0028/* DAS JTAG TriBoard TC1798 V1.0 */ +#define INFINEON_TRIBOARD_TC2X7_PID 0x0043/* DAS JTAG TriBoard TC2X7 V1.0 */ /* * Acton Research Corp.
drivers/usb/serial/usb-serial.c +2 -1
@@ -1077,7 +1077,8 @@ static int usb_serial_probe(struct usb_interface *interface, serial->disconnected =0 ; -usb_serial_console_init (serial->port[0 ]->minor); +if (num_ports >0 ) +usb_serial_console_init (serial->port[0 ]->minor); exit:module_put (type->driver.owner);return 0 ;
drivers/virtio/virtio_ring.c +9 -5
@@ -548,7 +548,8 @@ void virtqueue_disable_cb(struct virtqueue *_vq)if (!(vq->avail_flags_shadow &VRING_AVAIL_F_NO_INTERRUPT )) { vq->avail_flags_shadow |=VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); } }
@@ -580,7 +581,8 @@ unsigned virtqueue_enable_cb_prepare(struct virtqueue *_vq)* entry. Always do both to keep code simple. */ if (vq->avail_flags_shadow &VRING_AVAIL_F_NO_INTERRUPT ) { vq->avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); }vring_used_event (&vq->vring) =cpu_to_virtio16 (_vq->vdev, last_used_idx = vq->last_used_idx);END_USE (vq);
@@ -648,10 +650,11 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *_vq)* more to do. */ /* Depending on the VIRTIO_RING_F_USED_EVENT_IDX feature, we need to * either clear the flags bit or point the event index at the next -* entry. Always do both to keep code simple. */ +* entry. Always update the event index to keep code simple. */ if (vq->avail_flags_shadow &VRING_AVAIL_F_NO_INTERRUPT ) { vq->avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (_vq->vdev, vq->avail_flags_shadow); }/* TODO: tune this threshold */ bufs = (u16)(vq->avail_idx_shadow - vq->last_used_idx) *3 /4 ;
@@ -770,7 +773,8 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,/* No callback? Tell other side not to bother us. */ if (!callback) { vq->avail_flags_shadow |=VRING_AVAIL_F_NO_INTERRUPT ; - vq->vring.avail->flags =cpu_to_virtio16 (vdev, vq->avail_flags_shadow); +if (!vq->event) + vq->vring.avail->flags =cpu_to_virtio16 (vdev, vq->avail_flags_shadow); }/* Put everything in free lists. */
fs/btrfs/tree-log.c +6 -14
@@ -2696,14 +2696,12 @@ static inline void btrfs_remove_all_log_ctxs(struct btrfs_root *root, int index, int error) {struct btrfs_log_ctx *ctx; +struct btrfs_log_ctx *safe; -if (!error) { -INIT_LIST_HEAD (&root->log_ctxs[index]); -return ; - } - -list_for_each_entry (ctx, &root->log_ctxs[index], list) +list_for_each_entry_safe (ctx, safe, &root->log_ctxs[index], list) { +list_del_init (&ctx->list); ctx->log_ret = error; + }INIT_LIST_HEAD (&root->log_ctxs[index]); }
@@ -2944,13 +2942,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&root->log_mutex); out_wake_log_root: -/* -* We needn't get log_mutex here because we are sure all -* the other tasks are blocked. -*/ +mutex_lock (&log_root_tree->log_mutex);btrfs_remove_all_log_ctxs (log_root_tree, index2, ret); -mutex_lock (&log_root_tree->log_mutex); log_root_tree->log_transid_committed++;atomic_set (&log_root_tree->log_commit[index2],0 );mutex_unlock (&log_root_tree->log_mutex);
@@ -2961,10 +2955,8 @@ out_wake_log_root:if (waitqueue_active (&log_root_tree->log_commit_wait[index2]))wake_up (&log_root_tree->log_commit_wait[index2]); out: -/* See above. */ -btrfs_remove_all_log_ctxs (root, index1, ret); -mutex_lock (&root->log_mutex); +btrfs_remove_all_log_ctxs (root, index1, ret); root->log_transid_committed++;atomic_set (&root->log_commit[index1],0 );mutex_unlock (&root->log_mutex);
fs/overlayfs/copy_up.c +2 -0
@@ -139,6 +139,8 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len) len -= bytes; } +if (!error) + error =vfs_fsync (new_file,0 );fput (new_file); out_fput:fput (old_file);
fs/ubifs/dir.c +11 -5
@@ -350,7 +350,7 @@ static unsigned int vfs_dent_type(uint8_t type)*/ static int ubifs_readdir (struct file *file,struct dir_context *ctx) { -int err; +int err =0 ;struct qstr nm;union ubifs_key key;struct ubifs_dent_node *dent;
@@ -452,14 +452,20 @@ out:kfree (file->private_data); file->private_data =NULL ; -if (err != -ENOENT ) { +if (err != -ENOENT )ubifs_err (c,"cannot find next direntry, error %d" , err); -return err; - } +else +/* +* -ENOENT is a non-fatal error in this context, the TNC uses +* it to indicate that the cursor moved past the current directory +* and readdir() has to stop. +*/ + err =0 ; +/* 2 is a special value indicating that there are no more direntries */ ctx->pos =2 ; -return 0 ; +return err; }/* Free saved readdir() state when the directory is closed */
fs/xfs/libxfs/xfs_dquot_buf.c +1 -2
@@ -191,8 +191,7 @@ xfs_dquot_buf_verify_crc(if (mp->m_quotainfo) ndquots = mp->m_quotainfo->qi_dqperchunk;else - ndquots =xfs_calc_dquots_per_chunk ( -XFS_BB_TO_FSB (mp, bp->b_length)); + ndquots =xfs_calc_dquots_per_chunk (bp->b_length); for (i = 0; i < ndquots; i++, d++) { if (!xfs_verify_cksum((char *)d, sizeof(struct xfs_dqblk),
include/linux/pwm.h +5 -0
@@ -331,6 +331,7 @@ static inline void pwm_remove_table(struct pwm_lookup *table, size_t num)#ifdef CONFIG_PWM_SYSFS void pwmchip_sysfs_export (struct pwm_chip *chip);void pwmchip_sysfs_unexport (struct pwm_chip *chip); +void pwmchip_sysfs_unexport_children (struct pwm_chip *chip);#else static inline void pwmchip_sysfs_export (struct pwm_chip *chip) {
@@ -339,6 +340,10 @@ static inline void pwmchip_sysfs_export(struct pwm_chip *chip)static inline void pwmchip_sysfs_unexport (struct pwm_chip *chip) { } + +static inline void pwmchip_sysfs_unexport_children (struct pwm_chip *chip) +{ +}#endif /* CONFIG_PWM_SYSFS */ #endif /* __LINUX_PWM_H */
kernel/cgroup.c +3 -0
@@ -236,6 +236,9 @@ static int cgroup_addrm_files(struct cgroup_subsys_state *css,*/ static bool cgroup_ssid_enabled (int ssid) { +if (CGROUP_SUBSYS_COUNT ==0 ) +return false; +return static_key_enabled (cgroup_subsys_enabled_key[ssid]); }
mm/cma.c +4 -3
@@ -183,7 +183,8 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,return -EINVAL ;/* ensure minimal alignment required by mm core */ - alignment =PAGE_SIZE <<max (MAX_ORDER -1 , pageblock_order); + alignment =PAGE_SIZE << + max_t(unsigned long, MAX_ORDER - 1, pageblock_order);/* alignment should be aligned with order_per_bit */ if (!IS_ALIGNED (alignment >>PAGE_SHIFT ,1 << order_per_bit))
@@ -266,8 +267,8 @@ int __init cma_declare_contiguous(phys_addr_t base,* migratetype page by page allocator's buddy algorithm. In the case, * you couldn't get a contiguous memory, which is not what we want. */ - alignment =max (alignment, - (phys_addr_t )PAGE_SIZE <<max (MAX_ORDER -1 , pageblock_order)); + alignment =max (alignment, (phys_addr_t )PAGE_SIZE << + max_t(unsigned long, MAX_ORDER - 1, pageblock_order)); base =ALIGN (base, alignment); size =ALIGN (size, alignment); limit &= ~(alignment -1 );
mm/list_lru.c +2 -0
@@ -554,6 +554,8 @@ int __list_lru_init(struct list_lru *lru, bool memcg_aware, err =memcg_init_list_lru (lru, memcg_aware);if (err) {kfree (lru->node); +/* Do this so a list_lru_destroy() doesn't crash: */ + lru->node =NULL ; goto out; }
mm/memcontrol.c +9 -0
@@ -2055,6 +2055,15 @@ retry: current->flags & PF_EXITING)) goto force; +/* +* Prevent unbounded recursion when reclaim operations need to +* allocate memory. This might exceed the limits temporarily, +* but we prefer facilitating memory reclaim and getting back +* under the limit over triggering OOM kills in these cases. +*/ +if (unlikely (current->flags &PF_MEMALLOC )) + goto force; +if (unlikely (task_in_memcg_oom (current))) goto nomem;
mm/vmscan.c +2 -0
@@ -2910,7 +2910,9 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg, sc.may_writepage, sc.gfp_mask); + current->flags |=PF_MEMALLOC ; nr_reclaimed =do_try_to_free_pages (zonelist, &sc); + current->flags &= ~PF_MEMALLOC ;trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed);
net/mac80211/rx.c +15 -9
@@ -2203,16 +2203,22 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)if (!(status->rx_flags &IEEE80211_RX_AMSDU ))return RX_CONTINUE ; -if (ieee80211_has_a4 (hdr->frame_control) && - rx->sdata->vif.type ==NL80211_IFTYPE_AP_VLAN && - !rx->sdata->u.vlan.sta) -return RX_DROP_UNUSABLE ; +if (unlikely (ieee80211_has_a4 (hdr->frame_control))) { +switch (rx->sdata->vif.type) { +case NL80211_IFTYPE_AP_VLAN : +if (!rx->sdata->u.vlan.sta) +return RX_DROP_UNUSABLE ; +break ; +case NL80211_IFTYPE_STATION : +if (!rx->sdata->u.mgd.use_4addr) +return RX_DROP_UNUSABLE ; +break ; +default : +return RX_DROP_UNUSABLE ; + } + } -if (is_multicast_ether_addr (hdr->addr1) && - ((rx->sdata->vif.type ==NL80211_IFTYPE_AP_VLAN && - rx->sdata->u.vlan.sta) || - (rx->sdata->vif.type ==NL80211_IFTYPE_STATION && - rx->sdata->u.mgd.use_4addr))) +if (is_multicast_ether_addr (hdr->addr1))return RX_DROP_UNUSABLE ; skb->dev = dev;
security/keys/proc.c +1 -1
@@ -181,7 +181,7 @@ static int proc_keys_show(struct seq_file *m, void *v)struct timespec now;unsigned long timo;key_ref_t key_ref, skey_ref; -char xbuf[12 ]; +char xbuf[16 ];int rc;struct keyring_search_context ctx = {
sound/pci/hda/hda_controller.c +1 -6
@@ -956,7 +956,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) status =azx_readb (chip,RIRBSTS );if (status &RIRB_INT_MASK ) {if (status &RIRB_INT_RESPONSE ) { -if (chip->driver_caps &AZX_DCAPS_RIRB_PRE_DELAY ) +if (chip->driver_caps &AZX_DCAPS_CTX_WORKAROUND )udelay (80 );snd_hdac_bus_update_rirb (bus); }
@@ -1055,11 +1055,6 @@ int azx_bus_init(struct azx *chip, const char *model,if (chip->driver_caps &AZX_DCAPS_CORBRP_SELF_CLEAR ) bus->core.corbrp_self_clear = true; -if (chip->driver_caps &AZX_DCAPS_RIRB_DELAY ) { -dev_dbg (chip->card->dev,"Enable delay in RIRB handling\n" ); - bus->needs_damn_long_delay =1 ; - } -if (chip->driver_caps &AZX_DCAPS_4K_BDLE_BOUNDARY ) bus->core.align_bdle_4k = true;
sound/pci/hda/hda_controller.h +2 -2
@@ -32,8 +32,8 @@#define AZX_DCAPS_NO_MSI (1 << 9)/* No MSI support */ #define AZX_DCAPS_SNOOP_MASK (3 << 10)/* snoop type mask */ #define AZX_DCAPS_SNOOP_OFF (1 << 12)/* snoop default off */ -#define AZX_DCAPS_RIRB_DELAY (1 << 13)/* Long delay in read loop */ -#define AZX_DCAPS_RIRB_PRE_DELAY (1 << 14)/* Put a delay before read */ +/* 13 unused */ +/* 14 unused */ #define AZX_DCAPS_CTX_WORKAROUND (1 << 15)/* X-Fi workaround */ #define AZX_DCAPS_POSFIX_LPIB (1 << 16)/* Use LPIB as default */ #define AZX_DCAPS_POSFIX_VIA (1 << 17)/* Use VIACOMBO as default */
sound/pci/hda/hda_intel.c +12 -6
@@ -334,8 +334,7 @@ enum {/* quirks for Nvidia */ #define AZX_DCAPS_PRESET_NVIDIA \ - (AZX_DCAPS_RIRB_DELAY | AZX_DCAPS_NO_MSI | /*AZX_DCAPS_ALIGN_BUFSIZE |*/ \ -AZX_DCAPS_NO_64BIT | AZX_DCAPS_CORBRP_SELF_CLEAR |\ + (AZX_DCAPS_NO_MSI | AZX_DCAPS_CORBRP_SELF_CLEAR |\ AZX_DCAPS_SNOOP_TYPE(NVIDIA))#define AZX_DCAPS_PRESET_CTHDA \
@@ -1637,6 +1636,11 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,return err; } +if (chip->driver_type ==AZX_DRIVER_NVIDIA ) { +dev_dbg (chip->card->dev,"Enable delay in RIRB handling\n" ); + chip->bus.needs_damn_long_delay =1 ; + } + err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , chip, &ops);if (err <0 ) {dev_err (card->dev,"Error creating device [card]!\n" );
@@ -1720,6 +1724,10 @@ static int azx_first_init(struct azx *chip) } } +/* NVidia hardware normally only supports up to 40 bits of DMA */ +if (chip->pci->vendor ==PCI_VENDOR_ID_NVIDIA ) + dma_bits =40 ; +/* disable 64bit DMA address on some devices */ if (chip->driver_caps &AZX_DCAPS_NO_64BIT ) {dev_dbg (card->dev,"Disabling 64bit DMA\n" );
@@ -2406,14 +2414,12 @@ static const struct pci_device_id azx_ids[] = { .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class_mask = 0xffffff, .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | - AZX_DCAPS_NO_64BIT | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },#else /* this entry seems still valid -- i.e. without emu20kx chip */ { PCI_DEVICE(0x1102, 0x0009), .driver_data =AZX_DRIVER_CTX |AZX_DCAPS_CTX_WORKAROUND | -AZX_DCAPS_NO_64BIT | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB }, #endif /* CM8888 */ { PCI_DEVICE(0x13f6, 0x5011),
sound/pci/hda/hda_tegra.c +3 -2
@@ -464,6 +464,8 @@ static int hda_tegra_create(struct snd_card *card,if (err <0 )return err; + chip->bus.needs_damn_long_delay =1 ; + err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , chip, &ops);if (err <0 ) {dev_err (card->dev,"Error creating device\n" );
@@ -481,8 +483,7 @@ MODULE_DEVICE_TABLE(of, hda_tegra_match);static int hda_tegra_probe (struct platform_device *pdev) { -const unsigned int driver_flags =AZX_DCAPS_RIRB_DELAY | -AZX_DCAPS_CORBRP_SELF_CLEAR ; +const unsigned int driver_flags =AZX_DCAPS_CORBRP_SELF_CLEAR ;struct snd_card *card;struct azx *chip;struct hda_tegra *hda;
sound/pci/hda/patch_realtek.c +15 -3
@@ -5793,8 +5793,6 @@ static const struct hda_model_fixup alc269_fixup_models[] = {#define ALC295_STANDARD_PINS \ {0x12, 0xb7a60130}, \ {0x14, 0x90170110}, \ - {0x17, 0x21014020}, \ - {0x18, 0x21a19030}, \ {0x21, 0x04211020}#define ALC298_STANDARD_PINS \
@@ -5841,11 +5839,19 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1b, 0x02011020}, {0x21, 0x0221101f}),SND_HDA_PIN_QUIRK (0x10ec0255 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , + {0x14, 0x90170110}, + {0x1b, 0x01011020}, + {0x21, 0x0221101f}), +SND_HDA_PIN_QUIRK (0x10ec0255 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , {0x14, 0x90170130}, {0x1b, 0x01014020}, {0x21, 0x0221103f}),SND_HDA_PIN_QUIRK (0x10ec0255 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , {0x14, 0x90170130}, + {0x1b, 0x01011020}, + {0x21, 0x0221103f}), +SND_HDA_PIN_QUIRK (0x10ec0255 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , + {0x14, 0x90170130}, {0x1b, 0x02011020}, {0x21, 0x0221103f}), SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
@@ -6021,7 +6027,13 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {ALC292_STANDARD_PINS , {0x13, 0x90a60140}),SND_HDA_PIN_QUIRK (0x10ec0295 ,0x1028 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE , -ALC295_STANDARD_PINS ), +ALC295_STANDARD_PINS , + {0x17, 0x21014020}, + {0x18, 0x21a19030}), +SND_HDA_PIN_QUIRK (0x10ec0295 ,0x1028 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE , +ALC295_STANDARD_PINS , + {0x17, 0x21014040}, + {0x18, 0x21a19050}),SND_HDA_PIN_QUIRK (0x10ec0298 ,0x1028 ,"Dell" ,ALC298_FIXUP_DELL1_MIC_NO_PRESENCE ,ALC298_STANDARD_PINS , {0x17, 0x90170110}),
sound/usb/quirks-table.h +17 -0
@@ -2907,6 +2907,23 @@ AU0828_DEVICE(0x2040, 0x7260, "Hauppauge", "HVR-950Q"),AU0828_DEVICE (0x2040 ,0x7213 ,"Hauppauge" ,"HVR-950Q" ),AU0828_DEVICE (0x2040 ,0x7270 ,"Hauppauge" ,"HVR-950Q" ), +/* Syntek STK1160 */ +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | +USB_DEVICE_ID_MATCH_INT_CLASS | +USB_DEVICE_ID_MATCH_INT_SUBCLASS , + .idVendor = 0x05e1, + .idProduct = 0x0408, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .vendor_name ="Syntek" , + .product_name ="STK1160" , + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_AUDIO_ALIGN_TRANSFER + } +}, + /* Digidesign Mbox */ {/* Thanks to Clemens Ladisch <[email protected]> */
tools/perf/Makefile.perf +1 -1
@@ -420,7 +420,7 @@ $(LIBTRACEEVENT)-clean: $(call QUIET_CLEAN, libtraceevent) $(Q)$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null -install-traceevent-plugins: $(LIBTRACEEVENT) +install-traceevent-plugins: libtraceevent_plugins $(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) install_plugins $(LIBAPI): fixdep FORCE