Linux 4.9.71
Greg KH
maintainerI'm announcing the release of the 4.9.71 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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/Makefile | 8 - arch/blackfin/Kconfig | 7 arch/blackfin/Kconfig.debug | 1 arch/openrisc/include/asm/uaccess.h | 2 arch/powerpc/perf/hv-24x7.c | 2 arch/powerpc/platforms/powernv/opal-async.c | 6 arch/powerpc/platforms/powernv/setup.c | 2 arch/powerpc/sysdev/ipic.c | 4 arch/x86/crypto/salsa20_glue.c | 7 arch/x86/kernel/acpi/boot.c | 2 arch/x86/kvm/vmx.c | 4 block/badblocks.c | 2 block/blk-mq-tag.c | 3 crypto/hmac.c | 6 crypto/rsa_helper.c | 2 crypto/salsa20_generic.c | 7 crypto/shash.c | 5 crypto/tcrypt.c | 6 drivers/acpi/acpi_processor.c | 5 drivers/acpi/bus.c | 1 drivers/acpi/processor_core.c | 73 --------- drivers/bluetooth/btusb.c | 5 drivers/bus/arm-ccn.c | 1 drivers/clk/hisilicon/clk-hi6220.c | 2 drivers/clk/imx/clk-imx6q.c | 2 drivers/clk/mediatek/clk-mtk.h | 1 drivers/clk/mediatek/clk-pll.c | 5 drivers/clk/tegra/clk-tegra30.c | 2 drivers/dma/dmaengine.c | 2 drivers/dma/dmatest.c | 55 ++++--- drivers/dma/ti-dma-crossbar.c | 8 - drivers/firmware/efi/efi.c | 1 drivers/firmware/efi/esrt.c | 2 drivers/gpu/drm/amd/acp/Makefile | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 drivers/gpu/drm/radeon/si_dpm.c | 10 + drivers/hid/hid-cp2112.c | 8 - drivers/hv/hv_fcopy.c | 4 drivers/hv/hv_kvp.c | 4 drivers/hv/hv_snapshot.c | 4 drivers/hv/hv_utils_transport.c | 12 + drivers/hv/hv_utils_transport.h | 1 drivers/hwtracing/intel_th/pci.c | 5 drivers/infiniband/core/cma.c | 11 - drivers/infiniband/hw/cxgb4/t4.h | 2 drivers/infiniband/hw/hfi1/chip.c | 2 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 drivers/input/serio/i8042-x86ia64io.h | 7 drivers/iommu/amd_iommu.c | 2 drivers/iommu/io-pgtable-arm-v7s.c | 6 drivers/iommu/mtk_iommu_v1.c | 2 drivers/irqchip/Kconfig | 1 drivers/md/bcache/request.c | 6 drivers/md/bcache/super.c | 6 drivers/md/md-cluster.c | 1 drivers/md/raid5.c | 5 drivers/mfd/fsl-imx25-tsadc.c | 14 + drivers/misc/eeprom/at24.c | 2 drivers/mmc/host/mtk-sd.c | 4 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 168 +++++++++++++++------- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 16 +- drivers/net/ethernet/mellanox/mlx4/cmd.c | 11 + drivers/net/ethernet/mellanox/mlx4/main.c | 11 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 drivers/net/ethernet/mellanox/mlxsw/reg.h | 4 drivers/net/ethernet/qlogic/qed/qed_cxt.c | 3 drivers/net/ethernet/qlogic/qed/qed_ll2.c | 11 - drivers/net/ethernet/sfc/ef10.c | 2 drivers/net/fjes/fjes_main.c | 2 drivers/net/macvlan.c | 2 drivers/net/ppp/ppp_generic.c | 1 drivers/net/wimax/i2400m/usb.c | 3 drivers/net/wireless/ath/ath9k/tx99.c | 5 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 11 - drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 41 ++--- drivers/nvme/host/core.c | 3 drivers/nvme/target/core.c | 11 + drivers/nvme/target/loop.c | 2 drivers/nvme/target/nvmet.h | 1 drivers/nvme/target/rdma.c | 8 - drivers/pci/pcie/pme.c | 5 drivers/pci/probe.c | 7 drivers/pci/remove.c | 2 drivers/pinctrl/Kconfig | 3 drivers/platform/x86/hp_accel.c | 1 drivers/platform/x86/intel_punit_ipc.c | 8 - drivers/rtc/rtc-pcf8563.c | 2 drivers/scsi/bfa/bfad_debugfs.c | 5 drivers/scsi/hpsa.c | 59 ++++--- drivers/scsi/hpsa.h | 1 drivers/scsi/hpsa_cmd.h | 2 drivers/scsi/scsi_debug.c | 6 drivers/scsi/scsi_devinfo.c | 2 drivers/scsi/sd.c | 12 + drivers/soc/mediatek/mtk-pmic-wrap.c | 2 drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 drivers/staging/vt6655/device_main.c | 3 drivers/target/iscsi/iscsi_target.c | 3 drivers/target/iscsi/iscsi_target_configfs.c | 3 drivers/target/target_core_alua.c | 33 +--- drivers/target/target_core_file.c | 4 drivers/target/target_core_pr.c | 4 drivers/thermal/step_wise.c | 11 - drivers/tty/tty_ldisc.c | 92 ++---------- drivers/usb/core/config.c | 4 drivers/usb/host/xhci-mem.c | 15 + drivers/usb/host/xhci-mtk.c | 6 drivers/usb/host/xhci-ring.c | 6 drivers/usb/musb/da8xx.c | 10 + drivers/usb/phy/phy-isp1301.c | 7 drivers/usb/storage/unusual_devs.h | 7 drivers/usb/storage/unusual_uas.h | 7 drivers/usb/usbip/stub_rx.c | 51 +++++- drivers/usb/usbip/stub_tx.c | 7 drivers/video/fbdev/au1200fb.c | 7 drivers/video/fbdev/controlfb.h | 2 drivers/video/fbdev/udlfb.c | 10 - fs/afs/callback.c | 7 fs/afs/cmservice.c | 11 - fs/afs/file.c | 1 fs/afs/fsclient.c | 22 +- fs/afs/inode.c | 11 - fs/afs/internal.h | 17 +- fs/afs/misc.c | 2 fs/afs/rxrpc.c | 52 ++++-- fs/afs/security.c | 7 fs/afs/server.c | 6 fs/afs/vlocation.c | 16 +- fs/afs/write.c | 32 +++- fs/autofs4/waitq.c | 1 fs/btrfs/inode.c | 14 + fs/btrfs/tests/free-space-tree-tests.c | 3 fs/ceph/mds_client.c | 42 ++++- fs/ext4/extents.c | 1 fs/ext4/namei.c | 4 fs/fs-writeback.c | 35 ++-- fs/gfs2/file.c | 4 fs/nfs/nfs4client.c | 4 fs/nfs/write.c | 2 fs/nfsd/nfssvc.c | 30 +-- fs/proc/proc_tty.c | 3 fs/udf/super.c | 2 fs/userfaultfd.c | 2 fs/xfs/libxfs/xfs_bmap.c | 2 fs/xfs/xfs_iops.c | 36 ++-- fs/xfs/xfs_log_recover.c | 2 include/crypto/internal/hash.h | 8 + include/linux/acpi.h | 3 include/linux/mlx4/device.h | 1 include/linux/mman.h | 3 include/rdma/ib_addr.h | 7 include/rdma/ib_pack.h | 19 +- include/target/target_core_base.h | 2 include/uapi/linux/usb/ch9.h | 19 ++ kernel/sched/deadline.c | 63 +++++++- kernel/sched/rt.c | 8 - kernel/trace/trace.c | 29 +-- net/bridge/br_netfilter_hooks.c | 12 - net/core/dev.c | 1 net/ipv4/icmp.c | 15 + net/l2tp/l2tp_core.c | 2 net/l2tp/l2tp_netlink.c | 2 net/mac80211/mesh.c | 2 net/mpls/af_mpls.c | 13 + net/netfilter/ipvs/ip_vs_ctl.c | 4 net/rxrpc/conn_event.c | 4 net/rxrpc/input.c | 15 + net/socket.c | 1 sound/soc/intel/skylake/skl-sst-utils.c | 15 + sound/soc/sh/rcar/cmd.c | 36 ++-- sound/soc/sh/rcar/dma.c | 18 ++ sound/soc/sh/rcar/ssi.c | 11 + tools/perf/util/symbol.c | 2 tools/testing/selftests/vm/Makefile | 4 180 files changed, 1122 insertions(+), 692 deletions(-)
Adam Wallis (1):
dmaengine: dmatest: move callback wait queue to thread context
Alan Stern (1):
USB: core: prevent malicious bNumInterfaces overflow
Alex Deucher (2):
drm/radeon/si: add dpm quirk for Oland drm/radeon: reinstate oland workaround for sclk
Alex Vesker (1):
IB/ipoib: Grab rtnl lock on heavy flush when calling ndo_open/stop
Alex Williamson (1):
PCI: Detach driver before procfs & sysfs teardown on device remove
Alexander Duyck (1):
macvlan: Only deliver one copy of the frame to the macvlan interface
Alexander Potapenko (1):
net: initialize msg.msg_flags in recvfrom
Alexander Shishkin (1):
intel_th: pci: Add Gemini Lake support
Andrea Arcangeli (2):
userfaultfd: shmem: __do_fault requires VM_FAULT_NOPAGE
userfaultfd: selftest: vm: allow to build in vm/ directory
Arnd Bergmann (2):
irqchip/mvebu-odmi: Select GENERIC_MSI_IRQ_DOMAIN
drm: amd: remove broken include path
Bart Van Assche (2):
target/iscsi: Fix a race condition in iscsit_add_reject_from_cmd() RDMA/cma: Avoid triggering undefined behavior
Bin Liu (1):
usb: musb: da8xx: fix babble condition handling
Bob Peterson (1):
GFS2: Take inode off order_write list when setting jdata flag
Brian Foster (1):
xfs: fix log block underflow during recovery cycle verification
Chandan Rajendra (1):
ext4: fix crash when a directory's i_size is too small
Changbin Du (1):
tracing: Allocate mask_str buffer dynamically
Chen Zhong (1):
clk: mediatek: add the option for determining PLL source clock
Christoph Hellwig (2):
nvme: use kref_get_unless_zero in nvme_find_get_ns
xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real
Christophe JAILLET (3):
video: fbdev: au1200fb: Release some resources if a memory allocation fails
video: fbdev: au1200fb: Return an error code if a memory allocation fails
btrfs: tests: Fix a memory leak in error handling path in 'run_test()'
Christophe Leroy (1):
powerpc/ipic: Fix status get and status clear
Chunfeng Yun (2):
usb: xhci: fix TDS for MTK xHCI1.1
usb: xhci-mtk: check hcc_params after adding primary hcd
Dan Carpenter (1):
scsi: bfa: integer overflow in debugfs
Daniel Borkmann (1):
perf symbols: Fix symbols__fixup_end heuristic for corner cases
Daniel Bristot de Oliveira (2):
sched/deadline: Make sure the replenishment timer fires in the next period sched/deadline: Throttle a constrained deadline task activated after the deadline
Daniel Drake (1):
efi/esrt: Cleanup bad memory map log messages
Daniel Jurgens (1):
net/mlx5: Don't save PCI state when PCI error is detected
Daniel Lezcano (1):
thermal/drivers/step_wise: Fix temperature regulation misbehavior
Dave Airlie (1):
drm/amdgpu: fix parser init error path to avoid crash in parser fini
David Ahern (1):
net: mpls: Fix nexthop alive tracking on down events
David Howells (10):
rxrpc: Wake up the transmitter if Rx window size increases on the peer
afs: Fix missing put_page()
afs: Flush outstanding writes when an fd is closed
afs: Fix the maths in afs_fs_store_data()
afs: Invalid op ID should abort with RXGEN_OPCODE
afs: Better abort and net error handling
afs: Fix page leak in afs_write_begin()
afs: Fix afs_kill_pages()
afs: Fix abort on signal while waiting for call completion
rxrpc: Ignore BUSY packets on old calls
David Kozub (1):
USB: uas and storage: Add US_FL_BROKEN_FUA for another JMicron JMS567 ID
David Lechner (1):
eeprom: at24: change nvmem stride to 1
Dmitry Torokhov (1):
Input: i8042 - add TUXEDO BU1406 (N24_25BU) to the nomux list
Dmitry Vyukov (2):
tty: don't panic on OOM in tty_set_ldisc()
tty: fix data race in tty_ldisc_ref_wait()
Don Brace (3):
scsi: hpsa: update check for logical volume status
scsi: hpsa: limit outstanding rescans
scsi: hpsa: do not timeout reset operations
Dou Liyang (1):
Revert "x86/acpi: Set persistent cpuid <-> nodeid mapping when booting"
Doug Berger (6):
net: bcmgenet: correct the RBUF_OVFL_CNT and RBUF_ERR_CNT MIB values
net: bcmgenet: correct MIB access of UniMAC RUNT counters
net: bcmgenet: reserved phy revisions must be checked first
net: bcmgenet: power down internal phy if open or resume fails
net: bcmgenet: synchronize irq0 status between the isr and task
net: bcmgenet: Power up the internal PHY before probing the MII
Douglas Gilbert (1):
scsi: scsi_debug: write_same: fix error report
Eric Biggers (3):
crypto: rsa - fix buffer overread when stripping leading zeroes
crypto: hmac - require that the underlying hash algorithm is unkeyed
crypto: salsa20 - fix blkcipher_walk API usage
Eryu Guan (2):
ext4: fix fdatasync(2) after fallocate(2) operation
xfs: truncate pagecache before writeback in xfs_setattr_size()
Felipe Balbi (1):
usb: add helper to extract bits 12:11 of wMaxPacketSize
Florian Westphal (1):
netfilter: bridge: honor frag_max_size when refragmenting
Gao Feng (1):
ppp: Destroy the mutex when cleanup
Gary R Hook (1):
iommu/amd: Limit the IOVA page range to the specified addresses
Geert Uytterhoeven (1):
fbdev: controlfb: Add missing modes to fix out of bounds access
Greg Kroah-Hartman (1):
Linux 4.9.71
Guoqing Jiang (1):
md-cluster: free md_cluster_info if node leave cluster
Hiroyuki Yokoyama (1):
ASoC: rsnd: fix sound route path when using SRC6/SRC9
Ilan peer (1):
mac80211: Fix addition of mesh configuration element
Jack Morgenstein (1):
net/mlx4_core: Avoid delays during VF driver device shutdown
Jan Kara (2):
mm: Handle 0 flags in _calc_vm_trans() macro
udf: Avoid overflow when session starts at large offset
Javier Martinez Canillas (1):
usb: phy: isp1301: Add OF device ID table
Jia-Ju Bai (3):
vt6655: Fix a possible sleep-in-atomic bug in vt6655_suspend
rtl8188eu: Fix a possible sleep-in-atomic bug in rtw_createbss_cmd
rtl8188eu: Fix a possible sleep-in-atomic bug in rtw_disassoc_cmd
Jiang Yi (1):
target/file: Do not return error for UNMAP if length is zero
Jiri Pirko (2):
mlxsw: reg: Fix SPVM max record count
mlxsw: reg: Fix SPVMLR max record count
Jiri Slaby (1):
l2tp: cleanup l2tp_tunnel_delete calls
Johan Hovold (1):
net: wimax/i2400m: fix NULL-deref at probe
KUWAZAWA Takuya (1):
netfilter: ipvs: Fix inappropriate output of procfs
Kuninori Morimoto (2):
ASoC: rcar: clear DE bit only in PDMACHCR when it stops
ASoC: rsnd: rsnd_ssi_run_mods() needs to care ssi_parent_mod
Kuppuswamy Sathyanarayanan (1):
platform/x86: intel_punit_ipc: Fix resource ioremap warning
Kurt Garloff (1):
scsi: scsi_devinfo: Add REPORTLUN2 to EMC SYMMETRIX blacklist entry
Ladislav Michl (1):
video: udlfb: Fix read EDID timeout
Leo Yan (1):
clk: hi6220: mark clock cs_atb_syspll as critical
Leon Romanovsky (1):
RDMA/cxgb4: Declare stag as __be32
Liang Chen (1):
bcache: explicitly destroy mutex while exiting
Linus Walleij (1):
pinctrl: adi2: Fix Kconfig build problem
Liu Bo (1):
badblocks: fix wrong return value in badblocks_set if badblocks are disabled
Marc Dionne (4):
afs: Populate group ID from vnode status
afs: Adjust mode bits processing
afs: Deal with an empty callback array
afs: Populate and use client modification time
Martin Kaiser (1):
mfd: fsl-imx25: Clean up irq settings during removal
Martin Wilck (2):
scsi: hpsa: cleanup sas_phy structures in sysfs when unloading
scsi: hpsa: destroy sas transport properties before scsi_host
Mathias Nyman (1):
xhci: Don't add a virt_dev to the devs array before it's fully allocated
Matteo Croce (1):
icmp: don't fail on fragment reassembly time exceeded
Matthias Brugger (2):
iommu/mediatek: Fix driver name
soc: mediatek: pwrap: fix compiler errors
Matthias Kaehlcke (1):
dmaengine: Fix array index out of bounds warning in __get_unmap_pool()
Miaoqing Pan (1):
ath9k: fix tx99 potential info leak
Michael Chan (1):
bnxt_en: Ignore 0 value in autoneg supported speed from firmware.
Michael Ellerman (1):
powerpc/perf/hv-24x7: Fix incorrect comparison in memord
Michał Mirosław (1):
clk: tegra: Fix cclk_lp divisor register
Mika Westerberg (1):
PCI: Do not allocate more buses than available in parent
Mike Christie (3):
target: Use system workqueue for ALUA transitions
target: fix ALUA transition timeout handling
target: fix race during implicit transition work flushes
Mintz, Yuval (1):
qed: Fix mapping leak on LL2 rx flow
NeilBrown (4):
autofs: fix careless error in recent commit
NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)
NFSD: fix nfsd_reset_versions for NFSv4.
raid5: Set R5_Expanded on parity devices as well as data.
Nick Desaulniers (1):
arm64: prevent regressions in compressed kernel image size when upgrading to binutils 2.27
Oleksandr Tyshchenko (1):
iommu/io-pgtable-arm-v7s: Check for leaf entry before dereferencing it
Olga Kornievskaia (1):
NFSv4.1 respect server's max size in CREATE_SESSION
Osama Khan (1):
platform/x86: hp_accel: Add quirk for HP ProBook 440 G4
Pankaj Bharadiya (1):
ASoC: Intel: Skylake: Fix uuid_module memory leak in failure case
Parav Pandit (1):
IB/core: Fix calculation of maximum RoCE MTU
Patel Jay P (1):
Ib/hfi1: Return actual operational VLs in port info query
Paul Blakey (1):
net/mlx5: Fix create autogroup prev initializer
Peter Ujfalusi (1):
dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type
Philipp Zabel (1):
rtc: pcf8563: fix output clock rate
Qiang (1):
PCI/PME: Handle invalid data when reading Root Status
Radim Krčmář (1):
KVM: nVMX: do not warn when MSR bitmap address is not backed
Ram Amrani (2):
qed: Align CIDs according to DORQ requirement
qed: Fix interrupt flags on Rx LL2
Robert Baronescu (1):
crypto: tcrypt - fix buffer lengths in test_aead_speed()
Robert Stonehouse (1):
sfc: don't warn on successful change of MAC
Sagi Grimberg (4):
blk-mq: Fix tagset reinit in the presence of cpu hot-unplug
nvme-loop: fix a possible use-after-free when destroying the admin queue
nvmet: confirm sq percpu has scheduled and switched to atomic
nvmet-rdma: Fix a possible uninitialized variable dereference
Sara Sharon (1):
iwlwifi: mvm: cleanup pending frames in DQA mode
Scott Mayhew (1):
nfs: don't wait on commit in nfs_commit_inode() if there were no commit requests
Shriya (1):
powerpc/powernv/cpufreq: Fix the frequency read by /proc/cpuinfo
Shuah Khan (3):
usbip: fix stub_rx: get_pipe() to validate endpoint number
usbip: fix stub_rx: harden CMD_SUBMIT path to handle malicious input
usbip: fix stub_send_ret_submit() vulnerability to null transfer_buffer
Stafford Horne (1):
openrisc: fix issue handling 8 byte get_user calls
Steven Rostedt (1):
sched/rt: Do not pull from current CPU if only one CPU to pull
Steven Rostedt (VMware) (1):
sched/deadline: Use deadline instead of period when calculating overflow
Sukumar Ghorai (1):
Bluetooth: btusb: driver to enable the usb-wakeup feature
Suzuki K Poulose (1):
arm-ccn: perf: Prevent module unload while PMU is in use
Sébastien Szymanski (2):
HID: cp2112: fix broken gpio_direction_input callback
clk: imx6: refine hdmi_isfr's parent to make HDMI work on i.MX6 SoCs w/o VPU
Tahsin Erdogan (1):
writeback: fix memory leak in wb_queue_work()
Taku Izumi (1):
fjes: Fix wrong netdevice feature flags
Tina Ruchandani (2):
afs: Migrate vlocation fields to 64-bit
afs: Prevent callback expiry timer overflow
Tomi Valkeinen (1):
drm/omap: fix dmabuf mmap for dma_alloc'ed buffers
Vitaly Kuznetsov (1):
Drivers: hv: util: move waiting for release to hv_utils_transport itself
Vlad Yasevich (1):
net: Resend IGMP memberships upon peer notification.
Wanpeng Li (1):
sched/deadline: Add missing update_rq_clock() in dl_task_timer()
William A. Kennington III (1):
powerpc/opal: Fix EBUSY bug in acquiring tokens
Yan, Zheng (1):
ceph: drop negative child dentries before try pruning inode's alias
Zygo Blaxell (1):
btrfs: add missing memset while reading compressed inline extents
nixiaoming (1):
tty fix oops when rmmod 8250
tang.junhui (1):
bcache: fix wrong cache_misses statistics
tangwenji (2):
iscsi-target: fix memory leak in lio_target_tiqn_addtpg() target:fix condition return in core_pr_dump_initiator_port()
weiping zhang (2):
scsi: sd: change manage_start_stop to bool in sysfs interface
scsi: sd: change allow_restart to bool in sysfs interface
yong mao (1):
mmc: mediatek: Fixed bug where clock frequency could be set wrong
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 70 +SUBLEVEL = 71 EXTRAVERSION = NAME = Roaring Lionus
arch/arm64/Makefile +6 -2
@@ -14,8 +14,12 @@ LDFLAGS_vmlinux :=-p --no-undefined -X CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) GZFLAGS :=-9 -ifneq ($(CONFIG_RELOCATABLE),) -LDFLAGS_vmlinux += -pie -shared -Bsymbolic +ifeq ($(CONFIG_RELOCATABLE), y) +# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour +# for relative relocs, since this leads to better Image compression +# with the relocation offsets always being zero. +LDFLAGS_vmlinux += -pie -shared -Bsymbolic \ + $(call ld-option, --no-apply-dynamic-relocs) endif ifeq ($(CONFIG_ARM64_ERRATUM_843419),y)
arch/blackfin/Kconfig +5 -2
@@ -319,11 +319,14 @@ config BF53x config GPIO_ADI def_bool y + depends on !PINCTRL depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561) -config PINCTRL +config PINCTRL_BLACKFIN_ADI2 def_bool y - depends on BF54x || BF60x + depends on (BF54x || BF60x) + select PINCTRL + select PINCTRL_ADI2 config MEM_MT48LC64M4A2FB_7E bool
arch/blackfin/Kconfig.debug +1 -0
@@ -17,6 +17,7 @@ config DEBUG_VERBOSE config DEBUG_MMRS tristate "Generate Blackfin MMR tree" + depends on !PINCTRL select DEBUG_FS help Create a tree of Blackfin MMRs via the debugfs tree. If
arch/openrisc/include/asm/uaccess.h +1 -1
@@ -211,7 +211,7 @@ do { \case 1 :__get_user_asm (x, ptr, retval,"l.lbz" );break ; \case 2 :__get_user_asm (x, ptr, retval,"l.lhz" );break ; \case 4 :__get_user_asm (x, ptr, retval,"l.lwz" );break ; \ -case 8 :__get_user_asm2 (x, ptr, retval); \ +case 8 :__get_user_asm2 (x, ptr, retval);break ; \default : (x) =__get_user_bad (); \ } \ }while (0 )
arch/powerpc/perf/hv-24x7.c +1 -1
@@ -516,7 +516,7 @@ static int memord(const void *d1, size_t s1, const void *d2, size_t s2) {if (s1 < s2)return 1 ; -if (s2 > s1) +if (s1 > s2)return -1 ;return memcmp (d1, d2, s1);
arch/powerpc/platforms/powernv/opal-async.c +3 -3
@@ -39,18 +39,18 @@ int __opal_async_get_token(void)int token;spin_lock_irqsave (&opal_async_comp_lock, flags); - token =find_first_bit (opal_async_complete_map, opal_max_async_tokens); + token =find_first_zero_bit (opal_async_token_map, opal_max_async_tokens);if (token >= opal_max_async_tokens) { token = -EBUSY ; goto out; } -if (__test_and_set_bit (token, opal_async_token_map)) { +if (!__test_and_clear_bit (token, opal_async_complete_map)) { token = -EBUSY ; goto out; } -__clear_bit (token, opal_async_complete_map); +__set_bit (token, opal_async_token_map); out:spin_unlock_irqrestore (&opal_async_comp_lock, flags);
arch/powerpc/platforms/powernv/setup.c +1 -1
@@ -289,7 +289,7 @@ static unsigned long pnv_get_proc_freq(unsigned int cpu) {unsigned long ret_freq; - ret_freq =cpufreq_quick_get (cpu) *1000ul ; + ret_freq =cpufreq_get (cpu) *1000ul ;/* * If the backend cpufreq driver does not exist,
arch/powerpc/sysdev/ipic.c +2 -2
@@ -845,12 +845,12 @@ void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq)u32 ipic_get_mcp_status (void ) { -return ipic_read (primary_ipic->regs,IPIC_SERMR ); +return ipic_read (primary_ipic->regs,IPIC_SERSR ); }void ipic_clear_mcp_status (u32 mask) { -ipic_write (primary_ipic->regs,IPIC_SERMR , mask); +ipic_write (primary_ipic->regs,IPIC_SERSR , mask); }/* Return an interrupt vector or 0 if no interrupt is pending. */
arch/x86/crypto/salsa20_glue.c +0 -7
@@ -59,13 +59,6 @@ static int encrypt(struct blkcipher_desc *desc,salsa20_ivsetup (ctx, walk.iv); -if (likely (walk.nbytes == nbytes)) - { -salsa20_encrypt_bytes (ctx, walk.src.virt.addr, - walk.dst.virt.addr, nbytes); -return blkcipher_walk_done (desc, &walk,0 ); - } -while (walk.nbytes >=64 ) { salsa20_encrypt_bytes(ctx, walk.src.virt.addr, walk.dst.virt.addr,
arch/x86/kernel/acpi/boot.c +1 -1
@@ -720,7 +720,7 @@ static void __init acpi_set_irq_model_ioapic(void)#ifdef CONFIG_ACPI_HOTPLUG_CPU #include <acpi/processor.h> -int acpi_map_cpu2node (acpi_handle handle,int cpu,int physid) +static int acpi_map_cpu2node (acpi_handle handle,int cpu,int physid) {#ifdef CONFIG_ACPI_NUMA int nid;
arch/x86/kvm/vmx.c +1 -3
@@ -9543,10 +9543,8 @@ static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu,return false; page =nested_get_page (vcpu, vmcs12->msr_bitmap); -if (!page) { -WARN_ON (1 ); +if (!page)return false; - } msr_bitmap_l1 = (unsigned long *)kmap (page);if (!msr_bitmap_l1) {nested_release_page_clean (page);
block/badblocks.c +1 -1
@@ -178,7 +178,7 @@ int badblocks_set(struct badblocks *bb, sector_t s, int sectors,if (bb->shift <0 )/* badblocks are disabled */ -return 0 ; +return 1 ;if (bb->shift) {/* round the start down, and the end up */
block/blk-mq-tag.c +3 -0
@@ -311,6 +311,9 @@ int blk_mq_reinit_tagset(struct blk_mq_tag_set *set)for (i =0 ; i < set->nr_hw_queues; i++) {struct blk_mq_tags *tags = set->tags[i]; +if (!tags) +continue ; +for (j =0 ; j < tags->nr_tags; j++) {if (!tags->rqs[j])continue ;
crypto/hmac.c +5 -1
@@ -194,11 +194,15 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb) salg =shash_attr_alg (tb[1 ],0 ,0 );if (IS_ERR (salg))return PTR_ERR (salg); + alg = &salg->base; +/* The underlying hash algorithm must be unkeyed */ err = -EINVAL ; +if (crypto_shash_alg_has_setkey (salg)) + goto out_put_alg; + ds = salg->digestsize; ss = salg->statesize; - alg = &salg->base;if (ds > alg->cra_blocksize || ss < alg->cra_blocksize) goto out_put_alg;
crypto/rsa_helper.c +1 -1
@@ -30,7 +30,7 @@ int rsa_get_n(void *context, size_t hdrlen, unsigned char tag,return -EINVAL ;if (fips_enabled) { -while (!*ptr && n_sz) { +while (n_sz && !*ptr) { ptr++; n_sz--; }
crypto/salsa20_generic.c +0 -7
@@ -188,13 +188,6 @@ static int encrypt(struct blkcipher_desc *desc,salsa20_ivsetup (ctx, walk.iv); -if (likely (walk.nbytes == nbytes)) - { -salsa20_encrypt_bytes (ctx, walk.dst.virt.addr, - walk.src.virt.addr, nbytes); -return blkcipher_walk_done (desc, &walk,0 ); - } -while (walk.nbytes >=64 ) { salsa20_encrypt_bytes(ctx, walk.dst.virt.addr, walk.src.virt.addr,
crypto/shash.c +3 -2
@@ -24,11 +24,12 @@static const struct crypto_type crypto_shash_type; -static int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, -unsigned int keylen) +int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, +unsigned int keylen) {return -ENOSYS ; } +EXPORT_SYMBOL_GPL (shash_no_setkey);static int shash_setkey_unaligned (struct crypto_shash *tfm,const u8 *key,unsigned int keylen)
crypto/tcrypt.c +4 -2
@@ -342,7 +342,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, }sg_init_aead (sg, xbuf, - *b_size + (enc ? authsize :0 )); + *b_size + (enc ?0 : authsize));sg_init_aead (sgout, xoutbuf, *b_size + (enc ? authsize :0 ));
@@ -350,7 +350,9 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,sg_set_buf (&sg[0 ], assoc, aad_size);sg_set_buf (&sgout[0 ], assoc, aad_size); -aead_request_set_crypt (req, sg, sgout, *b_size, iv); +aead_request_set_crypt (req, sg, sgout, + *b_size + (enc ?0 : authsize), + iv);aead_request_set_ad (req, aad_size);if (secs)
drivers/acpi/acpi_processor.c +0 -5
@@ -182,11 +182,6 @@ int __weak arch_register_cpu(int cpu)void __weak arch_unregister_cpu (int cpu) {} -int __weak acpi_map_cpu2node (acpi_handle handle,int cpu,int physid) -{ -return -ENODEV ; -} -static int acpi_processor_hotadd_init (struct acpi_processor *pr) {unsigned long long sta;
drivers/acpi/bus.c +0 -1
@@ -1197,7 +1197,6 @@ static int __init acpi_init(void)acpi_wakeup_device_init ();acpi_debugger_init ();acpi_setup_sb_notify_handler (); -acpi_set_processor_mapping ();return 0 ; }
drivers/acpi/processor_core.c +0 -73
79 lines not on this page · raw message
drivers/bluetooth/btusb.c +5 -0
@@ -1059,6 +1059,10 @@ static int btusb_open(struct hci_dev *hdev) } data->intf->needs_remote_wakeup =1 ; +/* device specific wakeup source enabled and required for USB +* remote wakeup while host is suspended +*/ +device_wakeup_enable (&data->udev->dev);if (test_and_set_bit (BTUSB_INTR_RUNNING , &data->flags)) goto done;
@@ -1122,6 +1126,7 @@ static int btusb_close(struct hci_dev *hdev) goto failed; data->intf->needs_remote_wakeup =0 ; +device_wakeup_disable (&data->udev->dev);usb_autopm_put_interface (data->intf); failed:
drivers/bus/arm-ccn.c +1 -0
@@ -1280,6 +1280,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)/* Perf driver registration */ ccn->dt.pmu = (struct pmu ) { + .module =THIS_MODULE , .attr_groups = arm_ccn_pmu_attr_groups, .task_ctx_nr = perf_invalid_context, .event_init = arm_ccn_pmu_event_init,
drivers/clk/hisilicon/clk-hi6220.c +1 -1
@@ -144,7 +144,7 @@ static struct hisi_gate_clock hi6220_separated_gate_clks_sys[] __initdata = { { HI6220_BBPPLL_SEL, "bbppll_sel", "pll0_bbp_gate", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 9, 0, }, { HI6220_MEDIA_PLL_SRC, "media_pll_src", "pll_media_gate", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 10, 0, }, { HI6220_MMC2_SEL, "mmc2_sel", "mmc2_mux1", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 11, 0, }, - { HI6220_CS_ATB_SYSPLL, "cs_atb_syspll", "syspll", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 12, 0, }, + { HI6220_CS_ATB_SYSPLL, "cs_atb_syspll", "syspll", CLK_SET_RATE_PARENT|CLK_IS_CRITICAL, 0x270, 12, 0, }, }; static struct hisi_mux_clock hi6220_mux_clks_sys[] __initdata = {
drivers/clk/imx/clk-imx6q.c +1 -1
@@ -487,7 +487,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[IMX6QDL_CLK_GPU2D_CORE ] =imx_clk_gate2 ("gpu2d_core" ,"gpu2d_core_podf" , base +0x6c ,24 ); clk[IMX6QDL_CLK_GPU3D_CORE ] =imx_clk_gate2 ("gpu3d_core" ,"gpu3d_core_podf" , base +0x6c ,26 ); clk[IMX6QDL_CLK_HDMI_IAHB ] =imx_clk_gate2 ("hdmi_iahb" ,"ahb" , base +0x70 ,0 ); - clk[IMX6QDL_CLK_HDMI_ISFR ] =imx_clk_gate2 ("hdmi_isfr" ,"video_27m" , base +0x70 ,4 ); + clk[IMX6QDL_CLK_HDMI_ISFR ] =imx_clk_gate2 ("hdmi_isfr" ,"mipi_core_cfg" , base +0x70 ,4 ); clk[IMX6QDL_CLK_I2C1 ] =imx_clk_gate2 ("i2c1" ,"ipg_per" , base +0x70 ,6 ); clk[IMX6QDL_CLK_I2C2 ] =imx_clk_gate2 ("i2c2" ,"ipg_per" , base +0x70 ,8 ); clk[IMX6QDL_CLK_I2C3 ] =imx_clk_gate2 ("i2c3" ,"ipg_per" , base +0x70 ,10 );
drivers/clk/mediatek/clk-mtk.h +1 -0
@@ -185,6 +185,7 @@ struct mtk_pll_data {uint32_t pcw_reg;int pcw_shift;const struct mtk_pll_div_table *div_table; +const char *parent_name; }; void mtk_clk_register_plls(struct device_node *node,
drivers/clk/mediatek/clk-pll.c +4 -1
@@ -302,7 +302,10 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data, init.name = data->name; init.ops = &mtk_pll_ops; - init.parent_names = &parent_name; +if (data->parent_name) + init.parent_names = &data->parent_name; +else + init.parent_names = &parent_name; init.num_parents =1 ; clk =clk_register (NULL , &pll->hw);
drivers/clk/tegra/clk-tegra30.c +1 -1
@@ -963,7 +963,7 @@ static void __init tegra30_super_clk_init(void)* U71 divider of cclk_lp. */ clk =tegra_clk_register_divider ("pll_p_out3_cclklp" ,"pll_p_out3" , - clk_base +SUPER_CCLKG_DIVIDER ,0 , + clk_base +SUPER_CCLKLP_DIVIDER ,0 ,TEGRA_DIVIDER_INT ,16 ,8 ,1 ,NULL );clk_register_clkdev (clk,"pll_p_out3_cclklp" ,NULL );
drivers/dma/dmaengine.c +2 -0
@@ -1107,12 +1107,14 @@ static struct dmaengine_unmap_pool *__get_unmap_pool(int nr)switch (order) { case 0 ... 1:return &unmap_pool[0 ]; +#if IS_ENABLED (CONFIG_DMA_ENGINE_RAID ) case 2 ... 4:return &unmap_pool[1 ]; case 5 ... 7:return &unmap_pool[2 ];case 8 :return &unmap_pool[3 ]; +#endif default :BUG ();return NULL ;
drivers/dma/dmatest.c +31 -24
113 lines not on this page · raw message
drivers/dma/ti-dma-crossbar.c +4 -4
@@ -49,12 +49,12 @@ struct ti_am335x_xbar_data {struct ti_am335x_xbar_map {u16 dma_line; -u16 mux_val; +u8 mux_val; }; -static inline void ti_am335x_xbar_write (void __iomem *iomem,int event,u16 val) +static inline void ti_am335x_xbar_write (void __iomem *iomem,int event,u8 val) { -writeb_relaxed (val &0x1f , iomem + event); +writeb_relaxed (val, iomem + event); }static void ti_am335x_xbar_free (struct device *dev,void *route_data)
@@ -105,7 +105,7 @@ static void *ti_am335x_xbar_route_allocate(struct of_phandle_args *dma_spec, } map->dma_line = (u16 )dma_spec->args[0 ]; - map->mux_val = (u16 )dma_spec->args[2 ]; + map->mux_val = (u8 )dma_spec->args[2 ]; dma_spec->args[2 ] =0 ; dma_spec->args_count =2 ;
drivers/firmware/efi/efi.c +0 -1
@@ -384,7 +384,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)return 0 ; } } -pr_err_once ("requested map not found.\n" );return -ENOENT ; }
drivers/firmware/efi/esrt.c +1 -1
@@ -251,7 +251,7 @@ void __init efi_esrt_init(void) rc =efi_mem_desc_lookup (efi.esrt, &md);if (rc <0 ) { -pr_err ("ESRT header is not in the memory map.\n" ); +pr_warn ("ESRT header is not in the memory map.\n" );return ; }
drivers/gpu/drm/amd/acp/Makefile +0 -2
@@ -3,6 +3,4 @@ # of AMDSOC/AMDGPU drm driver. # It provides the HW control for ACP related functionalities. -subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include - AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -0
@@ -240,6 +240,8 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)for (; i >=0 ; i--)drm_free_large (p->chunks[i].kdata);kfree (p->chunks); + p->chunks =NULL ; + p->nchunks =0 ; put_ctx:amdgpu_ctx_put (p->ctx); free_chunk:
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +0 -3
@@ -147,9 +147,6 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer,struct drm_gem_object *obj = buffer->priv;int ret =0 ; -if (WARN_ON (!obj->filp)) -return -EINVAL ; - ret =drm_gem_mmap_obj (obj,omap_gem_mmap_size (obj), vma);if (ret <0 )return ret;
drivers/gpu/drm/radeon/si_dpm.c +10 -0
@@ -3029,6 +3029,16 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev, max_sclk =75000 ; max_mclk =80000 ; } + }else if (rdev->family ==CHIP_OLAND ) { +if ((rdev->pdev->revision ==0xC7 ) || + (rdev->pdev->revision ==0x80 ) || + (rdev->pdev->revision ==0x81 ) || + (rdev->pdev->revision ==0x83 ) || + (rdev->pdev->revision ==0x87 ) || + (rdev->pdev->device ==0x6604 ) || + (rdev->pdev->device ==0x6605 )) { + max_sclk =75000 ; + } }/* Apply dpm quirks */ while (p && p->chip_device !=0 ) {
drivers/hid/hid-cp2112.c +6 -2
@@ -188,6 +188,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) HID_REQ_GET_REPORT);if (ret !=CP2112_GPIO_CONFIG_LENGTH ) {hid_err (hdev,"error requesting GPIO config: %d\n" , ret); +if (ret >=0 ) + ret = -EIO ; goto exit; }
@@ -197,8 +199,10 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) ret =hid_hw_raw_request (hdev,CP2112_GPIO_CONFIG , buf,CP2112_GPIO_CONFIG_LENGTH ,HID_FEATURE_REPORT ,HID_REQ_SET_REPORT ); -if (ret <0 ) { +if (ret !=CP2112_GPIO_CONFIG_LENGTH ) {hid_err (hdev,"error setting GPIO config: %d\n" , ret); +if (ret >=0 ) + ret = -EIO ; goto exit; }
@@ -206,7 +210,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) exit:mutex_unlock (&dev->lock); -return ret <0 ? ret : -EIO ; +return ret; }static void cp2112_gpio_set (struct gpio_chip *chip,unsigned offset,int value)
drivers/hv/hv_fcopy.c +0 -4
@@ -61,7 +61,6 @@ static DECLARE_WORK(fcopy_send_work, fcopy_send_data);static const char fcopy_devname[] ="vmbus/hv_fcopy" ;static u8 *recv_buffer;static struct hvutil_transport *hvt; -static struct completion release_event;/* * This state maintains the version number registered by the daemon. */
@@ -322,7 +321,6 @@ static void fcopy_on_reset(void)if (cancel_delayed_work_sync (&fcopy_timeout_work))fcopy_respond_to_host (HV_E_FAIL ); -complete (&release_event); }int hv_fcopy_init (struct hv_util_service *srv)
@@ -330,7 +328,6 @@ int hv_fcopy_init(struct hv_util_service *srv) recv_buffer = srv->recv_buffer; fcopy_transaction.recv_channel = srv->channel; -init_completion (&release_event);/* * When this driver loads, the user level daemon that * processes the host requests may not yet be running.
@@ -352,5 +349,4 @@ void hv_fcopy_deinit(void) fcopy_transaction.state =HVUTIL_DEVICE_DYING ;cancel_delayed_work_sync (&fcopy_timeout_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); }
drivers/hv/hv_kvp.c +0 -4
@@ -88,7 +88,6 @@ static DECLARE_WORK(kvp_sendkey_work, kvp_send_key);static const char kvp_devname[] ="vmbus/hv_kvp" ;static u8 *recv_buffer;static struct hvutil_transport *hvt; -static struct completion release_event;/* * Register the kernel component with the user-level daemon. * As part of this registration, pass the LIC version number.
@@ -717,7 +716,6 @@ static void kvp_on_reset(void)if (cancel_delayed_work_sync (&kvp_timeout_work))kvp_respond_to_host (NULL ,HV_E_FAIL ); kvp_transaction.state =HVUTIL_DEVICE_INIT ; -complete (&release_event); }int
@@ -726,7 +724,6 @@ hv_kvp_init(struct hv_util_service *srv) recv_buffer = srv->recv_buffer; kvp_transaction.recv_channel = srv->channel; -init_completion (&release_event);/* * When this driver loads, the user level daemon that * processes the host requests may not yet be running.
@@ -750,5 +747,4 @@ void hv_kvp_deinit(void)cancel_delayed_work_sync (&kvp_timeout_work);cancel_work_sync (&kvp_sendkey_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); }
drivers/hv/hv_snapshot.c +0 -4
@@ -66,7 +66,6 @@ static int dm_reg_value;static const char vss_devname[] ="vmbus/hv_vss" ;static __u8 *recv_buffer;static struct hvutil_transport *hvt; -static struct completion release_event;static void vss_timeout_func (struct work_struct *dummy);static void vss_handle_request (struct work_struct *dummy);
@@ -331,13 +330,11 @@ static void vss_on_reset(void)if (cancel_delayed_work_sync (&vss_timeout_work))vss_respond_to_host (HV_E_FAIL ); vss_transaction.state =HVUTIL_DEVICE_INIT ; -complete (&release_event); }int hv_vss_init (struct hv_util_service *srv) { -init_completion (&release_event);if (vmbus_proto_version <VERSION_WIN8_1 ) {pr_warn ("Integration service 'Backup (volume snapshot)'" " not supported on this host version.\n" );
@@ -368,5 +365,4 @@ void hv_vss_deinit(void)cancel_delayed_work_sync (&vss_timeout_work);cancel_work_sync (&vss_handle_request_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); }
drivers/hv/hv_utils_transport.c +8 -4
@@ -182,10 +182,11 @@ static int hvt_op_release(struct inode *inode, struct file *file)* connects back. */ hvt_reset (hvt); -mutex_unlock (&hvt->lock);if (mode_old ==HVUTIL_TRANSPORT_DESTROY ) -hvt_transport_free (hvt); +complete (&hvt->release); + +mutex_unlock (&hvt->lock);return 0 ; }
@@ -304,6 +305,7 @@ struct hvutil_transport *hvutil_transport_init(const char *name,init_waitqueue_head (&hvt->outmsg_q);mutex_init (&hvt->lock); +init_completion (&hvt->release);spin_lock (&hvt_list_lock);list_add (&hvt->list, &hvt_list);
@@ -351,6 +353,8 @@ void hvutil_transport_destroy(struct hvutil_transport *hvt)if (hvt->cn_id.idx >0 && hvt->cn_id.val >0 )cn_del_callback (&hvt->cn_id); -if (mode_old !=HVUTIL_TRANSPORT_CHARDEV ) -hvt_transport_free (hvt); +if (mode_old ==HVUTIL_TRANSPORT_CHARDEV ) +wait_for_completion (&hvt->release); + +hvt_transport_free (hvt); }
drivers/hv/hv_utils_transport.h +1 -0
@@ -41,6 +41,7 @@ struct hvutil_transport {int outmsg_len;/* its length */ wait_queue_head_t outmsg_q;/* poll/read wait queue */ struct mutex lock;/* protects struct members */ +struct completion release;/* synchronize with fd release */ }; struct hvutil_transport *hvutil_transport_init(const char *name,
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -95,6 +95,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9da6), .driver_data = (kernel_ulong_t)0, }, + { +/* Gemini Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e), + .driver_data = (kernel_ulong_t )0 , + }, { 0 }, };
drivers/infiniband/core/cma.c +7 -4
@@ -1482,7 +1482,7 @@ static struct rdma_id_private *cma_id_from_event(struct ib_cm_id *cm_id,return id_priv; } -static inline int cma_user_data_offset (struct rdma_id_private *id_priv) +static inline u8 cma_user_data_offset (struct rdma_id_private *id_priv) {return cma_family (id_priv) ==AF_IB ?0 :sizeof (struct cma_hdr ); }
@@ -1877,7 +1877,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)struct rdma_id_private *listen_id, *conn_id =NULL ;struct rdma_cm_event event;struct net_device *net_dev; -int offset, ret; +u8 offset; +int ret; listen_id =cma_id_from_event (cm_id, ib_event, &net_dev);if (IS_ERR (listen_id))
@@ -3309,7 +3310,8 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,struct ib_cm_sidr_req_param req;struct ib_cm_id *id;void *private_data; -int offset, ret; +u8 offset; +int ret;memset (&req,0 ,sizeof req); offset =cma_user_data_offset (id_priv);
@@ -3366,7 +3368,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,struct rdma_route *route;void *private_data;struct ib_cm_id *id; -int offset, ret; +u8 offset; +int ret;memset (&req,0 ,sizeof req); offset =cma_user_data_offset (id_priv);
drivers/infiniband/hw/cxgb4/t4.h +1 -1
@@ -171,7 +171,7 @@ struct t4_cqe {__be32 msn; } rcqe;struct { -u32 stag; +__be32 stag;u16 nada2;u16 cidx; } scqe;
drivers/infiniband/hw/hfi1/chip.c +1 -1
@@ -9769,7 +9769,7 @@ int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which) goto unimplemented;case HFI1_IB_CFG_OP_VLS : - val = ppd->vls_operational; + val = ppd->actual_vls_operational;break ;case HFI1_IB_CFG_VL_HIGH_CAP :/* VL arb high priority table size */ val =VL_ARB_HIGH_PRIO_TABLE_SIZE ;
drivers/infiniband/ulp/ipoib/ipoib_ib.c +6 -1
@@ -1177,10 +1177,15 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,ipoib_ib_dev_down (dev);if (level ==IPOIB_FLUSH_HEAVY ) { +rtnl_lock ();if (test_bit (IPOIB_FLAG_INITIALIZED , &priv->flags))ipoib_ib_dev_stop (dev); -if (ipoib_ib_dev_open (dev) !=0 ) + + result =ipoib_ib_dev_open (dev); +rtnl_unlock (); +if (result)return ; +if (netif_queue_stopped (dev))netif_start_queue (dev); }
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -520,6 +520,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "IC4I"), }, }, + { + /* TUXEDO BU1406 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), + DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"), + }, + }, { } };
drivers/iommu/amd_iommu.c +1 -1
@@ -3211,7 +3211,7 @@ static void amd_iommu_apply_dm_region(struct device *dev,unsigned long start, end; start =IOVA_PFN (region->start); - end =IOVA_PFN (region->start + region->length); + end =IOVA_PFN (region->start + region->length -1 );WARN_ON_ONCE (reserve_iova (&dma_dom->iovad, start, end) ==NULL ); }
drivers/iommu/io-pgtable-arm-v7s.c +5 -1
@@ -418,8 +418,12 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova, pte |=ARM_V7S_ATTR_NS_TABLE ;__arm_v7s_set_pte (ptep, pte,1 , cfg); - }else { + }else if (ARM_V7S_PTE_IS_TABLE (pte, lvl)) { cptep =iopte_deref (pte, lvl); + }else { +/* We require an unmap first */ +WARN_ON (!selftest_running); +return -EEXIST ; }/* Rinse, repeat */
drivers/iommu/mtk_iommu_v1.c +1 -1
@@ -703,7 +703,7 @@ static struct platform_driver mtk_iommu_driver = { .probe = mtk_iommu_probe, .remove = mtk_iommu_remove, .driver = { - .name = "mtk-iommu", + .name = "mtk-iommu-v1", .of_match_table = mtk_iommu_of_ids, .pm = &mtk_iommu_pm_ops, }
drivers/irqchip/Kconfig +1 -0
@@ -258,6 +258,7 @@ config IRQ_MXS config MVEBU_ODMI bool + select GENERIC_MSI_IRQ_DOMAIN config MVEBU_PIC bool
drivers/md/bcache/request.c +5 -1
@@ -468,6 +468,7 @@ struct search { unsigned recoverable:1; unsigned write:1; unsigned read_dirty_data:1; + unsigned cache_missed:1;unsigned long start_time;
@@ -653,6 +654,7 @@ static inline struct search *search_alloc(struct bio *bio, s->orig_bio = bio; s->cache_miss =NULL ; + s->cache_missed =0 ; s->d = d; s->recoverable =1 ; s->write =op_is_write (bio_op (bio));
@@ -771,7 +773,7 @@ static void cached_dev_read_done_bh(struct closure *cl) struct cached_dev *dc = container_of(s->d, struct cached_dev, disk);bch_mark_cache_accounting (s->iop.c, s->d, - !s->cache_miss, s->iop.bypass); + !s->cache_missed, s->iop.bypass);trace_bcache_read (s->orig_bio, !s->cache_miss, s->iop.bypass);if (s->iop.error)
@@ -790,6 +792,8 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, struct cached_dev *dc = container_of(s->d, struct cached_dev, disk);struct bio *miss, *cache_bio; + s->cache_missed =1 ; +if (s->cache_miss || s->iop.bypass) { miss =bio_next_split (bio, sectors,GFP_NOIO , s->d->bio_split); ret = miss == bio ?MAP_DONE :MAP_CONTINUE ;
drivers/md/bcache/super.c +4 -2
@@ -2091,6 +2091,7 @@ static void bcache_exit(void)if (bcache_major)unregister_blkdev (bcache_major,"bcache" );unregister_reboot_notifier (&reboot); +mutex_destroy (&bch_register_lock); }static int __init bcache_init (void )
@@ -2109,14 +2110,15 @@ static int __init bcache_init(void) bcache_major =register_blkdev (0 ,"bcache" );if (bcache_major <0 ) {unregister_reboot_notifier (&reboot); +mutex_destroy (&bch_register_lock);return bcache_major; }if (!(bcache_wq =alloc_workqueue ("bcache" ,WQ_MEM_RECLAIM ,0 )) || !(bcache_kobj =kobject_create_and_add ("bcache" , fs_kobj)) || -sysfs_create_files (bcache_kobj, files) ||bch_request_init () || -bch_debug_init (bcache_kobj)) +bch_debug_init (bcache_kobj) || +sysfs_create_files (bcache_kobj, files)) goto err;return 0 ;
drivers/md/md-cluster.c +1 -0
@@ -974,6 +974,7 @@ static int leave(struct mddev *mddev)lockres_free (cinfo->bitmap_lockres);unlock_all_bitmaps (mddev);dlm_release_lockspace (cinfo->lockspace,2 ); +kfree (cinfo);return 0 ; }
drivers/md/raid5.c +4 -1
@@ -1689,8 +1689,11 @@ static void ops_complete_reconstruct(void *stripe_head_ref)struct r5dev *dev = &sh->dev[i];if (dev->written || i == pd_idx || i == qd_idx) { -if (!discard && !test_bit (R5_SkipCopy, &dev->flags)) +if (!discard && !test_bit (R5_SkipCopy, &dev->flags)) {set_bit (R5_UPTODATE , &dev->flags); +if (test_bit (STRIPE_EXPAND_READY , &sh->state)) +set_bit (R5_Expanded, &dev->flags); + }if (fua)set_bit (R5_WantFUA, &dev->flags);if (sync)
drivers/mfd/fsl-imx25-tsadc.c +14 -0
@@ -183,6 +183,19 @@ static int mx25_tsadc_probe(struct platform_device *pdev)return 0 ; } +static int mx25_tsadc_remove (struct platform_device *pdev) +{ +struct mx25_tsadc *tsadc =platform_get_drvdata (pdev); +int irq =platform_get_irq (pdev,0 ); + +if (irq) { +irq_set_chained_handler_and_data (irq,NULL ,NULL ); +irq_domain_remove (tsadc->domain); + } + +return 0 ; +} +static const struct of_device_id mx25_tsadc_ids[] = { { .compatible ="fsl,imx25-tsadc" }, {/* Sentinel */ }
@@ -194,6 +207,7 @@ static struct platform_driver mx25_tsadc_driver = { .of_match_table = of_match_ptr(mx25_tsadc_ids), }, .probe = mx25_tsadc_probe, + .remove = mx25_tsadc_remove, };module_platform_driver (mx25_tsadc_driver);
drivers/misc/eeprom/at24.c +1 -1
@@ -783,7 +783,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) at24->nvmem_config.reg_read = at24_read; at24->nvmem_config.reg_write = at24_write; at24->nvmem_config.priv = at24; - at24->nvmem_config.stride =4 ; + at24->nvmem_config.stride =1 ; at24->nvmem_config.word_size =1 ; at24->nvmem_config.size = chip.byte_len;
drivers/mmc/host/mtk-sd.c +2 -2
@@ -579,7 +579,7 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz) } }sdr_set_field (host->base +MSDC_CFG ,MSDC_CFG_CKMOD |MSDC_CFG_CKDIV , - (mode <<8 ) | (div %0xff )); + (mode <<8 ) | div);sdr_set_bits (host->base +MSDC_CFG ,MSDC_CFG_CKPDN );while (!(readl (host->base +MSDC_CFG ) &MSDC_CFG_CKSTB ))cpu_relax ();
@@ -1562,7 +1562,7 @@ static int msdc_drv_probe(struct platform_device *pdev) host->src_clk_freq =clk_get_rate (host->src_clk);/* Set host parameters to mmc */ mmc->ops = &mt_msdc_ops; - mmc->f_min = host->src_clk_freq / (4 *255 ); + mmc->f_min =DIV_ROUND_UP (host->src_clk_freq,4 *255 ); mmc->caps |=MMC_CAP_ERASE |MMC_CAP_CMD23 ;/* MMC core transfer sizes tunable parameters */
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -2
@@ -5132,8 +5132,9 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp) bp->lpi_tmr_hi =le32_to_cpu (resp->valid_tx_lpi_timer_high) &PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_MASK ; } - link_info->support_auto_speeds = -le16_to_cpu (resp->supported_speeds_auto_mode); +if (resp->supported_speeds_auto_mode) + link_info->support_auto_speeds = +le16_to_cpu (resp->supported_speeds_auto_mode); hwrm_phy_qcaps_exit:mutex_unlock (&bp->hwrm_cmd_lock);
drivers/net/ethernet/broadcom/genet/bcmgenet.c +118 -50
307 lines not on this page · raw message
drivers/net/ethernet/broadcom/genet/bcmgenet.h +11 -5
@@ -1,5 +1,5 @@/* -* Copyright (c) 2014 Broadcom Corporation +* Copyright (c) 2014-2017 Broadcom * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -214,7 +214,9 @@ struct bcmgenet_mib_counters {#define MDIO_REG_SHIFT 16#define MDIO_REG_MASK 0x1F -#define UMAC_RBUF_OVFL_CNT 0x61C +#define UMAC_RBUF_OVFL_CNT_V1 0x61C +#define RBUF_OVFL_CNT_V2 0x80 +#define RBUF_OVFL_CNT_V3PLUS 0x94#define UMAC_MPD_CTRL 0x620#define MPD_EN (1 << 0)
@@ -224,7 +226,9 @@ struct bcmgenet_mib_counters {#define UMAC_MPD_PW_MS 0x624#define UMAC_MPD_PW_LS 0x628 -#define UMAC_RBUF_ERR_CNT 0x634 +#define UMAC_RBUF_ERR_CNT_V1 0x634 +#define RBUF_ERR_CNT_V2 0x84 +#define RBUF_ERR_CNT_V3PLUS 0x98#define UMAC_MDF_ERR_CNT 0x638#define UMAC_MDF_CTRL 0x650#define UMAC_MDF_ADDR 0x654
@@ -619,11 +623,13 @@ struct bcmgenet_priv {struct work_struct bcmgenet_irq_work;int irq0;int irq1; -unsigned int irq0_stat; -unsigned int irq1_stat;int wol_irq;bool wol_irq_disabled; +/* shared status */ +spinlock_t lock; +unsigned int irq0_stat; +/* HW descriptors/checksum variables */ bool desc_64b_en;bool desc_rxchk_en;
drivers/net/ethernet/mellanox/mlx4/cmd.c +11 -0
@@ -2304,6 +2304,17 @@ static int sync_toggles(struct mlx4_dev *dev) rd_toggle =swab32 (readl (&priv->mfunc.comm->slave_read));if (wr_toggle ==0xffffffff || rd_toggle ==0xffffffff ) {/* PCI might be offline */ + +/* If device removal has been requested, +* do not continue retrying. +*/ +if (dev->persist->interface_state & +MLX4_INTERFACE_STATE_NOWAIT ) { +mlx4_warn (dev, +"communication channel is offline\n" ); +return -EIO ; + } +msleep (100 ); wr_toggle =swab32 (readl (&priv->mfunc.comm-> slave_write));
drivers/net/ethernet/mellanox/mlx4/main.c +11 -0
@@ -1940,6 +1940,14 @@ static int mlx4_comm_check_offline(struct mlx4_dev *dev) (u32)(1 << COMM_CHAN_OFFLINE_OFFSET));if (!offline_bit)return 0 ; + +/* If device removal has been requested, +* do not continue retrying. +*/ +if (dev->persist->interface_state & +MLX4_INTERFACE_STATE_NOWAIT ) +break ; +/* There are cases as part of AER/Reset flow that PF needs * around 100 msec to load. We therefore sleep for 100 msec * to allow other tasks to make use of that CPU during this
@@ -3954,6 +3962,9 @@ static void mlx4_remove_one(struct pci_dev *pdev)struct devlink *devlink =priv_to_devlink (priv);int active_vfs =0 ; +if (mlx4_is_slave (dev)) + persist->interface_state |=MLX4_INTERFACE_STATE_NOWAIT ; +mutex_lock (&persist->interface_state_mutex); persist->interface_state |=MLX4_INTERFACE_STATE_DELETION ;mutex_unlock (&persist->interface_state_mutex);
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +1 -1
@@ -1015,7 +1015,7 @@ static struct mlx5_flow_group *create_autogroup(struct mlx5_flow_table *ft, u32 *match_criteria) {int inlen =MLX5_ST_SZ_BYTES (create_flow_group_in); -struct list_head *prev = ft->node.children.prev; +struct list_head *prev = &ft->node.children;unsigned int candidate_index =0 ;struct mlx5_flow_group *fg;void *match_criteria_addr;
drivers/net/ethernet/mellanox/mlx5/core/main.c +3 -2
@@ -1283,6 +1283,7 @@ static int init_one(struct pci_dev *pdev,if (err) goto clean_load; +pci_save_state (pdev);return 0 ; clean_load:
@@ -1331,9 +1332,8 @@ static pci_ers_result_t mlx5_pci_err_detected(struct pci_dev *pdev,mlx5_enter_error_state (dev);mlx5_unload_one (dev, priv, false); -/* In case of kernel call save the pci state and drain the health wq */ +/* In case of kernel call drain the health wq */ if (state) { -pci_save_state (pdev);mlx5_drain_health_wq (dev);mlx5_pci_disable_device (dev); }
@@ -1385,6 +1385,7 @@ static pci_ers_result_t mlx5_pci_slot_reset(struct pci_dev *pdev)pci_set_master (pdev);pci_restore_state (pdev); +pci_save_state (pdev);if (wait_vital (pdev)) {dev_err (&pdev->dev,"%s: wait_vital timed out\n" , __func__);
drivers/net/ethernet/mellanox/mlxsw/reg.h +2 -2
@@ -788,7 +788,7 @@ static inline void mlxsw_reg_spvid_pack(char *payload, u8 local_port, u16 pvid)#define MLXSW_REG_SPVM_ID 0x200F#define MLXSW_REG_SPVM_BASE_LEN 0x04/* base length, without records */ #define MLXSW_REG_SPVM_REC_LEN 0x04/* record length */ -#define MLXSW_REG_SPVM_REC_MAX_COUNT 256 +#define MLXSW_REG_SPVM_REC_MAX_COUNT 255#define MLXSW_REG_SPVM_LEN (MLXSW_REG_SPVM_BASE_LEN + \ MLXSW_REG_SPVM_REC_LEN * MLXSW_REG_SPVM_REC_MAX_COUNT)
@@ -1757,7 +1757,7 @@ static inline void mlxsw_reg_sfmr_pack(char *payload,#define MLXSW_REG_SPVMLR_ID 0x2020#define MLXSW_REG_SPVMLR_BASE_LEN 0x04/* base length, without records */ #define MLXSW_REG_SPVMLR_REC_LEN 0x04/* record length */ -#define MLXSW_REG_SPVMLR_REC_MAX_COUNT 256 +#define MLXSW_REG_SPVMLR_REC_MAX_COUNT 255#define MLXSW_REG_SPVMLR_LEN (MLXSW_REG_SPVMLR_BASE_LEN + \ MLXSW_REG_SPVMLR_REC_LEN * \ MLXSW_REG_SPVMLR_REC_MAX_COUNT)
drivers/net/ethernet/qlogic/qed/qed_cxt.c +2 -1
@@ -373,8 +373,9 @@ static void qed_cxt_set_proto_cid_count(struct qed_hwfn *p_hwfn,u32 page_sz = p_mgr->clients[ILT_CLI_CDUC ].p_size.val;u32 cxt_size =CONN_CXT_SIZE (p_hwfn);u32 elems_per_page =ILT_PAGE_IN_BYTES (page_sz) / cxt_size; +u32 align = elems_per_page *DQ_RANGE_ALIGN ; - p_conn->cid_count =roundup (p_conn->cid_count, elems_per_page); + p_conn->cid_count =roundup (p_conn->cid_count, align); } }
drivers/net/ethernet/qlogic/qed/qed_ll2.c +7 -4
@@ -187,6 +187,8 @@ static void qed_ll2b_complete_rx_packet(struct qed_hwfn *p_hwfn,/* If need to reuse or there's no replacement buffer, repost this */ if (rc) goto out_post; +dma_unmap_single (&cdev->pdev->dev, buffer->phys_addr, + cdev->ll2->rx_size,DMA_FROM_DEVICE ); skb =build_skb (buffer->data,0 );if (!skb) {
@@ -441,7 +443,7 @@ qed_ll2_rxq_completion_gsi(struct qed_hwfn *p_hwfn,static int qed_ll2_rxq_completion_reg (struct qed_hwfn *p_hwfn,struct qed_ll2_info *p_ll2_conn,union core_rx_cqe_union *p_cqe, -unsigned long lock_flags, +unsigned long *p_lock_flags,bool b_last_cqe) {struct qed_ll2_rx_queue *p_rx = &p_ll2_conn->rx_queue;
@@ -462,10 +464,10 @@ static int qed_ll2_rxq_completion_reg(struct qed_hwfn *p_hwfn, "Mismatch between active_descq and the LL2 Rx chain\n");list_add_tail (&p_pkt->list_entry, &p_rx->free_descq); -spin_unlock_irqrestore (&p_rx->lock, lock_flags); +spin_unlock_irqrestore (&p_rx->lock, *p_lock_flags);qed_ll2b_complete_rx_packet (p_hwfn, p_ll2_conn->my_id, p_pkt, &p_cqe->rx_cqe_fp, b_last_cqe); -spin_lock_irqsave (&p_rx->lock, lock_flags); +spin_lock_irqsave (&p_rx->lock, *p_lock_flags);return 0 ; }
@@ -505,7 +507,8 @@ static int qed_ll2_rxq_completion(struct qed_hwfn *p_hwfn, void *cookie)break ;case CORE_RX_CQE_TYPE_REGULAR : rc =qed_ll2_rxq_completion_reg (p_hwfn, p_ll2_conn, - cqe, flags, b_last_cqe); + cqe, &flags, + b_last_cqe);break ;default : rc = -EIO ;
drivers/net/ethernet/sfc/ef10.c +1 -1
@@ -4967,7 +4967,7 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx)* MCFW do not support VFs. */ rc =efx_ef10_vport_set_mac_address (efx); - }else { + }else if (rc) {efx_mcdi_display_error (efx,MC_CMD_VADAPTOR_SET_MAC ,sizeof (inbuf),NULL ,0 , rc); }
drivers/net/fjes/fjes_main.c +1 -1
@@ -1277,7 +1277,7 @@ static void fjes_netdev_setup(struct net_device *netdev)fjes_set_ethtool_ops (netdev); netdev->mtu = fjes_support_mtu[3 ]; netdev->flags |=IFF_BROADCAST ; - netdev->features |=NETIF_F_HW_CSUM |NETIF_F_HW_VLAN_CTAG_FILTER ; + netdev->features |=NETIF_F_HW_VLAN_CTAG_FILTER ; }static void fjes_irq_watch_task (struct work_struct *work)
drivers/net/macvlan.c +1 -1
@@ -452,7 +452,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) struct macvlan_dev, list); else vlan =macvlan_hash_lookup (port, eth->h_dest); -if (vlan ==NULL ) +if (!vlan || vlan->mode ==MACVLAN_MODE_SOURCE )return RX_HANDLER_PASS ; dev = vlan->dev;
drivers/net/ppp/ppp_generic.c +1 -0
@@ -958,6 +958,7 @@ static __net_exit void ppp_exit_net(struct net *net)unregister_netdevice_many (&list);rtnl_unlock (); +mutex_destroy (&pn->all_ppp_mutex);idr_destroy (&pn->units_idr); }
drivers/net/wimax/i2400m/usb.c +3 -0
@@ -467,6 +467,9 @@ int i2400mu_probe(struct usb_interface *iface,struct i2400mu *i2400mu;struct usb_device *usb_dev =interface_to_usbdev (iface); +if (iface->cur_altsetting->desc.bNumEndpoints <4 ) +return -ENODEV ; +if (usb_dev->speed !=USB_SPEED_HIGH )dev_err (dev,"device not connected as high speed\n" );
drivers/net/wireless/ath/ath9k/tx99.c +5 -0
@@ -179,6 +179,9 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,ssize_t len;int r; +if (count <1 ) +return -EINVAL ; +if (sc->cur_chan->nvifs >1 )return -EOPNOTSUPP ;
@@ -186,6 +189,8 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,if (copy_from_user (buf, user_buf, len))return -EFAULT ; + buf[len] ='\0' ; +if (strtobool (buf, &start))return -EINVAL ;
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +3 -2
@@ -2320,7 +2320,7 @@ iwl_mvm_mac_release_buffered_frames(struct ieee80211_hw *hw, {struct iwl_mvm *mvm =IWL_MAC80211_GET_MVM (hw); -/* Called when we need to transmit (a) frame(s) from agg queue */ +/* Called when we need to transmit (a) frame(s) from agg or dqa queue */ iwl_mvm_sta_modify_sleep_tx_count (mvm, sta, reason, num_frames, tids, more_data, true);
@@ -2340,7 +2340,8 @@ static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,for (tid =0 ; tid <IWL_MAX_TID_COUNT ; tid++) {struct iwl_mvm_tid_data *tid_data = &mvmsta->tid_data[tid]; -if (tid_data->state !=IWL_AGG_ON && +if (!iwl_mvm_is_dqa_supported (mvm) && + tid_data->state !=IWL_AGG_ON && tid_data->state !=IWL_EMPTYING_HW_QUEUE_DELBA )continue ;
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +6 -5
@@ -3032,7 +3032,7 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,struct ieee80211_sta *sta, enum ieee80211_frame_release_type reason, u16 cnt, u16 tids, bool more_data, - bool agg) + bool single_sta_queue) { struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta); struct iwl_mvm_add_sta_cmd cmd = {
@@ -3052,14 +3052,14 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,for_each_set_bit (tid, &_tids,IWL_MAX_TID_COUNT ) cmd.awake_acs |=BIT (tid_to_ucode_ac[tid]); -/* If we're releasing frames from aggregation queues then check if the -* all queues combined that we're releasing frames from have +/* If we're releasing frames from aggregation or dqa queues then check +* if all the queues that we're releasing frames from, combined, have: * - more frames than the service period, in which case more_data * needs to be set * - fewer than 'cnt' frames, in which case we need to adjust the * firmware command (but do that unconditionally) */ -if (agg) { +if (single_sta_queue) {int remaining = cnt;int sleep_tx_count;
@@ -3069,7 +3069,8 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,u16 n_queued; tid_data = &mvmsta->tid_data[tid]; -if (WARN (tid_data->state !=IWL_AGG_ON && +if (WARN (!iwl_mvm_is_dqa_supported (mvm) && + tid_data->state !=IWL_AGG_ON && tid_data->state !=IWL_EMPTYING_HW_QUEUE_DELBA ,"TID %d state is %d\n" , tid, tid_data->state)) {
drivers/net/wireless/intel/iwlwifi/mvm/sta.h +1 -1
@@ -545,7 +545,7 @@ void iwl_mvm_sta_modify_sleep_tx_count(struct iwl_mvm *mvm,struct ieee80211_sta *sta, enum ieee80211_frame_release_type reason, u16 cnt, u16 tids, bool more_data, - bool agg); + bool single_sta_queue);int iwl_mvm_drain_sta (struct iwl_mvm *mvm,struct iwl_mvm_sta *mvmsta,bool drain); void iwl_mvm_sta_modify_disable_tx(struct iwl_mvm *mvm,
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +18 -23
101 lines not on this page · raw message
drivers/nvme/host/core.c +2 -1
@@ -1619,7 +1619,8 @@ static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid)mutex_lock (&ctrl->namespaces_mutex);list_for_each_entry (ns, &ctrl->namespaces, list) {if (ns->ns_id == nsid) { -kref_get (&ns->kref); +if (!kref_get_unless_zero (&ns->kref)) +continue ; ret = ns;break ; }
drivers/nvme/target/core.c +10 -1
@@ -422,6 +422,13 @@ void nvmet_sq_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq, ctrl->sqs[qid] = sq; } +static void nvmet_confirm_sq (struct percpu_ref *ref) +{ + struct nvmet_sq *sq = container_of(ref, struct nvmet_sq, ref); + +complete (&sq->confirm_done); +} +void nvmet_sq_destroy (struct nvmet_sq *sq) {/*
@@ -430,7 +437,8 @@ void nvmet_sq_destroy(struct nvmet_sq *sq)*/ if (sq->ctrl && sq->ctrl->sqs && sq->ctrl->sqs[0 ] == sq)nvmet_async_events_free (sq->ctrl); -percpu_ref_kill (&sq->ref); +percpu_ref_kill_and_confirm (&sq->ref, nvmet_confirm_sq); +wait_for_completion (&sq->confirm_done);wait_for_completion (&sq->free_done);percpu_ref_exit (&sq->ref);
@@ -458,6 +466,7 @@ int nvmet_sq_init(struct nvmet_sq *sq)return ret; }init_completion (&sq->free_done); +init_completion (&sq->confirm_done);return 0 ; }
drivers/nvme/target/loop.c +1 -1
@@ -288,9 +288,9 @@ static struct blk_mq_ops nvme_loop_admin_mq_ops = {static void nvme_loop_destroy_admin_queue (struct nvme_loop_ctrl *ctrl) { +nvmet_sq_destroy (&ctrl->queues[0 ].nvme_sq);blk_cleanup_queue (ctrl->ctrl.admin_q);blk_mq_free_tag_set (&ctrl->admin_tag_set); -nvmet_sq_destroy (&ctrl->queues[0 ].nvme_sq); }static void nvme_loop_free_ctrl (struct nvme_ctrl *nctrl)
drivers/nvme/target/nvmet.h +1 -0
@@ -73,6 +73,7 @@ struct nvmet_sq {u16 qid;u16 size;struct completion free_done; +struct completion confirm_done; };/**
drivers/nvme/target/rdma.c +3 -5
@@ -703,11 +703,6 @@ static void nvmet_rdma_handle_command(struct nvmet_rdma_queue *queue, {u16 status; - cmd->queue = queue; - cmd->n_rdma =0 ; - cmd->req.port = queue->port; - -ib_dma_sync_single_for_cpu (queue->dev->device, cmd->cmd->sge[0 ].addr, cmd->cmd->sge[0 ].length,DMA_FROM_DEVICE );
@@ -760,9 +755,12 @@ static void nvmet_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc) cmd->queue = queue; rsp =nvmet_rdma_get_rsp (queue); + rsp->queue = queue; rsp->cmd = cmd; rsp->flags =0 ; rsp->req.cmd = cmd->nvme_cmd; + rsp->req.port = queue->port; + rsp->n_rdma =0 ;if (unlikely (queue->state !=NVMET_RDMA_Q_LIVE )) {unsigned long flags;
drivers/pci/pcie/pme.c +4 -1
@@ -232,6 +232,9 @@ static void pcie_pme_work_fn(struct work_struct *work)break ;pcie_capability_read_dword (port,PCI_EXP_RTSTA , &rtsta); +if (rtsta == (u32 ) ~0 ) +break ; +if (rtsta &PCI_EXP_RTSTA_PME ) {/* * Clear PME status of the port. If there are other
@@ -279,7 +282,7 @@ static irqreturn_t pcie_pme_irq(int irq, void *context)spin_lock_irqsave (&data->lock, flags);pcie_capability_read_dword (port,PCI_EXP_RTSTA , &rtsta); -if (!(rtsta &PCI_EXP_RTSTA_PME )) { +if (rtsta == (u32 ) ~0 || !(rtsta &PCI_EXP_RTSTA_PME )) {spin_unlock_irqrestore (&data->lock, flags);return IRQ_NONE ; }
drivers/pci/probe.c +6 -1
@@ -932,7 +932,8 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) child =pci_add_new_bus (bus, dev, max+1 );if (!child) goto out; -pci_bus_insert_busn_res (child, max+1 ,0xff ); +pci_bus_insert_busn_res (child, max+1 , + bus->busn_res.end); } max++; buses = (buses &0xff000000 )
@@ -2136,6 +2137,10 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)if (bus->self && bus->self->is_hotplug_bridge && pci_hotplug_bus_size) {if (max - bus->busn_res.start < pci_hotplug_bus_size -1 ) max = bus->busn_res.start + pci_hotplug_bus_size -1 ; + +/* Do not allocate more buses than we have room left */ +if (max > bus->busn_res.end) + max = bus->busn_res.end; }/*
drivers/pci/remove.c +1 -1
@@ -19,9 +19,9 @@ static void pci_stop_dev(struct pci_dev *dev)pci_pme_active (dev, false);if (dev->is_added) { +device_release_driver (&dev->dev);pci_proc_detach_device (dev);pci_remove_sysfs_dev_files (dev); -device_release_driver (&dev->dev); dev->is_added =0 ; }
drivers/pinctrl/Kconfig +2 -1
@@ -26,7 +26,8 @@ config DEBUG_PINCTRL config PINCTRL_ADI2 bool "ADI pin controller driver" - depends on BLACKFIN + depends on (BF54x || BF60x) + depends on !GPIO_ADI select PINMUX select IRQ_DOMAIN help
drivers/platform/x86/hp_accel.c +1 -0
@@ -240,6 +240,7 @@ static const struct dmi_system_id lis3lv02d_dmi_ids[] = {AXIS_DMI_MATCH ("HDX18" ,"HP HDX 18" , x_inverted),AXIS_DMI_MATCH ("HPB432x" ,"HP ProBook 432" , xy_rotated_left),AXIS_DMI_MATCH ("HPB440G3" ,"HP ProBook 440 G3" , x_inverted_usd), +AXIS_DMI_MATCH ("HPB440G4" ,"HP ProBook 440 G4" , x_inverted),AXIS_DMI_MATCH ("HPB442x" ,"HP ProBook 442" , xy_rotated_left),AXIS_DMI_MATCH ("HPB452x" ,"HP ProBook 452" , y_inverted), AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap),
drivers/platform/x86/intel_punit_ipc.c +4 -4
@@ -252,28 +252,28 @@ static int intel_punit_get_bars(struct platform_device *pdev)* - GTDRIVER_IPC BASE_IFACE */ res =platform_get_resource (pdev,IORESOURCE_MEM ,2 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[ISPDRIVER_IPC ][BASE_DATA ] = addr; } res =platform_get_resource (pdev,IORESOURCE_MEM ,3 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[ISPDRIVER_IPC ][BASE_IFACE ] = addr; } res =platform_get_resource (pdev,IORESOURCE_MEM ,4 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[GTDRIVER_IPC ][BASE_DATA ] = addr; } res =platform_get_resource (pdev,IORESOURCE_MEM ,5 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[GTDRIVER_IPC ][BASE_IFACE ] = addr;
drivers/rtc/rtc-pcf8563.c +1 -1
@@ -422,7 +422,7 @@ static unsigned long pcf8563_clkout_recalc_rate(struct clk_hw *hw,return 0 ; buf &=PCF8563_REG_CLKO_F_MASK ; -return clkout_rates[ret]; +return clkout_rates[buf]; } static long pcf8563_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
drivers/scsi/bfa/bfad_debugfs.c +3 -2
@@ -255,7 +255,8 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,struct bfad_s *bfad = port->bfad;struct bfa_s *bfa = &bfad->bfa;struct bfa_ioc_s *ioc = &bfa->ioc; -int addr, len, rc, i; +int addr, rc, i; +u32 len;u32 *regbuf;void __iomem *rb, *reg_addr;unsigned long flags;
@@ -266,7 +267,7 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,return PTR_ERR (kern_buf); rc =sscanf (kern_buf,"%x:%x" , &addr, &len); -if (rc <2 ) { +if (rc <2 || len > (UINT_MAX >>2 )) {printk (KERN_INFO "bfad[%d]: %s failed to read user buf\n" , bfad->inst_no, __func__);
drivers/scsi/hpsa.c +35 -24
168 lines not on this page · raw message
drivers/scsi/hpsa.h +1 -0
@@ -203,6 +203,7 @@ struct ctlr_info {dma_addr_t errinfo_pool_dhandle;unsigned long *cmd_pool_bits;int scan_finished; + u8 scan_waiting : 1;spinlock_t scan_lock;wait_queue_head_t scan_wait_queue;
drivers/scsi/hpsa_cmd.h +2 -0
@@ -156,6 +156,7 @@#define CFGTBL_BusType_Fibre2G 0x00000200l/* VPD Inquiry types */ +#define HPSA_INQUIRY_FAILED 0x02#define HPSA_VPD_SUPPORTED_PAGES 0x00#define HPSA_VPD_LV_DEVICE_ID 0x83#define HPSA_VPD_LV_DEVICE_GEOMETRY 0xC1
@@ -166,6 +167,7 @@/* Logical volume states */ #define HPSA_VPD_LV_STATUS_UNSUPPORTED 0xff#define HPSA_LV_OK 0x0 +#define HPSA_LV_FAILED 0x01#define HPSA_LV_NOT_AVAILABLE 0x0b#define HPSA_LV_UNDERGOING_ERASE 0x0F#define HPSA_LV_UNDERGOING_RPI 0x12
drivers/scsi/scsi_debug.c +3 -3
@@ -2996,11 +2996,11 @@ static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,if (-1 == ret) {write_unlock_irqrestore (&atomic_rw, iflags);return DID_ERROR <<16 ; - }else if (sdebug_verbose && (ret < (num * sdebug_sector_size))) + }else if (sdebug_verbose && !ndob && (ret < sdebug_sector_size))sdev_printk (KERN_INFO , scp->device, -"%s: %s: cdb indicated=%u, IO sent=%d bytes\n" , +"%s: %s: lb size=%u, IO sent=%d bytes\n" , my_name,"write same" , - num * sdebug_sector_size, ret); + sdebug_sector_size, ret);/* Copy first sector to remaining blocks */ for (i =1 ; i < num ; i++)
drivers/scsi/scsi_devinfo.c +1 -1
@@ -160,7 +160,7 @@ static struct { {"DGC", "RAID", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, storage on LUN 0 */ {"DGC", "DISK", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, no storage on LUN 0 */ {"EMC", "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, - {"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN}, + {"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_REPORTLUN2}, {"EMULEX", "MD21/S2 ESDI", NULL, BLIST_SINGLELUN}, {"easyRAID", "16P", NULL, BLIST_NOREPORTLUN}, {"easyRAID", "X6P", NULL, BLIST_NOREPORTLUN},
drivers/scsi/sd.c +10 -2
@@ -234,11 +234,15 @@ manage_start_stop_store(struct device *dev, struct device_attribute *attr, {struct scsi_disk *sdkp =to_scsi_disk (dev);struct scsi_device *sdp = sdkp->device; +bool v;if (!capable (CAP_SYS_ADMIN ))return -EACCES ; - sdp->manage_start_stop =simple_strtoul (buf,NULL ,10 ); +if (kstrtobool (buf, &v)) +return -EINVAL ; + + sdp->manage_start_stop = v;return count; }
@@ -256,6 +260,7 @@ static ssize_t allow_restart_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + bool v;struct scsi_disk *sdkp =to_scsi_disk (dev);struct scsi_device *sdp = sdkp->device;
@@ -265,7 +270,10 @@ allow_restart_store(struct device *dev, struct device_attribute *attr,if (sdp->type !=TYPE_DISK )return -EINVAL ; - sdp->allow_restart =simple_strtoul (buf,NULL ,10 ); +if (kstrtobool (buf, &v)) +return -EINVAL ; + + sdp->allow_restart = v;return count; }
drivers/soc/mediatek/mtk-pmic-wrap.c +1 -1
@@ -522,7 +522,7 @@ struct pmic_wrapper_type {u32 int_en_all;u32 spi_w;u32 wdt_src; - int has_bridge:1; + unsigned int has_bridge:1;int (*init_reg_clock)(struct pmic_wrapper *wrp);int (*init_soc_specific)(struct pmic_wrapper *wrp); };
drivers/staging/rtl8188eu/core/rtw_cmd.c +2 -2
@@ -342,7 +342,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)else RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n" , pmlmepriv->assoc_ssid.Ssid)); - pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL ); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_ATOMIC );if (!pcmd) { res = _FAIL; goto exit;
@@ -522,7 +522,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueuif (enqueue) {/* need enqueue, prepare cmd_obj and enqueue */ - cmdobj =kzalloc (sizeof (*cmdobj),GFP_KERNEL ); + cmdobj =kzalloc (sizeof (*cmdobj),GFP_ATOMIC );if (!cmdobj) { res = _FAIL;kfree (param);
drivers/staging/vt6655/device_main.c +2 -1
@@ -1698,10 +1698,11 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state)MACbShutdown (priv);pci_disable_device (pcid); -pci_set_power_state (pcid,pci_choose_state (pcid, state));spin_unlock_irqrestore (&priv->lock, flags); +pci_set_power_state (pcid,pci_choose_state (pcid, state)); +return 0 ; }
drivers/target/iscsi/iscsi_target.c +2 -1
@@ -841,6 +841,7 @@ static int iscsit_add_reject_from_cmd( unsigned char *buf) {struct iscsi_conn *conn; +const bool do_put = cmd->se_cmd.se_tfo !=NULL ;if (!cmd->conn) { pr_err("cmd->conn is NULL for ITT: 0x%08x\n",
@@ -871,7 +872,7 @@ static int iscsit_add_reject_from_cmd(* Perform the kref_put now if se_cmd has already been setup by * scsit_setup_scsi_cmd() */ -if (cmd->se_cmd.se_tfo !=NULL ) { +if (do_put) {pr_debug ("iscsi reject: calling target_put_sess_cmd >>>>>>\n" );target_put_sess_cmd (&cmd->se_cmd); }
drivers/target/iscsi/iscsi_target_configfs.c +2 -1
@@ -1144,7 +1144,7 @@ static struct se_portal_group *lio_target_tiqn_addtpg( ret =core_tpg_register (wwn, &tpg->tpg_se_tpg,SCSI_PROTOCOL_ISCSI );if (ret <0 ) -return NULL ; + goto free_out; ret =iscsit_tpg_add_portal_group (tiqn, tpg);if (ret !=0 )
@@ -1156,6 +1156,7 @@ static struct se_portal_group *lio_target_tiqn_addtpg(return &tpg->tpg_se_tpg; out:core_tpg_deregister (&tpg->tpg_se_tpg); +free_out:kfree (tpg);return NULL ; }
drivers/target/target_core_alua.c +8 -25
@@ -1010,7 +1010,7 @@ static void core_alua_queue_state_change_ua(struct t10_alua_tg_pt_gp *tg_pt_gp)static void core_alua_do_transition_tg_pt_work (struct work_struct *work) {struct t10_alua_tg_pt_gp *tg_pt_gp =container_of (work, - struct t10_alua_tg_pt_gp, tg_pt_gp_transition_work.work); + struct t10_alua_tg_pt_gp, tg_pt_gp_transition_work);struct se_device *dev = tg_pt_gp->tg_pt_gp_dev;bool explicit = (tg_pt_gp->tg_pt_gp_alua_access_status ==ALUA_STATUS_ALTERED_BY_EXPLICIT_STPG );
@@ -1073,17 +1073,8 @@ static int core_alua_do_transition_tg_pt(/* * Flush any pending transitions */ -if (!explicit && tg_pt_gp->tg_pt_gp_implicit_trans_secs && -atomic_read (&tg_pt_gp->tg_pt_gp_alua_access_state) == -ALUA_ACCESS_STATE_TRANSITION ) { -/* Just in case */ - tg_pt_gp->tg_pt_gp_alua_pending_state = new_state; - tg_pt_gp->tg_pt_gp_transition_complete = &wait; -flush_delayed_work (&tg_pt_gp->tg_pt_gp_transition_work); -wait_for_completion (&wait); - tg_pt_gp->tg_pt_gp_transition_complete =NULL ; -return 0 ; - } +if (!explicit) +flush_work (&tg_pt_gp->tg_pt_gp_transition_work);/* * Save the old primary ALUA access state, and set the current state
@@ -1114,17 +1105,9 @@ static int core_alua_do_transition_tg_pt(atomic_inc (&tg_pt_gp->tg_pt_gp_ref_cnt);spin_unlock (&dev->t10_alua.tg_pt_gps_lock); -if (!explicit && tg_pt_gp->tg_pt_gp_implicit_trans_secs) { -unsigned long transition_tmo; - - transition_tmo = tg_pt_gp->tg_pt_gp_implicit_trans_secs *HZ ; -queue_delayed_work (tg_pt_gp->tg_pt_gp_dev->tmr_wq, - &tg_pt_gp->tg_pt_gp_transition_work, - transition_tmo); - }else { +schedule_work (&tg_pt_gp->tg_pt_gp_transition_work); +if (explicit) { tg_pt_gp->tg_pt_gp_transition_complete = &wait; -queue_delayed_work (tg_pt_gp->tg_pt_gp_dev->tmr_wq, - &tg_pt_gp->tg_pt_gp_transition_work,0 );wait_for_completion (&wait); tg_pt_gp->tg_pt_gp_transition_complete =NULL ; }
@@ -1692,8 +1675,8 @@ struct t10_alua_tg_pt_gp *core_alua_allocate_tg_pt_gp(struct se_device *dev,mutex_init (&tg_pt_gp->tg_pt_gp_md_mutex);spin_lock_init (&tg_pt_gp->tg_pt_gp_lock);atomic_set (&tg_pt_gp->tg_pt_gp_ref_cnt,0 ); -INIT_DELAYED_WORK (&tg_pt_gp->tg_pt_gp_transition_work, - core_alua_do_transition_tg_pt_work); +INIT_WORK (&tg_pt_gp->tg_pt_gp_transition_work, + core_alua_do_transition_tg_pt_work); tg_pt_gp->tg_pt_gp_dev = dev;atomic_set (&tg_pt_gp->tg_pt_gp_alua_access_state,ALUA_ACCESS_STATE_ACTIVE_OPTIMIZED );
@@ -1801,7 +1784,7 @@ void core_alua_free_tg_pt_gp( dev->t10_alua.alua_tg_pt_gps_counter--;spin_unlock (&dev->t10_alua.tg_pt_gps_lock); -flush_delayed_work (&tg_pt_gp->tg_pt_gp_transition_work); +flush_work (&tg_pt_gp->tg_pt_gp_transition_work);/* * Allow a struct t10_alua_tg_pt_gp_member * referenced by
drivers/target/target_core_file.c +4 -0
@@ -466,6 +466,10 @@ fd_execute_unmap(struct se_cmd *cmd, sector_t lba, sector_t nolb)struct inode *inode = file->f_mapping->host;int ret; +if (!nolb) { +return 0 ; + } +if (cmd->se_dev->dev_attrib.pi_prot_type) { ret =fd_do_prot_unmap (cmd, lba, nolb);if (ret)
drivers/target/target_core_pr.c +3 -1
@@ -56,8 +56,10 @@ void core_pr_dump_initiator_port( char *buf, u32 size) { -if (!pr_reg->isid_present_at_reg) +if (!pr_reg->isid_present_at_reg) { buf[0 ] ='\0' ; +return ; + }snprintf (buf, size,",i,0x%s" , pr_reg->pr_reg_isid); }
drivers/thermal/step_wise.c +6 -5
@@ -31,8 +31,7 @@* If the temperature is higher than a trip point, * a. if the trend is THERMAL_TREND_RAISING, use higher cooling * state for this trip point -* b. if the trend is THERMAL_TREND_DROPPING, use lower cooling -* state for this trip point +* b. if the trend is THERMAL_TREND_DROPPING, do nothing * c. if the trend is THERMAL_TREND_RAISE_FULL, use upper limit * for this trip point * d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit
@@ -94,9 +93,11 @@ static unsigned long get_target_state(struct thermal_instance *instance,if (!throttle) next_target =THERMAL_NO_TARGET ; }else { - next_target = cur_state -1 ; -if (next_target > instance->upper) - next_target = instance->upper; +if (!throttle) { + next_target = cur_state -1 ; +if (next_target > instance->upper) + next_target = instance->upper; + } }break ;case THERMAL_TREND_DROP_FULL :
drivers/tty/tty_ldisc.c +21 -71
152 lines not on this page · raw message
drivers/usb/core/config.c +3 -1
@@ -550,6 +550,9 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,unsigned iad_num =0 ;memcpy (&config->desc, buffer,USB_DT_CONFIG_SIZE ); + nintf = nintf_orig = config->desc.bNumInterfaces; + config->desc.bNumInterfaces =0 ;// Adjusted later +if (config->desc.bDescriptorType !=USB_DT_CONFIG || config->desc.bLength <USB_DT_CONFIG_SIZE || config->desc.bLength > size) {
@@ -563,7 +566,6 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, buffer += config->desc.bLength; size -= config->desc.bLength; - nintf = nintf_orig = config->desc.bNumInterfaces;if (nintf >USB_MAXINTERFACES ) { dev_warn(ddev, "config %d has too many interfaces: %d, " "using maximum allowed: %d\n",
drivers/usb/host/xhci-mem.c +11 -4
@@ -1032,10 +1032,9 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,return 0 ; } - xhci->devs[slot_id] =kzalloc (sizeof (*xhci->devs[slot_id]), flags); -if (!xhci->devs[slot_id]) + dev =kzalloc (sizeof (*dev), flags); +if (!dev)return 0 ; - dev = xhci->devs[slot_id];/* Allocate the (output) device context that will be used in the HC. */ dev->out_ctx =xhci_alloc_container_ctx (xhci,XHCI_CTX_TYPE_DEVICE , flags);
@@ -1083,9 +1082,17 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, &xhci->dcbaa->dev_context_ptrs[slot_id], le64_to_cpu(xhci->dcbaa->dev_context_ptrs[slot_id])); + xhci->devs[slot_id] = dev; +return 1 ; fail: -xhci_free_virt_device (xhci, slot_id); + +if (dev->in_ctx) +xhci_free_container_ctx (xhci, dev->in_ctx); +if (dev->out_ctx) +xhci_free_container_ctx (xhci, dev->out_ctx); +kfree (dev); +return 0 ; }
drivers/usb/host/xhci-mtk.c +3 -3
@@ -632,13 +632,13 @@ static int xhci_mtk_probe(struct platform_device *pdev) goto power_off_phys; } -if (HCC_MAX_PSA (xhci->hcc_params) >=4 ) - xhci->shared_hcd->can_do_streams =1 ; - ret =usb_add_hcd (hcd, irq,IRQF_SHARED );if (ret) goto put_usb3_hcd; +if (HCC_MAX_PSA (xhci->hcc_params) >=4 ) + xhci->shared_hcd->can_do_streams =1 ; + ret =usb_add_hcd (xhci->shared_hcd, irq,IRQF_SHARED );if (ret) goto dealloc_usb2_hcd;
drivers/usb/host/xhci-ring.c +3 -3
@@ -3132,7 +3132,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, {u32 maxp, total_packet_count; -/* MTK xHCI is mostly 0.97 but contains some features from 1.0 */ +/* MTK xHCI 0.96 contains some features from 1.0 */ if (xhci->hci_version <0x100 && !(xhci->quirks &XHCI_MTK_HOST ))return ((td_total_len - transferred) >>10 );
@@ -3141,8 +3141,8 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, trb_buff_len == td_total_len)return 0 ; -/* for MTK xHCI, TD size doesn't include this TRB */ -if (xhci->quirks &XHCI_MTK_HOST ) +/* for MTK xHCI 0.96, TD size include this TRB, but not in 1.x */ +if ((xhci->quirks &XHCI_MTK_HOST ) && (xhci->hci_version <0x100 )) trb_buff_len =0 ; maxp =GET_MAX_PACKET (usb_endpoint_maxp (&urb->ep->desc));
drivers/usb/musb/da8xx.c +9 -1
@@ -302,7 +302,15 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) musb->xceiv->otg->state =OTG_STATE_A_WAIT_VRISE ;portstate (musb->port1_status |=USB_PORT_STAT_POWER );del_timer (&otg_workaround); - }else { + }else if (!(musb->int_usb &MUSB_INTR_BABBLE )){ +/* +* When babble condition happens, drvvbus interrupt +* is also generated. Ignore this drvvbus interrupt +* and let babble interrupt handler recovers the +* controller; otherwise, the host-mode flag is lost +* due to the MUSB_DEV_MODE() call below and babble +* recovery logic will not called. +*/ musb->is_active =0 ;MUSB_DEV_MODE (musb); otg->default_a =0 ;
drivers/usb/phy/phy-isp1301.c +7 -0
@@ -33,6 +33,12 @@ static const struct i2c_device_id isp1301_id[] = { };MODULE_DEVICE_TABLE (i2c, isp1301_id); +static const struct of_device_id isp1301_of_match[] = { + {.compatible ="nxp,isp1301" }, + { }, +}; +MODULE_DEVICE_TABLE (of, isp1301_of_match); +static struct i2c_client *isp1301_i2c_client;static int __isp1301_write (struct isp1301 *isp,u8 reg,u8 value,u8 clear)
@@ -130,6 +136,7 @@ static int isp1301_remove(struct i2c_client *client)static struct i2c_driver isp1301_driver = { .driver = { .name =DRV_NAME , + .of_match_table =of_match_ptr (isp1301_of_match), }, .probe = isp1301_probe, .remove = isp1301_remove,
drivers/usb/storage/unusual_devs.h +7 -0
@@ -2113,6 +2113,13 @@ UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0116, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BROKEN_FUA ), +/* Reported by David Kozub <[email protected]> */ +UNUSUAL_DEV (0x152d ,0x0578 ,0x0000 ,0x9999 , +"JMicron" , +"JMS567" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , + US_FL_BROKEN_FUA), +/* * Reported by Alexandre Oliva <[email protected]> * JMicron responds to USN and several other SCSI ioctls with a
drivers/usb/storage/unusual_uas.h +7 -0
@@ -142,6 +142,13 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BROKEN_FUA | US_FL_NO_REPORT_OPCODES), +/* Reported-by: David Kozub <[email protected]> */ +UNUSUAL_DEV (0x152d ,0x0578 ,0x0000 ,0x9999 , +"JMicron" , +"JMS567" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_BROKEN_FUA ), +/* Reported-by: Hans de Goede <[email protected]> */ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA",
drivers/usb/usbip/stub_rx.c +41 -10
93 lines not on this page · raw message
drivers/usb/usbip/stub_tx.c +7 -0
@@ -181,6 +181,13 @@ static int stub_send_ret_submit(struct stub_device *sdev)memset (&pdu_header,0 ,sizeof (pdu_header));memset (&msg,0 ,sizeof (msg)); +if (urb->actual_length >0 && !urb->transfer_buffer) { +dev_err (&sdev->udev->dev, +"urb: actual_length %d transfer_buffer null\n" , + urb->actual_length); +return -1 ; + } +if (usb_pipetype (urb->pipe) ==PIPE_ISOCHRONOUS ) iovnum =2 + urb->number_of_packets;else
drivers/video/fbdev/au1200fb.c +5 -2
@@ -1681,8 +1681,10 @@ static int au1200fb_drv_probe(struct platform_device *dev) fbi =framebuffer_alloc (sizeof (struct au1200fb_device ), &dev->dev); -if (!fbi) +if (!fbi) { + ret = -ENOMEM ; goto failed; + } _au1200fb_infos[plane] = fbi; fbdev = fbi->par;
@@ -1700,7 +1702,8 @@ static int au1200fb_drv_probe(struct platform_device *dev)if (!fbdev->fb_mem) {print_err ("fail to allocate frambuffer (size: %dK))" , fbdev->fb_len /1024 ); -return -ENOMEM ; + ret = -ENOMEM ; + goto failed; }/*
drivers/video/fbdev/controlfb.h +2 -0
@@ -141,5 +141,7 @@ static struct max_cmodes control_mac_modes[] = { {{ 1, 2}}, /* 1152x870, 75Hz */ {{ 0, 1}}, /* 1280x960, 75Hz */ {{ 0, 1}}, /* 1280x1024, 75Hz */ + {{ 1, 2}}, /* 1152x768, 60Hz */ + {{ 0, 1}}, /* 1600x1024, 60Hz */ };
drivers/video/fbdev/udlfb.c +5 -5
@@ -769,11 +769,11 @@ static int dlfb_get_edid(struct dlfb_data *dev, char *edid, int len)for (i =0 ; i < len; i++) { ret =usb_control_msg (dev->udev, -usb_rcvctrlpipe (dev->udev,0 ), (0x02 ), - (0x80 | (0x02 <<5 )), i <<8 ,0xA1 , rbuf,2 , -HZ ); -if (ret <1 ) { -pr_err ("Read EDID byte %d failed err %x\n" , i, ret); +usb_rcvctrlpipe (dev->udev,0 ),0x02 , + (0x80 | (0x02 <<5 )), i <<8 ,0xA1 , + rbuf,2 ,USB_CTRL_GET_TIMEOUT ); +if (ret <2 ) { +pr_err ("Read EDID byte %d failed: %d\n" , i, ret); i--;break ; }
fs/afs/callback.c +4 -3
@@ -362,7 +362,7 @@ static void afs_callback_updater(struct work_struct *work) {struct afs_server *server;struct afs_vnode *vnode, *xvnode; -time_t now; +time64_t now;long timeout;int ret;
@@ -370,7 +370,7 @@ static void afs_callback_updater(struct work_struct *work)_enter ("" ); - now =get_seconds (); + now =ktime_get_real_seconds ();/* find the first vnode to update */ spin_lock (&server->cb_lock);
@@ -424,7 +424,8 @@ static void afs_callback_updater(struct work_struct *work)/* and then reschedule */ _debug ("reschedule" ); - vnode->update_at =get_seconds () + afs_vnode_update_timeout; + vnode->update_at =ktime_get_real_seconds () + + afs_vnode_update_timeout;spin_lock (&server->cb_lock);
fs/afs/cmservice.c +5 -6
@@ -168,7 +168,6 @@ static int afs_deliver_cb_callback(struct afs_call *call)struct afs_callback *cb;struct afs_server *server;__be32 *bp; -u32 tmp;int ret, loop;_enter ("{%u}" , call->unmarshall);
@@ -230,9 +229,9 @@ static int afs_deliver_cb_callback(struct afs_call *call)if (ret <0 )return ret; - tmp =ntohl (call->tmp); -_debug ("CB count: %u" , tmp); -if (tmp != call->count && tmp !=0 ) + call->count2 =ntohl (call->tmp); +_debug ("CB count: %u" , call->count2); +if (call->count2 != call->count && call->count2 !=0 )return -EBADMSG ; call->offset =0 ; call->unmarshall++;
@@ -240,14 +239,14 @@ static int afs_deliver_cb_callback(struct afs_call *call)case 4 :_debug ("extract CB array" ); ret =afs_extract_data (call, call->buffer, - call->count *3 *4 , false); + call->count2 *3 *4 , false);if (ret <0 )return ret;_debug ("unmarshall CB array" ); cb = call->request; bp = call->buffer; -for (loop = call->count; loop >0 ; loop--, cb++) { +for (loop = call->count2; loop >0 ; loop--, cb++) { cb->version =ntohl (*bp++); cb->expiry =ntohl (*bp++); cb->type =ntohl (*bp++);
fs/afs/file.c +1 -0
@@ -29,6 +29,7 @@ static int afs_readpages(struct file *filp, struct address_space *mapping,const struct file_operations afs_file_operations = { .open = afs_open, + .flush = afs_flush, .release = afs_release, .llseek = generic_file_llseek, .read_iter = generic_file_read_iter,
fs/afs/fsclient.c +11 -11
@@ -105,7 +105,7 @@ static void xdr_decode_AFSFetchStatus(const __be32 **_bp, vnode->vfs_inode.i_mode = mode; } - vnode->vfs_inode.i_ctime.tv_sec = status->mtime_server; + vnode->vfs_inode.i_ctime.tv_sec = status->mtime_client; vnode->vfs_inode.i_mtime = vnode->vfs_inode.i_ctime; vnode->vfs_inode.i_atime = vnode->vfs_inode.i_ctime; vnode->vfs_inode.i_version = data_version;
@@ -139,7 +139,7 @@ static void xdr_decode_AFSCallBack(const __be32 **_bp, struct afs_vnode *vnode) vnode->cb_version =ntohl (*bp++); vnode->cb_expiry =ntohl (*bp++); vnode->cb_type =ntohl (*bp++); - vnode->cb_expires = vnode->cb_expiry +get_seconds (); + vnode->cb_expires = vnode->cb_expiry +ktime_get_real_seconds (); *_bp = bp; }
@@ -676,8 +676,8 @@ int afs_fs_create(struct afs_server *server,memset (bp,0 , padsz); bp = (void *) bp + padsz; } - *bp++ =htonl (AFS_SET_MODE ); - *bp++ =0 ;/* mtime */ + *bp++ =htonl (AFS_SET_MODE |AFS_SET_MTIME ); + *bp++ =htonl (vnode->vfs_inode.i_mtime.tv_sec);/* mtime */ *bp++ =0 ;/* owner */ *bp++ =0 ;/* group */ *bp++ =htonl (mode &S_IALLUGO );/* unix mode */
@@ -945,8 +945,8 @@ int afs_fs_symlink(struct afs_server *server,memset (bp,0 , c_padsz); bp = (void *) bp + c_padsz; } - *bp++ =htonl (AFS_SET_MODE ); - *bp++ =0 ;/* mtime */ + *bp++ =htonl (AFS_SET_MODE |AFS_SET_MTIME ); + *bp++ =htonl (vnode->vfs_inode.i_mtime.tv_sec);/* mtime */ *bp++ =0 ;/* owner */ *bp++ =0 ;/* group */ *bp++ =htonl (S_IRWXUGO );/* unix mode */
@@ -1145,8 +1145,8 @@ static int afs_fs_store_data64(struct afs_server *server, *bp++ =htonl (vnode->fid.vnode); *bp++ =htonl (vnode->fid.unique); - *bp++ =0 ;/* mask */ - *bp++ =0 ;/* mtime */ + *bp++ =htonl (AFS_SET_MTIME );/* mask */ + *bp++ =htonl (vnode->vfs_inode.i_mtime.tv_sec);/* mtime */ *bp++ =0 ;/* owner */ *bp++ =0 ;/* group */ *bp++ =0 ;/* unix mode */
@@ -1178,7 +1178,7 @@ int afs_fs_store_data(struct afs_server *server, struct afs_writeback *wb,_enter (",%x,{%x:%u},," ,key_serial (wb->key), vnode->fid.vid, vnode->fid.vnode); - size = to - offset; + size = (loff_t )to - (loff_t )offset;if (first != last) size += (loff_t)(last - first) <<PAGE_SHIFT ; pos = (loff_t )first <<PAGE_SHIFT ;
@@ -1222,8 +1222,8 @@ int afs_fs_store_data(struct afs_server *server, struct afs_writeback *wb, *bp++ =htonl (vnode->fid.vnode); *bp++ =htonl (vnode->fid.unique); - *bp++ =0 ;/* mask */ - *bp++ =0 ;/* mtime */ + *bp++ =htonl (AFS_SET_MTIME );/* mask */ + *bp++ =htonl (vnode->vfs_inode.i_mtime.tv_sec);/* mtime */ *bp++ =0 ;/* owner */ *bp++ =0 ;/* group */ *bp++ =0 ;/* unix mode */
fs/afs/inode.c +6 -5
@@ -70,9 +70,9 @@ static int afs_inode_map_status(struct afs_vnode *vnode, struct key *key)set_nlink (inode, vnode->status.nlink); inode->i_uid = vnode->status.owner; - inode->i_gid =GLOBAL_ROOT_GID ; + inode->i_gid = vnode->status.group; inode->i_size = vnode->status.size; - inode->i_ctime.tv_sec = vnode->status.mtime_server; + inode->i_ctime.tv_sec = vnode->status.mtime_client; inode->i_ctime.tv_nsec =0 ; inode->i_atime = inode->i_mtime = inode->i_ctime; inode->i_blocks =0 ;
@@ -245,12 +245,13 @@ struct inode *afs_iget(struct super_block *sb, struct key *key, vnode->cb_version =0 ; vnode->cb_expiry =0 ; vnode->cb_type =0 ; - vnode->cb_expires =get_seconds (); + vnode->cb_expires =ktime_get_real_seconds (); }else { vnode->cb_version = cb->version; vnode->cb_expiry = cb->expiry; vnode->cb_type = cb->type; - vnode->cb_expires = vnode->cb_expiry +get_seconds (); + vnode->cb_expires = vnode->cb_expiry + +ktime_get_real_seconds (); } }
@@ -323,7 +324,7 @@ int afs_validate(struct afs_vnode *vnode, struct key *key) !test_bit(AFS_VNODE_CB_BROKEN, &vnode->flags) && !test_bit(AFS_VNODE_MODIFIED, &vnode->flags) && !test_bit(AFS_VNODE_ZAP_DATA, &vnode->flags)) { -if (vnode->cb_expires <get_seconds () +10 ) { +if (vnode->cb_expires <ktime_get_real_seconds () +10 ) {_debug ("callback expired" );set_bit (AFS_VNODE_CB_BROKEN , &vnode->flags); }else {
fs/afs/internal.h +11 -6
@@ -11,6 +11,7 @@#include <linux/compiler.h> #include <linux/kernel.h> +#include <linux/ktime.h> #include <linux/fs.h> #include <linux/pagemap.h> #include <linux/rxrpc.h>
@@ -105,7 +106,10 @@ struct afs_call {unsigned request_size;/* size of request data */ unsigned reply_max;/* maximum size of reply */ unsigned first_offset;/* offset into mapping[first] */ -unsigned last_to;/* amount of mapping[last] */ +union { +unsigned last_to;/* amount of mapping[last] */ +unsigned count2;/* count used in unmarshalling */ + };unsigned char unmarshall;/* unmarshalling phase */ bool incoming;/* T if incoming call */ bool send_pages;/* T if data from mapping should be sent */
@@ -242,7 +246,7 @@ struct afs_cache_vhash {*/ struct afs_vlocation {atomic_t usage; -time_t time_of_death;/* time at which put reduced usage to 0 */ +time64_t time_of_death;/* time at which put reduced usage to 0 */ struct list_head link;/* link in cell volume location list */ struct list_head grave;/* link in master graveyard list */ struct list_head update;/* link in master update list */
@@ -253,7 +257,7 @@ struct afs_vlocation {struct afs_cache_vlocation vldb;/* volume information DB record */ struct afs_volume *vols[3 ];/* volume access record pointer (index by type) */ wait_queue_head_t waitq;/* status change waitqueue */ -time_t update_at;/* time at which record should be updated */ +time64_t update_at;/* time at which record should be updated */ spinlock_t lock;/* access lock */ afs_vlocation_state_t state;/* volume location state */ unsigned short upd_rej_cnt;/* ENOMEDIUM count during update */
@@ -266,7 +270,7 @@ struct afs_vlocation {*/ struct afs_server {atomic_t usage; -time_t time_of_death;/* time at which put reduced usage to 0 */ +time64_t time_of_death;/* time at which put reduced usage to 0 */ struct in_addr addr;/* server address */ struct afs_cell *cell;/* cell in which server resides */ struct list_head link;/* link in cell's server list */
@@ -369,8 +373,8 @@ struct afs_vnode {struct rb_node server_rb;/* link in server->fs_vnodes */ struct rb_node cb_promise;/* link in server->cb_promises */ struct work_struct cb_broken_work;/* work to be done on callback break */ -time_t cb_expires;/* time at which callback expires */ -time_t cb_expires_at;/* time used to order cb_promise */ +time64_t cb_expires;/* time at which callback expires */ +time64_t cb_expires_at;/* time used to order cb_promise */ unsigned cb_version;/* callback version */ unsigned cb_expiry;/* callback expiry time */ afs_callback_type_t cb_type;/* type of callback */
@@ -749,6 +753,7 @@ extern int afs_writepages(struct address_space *, struct writeback_control *);extern void afs_pages_written_back (struct afs_vnode *,struct afs_call *);extern ssize_t afs_file_write (struct kiocb *,struct iov_iter *);extern int afs_writeback_all (struct afs_vnode *); +extern int afs_flush (struct file *,fl_owner_t );extern int afs_fsync (struct file *,loff_t ,loff_t ,int );
fs/afs/misc.c +2 -0
@@ -84,6 +84,8 @@ int afs_abort_to_error(u32 abort_code)case RXKADDATALEN :return -EKEYREJECTED ;case RXKADILLEGALLEVEL :return -EKEYREJECTED ; +case RXGEN_OPCODE :return -ENOTSUPP ; +default :return -EREMOTEIO ; } }
fs/afs/rxrpc.c +32 -20
20 lines not on this page · raw message
fs/ceph/mds_client.c +38 -4
42 lines not on this page · raw message
kernel/sched/deadline.c +57 -6
63 lines not on this page · raw message
sound/soc/intel/skylake/skl-sst-utils.c +11 -4
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.