Skip to contentSkip to conversation

Linux 4.3.6

DISCUSSION Greg KH 1 participant 2 messages Feb 19, 2016 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 4.3.6 kernel.

All users of the 4.3 kernel series must upgrade.

Note, this is the LAST 4.3.y kernel to be released. This kernel branch is now end-of-life. Move to 4.4.y right now.

The updated 4.3.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.3.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                                       |    2 
 arch/arm64/mm/mmu.c                            |   13 -
 arch/parisc/include/asm/compat.h               |    4 
 arch/parisc/include/uapi/asm/ipcbuf.h          |   19 +
 arch/parisc/include/uapi/asm/mman.h            |   10 
 arch/parisc/include/uapi/asm/msgbuf.h          |   10 
 arch/parisc/include/uapi/asm/posix_types.h     |    2 
 arch/parisc/include/uapi/asm/sembuf.h          |    6 
 arch/parisc/include/uapi/asm/shmbuf.h          |    8 
 arch/parisc/include/uapi/asm/siginfo.h         |    4 
 arch/parisc/kernel/signal.c                    |   64 ++++-
 arch/parisc/mm/init.c                          |   16 +
 arch/sh/include/uapi/asm/unistd_64.h           |    2 
 arch/x86/crypto/chacha20-ssse3-x86_64.S        |    6 
 arch/x86/crypto/crc32c-pcl-intel-asm_64.S      |    2 
 arch/xtensa/include/asm/asmmacro.h             |    7 
 arch/xtensa/include/asm/vectors.h              |    9 
 arch/xtensa/kernel/Makefile                    |    1 
 arch/xtensa/kernel/entry.S                     |    8 
 arch/xtensa/kernel/head.S                      |    2 
 arch/xtensa/kernel/setup.c                     |    9 
 arch/xtensa/kernel/vectors.S                   |    4 
 arch/xtensa/kernel/vmlinux.lds.S               |   12 -
 arch/xtensa/lib/usercopy.S                     |    6 
 arch/xtensa/platforms/iss/setup.c              |    2 
 arch/xtensa/platforms/xt2000/setup.c           |    2 
 arch/xtensa/platforms/xtfpga/setup.c           |    2 
 block/blk-core.c                               |   25 --
 crypto/ablkcipher.c                            |    2 
 crypto/af_alg.c                                |   55 ++++
 crypto/ahash.c                                 |    5 
 crypto/algif_hash.c                            |  181 +++++++++++++++-
 crypto/algif_skcipher.c                        |  279 ++++++++++++++++++-------
 crypto/blkcipher.c                             |    2 
 crypto/crc32c_generic.c                        |    1 
 crypto/crypto_user.c                           |    6 
 crypto/shash.c                                 |    5 
 crypto/skcipher.c                              |    2 
 crypto/testmgr.h                               |    7 
 drivers/ata/ahci.c                             |   20 +
 drivers/ata/libahci.c                          |   13 -
 drivers/base/memory.c                          |    4 
 drivers/block/zram/zcomp.c                     |    4 
 drivers/block/zram/zcomp_lz4.c                 |   23 +-
 drivers/block/zram/zcomp_lzo.c                 |   23 +-
 drivers/block/zram/zram_drv.c                  |    7 
 drivers/char/tpm/tpm-chip.c                    |    2 
 drivers/char/tpm/tpm_crb.c                     |    7 
 drivers/char/tpm/tpm_ibmvtpm.c                 |    2 
 drivers/char/tpm/tpm_tis.c                     |    2 
 drivers/crypto/caam/caamhash.c                 |    2 
 drivers/crypto/caam/ctrl.c                     |    4 
 drivers/crypto/marvell/cesa.c                  |    2 
 drivers/crypto/nx/nx-aes-ccm.c                 |    2 
 drivers/crypto/nx/nx-aes-gcm.c                 |    3 
 drivers/crypto/qat/qat_common/adf_ctl_drv.c    |    2 
 drivers/crypto/sunxi-ss/sun4i-ss-core.c        |    2 
 drivers/crypto/talitos.c                       |    2 
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c |    2 
 drivers/hid/hid-multitouch.c                   |   60 +++++
 drivers/hid/usbhid/hid-core.c                  |    4 
 drivers/i2c/busses/i2c-at91.c                  |   82 ++++++-
 drivers/i2c/busses/i2c-mv64xxx.c               |   27 +-
 drivers/i2c/busses/i2c-rcar.c                  |    4 
 drivers/i2c/busses/i2c-rk3x.c                  |    2 
 drivers/i2c/i2c-core.c                         |    2 
 drivers/iommu/io-pgtable-arm.c                 |   11 
 drivers/md/dm-mpath.c                          |    7 
 drivers/md/dm.c                                |   10 
 drivers/md/persistent-data/dm-btree.c          |    4 
 drivers/md/raid10.c                            |    4 
 drivers/media/i2c/ir-kbd-i2c.c                 |    1 
 drivers/media/pci/ivtv/ivtv-driver.c           |    4 
 drivers/media/pci/saa7134/saa7134-alsa.c       |    5 
 drivers/media/platform/sti/c8sectpfe/Kconfig   |    1 
 drivers/media/platform/vivid/vivid-core.c      |    5 
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c  |    9 
 drivers/media/v4l2-core/v4l2-ctrls.c           |   12 -
 drivers/media/v4l2-core/videobuf2-dma-contig.c |    5 
 drivers/media/v4l2-core/videobuf2-dma-sg.c     |    5 
 drivers/mtd/mtd_blkdevs.c                      |   10 
 drivers/mtd/mtdpart.c                          |    4 
 drivers/mtd/nand/jz4740_nand.c                 |    1 
 drivers/mtd/nand/nand_base.c                   |    2 
 drivers/mtd/ubi/wl.c                           |   53 ++--
 drivers/net/wireless/rtlwifi/rtl8821ae/hw.c    |    2 
 drivers/net/wireless/rtlwifi/rtl8821ae/sw.c    |    2 
 drivers/net/wireless/ti/wlcore/io.h            |   10 
 drivers/net/wireless/ti/wlcore/spi.c           |   10 
 drivers/pci/bus.c                              |    6 
 drivers/pci/host/pci-dra7xx.c                  |    3 
 drivers/pci/host/pci-exynos.c                  |    3 
 drivers/pci/host/pci-imx6.c                    |    3 
 drivers/pci/host/pci-tegra.c                   |    2 
 drivers/pci/host/pcie-rcar.c                   |    6 
 drivers/pci/host/pcie-spear13xx.c              |   29 +-
 drivers/pci/host/pcie-xilinx.c                 |    3 
 drivers/pci/iov.c                              |   41 +--
 drivers/pci/pci-sysfs.c                        |    5 
 drivers/remoteproc/remoteproc_debugfs.c        |    2 
 drivers/spi/spi-atmel.c                        |    3 
 drivers/spi/spi-omap2-mcspi.c                  |   28 ++
 drivers/spi/spi-ti-qspi.c                      |    3 
 drivers/spi/spi-xilinx.c                       |   38 ++-
 drivers/spi/spi.c                              |    2 
 drivers/tty/n_tty.c                            |   29 --
 drivers/tty/tty_buffer.c                       |    2 
 drivers/tty/tty_io.c                           |   36 ++-
 drivers/usb/class/cdc-acm.c                    |    9 
 drivers/usb/class/cdc-acm.h                    |    1 
 drivers/usb/core/hub.c                         |    8 
 drivers/usb/host/xhci-hub.c                    |   45 +++-
 drivers/usb/host/xhci-pci.c                    |   52 ++--
 drivers/usb/host/xhci-ring.c                   |    3 
 drivers/usb/phy/phy-msm-usb.c                  |   37 ++-
 drivers/usb/serial/cp210x.c                    |    1 
 drivers/usb/serial/ftdi_sio.c                  |    1 
 drivers/usb/serial/ftdi_sio_ids.h              |    1 
 drivers/usb/serial/option.c                    |   18 +
 drivers/usb/serial/visor.c                     |   11 
 fs/binfmt_elf.c                                |   10 
 fs/cachefiles/rdwr.c                           |   69 +++---
 fs/ext2/super.c                                |    2 
 fs/ext4/crypto.c                               |    2 
 fs/ext4/ext4.h                                 |   51 +++-
 fs/ext4/resize.c                               |    4 
 fs/ext4/super.c                                |    6 
 fs/ext4/symlink.c                              |    2 
 fs/f2fs/dir.c                                  |   13 -
 fs/f2fs/namei.c                                |   10 
 fs/fat/dir.c                                   |   16 -
 fs/fscache/netfs.c                             |   38 +--
 fs/fscache/page.c                              |    2 
 fs/hugetlbfs/inode.c                           |   65 ++---
 fs/jbd2/checkpoint.c                           |    8 
 fs/jbd2/transaction.c                          |   12 -
 fs/nfs/nfs4proc.c                              |    1 
 fs/ocfs2/dlm/dlmmaster.c                       |   26 +-
 fs/ocfs2/dlm/dlmrecovery.c                     |    2 
 fs/ocfs2/dlmglue.c                             |    6 
 fs/ocfs2/namei.c                               |    4 
 fs/ocfs2/resize.c                              |   15 +
 fs/pipe.c                                      |    9 
 fs/proc/base.c                                 |    1 
 fs/proc/fd.c                                   |   14 -
 fs/seq_file.c                                  |   11 
 fs/sysv/inode.c                                |   11 
 fs/tracefs/inode.c                             |    6 
 include/crypto/hash.h                          |    6 
 include/crypto/if_alg.h                        |   11 
 include/crypto/skcipher.h                      |    7 
 include/linux/blkdev.h                         |    1 
 include/linux/hrtimer.h                        |   34 ++-
 include/linux/signal.h                         |    1 
 include/sound/rawmidi.h                        |    4 
 kernel/printk/printk.c                         |   13 -
 kernel/sched/core.c                            |    2 
 kernel/signal.c                                |    2 
 kernel/time/hrtimer.c                          |   55 +++-
 kernel/time/timer_list.c                       |    2 
 kernel/trace/trace.c                           |    2 
 kernel/trace/trace_printk.c                    |    1 
 lib/hexdump.c                                  |    6 
 lib/libcrc32c.c                                |    1 
 mm/backing-dev.c                               |   19 +
 mm/hugetlb.c                                   |   27 +-
 mm/memcontrol.c                                |   71 ++++--
 mm/oom_kill.c                                  |    7 
 mm/slab.c                                      |    5 
 mm/vmstat.c                                    |    6 
 mm/zsmalloc.c                                  |   14 +
 security/integrity/digsig.c                    |    2 
 security/integrity/evm/evm_main.c              |    3 
 sound/core/compress_offload.c                  |   11 
 sound/core/oss/pcm_oss.c                       |   21 +
 sound/core/rawmidi.c                           |  134 ++++++++----
 sound/core/seq/oss/seq_oss_init.c              |    2 
 sound/core/seq/oss/seq_oss_synth.c             |    2 
 sound/core/seq/seq_clientmgr.c                 |    3 
 sound/core/seq/seq_ports.c                     |  233 +++++++++++---------
 sound/core/seq/seq_timer.c                     |   87 ++++++-
 sound/core/seq/seq_virmidi.c                   |   23 +-
 sound/core/timer.c                             |   98 +++++---
 sound/drivers/dummy.c                          |   35 +--
 sound/firewire/bebob/bebob_stream.c            |   14 -
 sound/pci/hda/hda_generic.c                    |   91 ++++++--
 sound/pci/hda/hda_jack.c                       |    2 
 sound/pci/hda/hda_jack.h                       |    2 
 sound/pci/hda/patch_ca0132.c                   |    5 
 sound/pci/hda/patch_cirrus.c                   |   27 ++
 sound/pci/hda/patch_hdmi.c                     |    5 
 sound/pci/hda/patch_realtek.c                  |   11 
 sound/pci/hda/patch_sigmatel.c                 |    6 
 sound/soc/codecs/rt5645.c                      |    2 
 sound/soc/soc-pcm.c                            |    3 
 sound/usb/midi.c                               |    1 
 sound/usb/quirks.c                             |   18 +
 197 files changed, 2310 insertions(+), 963 deletions(-)

Al Viro (3):
fix sysvfs symlinks
ext4: fix an endianness bug in ext4_encrypted_zeroout()
ext4: fix an endianness bug in ext4_encrypted_follow_link()

Alexander Duyck (1):
PCI: Set SR-IOV NumVFs to zero after enumeration

Alexandra Yates (1):
ahci: Intel DNV device IDs SATA

Alexandre Courbot (1):
drm/nouveau/pmu: do not assume a PMU is present

Andrey Konovalov (1):
ALSA: usb-audio: avoid freeing umidi object twice

Andrzej Hajda (1):
v4l2-compat-ioctl32: fix alignment for ARM64

Andy Leiserson (1):
fix calculation of meta_bg descriptor backups

Andy Shevchenko (1):
lib/hexdump.c: truncate output in case of overflow

Antonio Ospite (1):
media/v4l2-ctrls: fix setting autocluster to manual with VIDIOC_S_CTRL

Ard Biesheuvel (1):
arm64: mm: use correct mapping granularity under DEBUG_RODATA

Arnd Bergmann (1):
remoteproc: avoid stack overflow in debugfs file

Artur Paszkiewicz (1):
md/raid10: fix data corruption and crash during resync

Bard Liao (1):
ASoC: rt5645: fix the shift bit of IN1 boost

Benjamin Tissoires (1):
HID: multitouch: fix input mode switching on some Elan panels

Benoit Parrot (1):
media: v4l2-ctrls: Fix 64bit support in get_ctrl()

Boris BREZILLON (2):
mtd: mtdpart: fix add_mtd_partitions error path
crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init()

Brian Norris (3):
mtd: blkdevs: fix potential deadlock + lockdep warnings
mtd: nand: fix shutdown/reboot for multi-chip systems
mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

Catalin Marinas (1):
mm: slab: only move management objects off-slab for sizes larger than KMALLOC_MIN_SIZE

Christoph Biedl (1):
PCI: Fix minimum allocation address overwrite

Colin Ian King (1):
proc: fix -ESRCH error when writing to /proc/$pid/coredump_filter

Cyrille Pitchen (1):
i2c: at91: fix write transfers by clearing pending interrupt first

Dan Williams (1):
ext2, ext4: warn when mounting with dax enabled

Daniel Borkmann (1):
tracefs: Fix refcount imbalance in start_creating()

Daniele Palmas (1):
USB: serial: option: Adding support for Telit LE922

David Gstir (2):
crypto: nx - Fix timing leak in GCM and CCM decryption
crypto: talitos - Fix timing leak in ESP ICV verification

David Henningsson (1):
ALSA: hda - Fix static checker warning in patch_hdmi.c

David Howells (1):
FS-Cache: Handle a write to the page immediately beyond the EOF marker

David Mosberger-Tang (1):
spi: atmel: Fix DMA-setup for transfers with more than 8 bits per word

David Turner (1):
ext4: Fix handling of extended tv_sec

Dmitry Kasatkin (1):
integrity: prevent loading untrusted certificates on the IMA trusted keyring

Dmitry V. Levin (1):
sh64: fix __NR_fgetxattr

Du, Changbin (1):
usb: hub: do not clear BOS field during reset device

Eli Cooper (1):
crypto: chacha20-ssse3 - Align stack pointer to 64 bytes

Eric Biggers (1):
fs/pipe.c: return error code rather than 0 in pipe_write()

Ezequiel Garcia (1):
vivid: Fix iteration in driver removal path

Gabriele Paoloni (1):
PCI: spear: Fix dw_pcie_cfg_read/write() usage

Geert Uytterhoeven (1):
FS-Cache: Add missing initialization of ret in cachefiles_write_page()

Greg Kroah-Hartman (2):
USB: serial: ftdi_sio: add support for Yaesu SCU-18 cable Linux 4.3.6

Greg Thelen (1):
fs, seqfile: always allow oom killer

Grygorii Strashko (2):
PCI: host: Mark PCIe/PCI (MSI) IRQ cascade handlers as IRQF_NO_THREAD
i2c: fix wakeup irq parsing

Guillaume Fougnies (1):

      ALSA: usb-audio: Fix TEAC UD-501/UD-503/NT-503 usb delay

Hannes Reinecke (1):
block: Always check queue limits for cloned requests

Hans Verkuil (1):
v4l2-ctrls: arrays are also considered compound controls

Hans de Goede (1):
i2c: mv64xxx: The n clockdiv factor is 0 based on sunxi SoCs

Helge Deller (4):
parisc: Fixes and cleanups in kernel uapi header files
parisc: Drop unused MADV_xxxK_PAGES flags from asm/mman.h
parisc: Fix syscall restarts
parisc: Fix __ARCH_SI_PREAMBLE_SIZE

Herbert Xu (23):
crypto: algif_hash - Only export and import on sockets with data
crypto: algif_skcipher - Use new skcipher interface
crypto: algif_skcipher - Require setkey before accept(2)
crypto: af_alg - Disallow bind/setkey/... after accept(2)
crypto: af_alg - Fix socket double-free when accept fails
crypto: af_alg - Add nokey compatibility path
crypto: algif_skcipher - Add nokey compatibility path
crypto: hash - Add crypto_ahash_has_setkey
crypto: algif_hash - Require setkey before accept(2)
crypto: skcipher - Add crypto_skcipher_has_setkey
crypto: algif_skcipher - Add key check exception for cipher_null
crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path
crypto: algif_hash - Remove custom release parent function
crypto: algif_skcipher - Remove custom release parent function
crypto: af_alg - Forbid bind(2) when nokey child sockets are present
crypto: algif_hash - Fix race condition in hash_check_key
crypto: algif_skcipher - Fix race condition in skcipher_check_key
crypto: algif_skcipher - Load TX SG list after waiting
crypto: algif_skcipher - sendmsg SG marking is off by one
crypto: shash - Fix has_key setting
crypto: algif_skcipher - Do not assume that req is unchanged
crypto: algif_skcipher - Do not dereference ctx without socket lock
crypto: algif_skcipher - Do not set MAY_BACKLOG on the async path

Hon Ching \(Vicky\) Lo (1):
vTPM: fix memory allocation flag for rtce buffer at kernel boot

Horia Geant? (1):
crypto: caam - make write transactions bufferable on PPC platforms

Ioan-Adrian Ratiu (1):
HID: usbhid: fix recursive deadlock

Jaegeuk Kim (1):
f2fs crypto: allocate buffer for decrypting filename

Jan Kara (2):
jbd2: fix checkpoint list cleanup
jbd2: Fix unreclaimed pages after truncate in data=journal mode

Jarkko Sakkinen (2):
tpm, tpm_crb: fix unaligned read of the command buffer address
TPM: revert the list handling logic fixed in 398a1e7

Jason A. Donenfeld (1):
crypto: skcipher - Copy iv from desc even for 0-len walks

Javier Martinez Canillas (1):
media: i2c: Don't export ir-kbd-i2c module alias

Jean Delvare (1):
crypto: crc32c - Fix crc32c soft dependency

Jerome Marchand (1):
zram: don't call idr_remove() from zram_remove()

Jiaxing Wang (1):
tracing: Update instance_rmdir() to use tracefs_remove_recursive

Johan Hovold (2):
spi: fix parent-device reference leak
USB: visor: fix null-deref at probe

John Ernberg (1):
USB: option: fix Cinterion AHxx enumeration

Joseph Qi (1):
ocfs2: fix BUG when calculate new backup super

Junichi Nomura (1):
block: ensure to split after potentially bouncing a bio

Junil Lee (1):
zsmalloc: fix migrate_zspage-zs_free race condition

Junxiao Bi (2):
ocfs2: fix SGID not inherited issue
jbd2: fix null committed data return in undo_access

Jurgen Kramer (2):
ALSA: usb-audio: Fix OPPO HA-1 vendor ID
ALSA: usb-audio: Add native DSD support for PS Audio NuWave DAC

Kinglong Mee (2):
FS-Cache: Increase reference of parent after registering, netfs success
FS-Cache: Don't override netfs's primary_index if registering failed

Kyeongdon Kim (1):
zram: try vmalloc() after kmalloc()

LABBE Corentin (1):
crypto: sun4i-ss - add missing statesize

Larry Finger (1):
rtlwifi: rtl8821ae: Fix lockups on boot

Lev Lybin (1):
ALSA: usb-audio: Add quirk for Microsoft LifeCam HD-6000

Lu Baolu (4):
usb: cdc-acm: handle unlinked urb in acm read callback
usb: cdc-acm: send zero packet for intel 7260 modem
usb: xhci: handle both SSIC ports in PME stuck quirk
usb: xhci: apply XHCI_PME_STUCK_QUIRK to Intel Broxton-M platforms

Lucas Tanure (1):
ALSA: bebob: Use a signed return type for get_formation_index

Ludovic Desroches (1):
i2c: at91: manage unexpected RXRDY flag when starting a transfer

Maciej W. Rozycki (1):
binfmt_elf: Don't clobber passed executable's file header

Martin Wilck (1):
tpm_tis: free irq after probing

Mathias Krause (3):
PCI: Prevent out of bounds access in numa_node override
printk: prevent userland from spoofing kernel messages
crypto: user - lock crypto_alg_list on alg dump

Mathias Nyman (1):
xhci: fix usb2 resume timing and races.

Mauricio Faria de Oliveira (1):
Revert "dm mpath: fix stalls when handling invalid ioctls"

Mauro Carvalho Chehab (2):
Revert "[media] ivtv: avoid going past input/audio array"
saa7134-alsa: Only frees registered sound cards

Max Filippov (2):
xtensa: fixes for configs without loop option
xtensa: fix secondary core boot in SMP

Michal Hocko (2):
memcg: fix thresholds for 32b architectures.
mm, vmstat: allow WQ concurrency to discover memory reclaim doesn't make any progress

Mika Westerberg (1):
HID: multitouch: Fetch feature reports on demand for Win8 devices

Mike Kravetz (2):
mm/hugetlbfs: fix bugs in fallocate hole punch of areas with holes mm/hugetlb.c: fix resv map memory leak for placeholder entries

Mike Snitzer (1):
dm btree: fix leak of bufio-backed block in btree_split_sibling error path

Mikulas Patocka (1):
dm: initialize non-blk-mq queue data before queue is used

Naoya Horiguchi (2):
mm: hugetlb: fix hugepage memory leak caused by wrong reserve count
mm: hugetlb: call huge_pte_alloc() only if ptep is null

Neil Armstrong (1):
spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message

Nicolas Iooss (1):
crypto: crc32c-pclmul - use .rodata instead of .rotata

OGAWA Hirofumi (1):
fat: fix fake_offset handling on error path

Oleg Nesterov (1):
proc: actually make proc_fd_permission() thread-friendly

Peter Dedecker (1):

      USB: cp210x: add ID for IAI USB to RS485 adaptor

Peter Hurley (5):
n_tty: Fix poll() after buffer-limited eof push read
n_tty: Fix unsafe reference to "other" ldisc
tty: Fix GPF in flush_to_ldisc()
tty: Retry failed reopen if tty teardown in-progress
tty: Fix unsafe ldisc reference via ioctl(TIOCGETD)

Qiu Peiyang (1):
tracing: Fix setting of start_index in find_next()

Raghavendra K T (1):
sched: Fix crash in sched_init_numa()

Ricardo Ribalda Delgado (1):
spi/spi-xilinx: Fix race condition on last word read

Richard Weinberger (1):
kernel/signal.c: unexport sigsuspend()

Russell King (1):
crypto: caam - fix non-block aligned hash calculation

Ryan Ware (1):
EVM: Use crypto_memneq() for digest comparisons

Sebastian Siewior (2):
mtd: ubi: fixup error correction in do_sync_erase()
mtd: ubi: don't leak e if schedule_erase() fails

Sergey Senozhatsky (1):
zram/zcomp: use GFP_NOIO to allocate streams

Seth Jennings (1):
drivers/base/memory.c: prohibit offlining of memory blocks with missing sections

Srinivas Kandagatla (1):
usb: phy: msm: fix error handling in probe.

Tadeusz Struk (2):
crypto: qat - don't use userspace pointer
crypto: fix test vector for rsa

Takashi Iwai (24):
ALSA: hda - Implement loopback control switch for Realtek and other codecs
c8sectpfe: Remove select on CONFIG_FW_LOADER_USER_HELPER_FALLBACK
ALSA: compress: Disable GET_CODEC_CAPS ioctl for some architectures
ALSA: dummy: Disable switching timer backend via sysfs
ALSA: seq: Fix incorrect sanity check at snd_seq_oss_synth_cleanup()
ALSA: seq: Degrade the error message for too many opens
ALSA: rawmidi: Make snd_rawmidi_transmit() race-free
ALSA: rawmidi: Remove kernel WARNING for NULL user-space buffer check
ALSA: rawmidi: Fix race at copying & updating the position
ALSA: pcm: Fix potential deadlock in OSS emulation
ALSA: seq: Fix yet another races among ALSA timer accesses
ALSA: seq: Fix race at closing in virmidi driver
ALSA: seq: Fix lockdep warnings due to double mutex locks
ALSA: timer: Code cleanup
ALSA: timer: Fix leftover link at closing
ALSA: timer: Fix link corruption due to double start or stop
ALSA: timer: Fix race at concurrent reads
ALSA: timer: Fix wrong instance passed to slave callbacks
ALSA: timer: Fix race between stop and interrupt
ALSA: hda - Add fixup for Mac Mini 7,1 model
Revert "ALSA: hda - Fix noise on Gigabyte Z170X mobo"
ALSA: hda - Fix speaker output from VAIO AiO machines
ALSA: hda - Fix bad dereference of jack object
ALSA: dummy: Implement timer backend switching more safely

Tariq Saeed (1):
ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock

Tejun Heo (1):
libata: disable forced PORTS_IMPL for >= AHCI 1.3

Tetsuo Handa (2):
mm/oom_kill.c: reverse the order of setting TIF_MEMDIE and sending SIGKILL mm, vmstat: fix wrong WQ sleep when memory reclaim doesn't make any progress

Thomas Gleixner (1):
hrtimer: Handle remaining time proper for TIME_LOW_RES

Tiffany Lin (2):
media: vb2 dma-contig: Fully cache synchronise buffers in prepare and finish
media: vb2 dma-sg: Fully cache synchronise buffers in prepare and finish

Trond Myklebust (1):

      NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturn

Uri Mashiach (2):
wlcore/wl12xx: spi: fix oops on firmware load wlcore/wl12xx: spi: fix NULL pointer dereference (Oops)

Vignesh R (1):
spi: ti-qspi: Fix data corruption seen on r/w stress test

Vinod Koul (1):
ASoC: dpcm: fix the BE state on hw_free

Vladimir Davydov (1):
mm: memcontrol: fix possible memcg leak due to interrupted reclaim

Vladis Dronov (1):
USB: serial: visor: fix crash on detecting device without write_urbs

Wang, Rui Y (1):
crypto: algif_hash - wait for crypto_ahash_init() to complete

Will Deacon (1):
iommu/io-pgtable-arm: Ensure we free the final level on teardown

Wolfram Sang (2):
i2c: rk3x: populate correct variable for sda_falling_time
i2c: rcar: disable runtime PM correctly in slave mode

Xiangliang Yu (1):
AHCI: Fix softreset failed issue of Port Multiplier

xuejiufei (2):
ocfs2/dlm: ignore cleaning the migration mle that is inuse ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup

author maintainer
#1 lore raw
Makefile +1 -1
index efc7a766c470..95568cb1f5c6 100644
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 3
-SUBLEVEL = 5
+SUBLEVEL = 6
 EXTRAVERSION =
 NAME = Blurry Fish Butt
 
arch/arm64/mm/mmu.c +7 -6
index 9317974c9b8e..326564386cfa 100644
@@ -301,6 +301,7 @@ static void create_mapping_late(phys_addr_t phys, unsigned long virt,
 }
 
 #ifdef CONFIG_DEBUG_RODATA
+#define SWAPPER_BLOCK_SIZE	(PAGE_SHIFT == 12 ? SECTION_SIZE : PAGE_SIZE)
 static void __init __map_memblock(phys_addr_t start, phys_addr_t end)
 {
 	/*
@@ -308,8 +309,8 @@ static void __init __map_memblock(phys_addr_t start, phys_addr_t end)
 	 * for now. This will get more fine grained later once all memory
 	 * is mapped
 	 */
-	unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
-	unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
+	unsigned long kernel_x_start = round_down(__pa(_stext), SWAPPER_BLOCK_SIZE);
+	unsigned long kernel_x_end = round_up(__pa(__init_end), SWAPPER_BLOCK_SIZE);
 
 	if (end < kernel_x_start) {
 		create_mapping(start, __phys_to_virt(start),
@@ -397,18 +398,18 @@ void __init fixup_executable(void)
 {
 #ifdef CONFIG_DEBUG_RODATA
 	/* now that we are actually fully mapped, make the start/end more fine grained */
-	if (!IS_ALIGNED((unsigned long)_stext, SECTION_SIZE)) {
+	if (!IS_ALIGNED((unsigned long)_stext, SWAPPER_BLOCK_SIZE)) {
 		unsigned long aligned_start = round_down(__pa(_stext),
-							SECTION_SIZE);
+							 SWAPPER_BLOCK_SIZE);
 
 		create_mapping(aligned_start, __phys_to_virt(aligned_start),
 				__pa(_stext) - aligned_start,
 				PAGE_KERNEL);
 	}
 
-	if (!IS_ALIGNED((unsigned long)__init_end, SECTION_SIZE)) {
+	if (!IS_ALIGNED((unsigned long)__init_end, SWAPPER_BLOCK_SIZE)) {
 		unsigned long aligned_end = round_up(__pa(__init_end),
-							SECTION_SIZE);
+							  SWAPPER_BLOCK_SIZE);
 		create_mapping(__pa(__init_end), (unsigned long)__init_end,
 				aligned_end - __pa(__init_end),
 				PAGE_KERNEL);
arch/parisc/include/asm/compat.h +2 -2
index 94710cfc1ce8..0448a2c8eafb 100644
@@ -206,10 +206,10 @@ struct compat_ipc64_perm {
 
 struct compat_semid64_ds {
 	struct compat_ipc64_perm sem_perm;
-	compat_time_t sem_otime;
 	unsigned int __unused1;
-	compat_time_t sem_ctime;
+	compat_time_t sem_otime;
 	unsigned int __unused2;
+	compat_time_t sem_ctime;
 	compat_ulong_t sem_nsems;
 	compat_ulong_t __unused3;
 	compat_ulong_t __unused4;
arch/parisc/include/uapi/asm/ipcbuf.h +12 -7
index bd956c425785..790c4119f647 100644
@@ -1,6 +1,9 @@
 #ifndef __PARISC_IPCBUF_H__
 #define __PARISC_IPCBUF_H__
 
+#include <asm/bitsperlong.h>
+#include <linux/posix_types.h>
+
 /*
  * The ipc64_perm structure for PA-RISC is almost identical to
  * kern_ipc_perm as we have always had 32-bit UIDs and GIDs in the kernel.
@@ -10,16 +13,18 @@
 
 struct ipc64_perm
 {
-	key_t           key;
-	uid_t           uid;
-	gid_t           gid;
-	uid_t           cuid;
-	gid_t           cgid;
+	__kernel_key_t		key;
+	__kernel_uid_t		uid;
+	__kernel_gid_t		gid;
+	__kernel_uid_t		cuid;
+	__kernel_gid_t		cgid;
+#if __BITS_PER_LONG != 64
 	unsigned short int	__pad1;
-	mode_t          mode;
+#endif
+	__kernel_mode_t		mode;
 	unsigned short int	__pad2;
 	unsigned short int	seq;
-	unsigned int	__pad3;
+	unsigned int		__pad3;
 	unsigned long long int __unused1;
 	unsigned long long int __unused2;
 };
arch/parisc/include/uapi/asm/mman.h +0 -10
index 294d251ca7b2..2ae13ce592e8 100644
@@ -46,16 +46,6 @@
 #define MADV_DONTFORK	10		/* don't inherit across fork */
 #define MADV_DOFORK	11		/* do inherit across fork */
 
-/* The range 12-64 is reserved for page size specification. */
-#define MADV_4K_PAGES   12              /* Use 4K pages  */
-#define MADV_16K_PAGES  14              /* Use 16K pages */
-#define MADV_64K_PAGES  16              /* Use 64K pages */
-#define MADV_256K_PAGES 18              /* Use 256K pages */
-#define MADV_1M_PAGES   20              /* Use 1 Megabyte pages */
-#define MADV_4M_PAGES   22              /* Use 4 Megabyte pages */
-#define MADV_16M_PAGES  24              /* Use 16 Megabyte pages */
-#define MADV_64M_PAGES  26              /* Use 64 Megabyte pages */
-
 #define MADV_MERGEABLE   65		/* KSM may merge identical pages */
 #define MADV_UNMERGEABLE 66		/* KSM may not merge identical pages */
 
arch/parisc/include/uapi/asm/msgbuf.h +5 -5
index 342138983914..2e83ac758e19 100644
@@ -27,13 +27,13 @@ struct msqid64_ds {
 	unsigned int   __pad3;
 #endif
 	__kernel_time_t msg_ctime;	/* last change time */
-	unsigned int  msg_cbytes;	/* current number of bytes on queue */
-	unsigned int  msg_qnum;	/* number of messages in queue */
-	unsigned int  msg_qbytes;	/* max number of bytes on queue */
+	unsigned long msg_cbytes;	/* current number of bytes on queue */
+	unsigned long msg_qnum;		/* number of messages in queue */
+	unsigned long msg_qbytes;	/* max number of bytes on queue */
 	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */
 	__kernel_pid_t msg_lrpid;	/* last receive pid */
-	unsigned int  __unused1;
-	unsigned int  __unused2;
+	unsigned long __unused1;
+	unsigned long __unused2;
 };
 
 #endif /* _PARISC_MSGBUF_H */
arch/parisc/include/uapi/asm/posix_types.h +2 -0
index b9344256f76b..f3b5f70b9a5f 100644
@@ -7,8 +7,10 @@
  * assume GCC is being used.
  */
 
+#ifndef __LP64__
 typedef unsigned short		__kernel_mode_t;
 #define __kernel_mode_t __kernel_mode_t
+#endif
 
 typedef unsigned short		__kernel_ipc_pid_t;
 #define __kernel_ipc_pid_t __kernel_ipc_pid_t
arch/parisc/include/uapi/asm/sembuf.h +3 -3
index f01d89e30d73..c20971bf520f 100644
@@ -23,9 +23,9 @@ struct semid64_ds {
 	unsigned int	__pad2;
 #endif
 	__kernel_time_t	sem_ctime;		/* last change time */
-	unsigned int	sem_nsems;		/* no. of semaphores in array */
-	unsigned int	__unused1;
-	unsigned int	__unused2;
+	unsigned long 	sem_nsems;		/* no. of semaphores in array */
+	unsigned long	__unused1;
+	unsigned long	__unused2;
 };
 
 #endif /* _PARISC_SEMBUF_H */
arch/parisc/include/uapi/asm/shmbuf.h +4 -4
index 8496c38560c6..750e13e77991 100644
@@ -30,12 +30,12 @@ struct shmid64_ds {
 #if __BITS_PER_LONG != 64
 	unsigned int		__pad4;
 #endif
-	size_t			shm_segsz;	/* size of segment (bytes) */
+	__kernel_size_t		shm_segsz;	/* size of segment (bytes) */
 	__kernel_pid_t		shm_cpid;	/* pid of creator */
 	__kernel_pid_t		shm_lpid;	/* pid of last operator */
-	unsigned int		shm_nattch;	/* no. of current attaches */
-	unsigned int		__unused1;
-	unsigned int		__unused2;
+	unsigned long		shm_nattch;	/* no. of current attaches */
+	unsigned long		__unused1;
+	unsigned long		__unused2;
 };
 
 struct shminfo64 {
arch/parisc/include/uapi/asm/siginfo.h +4 -0
index d7034728f377..1c75565d984b 100644
@@ -1,6 +1,10 @@
 #ifndef _PARISC_SIGINFO_H
 #define _PARISC_SIGINFO_H
 
+#if defined(__LP64__)
+#define __ARCH_SI_PREAMBLE_SIZE   (4 * sizeof(int))
+#endif
+
 #include <asm-generic/siginfo.h>
 
 #undef NSIGTRAP
arch/parisc/kernel/signal.c +52 -12

83 lines not on this page · raw message

arch/parisc/mm/init.c +16 -0
index c229427fa546..c5fec4890fdf 100644
@@ -23,6 +23,7 @@
 #include <linux/unistd.h>
 #include <linux/nodemask.h>	/* for node_online_map */
 #include <linux/pagemap.h>	/* for release_pages and page_cache_release */
+#include <linux/compat.h>
 
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
@@ -30,6 +31,7 @@
 #include <asm/pdc_chassis.h>
 #include <asm/mmzone.h>
 #include <asm/sections.h>
+#include <asm/msgbuf.h>
 
 extern int  data_start;
 extern void parisc_kernel_start(void);	/* Kernel entry point in head.S */
@@ -590,6 +592,20 @@ unsigned long pcxl_dma_start __read_mostly;
 
 void __init mem_init(void)
 {
+	/* Do sanity checks on IPC (compat) structures */
+	BUILD_BUG_ON(sizeof(struct ipc64_perm) != 48);
+#ifndef CONFIG_64BIT
+	BUILD_BUG_ON(sizeof(struct semid64_ds) != 80);
+	BUILD_BUG_ON(sizeof(struct msqid64_ds) != 104);
+	BUILD_BUG_ON(sizeof(struct shmid64_ds) != 104);
+#endif
+#ifdef CONFIG_COMPAT
+	BUILD_BUG_ON(sizeof(struct compat_ipc64_perm) != sizeof(struct ipc64_perm));
+	BUILD_BUG_ON(sizeof(struct compat_semid64_ds) != 80);
+	BUILD_BUG_ON(sizeof(struct compat_msqid64_ds) != 104);
+	BUILD_BUG_ON(sizeof(struct compat_shmid64_ds) != 104);
+#endif
+
 	/* Do sanity checks on page table constants */
 	BUILD_BUG_ON(PTE_ENTRY_SIZE != sizeof(pte_t));
 	BUILD_BUG_ON(PMD_ENTRY_SIZE != sizeof(pmd_t));
arch/sh/include/uapi/asm/unistd_64.h +1 -1
index e6820c86e8c7..47ebd5b5ed55 100644
@@ -278,7 +278,7 @@
 #define __NR_fsetxattr		256
 #define __NR_getxattr		257
 #define __NR_lgetxattr		258
-#define __NR_fgetxattr		269
+#define __NR_fgetxattr		259
 #define __NR_listxattr		260
 #define __NR_llistxattr		261
 #define __NR_flistxattr		262
arch/x86/crypto/chacha20-ssse3-x86_64.S +4 -2
index 712b13047b41..3a33124e9112 100644
@@ -157,7 +157,9 @@ ENTRY(chacha20_4block_xor_ssse3)
 	# done with the slightly better performing SSSE3 byte shuffling,
 	# 7/12-bit word rotation uses traditional shift+OR.
 
-	sub		$0x40,%rsp
+	mov		%rsp,%r11
+	sub		$0x80,%rsp
+	and		$~63,%rsp
 
 	# x0..15[0-3] = s0..3[0..3]
 	movq		0x00(%rdi),%xmm1
@@ -620,6 +622,6 @@ ENTRY(chacha20_4block_xor_ssse3)
 	pxor		%xmm1,%xmm15
 	movdqu		%xmm15,0xf0(%rsi)
 
-	add		$0x40,%rsp
+	mov		%r11,%rsp
 	ret
 ENDPROC(chacha20_4block_xor_ssse3)
arch/x86/crypto/crc32c-pcl-intel-asm_64.S +1 -1
index 225be06edc80..4fe27e074194 100644
@@ -330,7 +330,7 @@ ENDPROC(crc_pcl)
 	## PCLMULQDQ tables
 	## Table is 128 entries x 2 words (8 bytes) each
 	################################################################
-.section	.rotata, "a", %progbits
+.section	.rodata, "a", %progbits
 .align 8
 K_table:
 	.long 0x493c7d27, 0x00000001
arch/xtensa/include/asm/asmmacro.h +4 -3
index 755320f6e0bc..746dcc8b5abc 100644
@@ -35,9 +35,10 @@
  * __loop  as
  *	   restart loop. 'as' register must not have been modified!
  *
- * __endla ar, at, incr
+ * __endla ar, as, incr
  *	   ar	start address (modified)
- *	   as	scratch register used by macro
+ *	   as	scratch register used by __loops/__loopi macros or
+ *		end address used by __loopt macro
  *	   inc	increment
  */
 
@@ -97,7 +98,7 @@
 	.endm
 
 /*
- * loop from ar to ax
+ * loop from ar to as
  */
 
 	.macro	__loopt	ar, as, at, incr_log2
arch/xtensa/include/asm/vectors.h +5 -4
index a46c53f36113..986b5d0cb9e0 100644
@@ -48,6 +48,9 @@
   #define LOAD_MEMORY_ADDRESS		0xD0003000
 #endif
 
+#define RESET_VECTOR1_VADDR		(VIRTUAL_MEMORY_ADDRESS + \
+					 XCHAL_RESET_VECTOR1_PADDR)
+
 #else /* !defined(CONFIG_MMU) */
   /* MMU Not being used - Virtual == Physical */
 
@@ -60,6 +63,8 @@
   /* Loaded just above possibly live vectors */
   #define LOAD_MEMORY_ADDRESS		(PLATFORM_DEFAULT_MEM_START + 0x3000)
 
+#define RESET_VECTOR1_VADDR		(XCHAL_RESET_VECTOR1_VADDR)
+
 #endif /* CONFIG_MMU */
 
 #define XC_VADDR(offset)		(VIRTUAL_MEMORY_ADDRESS  + offset)
@@ -71,10 +76,6 @@
 						VECBASE_RESET_VADDR)
 #define RESET_VECTOR_VADDR		XC_VADDR(RESET_VECTOR_VECOFS)
 
-#define RESET_VECTOR1_VECOFS		(XCHAL_RESET_VECTOR1_VADDR - \
-						VECBASE_RESET_VADDR)
-#define RESET_VECTOR1_VADDR		XC_VADDR(RESET_VECTOR1_VECOFS)
-
 #if defined(XCHAL_HAVE_VECBASE) && XCHAL_HAVE_VECBASE
 
 #define USER_VECTOR_VADDR		XC_VADDR(XCHAL_USER_VECOFS)
arch/xtensa/kernel/Makefile +1 -0
index 50137bc9e150..4db730290d2d 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_SMP) += smp.o mxhead.o
 obj-$(CONFIG_XTENSA_VARIANT_HAVE_PERF_EVENTS) += perf_event.o
 
 AFLAGS_head.o += -mtext-section-literals
+AFLAGS_mxhead.o += -mtext-section-literals
 
 # In the Xtensa architecture, assembly generates literals which must always
 # precede the L32R instruction with a relative offset less than 256 kB.
arch/xtensa/kernel/entry.S +6 -2
index 504130357597..db5c1765b413 100644
@@ -367,8 +367,10 @@ common_exception:
 	s32i	a2, a1, PT_SYSCALL
 	movi	a2, 0
 	s32i	a3, a1, PT_EXCVADDR
+#if XCHAL_HAVE_LOOPS
 	xsr	a2, lcount
 	s32i	a2, a1, PT_LCOUNT
+#endif
 
 	/* It is now save to restore the EXC_TABLE_FIXUP variable. */
 
@@ -429,11 +431,12 @@ common_exception:
 	rsync				# PS.WOE => rsync => overflow
 
 	/* Save lbeg, lend */
-
+#if XCHAL_HAVE_LOOPS
 	rsr	a4, lbeg
 	rsr	a3, lend
 	s32i	a4, a1, PT_LBEG
 	s32i	a3, a1, PT_LEND
+#endif
 
 	/* Save SCOMPARE1 */
 
@@ -724,13 +727,14 @@ common_exception_exit:
 	wsr	a3, sar
 
 	/* Restore LBEG, LEND, LCOUNT */
-
+#if XCHAL_HAVE_LOOPS
 	l32i	a2, a1, PT_LBEG
 	l32i	a3, a1, PT_LEND
 	wsr	a2, lbeg
 	l32i	a2, a1, PT_LCOUNT
 	wsr	a3, lend
 	wsr	a2, lcount
+#endif
 
 	/* We control single stepping through the ICOUNTLEVEL register. */
 
arch/xtensa/kernel/head.S +1 -1
index 15a461e2a0ed..9ed55649ac8e 100644
@@ -249,7 +249,7 @@ ENTRY(_startup)
 
 	__loopt	a2, a3, a4, 2
 	s32i	a0, a2, 0
-	__endla	a2, a4, 4
+	__endla	a2, a3, 4
 
 #if XCHAL_DCACHE_IS_WRITEBACK
 
arch/xtensa/kernel/setup.c +8 -1
index 28fc57ef5b86..4e06ec9769d1 100644
@@ -334,7 +334,10 @@ extern char _Level5InterruptVector_text_end;
 extern char _Level6InterruptVector_text_start;
 extern char _Level6InterruptVector_text_end;
 #endif
-
+#ifdef CONFIG_SMP
+extern char _SecondaryResetVector_text_start;
+extern char _SecondaryResetVector_text_end;
+#endif
 
 
 #ifdef CONFIG_S32C1I_SELFTEST
@@ -506,6 +509,10 @@ void __init setup_arch(char **cmdline_p)
 		    __pa(&_Level6InterruptVector_text_end), 0);
 #endif
 
+#ifdef CONFIG_SMP
+	mem_reserve(__pa(&_SecondaryResetVector_text_start),
+		    __pa(&_SecondaryResetVector_text_end), 0);
+#endif
 	parse_early_param();
 	bootmem_init();
 
arch/xtensa/kernel/vectors.S +3 -1
index abcdb527f18a..fc25318e75ad 100644
@@ -478,6 +478,9 @@ _DoubleExceptionVector_handle_exception:
 
 ENDPROC(_DoubleExceptionVector)
 
+	.end literal_prefix
+
+	.text
 /*
  * Fixup handler for TLB miss in double exception handler for window owerflow.
  * We get here with windowbase set to the window that was being spilled and
@@ -587,7 +590,6 @@ ENTRY(window_overflow_restore_a0_fixup)
 
 ENDPROC(window_overflow_restore_a0_fixup)
 
-	.end literal_prefix
 /*
  * Debug interrupt vector
  *
arch/xtensa/kernel/vmlinux.lds.S +2 -10
index fc1bc2ba8d5d..d66cd408be13 100644
@@ -166,8 +166,6 @@ SECTIONS
     RELOCATE_ENTRY(_DebugInterruptVector_text,
 		   .DebugInterruptVector.text);
 #if defined(CONFIG_SMP)
-    RELOCATE_ENTRY(_SecondaryResetVector_literal,
-		   .SecondaryResetVector.literal);
     RELOCATE_ENTRY(_SecondaryResetVector_text,
 		   .SecondaryResetVector.text);
 #endif
@@ -282,17 +280,11 @@ SECTIONS
 
 #if defined(CONFIG_SMP)
 
-  SECTION_VECTOR (_SecondaryResetVector_literal,
-		  .SecondaryResetVector.literal,
-		  RESET_VECTOR1_VADDR - 4,
-		  SIZEOF(.DoubleExceptionVector.text),
-		  .DoubleExceptionVector.text)
-
   SECTION_VECTOR (_SecondaryResetVector_text,
 		  .SecondaryResetVector.text,
 		  RESET_VECTOR1_VADDR,
-		  4,
-		  .SecondaryResetVector.literal)
+		  SIZEOF(.DoubleExceptionVector.text),
+		  .DoubleExceptionVector.text)
 
   . = LOADADDR(.SecondaryResetVector.text)+SIZEOF(.SecondaryResetVector.text);
 
arch/xtensa/lib/usercopy.S +3 -3
index ace1892a875e..7ea4dd68893e 100644
@@ -222,8 +222,8 @@ __xtensa_copy_user:
 	loopnez	a7, .Loop2done
 #else /* !XCHAL_HAVE_LOOPS */
 	beqz	a7, .Loop2done
-	slli	a10, a7, 4
-	add	a10, a10, a3	# a10 = end of last 16B source chunk
+	slli	a12, a7, 4
+	add	a12, a12, a3	# a12 = end of last 16B source chunk
 #endif /* !XCHAL_HAVE_LOOPS */
 .Loop2:
 	EX(l32i, a7, a3,  4, l_fixup)
@@ -241,7 +241,7 @@ __xtensa_copy_user:
 	EX(s32i, a9, a5, 12, s_fixup)
 	addi	a5, a5, 16
 #if !XCHAL_HAVE_LOOPS
-	blt	a3, a10, .Loop2
+	blt	a3, a12, .Loop2
 #endif /* !XCHAL_HAVE_LOOPS */
 .Loop2done:
 	bbci.l	a4, 3, .L12
arch/xtensa/platforms/iss/setup.c +2 -0
index da7d18240866..391820539f0a 100644
@@ -61,7 +61,9 @@ void platform_restart(void)
 #if XCHAL_NUM_IBREAK > 0
 			     "wsr	a2, ibreakenable\n\t"
 #endif
+#if XCHAL_HAVE_LOOPS
 			     "wsr	a2, lcount\n\t"
+#endif
 			     "movi	a2, 0x1f\n\t"
 			     "wsr	a2, ps\n\t"
 			     "isync\n\t"
arch/xtensa/platforms/xt2000/setup.c +2 -0
index b90555cb8089..87678961a8c8 100644
@@ -72,7 +72,9 @@ void platform_restart(void)
 #if XCHAL_NUM_IBREAK > 0
 			      "wsr	a2, ibreakenable\n\t"
 #endif
+#if XCHAL_HAVE_LOOPS
 			      "wsr	a2, lcount\n\t"
+#endif
 			      "movi	a2, 0x1f\n\t"
 			      "wsr	a2, ps\n\t"
 			      "isync\n\t"
arch/xtensa/platforms/xtfpga/setup.c +2 -0
index b4cf70e535ab..e9f65f79cf2e 100644
@@ -63,7 +63,9 @@ void platform_restart(void)
 #if XCHAL_NUM_IBREAK > 0
 			      "wsr	a2, ibreakenable\n\t"
 #endif
+#if XCHAL_HAVE_LOOPS
 			      "wsr	a2, lcount\n\t"
+#endif
 			      "movi	a2, 0x1f\n\t"
 			      "wsr	a2, ps\n\t"
 			      "isync\n\t"
block/blk-core.c +9 -16
index 18e92a6645e2..b128c1609347 100644
@@ -1616,8 +1616,6 @@ static void blk_queue_bio(struct request_queue *q, struct bio *bio)
 	struct request *req;
 	unsigned int request_count = 0;
 
-	blk_queue_split(q, &bio, q->bio_split);
-
 	/*
 	 * low level driver can indicate that it wants pages above a
 	 * certain limit bounced to low memory (ie for highmem, or even
@@ -1625,6 +1623,8 @@ static void blk_queue_bio(struct request_queue *q, struct bio *bio)
 	 */
 	blk_queue_bounce(q, &bio);
 
+	blk_queue_split(q, &bio, q->bio_split);
+
 	if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
 		bio->bi_error = -EIO;
 		bio_endio(bio);
@@ -2023,7 +2023,8 @@ void submit_bio(int rw, struct bio *bio)
 EXPORT_SYMBOL(submit_bio);
 
 /**
- * blk_rq_check_limits - Helper function to check a request for the queue limit
+ * blk_cloned_rq_check_limits - Helper function to check a cloned request
+ *                              for new the queue limits
  * @q:  the queue
  * @rq: the request being checked
  *
@@ -2034,20 +2035,13 @@ EXPORT_SYMBOL(submit_bio);
  *    after it is inserted to @q, it should be checked against @q before
  *    the insertion using this generic function.
  *
- *    This function should also be useful for request stacking drivers
- *    in some cases below, so export this function.
  *    Request stacking drivers like request-based dm may change the queue
- *    limits while requests are in the queue (e.g. dm's table swapping).
- *    Such request stacking drivers should check those requests against
- *    the new queue limits again when they dispatch those requests,
- *    although such checkings are also done against the old queue limits
- *    when submitting requests.
+ *    limits when retrying requests on other queues. Those requests need
+ *    to be checked against the new queue limits again during dispatch.
  */
-int blk_rq_check_limits(struct request_queue *q, struct request *rq)
+static int blk_cloned_rq_check_limits(struct request_queue *q,
+				      struct request *rq)
 {
-	if (!rq_mergeable(rq))
-		return 0;
-
 	if (blk_rq_sectors(rq) > blk_queue_get_max_sectors(q, rq->cmd_flags)) {
 		printk(KERN_ERR "%s: over max size limit.\n", __func__);
 		return -EIO;
@@ -2067,7 +2061,6 @@ int blk_rq_check_limits(struct request_queue *q, struct request *rq)
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(blk_rq_check_limits);
 
 /**
  * blk_insert_cloned_request - Helper for stacking drivers to submit a request
@@ -2079,7 +2072,7 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)
 	unsigned long flags;
 	int where = ELEVATOR_INSERT_BACK;
 
-	if (blk_rq_check_limits(q, rq))
+	if (blk_cloned_rq_check_limits(q, rq))
 		return -EIO;
 
 	if (rq->rq_disk &&
crypto/ablkcipher.c +1 -1
index b4ffc5be1a93..e5b5721809e2 100644
@@ -277,12 +277,12 @@ static int ablkcipher_walk_first(struct ablkcipher_request *req,
 	if (WARN_ON_ONCE(in_irq()))
 		return -EDEADLK;
 
+	walk->iv = req->info;
 	walk->nbytes = walk->total;
 	if (unlikely(!walk->total))
 		return 0;
 
 	walk->iv_buffer = NULL;
-	walk->iv = req->info;
 	if (unlikely(((unsigned long)walk->iv & alignmask))) {
 		int err = ablkcipher_copy_iv(walk, tfm, alignmask);
 
crypto/af_alg.c +49 -6

120 lines not on this page · raw message

crypto/ahash.c +4 -1
index 9c1dc8d6106a..d19b52324cf5 100644
@@ -451,6 +451,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
 	struct ahash_alg *alg = crypto_ahash_alg(hash);
 
 	hash->setkey = ahash_nosetkey;
+	hash->has_setkey = false;
 	hash->export = ahash_no_export;
 	hash->import = ahash_no_import;
 
@@ -463,8 +464,10 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
 	hash->finup = alg->finup ?: ahash_def_finup;
 	hash->digest = alg->digest;
 
-	if (alg->setkey)
+	if (alg->setkey) {
 		hash->setkey = alg->setkey;
+		hash->has_setkey = true;
+	}
 	if (alg->export)
 		hash->export = alg->export;
 	if (alg->import)
crypto/algif_hash.c +171 -10

256 lines not on this page · raw message

crypto/algif_skcipher.c +211 -68

442 lines not on this page · raw message

crypto/blkcipher.c +1 -1
index 11b981492031..8cc1622b2ee0 100644
@@ -326,12 +326,12 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc,
 	if (WARN_ON_ONCE(in_irq()))
 		return -EDEADLK;
 
+	walk->iv = desc->info;
 	walk->nbytes = walk->total;
 	if (unlikely(!walk->total))
 		return 0;
 
 	walk->buffer = NULL;
-	walk->iv = desc->info;
 	if (unlikely(((unsigned long)walk->iv & walk->alignmask))) {
 		int err = blkcipher_copy_iv(walk);
 		if (err)
crypto/crc32c_generic.c +0 -1
index 06f1b60f02b2..4c0a0e271876 100644
@@ -172,4 +172,3 @@ MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CRYPTO("crc32c");
 MODULE_ALIAS_CRYPTO("crc32c-generic");
-MODULE_SOFTDEP("pre: crc32c");
crypto/crypto_user.c +5 -1
index 237f3795cfaa..43fe85f20d57 100644
@@ -499,6 +499,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 		if (link->dump == NULL)
 			return -EINVAL;
 
+		down_read(&crypto_alg_sem);
 		list_for_each_entry(alg, &crypto_alg_list, cra_list)
 			dump_alloc += CRYPTO_REPORT_MAXSIZE;
 
@@ -508,8 +509,11 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 				.done = link->done,
 				.min_dump_alloc = dump_alloc,
 			};
-			return netlink_dump_start(crypto_nlsk, skb, nlh, &c);
+			err = netlink_dump_start(crypto_nlsk, skb, nlh, &c);
 		}
+		up_read(&crypto_alg_sem);
+
+		return err;
 	}
 
 	err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX,
crypto/shash.c +3 -2
index ecb1e3d39bf0..359754591653 100644
@@ -354,9 +354,10 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm)
 	crt->final = shash_async_final;
 	crt->finup = shash_async_finup;
 	crt->digest = shash_async_digest;
+	crt->setkey = shash_async_setkey;
+
+	crt->has_setkey = alg->setkey != shash_no_setkey;
 
-	if (alg->setkey)
-		crt->setkey = shash_async_setkey;
 	if (alg->export)
 		crt->export = shash_async_export;
 	if (alg->import)
crypto/skcipher.c +2 -0
index dd5fc1bf6447..bb7d44d2c843 100644
@@ -118,6 +118,7 @@ int crypto_init_skcipher_ops_blkcipher(struct crypto_tfm *tfm)
 	skcipher->decrypt = skcipher_decrypt_blkcipher;
 
 	skcipher->ivsize = crypto_blkcipher_ivsize(blkcipher);
+	skcipher->has_setkey = calg->cra_blkcipher.max_keysize;
 
 	return 0;
 }
@@ -210,6 +211,7 @@ int crypto_init_skcipher_ops_ablkcipher(struct crypto_tfm *tfm)
 	skcipher->ivsize = crypto_ablkcipher_ivsize(ablkcipher);
 	skcipher->reqsize = crypto_ablkcipher_reqsize(ablkcipher) +
 			    sizeof(struct ablkcipher_request);
+	skcipher->has_setkey = calg->cra_ablkcipher.max_keysize;
 
 	return 0;
 }
crypto/testmgr.h +4 -3
index 64b8a8082645..450f30e2c8e4 100644
@@ -270,7 +270,7 @@ static struct akcipher_testvec rsa_tv_template[] = {
 	.c_size = 256,
 	}, {
 	.key =
-	"\x30\x82\x01\x09" /* sequence of 265 bytes */
+	"\x30\x82\x01\x0C" /* sequence of 268 bytes */
 	"\x02\x82\x01\x00" /* modulus - integer of 256 bytes */
 	"\xDB\x10\x1A\xC2\xA3\xF1\xDC\xFF\x13\x6B\xED\x44\xDF\xF0\x02\x6D"
 	"\x13\xC7\x88\xDA\x70\x6B\x54\xF1\xE8\x27\xDC\xC3\x0F\x99\x6A\xFA"
@@ -288,8 +288,9 @@ static struct akcipher_testvec rsa_tv_template[] = {
 	"\x55\xE6\x29\x69\xD1\xC2\xE8\xB9\x78\x59\xF6\x79\x10\xC6\x4E\xEB"
 	"\x6A\x5E\xB9\x9A\xC7\xC4\x5B\x63\xDA\xA3\x3F\x5E\x92\x7A\x81\x5E"
 	"\xD6\xB0\xE2\x62\x8F\x74\x26\xC2\x0C\xD3\x9A\x17\x47\xE6\x8E\xAB"
-	"\x02\x03\x01\x00\x01", /* public key - integer of 3 bytes */
-	.key_len = 269,
+	"\x02\x03\x01\x00\x01" /* public key - integer of 3 bytes */
+	"\x02\x01\x00", /* private key - integer of 1 byte */
+	.key_len = 272,
 	.m = "\x54\x85\x9b\x34\x2c\x49\xea\x2a",
 	.c =
 	"\xb2\x97\x76\xb4\xae\x3e\x38\x3c\x7e\x64\x1f\xcc\xa2\x7f\xf6\xbe"
drivers/ata/ahci.c +20 -0
index a46660204e3a..bbd472cadc98 100644
@@ -264,6 +264,26 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */
 	{ PCI_VDEVICE(INTEL, 0x3b2c), board_ahci }, /* PCH RAID */
 	{ PCI_VDEVICE(INTEL, 0x3b2f), board_ahci }, /* PCH AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b0), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b1), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b2), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b3), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b4), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b5), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b6), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19b7), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19bE), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19bF), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c0), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c1), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c2), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c3), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c4), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c5), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c6), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19c7), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19cE), board_ahci }, /* DNV AHCI */
+	{ PCI_VDEVICE(INTEL, 0x19cF), board_ahci }, /* DNV AHCI */
 	{ PCI_VDEVICE(INTEL, 0x1c02), board_ahci }, /* CPT AHCI */
 	{ PCI_VDEVICE(INTEL, 0x1c03), board_ahci }, /* CPT AHCI */
 	{ PCI_VDEVICE(INTEL, 0x1c04), board_ahci }, /* CPT RAID */
drivers/ata/libahci.c +11 -2
index d256a66158be..317f85dfd39a 100644
@@ -495,8 +495,8 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv)
 		}
 	}
 
-	/* fabricate port_map from cap.nr_ports */
-	if (!port_map) {
+	/* fabricate port_map from cap.nr_ports for < AHCI 1.3 */
+	if (!port_map && vers < 0x10300) {
 		port_map = (1 << ahci_nr_ports(cap)) - 1;
 		dev_warn(dev, "forcing PORTS_IMPL to 0x%x\n", port_map);
 
@@ -1266,6 +1266,15 @@ static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
 	ata_tf_to_fis(tf, pmp, is_cmd, fis);
 	ahci_fill_cmd_slot(pp, 0, cmd_fis_len | flags | (pmp << 12));
 
+	/* set port value for softreset of Port Multiplier */
+	if (pp->fbs_enabled && pp->fbs_last_dev != pmp) {
+		tmp = readl(port_mmio + PORT_FBS);
+		tmp &= ~(PORT_FBS_DEV_MASK | PORT_FBS_DEC);
+		tmp |= pmp << PORT_FBS_DEV_OFFSET;
+		writel(tmp, port_mmio + PORT_FBS);
+		pp->fbs_last_dev = pmp;
+	}
+
 	/* issue & wait */
 	writel(1, port_mmio + PORT_CMD_ISSUE);
 
drivers/base/memory.c +4 -0
index 2804aed3f416..25425d3f2575 100644
@@ -303,6 +303,10 @@ static int memory_subsys_offline(struct device *dev)
 	if (mem->state == MEM_OFFLINE)
 		return 0;
 
+	/* Can't offline block with non-present sections */
+	if (mem->section_count != sections_per_block)
+		return -EINVAL;
+
 	return memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE);
 }
 
drivers/block/zram/zcomp.c +2 -2
index 5cb13ca3a3ac..c53617752b93 100644
@@ -76,7 +76,7 @@ static void zcomp_strm_free(struct zcomp *comp, struct zcomp_strm *zstrm)
  */
 static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp)
 {
-	struct zcomp_strm *zstrm = kmalloc(sizeof(*zstrm), GFP_KERNEL);
+	struct zcomp_strm *zstrm = kmalloc(sizeof(*zstrm), GFP_NOIO);
 	if (!zstrm)
 		return NULL;
 
@@ -85,7 +85,7 @@ static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp)
 	 * allocate 2 pages. 1 for compressed data, plus 1 extra for the
 	 * case when compressed size is larger than the original one
 	 */
-	zstrm->buffer = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1);
+	zstrm->buffer = (void *)__get_free_pages(GFP_NOIO | __GFP_ZERO, 1);
 	if (!zstrm->private || !zstrm->buffer) {
 		zcomp_strm_free(comp, zstrm);
 		zstrm = NULL;
drivers/block/zram/zcomp_lz4.c +21 -2
index f2afb7e988c3..dd6083124276 100644
@@ -10,17 +10,36 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/lz4.h>
+#include <linux/vmalloc.h>
+#include <linux/mm.h>
 
 #include "zcomp_lz4.h"
 
 static void *zcomp_lz4_create(void)
 {
-	return kzalloc(LZ4_MEM_COMPRESS, GFP_KERNEL);
+	void *ret;
+
+	/*
+	 * This function can be called in swapout/fs write path
+	 * so we can't use GFP_FS|IO. And it assumes we already
+	 * have at least one stream in zram initialization so we
+	 * don't do best effort to allocate more stream in here.
+	 * A default stream will work well without further multiple
+	 * streams. That's why we use NORETRY | NOWARN.
+	 */
+	ret = kzalloc(LZ4_MEM_COMPRESS, GFP_NOIO | __GFP_NORETRY |
+					__GFP_NOWARN);
+	if (!ret)
+		ret = __vmalloc(LZ4_MEM_COMPRESS,
+				GFP_NOIO | __GFP_NORETRY | __GFP_NOWARN |
+				__GFP_ZERO | __GFP_HIGHMEM,
+				PAGE_KERNEL);
+	return ret;
 }
 
 static void zcomp_lz4_destroy(void *private)
 {
-	kfree(private);
+	kvfree(private);
 }
 
 static int zcomp_lz4_compress(const unsigned char *src, unsigned char *dst,
drivers/block/zram/zcomp_lzo.c +21 -2
index da1bc47d588e..edc549920fa0 100644
@@ -10,17 +10,36 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/lzo.h>
+#include <linux/vmalloc.h>
+#include <linux/mm.h>
 
 #include "zcomp_lzo.h"
 
 static void *lzo_create(void)
 {
-	return kzalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL);
+	void *ret;
+
+	/*
+	 * This function can be called in swapout/fs write path
+	 * so we can't use GFP_FS|IO. And it assumes we already
+	 * have at least one stream in zram initialization so we
+	 * don't do best effort to allocate more stream in here.
+	 * A default stream will work well without further multiple
+	 * streams. That's why we use NORETRY | NOWARN.
+	 */
+	ret = kzalloc(LZO1X_MEM_COMPRESS, GFP_NOIO | __GFP_NORETRY |
+					__GFP_NOWARN);
+	if (!ret)
+		ret = __vmalloc(LZO1X_MEM_COMPRESS,
+				GFP_NOIO | __GFP_NORETRY | __GFP_NOWARN |
+				__GFP_ZERO | __GFP_HIGHMEM,
+				PAGE_KERNEL);
+	return ret;
 }
 
 static void lzo_destroy(void *private)
 {
-	kfree(private);
+	kvfree(private);
 }
 
 static int lzo_compress(const unsigned char *src, unsigned char *dst,
drivers/block/zram/zram_drv.c +4 -3
index 9fa15bb9d118..8022c0a96b36 100644
@@ -1324,7 +1324,6 @@ static int zram_remove(struct zram *zram)
 
 	pr_info("Removed device: %s\n", zram->disk->disk_name);
 
-	idr_remove(&zram_index_idr, zram->disk->first_minor);
 	blk_cleanup_queue(zram->disk->queue);
 	del_gendisk(zram->disk);
 	put_disk(zram->disk);
@@ -1366,10 +1365,12 @@ static ssize_t hot_remove_store(struct class *class,
 	mutex_lock(&zram_index_mutex);
 
 	zram = idr_find(&zram_index_idr, dev_id);
-	if (zram)
+	if (zram) {
 		ret = zram_remove(zram);
-	else
+		idr_remove(&zram_index_idr, dev_id);
+	} else {
 		ret = -ENODEV;
+	}
 
 	mutex_unlock(&zram_index_mutex);
 	return ret ? ret : count;
drivers/char/tpm/tpm-chip.c +1 -1
index 1082d4bb016a..0f8623d88b84 100644
@@ -231,7 +231,7 @@ int tpm_chip_register(struct tpm_chip *chip)
 
 	/* Make the chip available. */
 	spin_lock(&driver_lock);
-	list_add_rcu(&chip->list, &tpm_chip_list);
+	list_add_tail_rcu(&chip->list, &tpm_chip_list);
 	spin_unlock(&driver_lock);
 
 	chip->flags |= TPM_CHIP_FLAG_REGISTERED;
drivers/char/tpm/tpm_crb.c +4 -3
index 2b971b3e5c1c..4bb9727c1047 100644
@@ -68,7 +68,8 @@ struct crb_control_area {
 	u32 int_enable;
 	u32 int_sts;
 	u32 cmd_size;
-	u64 cmd_pa;
+	u32 cmd_pa_low;
+	u32 cmd_pa_high;
 	u32 rsp_size;
 	u64 rsp_pa;
 } __packed;
@@ -263,8 +264,8 @@ static int crb_acpi_add(struct acpi_device *device)
 		return -ENOMEM;
 	}
 
-	memcpy_fromio(&pa, &priv->cca->cmd_pa, 8);
-	pa = le64_to_cpu(pa);
+	pa = ((u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_high)) << 32) |
+		(u64) le32_to_cpu(ioread32(&priv->cca->cmd_pa_low));
 	priv->cmd = devm_ioremap_nocache(dev, pa,
 					 ioread32(&priv->cca->cmd_size));
 	if (!priv->cmd) {
drivers/char/tpm/tpm_ibmvtpm.c +1 -1
index 27ebf9511cb4..3e6a22658b63 100644
@@ -491,7 +491,7 @@ static void ibmvtpm_crq_process(struct ibmvtpm_crq *crq,
 			}
 			ibmvtpm->rtce_size = be16_to_cpu(crq->len);
 			ibmvtpm->rtce_buf = kmalloc(ibmvtpm->rtce_size,
-						    GFP_KERNEL);
+						    GFP_ATOMIC);
 			if (!ibmvtpm->rtce_buf) {
 				dev_err(ibmvtpm->dev, "Failed to allocate memory for rtce buffer\n");
 				return;
drivers/char/tpm/tpm_tis.c +2 -0
index 696ef1d56b4f..19f9c7dc7bc0 100644
@@ -805,6 +805,8 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
 			iowrite32(intmask,
 				  chip->vendor.iobase +
 				  TPM_INT_ENABLE(chip->vendor.locality));
+
+			devm_free_irq(dev, i, chip);
 		}
 	}
 	if (chip->vendor.irq) {
drivers/crypto/caam/caamhash.c +1 -1
index 94433b9fc200..3b70354b0d4b 100644
@@ -829,7 +829,7 @@ static int ahash_update_ctx(struct ahash_request *req)
 		state->buf_dma = try_buf_map_to_sec4_sg(jrdev,
 							edesc->sec4_sg + 1,
 							buf, state->buf_dma,
-							*next_buflen, *buflen);
+							*buflen, last_buflen);
 
 		if (src_nents) {
 			src_map_to_sec4_sg(jrdev, req->src, src_nents,
drivers/crypto/caam/ctrl.c +2 -2
index 8abb4bc548cc..69d4a1326fee 100644
@@ -534,8 +534,8 @@ static int caam_probe(struct platform_device *pdev)
 	 * long pointers in master configuration register
 	 */
 	clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH |
-		      MCFGR_WDENABLE | (sizeof(dma_addr_t) == sizeof(u64) ?
-					MCFGR_LONG_PTR : 0));
+		      MCFGR_AWCACHE_BUFF | MCFGR_WDENABLE |
+		      (sizeof(dma_addr_t) == sizeof(u64) ? MCFGR_LONG_PTR : 0));
 
 	/*
 	 *  Read the Compile Time paramters and SCFGR to determine
drivers/crypto/marvell/cesa.c +1 -1
index 0643e3366e33..c0656e7f37b5 100644
@@ -306,7 +306,7 @@ static int mv_cesa_dev_dma_init(struct mv_cesa_dev *cesa)
 		return -ENOMEM;
 
 	dma->padding_pool = dmam_pool_create("cesa_padding", dev, 72, 1, 0);
-	if (!dma->cache_pool)
+	if (!dma->padding_pool)
 		return -ENOMEM;
 
 	cesa->dma = dma;
drivers/crypto/nx/nx-aes-ccm.c +1 -1
index 73ef49922788..7038f364acb5 100644
@@ -409,7 +409,7 @@ static int ccm_nx_decrypt(struct aead_request   *req,
 		processed += to_process;
 	} while (processed < nbytes);
 
-	rc = memcmp(csbcpb->cpb.aes_ccm.out_pat_or_mac, priv->oauth_tag,
+	rc = crypto_memneq(csbcpb->cpb.aes_ccm.out_pat_or_mac, priv->oauth_tag,
 		    authsize) ? -EBADMSG : 0;
 out:
 	spin_unlock_irqrestore(&nx_ctx->lock, irq_flags);
drivers/crypto/nx/nx-aes-gcm.c +2 -1
index eee624f589b6..abd465f479c4 100644
@@ -21,6 +21,7 @@
 
 #include <crypto/internal/aead.h>
 #include <crypto/aes.h>
+#include <crypto/algapi.h>
 #include <crypto/scatterwalk.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -418,7 +419,7 @@ mac:
 			itag, req->src, req->assoclen + nbytes,
 			crypto_aead_authsize(crypto_aead_reqtfm(req)),
 			SCATTERWALK_FROM_SG);
-		rc = memcmp(itag, otag,
+		rc = crypto_memneq(itag, otag,
 			    crypto_aead_authsize(crypto_aead_reqtfm(req))) ?
 		     -EBADMSG : 0;
 	}
drivers/crypto/qat/qat_common/adf_ctl_drv.c +1 -1
index cd8a12af8ec5..35bada05608a 100644
@@ -198,7 +198,7 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev,
 			goto out_err;
 		}
 
-		params_head = section_head->params;
+		params_head = section.params;
 
 		while (params_head) {
 			if (copy_from_user(&key_val, (void __user *)params_head,
drivers/crypto/sunxi-ss/sun4i-ss-core.c +2 -0
index eab6fe227fa0..107cd2a41cae 100644
@@ -39,6 +39,7 @@ static struct sun4i_ss_alg_template ss_algs[] = {
 		.import = sun4i_hash_import_md5,
 		.halg = {
 			.digestsize = MD5_DIGEST_SIZE,
+			.statesize = sizeof(struct md5_state),
 			.base = {
 				.cra_name = "md5",
 				.cra_driver_name = "md5-sun4i-ss",
@@ -66,6 +67,7 @@ static struct sun4i_ss_alg_template ss_algs[] = {
 		.import = sun4i_hash_import_sha1,
 		.halg = {
 			.digestsize = SHA1_DIGEST_SIZE,
+			.statesize = sizeof(struct sha1_state),
 			.base = {
 				.cra_name = "sha1",
 				.cra_driver_name = "sha1-sun4i-ss",
drivers/crypto/talitos.c +1 -1
index 3b20a1bce703..8b327d89a8fc 100644
@@ -1015,7 +1015,7 @@ static void ipsec_esp_decrypt_swauth_done(struct device *dev,
 		} else
 			oicv = (char *)&edesc->link_tbl[0];
 
-		err = memcmp(oicv, icv, authsize) ? -EBADMSG : 0;
+		err = crypto_memneq(oicv, icv, authsize) ? -EBADMSG : 0;
 	}
 
 	kfree(edesc);
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +1 -1
index 27a79c0c3888..d95eb8659d1b 100644
@@ -28,7 +28,7 @@
 void
 nvkm_pmu_pgob(struct nvkm_pmu *pmu, bool enable)
 {
-	if (pmu->func->pgob)
+	if (pmu && pmu->func->pgob)
 		pmu->func->pgob(pmu, enable);
 }
 
drivers/hid/hid-multitouch.c +57 -3

88 lines not on this page · raw message

drivers/hid/usbhid/hid-core.c +2 -2
index 36712e9f56c2..5dd426fee8cc 100644
@@ -477,8 +477,6 @@ static void hid_ctrl(struct urb *urb)
 	struct usbhid_device *usbhid = hid->driver_data;
 	int unplug = 0, status = urb->status;
 
-	spin_lock(&usbhid->lock);
-
 	switch (status) {
 	case 0:			/* success */
 		if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN)
@@ -498,6 +496,8 @@ static void hid_ctrl(struct urb *urb)
 		hid_warn(urb->dev, "ctrl urb status %d received\n", status);
 	}
 
+	spin_lock(&usbhid->lock);
+
 	if (unplug) {
 		usbhid->ctrltail = usbhid->ctrlhead;
 	} else {
drivers/i2c/busses/i2c-at91.c +70 -12

114 lines not on this page · raw message

drivers/i2c/busses/i2c-mv64xxx.c +18 -9
index 5801227b97ab..43207f52e5a3 100644
@@ -146,6 +146,8 @@ struct mv64xxx_i2c_data {
 	bool			errata_delay;
 	struct reset_control	*rstc;
 	bool			irq_clear_inverted;
+	/* Clk div is 2 to the power n, not 2 to the power n + 1 */
+	bool			clk_n_base_0;
 };
 
 static struct mv64xxx_i2c_regs mv64xxx_i2c_regs_mv64xxx = {
@@ -757,25 +759,29 @@ MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
 #ifdef CONFIG_OF
 #ifdef CONFIG_HAVE_CLK
 static int
-mv64xxx_calc_freq(const int tclk, const int n, const int m)
+mv64xxx_calc_freq(struct mv64xxx_i2c_data *drv_data,
+		  const int tclk, const int n, const int m)
 {
-	return tclk / (10 * (m + 1) * (2 << n));
+	if (drv_data->clk_n_base_0)
+		return tclk / (10 * (m + 1) * (1 << n));
+	else
+		return tclk / (10 * (m + 1) * (2 << n));
 }
 
 static bool
-mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
-			  u32 *best_m)
+mv64xxx_find_baud_factors(struct mv64xxx_i2c_data *drv_data,
+			  const u32 req_freq, const u32 tclk)
 {
 	int freq, delta, best_delta = INT_MAX;
 	int m, n;
 
 	for (n = 0; n <= 7; n++)
 		for (m = 0; m <= 15; m++) {
-			freq = mv64xxx_calc_freq(tclk, n, m);
+			freq = mv64xxx_calc_freq(drv_data, tclk, n, m);
 			delta = req_freq - freq;
 			if (delta >= 0 && delta < best_delta) {
-				*best_m = m;
-				*best_n = n;
+				drv_data->freq_m = m;
+				drv_data->freq_n = n;
 				best_delta = delta;
 			}
 			if (best_delta == 0)
@@ -813,8 +819,11 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
 	if (of_property_read_u32(np, "clock-frequency", &bus_freq))
 		bus_freq = 100000; /* 100kHz by default */
 
-	if (!mv64xxx_find_baud_factors(bus_freq, tclk,
-				       &drv_data->freq_n, &drv_data->freq_m)) {
+	if (of_device_is_compatible(np, "allwinner,sun4i-a10-i2c") ||
+	    of_device_is_compatible(np, "allwinner,sun6i-a31-i2c"))
+		drv_data->clk_n_base_0 = true;
+
+	if (!mv64xxx_find_baud_factors(drv_data, bus_freq, tclk)) {
 		rc = -EINVAL;
 		goto out;
 	}
drivers/i2c/busses/i2c-rcar.c +2 -2
index d8b5a8fee1e6..3191dd9984dc 100644
@@ -575,7 +575,7 @@ static int rcar_reg_slave(struct i2c_client *slave)
 	if (slave->flags & I2C_CLIENT_TEN)
 		return -EAFNOSUPPORT;
 
-	pm_runtime_forbid(rcar_i2c_priv_to_dev(priv));
+	pm_runtime_get_sync(rcar_i2c_priv_to_dev(priv));
 
 	priv->slave = slave;
 	rcar_i2c_write(priv, ICSAR, slave->addr);
@@ -597,7 +597,7 @@ static int rcar_unreg_slave(struct i2c_client *slave)
 
 	priv->slave = NULL;
 
-	pm_runtime_allow(rcar_i2c_priv_to_dev(priv));
+	pm_runtime_put(rcar_i2c_priv_to_dev(priv));
 
 	return 0;
 }
drivers/i2c/busses/i2c-rk3x.c +1 -1
index 72e97e306bd9..9c4efd308f10 100644
@@ -907,7 +907,7 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
 				 &i2c->scl_fall_ns))
 		i2c->scl_fall_ns = 300;
 	if (of_property_read_u32(pdev->dev.of_node, "i2c-sda-falling-time-ns",
-				 &i2c->scl_fall_ns))
+				 &i2c->sda_fall_ns))
 		i2c->sda_fall_ns = i2c->scl_fall_ns;
 
 	strlcpy(i2c->adap.name, "rk3x-i2c", sizeof(i2c->adap.name));
drivers/i2c/i2c-core.c +1 -1
index a59c3111f7fb..a4347ba78a51 100644
@@ -679,7 +679,7 @@ static int i2c_device_probe(struct device *dev)
 		if (wakeirq > 0 && wakeirq != client->irq)
 			status = dev_pm_set_dedicated_wake_irq(dev, wakeirq);
 		else if (client->irq > 0)
-			status = dev_pm_set_wake_irq(dev, wakeirq);
+			status = dev_pm_set_wake_irq(dev, client->irq);
 		else
 			status = 0;
 
drivers/iommu/io-pgtable-arm.c +6 -5
index 7df97777662d..dad768caa9c5 100644
@@ -405,17 +405,18 @@ static void __arm_lpae_free_pgtable(struct arm_lpae_io_pgtable *data, int lvl,
 	arm_lpae_iopte *start, *end;
 	unsigned long table_size;
 
-	/* Only leaf entries at the last level */
-	if (lvl == ARM_LPAE_MAX_LEVELS - 1)
-		return;
-
 	if (lvl == ARM_LPAE_START_LVL(data))
 		table_size = data->pgd_size;
 	else
 		table_size = 1UL << data->pg_shift;
 
 	start = ptep;
-	end = (void *)ptep + table_size;
+
+	/* Only leaf entries at the last level */
+	if (lvl == ARM_LPAE_MAX_LEVELS - 1)
+		end = ptep;
+	else
+		end = (void *)ptep + table_size;
 
 	while (ptep != end) {
 		arm_lpae_iopte pte = *ptep++;
drivers/md/dm-mpath.c +2 -5
index 5a67671a3973..bdc96cd838b8 100644
@@ -1569,11 +1569,8 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 	/*
 	 * Only pass ioctls through if the device sizes match exactly.
 	 */
-	if (!bdev || ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT) {
-		int err = scsi_verify_blk_ioctl(NULL, cmd);
-		if (err)
-			r = err;
-	}
+	if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)
+		r = scsi_verify_blk_ioctl(NULL, cmd);
 
 	if (r == -ENOTCONN && !fatal_signal_pending(current)) {
 		spin_lock_irqsave(&m->lock, flags);
drivers/md/dm.c +7 -3
index 1b5c6047e4f1..8af4750f20bf 100644
@@ -2198,6 +2198,13 @@ static void dm_init_md_queue(struct mapped_device *md)
 	 * This queue is new, so no concurrency on the queue_flags.
 	 */
 	queue_flag_clear_unlocked(QUEUE_FLAG_STACKABLE, md->queue);
+
+	/*
+	 * Initialize data that will only be used by a non-blk-mq DM queue
+	 * - must do so here (in alloc_dev callchain) before queue is used
+	 */
+	md->queue->queuedata = md;
+	md->queue->backing_dev_info.congested_data = md;
 }
 
 static void dm_init_old_md_queue(struct mapped_device *md)
@@ -2208,10 +2215,7 @@ static void dm_init_old_md_queue(struct mapped_device *md)
 	/*
 	 * Initialize aspects of queue that aren't relevant for blk-mq
 	 */
-	md->queue->queuedata = md;
 	md->queue->backing_dev_info.congested_fn = dm_any_congested;
-	md->queue->backing_dev_info.congested_data = md;
-
 	blk_queue_bounce_limit(md->queue, BLK_BOUNCE_ANY);
 }
 
drivers/md/persistent-data/dm-btree.c +3 -1
index 0e09aef43998..88c287db3bde 100644
@@ -471,8 +471,10 @@ static int btree_split_sibling(struct shadow_spine *s, unsigned parent_index,
 
 	r = insert_at(sizeof(__le64), pn, parent_index + 1,
 		      le64_to_cpu(rn->keys[0]), &location);
-	if (r)
+	if (r) {
+		unlock_block(s->info, right);
 		return r;
+	}
 
 	if (key < le64_to_cpu(rn->keys[0])) {
 		unlock_block(s->info, right);
drivers/md/raid10.c +3 -1
index 96f365968306..23bbe61f9ac0 100644
@@ -1944,6 +1944,8 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)
 
 	first = i;
 	fbio = r10_bio->devs[i].bio;
+	fbio->bi_iter.bi_size = r10_bio->sectors << 9;
+	fbio->bi_iter.bi_idx = 0;
 
 	vcnt = (r10_bio->sectors + (PAGE_SIZE >> 9) - 1) >> (PAGE_SHIFT - 9);
 	/* now find blocks with errors */
@@ -1987,7 +1989,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)
 		bio_reset(tbio);
 
 		tbio->bi_vcnt = vcnt;
-		tbio->bi_iter.bi_size = r10_bio->sectors << 9;
+		tbio->bi_iter.bi_size = fbio->bi_iter.bi_size;
 		tbio->bi_rw = WRITE;
 		tbio->bi_private = r10_bio;
 		tbio->bi_iter.bi_sector = r10_bio->devs[i].addr;
drivers/media/i2c/ir-kbd-i2c.c +0 -1
index 728d2cc8a3e7..175a76114953 100644
@@ -478,7 +478,6 @@ static const struct i2c_device_id ir_kbd_id[] = {
 	{ "ir_rx_z8f0811_hdpvr", 0 },
 	{ }
 };
-MODULE_DEVICE_TABLE(i2c, ir_kbd_id);
 
 static struct i2c_driver ir_kbd_driver = {
 	.driver = {
drivers/media/pci/ivtv/ivtv-driver.c +2 -2
index 8616fa8193bc..c2e60b4f292d 100644
@@ -805,11 +805,11 @@ static void ivtv_init_struct2(struct ivtv *itv)
 {
 	int i;
 
-	for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS - 1; i++)
+	for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS; i++)
 		if (itv->card->video_inputs[i].video_type == 0)
 			break;
 	itv->nof_inputs = i;
-	for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS - 1; i++)
+	for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS; i++)
 		if (itv->card->audio_inputs[i].audio_type == 0)
 			break;
 	itv->nof_audio_inputs = i;
drivers/media/pci/saa7134/saa7134-alsa.c +4 -1
index 1d2c310ce838..94f816244407 100644
@@ -1211,6 +1211,8 @@ static int alsa_device_init(struct saa7134_dev *dev)
 
 static int alsa_device_exit(struct saa7134_dev *dev)
 {
+	if (!snd_saa7134_cards[dev->nr])
+		return 1;
 
 	snd_card_free(snd_saa7134_cards[dev->nr]);
 	snd_saa7134_cards[dev->nr] = NULL;
@@ -1260,7 +1262,8 @@ static void saa7134_alsa_exit(void)
 	int idx;
 
 	for (idx = 0; idx < SNDRV_CARDS; idx++) {
-		snd_card_free(snd_saa7134_cards[idx]);
+		if (snd_saa7134_cards[idx])
+			snd_card_free(snd_saa7134_cards[idx]);
 	}
 
 	saa7134_dmasound_init = NULL;
drivers/media/platform/sti/c8sectpfe/Kconfig +0 -1
index 641ad8f34956..7420a50572d3 100644
@@ -3,7 +3,6 @@ config DVB_C8SECTPFE
 	depends on PINCTRL && DVB_CORE && I2C
 	depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST
 	select FW_LOADER
-	select FW_LOADER_USER_HELPER_FALLBACK
 	select DEBUG_FS
 	select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV090x if MEDIA_SUBDRV_AUTOSELECT
drivers/media/platform/vivid/vivid-core.c +4 -1
index a047b4716741..0f5e9143cc7e 100644
@@ -1341,8 +1341,11 @@ static int vivid_remove(struct platform_device *pdev)
 	struct vivid_dev *dev;
 	unsigned i;
 
-	for (i = 0; vivid_devs[i]; i++) {
+
+	for (i = 0; i < n_devs; i++) {
 		dev = vivid_devs[i];
+		if (!dev)
+			continue;
 
 		if (dev->has_vid_cap) {
 			v4l2_info(&dev->v4l2_dev, "unregistering %s\n",
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +5 -4
index af635430524e..788b31c91330 100644
@@ -266,7 +266,7 @@ static int put_v4l2_create32(struct v4l2_create_buffers *kp, struct v4l2_create_
 
 struct v4l2_standard32 {
 	__u32		     index;
-	__u32		     id[2]; /* __u64 would get the alignment wrong */
+	compat_u64	     id;
 	__u8		     name[24];
 	struct v4l2_fract    frameperiod; /* Frames, not fields */
 	__u32		     framelines;
@@ -286,7 +286,7 @@ static int put_v4l2_standard32(struct v4l2_standard *kp, struct v4l2_standard32
 {
 	if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_standard32)) ||
 		put_user(kp->index, &up->index) ||
-		copy_to_user(up->id, &kp->id, sizeof(__u64)) ||
+		put_user(kp->id, &up->id) ||
 		copy_to_user(up->name, kp->name, 24) ||
 		copy_to_user(&up->frameperiod, &kp->frameperiod, sizeof(kp->frameperiod)) ||
 		put_user(kp->framelines, &up->framelines) ||
@@ -587,10 +587,10 @@ struct v4l2_input32 {
 	__u32	     type;		/*  Type of input */
 	__u32	     audioset;		/*  Associated audios (bitfield) */
 	__u32        tuner;             /*  Associated tuner */
-	v4l2_std_id  std;
+	compat_u64   std;
 	__u32	     status;
 	__u32	     reserved[4];
-} __attribute__ ((packed));
+};
 
 /* The 64-bit v4l2_input struct has extra padding at the end of the struct.
    Otherwise it is identical to the 32-bit version. */
@@ -738,6 +738,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
 struct v4l2_event32 {
 	__u32				type;
 	union {
+		compat_s64		value64;
 		__u8			data[64];
 	} u;
 	__u32				pending;
drivers/media/v4l2-core/v4l2-ctrls.c +6 -6
index b6b7dcc1b77d..e1e70b8694a8 100644
@@ -2498,7 +2498,7 @@ int v4l2_query_ext_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_query_ext_ctr
 			/* We found a control with the given ID, so just get
 			   the next valid one in the list. */
 			list_for_each_entry_continue(ref, &hdl->ctrl_refs, node) {
-				is_compound =
+				is_compound = ref->ctrl->is_array ||
 					ref->ctrl->type >= V4L2_CTRL_COMPOUND_TYPES;
 				if (id < ref->ctrl->id &&
 				    (is_compound & mask) == match)
@@ -2512,7 +2512,7 @@ int v4l2_query_ext_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_query_ext_ctr
 			   is one, otherwise the first 'if' above would have
 			   been true. */
 			list_for_each_entry(ref, &hdl->ctrl_refs, node) {
-				is_compound =
+				is_compound = ref->ctrl->is_array ||
 					ref->ctrl->type >= V4L2_CTRL_COMPOUND_TYPES;
 				if (id < ref->ctrl->id &&
 				    (is_compound & mask) == match)
@@ -2884,7 +2884,7 @@ static int get_ctrl(struct v4l2_ctrl *ctrl, struct v4l2_ext_control *c)
 	 * cur_to_user() calls below would need to be modified not to access
 	 * userspace memory when called from get_ctrl().
 	 */
-	if (!ctrl->is_int)
+	if (!ctrl->is_int && ctrl->type != V4L2_CTRL_TYPE_INTEGER64)
 		return -EINVAL;
 
 	if (ctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY)
@@ -2942,9 +2942,9 @@ s64 v4l2_ctrl_g_ctrl_int64(struct v4l2_ctrl *ctrl)
 
 	/* It's a driver bug if this happens. */
 	WARN_ON(ctrl->is_ptr || ctrl->type != V4L2_CTRL_TYPE_INTEGER64);
-	c.value = 0;
+	c.value64 = 0;
 	get_ctrl(ctrl, &c);
-	return c.value;
+	return c.value64;
 }
 EXPORT_SYMBOL(v4l2_ctrl_g_ctrl_int64);
 
@@ -3043,7 +3043,7 @@ static void update_from_auto_cluster(struct v4l2_ctrl *master)
 {
 	int i;
 
-	for (i = 0; i < master->ncontrols; i++)
+	for (i = 1; i < master->ncontrols; i++)
 		cur_to_new(master->cluster[i]);
 	if (!call_op(master, g_volatile_ctrl))
 		for (i = 1; i < master->ncontrols; i++)
drivers/media/v4l2-core/videobuf2-dma-contig.c +3 -2
index 2397ceb1dc6b..f42e66624734 100644
@@ -100,7 +100,8 @@ static void vb2_dc_prepare(void *buf_priv)
 	if (!sgt || buf->db_attach)
 		return;
 
-	dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+	dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents,
+			       buf->dma_dir);
 }
 
 static void vb2_dc_finish(void *buf_priv)
@@ -112,7 +113,7 @@ static void vb2_dc_finish(void *buf_priv)
 	if (!sgt || buf->db_attach)
 		return;
 
-	dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+	dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
 }
 
 /*********************************************/
drivers/media/v4l2-core/videobuf2-dma-sg.c +3 -2
index be7bd6535c9d..07bd2605c2b1 100644
@@ -210,7 +210,8 @@ static void vb2_dma_sg_prepare(void *buf_priv)
 	if (buf->db_attach)
 		return;
 
-	dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+	dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents,
+			       buf->dma_dir);
 }
 
 static void vb2_dma_sg_finish(void *buf_priv)
@@ -222,7 +223,7 @@ static void vb2_dma_sg_finish(void *buf_priv)
 	if (buf->db_attach)
 		return;
 
-	dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+	dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
 }
 
 static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
drivers/mtd/mtd_blkdevs.c +5 -5
index 44dc965a2f7c..e7a02ed9fba8 100644
@@ -192,8 +192,8 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
 	if (!dev)
 		return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/
 
-	mutex_lock(&dev->lock);
 	mutex_lock(&mtd_table_mutex);
+	mutex_lock(&dev->lock);
 
 	if (dev->open)
 		goto unlock;
@@ -217,8 +217,8 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
 
 unlock:
 	dev->open++;
-	mutex_unlock(&mtd_table_mutex);
 	mutex_unlock(&dev->lock);
+	mutex_unlock(&mtd_table_mutex);
 	blktrans_dev_put(dev);
 	return ret;
 
@@ -228,8 +228,8 @@ error_release:
 error_put:
 	module_put(dev->tr->owner);
 	kref_put(&dev->ref, blktrans_dev_release);
-	mutex_unlock(&mtd_table_mutex);
 	mutex_unlock(&dev->lock);
+	mutex_unlock(&mtd_table_mutex);
 	blktrans_dev_put(dev);
 	return ret;
 }
@@ -241,8 +241,8 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode)
 	if (!dev)
 		return;
 
-	mutex_lock(&dev->lock);
 	mutex_lock(&mtd_table_mutex);
+	mutex_lock(&dev->lock);
 
 	if (--dev->open)
 		goto unlock;
@@ -256,8 +256,8 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode)
 		__put_mtd_device(dev->mtd);
 	}
 unlock:
-	mutex_unlock(&mtd_table_mutex);
 	mutex_unlock(&dev->lock);
+	mutex_unlock(&mtd_table_mutex);
 	blktrans_dev_put(dev);
 }
 
drivers/mtd/mtdpart.c +3 -1
index cafdb8855a79..919a936abc42 100644
@@ -664,8 +664,10 @@ int add_mtd_partitions(struct mtd_info *master,
 
 	for (i = 0; i < nbparts; i++) {
 		slave = allocate_partition(master, parts + i, i, cur_offset);
-		if (IS_ERR(slave))
+		if (IS_ERR(slave)) {
+			del_mtd_partitions(master);
 			return PTR_ERR(slave);
+		}
 
 		mutex_lock(&mtd_partitions_mutex);
 		list_add(&slave->list, &mtd_partitions);
drivers/mtd/nand/jz4740_nand.c +1 -0
index ebf2cce04cba..ca3270b1299c 100644
@@ -25,6 +25,7 @@
 
 #include <linux/gpio.h>
 
+#include <asm/mach-jz4740/gpio.h>
 #include <asm/mach-jz4740/jz4740_nand.h>
 
 #define JZ_REG_NAND_CTRL	0x50
drivers/mtd/nand/nand_base.c +1 -1
index ceb68ca8277a..066f967e03b1 100644
@@ -2964,7 +2964,7 @@ static void nand_resume(struct mtd_info *mtd)
  */
 static void nand_shutdown(struct mtd_info *mtd)
 {
-	nand_get_device(mtd, FL_SHUTDOWN);
+	nand_get_device(mtd, FL_PM_SUSPENDED);
 }
 
 /* Set default functions */
drivers/mtd/ubi/wl.c +29 -24

110 lines not on this page · raw message

drivers/net/wireless/rtlwifi/rtl8821ae/hw.c +1 -1
index 6e9418ed90c2..bbb789f8990b 100644
@@ -2272,7 +2272,7 @@ void rtl8821ae_enable_interrupt(struct ieee80211_hw *hw)
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-	if (!rtlpci->int_clear)
+	if (rtlpci->int_clear)
 		rtl8821ae_clear_interrupt(hw);/*clear it here first*/
 
 	rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
drivers/net/wireless/rtlwifi/rtl8821ae/sw.c +1 -1
index 8ee141a55bc5..142bdff4ed60 100644
@@ -448,7 +448,7 @@ MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
 MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");
 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
 MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
-MODULE_PARM_DESC(int_clear, "Set to 1 to disable interrupt clear before set (default 0)\n");
+MODULE_PARM_DESC(int_clear, "Set to 0 to disable interrupt clear before set (default 1)\n");
 
 static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
 
drivers/net/wireless/ti/wlcore/io.h +7 -3
index 0305729d0986..10cf3747694d 100644
@@ -207,19 +207,23 @@ static inline int __must_check wlcore_write_reg(struct wl1271 *wl, int reg,
 
 static inline void wl1271_power_off(struct wl1271 *wl)
 {
-	int ret;
+	int ret = 0;
 
 	if (!test_bit(WL1271_FLAG_GPIO_POWER, &wl->flags))
 		return;
 
-	ret = wl->if_ops->power(wl->dev, false);
+	if (wl->if_ops->power)
+		ret = wl->if_ops->power(wl->dev, false);
 	if (!ret)
 		clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
 }
 
 static inline int wl1271_power_on(struct wl1271 *wl)
 {
-	int ret = wl->if_ops->power(wl->dev, true);
+	int ret = 0;
+
+	if (wl->if_ops->power)
+		ret = wl->if_ops->power(wl->dev, true);
 	if (ret == 0)
 		set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
 
drivers/net/wireless/ti/wlcore/spi.c +7 -3
index f1ac2839d97c..720e4e4b5a3c 100644
@@ -73,7 +73,10 @@
  */
 #define SPI_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
 
-#define WSPI_MAX_NUM_OF_CHUNKS (SPI_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE)
+/* Maximum number of SPI write chunks */
+#define WSPI_MAX_NUM_OF_CHUNKS \
+	((SPI_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE) + 1)
+
 
 struct wl12xx_spi_glue {
 	struct device *dev;
@@ -268,9 +271,10 @@ static int __must_check wl12xx_spi_raw_write(struct device *child, int addr,
 					     void *buf, size_t len, bool fixed)
 {
 	struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
-	struct spi_transfer t[2 * (WSPI_MAX_NUM_OF_CHUNKS + 1)];
+	/* SPI write buffers - 2 for each chunk */
+	struct spi_transfer t[2 * WSPI_MAX_NUM_OF_CHUNKS];
 	struct spi_message m;
-	u32 commands[WSPI_MAX_NUM_OF_CHUNKS];
+	u32 commands[WSPI_MAX_NUM_OF_CHUNKS]; /* 1 command per chunk */
 	u32 *cmd;
 	u32 chunk_len;
 	int i;
drivers/pci/bus.c +4 -2
index d3346d23963b..89b3befc7155 100644
@@ -140,6 +140,8 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
 	type_mask |= IORESOURCE_TYPE_BITS;
 
 	pci_bus_for_each_resource(bus, r, i) {
+		resource_size_t min_used = min;
+
 		if (!r)
 			continue;
 
@@ -163,12 +165,12 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
 		 * overrides "min".
 		 */
 		if (avail.start)
-			min = avail.start;
+			min_used = avail.start;
 
 		max = avail.end;
 
 		/* Ok, try it out.. */
-		ret = allocate_resource(r, res, size, min, max,
+		ret = allocate_resource(r, res, size, min_used, max,
 					align, alignf, alignf_data);
 		if (ret == 0)
 			return 0;
drivers/pci/host/pci-dra7xx.c +2 -1
index 199e29a044cd..ee978705a6f5 100644
@@ -295,7 +295,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
 	}
 
 	ret = devm_request_irq(&pdev->dev, pp->irq,
-			       dra7xx_pcie_msi_irq_handler, IRQF_SHARED,
+			       dra7xx_pcie_msi_irq_handler,
+			       IRQF_SHARED | IRQF_NO_THREAD,
 			       "dra7-pcie-msi",	pp);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to request irq\n");
drivers/pci/host/pci-exynos.c +2 -1
index f9f468d9a819..7b6be7791d33 100644
@@ -523,7 +523,8 @@ static int __init exynos_add_pcie_port(struct pcie_port *pp,
 
 		ret = devm_request_irq(&pdev->dev, pp->msi_irq,
 					exynos_pcie_msi_irq_handler,
-					IRQF_SHARED, "exynos-pcie", pp);
+					IRQF_SHARED | IRQF_NO_THREAD,
+					"exynos-pcie", pp);
 		if (ret) {
 			dev_err(&pdev->dev, "failed to request msi irq\n");
 			return ret;
drivers/pci/host/pci-imx6.c +2 -1
index 8f3a9813c4e5..58713d57c426 100644
@@ -536,7 +536,8 @@ static int __init imx6_add_pcie_port(struct pcie_port *pp,
 
 		ret = devm_request_irq(&pdev->dev, pp->msi_irq,
 				       imx6_pcie_msi_handler,
-				       IRQF_SHARED, "mx6-pcie-msi", pp);
+				       IRQF_SHARED | IRQF_NO_THREAD,
+				       "mx6-pcie-msi", pp);
 		if (ret) {
 			dev_err(&pdev->dev, "failed to request MSI irq\n");
 			return -ENODEV;
drivers/pci/host/pci-tegra.c +1 -1
index 81df0c1fe063..46d5e07dbdfe 100644
@@ -1288,7 +1288,7 @@ static int tegra_pcie_enable_msi(struct tegra_pcie *pcie)
 
 	msi->irq = err;
 
-	err = request_irq(msi->irq, tegra_pcie_msi_irq, 0,
+	err = request_irq(msi->irq, tegra_pcie_msi_irq, IRQF_NO_THREAD,
 			  tegra_msi_irq_chip.name, pcie);
 	if (err < 0) {
 		dev_err(&pdev->dev, "failed to request IRQ: %d\n", err);
drivers/pci/host/pcie-rcar.c +4 -2
index 7678fe0820d7..b86e42fcf19f 100644
@@ -694,14 +694,16 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
 
 	/* Two irqs are for MSI, but they are also used for non-MSI irqs */
 	err = devm_request_irq(&pdev->dev, msi->irq1, rcar_pcie_msi_irq,
-			       IRQF_SHARED, rcar_msi_irq_chip.name, pcie);
+			       IRQF_SHARED | IRQF_NO_THREAD,
+			       rcar_msi_irq_chip.name, pcie);
 	if (err < 0) {
 		dev_err(&pdev->dev, "failed to request IRQ: %d\n", err);
 		goto err;
 	}
 
 	err = devm_request_irq(&pdev->dev, msi->irq2, rcar_pcie_msi_irq,
-			       IRQF_SHARED, rcar_msi_irq_chip.name, pcie);
+			       IRQF_SHARED | IRQF_NO_THREAD,
+			       rcar_msi_irq_chip.name, pcie);
 	if (err < 0) {
 		dev_err(&pdev->dev, "failed to request IRQ: %d\n", err);
 		goto err;
drivers/pci/host/pcie-spear13xx.c +16 -13
index 98d2683181bc..4aca7167ed95 100644
@@ -163,34 +163,36 @@ static int spear13xx_pcie_establish_link(struct pcie_port *pp)
 	 * default value in capability register is 512 bytes. So force
 	 * it to 128 here.
 	 */
-	dw_pcie_cfg_read(pp->dbi_base, exp_cap_off + PCI_EXP_DEVCTL, 4, &val);
+	dw_pcie_cfg_read(pp->dbi_base + exp_cap_off + PCI_EXP_DEVCTL,
+				0, 2, &val);
 	val &= ~PCI_EXP_DEVCTL_READRQ;
-	dw_pcie_cfg_write(pp->dbi_base, exp_cap_off + PCI_EXP_DEVCTL, 4, val);
+	dw_pcie_cfg_write(pp->dbi_base + exp_cap_off + PCI_EXP_DEVCTL,
+				0, 2, val);
 
-	dw_pcie_cfg_write(pp->dbi_base, PCI_VENDOR_ID, 2, 0x104A);
-	dw_pcie_cfg_write(pp->dbi_base, PCI_DEVICE_ID, 2, 0xCD80);
+	dw_pcie_cfg_write(pp->dbi_base + PCI_VENDOR_ID, 0, 2, 0x104A);
+	dw_pcie_cfg_write(pp->dbi_base + PCI_VENDOR_ID, 2, 2, 0xCD80);
 
 	/*
 	 * if is_gen1 is set then handle it, so that some buggy card
 	 * also works
 	 */
 	if (spear13xx_pcie->is_gen1) {
-		dw_pcie_cfg_read(pp->dbi_base, exp_cap_off + PCI_EXP_LNKCAP, 4,
-				 &val);
+		dw_pcie_cfg_read(pp->dbi_base + exp_cap_off + PCI_EXP_LNKCAP,
+					0, 4, &val);
 		if ((val & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) {
 			val &= ~((u32)PCI_EXP_LNKCAP_SLS);
 			val |= PCI_EXP_LNKCAP_SLS_2_5GB;
-			dw_pcie_cfg_write(pp->dbi_base, exp_cap_off +
-					  PCI_EXP_LNKCAP, 4, val);
+			dw_pcie_cfg_write(pp->dbi_base + exp_cap_off +
+						PCI_EXP_LNKCAP, 0, 4, val);
 		}
 
-		dw_pcie_cfg_read(pp->dbi_base, exp_cap_off + PCI_EXP_LNKCTL2, 4,
-				 &val);
+		dw_pcie_cfg_read(pp->dbi_base + exp_cap_off + PCI_EXP_LNKCTL2,
+					0, 2, &val);
 		if ((val & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) {
 			val &= ~((u32)PCI_EXP_LNKCAP_SLS);
 			val |= PCI_EXP_LNKCAP_SLS_2_5GB;
-			dw_pcie_cfg_write(pp->dbi_base, exp_cap_off +
-					  PCI_EXP_LNKCTL2, 4, val);
+			dw_pcie_cfg_write(pp->dbi_base + exp_cap_off +
+						PCI_EXP_LNKCTL2, 0, 2, val);
 		}
 	}
 
@@ -279,7 +281,8 @@ static int spear13xx_add_pcie_port(struct pcie_port *pp,
 		return -ENODEV;
 	}
 	ret = devm_request_irq(dev, pp->irq, spear13xx_pcie_irq_handler,
-			       IRQF_SHARED, "spear1340-pcie", pp);
+			       IRQF_SHARED | IRQF_NO_THREAD,
+			       "spear1340-pcie", pp);
 	if (ret) {
 		dev_err(dev, "failed to request irq %d\n", pp->irq);
 		return ret;
drivers/pci/host/pcie-xilinx.c +2 -1
index 3c7a0d580b1e..4cfa46360d12 100644
@@ -781,7 +781,8 @@ static int xilinx_pcie_parse_dt(struct xilinx_pcie_port *port)
 
 	port->irq = irq_of_parse_and_map(node, 0);
 	err = devm_request_irq(dev, port->irq, xilinx_pcie_intr_handler,
-			       IRQF_SHARED, "xilinx-pcie", port);
+			       IRQF_SHARED | IRQF_NO_THREAD,
+			       "xilinx-pcie", port);
 	if (err) {
 		dev_err(dev, "unable to request irq %d\n", port->irq);
 		return err;
drivers/pci/iov.c +22 -19

82 lines not on this page · raw message

drivers/pci/pci-sysfs.c +4 -1
index 92618686604c..eead54cd01b2 100644
@@ -216,7 +216,10 @@ static ssize_t numa_node_store(struct device *dev,
 	if (ret)
 		return ret;
 
-	if (node >= MAX_NUMNODES || !node_online(node))
+	if ((node < 0 && node != NUMA_NO_NODE) || node >= MAX_NUMNODES)
+		return -EINVAL;
+
+	if (node != NUMA_NO_NODE && !node_online(node))
 		return -EINVAL;
 
 	add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
drivers/remoteproc/remoteproc_debugfs.c +1 -1
index 9d30809bb407..916af5096f57 100644
@@ -156,7 +156,7 @@ rproc_recovery_write(struct file *filp, const char __user *user_buf,
 	char buf[10];
 	int ret;
 
-	if (count > sizeof(buf))
+	if (count < 1 || count > sizeof(buf))
 		return count;
 
 	ret = copy_from_user(buf, user_buf, count);
drivers/spi/spi-atmel.c +2 -1
index 63318e2afba1..3fff59ce065f 100644
@@ -773,7 +773,8 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
 
 	*plen = len;
 
-	if (atmel_spi_dma_slave_config(as, &slave_config, 8))
+	if (atmel_spi_dma_slave_config(as, &slave_config,
+				       xfer->bits_per_word))
 		goto err_exit;
 
 	/* Send both scatterlists */
drivers/spi/spi-omap2-mcspi.c +28 -0
index 3d09e0b69b73..1f8903d356e5 100644
@@ -1217,6 +1217,33 @@ out:
 	return status;
 }
 
+static int omap2_mcspi_prepare_message(struct spi_master *master,
+				       struct spi_message *msg)
+{
+	struct omap2_mcspi	*mcspi = spi_master_get_devdata(master);
+	struct omap2_mcspi_regs	*ctx = &mcspi->ctx;
+	struct omap2_mcspi_cs	*cs;
+
+	/* Only a single channel can have the FORCE bit enabled
+	 * in its chconf0 register.
+	 * Scan all channels and disable them except the current one.
+	 * A FORCE can remain from a last transfer having cs_change enabled
+	 */
+	list_for_each_entry(cs, &ctx->cs, node) {
+		if (msg->spi->controller_state == cs)
+			continue;
+
+		if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE)) {
+			cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
+			writel_relaxed(cs->chconf0,
+					cs->base + OMAP2_MCSPI_CHCONF0);
+			readl_relaxed(cs->base + OMAP2_MCSPI_CHCONF0);
+		}
+	}
+
+	return 0;
+}
+
 static int omap2_mcspi_transfer_one(struct spi_master *master,
 		struct spi_device *spi, struct spi_transfer *t)
 {
@@ -1344,6 +1371,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
 	master->setup = omap2_mcspi_setup;
 	master->auto_runtime_pm = true;
+	master->prepare_message = omap2_mcspi_prepare_message;
 	master->transfer_one = omap2_mcspi_transfer_one;
 	master->set_cs = omap2_mcspi_set_cs;
 	master->cleanup = omap2_mcspi_cleanup;
drivers/spi/spi-ti-qspi.c +1 -2
index aa6d284131e0..81b84858cfee 100644
@@ -410,11 +410,10 @@ static int ti_qspi_start_transfer_one(struct spi_master *master,
 
 	mutex_unlock(&qspi->list_lock);
 
+	ti_qspi_write(qspi, qspi->cmd | QSPI_INVAL, QSPI_SPI_CMD_REG);
 	m->status = status;
 	spi_finalize_current_message(master);
 
-	ti_qspi_write(qspi, qspi->cmd | QSPI_INVAL, QSPI_SPI_CMD_REG);
-
 	return status;
 }
 
drivers/spi/spi-xilinx.c +24 -14
index a339c1e9997a..3009121173cd 100644
@@ -270,6 +270,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
 
 	while (remaining_words) {
 		int n_words, tx_words, rx_words;
+		u32 sr;
 
 		n_words = min(remaining_words, xspi->buffer_size);
 
@@ -284,24 +285,33 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
 		if (use_irq) {
 			xspi->write_fn(cr, xspi->regs + XSPI_CR_OFFSET);
 			wait_for_completion(&xspi->done);
-		} else
-			while (!(xspi->read_fn(xspi->regs + XSPI_SR_OFFSET) &
-						XSPI_SR_TX_EMPTY_MASK))
-				;
-
-		/* A transmit has just completed. Process received data and
-		 * check for more data to transmit. Always inhibit the
-		 * transmitter while the Isr refills the transmit register/FIFO,
-		 * or make sure it is stopped if we're done.
-		 */
-		if (use_irq)
+			/* A transmit has just completed. Process received data
+			 * and check for more data to transmit. Always inhibit
+			 * the transmitter while the Isr refills the transmit
+			 * register/FIFO, or make sure it is stopped if we're
+			 * done.
+			 */
 			xspi->write_fn(cr | XSPI_CR_TRANS_INHIBIT,
-			       xspi->regs + XSPI_CR_OFFSET);
+				       xspi->regs + XSPI_CR_OFFSET);
+			sr = XSPI_SR_TX_EMPTY_MASK;
+		} else
+			sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);
 
 		/* Read out all the data from the Rx FIFO */
 		rx_words = n_words;
-		while (rx_words--)
-			xilinx_spi_rx(xspi);
+		while (rx_words) {
+			if ((sr & XSPI_SR_TX_EMPTY_MASK) && (rx_words > 1)) {
+				xilinx_spi_rx(xspi);
+				rx_words--;
+				continue;
+			}
+
+			sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);
+			if (!(sr & XSPI_SR_RX_EMPTY_MASK)) {
+				xilinx_spi_rx(xspi);
+				rx_words--;
+			}
+		}
 
 		remaining_words -= n_words;
 	}
drivers/spi/spi.c +1 -1
index a5f53de813d3..a83d9d07df58 100644
@@ -1627,7 +1627,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
 	master->bus_num = -1;
 	master->num_chipselect = 1;
 	master->dev.class = &spi_master_class;
-	master->dev.parent = get_device(dev);
+	master->dev.parent = dev;
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/tty/n_tty.c +11 -18
index a0285da0244c..1fc7a84a2ded 100644

Lines of this file are not shown. View the raw message.

drivers/tty/tty_buffer.c +1 -1
index a660ab181cca..bcf2de080471 100644

Lines of this file are not shown. View the raw message.

drivers/tty/tty_io.c +31 -5
index f435977de740..ff7f15f0f1fb 100644

Lines of this file are not shown. View the raw message.

drivers/usb/class/cdc-acm.c +8 -1
index 26ca4f910cb0..e4c70dce3e7c 100644

Lines of this file are not shown. View the raw message.

drivers/usb/class/cdc-acm.h +1 -0
index dd9af38e7cda..ccfaba9ab4e4 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/hub.c +5 -3
index 62084335a608..a2fef797d553 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-hub.c +40 -5

45 lines not on this page · raw message

drivers/usb/host/xhci-pci.c +32 -20

52 lines not on this page · raw message

drivers/usb/host/xhci-ring.c +2 -1
index fe9e2d3a223c..23c712ec7541 100644

Lines of this file are not shown. View the raw message.

drivers/usb/phy/phy-msm-usb.c +24 -13
index c58c3c0dbe35..260e510578e7 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/cp210x.c +1 -0
index 59b2126b21a3..1dd9919081f8 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/ftdi_sio.c +1 -0
index a5a0376bbd48..8c660ae401d8 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/ftdi_sio_ids.h +1 -0
index 67c6d4469730..a84df2513994 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/option.c +17 -1
index e945b5195258..35622fba4305 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/visor.c +9 -2
index 60afb39eb73c..337a0be89fcf 100644

Lines of this file are not shown. View the raw message.

fs/binfmt_elf.c +5 -5
index 6b659967898e..e6572a665b2e 100644

Lines of this file are not shown. View the raw message.

fs/cachefiles/rdwr.c +38 -31

69 lines not on this page · raw message

fs/ext2/super.c +2 -0
index 900e19cf9ef6..2597b0663bf2 100644

Lines of this file are not shown. View the raw message.

fs/ext4/crypto.c +1 -1
index 2fab243a4c9e..7d6cda4738a4 100644

Lines of this file are not shown. View the raw message.

fs/ext4/ext4.h +44 -7

51 lines not on this page · raw message

fs/ext4/resize.c +2 -2
index cf0c472047e3..c7c53fd46a41 100644

Lines of this file are not shown. View the raw message.

fs/ext4/super.c +5 -1
index df84bd256c9f..7683892d855c 100644

Lines of this file are not shown. View the raw message.

fs/ext4/symlink.c +1 -1
index c677f2c1044b..3627fd7cf4a0 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/dir.c +10 -3
index 8f15fc134040..6726c4a5efa2 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/namei.c +9 -1
index a680bf38e4f0..dfa01c88b34b 100644

Lines of this file are not shown. View the raw message.

fs/fat/dir.c +11 -5
index 4afc4d9d2e41..8b2127ffb226 100644

Lines of this file are not shown. View the raw message.

fs/fscache/netfs.c +18 -20
index 6d941f56faf4..9b28649df3a1 100644

Lines of this file are not shown. View the raw message.

fs/fscache/page.c +1 -1
index 483bbc613bf0..ca916af5a7c4 100644

Lines of this file are not shown. View the raw message.

fs/hugetlbfs/inode.c +32 -33

65 lines not on this page · raw message

fs/jbd2/checkpoint.c +3 -5
index 8c44654ce274..684996c8a3a4 100644

Lines of this file are not shown. View the raw message.

fs/jbd2/transaction.c +9 -3
index 6b8338ec2464..1498ad9f731a 100644

Lines of this file are not shown. View the raw message.

fs/nfs/nfs4proc.c +0 -1
index 5133bb18830e..c8bd1ddb7df8 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/dlm/dlmmaster.c +15 -11
index ce38b4ccc9ab..5e355650eea0 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/dlm/dlmrecovery.c +2 -0
index 58eaa5c0d387..572a3dc4861f 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/dlmglue.c +6 -0
index 1c91103c1333..9a894aecc960 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/namei.c +1 -3
index 12bfa9ca5583..c0356c18cdf5 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/resize.c +12 -3
index d5da6f624142..79b8021302b3 100644

Lines of this file are not shown. View the raw message.

fs/pipe.c +4 -5
index 8865f7963700..14788ddcd3f3 100644

Lines of this file are not shown. View the raw message.

fs/proc/base.c +1 -0
index 29595af32866..4b6fb2cbd928 100644

Lines of this file are not shown. View the raw message.

fs/proc/fd.c +11 -3
index 6e5fcd00733e..3c2a915c695a 100644

Lines of this file are not shown. View the raw message.

fs/seq_file.c +8 -3
index 225586e141ca..a8e288755f24 100644

Lines of this file are not shown. View the raw message.

fs/sysv/inode.c +2 -9
index 590ad9206e3f..02fa1dcc5969 100644

Lines of this file are not shown. View the raw message.

fs/tracefs/inode.c +5 -1
index cbc8d5d2755a..c66f2423e1f5 100644

Lines of this file are not shown. View the raw message.

include/crypto/hash.h +6 -0
index 8e920b44c0ac..da791ac52f13 100644

Lines of this file are not shown. View the raw message.

include/crypto/if_alg.h +6 -5
index 018afb264ac2..a2bfd7843f18 100644

Lines of this file are not shown. View the raw message.

include/crypto/skcipher.h +7 -0
index d8dd41fb034f..fd8742a40ff3 100644

Lines of this file are not shown. View the raw message.

include/linux/blkdev.h +0 -1
index 19c2e947d4d1..3a3ff074782f 100644

Lines of this file are not shown. View the raw message.

include/linux/hrtimer.h +31 -3
index 76dd4f0da5ca..2ead22dd74a0 100644

Lines of this file are not shown. View the raw message.

include/linux/signal.h +0 -1
index ab1e0392b5ac..92557bbce7e7 100644

Lines of this file are not shown. View the raw message.

include/sound/rawmidi.h +4 -0
index f6cbef78db62..3b91ad5d5115 100644

Lines of this file are not shown. View the raw message.

kernel/printk/printk.c +8 -5
index 8f0324ef72ab..9982616ce712 100644

Lines of this file are not shown. View the raw message.

kernel/sched/core.c +1 -1
index bcd214e4b4d6..9a584b204e85 100644

Lines of this file are not shown. View the raw message.

kernel/signal.c +1 -1
index 0f6bbbe77b46..6c863ca42a76 100644

Lines of this file are not shown. View the raw message.

kernel/time/hrtimer.c +37 -18

55 lines not on this page · raw message

kernel/time/timer_list.c +1 -1
index f75e35b60149..ba7d8b288bb3 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace.c +1 -1
index 6e79408674aa..69f97541ce6e 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace_printk.c +1 -0
index 36c1455b7567..2dbffe22cbcf 100644

Lines of this file are not shown. View the raw message.

lib/hexdump.c +5 -1
index 8d74c20d8595..992457b1284c 100644

Lines of this file are not shown. View the raw message.

lib/libcrc32c.c +1 -0
index 6a08ce7d6adc..acf9da449f81 100644

Lines of this file are not shown. View the raw message.

mm/backing-dev.c +16 -3
index 619984fc07ec..4cf30e1ca163 100644

Lines of this file are not shown. View the raw message.

mm/hugetlb.c +20 -7
index 9cc773483624..960f0ace6824 100644

Lines of this file are not shown. View the raw message.

mm/memcontrol.c +51 -20

71 lines not on this page · raw message

mm/oom_kill.c +6 -1
index 1ecc0bcaecc5..8ad35aa45436 100644

Lines of this file are not shown. View the raw message.

mm/slab.c +3 -2
index 4fcc5dd8d5a6..461935bab9ef 100644

Lines of this file are not shown. View the raw message.

mm/vmstat.c +4 -2
index fbf14485a049..34444706a3a7 100644

Lines of this file are not shown. View the raw message.

mm/zsmalloc.c +13 -1
index f135b1b6fcdc..3734fc4d2e74 100644

Lines of this file are not shown. View the raw message.

security/integrity/digsig.c +1 -1
index 36fb6b527829..5be9ffbe90ba 100644

Lines of this file are not shown. View the raw message.

security/integrity/evm/evm_main.c +2 -1
index 1334e02ae8f4..3d145a3ffccf 100644

Lines of this file are not shown. View the raw message.

sound/core/compress_offload.c +11 -0
index b123c42e7dc8..b554d7f9e3be 100644

Lines of this file are not shown. View the raw message.

sound/core/oss/pcm_oss.c +15 -6
index 58550cc93f28..33e72c809e50 100644

Lines of this file are not shown. View the raw message.

sound/core/rawmidi.c +95 -39

134 lines not on this page · raw message

sound/core/seq/oss/seq_oss_init.c +1 -1
index b1221b29728e..6779e82b46dd 100644

Lines of this file are not shown. View the raw message.

sound/core/seq/oss/seq_oss_synth.c +1 -1
index 0f3b38184fe5..b16dbef04174 100644

Lines of this file are not shown. View the raw message.

sound/core/seq/seq_clientmgr.c +3 -0
index 13cfa815732d..58e79e02f217 100644

Lines of this file are not shown. View the raw message.

sound/core/seq/seq_ports.c +130 -103

233 lines not on this page · raw message

sound/core/seq/seq_timer.c +67 -20

87 lines not on this page · raw message

sound/core/seq/seq_virmidi.c +17 -6
index 56e0f4cd3f82..81134e067184 100644

Lines of this file are not shown. View the raw message.

sound/core/timer.c +59 -39

98 lines not on this page · raw message

sound/drivers/dummy.c +18 -17
index 016e451ed506..a9f7a75702d2 100644

Lines of this file are not shown. View the raw message.

sound/firewire/bebob/bebob_stream.c +9 -5
index 5be5242e1ed8..7fdf34e80d5e 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_generic.c +70 -21

91 lines not on this page · raw message

sound/pci/hda/hda_jack.c +1 -1
index 366efbf87d41..b6dbe653b74f 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_jack.h +1 -1
index 387d30984dfe..1009909ea158 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_ca0132.c +4 -1
index 5b8a5b84a03c..304a0d7a6481 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_cirrus.c +27 -0
index 85813de26da8..ac38222cce49 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_hdmi.c +3 -2
index d1c74295a362..57d4cce06ab6 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_realtek.c +2 -9
index 887f37761f18..f33c58d3850e 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_sigmatel.c +3 -3
index 14a62b8117fd..79f78989a7b6 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/rt5645.c +1 -1
index 5c101af0ac63..a06cdcfffd2a 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-pcm.c +2 -1
index 70e4b9d8bdcd..81133fe5f2d0 100644

Lines of this file are not shown. View the raw message.

sound/usb/midi.c +0 -1
index bec63e0d2605..f059326a4914 100644

Lines of this file are not shown. View the raw message.

sound/usb/quirks.c +16 -2
index fb9a8a5787a6..37d8ababfc04 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.