Linux 5.4.62
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.4.62 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 13 arch/arm/boot/deflate_xip_data.sh | 2 arch/arm/boot/dts/ls1021a.dtsi | 2 arch/arm64/Makefile | 3 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 arch/arm64/include/asm/smp.h | 7 arch/arm64/kernel/cpu_errata.c | 2 arch/arm64/kernel/process.c | 34 + arch/arm64/kernel/setup.c | 8 arch/arm64/kernel/smp.c | 6 arch/arm64/kvm/hyp/switch.c | 2 arch/ia64/Makefile | 2 arch/m68k/Makefile | 8 arch/mips/vdso/genvdso.c | 10 arch/parisc/Makefile | 2 arch/powerpc/kernel/cpu_setup_power.S | 2 arch/powerpc/perf/core-book3s.c | 23 arch/powerpc/platforms/cell/Kconfig | 1 arch/powerpc/sysdev/xive/native.c | 2 arch/s390/include/asm/numa.h | 1 arch/s390/include/asm/topology.h | 2 arch/s390/numa/numa.c | 6 arch/x86/kernel/smpboot.c | 26 block/bfq-cgroup.c | 2 block/bfq-iosched.h | 1 block/bfq-wf2q.c | 12 block/bio.c | 10 block/blk-cgroup.c | 8 block/blk-merge.c | 13 block/blk-mq-sched.c | 9 block/blk-mq.c | 12 crypto/af_alg.c | 13 drivers/base/core.c | 12 drivers/base/power/main.c | 16 drivers/block/loop.c | 33 - drivers/block/null_blk_main.c | 2 drivers/block/virtio_blk.c | 31 - drivers/cpufreq/intel_pstate.c | 18 drivers/devfreq/rk3399_dmc.c | 51 + drivers/edac/i7core_edac.c | 4 drivers/edac/ie31200_edac.c | 50 + drivers/edac/pnd2_edac.c | 2 drivers/edac/sb_edac.c | 25 drivers/edac/skx_common.c | 9 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 20 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 58 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c | 16 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h | 14 drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 9 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 22 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 21 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 44 - drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 21 drivers/gpu/drm/i915/i915_cmd_parser.c | 14 drivers/gpu/drm/ingenic/ingenic-drm.c | 6 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 drivers/gpu/drm/nouveau/nouveau_connector.c | 4 drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 drivers/gpu/drm/radeon/radeon_connectors.c | 20 drivers/gpu/drm/xen/xen_drm_front.c | 2 drivers/gpu/drm/xen/xen_drm_front_gem.c | 8 drivers/gpu/drm/xen/xen_drm_front_kms.c | 2 drivers/hid/hid-ids.h | 1 drivers/hid/hid-quirks.c | 1 drivers/hid/i2c-hid/i2c-hid-core.c | 22 drivers/hid/usbhid/hiddev.c | 4 drivers/hwmon/nct7904.c | 4 drivers/i2c/busses/i2c-rcar.c | 1 drivers/i2c/i2c-core-base.c | 2 drivers/iommu/iova.c | 4 drivers/irqchip/irq-stm32-exti.c | 14 drivers/media/cec/cec-api.c | 8 drivers/media/pci/ttpci/av7110.c | 5 drivers/media/platform/davinci/vpif_capture.c | 2 drivers/media/rc/gpio-ir-tx.c | 7 drivers/mfd/intel-lpss-pci.c | 19 drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 drivers/net/ethernet/freescale/gianfar.c | 4 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 drivers/net/ipvlan/ipvlan_main.c | 27 drivers/net/macvlan.c | 21 drivers/net/wireless/ath/ath10k/hw.h | 2 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 8 drivers/net/wireless/realtek/rtlwifi/usb.c | 5 drivers/nvme/host/fc.c | 4 drivers/nvme/host/multipath.c | 15 drivers/pci/controller/dwc/pcie-qcom.c | 58 + drivers/pci/slot.c | 6 drivers/s390/cio/css.c | 5 drivers/scsi/fcoe/fcoe_ctlr.c | 2 drivers/scsi/lpfc/lpfc_vport.c | 26 drivers/scsi/qla2xxx/qla_gs.c | 18 drivers/scsi/qla2xxx/qla_mbx.c | 8 drivers/scsi/qla2xxx/qla_nvme.c | 5 drivers/scsi/qla2xxx/qla_os.c | 5 drivers/scsi/qla2xxx/qla_target.c | 2 drivers/scsi/scsi_transport_iscsi.c | 2 drivers/scsi/ufs/ufshcd.c | 14 drivers/spi/spi-stm32.c | 73 +- drivers/target/target_core_internal.h | 1 drivers/target/target_core_transport.c | 7 drivers/target/target_core_user.c | 9 drivers/target/target_core_xcopy.c | 11 drivers/tty/serial/8250/8250_exar.c | 24 drivers/tty/serial/8250/8250_port.c | 9 drivers/tty/serial/amba-pl011.c | 16 drivers/tty/serial/samsung.c | 8 drivers/tty/serial/stm32-usart.c | 2 drivers/tty/vt/vt.c | 5 drivers/tty/vt/vt_ioctl.c | 12 drivers/usb/cdns3/gadget.c | 4 drivers/usb/class/cdc-acm.c | 22 drivers/usb/core/quirks.c | 7 drivers/usb/dwc3/gadget.c | 104 ++- drivers/usb/gadget/function/f_ncm.c | 81 ++ drivers/usb/gadget/function/f_tcm.c | 7 drivers/usb/gadget/u_f.h | 38 - drivers/usb/host/ohci-exynos.c | 5 drivers/usb/host/xhci-debugfs.c | 8 drivers/usb/host/xhci-hub.c | 19 drivers/usb/host/xhci.c | 3 drivers/usb/misc/lvstest.c | 2 drivers/usb/misc/sisusbvga/sisusb.c | 2 drivers/usb/misc/yurex.c | 2 drivers/usb/storage/unusual_devs.h | 2 drivers/usb/storage/unusual_uas.h | 14 drivers/video/fbdev/core/fbcon.c | 25 drivers/video/fbdev/core/fbmem.c | 8 drivers/video/fbdev/core/fbsysfs.c | 4 drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 drivers/video/fbdev/omap2/omapfb/dss/dss.c | 7 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 drivers/video/fbdev/ps3fb.c | 5 drivers/xen/events/events_base.c | 16 fs/binfmt_flat.c | 20 fs/btrfs/ctree.h | 4 fs/btrfs/disk-io.c | 1 fs/btrfs/extent-tree.c | 17 fs/btrfs/file.c | 10 fs/btrfs/free-space-cache.c | 2 fs/btrfs/inode.c | 18 fs/btrfs/qgroup.c | 14 fs/btrfs/qgroup.h | 2 fs/btrfs/super.c | 1 fs/btrfs/tree-log.c | 305 +++++----- fs/buffer.c | 9 fs/ceph/file.c | 5 fs/ceph/mds_client.c | 14 fs/ext4/block_validity.c | 8 fs/ext4/super.c | 175 +++-- fs/f2fs/f2fs.h | 4 fs/f2fs/inline.c | 19 fs/f2fs/node.c | 6 fs/f2fs/recovery.c | 10 fs/f2fs/super.c | 5 fs/fs-writeback.c | 83 +- fs/hugetlbfs/inode.c | 6 fs/io_uring.c | 9 fs/jbd2/transaction.c | 26 fs/xfs/libxfs/xfs_trans_inode.c | 2 fs/xfs/xfs_icache.c | 3 fs/xfs/xfs_inode.c | 25 include/linux/efi.h | 4 include/linux/fb.h | 2 include/linux/fs.h | 8 include/linux/netfilter_ipv6.h | 18 include/trace/events/writeback.h | 13 kernel/Makefile | 2 kernel/gen_kheaders.sh | 66 +- kernel/irq/matrix.c | 7 kernel/locking/lockdep_proc.c | 2 kernel/sched/core.c | 81 ++ kernel/sched/cpufreq_schedutil.c | 2 kernel/sched/sched.h | 47 + kernel/trace/blktrace.c | 12 mm/cma.c | 29 mm/mmu_context.c | 7 mm/shuffle.c | 18 mm/vmalloc.c | 2 net/bridge/netfilter/nf_conntrack_bridge.c | 8 net/can/j1939/transport.c | 15 net/core/skbuff.c | 4 net/ipv4/nexthop.c | 5 net/ipv6/ip6_tunnel.c | 10 net/ipv6/netfilter.c | 3 net/qrtr/qrtr.c | 20 net/sched/act_ct.c | 2 net/sctp/stream.c | 6 net/smc/smc_diag.c | 16 net/tipc/netlink_compat.c | 12 scripts/Makefile.lib | 12 scripts/Makefile.package | 8 scripts/package/buildtar | 6 scripts/xz_wrap.sh | 2 sound/pci/cs46xx/cs46xx_lib.c | 2 sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 sound/pci/hda/hda_codec.c | 2 sound/pci/hda/hda_generic.c | 2 sound/pci/hda/hda_intel.c | 2 sound/pci/hda/patch_hdmi.c | 17 sound/pci/hda/patch_realtek.c | 12 sound/pci/hda/patch_sigmatel.c | 2 sound/pci/ice1712/prodigy192.c | 2 sound/pci/oxygen/xonar_dg.c | 2 sound/soc/codecs/wm8958-dsp2.c | 4 sound/soc/img/img-i2s-in.c | 4 sound/soc/img/img-parallel-out.c | 4 sound/soc/tegra/tegra30_ahub.c | 4 sound/soc/tegra/tegra30_i2s.c | 4 sound/usb/quirks-table.h | 34 + tools/testing/selftests/net/icmp_redirect.sh | 2 tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c | 2 tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c | 1 tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c | 7 tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c | 2 231 files changed, 2124 insertions(+), 1013 deletions(-)
Abhishek Sahu (1):
PCI: qcom: Change duplicate PCI reset to phy reset
Aditya Pakki (5):
drm/radeon: fix multiple reference count leak
omapfb: fix multiple reference count leaks due to pm_runtime_get_sync drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open drm/nouveau: fix reference count leak in nv50_disp_atomic_commit drm/nouveau: Fix reference count leak in nouveau_connector_detect
Adrian Hunter (1):
scsi: ufs: Improve interrupt handling for shared interrupts
Alaa Hleihel (1):
net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow
Alain Volmat (1):
spi: stm32: always perform registers configuration prior to transfer
Alan Stern (3):
USB: yurex: Fix bad gfp argument
USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D
usb: storage: Add unusual_uas entry for Sony PSZ drives
Alex Deucher (1):
drm/amdgpu: Fix buffer overflow in INFO ioctl
Alexander Tsoy (1):
ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1)
Alexey Kardashevskiy (2):
powerpc/xive: Ignore kmemleak false positives powerpc/perf: Fix crashes with generic_compat_pmu & BHRB
Alvin Šipraga (1):
macvlan: validate setting of multiple remote source MAC addresses
Amelie Delaunay (2):
spi: stm32: fix fifo threshold level in case of short transfer
spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate
Andrey Konovalov (1):
efi: provide empty efi_enter_virtual_mode implementation
Andy Shevchenko (4):
mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs
mfd: intel-lpss: Add Intel Tiger Lake PCH-H PCI IDs
i2c: core: Don't fail PRP0001 enumeration when no ID table exist
USB: gadget: u_f: Unbreak offset calculation in VLAs
Ansuel Smith (2):
PCI: qcom: Add missing ipq806x clocks in PCIe driver
PCI: qcom: Add missing reset for ipq806x
Anthony Koo (1):
drm/amd/display: Switch to immediate mode for updating infopackets
Antonio Borneo (1):
spi: stm32h7: fix race condition at end of transfer
Arnd Bergmann (1):
powerpc/spufs: add CONFIG_COREDUMP dependency
Ashok Raj (1):
x86/hotplug: Silence APIC only after all interrupts are migrated
Athira Rajeev (1):
powerpc/perf: Fix soft lockups due to missed interrupt accounting
Aurabindo Pillai (1):
drm/amd/display: Add additional config guards for DCN
Bodo Stroesser (1):
scsi: target: tcmu: Fix crash on ARM during cmd completion
Boris Burkov (1):
btrfs: detect nocow for swap after snapshot delete
Brooke Basile (2):
USB: gadget: u_f: add overflow checks to VLA macros
USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()
Changming Liu (1):
USB: sisusbvga: Fix a potential UB casued by left shifting a negative value
Chao Yu (1):
f2fs: fix error path in do_recover_data()
Chris Wilson (1):
locking/lockdep: Fix overflow in presentation of average lock-time
Christophe JAILLET (1):
usb: gadget: f_tcm: Fix some resource leaks in some error paths
Cong Wang (1):
tipc: fix uninit skb->data in tipc_nl_compat_dumpit()
Cyril Roelandt (1):
USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge
Dave Chinner (1):
xfs: Don't allow logging of XFS_ISTALE inodes
David Ahern (1):
selftests: disable rp_filter for icmp_redirect.sh
David Brazdil (1):
KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe
David Hildenbrand (1):
mm/shuffle: don't move pages between zones and don't read garbage memmaps
David Laight (1):
net: sctp: Fix negotiation of the number of data streams.
Denis Efremov (2):
kbuild: add variables for compression tools
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
Desnes A. Nunes do Rosario (1):
selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
Dick Kennedy (1):
scsi: lpfc: Fix shost refcount mismatch when deleting vport
Ding Hui (1):
xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed
Ding Xiang (1):
drm/xen: fix passing zero to 'PTR_ERR' warning
Dmitry Monakhov (1):
bfq: fix blkio cgroup leakage v4
Evan Quan (6):
drm/amd/powerplay: correct Vega20 cached smu feature state drm/amd/powerplay: correct UVD/VCE PG state on custom pptable uploading drm/amd/pm: correct Vega10 swctf limit setting
drm/amd/pm: correct Vega12 swctf limit setting
drm/amd/pm: correct Vega20 swctf limit setting
drm/amd/pm: correct the thermal alert temperature limit settings
Evgeny Novikov (2):
media: davinci: vpif_capture: fix potential double free
USB: lvtest: return proper error code in probe
Filipe Manana (4):
btrfs: factor out inode items copy loop from btrfs_log_inode()
btrfs: only commit the delayed inode when doing a full fsync
btrfs: only commit delayed items at fsync if we are logging a directory
btrfs: fix space cache memory leak after transaction abort
Florian Westphal (1):
netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency
Frank van der Linden (1):
arm64: vdso32: make vdso32 install conditional
George Kennedy (2):
fbcon: prevent user font height or width change from causing potential out-of-bounds access
vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize()
Greg Kroah-Hartman (1):
Linux 5.4.62
Hans Verkuil (1):
cec-api: prevent leaking memory through hole in structure
Hans de Goede (1):
HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands
Hector Martin (1):
ALSA: usb-audio: Update documentation comment for MS2109 quirk
Heikki Krogerus (1):
device property: Fix the secondary firmware node handling in set_primary_fwnode()
Herbert Xu (1):
crypto: af_alg - Work around empty control messages without MSG_MORE
Holger Assmann (1):
serial: stm32: avoid kernel warning on absence of optional IRQ
Hou Pu (1):
null_blk: fix passing of REQ_FUA flag in null_handle_rq
Ikjoon Jang (1):
HID: quirks: add NOGET quirk for Logitech GROUP
Jan Kara (6):
ext4: don't BUG on inconsistent journal feature
ext4: handle error of ext4_setup_system_zone() on remount
ext4: correctly restore system zone info when remount fails
writeback: Protect inode->i_io_list with inode->i_lock
writeback: Avoid skipping inode writeback
writeback: Fix sync livelock due to b_dirty_time processing
Jason Baron (2):
EDAC/ie31200: Fallback if host bridge device is already initialized
hwmon: (nct7904) Correct divide by 0
Javed Hasan (1):
scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
Jia-Ju Bai (1):
media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq()
Jiansong Chen (1):
drm/amdgpu/gfx10: refine mgcg setting
Jing Xiangfeng (1):
scsi: iscsi: Do not put host in iscsi_set_flashnode_param()
Josef Bacik (1):
btrfs: check the right error variable in btrfs_del_dir_entries_in_log
Kai-Heng Feng (5):
ALSA: hda/hdmi: Add quirk to force connectivity
ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged
ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop
xhci: Do warm-reset when both CAS and XDEV_RESUME are set
USB: quirks: Add no-lpm quirk for another Raydium touchscreen
Kaige Li (1):
ALSA: hda: Add support for Loongson 7A1000 controller
Kefeng Wang (1):
arm64: Fix __cpu_logical_map undefined issue
Keith Busch (1):
block: fix get_max_io_size()
Li Guifu (1):
f2fs: fix use-after-free issue
Li Jun (1):
usb: host: xhci: fix ep context print mismatch in debugfs
Luis Chamberlain (1):
blktrace: ensure our debugfs dir exists
Lukas Czerner (3):
jbd2: make sure jh have b_transaction set in refile/unfile_buffer
ext4: handle read only external journal device
ext4: handle option set by mount flags correctly
Lukas Wunner (2):
serial: pl011: Fix oops on -EPROBE_DEFER
serial: pl011: Don't leak amba_ports entry on driver register error
Mahesh Bandewar (1):
ipvlan: fix device features
Marc Zyngier (3):
PM / devfreq: rk3399_dmc: Fix kernel oops when rockchip,pmu is absent
arm64: Move handling of erratum 1418040 into C code
arm64: Allow booting of late CPUs affected by erratum 1418040
Marcos Paulo de Souza (1):
btrfs: reset compression level for lzo on remount
Mark Tomlinson (1):
gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY
Martin Wilck (1):
nvme: multipath: round-robin: fix single non-optimized path case
Masahiro Yamada (5):
kheaders: remove unneeded 'cat' command piped to 'head' / 'tail'
kheaders: optimize md5sum calculation for in-tree builds
kheaders: optimize header copy for in-tree builds
kheaders: remove the last bashism to allow sh to run it
kheaders: explain why include/config/autoconf.h is excluded from md5sum
Matthew Wilcox (Oracle) (1):
block: Fix page_is_mergeable() for compound pages
Mauro Carvalho Chehab (2):
EDAC: sb_edac: get rid of unused vars
EDAC: skx_common: get rid of unused type var
Max Filippov (1):
binfmt_flat: revert "binfmt_flat: don't offset the data start"
Miaohe Lin (1):
net: Fix potential wrong skb->protocol in skb_vlan_untag()
Michael Ellerman (1):
powerpc/64s: Don't init FSCR_DSCR in __init_FSCR()
Mika Kuoppala (1):
drm/i915: Fix cmd parser desc matching with masks
Mike Christie (2):
scsi: target: Fix xcopy sess release leak
scsi: fcoe: Fix I/O path allocation
Mike Kravetz (2):
hugetlbfs: prevent filesystem stacking of hugetlbfs
cma: don't quit at first error when activating reserved areas
Mike Pozulp (1):
ALSA: hda/realtek: Add model alc298-samsung-headphone
Mikita Lipski (1):
drm/amd/display: Trigger modesets on MST DSC connectors
Ming Lei (5):
block: respect queue limit of max discard segment
block: virtio_blk: fix handling single range discard request
blk-mq: insert request not through ->queue_rq into sw/scheduler queue
block: loop: set discard granularity and alignment for block device backed loop
blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART
Navid Emamdoost (4):
drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms drm/amd/display: fix ref count leak in amdgpu_drm_ioctl drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
Necip Fazil Yildiran (1):
net: qrtr: fix usage of idr in port assignment to socket
Nicholas Kazlauskas (1):
drm/amd/powerplay: Fix hardmins not being sent to SMU for RV
Nicolas Saenz Julienne (1):
brcmfmac: Set timeout value when configuring power save
Nikolay Aleksandrov (1):
net: nexthop: don't allow empty NHA_GROUP
Nikolay Borisov (1):
btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode
Oleksandr Andrushchenko (1):
drm/xen-front: Fix misused IS_ERR_OR_NULL checks
Oleksij Rempel (1):
can: j1939: transport: j1939_xtp_rx_dat_one(): compare own packets to detect corruptions
Paul Cercueil (2):
gpu/drm: ingenic: Use the plane's src_[x,y] to configure DMA length drm/ingenic: Fix incorrect assumption about plane->index
Peilin Ye (2):
net/smc: Prevent kernel-infoleak in __smc_diag_dump()
HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
Peng Fan (1):
mips/vdso: Fix resource leaks in genvdso.c
Peter Zijlstra (1):
mm: fix kthread_use_mm() vs TLB invalidate
Qais Yousef (2):
sched/uclamp: Protect uclamp fast path code with static key sched/uclamp: Fix a deadlock when enabling uclamp static key
Qiushi Wu (5):
ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt
ASoC: img-parallel-out: Fix a reference count leak
ASoC: tegra: Fix reference count leaks. drm/amdkfd: Fix reference count leaks.
PCI: Fix pci_create_slot() reference count leak
Qu Wenruo (1):
btrfs: file: reserve qgroup space after the hole punch range is locked
Quinn Tran (2):
scsi: qla2xxx: Fix login timeout
scsi: qla2xxx: Fix null pointer access during disconnect from subsystem
Rafael J. Wysocki (2):
cpufreq: intel_pstate: Fix EPP setting via sysfs in active mode
PM: sleep: core: Fix the handling of pending runtime resume requests
Randy Dunlap (1):
ALSA: pci: delete repeated words in comments
Reto Schneider (1):
rtlwifi: rtl8192cu: Prevent leaking urb
Rob Clark (1):
drm/msm/adreno: fix updating ring fence
Robin Murphy (1):
iommu/iova: Don't BUG on invalid PFNs
Sasha Levin (3):
usb: cdns3: gadget: always zeroed TRB buffer when enable endpoint s390/numa: set node distance to LOCAL_DISTANCE mm/vunmap: add cond_resched() in vunmap_pmd_range
Saurav Kashyap (2):
scsi: qla2xxx: Check if FW supports MQ before enabling Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command"
Sean Young (1):
media: gpio-ir-tx: improve precision of transmitted signal due to scheduling
Sergey Senozhatsky (1):
serial: 8250: change lock order in serial8250_do_startup()
Shay Agroskin (1):
net: ena: Make missed_tx stat incremental
Stanley Chu (2):
scsi: ufs: Fix possible infinite loop in ufshcd_hold
scsi: ufs: Clean up completed request without interrupt notification
Stephan Gerhold (1):
arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep
Stylon Wang (1):
drm/amd/display: Fix dmesg warning from setting abm level
Sumera Priyadarsini (1):
net: gianfar: Add of_node_put() before goto statement
Sylwester Nawrocki (1):
ASoC: wm8994: Avoid attempts to read unreadable registers
Tamseel Shams (1):
serial: samsung: Removes the IRQ not found warning
Tang Bin (1):
usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()
Tetsuo Handa (2):
vt: defer kfree() of vc_screenbuf in vc_do_resize()
fbmem: pull fbcon_update_vcs() out of fb_set_var()
Thinh Nguyen (4):
usb: uas: Add quirk for PNY Pro Elite
usb: dwc3: gadget: Don't setup more than requested
usb: dwc3: gadget: Fix handling ZLP
usb: dwc3: gadget: Handle ZLP for sg requests
Thomas Gleixner (2):
XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information. genirq/matrix: Deal with the sillyness of for_each_cpu() on UP
Tianjia Zhang (1):
nvme-fc: Fix wrong return value in __nvme_fc_init_request()
Tobias Schramm (1):
spi: stm32: clear only asserted irq flags on interrupt
Tom Rix (1):
USB: cdc-acm: rework notification_buffer resizing
Tony Luck (1):
EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
Valmer Huhn (1):
serial: 8250_exar: Fix number of ports for Commtech PCIe cards
Vineeth Vijayan (1):
s390/cio: add cond_resched() in the slow_eval_known_fn() loop
Wolfram Sang (1):
i2c: rcar: in slave mode, clear NACK earlier
Xianting Tian (1):
fs: prevent BUG_ON in submit_bh_wbc()
Xin Yin (1):
io_uring: Fix NULL pointer dereference in io_sq_wq_submit_work()
Xiubo Li (2):
ceph: fix potential mdsc use-after-free crash
ceph: do not access the kiocb after aio requests
Yangbo Lu (1):
ARM: dts: ls1021a: output PPS signal on FIPER2
Yangtao Li (2):
PM / devfreq: rk3399_dmc: Add missing of_node_put()
PM / devfreq: rk3399_dmc: Disable devfreq-event device when fails
Yufen Yu (1):
blkcg: fix memleak for iolatency
Yunfeng Ye (1):
mm/cma.c: switch to bitmap_zalloc() for cma bitmap allocation
Zhi Chen (1):
Revert "ath10k: fix DMA related firmware crashes on multiple devices"
qiuguorui1 (1):
irqchip/stm32-exti: Avoid losing interrupts due to clearing pending bits by mistake
zhangyi (F) (1):
jbd2: abort journal if free a async write error metadata buffer
Greg Kroah-Hartman
maintainerMakefile +10 -3
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 61 +SUBLEVEL = 62 EXTRAVERSION = NAME = Kleptomaniac Octopus
@@ -442,6 +442,12 @@ PYTHON = python PYTHON3 = python3 CHECK = sparse BASH = bash +KGZIP = gzip +KBZIP2 = bzip2 +KLZOP = lzop +LZMA = lzma +LZ4 = lz4c +XZ = xz CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
@@ -490,6 +496,7 @@ CLANG_FLAGS := export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX +export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS
@@ -997,10 +1004,10 @@ export mod_strip_cmd mod_compress_cmd = true ifdef CONFIG_MODULE_COMPRESS ifdef CONFIG_MODULE_COMPRESS_GZIP - mod_compress_cmd = gzip -n -f + mod_compress_cmd = $(KGZIP) -n -f endif # CONFIG_MODULE_COMPRESS_GZIP ifdef CONFIG_MODULE_COMPRESS_XZ - mod_compress_cmd = xz -f + mod_compress_cmd = $(XZ) -f endif # CONFIG_MODULE_COMPRESS_XZ endif # CONFIG_MODULE_COMPRESS export mod_compress_cmd
arch/arm/boot/deflate_xip_data.sh +1 -1
@@ -56,7 +56,7 @@ trap 'rm -f "$XIPIMAGE.tmp"; exit 1' 1 2 3 # substitute the data section by a compressed version $DD if="$XIPIMAGE" count=$data_start iflag=count_bytes of="$XIPIMAGE.tmp" $DD if="$XIPIMAGE" skip=$data_start iflag=skip_bytes | -gzip -9 >> "$XIPIMAGE.tmp" +$KGZIP -9 >> "$XIPIMAGE.tmp" # replace kernel binary mv -f "$XIPIMAGE.tmp" "$XIPIMAGE"
arch/arm/boot/dts/ls1021a.dtsi +1 -1
@@ -753,7 +753,7 @@ fsl,tmr-prsc = <2>; fsl,tmr-add = <0xaaaaaaab>; fsl,tmr-fiper1 = <999999995>; - fsl,tmr-fiper2 = <99990>; + fsl,tmr-fiper2 = <999999995>; fsl,max-adj = <499999999>; fsl,extts-fifo; };
arch/arm64/Makefile +2 -1
@@ -146,7 +146,8 @@ zinstall install: PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ - $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@ + $(if $(CONFIG_COMPAT_VDSO), \ + $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@) # We use MRPROPER_FILES and CLEAN_FILES now archclean:
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +1 -1
@@ -521,7 +521,7 @@ pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68"; drive-strength = <2>; - bias-disable; + bias-pull-down; }; }; };
arch/arm64/include/asm/smp.h +6 -1
@@ -46,7 +46,12 @@ DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);* Logical CPU mapping. */ extern u64 __cpu_logical_map[NR_CPUS ]; -#define cpu_logical_map (cpu) __cpu_logical_map[cpu] +extern u64 cpu_logical_map (int cpu); + +static inline void set_cpu_logical_map (int cpu,u64 hwid) +{ + __cpu_logical_map[cpu] = hwid; +}struct seq_file ;
arch/arm64/kernel/cpu_errata.c +2 -0
@@ -917,6 +917,8 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .desc = "ARM erratum 1418040", .capability =ARM64_WORKAROUND_1418040 ,ERRATA_MIDR_RANGE_LIST (erratum_1418040_list), + .type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | +ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU ), }, #endif #ifdef CONFIG_ARM64_ERRATUM_1165522
arch/arm64/kernel/process.c +34 -0
@@ -498,6 +498,39 @@ static void entry_task_switch(struct task_struct *next)__this_cpu_write (__entry_task, next); } +/* +* ARM erratum 1418040 handling, affecting the 32bit view of CNTVCT. +* Assuming the virtual counter is enabled at the beginning of times: +* +* - disable access when switching from a 64bit task to a 32bit task +* - enable access when switching from a 32bit task to a 64bit task +*/ +static void erratum_1418040_thread_switch (struct task_struct *prev, +struct task_struct *next) +{ +bool prev32, next32; +u64 val; + +if (!(IS_ENABLED (CONFIG_ARM64_ERRATUM_1418040 ) && +cpus_have_const_cap (ARM64_WORKAROUND_1418040 ))) +return ; + + prev32 =is_compat_thread (task_thread_info (prev)); + next32 =is_compat_thread (task_thread_info (next)); + +if (prev32 == next32) +return ; + + val =read_sysreg (cntkctl_el1); + +if (!next32) + val |=ARCH_TIMER_USR_VCT_ACCESS_EN ; +else + val &= ~ARCH_TIMER_USR_VCT_ACCESS_EN ; + +write_sysreg (val, cntkctl_el1); +} +/* * Thread switching. */
@@ -514,6 +547,7 @@ __notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,uao_thread_switch (next);ptrauth_thread_switch (next);ssbs_thread_switch (next); +erratum_1418040_thread_switch (prev, next);/* * Complete any pending TLB or cache maintenance on this CPU in case
arch/arm64/kernel/setup.c +7 -1
@@ -85,7 +85,7 @@ u64 __cacheline_aligned boot_args[4];void __init smp_setup_processor_id (void ) {u64 mpidr =read_cpuid_mpidr () &MPIDR_HWID_BITMASK ; -cpu_logical_map (0 ) = mpidr; +set_cpu_logical_map (0 , mpidr);/* * clear __my_cpu_offset on boot CPU to avoid hang caused by
@@ -276,6 +276,12 @@ arch_initcall(reserve_memblock_reserved_regions);u64 __cpu_logical_map[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =INVALID_HWID }; +u64 cpu_logical_map (int cpu) +{ +return __cpu_logical_map[cpu]; +} +EXPORT_SYMBOL_GPL (cpu_logical_map); +void __init setup_arch (char **cmdline_p) { init_mm.start_code = (unsigned long ) _text;
arch/arm64/kernel/smp.c +3 -3
@@ -549,7 +549,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)return ;/* map the logical cpu id to cpu MPIDR */ -cpu_logical_map (cpu_count) = hwid; +set_cpu_logical_map (cpu_count, hwid); cpu_madt_gicc[cpu_count] = *processor;
@@ -663,7 +663,7 @@ static void __init of_parse_and_init_cpus(void) goto next;pr_debug ("cpu logical map 0x%llx\n" , hwid); -cpu_logical_map (cpu_count) = hwid; +set_cpu_logical_map (cpu_count, hwid);early_map_cpu_to_node (cpu_count,of_node_to_nid (dn)); next:
@@ -704,7 +704,7 @@ void __init smp_init_cpus(void)for (i =1 ; i < nr_cpu_ids; i++) {if (cpu_logical_map (i) !=INVALID_HWID ) {if (smp_cpu_setup (i)) -cpu_logical_map (i) =INVALID_HWID ; +set_cpu_logical_map (i,INVALID_HWID ); } } }
arch/arm64/kvm/hyp/switch.c +1 -1
@@ -754,7 +754,7 @@ static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par,* making sure it is a kernel address and not a PC-relative * reference. */ - asmvolatile ("ldr %0, =__hyp_panic_string" :"=r" (str_va)); + asmvolatile ("ldr %0, =%1" :"=r" (str_va) :"S" (__hyp_panic_string)); __hyp_do_panic(str_va, spsr, elr,
arch/ia64/Makefile +1 -1
@@ -40,7 +40,7 @@ $(error Sorry, you need a newer version of the assember, one that is built from endif quiet_cmd_gzip = GZIP $@ -cmd_gzip = cat $(real-prereqs) | gzip -n -f -9 > $@ +cmd_gzip = cat $(real-prereqs) | $(KGZIP) -n -f -9 > $@ quiet_cmd_objcopy = OBJCOPY $@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
arch/m68k/Makefile +4 -4
@@ -135,10 +135,10 @@ vmlinux.gz: vmlinux ifndef CONFIG_KGDB cp vmlinux vmlinux.tmp $(STRIP) vmlinux.tmp - gzip -9c vmlinux.tmp >vmlinux.gz + $(KGZIP) -9c vmlinux.tmp >vmlinux.gz rm vmlinux.tmp else - gzip -9c vmlinux >vmlinux.gz + $(KGZIP) -9c vmlinux >vmlinux.gz endif bzImage: vmlinux.bz2
@@ -148,10 +148,10 @@ vmlinux.bz2: vmlinux ifndef CONFIG_KGDB cp vmlinux vmlinux.tmp $(STRIP) vmlinux.tmp - bzip2 -1c vmlinux.tmp >vmlinux.bz2 + $(KBZIP2) -1c vmlinux.tmp >vmlinux.bz2 rm vmlinux.tmp else - bzip2 -1c vmlinux >vmlinux.bz2 + $(KBZIP2) -1c vmlinux >vmlinux.bz2 endif archclean:
arch/mips/vdso/genvdso.c +10 -0
@@ -122,6 +122,7 @@ static void *map_vdso(const char *path, size_t *_size)if (fstat (fd, &stat) !=0 ) {fprintf (stderr,"%s: Failed to stat '%s': %s\n" , program_name, path,strerror (errno)); +close (fd);return NULL ; }
@@ -130,6 +131,7 @@ static void *map_vdso(const char *path, size_t *_size)if (addr ==MAP_FAILED ) {fprintf (stderr,"%s: Failed to map '%s': %s\n" , program_name, path,strerror (errno)); +close (fd);return NULL ; }
@@ -139,6 +141,7 @@ static void *map_vdso(const char *path, size_t *_size)if (memcmp (ehdr->e_ident,ELFMAG ,SELFMAG ) !=0 ) {fprintf (stderr,"%s: '%s' is not an ELF file\n" , program_name, path); +close (fd);return NULL ; }
@@ -150,6 +153,7 @@ static void *map_vdso(const char *path, size_t *_size)default :fprintf (stderr,"%s: '%s' has invalid ELF class\n" , program_name, path); +close (fd);return NULL ; }
@@ -161,6 +165,7 @@ static void *map_vdso(const char *path, size_t *_size)default :fprintf (stderr,"%s: '%s' has invalid ELF data order\n" , program_name, path); +close (fd);return NULL ; }
@@ -168,15 +173,18 @@ static void *map_vdso(const char *path, size_t *_size)fprintf (stderr,"%s: '%s' has invalid ELF machine (expected EM_MIPS)\n" , program_name, path); +close (fd);return NULL ; }else if (swap_uint16 (ehdr->e_type) !=ET_DYN ) {fprintf (stderr,"%s: '%s' has invalid ELF type (expected ET_DYN)\n" , program_name, path); +close (fd);return NULL ; } *_size = stat.st_size; +close (fd);return addr; }
@@ -280,10 +288,12 @@ int main(int argc, char **argv)/* Calculate and write symbol offsets to <output file> */ if (!get_symbols (dbg_vdso_path, dbg_vdso)) {unlink (out_path); +fclose (out_file);return EXIT_FAILURE ; }fprintf (out_file,"};\n" ); +fclose (out_file);return EXIT_SUCCESS ; }
arch/parisc/Makefile +1 -1
@@ -156,7 +156,7 @@ vmlinuz: bzImage $(OBJCOPY) $(boot)/bzImage $@ else vmlinuz: vmlinux - @gzip -cf -9 $< > $@ + @$(KGZIP) -cf -9 $< > $@ endif install:
arch/powerpc/kernel/cpu_setup_power.S +1 -1
@@ -184,7 +184,7 @@ __init_LPCR_ISA300: __init_FSCR: mfspr r3,SPRN_FSCR - ori r3,r3,FSCR_TAR|FSCR_DSCR|FSCR_EBB + ori r3,r3,FSCR_TAR|FSCR_EBB mtspr SPRN_FSCR,r3 blr
arch/powerpc/perf/core-book3s.c +18 -5
@@ -1522,9 +1522,16 @@ static int power_pmu_add(struct perf_event *event, int ef_flags) ret =0 ; out:if (has_branch_stack (event)) { -power_pmu_bhrb_enable (event); - cpuhw->bhrb_filter = ppmu->bhrb_filter_map ( - event->attr.branch_sample_type); +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( + event->attr.branch_sample_type); + +if (bhrb_filter !=-1 ) { + cpuhw->bhrb_filter = bhrb_filter; +power_pmu_bhrb_enable (event); + } }perf_pmu_enable (event->pmu);
@@ -1846,7 +1853,6 @@ static int power_pmu_event_init(struct perf_event *event)int n;int err;struct cpu_hw_events *cpuhw; -u64 bhrb_filter;if (!ppmu)return -ENOENT ;
@@ -1952,7 +1958,10 @@ static int power_pmu_event_init(struct perf_event *event) err =power_check_constraints (cpuhw, events, cflags, n +1 );if (has_branch_stack (event)) { - bhrb_filter = ppmu->bhrb_filter_map ( +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( event->attr.branch_sample_type);if (bhrb_filter ==-1 ) {
@@ -2106,6 +2115,10 @@ static void record_and_restart(struct perf_event *event, unsigned long val,if (perf_event_overflow (event, &data, regs))power_pmu_stop (event,0 ); + }else if (period) { +/* Account for interrupt in case of invalid SIAR */ +if (perf_event_account_interrupt (event)) +power_pmu_stop (event,0 ); } }
arch/powerpc/platforms/cell/Kconfig +1 -0
@@ -44,6 +44,7 @@ config SPU_FS tristate "SPU file system" default m depends on PPC_CELL + depends on COREDUMP select SPU_BASE help The SPU file system is used to access Synergistic Processing
arch/powerpc/sysdev/xive/native.c +2 -0
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/cpumask.h> #include <linux/mm.h> +#include <linux/kmemleak.h> #include <asm/prom.h> #include <asm/io.h>
@@ -646,6 +647,7 @@ static bool xive_native_provision_pages(void)pr_err ("Failed to allocate provisioning page\n" );return false; } +kmemleak_ignore (p);opal_xive_donate_page (chip,__pa (p)); }return true;
arch/s390/include/asm/numa.h +0 -1
@@ -17,7 +17,6 @@void numa_setup (void );int numa_pfn_to_nid (unsigned long pfn); -int __node_distance (int a,int b);void numa_update_cpu_topology (void );extern cpumask_t node_to_cpumask_map[MAX_NUMNODES ];
arch/s390/include/asm/topology.h +0 -2
@@ -83,8 +83,6 @@ static inline const struct cpumask *cpumask_of_node(int node)#define pcibus_to_node (bus) __pcibus_to_node(bus) -#define node_distance (a, b) __node_distance(a, b) -#else /* !CONFIG_NUMA */ #define numa_node_id numa_node_id
arch/s390/numa/numa.c +0 -6
@@ -49,12 +49,6 @@ void numa_update_cpu_topology(void) mode->update_cpu_topology (); } -int __node_distance (int a,int b) -{ -return mode->distance ? mode->distance (a, b) :0 ; -} -EXPORT_SYMBOL (__node_distance); -int numa_debug_enabled;/*
arch/x86/kernel/smpboot.c +20 -6
@@ -1599,14 +1599,28 @@ int native_cpu_disable(void)if (ret)return ret; -/* -* Disable the local APIC. Otherwise IPI broadcasts will reach -* it. It still responds normally to INIT, NMI, SMI, and SIPI -* messages. -*/ -apic_soft_disable ();cpu_disable_common (); +/* +* Disable the local APIC. Otherwise IPI broadcasts will reach +* it. It still responds normally to INIT, NMI, SMI, and SIPI +* messages. +* +* Disabling the APIC must happen after cpu_disable_common() +* which invokes fixup_irqs(). +* +* Disabling the APIC preserves already set bits in IRR, but +* an interrupt arriving after disabling the local APIC does not +* set the corresponding IRR bit. +* +* fixup_irqs() scans IRR for set bits so it can raise a not +* yet handled interrupt on the new destination CPU via an IPI +* but obviously it can't do so for IRR bits which are not set. +* IOW, interrupts arriving after disabling the local APIC will +* be lost. +*/ +apic_soft_disable (); +return 0 ; }
block/bfq-cgroup.c +1 -1
@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg)kfree (bfqg); } -void bfqg_and_blkg_get (struct bfq_group *bfqg) +static void bfqg_and_blkg_get (struct bfq_group *bfqg) {/* see comments in bfq_bic_update_cgroup for why refcounting bfqg */ bfqg_get (bfqg);
block/bfq-iosched.h +0 -1
@@ -980,7 +980,6 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,struct blkcg_gq *bfqg_to_blkg (struct bfq_group *bfqg);struct bfq_group *bfqq_group (struct bfq_queue *bfqq);struct bfq_group *bfq_create_group_hierarchy (struct bfq_data *bfqd,int node); -void bfqg_and_blkg_get (struct bfq_group *bfqg);void bfqg_and_blkg_put (struct bfq_group *bfqg);#ifdef CONFIG_BFQ_GROUP_IOSCHED
block/bfq-wf2q.c +2 -10
@@ -536,9 +536,7 @@ static void bfq_get_entity(struct bfq_entity *entity) bfqq->ref++;bfq_log_bfqq (bfqq->bfqd, bfqq,"get_entity: %p %d" , bfqq, bfqq->ref); - } else -bfqg_and_blkg_get (container_of (entity ,struct bfq_group , -entity )); + } }/**
@@ -652,14 +650,8 @@ static void bfq_forget_entity(struct bfq_service_tree *st, entity->on_st = false; st->wsum -= entity->weight; -if (is_in_service) -return ; - -if (bfqq) +if (bfqq && !is_in_service)bfq_put_queue (bfqq); -else - bfqg_and_blkg_put(container_of(entity, struct bfq_group, - entity)); }/**
block/bio.c +5 -5
@@ -683,8 +683,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv, struct page *page, unsigned int len, unsigned int off, bool *same_page) { - phys_addr_t vec_end_addr = page_to_phys(bv->bv_page) + - bv->bv_offset + bv->bv_len -1 ; + size_t bv_end = bv->bv_offset + bv->bv_len; +phys_addr_t vec_end_addr =page_to_phys (bv->bv_page) + bv_end -1 ;phys_addr_t page_addr =page_to_phys (page);if (vec_end_addr +1 != page_addr + off)
@@ -693,9 +693,9 @@ static inline bool page_is_mergeable(const struct bio_vec *bv,return false; *same_page = ((vec_end_addr &PAGE_MASK ) == page_addr); -if (!*same_page &&pfn_to_page (PFN_DOWN (vec_end_addr)) +1 != page) -return false; -return true; +if (*same_page) +return true; +return (bv->bv_page + bv_end /PAGE_SIZE ) == (page + off /PAGE_SIZE ); } static bool bio_try_merge_pc_page(struct request_queue *q, struct bio *bio,
block/blk-cgroup.c +5 -3
@@ -1219,13 +1219,15 @@ int blkcg_init_queue(struct request_queue *q)if (preloaded)radix_tree_preload_end (); - ret =blk_iolatency_init (q); + ret =blk_throtl_init (q);if (ret) goto err_destroy_all; - ret =blk_throtl_init (q); -if (ret) + ret =blk_iolatency_init (q); +if (ret) { +blk_throtl_exit (q); goto err_destroy_all; + }return 0 ; err_destroy_all:
block/blk-merge.c +10 -3
@@ -154,7 +154,7 @@ static inline unsigned get_max_io_size(struct request_queue *q,if (max_sectors > start_offset)return max_sectors - start_offset; -return sectors & (lbs -1 ); +return sectors & ~(lbs -1 ); } static inline unsigned get_max_segment_size(const struct request_queue *q,
@@ -553,10 +553,17 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq, }EXPORT_SYMBOL (blk_rq_map_sg); +static inline unsigned int blk_rq_get_max_segments (struct request *rq) +{ +if (req_op (rq) ==REQ_OP_DISCARD ) +return queue_max_discard_segments (rq->q); +return queue_max_segments (rq->q); +} +static inline int ll_new_hw_segment (struct request *req,struct bio *bio,unsigned int nr_phys_segs) { -if (req->nr_phys_segments + nr_phys_segs >queue_max_segments (req->q)) +if (req->nr_phys_segments + nr_phys_segs >blk_rq_get_max_segments (req)) goto no_merge;if (blk_integrity_merge_bio (req->q, req, bio) == false)
@@ -640,7 +647,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,return 0 ; total_phys_segments = req->nr_phys_segments + next->nr_phys_segments; -if (total_phys_segments >queue_max_segments (q)) +if (total_phys_segments >blk_rq_get_max_segments (req))return 0 ;if (blk_integrity_merge_rq (q, req, next) == false)
block/blk-mq-sched.c +9 -0
@@ -77,6 +77,15 @@ void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx)return ;clear_bit (BLK_MQ_S_SCHED_RESTART , &hctx->state); +/* +* Order clearing SCHED_RESTART and list_empty_careful(&hctx->dispatch) +* in blk_mq_run_hw_queue(). Its pair is the barrier in +* blk_mq_dispatch_rq_list(). So dispatch code won't see SCHED_RESTART, +* meantime new request added to hctx->dispatch is missed to check in +* blk_mq_run_hw_queue(). +*/ +smp_mb (); +blk_mq_run_hw_queue (hctx, true); }
block/blk-mq.c +11 -1
@@ -1318,6 +1318,15 @@ bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list,list_splice_tail_init (list, &hctx->dispatch);spin_unlock (&hctx->lock); +/* +* Order adding requests to hctx->dispatch and checking +* SCHED_RESTART flag. The pair of this smp_mb() is the one +* in blk_mq_sched_restart(). Avoid restart code path to +* miss the new added requests to hctx->dispatch, meantime +* SCHED_RESTART is observed here. +*/ +smp_mb (); +/* * If SCHED_RESTART was set by the caller of this function and * it is no longer set that means that it was cleared by another
@@ -1869,7 +1878,8 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,if (bypass_insert)return BLK_STS_RESOURCE ; -blk_mq_request_bypass_insert (rq, false, run_queue); +blk_mq_sched_insert_request (rq, false, run_queue, false); +return BLK_STS_OK ; }
crypto/af_alg.c +10 -3
@@ -16,6 +16,7 @@#include <linux/module.h> #include <linux/net.h> #include <linux/rwsem.h> +#include <linux/sched.h> #include <linux/sched/signal.h> #include <linux/security.h>
@@ -847,9 +848,15 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, }lock_sock (sk); -if (ctx->init && (init || !ctx->more)) { - err = -EINVAL ; - goto unlock; +if (ctx->init && !ctx->more) { +if (ctx->used) { + err = -EINVAL ; + goto unlock; + } + +pr_info_once ( +"%s sent an empty control message without MSG_MORE.\n" , + current->comm); } ctx->init = true;
drivers/base/core.c +8 -4
@@ -3400,9 +3400,9 @@ static inline bool fwnode_is_primary(struct fwnode_handle *fwnode)*/ void set_primary_fwnode (struct device *dev,struct fwnode_handle *fwnode) { -if (fwnode) { -struct fwnode_handle *fn = dev->fwnode; +struct fwnode_handle *fn = dev->fwnode; +if (fwnode) {if (fwnode_is_primary (fn)) fn = fn->secondary;
@@ -3412,8 +3412,12 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) } dev->fwnode = fwnode; }else { - dev->fwnode =fwnode_is_primary (dev->fwnode) ? - dev->fwnode->secondary :NULL ; +if (fwnode_is_primary (fn)) { + dev->fwnode = fn->secondary; + fn->secondary =NULL ; + }else { + dev->fwnode =NULL ; + } } }EXPORT_SYMBOL_GPL (set_primary_fwnode);
drivers/base/power/main.c +10 -6
@@ -1728,13 +1728,17 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) }/* -* If a device configured to wake up the system from sleep states -* has been suspended at run time and there's a resume request pending -* for it, this is equivalent to the device signaling wakeup, so the -* system suspend operation should be aborted. +* Wait for possible runtime PM transitions of the device in progress +* to complete and if there's a runtime resume request pending for it, +* resume it before proceeding with invoking the system-wide suspend +* callbacks for it. +* +* If the system-wide suspend callbacks below change the configuration +* of the device, they must disable runtime PM for it or otherwise +* ensure that its runtime-resume callbacks will not be confused by that +* change in case they are invoked going forward. */ -if (pm_runtime_barrier (dev) &&device_may_wakeup (dev)) -pm_wakeup_event (dev,0 ); +pm_runtime_barrier (dev);if (pm_wakeup_pending ()) { dev->power.direct_complete = false;
drivers/block/loop.c +18 -15
@@ -863,6 +863,7 @@ static void loop_config_discard(struct loop_device *lo)struct file *file = lo->lo_backing_file;struct inode *inode = file->f_mapping->host;struct request_queue *q = lo->lo_queue; +u32 granularity, max_discard_sectors;/* * If the backing device is a block device, mirror its zeroing
@@ -875,11 +876,10 @@ static void loop_config_discard(struct loop_device *lo)struct request_queue *backingq; backingq =bdev_get_queue (inode->i_bdev); -blk_queue_max_discard_sectors (q, - backingq->limits.max_write_zeroes_sectors); -blk_queue_max_write_zeroes_sectors (q, - backingq->limits.max_write_zeroes_sectors); + max_discard_sectors = backingq->limits.max_write_zeroes_sectors; + granularity = backingq->limits.discard_granularity ?: +queue_physical_block_size (backingq);/* * We use punch hole to reclaim the free space used by the
@@ -888,23 +888,26 @@ static void loop_config_discard(struct loop_device *lo)* useful information. */ }else if (!file->f_op->fallocate || lo->lo_encrypt_key_size) { - q->limits.discard_granularity =0 ; - q->limits.discard_alignment =0 ; -blk_queue_max_discard_sectors (q,0 ); -blk_queue_max_write_zeroes_sectors (q,0 ); + max_discard_sectors =0 ; + granularity =0 ; }else { - q->limits.discard_granularity = inode->i_sb->s_blocksize; - q->limits.discard_alignment =0 ; - -blk_queue_max_discard_sectors (q,UINT_MAX >>9 ); -blk_queue_max_write_zeroes_sectors (q,UINT_MAX >>9 ); + max_discard_sectors =UINT_MAX >>9 ; + granularity = inode->i_sb->s_blocksize; } -if (q->limits.max_write_zeroes_sectors) +if (max_discard_sectors) { + q->limits.discard_granularity = granularity; +blk_queue_max_discard_sectors (q, max_discard_sectors); +blk_queue_max_write_zeroes_sectors (q, max_discard_sectors);blk_queue_flag_set (QUEUE_FLAG_DISCARD , q); -else + }else { + q->limits.discard_granularity =0 ; +blk_queue_max_discard_sectors (q,0 ); +blk_queue_max_write_zeroes_sectors (q,0 );blk_queue_flag_clear (QUEUE_FLAG_DISCARD , q); + } + q->limits.discard_alignment =0 ; }static void loop_unprepare_queue (struct loop_device *lo)
drivers/block/null_blk_main.c +1 -1
@@ -1072,7 +1072,7 @@ static int null_handle_rq(struct nullb_cmd *cmd) len = bvec.bv_len; err =null_transfer (nullb, bvec.bv_page, len, bvec.bv_offset,op_is_write (req_op (rq)), sector, -req_op (rq) &REQ_FUA ); + rq->cmd_flags &REQ_FUA );if (err) {spin_unlock_irq (&nullb->lock);return err;
drivers/block/virtio_blk.c +23 -8
@@ -205,16 +205,31 @@ static int virtblk_setup_discard_write_zeroes(struct request *req, bool unmap)if (!range)return -ENOMEM ; -__rq_for_each_bio (bio, req) { -u64 sector = bio->bi_iter.bi_sector; -u32 num_sectors = bio->bi_iter.bi_size >>SECTOR_SHIFT ; - - range[n].flags =cpu_to_le32 (flags); - range[n].num_sectors =cpu_to_le32 (num_sectors); - range[n].sector =cpu_to_le64 (sector); - n++; +/* +* Single max discard segment means multi-range discard isn't +* supported, and block layer only runs contiguity merge like +* normal RW request. So we can't reply on bio for retrieving +* each range info. +*/ +if (queue_max_discard_segments (req->q) ==1 ) { + range[0 ].flags =cpu_to_le32 (flags); + range[0 ].num_sectors =cpu_to_le32 (blk_rq_sectors (req)); + range[0 ].sector =cpu_to_le64 (blk_rq_pos (req)); + n =1 ; + }else { +__rq_for_each_bio (bio, req) { +u64 sector = bio->bi_iter.bi_sector; +u32 num_sectors = bio->bi_iter.bi_size >>SECTOR_SHIFT ; + + range[n].flags =cpu_to_le32 (flags); + range[n].num_sectors =cpu_to_le32 (num_sectors); + range[n].sector =cpu_to_le64 (sector); + n++; + } } +WARN_ON_ONCE (n != segments); + req->special_vec.bv_page =virt_to_page (range); req->special_vec.bv_offset =offset_in_page (range); req->special_vec.bv_len =sizeof (*range) * segments;
drivers/cpufreq/intel_pstate.c +12 -6
@@ -649,11 +649,12 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data,mutex_lock (&intel_pstate_limits_lock);if (boot_cpu_has (X86_FEATURE_HWP_EPP )) { -u64 value; - - ret =rdmsrl_on_cpu (cpu_data->cpu,MSR_HWP_REQUEST , &value); -if (ret) - goto return_pref; +/* +* Use the cached HWP Request MSR value, because the register +* itself may be updated by intel_pstate_hwp_boost_up() or +* intel_pstate_hwp_boost_down() at any time. +*/ +u64 value =READ_ONCE (cpu_data->hwp_req_cached); value &= ~GENMASK_ULL (31 ,24 );
@@ -661,13 +662,18 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data, epp = epp_values[pref_index -1 ]; value |= (u64 )epp <<24 ; +/* +* The only other updater of hwp_req_cached in the active mode, +* intel_pstate_hwp_set(), is called under the same lock as this +* function, so it cannot run in parallel with the update below. +*/ +WRITE_ONCE (cpu_data->hwp_req_cached, value); ret =wrmsrl_on_cpu (cpu_data->cpu,MSR_HWP_REQUEST , value); }else {if (epp == -EINVAL ) epp = (pref_index -1 ) <<2 ; ret =intel_pstate_set_epb (cpu_data->cpu, epp); } -return_pref:mutex_unlock (&intel_pstate_limits_lock);return ret;
drivers/devfreq/rk3399_dmc.c +32 -19
88 lines not on this page · raw message
drivers/edac/i7core_edac.c +2 -2
@@ -1711,9 +1711,9 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) - tp_event =HW_EVENT_ERR_FATAL ; -else tp_event =HW_EVENT_ERR_UNCORRECTED ; +else + tp_event =HW_EVENT_ERR_FATAL ; }else { tp_event =HW_EVENT_ERR_CORRECTED ; }
drivers/edac/ie31200_edac.c +47 -3
88 lines not on this page · raw message
drivers/edac/pnd2_edac.c +1 -1
@@ -1155,7 +1155,7 @@ static void pnd2_mce_output_error(struct mem_ctl_info *mci, const struct mce *m,u32 optypenum =GET_BITFIELD (m->status,4 ,6 );int rc; - tp_event = uc_err ? (ripv ?HW_EVENT_ERR_FATAL :HW_EVENT_ERR_UNCORRECTED ) : + tp_event = uc_err ? (ripv ?HW_EVENT_ERR_UNCORRECTED :HW_EVENT_ERR_FATAL ) :HW_EVENT_ERR_CORRECTED ;/*
drivers/edac/sb_edac.c +10 -15
@@ -254,18 +254,20 @@ static const u32 rir_offset[MAX_RIR_RANGES][MAX_RIR_WAY] = {* FIXME: Implement the error count reads directly */ -static const u32 correrrcnt[] = { -0x104 ,0x108 ,0x10c ,0x110 , -}; -#define RANK_ODD_OV (reg) GET_BITFIELD(reg, 31, 31)#define RANK_ODD_ERR_CNT (reg) GET_BITFIELD(reg, 16, 30)#define RANK_EVEN_OV (reg) GET_BITFIELD(reg, 15, 15)#define RANK_EVEN_ERR_CNT (reg) GET_BITFIELD(reg, 0, 14) +#if 0 /* Currently unused*/ +static const u32 correrrcnt[] = { +0x104 ,0x108 ,0x10c ,0x110 , +}; +static const u32 correrrthrsld[] = {0x11c ,0x120 ,0x124 ,0x128 , }; +#endif #define RANK_ODD_ERR_THRSLD (reg) GET_BITFIELD(reg, 16, 30)#define RANK_EVEN_ERR_THRSLD (reg) GET_BITFIELD(reg, 0, 14)
@@ -1340,7 +1342,7 @@ static void knl_show_mc_route(u32 reg, char *s)*/ static int knl_get_dimm_capacity (struct sbridge_pvt *pvt,u64 *mc_sizes) { -u64 sad_base, sad_size, sad_limit =0 ; +u64 sad_base, sad_limit =0 ;u64 tad_base, tad_size, tad_limit, tad_deadspace, tad_livespace;int sad_rule =0 ;int tad_rule =0 ;
@@ -1427,7 +1429,6 @@ static int knl_get_dimm_capacity(struct sbridge_pvt *pvt, u64 *mc_sizes) edram_only =KNL_EDRAM_ONLY (dram_rule); sad_limit = pvt->info.sad_limit (dram_rule)+1 ; - sad_size = sad_limit - sad_base;pci_read_config_dword (pvt->pci_sad0, pvt->info.interleave_list[sad_rule], &interleave_reg);
@@ -2952,7 +2953,7 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,struct mem_ctl_info *new_mci;struct sbridge_pvt *pvt = mci->pvt_info;enum hw_event_mc_err_type tp_event; -char *type, *optype, msg[256 ]; +char *optype, msg[256 ];bool ripv =GET_BITFIELD (m->mcgstatus,0 ,0 );bool overflow =GET_BITFIELD (m->status,62 ,62 );bool uncorrected_error =GET_BITFIELD (m->status,61 ,61 );
@@ -2981,14 +2982,11 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - type ="FATAL" ; - tp_event =HW_EVENT_ERR_FATAL ; - }else { - type ="NON_FATAL" ; tp_event =HW_EVENT_ERR_UNCORRECTED ; + }else { + tp_event =HW_EVENT_ERR_FATAL ; } }else { - type ="CORRECTED" ; tp_event =HW_EVENT_ERR_CORRECTED ; }
@@ -3200,7 +3198,6 @@ static struct notifier_block sbridge_mce_dec = {static void sbridge_unregister_mci (struct sbridge_dev *sbridge_dev) {struct mem_ctl_info *mci = sbridge_dev->mci; -struct sbridge_pvt *pvt;if (unlikely (!mci || !mci->pvt_info)) {edac_dbg (0 ,"MC: dev = %p\n" , &sbridge_dev->pdev[0 ]->dev);
@@ -3209,8 +3206,6 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)return ; } - pvt = mci->pvt_info; -edac_dbg (0 ,"MC: mci = %p, dev = %p\n" , mci, &sbridge_dev->pdev[0 ]->dev);
drivers/edac/skx_common.c +3 -6
@@ -475,7 +475,7 @@ static void skx_mce_output_error(struct mem_ctl_info *mci, struct decoded_addr *res) {enum hw_event_mc_err_type tp_event; -char *type, *optype; +char *optype;bool ripv =GET_BITFIELD (m->mcgstatus,0 ,0 );bool overflow =GET_BITFIELD (m->status,62 ,62 );bool uncorrected_error =GET_BITFIELD (m->status,61 ,61 );
@@ -490,14 +490,11 @@ static void skx_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - type ="FATAL" ; - tp_event =HW_EVENT_ERR_FATAL ; - }else { - type ="NON_FATAL" ; tp_event =HW_EVENT_ERR_UNCORRECTED ; + }else { + tp_event =HW_EVENT_ERR_FATAL ; } }else { - type ="CORRECTED" ; tp_event =HW_EVENT_ERR_CORRECTED ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +12 -4
@@ -719,8 +719,10 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (encoder) {
@@ -857,8 +859,10 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =amdgpu_connector_best_single_encoder (connector);
@@ -980,8 +984,10 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&amdgpu_connector_check_hpd_status_unchanged (connector)) {
@@ -1330,8 +1336,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&amdgpu_connector_check_hpd_status_unchanged (connector)) {
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +3 -2
@@ -282,7 +282,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, ret =pm_runtime_get_sync (dev->dev);if (ret <0 ) -return ret; + goto out; ret =drm_crtc_helper_set_config (set, ctx);
@@ -297,7 +297,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,take the current one */ if (active && !adev->have_disp_power_ref) { adev->have_disp_power_ref = true; -return ret; + goto out; }/* if we have no active crtcs, then drop the power ref we got before */
@@ -306,6 +306,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, adev->have_disp_power_ref = false; } +out:/* drop the power reference we got coming in here */ pm_runtime_put_autosuspend (dev->dev);return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -1286,11 +1286,12 @@ long amdgpu_drm_ioctl(struct file *filp, dev = file_priv->minor->dev; ret =pm_runtime_get_sync (dev->dev);if (ret <0 ) -return ret; + goto out; ret =drm_ioctl (filp, cmd, arg);pm_runtime_mark_last_busy (dev->dev); +out:pm_runtime_put_autosuspend (dev->dev);return ret; }
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +6 -1
@@ -638,8 +638,12 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file* in the bitfields */ if (se_num ==AMDGPU_INFO_MMR_SE_INDEX_MASK ) se_num =0xffffffff ; +else if (se_num >=AMDGPU_GFX_MAX_SE ) +return -EINVAL ;if (sh_num ==AMDGPU_INFO_MMR_SH_INDEX_MASK ) sh_num =0xffffffff ; +else if (sh_num >=AMDGPU_GFX_MAX_SH_PER_SE ) +return -EINVAL ;if (info->read_mmr_reg.count >128 )return -EINVAL ;
@@ -976,7 +980,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) r =pm_runtime_get_sync (dev->dev);if (r <0 ) -return r; + goto pm_put; fpriv =kzalloc (sizeof (*fpriv),GFP_KERNEL );if (unlikely (!fpriv)) {
@@ -1027,6 +1031,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) out_suspend:pm_runtime_mark_last_busy (dev->dev); +pm_put:pm_runtime_put_autosuspend (dev->dev);return r;
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2 -4
@@ -4094,10 +4094,8 @@ static void gfx_v10_0_update_medium_grain_clock_gating(struct amdgpu_device *ade def = data =RREG32_SOC15 (GC ,0 , mmRLC_CGTT_MGCG_OVERRIDE); data &= ~(RLC_CGTT_MGCG_OVERRIDE__GRBM_CGTT_SCLK_OVERRIDE_MASK |RLC_CGTT_MGCG_OVERRIDE__GFXIP_MGCG_OVERRIDE_MASK | -RLC_CGTT_MGCG_OVERRIDE__GFXIP_MGLS_OVERRIDE_MASK ); - -/* only for Vega10 & Raven1 */ - data |=RLC_CGTT_MGCG_OVERRIDE__RLC_CGTT_SCLK_OVERRIDE_MASK ; +RLC_CGTT_MGCG_OVERRIDE__GFXIP_MGLS_OVERRIDE_MASK | +RLC_CGTT_MGCG_OVERRIDE__ENABLE_CGTS_LEGACY_MASK );if (def != data)WREG32_SOC15 (GC ,0 , mmRLC_CGTT_MGCG_OVERRIDE, data);
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +15 -5
@@ -612,8 +612,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev, ret =kobject_init_and_add (dev->kobj_node, &node_type, sys_props.kobj_nodes,"%d" , id); -if (ret <0 ) +if (ret <0 ) { +kobject_put (dev->kobj_node);return ret; + } dev->kobj_mem =kobject_create_and_add ("mem_banks" , dev->kobj_node);if (!dev->kobj_mem)
@@ -660,8 +662,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (mem->kobj, &mem_type, dev->kobj_mem,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (mem->kobj);return ret; + } mem->attr.name ="properties" ; mem->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -679,8 +683,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (cache->kobj, &cache_type, dev->kobj_cache,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (cache->kobj);return ret; + } cache->attr.name ="properties" ; cache->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -698,8 +704,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (iolink->kobj, &iolink_type, dev->kobj_iolink,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (iolink->kobj);return ret; + } iolink->attr.name ="properties" ; iolink->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -779,8 +787,10 @@ static int kfd_topology_update_sysfs(void) ret =kobject_init_and_add (sys_props.kobj_topology, &sysprops_type, &kfd_device->kobj,"topology" ); -if (ret <0 ) +if (ret <0 ) { +kobject_put (sys_props.kobj_topology);return ret; + } sys_props.kobj_nodes =kobject_create_and_add ("nodes" , sys_props.kobj_topology);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +58 -0
70 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +8 -8
@@ -121,35 +121,35 @@ void enc1_update_generic_info_packet(switch (packet_index) {case 0 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC0_FRAME_UPDATE ,1 ); +AFMT_GENERIC0_IMMEDIATE_UPDATE ,1 );break ;case 1 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC1_FRAME_UPDATE ,1 ); +AFMT_GENERIC1_IMMEDIATE_UPDATE ,1 );break ;case 2 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC2_FRAME_UPDATE ,1 ); +AFMT_GENERIC2_IMMEDIATE_UPDATE ,1 );break ;case 3 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC3_FRAME_UPDATE ,1 ); +AFMT_GENERIC3_IMMEDIATE_UPDATE ,1 );break ;case 4 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC4_FRAME_UPDATE ,1 ); +AFMT_GENERIC4_IMMEDIATE_UPDATE ,1 );break ;case 5 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC5_FRAME_UPDATE ,1 ); +AFMT_GENERIC5_IMMEDIATE_UPDATE ,1 );break ;case 6 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC6_FRAME_UPDATE ,1 ); +AFMT_GENERIC6_IMMEDIATE_UPDATE ,1 );break ;case 7 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC7_FRAME_UPDATE ,1 ); +AFMT_GENERIC7_IMMEDIATE_UPDATE ,1 );break ;default :break ;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +14 -0
@@ -275,7 +275,14 @@ struct dcn10_stream_enc_registers {SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC2_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC3_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC4_FRAME_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC0_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC1_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC2_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC3_IMMEDIATE_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC4_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC5_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC6_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC7_IMMEDIATE_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC5_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC6_FRAME_UPDATE , mask_sh),\ SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL1, AFMT_GENERIC7_FRAME_UPDATE, mask_sh),\
@@ -339,7 +346,14 @@ struct dcn10_stream_enc_registers {type AFMT_GENERIC2_FRAME_UPDATE ;\type AFMT_GENERIC3_FRAME_UPDATE ;\type AFMT_GENERIC4_FRAME_UPDATE ;\ +type AFMT_GENERIC0_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC1_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC2_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC3_IMMEDIATE_UPDATE ;\type AFMT_GENERIC4_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC5_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC6_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC7_IMMEDIATE_UPDATE ;\type AFMT_GENERIC5_FRAME_UPDATE ;\type AFMT_GENERIC6_FRAME_UPDATE ;\type AFMT_GENERIC7_FRAME_UPDATE ;\
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +3 -6
@@ -209,8 +209,7 @@ static int smu10_set_min_deep_sleep_dcefclk(struct pp_hwmgr *hwmgr, uint32_t clo {struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend); -if (smu10_data->need_min_deep_sleep_dcefclk && - smu10_data->deep_sleep_dcefclk != clock) { +if (clock && smu10_data->deep_sleep_dcefclk != clock) { smu10_data->deep_sleep_dcefclk = clock; smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetMinDeepSleepDcefclk,
@@ -223,8 +222,7 @@ static int smu10_set_hard_min_dcefclk_by_freq(struct pp_hwmgr *hwmgr, uint32_t c {struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend); -if (smu10_data->dcf_actual_hard_min_freq && - smu10_data->dcf_actual_hard_min_freq != clock) { +if (clock && smu10_data->dcf_actual_hard_min_freq != clock) { smu10_data->dcf_actual_hard_min_freq = clock; smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetHardMinDcefclkByFreq,
@@ -237,8 +235,7 @@ static int smu10_set_hard_min_fclk_by_freq(struct pp_hwmgr *hwmgr, uint32_t cloc {struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend); -if (smu10_data->f_actual_hard_min_freq && - smu10_data->f_actual_hard_min_freq != clock) { +if (clock && smu10_data->f_actual_hard_min_freq != clock) { smu10_data->f_actual_hard_min_freq = clock; smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetHardMinFclkByFreq,
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +12 -10
@@ -364,17 +364,19 @@ int vega10_thermal_get_temperature(struct pp_hwmgr *hwmgr)static int vega10_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range) { +struct phm_ppt_v2_information *pp_table_info = + (struct phm_ppt_v2_information *)(hwmgr->pptable); +struct phm_tdp_table *tdp_table = pp_table_info->tdp_table;struct amdgpu_device *adev = hwmgr->adev; -int low =VEGA10_THERMAL_MINIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; -int high =VEGA10_THERMAL_MAXIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +int low =VEGA10_THERMAL_MINIMUM_ALERT_TEMP ; +int high =VEGA10_THERMAL_MAXIMUM_ALERT_TEMP ;uint32_t val; -if (low < range->min) - low = range->min; -if (high > range->max) - high = range->max; +/* compare them in unit celsius degree */ +if (low < range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + low = range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +if (high > tdp_table->usSoftwareShutdownTemp) + high = tdp_table->usSoftwareShutdownTemp;if (low > high)return -EINVAL ;
@@ -383,8 +385,8 @@ static int vega10_thermal_set_temperature_range(struct pp_hwmgr *hwmgr, val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,MAX_IH_CREDIT ,5 ); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_IH_HW_ENA ,1 ); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , (low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , high); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , low); val &= (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK ) & (~THM_THERMAL_INT_CTRL__THERM_INTH_MASK_MASK ) & (~THM_THERMAL_INT_CTRL__THERM_INTL_MASK_MASK );
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c +11 -10
@@ -170,17 +170,18 @@ int vega12_thermal_get_temperature(struct pp_hwmgr *hwmgr)static int vega12_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range) { +struct phm_ppt_v3_information *pptable_information = + (struct phm_ppt_v3_information *)hwmgr->pptable;struct amdgpu_device *adev = hwmgr->adev; -int low =VEGA12_THERMAL_MINIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; -int high =VEGA12_THERMAL_MAXIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +int low =VEGA12_THERMAL_MINIMUM_ALERT_TEMP ; +int high =VEGA12_THERMAL_MAXIMUM_ALERT_TEMP ;uint32_t val; -if (low < range->min) - low = range->min; -if (high > range->max) - high = range->max; +/* compare them in unit celsius degree */ +if (low < range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + low = range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +if (high > pptable_information->us_software_shutdown_temp) + high = pptable_information->us_software_shutdown_temp;if (low > high)return -EINVAL ;
@@ -189,8 +190,8 @@ static int vega12_thermal_set_temperature_range(struct pp_hwmgr *hwmgr, val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,MAX_IH_CREDIT ,5 ); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_IH_HW_ENA ,1 ); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , (low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , high); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , low); val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL, val);
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +19 -25
74 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c +11 -10
@@ -240,17 +240,18 @@ int vega20_thermal_get_temperature(struct pp_hwmgr *hwmgr)static int vega20_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range) { +struct phm_ppt_v3_information *pptable_information = + (struct phm_ppt_v3_information *)hwmgr->pptable;struct amdgpu_device *adev = hwmgr->adev; -int low =VEGA20_THERMAL_MINIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; -int high =VEGA20_THERMAL_MAXIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +int low =VEGA20_THERMAL_MINIMUM_ALERT_TEMP ; +int high =VEGA20_THERMAL_MAXIMUM_ALERT_TEMP ;uint32_t val; -if (low < range->min) - low = range->min; -if (high > range->max) - high = range->max; +/* compare them in unit celsius degree */ +if (low < range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + low = range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +if (high > pptable_information->us_software_shutdown_temp) + high = pptable_information->us_software_shutdown_temp;if (low > high)return -EINVAL ;
@@ -259,8 +260,8 @@ static int vega20_thermal_set_temperature_range(struct pp_hwmgr *hwmgr, val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,MAX_IH_CREDIT ,5 ); val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_IH_HW_ENA ,1 ); - val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); - val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , (low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); + val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , high); + val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , low); val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL, val);
drivers/gpu/drm/i915/i915_cmd_parser.c +10 -4
@@ -1207,6 +1207,12 @@ static u32 *copy_batch(struct drm_i915_gem_object *dst_obj,return dst; } +static inline bool cmd_desc_is (const struct drm_i915_cmd_descriptor *const desc, +const u32 cmd) +{ +return desc->cmd.value == (cmd & desc->cmd.mask); +} +static bool check_cmd (const struct intel_engine_cs *engine,const struct drm_i915_cmd_descriptor *desc,const u32 *cmd,u32 length)
@@ -1245,19 +1251,19 @@ static bool check_cmd(const struct intel_engine_cs *engine,* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) { +if (cmd_desc_is (desc,MI_LOAD_REGISTER_MEM )) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false; } -if (desc->cmd.value ==MI_LOAD_REGISTER_REG ) { +if (cmd_desc_is (desc,MI_LOAD_REGISTER_REG )) {DRM_DEBUG_DRIVER ("CMD: Rejected LRR to masked register 0x%08X\n" , reg_addr);return false; } -if (desc->cmd.value ==MI_LOAD_REGISTER_IMM (1 ) && +if (cmd_desc_is (desc,MI_LOAD_REGISTER_IMM (1 )) && (offset +2 > length || (cmd[offset +1 ] & reg->mask) != reg->value)) { DRM_DEBUG_DRIVER("CMD: Rejected LRI to masked register 0x%08X\n",
@@ -1488,7 +1494,7 @@ int intel_engine_cmd_parser(struct i915_gem_context *ctx, goto err; } -if (desc->cmd.value ==MI_BATCH_BUFFER_START ) { +if (cmd_desc_is (desc,MI_BATCH_BUFFER_START )) { ret =check_bbstart (ctx, cmd, offset, length, batch_len, batch_start, shadow_batch_start);
drivers/gpu/drm/ingenic/ingenic-drm.c +3 -3
@@ -375,9 +375,9 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,if (state && state->fb) { addr =drm_fb_cma_get_gem_addr (state->fb, state,0 ); - width = state->crtc->state->adjusted_mode.hdisplay; - height = state->crtc->state->adjusted_mode.vdisplay; - cpp = state->fb->format->cpp[plane->index]; + width = state->src_w >>16 ; + height = state->src_h >>16 ; + cpp = state->fb->format->cpp[0 ]; priv->dma_hwdesc->addr = addr; priv->dma_hwdesc->cmd = width * height * cpp /4 ;
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1 -1
@@ -350,7 +350,7 @@ int adreno_hw_init(struct msm_gpu *gpu) ring->next = ring->start;/* reset completed fence seqno: */ - ring->memptrs->fence = ring->seqno; + ring->memptrs->fence = ring->fctx->completed_fence; ring->memptrs->rptr =0 ; }
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
@@ -2032,8 +2032,10 @@ nv50_disp_atomic_commit(struct drm_device *dev,int ret, i; ret =pm_runtime_get_sync (dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put_autosuspend (dev->dev);return ret; + } ret =drm_atomic_helper_setup_commit (state, nonblock);if (ret)
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -1
@@ -568,8 +568,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)pm_runtime_get_noresume (dev->dev); }else { ret =pm_runtime_get_sync (dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put_autosuspend (dev->dev);return conn_status; + } } nv_encoder =nouveau_connector_ddc_detect (connector);
drivers/gpu/drm/nouveau/nouveau_fbcon.c +3 -1
@@ -189,8 +189,10 @@ nouveau_fbcon_open(struct fb_info *info, int user)struct nouveau_fbdev *fbcon = info->par;struct nouveau_drm *drm =nouveau_drm (fbcon->helper.dev);int ret =pm_runtime_get_sync (drm->dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put (drm->dev->dev);return ret; + }return 0 ; }
drivers/gpu/drm/radeon/radeon_connectors.c +15 -5
@@ -883,8 +883,10 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (encoder) {
@@ -1029,8 +1031,10 @@ radeon_vga_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =radeon_best_single_encoder (connector);
@@ -1167,8 +1171,10 @@ radeon_tv_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =radeon_best_single_encoder (connector);
@@ -1251,8 +1257,10 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (radeon_connector->detected_hpd_without_ddc) {
@@ -1666,8 +1674,10 @@ radeon_dp_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&radeon_check_hpd_status_unchanged (connector)) {
drivers/gpu/drm/xen/xen_drm_front.c +1 -1
@@ -400,7 +400,7 @@ static int xen_drm_drv_dumb_create(struct drm_file *filp, args->size = args->pitch * args->height; obj =xen_drm_front_gem_create (dev, args->size); -if (IS_ERR_OR_NULL (obj)) { +if (IS_ERR (obj)) { ret =PTR_ERR (obj); goto fail; }
drivers/gpu/drm/xen/xen_drm_front_gem.c +4 -4
@@ -83,7 +83,7 @@ static struct xen_gem_object *gem_create(struct drm_device *dev, size_t size) size =round_up (size,PAGE_SIZE ); xen_obj =gem_create_obj (dev, size); -if (IS_ERR_OR_NULL (xen_obj)) +if (IS_ERR (xen_obj))return xen_obj;if (drm_info->front_info->cfg.be_alloc) {
@@ -117,7 +117,7 @@ static struct xen_gem_object *gem_create(struct drm_device *dev, size_t size)*/ xen_obj->num_pages =DIV_ROUND_UP (size,PAGE_SIZE ); xen_obj->pages =drm_gem_get_pages (&xen_obj->base); -if (IS_ERR_OR_NULL (xen_obj->pages)) { +if (IS_ERR (xen_obj->pages)) { ret =PTR_ERR (xen_obj->pages); xen_obj->pages =NULL ; goto fail;
@@ -136,7 +136,7 @@ struct drm_gem_object *xen_drm_front_gem_create(struct drm_device *dev,struct xen_gem_object *xen_obj; xen_obj =gem_create (dev, size); -if (IS_ERR_OR_NULL (xen_obj)) +if (IS_ERR (xen_obj))return ERR_CAST (xen_obj);return &xen_obj->base;
@@ -194,7 +194,7 @@ xen_drm_front_gem_import_sg_table(struct drm_device *dev, size = attach->dmabuf->size; xen_obj =gem_create_obj (dev, size); -if (IS_ERR_OR_NULL (xen_obj)) +if (IS_ERR (xen_obj))return ERR_CAST (xen_obj); ret =gem_alloc_pages_array (xen_obj, size);
drivers/gpu/drm/xen/xen_drm_front_kms.c +1 -1
@@ -60,7 +60,7 @@ fb_create(struct drm_device *dev, struct drm_file *filp,int ret; fb =drm_gem_fb_create_with_funcs (dev, filp, mode_cmd, &fb_funcs); -if (IS_ERR_OR_NULL (fb)) +if (IS_ERR (fb))return fb; gem_obj =drm_gem_object_lookup (filp, mode_cmd->handles[0 ]);
drivers/hid/hid-ids.h +1 -0
@@ -771,6 +771,7 @@#define USB_DEVICE_ID_LOGITECH_G27_WHEEL 0xc29b#define USB_DEVICE_ID_LOGITECH_WII_WHEEL 0xc29c#define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a +#define USB_DEVICE_ID_LOGITECH_GROUP_AUDIO 0x0882#define USB_DEVICE_ID_S510_RECEIVER 0xc50c#define USB_DEVICE_ID_S510_RECEIVER_2 0xc517#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500 0xc512
drivers/hid/hid-quirks.c +1 -0
@@ -179,6 +179,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, { 0 } };
drivers/hid/i2c-hid/i2c-hid-core.c +13 -9
@@ -422,6 +422,19 @@ static int i2c_hid_set_power(struct i2c_client *client, int power_state)dev_err (&client->dev,"failed to change power setting.\n" ); set_pwr_exit: + +/* +* The HID over I2C specification states that if a DEVICE needs time +* after the PWR_ON request, it should utilise CLOCK stretching. +* However, it has been observered that the Windows driver provides a +* 1ms sleep between the PWR_ON and RESET requests. +* According to Goodix Windows even waits 60 ms after (other?) +* PWR_ON requests. Testing has confirmed that several devices +* will not work properly without a delay after a PWR_ON request. +*/ +if (!ret && power_state ==I2C_HID_PWR_ON ) +msleep (60 ); +return ret; }
@@ -443,15 +456,6 @@ static int i2c_hid_hwreset(struct i2c_client *client)if (ret) goto out_unlock; -/* -* The HID over I2C specification states that if a DEVICE needs time -* after the PWR_ON request, it should utilise CLOCK stretching. -* However, it has been observered that the Windows driver provides a -* 1ms sleep between the PWR_ON and RESET requests and that some devices -* rely on this. -*/ -usleep_range (1000 ,5000 ); -i2c_hid_dbg (ihid,"resetting...\n" ); ret =i2c_hid_command (client, &hid_reset_cmd,NULL ,0 );
drivers/hid/usbhid/hiddev.c +4 -0
@@ -519,12 +519,16 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,switch (cmd) {case HIDIOCGUSAGE : +if (uref->usage_index >= field->report_count) + goto inval; uref->value = field->value[uref->usage_index];if (copy_to_user (user_arg, uref,sizeof (*uref))) goto fault; goto goodreturn;case HIDIOCSUSAGE : +if (uref->usage_index >= field->report_count) + goto inval; field->value[uref->usage_index] = uref->value; goto goodreturn;
drivers/hwmon/nct7904.c +2 -2
@@ -197,7 +197,7 @@ static int nct7904_read_fan(struct device *dev, u32 attr, int channel,if (ret <0 )return ret; cnt = ((ret &0xff00 ) >>3 ) | (ret &0x1f ); -if (cnt ==0x1fff ) +if (cnt ==0 || cnt ==0x1fff ) rpm =0 ;else rpm =1350000 / cnt;
@@ -209,7 +209,7 @@ static int nct7904_read_fan(struct device *dev, u32 attr, int channel,if (ret <0 )return ret; cnt = ((ret &0xff00 ) >>3 ) | (ret &0x1f ); -if (cnt ==0x1fff ) +if (cnt ==0 || cnt ==0x1fff ) rpm =0 ;else rpm =1350000 / cnt;
drivers/i2c/busses/i2c-rcar.c +1 -0
@@ -587,6 +587,7 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv)/* master sent stop */ if (ssr_filtered &SSR ) {i2c_slave_event (priv->slave,I2C_SLAVE_STOP , &value); +rcar_i2c_write (priv,ICSCR ,SIE |SDBS );/* clear our NACK */ rcar_i2c_write (priv,ICSIER ,SAR );rcar_i2c_write (priv,ICSSR , ~SSR &0xff ); }
drivers/i2c/i2c-core-base.c +1 -1
@@ -354,7 +354,7 @@ static int i2c_device_probe(struct device *dev)* or ACPI ID table is supplied for the probing device. */ if (!driver->id_table && - !i2c_acpi_match_device (dev->driver->acpi_match_table, client) && + !acpi_driver_match_device (dev, dev->driver) && !i2c_of_match_device (dev->driver->of_match_table, client)) { status = -ENODEV ; goto put_sync_adapter;
drivers/iommu/iova.c +3 -1
@@ -811,7 +811,9 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad)for (i =0 ; i < mag->size; ++i) {struct iova *iova =private_find_iova (iovad, mag->pfns[i]); -BUG_ON (!iova); +if (WARN_ON (!iova)) +continue ; +private_free_iova (iovad, iova); }
drivers/irqchip/irq-stm32-exti.c +12 -2
@@ -431,6 +431,16 @@ static void stm32_irq_ack(struct irq_data *d)irq_gc_unlock (gc); } +/* directly set the target bit without reading first. */ +static inline void stm32_exti_write_bit (struct irq_data *d,u32 reg) +{ +struct stm32_exti_chip_data *chip_data =irq_data_get_irq_chip_data (d); +void __iomem *base = chip_data->host_data->base; +u32 val =BIT (d->hwirq %IRQS_PER_BANK ); + +writel_relaxed (val, base + reg); +} +static inline u32 stm32_exti_set_bit (struct irq_data *d,u32 reg) {struct stm32_exti_chip_data *chip_data =irq_data_get_irq_chip_data (d);
@@ -464,9 +474,9 @@ static void stm32_exti_h_eoi(struct irq_data *d)raw_spin_lock (&chip_data->rlock); -stm32_exti_set_bit (d, stm32_bank->rpr_ofst); +stm32_exti_write_bit (d, stm32_bank->rpr_ofst);if (stm32_bank->fpr_ofst !=UNDEF_REG ) -stm32_exti_set_bit (d, stm32_bank->fpr_ofst); +stm32_exti_write_bit (d, stm32_bank->fpr_ofst);raw_spin_unlock (&chip_data->rlock);
drivers/media/cec/cec-api.c +7 -1
@@ -147,7 +147,13 @@ static long cec_adap_g_log_addrs(struct cec_adapter *adap,struct cec_log_addrs log_addrs;mutex_lock (&adap->lock); - log_addrs = adap->log_addrs; +/* +* We use memcpy here instead of assignment since there is a +* hole at the end of struct cec_log_addrs that an assignment +* might ignore. So when we do copy_to_user() we could leak +* one byte of memory. +*/ +memcpy (&log_addrs, &adap->log_addrs,sizeof (log_addrs));if (!adap->is_configured)memset (log_addrs.log_addr,CEC_LOG_ADDR_INVALID ,sizeof (log_addrs.log_addr));
drivers/media/pci/ttpci/av7110.c +3 -2
@@ -406,14 +406,15 @@ static void debiirq(unsigned long cookie)case DATA_CI_GET : {u8 *data = av7110->debi_virt; +u8 data_0 = data[0 ]; -if ((data[0 ] <2 ) && data[2 ] ==0xff ) { +if (data_0 <2 && data[2 ] ==0xff ) {int flags =0 ;if (data[5 ] >0 ) flags |=CA_CI_MODULE_PRESENT ;if (data[5 ] >5 ) flags |=CA_CI_MODULE_READY ; - av7110->ci_slot[data[0 ]].flags = flags; + av7110->ci_slot[data_0].flags = flags; }else ci_get_data(&av7110->ci_rbuffer, av7110->debi_virt,
drivers/media/platform/davinci/vpif_capture.c +0 -2
@@ -1482,8 +1482,6 @@ static int vpif_probe_complete(void)/* Unregister video device */ video_unregister_device (&ch->video_dev); } -kfree (vpif_obj.sd); -v4l2_device_unregister (&vpif_obj.v4l2_dev);return err; }
drivers/media/rc/gpio-ir-tx.c +1 -6
@@ -79,13 +79,8 @@ static int gpio_ir_tx(struct rc_dev *dev, unsigned int *txbuf,// space edge =ktime_add_us (edge, txbuf[i]); delta =ktime_us_delta (edge,ktime_get ()); -if (delta >10 ) { -spin_unlock_irqrestore (&gpio_ir->lock, flags); -usleep_range (delta, delta +10 ); -spin_lock_irqsave (&gpio_ir->lock, flags); - }else if (delta >0 ) { +if (delta >0 )udelay (delta); - } }else {// pulse ktime_t last =ktime_add_us (edge, txbuf[i]);
drivers/mfd/intel-lpss-pci.c +19 -0
@@ -196,6 +196,9 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x1ac4), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1ac6), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1aee), (kernel_ulong_t)&bxt_uart_info }, +/* EBG */ + { PCI_VDEVICE(INTEL, 0x1bad), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x1bae), (kernel_ulong_t)&bxt_uart_info },/* GLK */ { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&glk_i2c_info }, { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&glk_i2c_info },
@@ -225,6 +228,22 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x34ea), (kernel_ulong_t)&bxt_i2c_info }, { PCI_VDEVICE(INTEL, 0x34eb), (kernel_ulong_t)&bxt_i2c_info }, { PCI_VDEVICE(INTEL, 0x34fb), (kernel_ulong_t)&spt_info }, +/* TGL-H */ + { PCI_VDEVICE(INTEL, 0x43a7), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43a8), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43a9), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43aa), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43ab), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43ad), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43ae), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43d8), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43da), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43e8), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43e9), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43ea), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43eb), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43fb), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43fd), (kernel_ulong_t)&bxt_info },/* EHL */ { PCI_VDEVICE(INTEL, 0x4b28), (kernel_ulong_t)&bxt_uart_info }, { PCI_VDEVICE(INTEL, 0x4b29), (kernel_ulong_t)&bxt_uart_info },
drivers/net/ethernet/amazon/ena/ena_netdev.c +4 -1
@@ -2924,7 +2924,7 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter, }u64_stats_update_begin (&tx_ring->syncp); - tx_ring->tx_stats.missed_tx = missed_tx; + tx_ring->tx_stats.missed_tx += missed_tx;u64_stats_update_end (&tx_ring->syncp);return rc;
@@ -3848,6 +3848,9 @@ static void ena_keep_alive_wd(void *adapter_data, rx_drops = ((u64 )desc->rx_drops_high <<32 ) | desc->rx_drops_low;u64_stats_update_begin (&adapter->syncp); +/* These stats are accumulated by the device, so the counters indicate +* all drops since last reset. +*/ adapter->dev_stats.rx_drops = rx_drops;u64_stats_update_end (&adapter->syncp); }
drivers/net/ethernet/freescale/gianfar.c +3 -1
@@ -751,8 +751,10 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)continue ; err =gfar_parse_group (child, priv, model); -if (err) +if (err) { +of_node_put (child); goto err_grp_init; + } } }else {/* SQ_SG_MODE */ err =gfar_parse_group (np, priv, model);
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +1 -1
@@ -192,7 +192,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, }/* alloc the udl from per cpu ddp pool */ - ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_KERNEL , &ddp->udp); + ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_ATOMIC , &ddp->udp);if (!ddp->udl) {e_err (drv,"failed allocated ddp context\n" ); goto out_noddp_unmap;
drivers/net/ipvlan/ipvlan_main.c +22 -5
@@ -106,12 +106,21 @@ static void ipvlan_port_destroy(struct net_device *dev)kfree (port); } +#define IPVLAN_ALWAYS_ON_OFLOADS \ + (NETIF_F_SG | NETIF_F_HW_CSUM | \ + NETIF_F_GSO_ROBUST | NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ENCAP_ALL) + +#define IPVLAN_ALWAYS_ON \ + (IPVLAN_ALWAYS_ON_OFLOADS | NETIF_F_LLTX | NETIF_F_VLAN_CHALLENGED) +#define IPVLAN_FEATURES \ - (NETIF_F_SG | NETIF_F_CSUM_MASK | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ + (NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_GSO_ROBUST | \ NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \ NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER) +/* NETIF_F_GSO_ENCAP_ALL NETIF_F_GSO_SOFTWARE Newly added */ +#define IPVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -125,7 +134,9 @@ static int ipvlan_init(struct net_device *dev) dev->state = (dev->state & ~IPVLAN_STATE_MASK ) | (phy_dev->state &IPVLAN_STATE_MASK ); dev->features = phy_dev->features &IPVLAN_FEATURES ; - dev->features |=NETIF_F_LLTX |NETIF_F_VLAN_CHALLENGED ; + dev->features |=IPVLAN_ALWAYS_ON ; + dev->vlan_features = phy_dev->vlan_features &IPVLAN_FEATURES ; + dev->vlan_features |=IPVLAN_ALWAYS_ON_OFLOADS ; dev->hw_enc_features |= dev->features; dev->gso_max_size = phy_dev->gso_max_size; dev->gso_max_segs = phy_dev->gso_max_segs;
@@ -225,7 +236,14 @@ static netdev_features_t ipvlan_fix_features(struct net_device *dev, {struct ipvl_dev *ipvlan =netdev_priv (dev); -return features & (ipvlan->sfeatures | ~IPVLAN_FEATURES ); + features |=NETIF_F_ALL_FOR_ALL ; + features &= (ipvlan->sfeatures | ~IPVLAN_FEATURES ); + features =netdev_increment_features (ipvlan->phy_dev->features, + features, features); + features |=IPVLAN_ALWAYS_ON ; + features &= (IPVLAN_FEATURES |IPVLAN_ALWAYS_ON ); + +return features; }static void ipvlan_change_rx_flags (struct net_device *dev,int change)
@@ -732,10 +750,9 @@ static int ipvlan_device_event(struct notifier_block *unused,case NETDEV_FEAT_CHANGE :list_for_each_entry (ipvlan, &port->ipvlans, pnode) { - ipvlan->dev->features = dev->features &IPVLAN_FEATURES ; ipvlan->dev->gso_max_size = dev->gso_max_size; ipvlan->dev->gso_max_segs = dev->gso_max_segs; -netdev_features_change (ipvlan->dev); +netdev_update_features (ipvlan->dev); }break ;
drivers/net/macvlan.c +17 -4
@@ -1259,6 +1259,9 @@ static void macvlan_port_destroy(struct net_device *dev)static int macvlan_validate (struct nlattr *tb[],struct nlattr *data[],struct netlink_ext_ack *extack) { +struct nlattr *nla, *head; +int rem, len; +if (tb[IFLA_ADDRESS ]) {if (nla_len (tb[IFLA_ADDRESS ]) !=ETH_ALEN )return -EINVAL ;
@@ -1306,6 +1309,20 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[],return -EADDRNOTAVAIL ; } +if (data[IFLA_MACVLAN_MACADDR_DATA ]) { + head =nla_data (data[IFLA_MACVLAN_MACADDR_DATA ]); + len =nla_len (data[IFLA_MACVLAN_MACADDR_DATA ]); + +nla_for_each_attr (nla, head, len, rem) { +if (nla_type (nla) !=IFLA_MACVLAN_MACADDR || +nla_len (nla) !=ETH_ALEN ) +return -EINVAL ; + +if (!is_valid_ether_addr (nla_data (nla))) +return -EADDRNOTAVAIL ; + } + } +if (data[IFLA_MACVLAN_MACADDR_COUNT ])return -EINVAL ;
@@ -1362,10 +1379,6 @@ static int macvlan_changelink_sources(struct macvlan_dev *vlan, u32 mode, len =nla_len (data[IFLA_MACVLAN_MACADDR_DATA ]);nla_for_each_attr (nla, head, len, rem) { -if (nla_type (nla) !=IFLA_MACVLAN_MACADDR || -nla_len (nla) !=ETH_ALEN ) -continue ; - addr =nla_data (nla); ret =macvlan_hash_add_source (vlan, addr);if (ret)
drivers/net/wireless/ath/ath10k/hw.h +1 -1
@@ -810,7 +810,7 @@ ath10k_is_rssi_enable(struct ath10k_hw_params *hw,#define TARGET_10_4_TX_DBG_LOG_SIZE 1024#define TARGET_10_4_NUM_WDS_ENTRIES 32 -#define TARGET_10_4_DMA_BURST_SIZE 0 +#define TARGET_10_4_DMA_BURST_SIZE 1#define TARGET_10_4_MAC_AGGR_DELIM 0#define TARGET_10_4_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK 1#define TARGET_10_4_VOW_CONFIG 0
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +8 -0
@@ -82,6 +82,8 @@#define BRCMF_ND_INFO_TIMEOUT msecs_to_jiffies(2000) +#define BRCMF_PS_MAX_TIMEOUT_MS 2000 +#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \ (sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
@@ -2789,6 +2791,12 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,else bphy_err (drvr,"error (%d)\n" , err); } + + err =brcmf_fil_iovar_int_set (ifp,"pm2_sleep_ret" , +min_t (u32, timeout,BRCMF_PS_MAX_TIMEOUT_MS )); +if (err) +bphy_err (drvr,"Unable to set pm timeout, (%d)\n" , err); + done:brcmf_dbg (TRACE ,"Exit\n" );return err;
drivers/net/wireless/realtek/rtlwifi/usb.c +4 -1
@@ -718,8 +718,11 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw)usb_anchor_urb (urb, &rtlusb->rx_submitted); err =usb_submit_urb (urb,GFP_KERNEL ); -if (err) +if (err) { +usb_unanchor_urb (urb); +usb_free_urb (urb); goto err_out; + }usb_free_urb (urb); }return 0 ;
drivers/nvme/host/fc.c +2 -2
@@ -1740,7 +1740,7 @@ __nvme_fc_init_request(struct nvme_fc_ctrl *ctrl,if (fc_dma_mapping_error (ctrl->lport->dev, op->fcp_req.cmddma)) {dev_err (ctrl->dev,"FCP Op failed - cmdiu dma mapping failed.\n" ); - ret =EFAULT ; + ret = -EFAULT ; goto out_on_error; }
@@ -1750,7 +1750,7 @@ __nvme_fc_init_request(struct nvme_fc_ctrl *ctrl,if (fc_dma_mapping_error (ctrl->lport->dev, op->fcp_req.rspdma)) {dev_err (ctrl->dev,"FCP Op failed - rspiu dma mapping failed.\n" ); - ret =EFAULT ; + ret = -EFAULT ; }atomic_set (&op->state,FCPOP_STATE_IDLE );
drivers/nvme/host/multipath.c +10 -5
@@ -249,12 +249,17 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, fallback = ns; } -/* No optimized path found, re-check the current path */ +/* +* The loop above skips the current path for round-robin semantics. +* Fall back to the current path if either: +* - no other optimized path found and current is optimized, +* - no other usable path found and current is usable. +*/ if (!nvme_path_is_disabled (old) && - old->ana_state ==NVME_ANA_OPTIMIZED ) { - found = old; - goto out; - } + (old->ana_state ==NVME_ANA_OPTIMIZED || + (!fallback && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) +return old; +if (!fallback)return NULL ; found = fallback;
drivers/pci/controller/dwc/pcie-qcom.c +48 -10
125 lines not on this page · raw message
drivers/pci/slot.c +4 -2
@@ -304,13 +304,16 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, slot_name =make_slot_name (name);if (!slot_name) { err = -ENOMEM ; +kfree (slot); goto err; } err =kobject_init_and_add (&slot->kobj, &pci_slot_ktype,NULL ,"%s" , slot_name); -if (err) +if (err) { +kobject_put (&slot->kobj); goto err; + }INIT_LIST_HEAD (&slot->list);list_add (&slot->list, &parent->slots);
@@ -329,7 +332,6 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,mutex_unlock (&pci_slot_mutex);return slot; err: -kfree (slot); slot =ERR_PTR (err); goto out; }
drivers/s390/cio/css.c +5 -0
@@ -677,6 +677,11 @@ static int slow_eval_known_fn(struct subchannel *sch, void *data) rc =css_evaluate_known_subchannel (sch,1 );if (rc == -EAGAIN )css_schedule_eval (sch->schid); +/* +* The loop might take long time for platforms with lots of +* known devices. Allow scheduling here. +*/ +cond_resched (); }return 0 ; }
drivers/scsi/fcoe/fcoe_ctlr.c +1 -1
@@ -255,9 +255,9 @@ static void fcoe_sysfs_fcf_del(struct fcoe_fcf *new)WARN_ON (!fcf_dev); new->fcf_dev =NULL ;fcoe_fcf_device_delete (fcf_dev); -kfree (new);mutex_unlock (&cdev->lock); } +kfree (new); }/**
drivers/scsi/lpfc/lpfc_vport.c +8 -18
@@ -642,27 +642,16 @@ lpfc_vport_delete(struct fc_vport *fc_vport) vport->port_state < LPFC_VPORT_READY)return -EAGAIN ; } +/* -* This is a bit of a mess. We want to ensure the shost doesn't get -* torn down until we're done with the embedded lpfc_vport structure. -* -* Beyond holding a reference for this function, we also need a -* reference for outstanding I/O requests we schedule during delete -* processing. But once we scsi_remove_host() we can no longer obtain -* a reference through scsi_host_get(). -* -* So we take two references here. We release one reference at the -* bottom of the function -- after delinking the vport. And we -* release the other at the completion of the unreg_vpi that get's -* initiated after we've disposed of all other resources associated -* with the port. +* Take early refcount for outstanding I/O requests we schedule during +* delete processing for unreg_vpi. Always keep this before +* scsi_remove_host() as we can no longer obtain a reference through +* scsi_host_get() after scsi_host_remove as shost is set to SHOST_DEL. */ if (!scsi_host_get (shost))return VPORT_INVAL ; -if (!scsi_host_get (shost)) { -scsi_host_put (shost); -return VPORT_INVAL ; - } +lpfc_free_sysfs_attr (vport);lpfc_debugfs_terminate (vport);
@@ -809,8 +798,9 @@ lpfc_vport_delete(struct fc_vport *fc_vport)if (!(vport->vpi_state &LPFC_VPI_REGISTERED ) ||lpfc_mbx_unreg_vpi (vport))scsi_host_put (shost); - }else + }else {scsi_host_put (shost); + }lpfc_free_vpi (phba, vport->vpi); vport->work_port_events =0 ;
drivers/scsi/qla2xxx/qla_gs.c +15 -3
@@ -3673,10 +3673,22 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) }if (fcport->scan_state !=QLA_FCPORT_FOUND ) { +bool do_delete = false; + +if (fcport->scan_needed && + fcport->disc_state ==DSC_LOGIN_PEND ) { +/* Cable got disconnected after we sent +* a login. Do delete to prevent timeout. +*/ + fcport->logout_on_delete =1 ; + do_delete = true; + } + fcport->scan_needed =0 ; -if ((qla_dual_mode_enabled (vha) || -qla_ini_mode_enabled (vha)) && -atomic_read (&fcport->state) ==FCS_ONLINE ) { +if (((qla_dual_mode_enabled (vha) || +qla_ini_mode_enabled (vha)) && +atomic_read (&fcport->state) ==FCS_ONLINE ) || + do_delete) {if (fcport->loop_id !=FC_NO_LOOP_ID ) {if (fcport->flags &FCF_FCP2_DEVICE ) fcport->logout_on_delete =0 ;
drivers/scsi/qla2xxx/qla_mbx.c +0 -8
@@ -335,14 +335,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if (time_after (jiffies, wait_time))break ; -/* -* Check if it's UNLOADING, cause we cannot poll in -* this case, or else a NULL pointer dereference -* is triggered. -*/ -if (unlikely (test_bit (UNLOADING , &base_vha->dpc_flags))) -return QLA_FUNCTION_TIMEOUT ; -/* Check for pending interrupts. */ qla2x00_poll (ha->rsp_q_map[0 ]);
drivers/scsi/qla2xxx/qla_nvme.c +5 -0
@@ -535,6 +535,11 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,struct nvme_private *priv = fd->private;struct qla_nvme_rport *qla_rport = rport->private; +if (!priv) { +/* nvme association has been torn down */ +return rval; + } + fcport = qla_rport->fcport; if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
drivers/scsi/qla2xxx/qla_os.c +5 -0
@@ -1993,6 +1993,11 @@ qla2x00_iospace_config(struct qla_hw_data *ha)/* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues =1 ; ha->msix_count =QLA_BASE_VECTORS ; + +/* Check if FW supports MQ or not */ +if (!(ha->fw_attributes &BIT_6 )) + goto mqiobase_exit; +if (!ql2xmqsupport || !ql2xnvmeenable || (!IS_QLA25XX (ha) && !IS_QLA81XX (ha))) goto mqiobase_exit;
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -1262,7 +1262,7 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)qla24xx_chk_fcp_state (sess); -ql_dbg (ql_dbg_tgt, sess->vha,0xe001 , +ql_dbg (ql_dbg_disc, sess->vha,0xe001 ,"Scheduling sess %p for deletion %8phC\n" , sess, sess->port_name);
drivers/scsi/scsi_transport_iscsi.c +1 -1
@@ -3174,7 +3174,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.set_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_set_fnode; } idx = ev->u.set_flashnode.flashnode_idx;
drivers/scsi/ufs/ufshcd.c +9 -5
@@ -1516,6 +1516,7 @@ static void ufshcd_ungate_work(struct work_struct *work)int ufshcd_hold (struct ufs_hba *hba,bool async) {int rc =0 ; +bool flush_result;unsigned long flags;if (!ufshcd_is_clkgating_allowed (hba))
@@ -1547,7 +1548,9 @@ int ufshcd_hold(struct ufs_hba *hba, bool async)break ; }spin_unlock_irqrestore (hba->host->host_lock, flags); -flush_work (&hba->clk_gating.ungate_work); + flush_result =flush_work (&hba->clk_gating.ungate_work); +if (hba->clk_gating.is_suspended && !flush_result) + goto out;spin_lock_irqsave (hba->host->host_lock, flags); goto start; }
@@ -5609,7 +5612,7 @@ static void ufshcd_sl_intr(struct ufs_hba *hba, u32 intr_status)*/ static irqreturn_t ufshcd_intr (int irq,void *__hba) { -u32 intr_status, enabled_intr_status; +u32 intr_status, enabled_intr_status =0 ;irqreturn_t retval =IRQ_NONE ;struct ufs_hba *hba = __hba;int retries = hba->nutrs;
@@ -5623,7 +5626,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)* read, make sure we handle them by checking the interrupt status * again in a loop until we process all of the reqs before returning. */ - do { +while (intr_status && retries--) { enabled_intr_status = intr_status &ufshcd_readl (hba,REG_INTERRUPT_ENABLE );if (intr_status)
@@ -5634,7 +5637,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) } intr_status =ufshcd_readl (hba,REG_INTERRUPT_STATUS ); - }while (intr_status && --retries); + }spin_unlock (hba->host->host_lock);return retval;
@@ -6137,7 +6140,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)/* command completed already */ dev_err (hba->dev,"%s: cmd at tag %d successfully cleared from DB.\n" , __func__, tag); - goto out; + goto cleanup; }else { dev_err(hba->dev, "%s: no response from device. tag = %d, err %d\n",
@@ -6171,6 +6174,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } +cleanup:scsi_dma_unmap (cmd);spin_lock_irqsave (host->host_lock, flags);
drivers/spi/spi-stm32.c +38 -35
138 lines not on this page · raw message
drivers/target/target_core_internal.h +1 -0
@@ -138,6 +138,7 @@ int init_se_kmem_caches(void);void release_se_kmem_caches (void );u32 scsi_get_new_index (scsi_index_t );void transport_subsystem_check_init (void ); +void transport_uninit_session (struct se_session *);unsigned char *transport_dump_cmd_direction (struct se_cmd *);void transport_dump_dev_state (struct se_device *,char *,int *); void transport_dump_dev_info(struct se_device *, struct se_lun *,
drivers/target/target_core_transport.c +6 -1
@@ -236,6 +236,11 @@ int transport_init_session(struct se_session *se_sess) }EXPORT_SYMBOL (transport_init_session); +void transport_uninit_session (struct se_session *se_sess) +{ +percpu_ref_exit (&se_sess->cmd_count); +} +/** * transport_alloc_session - allocate a session object and initialize it * @sup_prot_ops: bitmask that defines which T10-PI modes are supported.
@@ -579,7 +584,7 @@ void transport_free_session(struct se_session *se_sess)sbitmap_queue_free (&se_sess->sess_tag_pool);kvfree (se_sess->sess_cmd_map); } -percpu_ref_exit (&se_sess->cmd_count); +transport_uninit_session (se_sess);kmem_cache_free (se_sess_cache, se_sess); }EXPORT_SYMBOL (transport_free_session);
drivers/target/target_core_user.c +8 -1
@@ -1220,7 +1220,14 @@ static unsigned int tcmu_handle_completions(struct tcmu_dev *udev)struct tcmu_cmd_entry *entry = (void *) mb +CMDR_OFF + udev->cmdr_last_cleaned; -tcmu_flush_dcache_range (entry,sizeof (*entry)); +/* +* Flush max. up to end of cmd ring since current entry might +* be a padding that is shorter than sizeof(*entry) +*/ +size_t ring_left =head_to_end (udev->cmdr_last_cleaned, + udev->cmdr_size); +tcmu_flush_dcache_range (entry, ring_left <sizeof (*entry) ? + ring_left :sizeof (*entry));if (tcmu_hdr_get_op (entry->hdr.len_op) ==TCMU_OP_PAD ) { UPDATE_HEAD(udev->cmdr_last_cleaned,
drivers/target/target_core_xcopy.c +9 -2
@@ -479,7 +479,7 @@ int target_xcopy_setup_pt(void)memset (&xcopy_pt_sess,0 ,sizeof (struct se_session )); ret =transport_init_session (&xcopy_pt_sess);if (ret <0 ) -return ret; + goto destroy_wq; xcopy_pt_nacl.se_tpg = &xcopy_pt_tpg; xcopy_pt_nacl.nacl_sess = &xcopy_pt_sess;
@@ -488,12 +488,19 @@ int target_xcopy_setup_pt(void) xcopy_pt_sess.se_node_acl = &xcopy_pt_nacl;return 0 ; + +destroy_wq: +destroy_workqueue (xcopy_wq); + xcopy_wq =NULL ; +return ret; }void target_xcopy_release_pt (void ) { -if (xcopy_wq) +if (xcopy_wq) {destroy_workqueue (xcopy_wq); +transport_uninit_session (&xcopy_pt_sess); + } }/*
drivers/tty/serial/8250/8250_exar.c +21 -3
@@ -725,6 +725,24 @@ static const struct exar8250_board pbn_exar_XR17V35x = { .exit = pci_xr17v35x_exit, }; +static const struct exar8250_board pbn_fastcom35x_2 = { + .num_ports =2 , + .setup = pci_xr17v35x_setup, + .exit = pci_xr17v35x_exit, +}; + +static const struct exar8250_board pbn_fastcom35x_4 = { + .num_ports =4 , + .setup = pci_xr17v35x_setup, + .exit = pci_xr17v35x_exit, +}; + +static const struct exar8250_board pbn_fastcom35x_8 = { + .num_ports =8 , + .setup = pci_xr17v35x_setup, + .exit = pci_xr17v35x_exit, +}; +static const struct exar8250_board pbn_exar_XR17V4358 = { .num_ports =12 , .setup = pci_xr17v35x_setup,
@@ -795,9 +813,9 @@ static const struct pci_device_id exar_pci_tbl[] = {EXAR_DEVICE (EXAR ,EXAR_XR17V358 , pbn_exar_XR17V35x),EXAR_DEVICE (EXAR ,EXAR_XR17V4358 , pbn_exar_XR17V4358),EXAR_DEVICE (EXAR ,EXAR_XR17V8358 , pbn_exar_XR17V8358), -EXAR_DEVICE (COMMTECH ,COMMTECH_4222PCIE , pbn_exar_XR17V35x), -EXAR_DEVICE (COMMTECH ,COMMTECH_4224PCIE , pbn_exar_XR17V35x), -EXAR_DEVICE (COMMTECH ,COMMTECH_4228PCIE , pbn_exar_XR17V35x), +EXAR_DEVICE (COMMTECH ,COMMTECH_4222PCIE , pbn_fastcom35x_2), +EXAR_DEVICE (COMMTECH ,COMMTECH_4224PCIE , pbn_fastcom35x_4), +EXAR_DEVICE (COMMTECH ,COMMTECH_4228PCIE , pbn_fastcom35x_8),EXAR_DEVICE (COMMTECH ,COMMTECH_4222PCI335 , pbn_fastcom335_2), EXAR_DEVICE(COMMTECH, COMMTECH_4224PCI335, pbn_fastcom335_4),
drivers/tty/serial/8250/8250_port.c +6 -3
@@ -2198,6 +2198,10 @@ int serial8250_do_startup(struct uart_port *port)if (port->irq && !(up->port.flags &UPF_NO_THRE_TEST )) {unsigned char iir1; + +if (port->irqflags &IRQF_SHARED ) +disable_irq_nosync (port->irq); +/* * Test for UARTs that do not reassert THRE when the * transmitter is idle and the interrupt has already
@@ -2207,8 +2211,6 @@ int serial8250_do_startup(struct uart_port *port)* allow register changes to become visible. */ spin_lock_irqsave (&port->lock, flags); -if (up->port.irqflags &IRQF_SHARED ) -disable_irq_nosync (port->irq);wait_for_xmitr (up,UART_LSR_THRE );serial_port_out_sync (port,UART_IER ,UART_IER_THRI );
@@ -2220,9 +2222,10 @@ int serial8250_do_startup(struct uart_port *port) iir =serial_port_in (port,UART_IIR );serial_port_out (port,UART_IER ,0 ); +spin_unlock_irqrestore (&port->lock, flags); +if (port->irqflags &IRQF_SHARED )enable_irq (port->irq); -spin_unlock_irqrestore (&port->lock, flags);/* * If the interrupt is not reasserted, or we otherwise
drivers/tty/serial/amba-pl011.c +9 -7
@@ -2252,9 +2252,8 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)clk_disable (uap->clk); } -static void __init -pl011_console_get_options (struct uart_amba_port *uap,int *baud, -int *parity,int *bits) +static void pl011_console_get_options (struct uart_amba_port *uap,int *baud, +int *parity,int *bits) {if (pl011_read (uap,REG_CR ) & UART01x_CR_UARTEN) {unsigned int lcr_h, ibrd, fbrd;
@@ -2287,7 +2286,7 @@ pl011_console_get_options(struct uart_amba_port *uap, int *baud, } } -static int __init pl011_console_setup (struct console *co,char *options) +static int pl011_console_setup (struct console *co,char *options) {struct uart_amba_port *uap;int baud =38400 ;
@@ -2355,8 +2354,8 @@ static int __init pl011_console_setup(struct console *co, char *options)* * Returns 0 if console matches; otherwise non-zero to use default matching */ -static int __init pl011_console_match (struct console *co,char *name,int idx, -char *options) +static int pl011_console_match (struct console *co,char *name,int idx, +char *options) {unsigned char iotype;resource_size_t addr;
@@ -2594,7 +2593,7 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap,static int pl011_register_port (struct uart_amba_port *uap) { -int ret; +int ret, i;/* Ensure interrupts from this UART are masked and cleared */ pl011_write (0 , uap,REG_IMSC );
@@ -2605,6 +2604,9 @@ static int pl011_register_port(struct uart_amba_port *uap)if (ret <0 ) {dev_err (uap->port.dev,"Failed to register AMBA-PL011 driver\n" ); +for (i =0 ; i <ARRAY_SIZE (amba_ports); i++) +if (amba_ports[i] == uap) + amba_ports[i] =NULL ;return ret; } }
drivers/tty/serial/samsung.c +5 -3
@@ -1791,9 +1791,11 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, ourport->tx_irq = ret +1 ; } - ret =platform_get_irq (platdev,1 ); -if (ret >0 ) - ourport->tx_irq = ret; +if (!s3c24xx_serial_has_interrupt_mask (port)) { + ret =platform_get_irq (platdev,1 ); +if (ret >0 ) + ourport->tx_irq = ret; + }/* * DMA is currently supported only on DT platforms, if DMA properties * are specified.
drivers/tty/serial/stm32-usart.c +1 -1
@@ -937,7 +937,7 @@ static int stm32_init_port(struct stm32_port *stm32port,stm32_init_rs485 (port, pdev);if (stm32port->info->cfg.has_wakeup) { - stm32port->wakeirq =platform_get_irq (pdev,1 ); + stm32port->wakeirq =platform_get_irq_optional (pdev,1 );if (stm32port->wakeirq <=0 && stm32port->wakeirq != -ENXIO )return stm32port->wakeirq ? : -ENODEV ; }
drivers/tty/vt/vt.c +3 -2
@@ -1196,7 +1196,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,unsigned int old_rows, old_row_size, first_copied_row;unsigned int new_cols, new_rows, new_row_size, new_screen_size;unsigned int user; -unsigned short *newscreen; +unsigned short *oldscreen, *newscreen;struct uni_screen *new_uniscr =NULL ;WARN_CONSOLE_UNLOCKED ();
@@ -1294,10 +1294,11 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,if (new_scr_end > new_origin)scr_memsetw ((void *)new_origin, vc->vc_video_erase_char, new_scr_end - new_origin); -kfree (vc->vc_screenbuf); + oldscreen = vc->vc_screenbuf; vc->vc_screenbuf = newscreen; vc->vc_screenbuf_size = new_screen_size;set_origin (vc); +kfree (oldscreen);/* do part of a reset_terminal() */ vc->vc_top =0 ;
drivers/tty/vt/vt_ioctl.c +11 -1
@@ -893,12 +893,22 @@ int vt_ioctl(struct tty_struct *tty,console_lock (); vcp = vc_cons[i].d;if (vcp) { +int ret; +int save_scan_lines = vcp->vc_scan_lines; +int save_font_height = vcp->vc_font.height; +if (v.v_vlin) vcp->vc_scan_lines = v.v_vlin;if (v.v_clin) vcp->vc_font.height = v.v_clin; vcp->vc_resize_user =1 ; -vc_resize (vcp, v.v_cols, v.v_rows); + ret =vc_resize (vcp, v.v_cols, v.v_rows); +if (ret) { + vcp->vc_scan_lines = save_scan_lines; + vcp->vc_font.height = save_font_height; +console_unlock (); +return ret; + } }console_unlock (); }
drivers/usb/cdns3/gadget.c +2 -2
@@ -189,10 +189,10 @@ int cdns3_allocate_trb_pool(struct cdns3_endpoint *priv_ep) GFP_DMA32 | GFP_ATOMIC);if (!priv_ep->trb_pool)return -ENOMEM ; - }else { -memset (priv_ep->trb_pool,0 , ring_size); } +memset (priv_ep->trb_pool,0 , ring_size); +if (!priv_ep->num)return 0 ;
drivers/usb/class/cdc-acm.c +10 -12
@@ -378,21 +378,19 @@ static void acm_ctrl_irq(struct urb *urb)if (current_size < expected_size) {/* notification is transmitted fragmented, reassemble */ if (acm->nb_size < expected_size) { -if (acm->nb_size) { -kfree (acm->notification_buffer); - acm->nb_size =0 ; - } +u8 *new_buffer; alloc_size =roundup_pow_of_two (expected_size); -/* -* kmalloc ensures a valid notification_buffer after a -* use of kfree in case the previous allocation was too
Lines of this file are not shown. View the raw message.
drivers/usb/dwc3/gadget.c +86 -18
104 lines not on this page · raw message
drivers/usb/gadget/function/f_ncm.c +69 -12
81 lines not on this page · raw message
drivers/video/fbdev/omap2/omapfb/dss/dispc.c +5 -2
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/omap2/omapfb/dss/dsi.c +5 -2
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/omap2/omapfb/dss/dss.c +5 -2
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/omap2/omapfb/dss/venc.c +5 -2
Lines of this file are not shown. View the raw message.
fs/btrfs/tree-log.c +156 -149
305 lines not on this page · raw message
fs/ext4/super.c +118 -57
175 lines not on this page · raw message
fs/fs-writeback.c +46 -37
83 lines not on this page · raw message
kernel/gen_kheaders.sh +38 -28
66 lines not on this page · raw message
kernel/sched/core.c +80 -1
81 lines not on this page · raw message
kernel/sched/sched.h +45 -2
47 lines not on this page · raw message
net/bridge/netfilter/nf_conntrack_bridge.c +6 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/net/icmp_redirect.sh +2 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/ebb.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c +0 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c +0 -7
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c +0 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c +0 -2
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.