Linux 5.10.214
Sasha Levin
maintainer-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
I'm announcing the release of the 5.10.214 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.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,
Sasha
- ------------
Makefile | 2 +- arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 28 ++- .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 24 +++ arch/arm/crypto/sha256_glue.c | 13 +- arch/arm/crypto/sha512-glue.c | 12 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 10 +- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 10 +- .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 1 + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 1 + arch/mips/include/asm/ptrace.h | 1 + arch/parisc/kernel/ftrace.c | 2 +- arch/powerpc/perf/hv-gpci.c | 29 ++- arch/powerpc/platforms/embedded6xx/linkstation.c | 3 - arch/powerpc/platforms/embedded6xx/mpc10x.h | 3 + arch/s390/kernel/vtime.c | 4 +- arch/sparc/kernel/leon_pci_grpci1.c | 2 +- arch/sparc/kernel/leon_pci_grpci2.c | 2 +- arch/x86/include/asm/vsyscall.h | 10 + arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/fault.c | 9 - arch/x86/mm/maccess.c | 10 + arch/x86/tools/relocs.c | 8 + arch/x86/xen/smp.c | 12 ++ block/ioctl.c | 5 + block/opal_proto.h | 1 + block/sed-opal.c | 6 +- drivers/acpi/processor_idle.c | 2 + drivers/acpi/scan.c | 8 +- drivers/base/regmap/regmap.c | 2 +- drivers/block/aoe/aoecmd.c | 12 +- drivers/block/aoe/aoenet.c | 1 + drivers/block/nbd.c | 6 + drivers/bus/Kconfig | 5 +- drivers/clk/clk.c | 3 + drivers/clk/hisilicon/clk-hi3519.c | 2 +- drivers/clk/qcom/dispcc-sdm845.c | 2 + drivers/clk/qcom/reset.c | 27 +-- drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 3 + drivers/dma/Kconfig | 14 +- drivers/firewire/core-card.c | 14 +- drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 +- drivers/gpu/drm/lima/lima_gem.c | 23 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 12 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 10 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 6 +- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 3 +- drivers/gpu/drm/tegra/dsi.c | 47 +++-- drivers/gpu/drm/tegra/fb.c | 1 + drivers/gpu/drm/tegra/output.c | 16 +- drivers/gpu/drm/tidss/tidss_plane.c | 2 +- drivers/hid/hid-lenovo.c | 57 +++-- drivers/hid/hid-multitouch.c | 4 + drivers/infiniband/core/device.c | 37 ++-- drivers/infiniband/hw/mlx5/devx.c | 2 +- drivers/infiniband/hw/mlx5/wr.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +- drivers/input/keyboard/gpio_keys_polled.c | 10 +- drivers/iommu/amd/init.c | 3 + drivers/iommu/intel/pasid.c | 3 + drivers/leds/leds-aw2013.c | 1 + drivers/leds/leds-sgm3140.c | 3 + drivers/md/dm-crypt.c | 4 +- drivers/md/dm-raid.c | 4 +- drivers/md/dm-verity.h | 4 +- drivers/md/dm.c | 26 ++- drivers/md/md.c | 76 ++++--- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 52 ++++- drivers/media/dvb-core/dvbdev.c | 5 + drivers/media/dvb-frontends/stv0367.c | 34 +-- drivers/media/i2c/tc358743.c | 7 +- drivers/media/pci/ttpci/budget-av.c | 8 +- drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 2 +- .../media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 10 +- drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- drivers/media/platform/mtk-vpu/mtk_vpu.h | 2 +- drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 69 +++--- drivers/media/usb/em28xx/em28xx-cards.c | 4 + drivers/media/usb/go7007/go7007-driver.c | 8 +- drivers/media/usb/go7007/go7007-usb.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-context.c | 10 +- drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 6 +- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 11 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 10 +- drivers/mfd/altera-sysmgr.c | 4 +- drivers/mfd/syscon.c | 4 +- drivers/mmc/host/wmt-sdmmc.c | 4 - drivers/mtd/maps/physmap-core.c | 2 +- drivers/mtd/nand/raw/lpc32xx_mlc.c | 5 +- drivers/net/dsa/mt7530.c | 8 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 17 -- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 6 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 112 +++++----- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 17 +- .../net/ethernet/netronome/nfp/flower/lag_conf.c | 5 + drivers/net/phy/dp83822.c | 38 ++-- drivers/net/phy/phy_device.c | 2 +- drivers/net/usb/sr9800.c | 4 +- drivers/net/wireguard/receive.c | 6 +- drivers/net/wireless/ath/ath10k/core.c | 3 - drivers/net/wireless/ath/ath10k/sdio.c | 1 - drivers/net/wireless/ath/ath10k/wmi-tlv.c | 4 + drivers/net/wireless/ath/ath9k/htc.h | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 4 + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 4 - drivers/net/wireless/ath/ath9k/wmi.c | 10 +- drivers/net/wireless/broadcom/b43/b43.h | 16 ++ drivers/net/wireless/broadcom/b43/dma.c | 4 +- drivers/net/wireless/broadcom/b43/main.c | 16 +- drivers/net/wireless/broadcom/b43/pio.c | 6 +- .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 3 +- .../broadcom/brcm80211/brcmsmac/phy_shim.c | 5 +- .../broadcom/brcm80211/brcmsmac/phy_shim.h | 2 +- drivers/net/wireless/intel/iwlegacy/3945-mac.c | 1 - drivers/net/wireless/intel/iwlegacy/4965-mac.c | 1 - drivers/net/wireless/intel/iwlwifi/dvm/main.c | 1 - drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 6 + drivers/net/wireless/marvell/libertas/cmd.c | 13 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 - drivers/net/wireless/marvell/mwifiex/debugfs.c | 3 - drivers/net/wireless/marvell/mwifiex/main.c | 2 - drivers/net/wireless/microchip/wilc1000/cfg80211.c | 1 - drivers/net/wireless/microchip/wilc1000/hif.c | 40 ++-- drivers/net/wireless/microchip/wilc1000/netdev.c | 29 +-- drivers/net/wireless/quantenna/qtnfmac/core.c | 2 - drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 2 - .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- drivers/net/wireless/rndis_wlan.c | 2 - drivers/net/wireless/st/cw1200/bh.c | 2 - drivers/opp/debugfs.c | 6 +- drivers/pci/pci.h | 5 - drivers/pci/pcie/dpc.c | 2 +- drivers/pci/quirks.c | 1 + drivers/pci/switch/switchtec.c | 4 +- drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 - drivers/remoteproc/Kconfig | 2 +- drivers/remoteproc/remoteproc_core.c | 32 +++ drivers/remoteproc/remoteproc_internal.h | 10 + drivers/remoteproc/stm32_rproc.c | 151 +++++++------ drivers/rtc/Kconfig | 3 +- drivers/scsi/bfa/bfa.h | 9 +- drivers/scsi/bfa/bfa_core.c | 4 +- drivers/scsi/bfa/bfa_ioc.h | 8 +- drivers/scsi/bfa/bfad_bsg.c | 11 +- drivers/scsi/csiostor/csio_defs.h | 18 +- drivers/scsi/csiostor/csio_lnode.c | 8 +- drivers/scsi/csiostor/csio_lnode.h | 13 -- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- drivers/soc/fsl/dpio/dpio-service.c | 2 +- drivers/spi/spi-mt65xx.c | 22 +- drivers/staging/greybus/light.c | 8 +- drivers/staging/media/imx/imx-media-csc-scaler.c | 1 + drivers/tty/serial/8250/8250_exar.c | 5 +- drivers/tty/serial/max310x.c | 2 +- drivers/tty/serial/samsung_tty.c | 5 +- drivers/tty/vt/vt.c | 2 +- drivers/usb/gadget/udc/net2272.c | 2 +- drivers/video/backlight/da9052_bl.c | 1 + drivers/video/backlight/lm3630a_bl.c | 15 +- drivers/video/backlight/lm3639_bl.c | 1 + drivers/video/backlight/lp8788_bl.c | 1 + drivers/watchdog/stm32_iwdg.c | 3 + fs/afs/dir.c | 10 - fs/f2fs/file.c | 13 +- fs/fhandle.c | 2 +- fs/nfs/nfs42.h | 7 +- fs/nfs/nfs4proc.c | 16 +- fs/nfs/nfsroot.c | 4 +- fs/quota/dquot.c | 226 +++++++++----------- fs/select.c | 2 +- include/drm/drm_fixed.h | 2 +- include/linux/blkdev.h | 1 + include/linux/bpf.h | 7 +- include/linux/filter.h | 21 +- include/linux/igmp.h | 4 +- include/linux/io_uring.h | 10 +- include/linux/mlx5/qp.h | 5 +- include/linux/mroute.h | 6 +- include/linux/pci.h | 5 + include/linux/poll.h | 4 - include/linux/rcupdate.h | 43 ++++ include/linux/remoteproc.h | 6 +- include/net/compat.h | 27 ++- include/uapi/linux/in.h | 42 +++- include/uapi/scsi/fc/fc_els.h | 114 +++++++++- io_uring/io_uring.c | 234 +-------------------- kernel/bpf/cpumap.c | 3 + kernel/bpf/devmap.c | 27 +-- kernel/bpf/hashtab.c | 14 +- kernel/bpf/helpers.c | 18 +- kernel/bpf/map_in_map.c | 11 +- kernel/bpf/stackmap.c | 9 +- kernel/bpf/syscall.c | 26 ++- kernel/rcu/tasks.h | 2 + kernel/time/timekeeping.c | 24 +-- lib/test_blackhole_dev.c | 3 +- net/bluetooth/hci_core.c | 2 +- net/bluetooth/hci_event.c | 2 - net/bluetooth/rfcomm/core.c | 2 +- net/core/dev.c | 2 +- net/core/scm.c | 2 +- net/core/sock_diag.c | 10 +- net/hsr/hsr_framereg.c | 4 + net/hsr/hsr_main.c | 15 +- net/ipv4/igmp.c | 28 +-- net/ipv4/inet_diag.c | 6 +- net/ipv4/ip_sockglue.c | 100 +++++---- net/ipv4/ip_tunnel.c | 15 +- net/ipv4/ipmr.c | 13 +- net/ipv4/tcp.c | 4 +- net/ipv4/udp.c | 4 +- net/ipv6/fib6_rules.c | 6 + net/ipv6/ipv6_sockglue.c | 18 +- net/iucv/iucv.c | 4 +- net/kcm/kcmsock.c | 3 +- net/l2tp/l2tp_ppp.c | 4 +- net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nft_set_pipapo.c | 5 +- net/packet/af_packet.c | 4 +- net/rds/send.c | 5 +- net/sunrpc/addr.c | 4 +- net/sunrpc/auth_gss/gss_rpc_xdr.c | 27 ++- net/unix/garbage.c | 2 +- net/unix/scm.c | 4 +- net/x25/af_x25.c | 4 +- scripts/clang-tools/gen_compile_commands.py | 2 +- scripts/kconfig/lexer.l | 7 +- sound/core/seq/seq_midi.c | 8 +- sound/core/seq/seq_virmidi.c | 9 +- sound/pci/hda/patch_realtek.c | 63 ++++++ sound/soc/codecs/rt5645.c | 10 + sound/soc/codecs/wm8962.c | 29 ++- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++ sound/soc/meson/aiu.c | 49 ++--- sound/soc/meson/aiu.h | 1 - sound/soc/meson/axg-fifo.c | 16 +- sound/soc/meson/axg-pdm.c | 25 +-- sound/soc/meson/axg-spdifin.c | 17 +- sound/soc/meson/axg-spdifout.c | 17 +- sound/soc/meson/axg-tdm-formatter.c | 50 ++--- sound/soc/meson/axg-tdm-interface.c | 54 ++--- sound/soc/meson/meson-card-utils.c | 8 +- sound/soc/meson/t9015.c | 30 +-- sound/usb/stream.c | 5 +- tools/bpf/bpftool/prog.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/util/evsel.c | 1 - tools/perf/util/stat-display.c | 2 +- tools/perf/util/thread_map.c | 2 +- tools/testing/selftests/net/tls.c | 8 +- 260 files changed, 1896 insertions(+), 1512 deletions(-)
Ajay Singh (1):
wifi: wilc1000: fix multi-vif management when deleting a vif
Alban Boyé (1):
ASoC: Intel: bytcr_rt5640: Add an extra entry for the Chuwi Vi8 tablet
Alex Bee (1):
drm/rockchip: inno_hdmi: Fix video timing
Alexander Gordeev (1):
net/iucv: fix the allocation size of iucv_path_table array
Alexander Stein (1):
media: tc358743: register v4l2 async device only after successful setup
Alexei Starovoitov (1):
bpf: Factor out bpf_spin_lock into helpers.
Alexis Lothoré (3):
wifi: wilc1000: fix declarations ordering
wifi: wilc1000: fix RCU usage in connect path
wifi: wilc1000: prevent use-after-free on vif when cleaning up all interfaces
Anastasia Belova (1):
cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return value
Andrew Ballance (1):
gen_compile_commands: fix invalid escape sequence warning
Andy Shevchenko (1):
serial: 8250_exar: Don't remove GPIO device on suspend
AngeloGioacchino Del Regno (1):
drm/mediatek: dsi: Fix DSI RGB666 formats and definitions
Armin Wolf (1):
ACPI: processor_idle: Fix memory leak in acpi_processor_power_exit()
Arnaud Pouliquen (2):
remoteproc: stm32: Fix incorrect type in assignment for va
remoteproc: stm32: Fix incorrect type assignment returned by stm32_rproc_get_loaded_rsc_tablef
Arnd Bergmann (12):
fs/select: rework stack allocation hack for clang
wifi: brcmsmac: avoid function pointer casts
media: pvrusb2: fix pvr2_stream_callback casts
crypto: arm/sha - fix function cast warnings
mtd: rawnand: lpc32xx_mlc: fix irq handler prototype
media: dvb-frontends: avoid stack overflow warnings with clang
media: mediatek: vcodec: avoid -Wcast-function-type-strict warning
scsi: csiostor: Avoid function pointer casts
scsi: bfa: Fix function pointer type mismatch for hcb_qe->cbfn
remoteproc: stm32: use correct format strings on 64-bit
soc: fsl: dpio: fix kcalloc() argument order
remoteproc: stm32: fix phys_addr_t format string
Arınç ÜNAL (1):
net: dsa: mt7530: prevent possible incorrect XTAL frequency selection
Athaariq Ardhiansyah (1):
ALSA: hda/realtek: fix ALC285 issues on HP Envy x360 laptops
Baokun Li (1):
quota: simplify drop_dquot_ref()
Baruch Siach (1):
mtd: maps: physmap-core: fix flash size larger than 32-bit
Ben Wolsieffer (1):
watchdog: stm32_iwdg: initialize default timeout
Bitterblue Smith (1):
wifi: rtw88: 8821c: Fix false alarm count
Borislav Petkov (AMD) (1):
x86/paravirt: Fix build due to __text_gen_insn() backport
Breno Leitao (1):
net: blackhole_dev: fix build warning for ethh set but not used
Bryan O'Donoghue (1):
clk: Fix clk_core_get NULL dereference
Cai Huoqing (1):
drm/tegra: dsi: Make use of the helper function dev_err_probe()
Chen Ni (2):
sr9800: Add check for usbnet_get_endpoints drm/tegra: dsi: Add missing check for of_find_device_by_node
Chen-Yu Tsai (1):
pinctrl: mediatek: Drop bogus slew rate register range for MT8192
Christoph Hellwig (2):
block: add a new set_read_only method
md: implement ->set_read_only to hook into BLKROSET processing
Christophe JAILLET (9):
wireless: Remove redundant 'flush_workqueue()' calls
mmc: wmt-sdmmc: remove an incorrect release_mem_region() call in the .remove function drm/tegra: dsi: Fix some error handling paths in tegra_dsi_probe()
drm/tegra: dsi: Fix missing pm_runtime_disable() in the error handling path of tegra_dsi_probe() drm/tegra: output: Fix missing i2c_put_adapter() in the error handling paths of tegra_output_probe()
PCI: switchtec: Fix an error handling path in switchtec_pci_probe()
clk: hisilicon: hi3519: Release the correct number of gates in hi3519_clk_unregister()
net: sunrpc: Fix an off by one in rpc_sockaddr2uaddr()
NFS: Fix an off by one in root_nfs_cat()
Chun-Yi Lee (1):
aoe: fix the potential use-after-free problem in aoecmd_cfg_pkts
Colin Ian King (1):
usb: gadget: net2272: Use irqflags in the call to net2272_probe_fin
Dan Carpenter (1):
staging: greybus: fix get_channel_from_mode() failure path
Daniel Thompson (3):
backlight: da9052: Fully initialize backlight_properties during probe
backlight: lm3639: Fully initialize backlight_properties during probe
backlight: lp8788: Fully initialize backlight_properties during probe
Daniil Dulov (2):
media: go7007: add check of return value of go7007_read_addr()
media: pvrusb2: remove redundant NULL check
David Howells (1):
afs: Revert "afs: Hide silly-rename files from userspace"
Duoming Zhou (1):
nfp: flower: handle acti_netdevs allocation failure
Edward Adam Davis (1):
media: pvrusb2: fix uaf in pvr2_context_set_notify
Eric Dumazet (4):
sock_diag: annotate data-races around sock_diag_handlers[family]
inet_diag: annotate data-races around inet_diag_table[]
net: ip_tunnel: make sure to pull inner header in ip_tunnel_rcv()
packet: annotate data-races around ignore_outgoing
Ethan Zhao (2):
PCI: Make pci_dev_is_disconnected() helper public for other drivers iommu/vt-d: Don't issue ATS Invalidation request when device is disconnected
Fedor Pchelkin (1):
drm/tegra: put drm_gem_object ref on error in tegra_fb_create
Fei Shao (1):
spi: spi-mt65xx: Fix NULL pointer access in interrupt handler
Felix Maurer (1):
hsr: Handle failures in module init
Gavrilov Ilia (6):
tcp: fix incorrect parameter validation in the do_tcp_getsockopt() function
ipmr: fix incorrect parameter validation in the ip_mroute_getsockopt() function
l2tp: fix incorrect parameter validation in the pppol2tp_getsockopt() function
udp: fix incorrect parameter validation in the udp_lib_getsockopt() function
net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function net/x25: fix incorrect parameter validation in the x25_getsockopt() function
Geert Uytterhoeven (1):
ARM: dts: arm: realview: Fix development chip ROM compatible value
George Stark (1):
leds: aw2013: Unlock mutex before destroying it
Greg Joyce (1):
block: sed-opal: handle empty atoms when parsing response
Gustavo A. R. Silva (3):
net/ipv4: Replace one-element array with flexible-array member net/ipv4: Revert use of struct_size() helper net/ipv4/ipv6: Replace one-element arraya with flexible-array members
Hans de Goede (1):
ASoC: rt5645: Make LattePanda board DMI match more precise
Harry Wentland (1):
drm: Don't treat 0 as -1 in drm_fixp2int_ceil
Hou Tao (3):
bpf: Defer the free of inner map when necessary x86/mm: Move is_vsyscall_vaddr() into asm/vsyscall.h x86/mm: Disallow vsyscall page read for copy_from_kernel_nofault()
Hsin-Yi Wang (1):
drm/mediatek: Fix a null pointer crash in mtk_drm_crtc_finish_page_flip
Hugo Villeneuve (1):
serial: max310x: fix syntax error in IRQ error message
Ian Rogers (1):
perf stat: Avoid metric-only segv
Ilpo Järvinen (1):
PCI/DPC: Print all TLP Prefixes, not just the first
Jakub Kicinski (1):
selftests: tls: use exact comparison in recv_partial
Jan Kara (1):
quota: Fix rcu annotations of inode dquot pointers
Jens Axboe (3):
io_uring/unix: drop usage of io_uring socket
io_uring: drop any code related to SCM_RIGHTS
io_uring: don't save/restore iowait state
Jernej Skrabec (3):
media: sun8i-di: Fix coefficient writes
media: sun8i-di: Fix power on/off sequences
media: sun8i-di: Fix chroma difference threshold
Jerome Brunet (4):
ASoC: meson: aiu: fix function pointer type mismatch
ASoC: meson: t9015: fix function pointer type mismatch
ASoC: meson: axg-tdm-interface: fix mclk setup without mclk-fs
ASoC: meson: axg-tdm-interface: add frame rate constraint
Jiaxun Yang (1):
MIPS: Clear Cause.BD in instruction_pointer_set
Jie Wang (1):
net: hns3: fix port duplex configure error in IMP reset
Jinjie Ruan (1):
wifi: mwifiex: debugfs: Drop unnecessary error check for debugfs_create_dir()
Jiri Slaby (SUSE) (1):
tty: vt: fix 20 vs 0x20 typo in EScsiignore
Johan Carlsson (1):
ALSA: usb-audio: Stop parsing channels bits when all channels are found.
Johannes Berg (1):
wifi: iwlwifi: dbg-tlv: ensure NUL termination
Jonas Dreßler (1):
Bluetooth: Remove superfluous call to hci_conn_check_pending()
Jorge Mora (2):
NFSv4.2: fix nfs4_listxattr kernel BUG at mm/usercopy.c:102 NFSv4.2: fix listxattr maximum XDR buffer size
Jörg Wedekind (1):
PCI: Mark 3ware-9650SE Root Port Extended Tags as broken
Kajol Jain (1):
powerpc/hv-gpci: Fix the H_GET_PERF_COUNTER_INFO hcall return value checks
Kamal Heib (1):
net: ena: Remove ena_select_queue
Kees Cook (1):
x86, relocs: Ignore relocations in .notes section
Konrad Dybcio (3):
clk: qcom: reset: Commonize the de/assert functions
clk: qcom: reset: Ensure write completion on reset de/assertion
clk: qcom: dispcc-sdm845: Adjust internal GDSC wait times
Kuninori Morimoto (1):
ASoC: meson: Use dev_err_probe() helper
Kuniyuki Iwashima (1):
af_unix: Annotate data-race of gc_in_progress in wait_for_unix_gc().
Kunwu Chan (1):
x86/xen: Add some null pointer checking to smp.c
Kévin L'hôpital (1):
net: phy: fix phy_get_internal_delay accessing an empty array
Leon Romanovsky (1):
RDMA/mlx5: Fix fortify source warning while accessing Eth segment
Li Nan (1):
md: Don't clear MD_CLOSING when the raid is about to stop
Linu Cherian (1):
octeontx2-af: Use matching wake_up API variant in CGX command interface
Luca Weiss (2):
backlight: lm3630a: Initialize backlight_properties on init
backlight: lm3630a: Don't set bl->props.brightness in get_brightness
Lucas Stach (1):
media: imx: csc/scaler: fix v4l2_ctrl_handler memory leak
Luiz Augusto von Dentz (1):
Bluetooth: hci_core: Fix possible buffer overflow
Manuel Fombuena (1):
HID: multitouch: Add required quirk for Synaptics 0xcddc device
Marek Vasut (1):
regmap: Add missing map->bus check
Mario Limonciello (1):
iommu/amd: Mark interrupt as managed
Martin KaFai Lau (1):
bpf: net: Change do_ip_getsockopt() to take the sockptr_t argument
Martin Kaistra (1):
wifi: rtl8xxxu: add cancel_work_sync() for c2hcmd_work
Masahiro Yamada (1):
kconfig: fix infinite loop when expanding a macro at the end of file
Mathieu Poirier (2):
remoteproc: Add new get_loaded_rsc_table() to rproc_ops
remoteproc: stm32: Move resource table setup to rproc_ops
Max Kellermann (1):
parisc/ftrace: add missing CONFIG_DYNAMIC_FTRACE check
Mete Durlu (1):
s390/vtime: fix average steal time calculation
Michael Ellerman (1):
powerpc/embedded6xx: Fix no previous prototype for avr_uart_send() etc.
Michael Klein (1):
ARM: dts: sun8i-h2-plus-bananapi-m2-zero: add regulator nodes vcc-dram and vcc1v2
Michal Vokáč (3):
ARM: dts: imx6dl-yapp4: Move phy reset into switch node
ARM: dts: imx6dl-yapp4: Fix typo in the QCA switch register address
ARM: dts: imx6dl-yapp4: Move the internal switch PHYs under the switch node
Mikhail Khvainitski (1):
HID: lenovo: Add middleclick_workaround sysfs knob for cptkbd
Mikulas Patocka (2):
dm-verity, dm-crypt: align "struct bvec_iter" correctly
dm: call the resume method on internal suspend
Ming Lei (1):
dm raid: fix false positive for requeue needed during reshape
Miri Korenblit (1):
wifi: iwlwifi: fix EWRD table validity check
Navid Emamdoost (1):
nbd: null check for nla_nest_start
Nikita Zhandarovich (4):
do_sys_name_to_handle(): use kzalloc() to fix kernel-infoleak
media: em28xx: annotate unchecked call to media_device_register() drm/radeon/ni: Fix wrong firmware size logging in ni_init_microcode()
wireguard: receive: annotate data-race around receiving_counter.counter
Ondrej Jirman (1):
leds: sgm3140: Add missing timer cleanup and flash gpio control
Pablo Neira Ayuso (2):
netfilter: nft_set_pipapo: release elements in clone only from destroy path
netfilter: nf_tables: do not compare internal table flags on updates
Paloma Arellano (1):
drm/msm/dpu: add division of drm_display_mode's hskew parameter
Paul E. McKenney (1):
rcu-tasks: Provide rcu_trace_implies_rcu_gp()
Peter Griffin (2):
mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref
mfd: altera-sysmgr: Call of_node_put() only when of_parse_phandle() takes a ref
Peter Hilber (3):
timekeeping: Fix cross-timestamp interpolation on counter wrap
timekeeping: Fix cross-timestamp interpolation corner case decision
timekeeping: Fix cross-timestamp interpolation for non-x86
Peter Robinson (2):
bus: tegra-aconnect: Update dependency to ARCH_TEGRA
dmaengine: tegra210-adma: Update dependency to ARCH_TEGRA
Quanyang Wang (1):
crypto: xilinx - call finalize with bh disabled
Quentin Schulz (2):
drm/rockchip: lvds: do not overwrite error code drm/rockchip: lvds: do not print scary message when probing defer
Rafael J. Wysocki (1):
ACPI: scan: Fix device check notification handling
Rafał Miłecki (2):
arm64: dts: mediatek: mt7622: add missing "device_type" to memory nodes
arm64: dts: marvell: reorder crypto interrupts on Armada SoCs
Rahul Rameshbabu (4):
wifi: b43: Stop/wake correct queue in DMA Tx path when QoS is disabled
wifi: b43: Stop/wake correct queue in PIO Tx path when QoS is disabled
wifi: b43: Stop correct queue in DMA worker when QoS is disabled
wifi: b43: Disable QoS for bcm4331
Randy Dunlap (1):
rtc: mt6397: select IRQ_DOMAIN instead of depending on it
Ranjan Kumar (1):
scsi: mpt3sas: Prevent sending diag_reset when the controller is ready
Rikard Falkeborn (1):
remoteproc: stm32: Constify st_rproc_ops
Roman Gushchin (1):
bpf: Eliminate rlimit-based memory accounting for devmap maps
Ruud Bos (1):
igb: move PEROUT and EXTTS isr logic to separate functions
Sam Ravnborg (1):
sparc32: Fix section mismatch in leon_pci_grpci
Sasha Levin (1):
Linux 5.10.214
Sheng Yong (1):
f2fs: compress: fix to check unreleased compressed cluster
Shifeng Li (1):
RDMA/device: Fix a race between mad_client and cm_client init
Shigeru Yoshida (1):
hsr: Fix uninit-value access in hsr_get_node()
Shiming Cheng (1):
ipv6: fib6_rules: flush route cache when rule is changed
Shyam Sundar (1):
scsi: fc: Update formal FPIN descriptor definitions
Srinivasan Shanmugam (3):
drm/amd/display: Fix a potential buffer overflow in 'dp_dsc_clock_en_read()' drm/amd/display: Fix potential NULL pointer dereferences in 'dcn10_set_output_transfer_func()' drm/amdgpu: Fix missing break in ATOM_ARG_IMM Case of atom_get_src_int()
Stuart Henderson (3):
ASoC: wm8962: Enable oscillator if selecting WM8962_FLL_OSC
ASoC: wm8962: Enable both SPKOUTR_ENA and SPKOUTL_ENA in mono mode
ASoC: wm8962: Fix up incorrect error message in wm8962_set_fll
Subbaraya Sundeep (1):
octeontx2-af: Use separate handlers for interrupts
Takashi Iwai (1):
ALSA: seq: fix function cast warnings
Takashi Sakamoto (1):
firewire: core: use long bus reset on gap count error
Thinh Tran (1):
net/bnx2x: Prevent access to a freed page in page_pool
Tiezhu Yang (1):
bpftool: Silence build warning about calloc()
Tim Pambor (1):
net: phy: dp83822: Fix RGMII TX delay configuration
Toke Høiland-Jørgensen (4):
wifi: ath9k: delay all of ath9k_wmi_event_tasklet() until init is complete
bpf: Fix DEVMAP_HASH overflow check on 32-bit arches
bpf: Fix hashtab overflow check on 32-bit arches
bpf: Fix stackmap overflow check on 32-bit arches
Tomi Valkeinen (1):
drm/tidss: Fix initial plane zpos values
Tommaso Merciai (1):
net: phy: DP83822: enable rgmii mode if phy_interface_is_rgmii
Tudor Ambarus (1):
tty: serial: samsung: fix tx_empty() to return TIOCSER_TEMT
Uwe Kleine-König (1):
Input: gpio_keys_polled - suppress deferred probe error for gpio
Vinicius Costa Gomes (1):
igb: Fix missing time sync events
Viresh Kumar (1):
OPP: debugfs: Fix warning around icc_get_name()
Wang Jianjian (1):
quota: Fix potential NULL pointer dereference
William Kucharski (1):
RDMA/srpt: Do not register event handler until srpt device is fully setup
Xingyuan Mo (1):
wifi: ath10k: fix NULL pointer dereference in ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev()
Yan Zhai (2):
rcu: add a helper to report consolidated flavor QS
bpf: report RCU QS in cpumap kthread
Yang Jihong (3):
perf record: Fix possible incorrect free in record__switch_output() perf evsel: Fix duplicate initialization of data->id in evsel__parse_sample() perf thread_map: Free strlist on normal path in thread_map__new_by_tid_str()
Yewon Choi (1):
rds: introduce acquire/release ordering in acquire/release_in_xmit()
Yishai Hadas (1):
RDMA/mlx5: Relax DEVX access upon modify commands
Yonghong Song (1):
bpf: Mark bpf_spin_{lock,unlock}() helpers with notrace correctly
Yuxuan Hu (1):
Bluetooth: rfcomm: Fix null-ptr-deref in rfcomm_check_security
Zhipeng Lu (8):
wifi: libertas: fix some memleaks in lbs_allocate_cmd_buffer()
SUNRPC: fix some memleaks in gssx_dec_option_array drm/lima: fix a memleak in lima_heap_alloc
media: v4l2-tpg: fix some memleaks in tpg_alloc
media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity
media: edia: dvbdev: fix a use-after-free
media: go7007: fix a memleak in go7007_load_encoder
media: ttpci: fix two memleaks in budget_av_attach
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmYDT1sACgkQ3qZv95d3 LNyY1Q//StppobKxfBSLZTO7fdWsA56aZOGjk0ggw6aRje2JggUsvPjq67bFcxQU DfeOPuVStICGw+63cFL8/I30cFJ/ebIFSVOiUSYwjHIG4VJLxG2ORRw42GGHhtx2 aJzGJp7JdzYUGCLJZICUsvZwePtK1nXjOwv+lnGzA2AM962Gkwf25V6WIdEjAluv TLT+3i9RSu3CMt5rDVrTi10hVYfWRfi589IAtHSl/OkJhdqVEwiAh7eD2dSYtAXI TryEpGKSatARjyQETKKv02zit5q4hcDFRxFTmA3ZS+FOY9xR0rha7kbjO9kjLFvH Hl9+zXd1yDg2rCl7RZ4xbID+ox6+/aVR9HjNbRDSNiNSfbFA6oY67ewE4IoaCURx 6sBUqf0P95aUCxVwHDwnZM3YY6E6dlvYRFif+HGHxc5hLtMSTEsdCgvJuJWxBwiq SrE6AdUcjQfH7+EG+uA9jRKoeOnCtJXmkNB61MNex4WiUhaKiA3ZMSnkpLcaZjEY 45qQlHvQDpCxOjFSxYjzgA2h9pKmRf/bGqNdcQd3489ahMZXdzwp5IAgZxCIBMjW apX4XhJDi1UyanXThuBUTogyutWa4JdCXD/o4O5ctxf5LZ7Xbf4FeYp2yUv6pzgj sJEfqyMiRcnuvpQrXtJiaA76xgRpnNJ1C4jKMs8Xa5MueW25wi0= =y383
-----END PGP SIGNATURE-----
Sasha Levin
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 213 +SUBLEVEL = 214 EXTRAVERSION = NAME = Dare mighty things
arch/arm/boot/dts/arm-realview-pb1176.dts +1 -1
@@ -435,7 +435,7 @@ pb1176_serial3: serial@1010f000 { /* Direct-mapped development chip ROM */ pb1176_rom@10200000 { - compatible = "direct-mapped"; + compatible = "mtd-rom"; reg = <0x10200000 0x4000>; bank-width = <1>; };
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi +17 -11
@@ -103,8 +103,6 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii-id"; - phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; - phy-reset-duration = <20>; phy-supply = <&sw2_reg>; status = "okay";
@@ -117,17 +115,10 @@ mdio { #address-cells = <1>; #size-cells = <0>; - phy_port2: phy@1 { - reg = <1>; - }; - - phy_port3: phy@2 { - reg = <2>; - }; - switch@10 { compatible = "qca,qca8334"; - reg = <10>; + reg = <0x10>; + reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; switch_ports: ports { #address-cells = <1>;
@@ -148,15 +139,30 @@ fixed-link { eth2: port@2 { reg = <2>; label = "eth2"; + phy-mode = "internal"; phy-handle = <&phy_port2>; }; eth1: port@3 { reg = <3>; label = "eth1"; + phy-mode = "internal"; phy-handle = <&phy_port3>; }; }; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + phy_port2: ethernet-phy@1 { + reg = <1>; + }; + + phy_port3: ethernet-phy@2 { + reg = <2>; + }; + }; }; }; };
arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts +24 -0
@@ -62,6 +62,30 @@ reg_vdd_cpux: vdd-cpux-regulator { states = <1100000 0>, <1300000 1>; }; + reg_vcc_dram: vcc-dram { + compatible = "regulator-fixed"; + regulator-name = "vcc-dram"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>; /* PL9 */ + vin-supply = <®_vcc5v0>; + }; + + reg_vcc1v2: vcc1v2 { + compatible = "regulator-fixed"; + regulator-name = "vcc1v2"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */ + vin-supply = <®_vcc5v0>; + }; + wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
arch/arm/crypto/sha256_glue.c +5 -8
@@ -24,8 +24,8 @@#include "sha256_glue.h" -asmlinkage void sha256_block_data_order(u32 *digest, const void *data, -unsigned int num_blks); +asmlinkage void sha256_block_data_order(struct sha256_state *state, +const u8 *data,int num_blks);int crypto_sha256_arm_update (struct shash_desc *desc,const u8 *data,unsigned int len)
@@ -33,23 +33,20 @@ int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data,/* make sure casting to sha256_block_fn() is safe */ BUILD_BUG_ON (offsetof(struct sha256_state , state) !=0 ); -return sha256_base_do_update (desc, data, len, - (sha256_block_fn *)sha256_block_data_order); +return sha256_base_do_update (desc, data, len, sha256_block_data_order); }EXPORT_SYMBOL (crypto_sha256_arm_update);static int crypto_sha256_arm_final (struct shash_desc *desc,u8 *out) { -sha256_base_do_finalize (desc, - (sha256_block_fn *)sha256_block_data_order); +sha256_base_do_finalize (desc, sha256_block_data_order);return sha256_base_finish (desc, out); }int crypto_sha256_arm_finup (struct shash_desc *desc,const u8 *data,unsigned int len,u8 *out) { -sha256_base_do_update (desc, data, len, - (sha256_block_fn *)sha256_block_data_order); +sha256_base_do_update (desc, data, len, sha256_block_data_order);return crypto_sha256_arm_final (desc, out); }EXPORT_SYMBOL (crypto_sha256_arm_finup);
arch/arm/crypto/sha512-glue.c +5 -7
@@ -25,27 +25,25 @@ MODULE_ALIAS_CRYPTO("sha512");MODULE_ALIAS_CRYPTO ("sha384-arm" );MODULE_ALIAS_CRYPTO ("sha512-arm" ); -asmlinkage void sha512_block_data_order(u64 *state, u8 const *src, int blocks); +asmlinkage void sha512_block_data_order(struct sha512_state *state, +u8 const *src,int blocks);int sha512_arm_update (struct shash_desc *desc,const u8 *data,unsigned int len) { -return sha512_base_do_update (desc, data, len, - (sha512_block_fn *)sha512_block_data_order); +return sha512_base_do_update (desc, data, len, sha512_block_data_order); }static int sha512_arm_final (struct shash_desc *desc,u8 *out) { -sha512_base_do_finalize (desc, - (sha512_block_fn *)sha512_block_data_order); +sha512_base_do_finalize (desc, sha512_block_data_order);return sha512_base_finish (desc, out); }int sha512_arm_finup (struct shash_desc *desc,const u8 *data,unsigned int len,u8 *out) { -sha512_base_do_update (desc, data, len, - (sha512_block_fn *)sha512_block_data_order); +sha512_base_do_update (desc, data, len, sha512_block_data_order);return sha512_arm_final (desc, out); }
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +5 -5
@@ -414,14 +414,14 @@ xor11 { crypto: crypto@90000 { compatible = "inside-secure,safexcel-eip97ies"; reg = <0x90000 0x20000>; - interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "mem", "ring0", "ring1", - "ring2", "ring3", "eip"; + <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "ring0", "ring1", "ring2", + "ring3", "eip", "mem"; clocks = <&nb_periph_clk 15>; };
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +5 -5
@@ -477,14 +477,14 @@ CP11X_LABEL(sdhci0): sdhci@780000 { CP11X_LABEL(crypto): crypto@800000 { compatible = "inside-secure,safexcel-eip197b"; reg = <0x800000 0x200000>; - interrupts = <87 IRQ_TYPE_LEVEL_HIGH>, - <88 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <88 IRQ_TYPE_LEVEL_HIGH>, <89 IRQ_TYPE_LEVEL_HIGH>, <90 IRQ_TYPE_LEVEL_HIGH>, <91 IRQ_TYPE_LEVEL_HIGH>, - <92 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "mem", "ring0", "ring1", - "ring2", "ring3", "eip"; + <92 IRQ_TYPE_LEVEL_HIGH>, + <87 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "ring0", "ring1", "ring2", "ring3", + "eip", "mem"; clock-names = "core", "reg"; clocks = <&CP11X_LABEL(clk) 1 26>, <&CP11X_LABEL(clk) 1 17>;
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +1 -0
@@ -71,6 +71,7 @@ red { memory@40000000 { reg = <0 0x40000000 0 0x40000000>; + device_type = "memory"; }; reg_1p8v: regulator-1p8v {
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +1 -0
@@ -57,6 +57,7 @@ wps { memory@40000000 { reg = <0 0x40000000 0 0x20000000>; + device_type = "memory"; }; reg_1p8v: regulator-1p8v {
arch/mips/include/asm/ptrace.h +1 -0
@@ -60,6 +60,7 @@ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) { regs->cp0_epc = val; + regs->cp0_cause &= ~CAUSEF_BD ; }/* Query offset/name of register from its name/offset */
arch/parisc/kernel/ftrace.c +1 -1
@@ -81,7 +81,7 @@ void notrace __hot ftrace_function_trampoline(unsigned long parent,#endif } -#ifdef CONFIG_FUNCTION_GRAPH_TRACER +#if defined(CONFIG_DYNAMIC_FTRACE ) && defined(CONFIG_FUNCTION_GRAPH_TRACER )int ftrace_enable_ftrace_graph_caller (void ) {return 0 ;
arch/powerpc/perf/hv-gpci.c +27 -2
@@ -164,6 +164,20 @@ static unsigned long single_gpci_request(u32 req, u32 starting_index, ret =plpar_hcall_norets (H_GET_PERF_COUNTER_INFO ,virt_to_phys (arg),HGPCI_REQ_BUFFER_SIZE ); + +/* +* ret value as 'H_PARAMETER' with detail_rc as 'GEN_BUF_TOO_SMALL', +* specifies that the current buffer size cannot accommodate +* all the information and a partial buffer returned. +* Since in this function we are only accessing data for a given starting index, +* we don't need to accommodate whole data and can get required count by +* accessing first entry data. +* Hence hcall fails only incase the ret value is other than H_SUCCESS or +* H_PARAMETER with detail_rc value as GEN_BUF_TOO_SMALL(0x1B). +*/ +if (ret ==H_PARAMETER &&be32_to_cpu (arg->params.detail_rc) ==0x1B ) + ret =0 ; +if (ret) {pr_devel ("hcall failed: 0x%lx\n" , ret); goto out;
@@ -228,6 +242,7 @@ static int h_gpci_event_init(struct perf_event *event) {u64 count;u8 length; +unsigned long ret;/* Not our event */ if (event->attr.type != event->pmu->type)
@@ -258,13 +273,23 @@ static int h_gpci_event_init(struct perf_event *event) }/* check if the request works... */ -if (single_gpci_request (event_get_request (event), + ret =single_gpci_request (event_get_request (event),event_get_starting_index (event),event_get_secondary_index (event),event_get_counter_info_version (event),event_get_offset (event), length, - &count)) { + &count); + +/* +* ret value as H_AUTHORITY implies that partition is not permitted to retrieve +* performance information, and required to set +* "Enable Performance Information Collection" option. +*/ +if (ret ==H_AUTHORITY ) +return -EPERM ; + +if (ret) {pr_devel ("gpci hcall failed\n" );return -EINVAL ; }
arch/powerpc/platforms/embedded6xx/linkstation.c +0 -3
@@ -97,9 +97,6 @@ static void __init linkstation_init_IRQ(void)mpic_init (mpic); } -extern void avr_uart_configure (void ); -extern void avr_uart_send (const char ); -static void __noreturn linkstation_restart (char *cmd) {local_irq_disable ();
arch/powerpc/platforms/embedded6xx/mpc10x.h +3 -0
@@ -156,4 +156,7 @@ int mpc10x_disable_store_gathering(struct pci_controller *hose);/* For MPC107 boards that use the built-in openpic */ void mpc10x_set_openpic (void ); +void avr_uart_configure (void ); +void avr_uart_send (const char c); +#endif /* __PPC_KERNEL_MPC10X_H */
arch/s390/kernel/vtime.c +2 -2
@@ -214,13 +214,13 @@ void vtime_flush(struct task_struct *tsk)virt_timer_expire (); steal = S390_lowcore.steal_timer; - avg_steal = S390_lowcore.avg_steal_timer /2 ; + avg_steal = S390_lowcore.avg_steal_timer;if ((s64 ) steal >0 ) { S390_lowcore.steal_timer =0 ;account_steal_time (cputime_to_nsecs (steal)); avg_steal += steal; } - S390_lowcore.avg_steal_timer = avg_steal; + S390_lowcore.avg_steal_timer = avg_steal /2 ; }/*
arch/sparc/kernel/leon_pci_grpci1.c +1 -1
@@ -696,7 +696,7 @@ static int grpci1_of_probe(struct platform_device *ofdev)return err; } -static const struct of_device_id grpci1_of_match[]__initconst = { +static const struct of_device_id grpci1_of_match[] = { { .name ="GAISLER_PCIFBRG" , },
arch/sparc/kernel/leon_pci_grpci2.c +1 -1
@@ -887,7 +887,7 @@ static int grpci2_of_probe(struct platform_device *ofdev)return err; } -static const struct of_device_id grpci2_of_match[]__initconst = { +static const struct of_device_id grpci2_of_match[] = { { .name ="GAISLER_GRPCI2" , },
arch/x86/include/asm/vsyscall.h +10 -0
@@ -4,6 +4,7 @@#include <linux/seqlock.h> #include <uapi/asm/vsyscall.h> +#include <asm/page_types.h> #ifdef CONFIG_X86_VSYSCALL_EMULATION extern void map_vsyscall (void );
@@ -24,4 +25,13 @@ static inline bool emulate_vsyscall(unsigned long error_code, }#endif +/* +* The (legacy) vsyscall page is the long page in the kernel portion +* of the address space that has user-accessible permissions. +*/ +static inline bool is_vsyscall_vaddr (unsigned long vaddr) +{ +return unlikely ((vaddr &PAGE_MASK ) ==VSYSCALL_ADDR ); +} +#endif /* _ASM_X86_VSYSCALL_H */
arch/x86/kernel/paravirt.c +1 -0
@@ -31,6 +31,7 @@#include <asm/special_insns.h> #include <asm/tlb.h> #include <asm/io_bitmap.h> +#include <asm/text-patching.h> /* * nop stub, which must not clobber anything *including the stack* to
arch/x86/mm/fault.c +0 -9
@@ -781,15 +781,6 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code,show_opcodes (regs, loglvl); } -/* -* The (legacy) vsyscall page is the long page in the kernel portion -* of the address space that has user-accessible permissions. -*/ -static bool is_vsyscall_vaddr (unsigned long vaddr) -{ -return unlikely ((vaddr &PAGE_MASK ) ==VSYSCALL_ADDR ); -} -static void __bad_area_nosemaphore (struct pt_regs *regs,unsigned long error_code,unsigned long address,u32 pkey,int si_code)
arch/x86/mm/maccess.c +10 -0
@@ -3,6 +3,8 @@#include <linux/uaccess.h> #include <linux/kernel.h> +#include <asm/vsyscall.h> +#ifdef CONFIG_X86_64 bool copy_from_kernel_nofault_allowed (const void *unsafe_src,size_t size) {
@@ -15,6 +17,14 @@ bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)if (vaddr <TASK_SIZE_MAX +PAGE_SIZE )return false; +/* +* Reading from the vsyscall page may cause an unhandled fault in +* certain cases. Though it is at an address above TASK_SIZE_MAX, it is +* usually considered as a user space address. +*/ +if (is_vsyscall_vaddr (vaddr)) +return false; +/* * Allow everything during early boot before 'x86_virt_bits' * is initialized. Needed for instruction decoding in early
arch/x86/tools/relocs.c +8 -0
@@ -596,6 +596,14 @@ static void print_absolute_relocs(void)if (!(sec_applies->shdr.sh_flags &SHF_ALLOC )) {continue ; } +/* +* Do not perform relocations in .notes section; any +* values there are meant for pre-boot consumption (e.g. +* startup_xen). +*/ +if (sec_applies->shdr.sh_type ==SHT_NOTE ) { +continue ; + } sh_symtab = sec_symtab->symtab; sym_strtab = sec_symtab->link->strtab;for (j =0 ; j < sec->shdr.sh_size/sizeof (Elf_Rel); j++) {
arch/x86/xen/smp.c +12 -0
@@ -65,6 +65,8 @@ int xen_smp_intr_init(unsigned int cpu)char *resched_name, *callfunc_name, *debug_name; resched_name =kasprintf (GFP_KERNEL ,"resched%d" , cpu); +if (!resched_name) + goto fail_mem;per_cpu (xen_resched_irq, cpu).name = resched_name; rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR, cpu,
@@ -77,6 +79,8 @@ int xen_smp_intr_init(unsigned int cpu)per_cpu (xen_resched_irq, cpu).irq = rc; callfunc_name =kasprintf (GFP_KERNEL ,"callfunc%d" , cpu); +if (!callfunc_name) + goto fail_mem;per_cpu (xen_callfunc_irq, cpu).name = callfunc_name; rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR, cpu,
@@ -90,6 +94,9 @@ int xen_smp_intr_init(unsigned int cpu)if (!xen_fifo_events) { debug_name =kasprintf (GFP_KERNEL ,"debug%d" , cpu); +if (!debug_name) + goto fail_mem; +per_cpu (xen_debug_irq, cpu).name = debug_name; rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt,
@@ -101,6 +108,9 @@ int xen_smp_intr_init(unsigned int cpu) } callfunc_name =kasprintf (GFP_KERNEL ,"callfuncsingle%d" , cpu); +if (!callfunc_name) + goto fail_mem; +per_cpu (xen_callfuncsingle_irq, cpu).name = callfunc_name; rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR, cpu,
@@ -114,6 +124,8 @@ int xen_smp_intr_init(unsigned int cpu)return 0 ; + fail_mem: + rc = -ENOMEM ; fail:xen_smp_intr_free (cpu);return rc;
block/ioctl.c +5 -0
@@ -405,6 +405,11 @@ static int blkdev_roset(struct block_device *bdev, fmode_t mode,return ret;if (get_user (n, (int __user *)arg))return -EFAULT ; +if (bdev->bd_disk->fops->set_read_only) { + ret = bdev->bd_disk->fops->set_read_only (bdev, n); +if (ret) +return ret; + }set_device_ro (bdev, n);return 0 ; }
block/opal_proto.h +1 -0
@@ -66,6 +66,7 @@ enum opal_response_token {#define SHORT_ATOM_BYTE 0xBF#define MEDIUM_ATOM_BYTE 0xDF#define LONG_ATOM_BYTE 0xE3 +#define EMPTY_ATOM_BYTE 0xFF#define OPAL_INVAL_PARAM 12#define OPAL_MANUFACTURED_INACTIVE 0x08
block/sed-opal.c +5 -1
@@ -895,16 +895,20 @@ static int response_parse(const u8 *buf, size_t length, token_length =response_parse_medium (iter, pos); else if (pos[0] <= LONG_ATOM_BYTE) /* long atom */ token_length =response_parse_long (iter, pos); + else if (pos[0] == EMPTY_ATOM_BYTE) /* empty atom */ + token_length =1 ; else /* TOKEN */ token_length =response_parse_token (iter, pos);if (token_length <0 )return token_length; +if (pos[0 ] !=EMPTY_ATOM_BYTE ) + num_entries++; + pos += token_length; total -= token_length; iter++; - num_entries++; } resp->num = num_entries;
drivers/acpi/processor_idle.c +2 -0
@@ -1427,6 +1427,8 @@ int acpi_processor_power_exit(struct acpi_processor *pr) acpi_processor_registered--;if (acpi_processor_registered ==0 )cpuidle_unregister_driver (&acpi_idle_driver); + +kfree (dev); } pr->flags.power_setup_done =0 ;
drivers/acpi/scan.c +2 -6
@@ -321,18 +321,14 @@ static int acpi_scan_device_check(struct acpi_device *adev)* again). */ if (adev->handler) { -dev_warn (&adev->dev,"Already enumerated\n" ); -return -EALREADY ; +dev_dbg (&adev->dev,"Already enumerated\n" ); +return 0 ; } error =acpi_bus_scan (adev->handle);if (error) {dev_warn (&adev->dev,"Namespace scan failure\n" );return error; } -if (!adev->handler) { -dev_warn (&adev->dev,"Enumeration failure\n" ); - error = -ENODEV ; - } }else { error =acpi_scan_device_not_present (adev); }
drivers/base/regmap/regmap.c +1 -1
@@ -1796,7 +1796,7 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg, map->format.reg_bytes + map->format.pad_bytes + val_len); - else if (map->bus->gather_write) + else if (map->bus && map->bus->gather_write) ret = map->bus->gather_write(map->bus_context, map->work_buf, map->format.reg_bytes + map->format.pad_bytes,
drivers/block/aoe/aoecmd.c +6 -6
@@ -420,13 +420,16 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *qurcu_read_lock ();for_each_netdev_rcu (&init_net, ifp) {dev_hold (ifp); -if (!is_aoe_netif (ifp)) - goto cont; +if (!is_aoe_netif (ifp)) { +dev_put (ifp); +continue ; + } skb =new_skb (sizeof *h +sizeof *ch);if (skb ==NULL ) {printk (KERN_INFO "aoe: skb alloc failure\n" ); - goto cont; +dev_put (ifp); +continue ; }skb_put (skb,sizeof *h +sizeof *ch); skb->dev = ifp;
@@ -441,9 +444,6 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *qu h->major =cpu_to_be16 (aoemajor); h->minor = aoeminor; h->cmd =AOECMD_CFG ; - -cont: -dev_put (ifp); }rcu_read_unlock (); }
drivers/block/aoe/aoenet.c +1 -0
@@ -64,6 +64,7 @@ tx(int id) __must_hold(&txlock)pr_warn ("aoe: packet could not be sent on %s. %s\n" , ifp ? ifp->name :"netif" ,"consider increasing tx_queue_len" ); +dev_put (ifp);spin_lock_irq (&txlock); }return 0 ;
drivers/block/nbd.c +6 -0
@@ -2339,6 +2339,12 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) } dev_list =nla_nest_start_noflag (reply,NBD_ATTR_DEVICE_LIST ); +if (!dev_list) { +nlmsg_free (reply); + ret = -EMSGSIZE ; + goto out; + } +if (index ==-1 ) { ret =idr_for_each (&nbd_index_idr, &status_cb, reply);if (ret) {
drivers/bus/Kconfig +3 -2
@@ -176,11 +176,12 @@ config SUNXI_RSB config TEGRA_ACONNECT tristate "Tegra ACONNECT Bus Driver" - depends on ARCH_TEGRA_210_SOC + depends on ARCH_TEGRA depends on OF && PM help Driver for the Tegra ACONNECT bus which is used to interface with - the devices inside the Audio Processing Engine (APE) for Tegra210. + the devices inside the Audio Processing Engine (APE) for + Tegra210 and later. config TEGRA_GMI tristate "Tegra Generic Memory Interface bus driver"
drivers/clk/clk.c +3 -0
@@ -425,6 +425,9 @@ static struct clk_core *clk_core_get(struct clk_core *core, u8 p_index)if (IS_ERR (hw))return ERR_CAST (hw); +if (!hw) +return NULL ; +return hw->core; }
drivers/clk/hisilicon/clk-hi3519.c +1 -1
@@ -130,7 +130,7 @@ static void hi3519_clk_unregister(struct platform_device *pdev)of_clk_del_provider (pdev->dev.of_node);hisi_clk_unregister_gate (hi3519_gate_clks, -ARRAY_SIZE (hi3519_mux_clks), +ARRAY_SIZE (hi3519_gate_clks), crg->clk_data); hisi_clk_unregister_mux(hi3519_mux_clks, ARRAY_SIZE(hi3519_mux_clks),
drivers/clk/qcom/dispcc-sdm845.c +2 -0
@@ -768,6 +768,8 @@ static struct clk_branch disp_cc_mdss_vsync_clk = {static struct gdsc mdss_gdsc = { .gdscr =0x3000 , + .en_few_wait_val =0x6 , + .en_rest_wait_val =0x5 , .pd = { .name ="mdss_gdsc" , },
drivers/clk/qcom/reset.c +14 -13
@@ -22,8 +22,8 @@ static int qcom_reset(struct reset_controller_dev *rcdev, unsigned long id)return 0 ; } -static int -qcom_reset_assert (struct reset_controller_dev *rcdev,unsigned long id) +static int qcom_reset_set_assert (struct reset_controller_dev *rcdev, +unsigned long id,bool assert) {struct qcom_reset_controller *rst;const struct qcom_reset_map *map;
@@ -33,21 +33,22 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id) map = &rst->reset_map[id]; mask = map->bitmask ? map->bitmask :BIT (map->bit); -return regmap_update_bits (rst->regmap, map->reg, mask, mask); +regmap_update_bits (rst->regmap, map->reg, mask, assert ? mask :0 ); + +/* Read back the register to ensure write completion, ignore the value */ +regmap_read (rst->regmap, map->reg, &mask); + +return 0 ; } -static int -qcom_reset_deassert (struct reset_controller_dev *rcdev,unsigned long id) +static int qcom_reset_assert (struct reset_controller_dev *rcdev,unsigned long id) { -struct qcom_reset_controller *rst; -const struct qcom_reset_map *map; -u32 mask; - - rst =to_qcom_reset_controller (rcdev); - map = &rst->reset_map[id]; - mask = map->bitmask ? map->bitmask :BIT (map->bit); +return qcom_reset_set_assert (rcdev, id, true); +} -return regmap_update_bits (rst->regmap, map->reg, mask,0 ); +static int qcom_reset_deassert (struct reset_controller_dev *rcdev,unsigned long id) +{ +return qcom_reset_set_assert (rcdev, id, false); }const struct reset_control_ops qcom_reset_ops = {
drivers/cpufreq/brcmstb-avs-cpufreq.c +2 -0
@@ -481,6 +481,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)static unsigned int brcm_avs_cpufreq_get (unsigned int cpu) {struct cpufreq_policy *policy =cpufreq_cpu_get (cpu); +if (!policy) +return 0 ;struct private_data *priv = policy->driver_data;cpufreq_cpu_put (policy);
drivers/crypto/xilinx/zynqmp-aes-gcm.c +3 -0
@@ -231,7 +231,10 @@ static int zynqmp_handle_aes_req(struct crypto_engine *engine, err =zynqmp_aes_aead_cipher (areq); } +local_bh_disable ();crypto_finalize_aead_request (engine, areq, err); +local_bh_enable (); +return 0 ; }
drivers/dma/Kconfig +7 -7
@@ -614,16 +614,16 @@ config TEGRA20_APB_DMA config TEGRA210_ADMA tristate "NVIDIA Tegra210 ADMA support" - depends on (ARCH_TEGRA_210_SOC || COMPILE_TEST) + depends on (ARCH_TEGRA || COMPILE_TEST) select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help - Support for the NVIDIA Tegra210 ADMA controller driver. The - DMA controller has multiple DMA channels and is used to service - various audio clients in the Tegra210 audio processing engine - (APE). This DMA controller transfers data from memory to - peripheral and vice versa. It does not support memory to - memory data transfer. + Support for the NVIDIA Tegra210/Tegra186/Tegra194/Tegra234 ADMA + controller driver. The DMA controller has multiple DMA channels + and is used to service various audio clients in the Tegra210 + audio processing engine (APE). This DMA controller transfers + data from memory to peripheral and vice versa. It does not + support memory to memory data transfer. config TIMB_DMA tristate "Timberdale FPGA DMA support"
drivers/firewire/core-card.c +13 -1
@@ -500,7 +500,19 @@ static void bm_work(struct work_struct *work)fw_notice (card,"phy config: new root=%x, gap_count=%d\n" , new_root_id, gap_count);fw_send_phy_config (card, new_root_id, generation, gap_count); -reset_bus (card, true); +/* +* Where possible, use a short bus reset to minimize +* disruption to isochronous transfers. But in the event +* of a gap count inconsistency, use a long bus reset. +* +* As noted in 1394a 8.4.6.2, nodes on a mixed 1394/1394a bus +* may set different gap counts after a bus reset. On a mixed +* 1394/1394a bus, a short bus reset can get doubled. Some +* nodes may treat the double reset as one bus reset and others +* may treat it as two, causing a gap count inconsistency +* again. Using a long bus reset prevents this. +*/ +reset_bus (card, card->gap_count !=0 );/* Will allocate broadcast channel after the reset. */ goto out; }
drivers/gpu/drm/amd/amdgpu/atom.c +1 -1
@@ -310,7 +310,7 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,DEBUG ("IMM 0x%02X\n" , val);return val; } -return 0 ; +break ;case ATOM_ARG_PLL : idx =U8 (*ptr); (*ptr)++;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +1 -1
@@ -1179,7 +1179,7 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf,const uint32_t rd_buf_size =10 ;struct pipe_ctx *pipe_ctx;ssize_t result =0 ; -int i, r, str_len =30 ; +int i, r, str_len =10 ; rd_buf =kcalloc (rd_buf_size,sizeof (char ),GFP_KERNEL );
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +5 -2
@@ -1669,6 +1669,9 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, {struct dpp *dpp = pipe_ctx->plane_res.dpp; +if (!stream) +return false; +if (dpp ==NULL )return false;
@@ -1691,8 +1694,8 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, }else dpp->funcs->dpp_program_regamma_pwl (dpp,NULL ,OPP_REGAMMA_BYPASS ); -if (stream !=NULL && stream->ctx !=NULL && - stream->out_transfer_func !=NULL ) { +if (stream->ctx && + stream->out_transfer_func) {log_tf (stream->ctx, stream->out_transfer_func, dpp->regamma_params.hw_points_num);
drivers/gpu/drm/lima/lima_gem.c +14 -9
@@ -74,29 +74,34 @@ int lima_heap_alloc(struct lima_bo *bo, struct lima_vm *vm) }else { bo->base.sgt =kmalloc (sizeof (*bo->base.sgt),GFP_KERNEL );if (!bo->base.sgt) { -sg_free_table (&sgt); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_out0; } } ret =dma_map_sgtable (dev, &sgt,DMA_BIDIRECTIONAL ,0 ); -if (ret) { -sg_free_table (&sgt); -kfree (bo->base.sgt); - bo->base.sgt =NULL ; -return ret; - } +if (ret) + goto err_out1; *bo->base.sgt = sgt;if (vm) { ret =lima_vm_map_bo (vm, bo, old_size >>PAGE_SHIFT );if (ret) -return ret; + goto err_out2; } bo->heap_size = new_size;return 0 ; + +err_out2: +dma_unmap_sgtable (dev, &sgt,DMA_BIDIRECTIONAL ,0 ); +err_out1: +kfree (bo->base.sgt); + bo->base.sgt =NULL ; +err_out0: +sg_free_table (&sgt); +return ret; } int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file,
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +7 -5
@@ -84,11 +84,13 @@ static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)struct drm_crtc *crtc = &mtk_crtc->base;unsigned long flags; -spin_lock_irqsave (&crtc->dev->event_lock, flags); -drm_crtc_send_vblank_event (crtc, mtk_crtc->event); -drm_crtc_vblank_put (crtc); - mtk_crtc->event =NULL ; -spin_unlock_irqrestore (&crtc->dev->event_lock, flags); +if (mtk_crtc->event) { +spin_lock_irqsave (&crtc->dev->event_lock, flags); +drm_crtc_send_vblank_event (crtc, mtk_crtc->event); +drm_crtc_vblank_put (crtc); + mtk_crtc->event =NULL ; +spin_unlock_irqrestore (&crtc->dev->event_lock, flags); + } }static void mtk_drm_finish_page_flip (struct mtk_drm_crtc *mtk_crtc)
drivers/gpu/drm/mediatek/mtk_dsi.c +5 -5
@@ -68,8 +68,8 @@#define DSI_PS_WC 0x3fff#define DSI_PS_SEL (3 << 16)#define PACKED_PS_16BIT_RGB565 (0 << 16) -#define LOOSELY_PS_18BIT_RGB666 (1 << 16) -#define PACKED_PS_18BIT_RGB666 (2 << 16) +#define PACKED_PS_18BIT_RGB666 (1 << 16) +#define LOOSELY_PS_24BIT_RGB666 (2 << 16)#define PACKED_PS_24BIT_RGB888 (3 << 16)#define DSI_VSA_NL 0x20
@@ -365,10 +365,10 @@ static void mtk_dsi_ps_control_vact(struct mtk_dsi *dsi) ps_bpp_mode |=PACKED_PS_24BIT_RGB888 ;break ;case MIPI_DSI_FMT_RGB666 : - ps_bpp_mode |=PACKED_PS_18BIT_RGB666 ; + ps_bpp_mode |=LOOSELY_PS_24BIT_RGB666 ;break ;case MIPI_DSI_FMT_RGB666_PACKED : - ps_bpp_mode |=LOOSELY_PS_18BIT_RGB666 ; + ps_bpp_mode |=PACKED_PS_18BIT_RGB666 ;break ;case MIPI_DSI_FMT_RGB565 : ps_bpp_mode |=PACKED_PS_16BIT_RGB565 ;
@@ -419,7 +419,7 @@ static void mtk_dsi_ps_control(struct mtk_dsi *dsi) dsi_tmp_buf_bpp =3 ;break ;case MIPI_DSI_FMT_RGB666 : - tmp_reg =LOOSELY_PS_18BIT_RGB666 ; + tmp_reg =LOOSELY_PS_24BIT_RGB666 ; dsi_tmp_buf_bpp =3 ;break ;case MIPI_DSI_FMT_RGB666_PACKED :
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +4 -2
@@ -265,12 +265,14 @@ static void dpu_encoder_phys_vid_setup_timing_engine( mode.htotal >>=1 ; mode.hsync_start >>=1 ; mode.hsync_end >>=1 ; + mode.hskew >>=1 ;DPU_DEBUG_VIDENC (phys_enc, -"split_role %d, halve horizontal %d %d %d %d\n" , +"split_role %d, halve horizontal %d %d %d %d %d\n" , phys_enc->split_role, mode.hdisplay, mode.htotal, - mode.hsync_start, mode.hsync_end); + mode.hsync_start, mode.hsync_end, + mode.hskew); }drm_mode_to_intf_timing_params (phys_enc, &mode, &timing_params);
drivers/gpu/drm/radeon/ni.c +1 -1
@@ -826,7 +826,7 @@ int ni_init_microcode(struct radeon_device *rdev) err =0 ; }else if (rdev->smc_fw->size != smc_req_size) {pr_err ("ni_mc: Bogus length %zu in firmware \"%s\"\n" , - rdev->mc_fw->size, fw_name); + rdev->smc_fw->size, fw_name); err = -EINVAL ; } }
drivers/gpu/drm/rockchip/inno_hdmi.c +2 -2
@@ -402,7 +402,7 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,hdmi_writeb (hdmi,HDMI_VIDEO_EXT_HBLANK_L , value &0xFF );hdmi_writeb (hdmi,HDMI_VIDEO_EXT_HBLANK_H , (value >>8 ) &0xFF ); - value = mode->hsync_start - mode->hdisplay; + value = mode->htotal - mode->hsync_start;hdmi_writeb (hdmi,HDMI_VIDEO_EXT_HDELAY_L , value &0xFF );hdmi_writeb (hdmi,HDMI_VIDEO_EXT_HDELAY_H , (value >>8 ) &0xFF );
@@ -417,7 +417,7 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi, value = mode->vtotal - mode->vdisplay;hdmi_writeb (hdmi,HDMI_VIDEO_EXT_VBLANK , value &0xFF ); - value = mode->vsync_start - mode->vdisplay; + value = mode->vtotal - mode->vsync_start;hdmi_writeb (hdmi,HDMI_VIDEO_EXT_VDELAY , value &0xFF ); value = mode->vsync_end - mode->vsync_start;
drivers/gpu/drm/rockchip/rockchip_lvds.c +1 -2
@@ -572,8 +572,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, ret = -EINVAL ; goto err_put_port; }else if (ret) { -DRM_DEV_ERROR (dev,"failed to find panel and bridge node\n" ); - ret = -EPROBE_DEFER ; +dev_err_probe (dev, ret,"failed to find panel and bridge node\n" ); goto err_put_port; }if (lvds->panel)
drivers/gpu/drm/tegra/dsi.c +31 -16
97 lines not on this page · raw message
drivers/gpu/drm/tegra/fb.c +1 -0
@@ -155,6 +155,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,if (gem->size < size) { err = -EINVAL ; +drm_gem_object_put (gem); goto unreference; }
drivers/gpu/drm/tegra/output.c +12 -4
@@ -139,8 +139,10 @@ int tegra_output_probe(struct tegra_output *output)GPIOD_IN , "HDMI hotplug detect");if (IS_ERR (output->hpd_gpio)) { -if (PTR_ERR (output->hpd_gpio) != -ENOENT ) -return PTR_ERR (output->hpd_gpio); +if (PTR_ERR (output->hpd_gpio) != -ENOENT ) { + err =PTR_ERR (output->hpd_gpio); + goto put_i2c; + } output->hpd_gpio =NULL ; }
@@ -149,7 +151,7 @@ int tegra_output_probe(struct tegra_output *output) err =gpiod_to_irq (output->hpd_gpio);if (err <0 ) {dev_err (output->dev,"gpiod_to_irq(): %d\n" , err); -return err; + goto put_i2c; } output->hpd_irq = err;
@@ -162,7 +164,7 @@ int tegra_output_probe(struct tegra_output *output)if (err <0 ) {dev_err (output->dev,"failed to request IRQ#%u: %d\n" , output->hpd_irq, err); -return err; + goto put_i2c; } output->connector.polled =DRM_CONNECTOR_POLL_HPD ;
@@ -176,6 +178,12 @@ int tegra_output_probe(struct tegra_output *output) }return 0 ; + +put_i2c: +if (output->ddc) +i2c_put_adapter (output->ddc); + +return err; }void tegra_output_remove (struct tegra_output *output)
drivers/gpu/drm/tidss/tidss_plane.c +1 -1
@@ -202,7 +202,7 @@ struct tidss_plane *tidss_plane_create(struct tidss_device *tidss,drm_plane_helper_add (&tplane->plane, &tidss_plane_helper_funcs); -drm_plane_create_zpos_property (&tplane->plane, hw_plane_id,0 , +drm_plane_create_zpos_property (&tplane->plane, tidss->num_planes,0 , num_planes -1 ); ret = drm_plane_create_color_properties(&tplane->plane,
drivers/hid/hid-lenovo.c +39 -18
94 lines not on this page · raw message
drivers/hid/hid-multitouch.c +4 -0
@@ -2067,6 +2067,10 @@ static const struct hid_device_id mt_devices[] = {HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 , USB_VENDOR_ID_SYNAPTICS, 0xcd7e) }, + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, +HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 , + USB_VENDOR_ID_SYNAPTICS, 0xcddc) }, + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 , USB_VENDOR_ID_SYNAPTICS, 0xce08) },
drivers/infiniband/core/device.c +22 -15
@@ -1686,7 +1686,7 @@ static int assign_client_id(struct ib_client *client) {int ret; -down_write (&clients_rwsem); +lockdep_assert_held (&clients_rwsem);/* * The add/remove callbacks must be called in FIFO/LIFO order. To * achieve this we assign client_ids so they are sorted in
@@ -1695,14 +1695,11 @@ static int assign_client_id(struct ib_client *client) client->client_id = highest_client_id; ret =xa_insert (&clients, client->client_id, client,GFP_KERNEL );if (ret) - goto out; +return ret; highest_client_id++;xa_set_mark (&clients, client->client_id,CLIENT_REGISTERED ); - -out: -up_write (&clients_rwsem); -return ret; +return 0 ; }static void remove_client_id (struct ib_client *client)
@@ -1732,25 +1729,35 @@ int ib_register_client(struct ib_client *client) {struct ib_device *device;unsigned long index; +bool need_unreg = false;int ret;refcount_set (&client->uses,1 );init_completion (&client->uses_zero); + +/* +* The devices_rwsem is held in write mode to ensure that a racing +* ib_register_device() sees a consisent view of clients and devices. +*/ +down_write (&devices_rwsem); +down_write (&clients_rwsem); ret =assign_client_id (client);if (ret) -return ret; + goto out; -down_read (&devices_rwsem); + need_unreg = true; xa_for_each_marked (&devices, index, device, DEVICE_REGISTERED) { ret =add_client_context (device, client); -if (ret) { -up_read (&devices_rwsem); -ib_unregister_client (client); -return ret; - } +if (ret) + goto out; } -up_read (&devices_rwsem); -return 0 ; + ret =0 ; +out: +up_write (&clients_rwsem); +up_write (&devices_rwsem); +if (need_unreg && ret) +ib_unregister_client (client); +return ret; }EXPORT_SYMBOL (ib_register_client);
drivers/infiniband/hw/mlx5/devx.c +1 -1
@@ -2780,7 +2780,7 @@ DECLARE_UVERBS_NAMED_METHOD(MLX5_IB_METHOD_DEVX_OBJ_MODIFY ,UVERBS_ATTR_IDR (MLX5_IB_ATTR_DEVX_OBJ_MODIFY_HANDLE ,UVERBS_IDR_ANY_OBJECT , -UVERBS_ACCESS_WRITE , +UVERBS_ACCESS_READ ,UA_MANDATORY ), UVERBS_ATTR_PTR_IN( MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_IN,
drivers/infiniband/hw/mlx5/wr.c +1 -1
@@ -128,7 +128,7 @@ static void set_eth_seg(const struct ib_send_wr *wr, struct mlx5_ib_qp *qp,*/ copysz =min_t (u64, *cur_edge - (void *)eseg->inline_hdr.start, left); -memcpy (eseg->inline_hdr.start, pdata, copysz); +memcpy (eseg->inline_hdr.data, pdata, copysz); stride =ALIGN (sizeof (struct mlx5_wqe_eth_seg ) -sizeof (eseg->inline_hdr.start) + copysz,16 ); *size += stride /16 ;
drivers/infiniband/ulp/srpt/ib_srpt.c +1 -2
@@ -3205,7 +3205,6 @@ static int srpt_add_one(struct ib_device *device)INIT_IB_EVENT_HANDLER (&sdev->event_handler, sdev->device, srpt_event_handler); -ib_register_event_handler (&sdev->event_handler);for (i =1 ; i <= sdev->device->phys_port_cnt; i++) { sport = &sdev->port[i -1 ];
@@ -3228,6 +3227,7 @@ static int srpt_add_one(struct ib_device *device) } } +ib_register_event_handler (&sdev->event_handler);spin_lock (&srpt_dev_lock);list_add_tail (&sdev->list, &srpt_dev_list);spin_unlock (&srpt_dev_lock);
@@ -3238,7 +3238,6 @@ static int srpt_add_one(struct ib_device *device) err_port:srpt_unregister_mad_agent (sdev, i); -ib_unregister_event_handler (&sdev->event_handler); err_cm:if (sdev->cm_id)ib_destroy_cm_id (sdev->cm_id);
drivers/input/keyboard/gpio_keys_polled.c +4 -6
@@ -319,12 +319,10 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) error =devm_gpio_request_one (dev, button->gpio, flags, button->desc ? :DRV_NAME ); -if (error) { -dev_err (dev, -"unable to claim gpio %u, err=%d\n" , - button->gpio, error); -return error; - } +if (error) +return dev_err_probe (dev, error, +"unable to claim gpio %u\n" , + button->gpio); bdata->gpiod =gpio_to_desc (button->gpio);if (!bdata->gpiod) {
drivers/iommu/amd/init.c +3 -0
@@ -1827,6 +1827,9 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)/* Prevent binding other PCI device drivers to IOMMU devices */ iommu->dev->match_driver = false; +/* ACPI _PRT won't have an IRQ for IOMMU */ + iommu->dev->irq_managed =1 ; +pci_read_config_dword (iommu->dev, cap_ptr +MMIO_CAP_HDR_OFFSET , &iommu->cap);
drivers/iommu/intel/pasid.c +3 -0
@@ -489,6 +489,9 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu,if (!info || !info->ats_enabled)return ; +if (pci_dev_is_disconnected (to_pci_dev (dev))) +return ; + sid = info->bus <<8 | info->devfn; qdep = info->ats_qdep; pfsid = info->pfsid;
drivers/leds/leds-aw2013.c +1 -0
@@ -397,6 +397,7 @@ static int aw2013_probe(struct i2c_client *client)regulator_disable (chip->vcc_regulator); error: +mutex_unlock (&chip->mutex);mutex_destroy (&chip->mutex);return ret; }
drivers/leds/leds-sgm3140.c +3 -0
@@ -114,8 +114,11 @@ static int sgm3140_brightness_set(struct led_classdev *led_cdev, "failed to enable regulator: %d\n", ret);return ret; } +gpiod_set_value_cansleep (priv->flash_gpio,0 );gpiod_set_value_cansleep (priv->enable_gpio,1 ); }else { +del_timer_sync (&priv->powerdown_timer); +gpiod_set_value_cansleep (priv->flash_gpio,0 );gpiod_set_value_cansleep (priv->enable_gpio,0 ); ret =regulator_disable (priv->vin_regulator);if (ret) {
drivers/md/dm-crypt.c +2 -2
@@ -48,11 +48,11 @@struct convert_context {struct completion restart;struct bio *bio_in; -struct bio *bio_out;struct bvec_iter iter_in; +struct bio *bio_out;struct bvec_iter iter_out; -u64 cc_sector;atomic_t cc_pending; +u64 cc_sector;union {struct skcipher_request *req;struct aead_request *req_aead;
drivers/md/dm-raid.c +2 -2
@@ -3329,14 +3329,14 @@ static int raid_map(struct dm_target *ti, struct bio *bio)struct mddev *mddev = &rs->md;/* -* If we're reshaping to add disk(s)), ti->len and +* If we're reshaping to add disk(s), ti->len and * mddev->array_sectors will differ during the process * (ti->len > mddev->array_sectors), so we have to requeue * bios with addresses > mddev->array_sectors here or * there will occur accesses past EOD of the component * data images thus erroring the raid set. */ -if (unlikely (bio_end_sector (bio) > mddev->array_sectors)) +if (unlikely (bio_has_data (bio) &&bio_end_sector (bio) > mddev->array_sectors))return DM_MAPIO_REQUEUE ;md_handle_request (mddev, bio);
drivers/md/dm-verity.h +2 -2
@@ -74,11 +74,11 @@ struct dm_verity_io {/* original value of bio->bi_end_io */ bio_end_io_t *orig_bi_end_io; +struct bvec_iter iter; +sector_t block;unsigned n_blocks; -struct bvec_iter iter; -struct work_struct work;/*
drivers/md/dm.c +20 -6
@@ -2733,6 +2733,9 @@ static void __dm_internal_suspend(struct mapped_device *md, unsigned suspend_flastatic void __dm_internal_resume (struct mapped_device *md) { +int r; +struct dm_table *map; +BUG_ON (!md->internal_suspend_count);if (--md->internal_suspend_count)
@@ -2741,12 +2744,23 @@ static void __dm_internal_resume(struct mapped_device *md)if (dm_suspended_md (md)) goto done;/* resume from nested suspend */ -/* -* NOTE: existing callers don't need to call dm_table_resume_targets -* (which may fail -- so best to avoid it for now by passing NULL map) -*/ - (void )__dm_resume (md,NULL ); - + map =rcu_dereference_protected (md->map,lockdep_is_held (&md->suspend_lock)); + r =__dm_resume (md, map); +if (r) { +/* +* If a preresume method of some target failed, we are in a +* tricky situation. We can't return an error to the caller. We +* can't fake success because then the "resume" and +* "postsuspend" methods would not be paired correctly, and it +* would break various targets, for example it would cause list +* corruption in the "origin" target. +* +* So, we fake normal suspend here, to make sure that the +* "resume" and "postsuspend" methods will be paired correctly. +*/ +DMERR ("Preresume method failed: %d" , r); +set_bit (DMF_SUSPENDED , &md->flags); + } done:clear_bit (DMF_SUSPENDED_INTERNALLY , &md->flags);smp_mb__after_atomic ();
drivers/md/md.c +41 -35
124 lines not on this page · raw message
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +42 -10
80 lines not on this page · raw message
drivers/media/dvb-core/dvbdev.c +5 -0
@@ -504,6 +504,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, dvbdevfops =kmemdup (template->fops,sizeof (*dvbdevfops),GFP_KERNEL );if (!dvbdevfops) {kfree (dvbdev); + *pdvbdev =NULL ;mutex_unlock (&dvbdev_register_lock);return -ENOMEM ; }
@@ -512,6 +513,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,if (!new_node) {kfree (dvbdevfops);kfree (dvbdev); + *pdvbdev =NULL ;mutex_unlock (&dvbdev_register_lock);return -ENOMEM ; }
@@ -545,6 +547,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, }list_del (&dvbdev->list_head);kfree (dvbdev); + *pdvbdev =NULL ;up_write (&minor_rwsem);mutex_unlock (&dvbdev_register_lock);return -EINVAL ;
@@ -567,6 +570,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,dvb_media_device_free (dvbdev);list_del (&dvbdev->list_head);kfree (dvbdev); + *pdvbdev =NULL ;mutex_unlock (&dvbdev_register_lock);return ret; }
@@ -585,6 +589,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,dvb_media_device_free (dvbdev);list_del (&dvbdev->list_head);kfree (dvbdev); + *pdvbdev =NULL ;mutex_unlock (&dvbdev_register_lock);return PTR_ERR (clsdev); }
drivers/media/dvb-frontends/stv0367.c +8 -26
@@ -118,50 +118,32 @@ static const s32 stv0367cab_RF_LookUp2[RF_LOOKUP_TABLE2_SIZE][RF_LOOKUP_TABLE2_S } }; -static -int stv0367_writeregs (struct stv0367_state *state,u16 reg,u8 *data,int len) +static noinline_for_stack +int stv0367_writereg(struct stv0367_state *state, u16 reg, u8 data) { -u8 buf[MAX_XFER_SIZE ]; +u8 buf[3 ] = {MSB (reg),LSB (reg), data };struct i2c_msg msg = { .addr = state->config->demod_address, .flags =0 , .buf = buf, - .len = len +2 + .len =3 , };int ret; -if (2 + len >sizeof (buf)) { -printk (KERN_WARNING -"%s: i2c wr reg=%04x: len=%d is too big!\n" , -KBUILD_MODNAME , reg, len); -return -EINVAL ; - } - - - buf[0 ] =MSB (reg); - buf[1 ] =LSB (reg); -memcpy (buf +2 , data, len); -if (i2cdebug)printk (KERN_DEBUG "%s: [%02x] %02x: %02x\n" , __func__, - state->config->demod_address, reg, buf[2 ]); + state->config->demod_address, reg, data); ret =i2c_transfer (state->i2c, &msg,1 );if (ret !=1 )printk (KERN_ERR "%s: i2c write error! ([%02x] %02x: %02x)\n" , - __func__, state->config->demod_address, reg, buf[2 ]); + __func__, state->config->demod_address, reg, data);return (ret !=1 ) ? -EREMOTEIO :0 ; } -static int stv0367_writereg (struct stv0367_state *state,u16 reg,u8 data) -{ -u8 tmp = data;/* see gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 */ - -return stv0367_writeregs (state, reg, &tmp,1 ); -} - -static u8 stv0367_readreg (struct stv0367_state *state,u16 reg) +static noinline_for_stack +u8 stv0367_readreg(struct stv0367_state *state, u16 reg) {u8 b0[] = {0 ,0 };u8 b1[] = {0 };
drivers/media/i2c/tc358743.c +4 -3
@@ -2108,9 +2108,6 @@ static int tc358743_probe(struct i2c_client *client) state->mbus_fmt_code =MEDIA_BUS_FMT_RGB888_1X24 ; sd->dev = &client->dev; - err =v4l2_async_register_subdev (sd); -if (err <0 ) - goto err_hdl;mutex_init (&state->confctl_mutex);
@@ -2168,6 +2165,10 @@ static int tc358743_probe(struct i2c_client *client)if (err) goto err_work_queues; + err =v4l2_async_register_subdev (sd); +if (err <0 ) + goto err_work_queues; +v4l2_info (sd,"%s found @ 0x%x (%s)\n" , client->name, client->addr <<1 , client->adapter->name);
drivers/media/pci/ttpci/budget-av.c +5 -3
@@ -1462,7 +1462,8 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio budget_av->has_saa7113 =1 ; err =saa7146_vv_init (dev, &vv_data);if (err !=0 ) { -/* fixme: proper cleanup here */ +ttpci_budget_deinit (&budget_av->budget); +kfree (budget_av);ERR ("cannot init vv subsystem\n" );return err; }
@@ -1471,9 +1472,10 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio vv_data.vid_ops.vidioc_s_input = vidioc_s_input;if ((err =saa7146_register_device (&budget_av->vd, dev,"knc1" ,VFL_TYPE_VIDEO ))) { -/* fixme: proper cleanup here */ -ERR ("cannot register capture v4l2 device\n" );saa7146_vv_release (dev); +ttpci_budget_deinit (&budget_av->budget); +kfree (budget_av); +ERR ("cannot register capture v4l2 device\n" );return err; }
drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c +1 -1
@@ -26,7 +26,7 @@ static void mtk_mdp_vpu_handle_init_ack(const struct mdp_ipi_comm_ack *msg) vpu->inst_addr = msg->vpu_inst_addr; } -static void mtk_mdp_vpu_ipi_handler (const void *data,unsigned int len, +static void mtk_mdp_vpu_ipi_handler (void *data,unsigned int len,void *priv) {const struct mdp_ipi_comm_ack *msg = data;
drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +1 -9
@@ -29,15 +29,7 @@ static int mtk_vcodec_vpu_set_ipi_register(struct mtk_vcodec_fw *fw, int id,mtk_vcodec_ipi_handler handler, const char *name, void *priv) { -/* -* The handler we receive takes a void * as its first argument. We -* cannot change this because it needs to be passed down to the rproc -* subsystem when SCP is used. VPU takes a const argument, which is -* more constrained, so the conversion below is safe. -*/ - ipi_handler_t handler_const = (ipi_handler_t)handler; - -return vpu_ipi_register (fw->pdev, id, handler_const, name, priv); + return vpu_ipi_register(fw->pdev, id, handler, name, priv); } static int mtk_vcodec_vpu_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf,
drivers/media/platform/mtk-vpu/mtk_vpu.c +1 -1
@@ -612,7 +612,7 @@ int vpu_load_firmware(struct platform_device *pdev) }EXPORT_SYMBOL_GPL (vpu_load_firmware); -static void vpu_init_ipi_handler (const void *data,unsigned int len,void *priv) +static void vpu_init_ipi_handler (void *data,unsigned int len,void *priv) {struct mtk_vpu *vpu = priv;const struct vpu_run *run = data;
drivers/media/platform/mtk-vpu/mtk_vpu.h +1 -1
@@ -15,7 +15,7 @@* VPU interfaces with other blocks by share memory and interrupt. **/ -typedef void (*ipi_handler_t ) (const void *data, +typedef void (*ipi_handler_t ) (void *data,unsigned int len,void *priv);
drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +35 -34
126 lines not on this page · raw message
drivers/media/usb/em28xx/em28xx-cards.c +4 -0
@@ -4049,6 +4049,10 @@ static int em28xx_usb_probe(struct usb_interface *intf,* topology will likely change after the load of the em28xx subdrivers. */ #ifdef CONFIG_MEDIA_CONTROLLER +/* +* No need to check the return value, the device will still be +* usable without media controller API. +*/ retval =media_device_register (dev->media_dev);#endif
drivers/media/usb/go7007/go7007-driver.c +5 -3
@@ -80,7 +80,7 @@ static int go7007_load_encoder(struct go7007 *go)const struct firmware *fw_entry;char fw_name[] ="go7007/go7007fw.bin" ;void *bounce; -int fw_len, rv =0 ; +int fw_len;u16 intr_val, intr_data;if (go->boot_fw ==NULL ) {
@@ -109,9 +109,11 @@ static int go7007_load_encoder(struct go7007 *go) go7007_read_interrupt(go, &intr_val, &intr_data) < 0 || (intr_val & ~0x1) != 0x5a5a) {v4l2_err (go,"error transferring firmware\n" ); - rv =-1 ; +kfree (go->boot_fw); + go->boot_fw =NULL ; +return -1 ; } -return rv; +return 0 ; }MODULE_FIRMWARE ("go7007/go7007fw.bin" );
drivers/media/usb/go7007/go7007-usb.c +3 -1
@@ -1201,7 +1201,9 @@ static int go7007_usb_probe(struct usb_interface *intf,u16 channel;/* read channel number from GPIO[1:0] */ -go7007_read_addr (go,0x3c81 , &channel); +if (go7007_read_addr (go,0x3c81 , &channel)) + goto allocfail; + channel &=0x3 ; go->board_id =GO7007_BOARDID_ADLINK_MPG24 ; usb->board = board = &board_adlink_mpg24;
drivers/media/usb/pvrusb2/pvrusb2-context.c +5 -5
@@ -90,8 +90,10 @@ static void pvr2_context_destroy(struct pvr2_context *mp) } -static void pvr2_context_notify (struct pvr2_context *mp) +static void pvr2_context_notify (void *ptr) { +struct pvr2_context *mp = ptr; +pvr2_context_set_notify (mp,!0 ); }
@@ -106,9 +108,7 @@ static void pvr2_context_check(struct pvr2_context *mp)pvr2_trace (PVR2_TRACE_CTXT ,"pvr2_context %p (initialize)" , mp);/* Finish hardware initialization */ -if (pvr2_hdw_initialize (mp->hdw, - (void (*)(void *))pvr2_context_notify, - mp)) { +if (pvr2_hdw_initialize (mp->hdw, pvr2_context_notify, mp)) { mp->video_stream.stream =pvr2_hdw_get_video_stream (mp->hdw);/* Trigger interface initialization. By doing this
@@ -267,9 +267,9 @@ static void pvr2_context_exit(struct pvr2_context *mp)void pvr2_context_disconnect (struct pvr2_context *mp) {pvr2_hdw_disconnect (mp->hdw); - mp->disconnect_flag = !0 ;if (!pvr2_context_shutok ())pvr2_context_notify (mp); + mp->disconnect_flag = !0 ; }
drivers/media/usb/pvrusb2/pvrusb2-dvb.c +4 -2
@@ -88,8 +88,10 @@ static int pvr2_dvb_feed_thread(void *data)return stat; } -static void pvr2_dvb_notify (struct pvr2_dvb_adapter *adap) +static void pvr2_dvb_notify (void *ptr) { +struct pvr2_dvb_adapter *adap = ptr; +wake_up (&adap->buffer_wait_data); }
@@ -149,7 +151,7 @@ static int pvr2_dvb_stream_do_start(struct pvr2_dvb_adapter *adap) }pvr2_stream_set_callback (pvr->video_stream.stream, - (pvr2_stream_callback ) pvr2_dvb_notify, adap); + pvr2_dvb_notify, adap); ret =pvr2_stream_set_buffer_count (stream,PVR2_DVB_BUFFER_COUNT );if (ret <0 )return ret;
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c +4 -7
@@ -1037,8 +1037,10 @@ static int pvr2_v4l2_open(struct file *file) } -static void pvr2_v4l2_notify (struct pvr2_v4l2_fh *fhp) +static void pvr2_v4l2_notify (void *ptr) { +struct pvr2_v4l2_fh *fhp = ptr; +wake_up (&fhp->wait_data); }
@@ -1071,7 +1073,7 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh) hdw = fh->channel.mc_head->hdw; sp = fh->pdi->stream->stream; -pvr2_stream_set_callback (sp,(pvr2_stream_callback )pvr2_v4l2_notify,fh); +pvr2_stream_set_callback (sp, pvr2_v4l2_notify, fh);pvr2_hdw_set_stream_type (hdw,fh->pdi->config);if ((ret =pvr2_hdw_set_streaming (hdw,!0 )) <0 )return ret;return pvr2_ioread_set_enabled (fh->rhp,!0 );
@@ -1202,11 +1204,6 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, dip->minor_type = pvr2_v4l_type_video; nr_ptr = video_nr; caps |=V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_AUDIO ; -if (!dip->stream) { -pr_err (KBUILD_MODNAME -": Failed to set up pvrusb2 v4l video dev due to missing stream instance\n" ); -return ; - }break ;case VFL_TYPE_VBI : dip->config = pvr2_config_vbi;
drivers/media/v4l2-core/v4l2-mem2mem.c +8 -2
@@ -1053,11 +1053,17 @@ static int v4l2_m2m_register_entity(struct media_device *mdev, entity->function = function; ret =media_entity_pads_init (entity, num_pads, pads); -if (ret) +if (ret) { +kfree (entity->name); + entity->name =NULL ;return ret; + } ret =media_device_register_entity (mdev, entity); -if (ret) +if (ret) { +kfree (entity->name); + entity->name =NULL ;return ret; + }return 0 ; }
drivers/mfd/altera-sysmgr.c +3 -1
@@ -110,7 +110,9 @@ struct regmap *altr_sysmgr_regmap_lookup_by_phandle(struct device_node *np, dev =driver_find_device_by_of_node (&altr_sysmgr_driver.driver, (void *)sysmgr_np); -of_node_put (sysmgr_np); +if (property) +of_node_put (sysmgr_np); +if (!dev)return ERR_PTR (-EPROBE_DEFER );
drivers/mfd/syscon.c +3 -1
@@ -224,7 +224,9 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np,return ERR_PTR (-ENODEV ); regmap =syscon_node_to_regmap (syscon_np); -of_node_put (syscon_np); + +if (property) +of_node_put (syscon_np);return regmap; }
drivers/mmc/host/wmt-sdmmc.c +0 -4
@@ -889,7 +889,6 @@ static int wmt_mci_remove(struct platform_device *pdev) {struct mmc_host *mmc;struct wmt_mci_priv *priv; -struct resource *res;u32 reg_tmp; mmc =platform_get_drvdata (pdev);
@@ -917,9 +916,6 @@ static int wmt_mci_remove(struct platform_device *pdev)clk_disable_unprepare (priv->clk_sdmmc);clk_put (priv->clk_sdmmc); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -release_mem_region (res->start,resource_size (res)); -mmc_free_host (mmc);dev_info (&pdev->dev,"WMT MCI device removed\n" );
drivers/mtd/maps/physmap-core.c +1 -1
@@ -528,7 +528,7 @@ static int physmap_flash_probe(struct platform_device *dev)if (!info->maps[i].phys) info->maps[i].phys = res->start; - info->win_order =get_bitmask_order (resource_size (res)) -1 ; + info->win_order =fls64 (resource_size (res)) -1 ; info->maps[i].size =BIT (info->win_order + (info->gpios ? info->gpios->ndescs :0 ));
drivers/mtd/nand/raw/lpc32xx_mlc.c +3 -2
@@ -304,8 +304,9 @@ static int lpc32xx_nand_device_ready(struct nand_chip *nand_chip)return 0 ; } -static irqreturn_t lpc3xxx_nand_irq (int irq,struct lpc32xx_nand_host *host) +static irqreturn_t lpc3xxx_nand_irq (int irq,void *data) { +struct lpc32xx_nand_host *host = data;uint8_t sr;/* Clear interrupt flag by reading status */
@@ -780,7 +781,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) goto release_dma_chan; } -if (request_irq (host->irq, (irq_handler_t)&lpc3xxx_nand_irq, +if (request_irq (host->irq, &lpc3xxx_nand_irq,IRQF_TRIGGER_HIGH ,DRV_NAME , host)) {dev_err (&pdev->dev,"Error requesting NAND IRQ\n" ); res = -ENXIO ;
drivers/net/dsa/mt7530.c +4 -4
@@ -1581,11 +1581,11 @@ mt7530_setup(struct dsa_switch *ds)*/ if (priv->mcm) {reset_control_assert (priv->rstc); -usleep_range (1000 ,1100 ); +usleep_range (5000 ,5100 );reset_control_deassert (priv->rstc); }else {gpiod_set_value_cansleep (priv->reset,0 ); -usleep_range (1000 ,1100 ); +usleep_range (5000 ,5100 );gpiod_set_value_cansleep (priv->reset,1 ); }
@@ -1704,11 +1704,11 @@ mt7531_setup(struct dsa_switch *ds)*/ if (priv->mcm) {reset_control_assert (priv->rstc); -usleep_range (1000 ,1100 ); +usleep_range (5000 ,5100 );reset_control_deassert (priv->rstc); }else {gpiod_set_value_cansleep (priv->reset,0 ); -usleep_range (1000 ,1100 ); +usleep_range (5000 ,5100 );gpiod_set_value_cansleep (priv->reset,1 ); }
drivers/net/ethernet/amazon/ena/ena_netdev.c +0 -17
@@ -3057,22 +3057,6 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static u16 ena_select_queue (struct net_device *dev,struct sk_buff *skb, -struct net_device *sb_dev) -{ -u16 qid; -/* we suspect that this is good for in--kernel network services that -* want to loop incoming skb rx to tx in normal user generated traffic, -* most probably we will not get to this -*/ -if (skb_rx_queue_recorded (skb)) - qid =skb_get_rx_queue (skb); -else - qid =netdev_pick_tx (dev, skb,NULL ); - -return qid; -} -static void ena_config_host_info (struct ena_com_dev *ena_dev,struct pci_dev *pdev) {struct device *dev = &pdev->dev;
@@ -3242,7 +3226,6 @@ static const struct net_device_ops ena_netdev_ops = { .ndo_open = ena_open, .ndo_stop = ena_close, .ndo_start_xmit = ena_start_xmit, - .ndo_select_queue = ena_select_queue, .ndo_get_stats64 = ena_get_stats64, .ndo_tx_timeout = ena_tx_timeout, .ndo_change_mtu = ena_change_mtu,
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +3 -3
@@ -1002,9 +1002,6 @@ static inline void bnx2x_set_fw_mac_addr(__le16 *fw_hi, __le16 *fw_mid,static inline void bnx2x_free_rx_mem_pool (struct bnx2x *bp,struct bnx2x_alloc_pool *pool) { -if (!pool->page) -return ; -put_page (pool->page); pool->page =NULL ;
@@ -1015,6 +1012,9 @@ static inline void bnx2x_free_rx_sge_range(struct bnx2x *bp, {int i; +if (!fp->page_pool.page) +return ; +if (fp->mode ==TPA_MODE_DISABLED )return ;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +4 -1
@@ -2723,7 +2723,10 @@ static int hclge_mac_init(struct hclge_dev *hdev)int ret; hdev->support_sfp_query = true; - hdev->hw.mac.duplex =HCLGE_MAC_FULL ; + +if (!test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state)) + hdev->hw.mac.duplex =HCLGE_MAC_FULL ; + ret =hclge_cfg_mac_speed_dup_hw (hdev, hdev->hw.mac.speed, hdev->hw.mac.duplex);if (ret)
drivers/net/ethernet/intel/igb/igb_main.c +55 -57
132 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/af/cgx.c +1 -1
@@ -714,7 +714,7 @@ static irqreturn_t cgx_fwi_event_handler(int irq, void *data)/* Release thread waiting for completion */ lmac->cmd_pend = false; -wake_up_interruptible (&lmac->wq_cmd_cmplt); +wake_up (&lmac->wq_cmd_cmplt);break ;case CGX_EVT_ASYNC :if (cgx_event_is_linkevent (event))
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +14 -3
@@ -1969,10 +1969,9 @@ static void rvu_queue_work(struct mbox_wq_info *mw, int first, } } -static irqreturn_t rvu_mbox_intr_handler (int irq,void *rvu_irq) +static irqreturn_t rvu_mbox_pf_intr_handler (int irq,void *rvu_irq) {struct rvu *rvu = (struct rvu *)rvu_irq; -int vfs = rvu->vfs;u64 intr; intr =rvu_read64 (rvu,BLKADDR_RVUM ,RVU_AF_PFAF_MBOX_INT );
@@ -1986,6 +1985,18 @@ static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq)rvu_queue_work (&rvu->afpf_wq_info,0 , rvu->hw->total_pfs, intr); +return IRQ_HANDLED ; +} + +static irqreturn_t rvu_mbox_intr_handler (int irq,void *rvu_irq) +{ +struct rvu *rvu = (struct rvu *)rvu_irq; +int vfs = rvu->vfs; +u64 intr; + +/* Sync with mbox memory region */ +rmb (); +/* Handle VF interrupts */ if (vfs >64 ) { intr =rvupf_read64 (rvu,RVU_PF_VFPF_MBOX_INTX (1 ));
@@ -2300,7 +2311,7 @@ static int rvu_register_interrupts(struct rvu *rvu)/* Register mailbox interrupt handler */ sprintf (&rvu->irq_name[RVU_AF_INT_VEC_MBOX *NAME_SIZE ],"RVUAF Mbox" ); ret =request_irq (pci_irq_vector (rvu->pdev,RVU_AF_INT_VEC_MBOX ), - rvu_mbox_intr_handler,0 , + rvu_mbox_pf_intr_handler,0 , &rvu->irq_name[RVU_AF_INT_VEC_MBOX *NAME_SIZE ], rvu);if (ret) { dev_err(rvu->dev,
drivers/net/ethernet/netronome/nfp/flower/lag_conf.c +5 -0
@@ -308,6 +308,11 @@ static void nfp_fl_lag_do_work(struct work_struct *work) acti_netdevs =kmalloc_array (entry->slave_cnt,sizeof (*acti_netdevs),GFP_KERNEL ); +if (!acti_netdevs) { +schedule_delayed_work (&lag->work, +NFP_FL_LAG_DELAY ); +continue ; + }/* Include sanity check in the loop. It may be that a bond has * changed between processing the last notification and the
drivers/net/phy/dp83822.c +24 -14
@@ -94,7 +94,8 @@#define DP83822_WOL_INDICATION_SEL BIT(8)#define DP83822_WOL_CLR_INDICATION BIT(11) -/* RSCR bits */ +/* RCSR bits */ +#define DP83822_RGMII_MODE_EN BIT(9)#define DP83822_RX_CLK_SHIFT BIT(12)#define DP83822_TX_CLK_SHIFT BIT(11)
@@ -358,7 +359,7 @@ static int dp83822_config_init(struct phy_device *phydev) {struct dp83822_private *dp83822 = phydev->priv;struct device *dev = &phydev->mdio.dev; -int rgmii_delay; +int rgmii_delay =0 ;s32 rx_int_delay;s32 tx_int_delay;int err =0 ;
@@ -368,24 +369,33 @@ static int dp83822_config_init(struct phy_device *phydev) rx_int_delay =phy_get_internal_delay (phydev, dev,NULL ,0 , true); -if (rx_int_delay <=0 ) - rgmii_delay =0 ; -else - rgmii_delay =DP83822_RX_CLK_SHIFT ; +/* Set DP83822_RX_CLK_SHIFT to enable rx clk internal delay */ +if (rx_int_delay >0 ) + rgmii_delay |=DP83822_RX_CLK_SHIFT ; tx_int_delay =phy_get_internal_delay (phydev, dev,NULL ,0 , false); + +/* Set DP83822_TX_CLK_SHIFT to disable tx clk internal delay */ if (tx_int_delay <=0 ) - rgmii_delay &= ~DP83822_TX_CLK_SHIFT ; -else rgmii_delay |=DP83822_TX_CLK_SHIFT ; -if (rgmii_delay) { - err =phy_set_bits_mmd (phydev,DP83822_DEVADDR , -MII_DP83822_RCSR , rgmii_delay); -if (err) -return err; - } + err =phy_modify_mmd (phydev,DP83822_DEVADDR ,MII_DP83822_RCSR , +DP83822_RX_CLK_SHIFT |DP83822_TX_CLK_SHIFT , rgmii_delay); +if (err) +return err; + + err =phy_set_bits_mmd (phydev,DP83822_DEVADDR , +MII_DP83822_RCSR ,DP83822_RGMII_MODE_EN ); + +if (err) +return err; + }else { + err =phy_clear_bits_mmd (phydev,DP83822_DEVADDR , +MII_DP83822_RCSR ,DP83822_RGMII_MODE_EN ); + +if (err) +return err; }if (dp83822->fx_enabled) {
drivers/net/phy/phy_device.c +1 -1
@@ -2769,7 +2769,7 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev,if (delay <0 )return delay; -if (delay && size ==0 ) +if (size ==0 )return delay;if (delay < delay_values[0 ] || delay > delay_values[size -1 ]) {
drivers/net/usb/sr9800.c +3 -1
@@ -736,7 +736,9 @@ static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf) data->eeprom_len =SR9800_EEPROM_LEN ; -usbnet_get_endpoints (dev, intf); + ret =usbnet_get_endpoints (dev, intf); +if (ret) + goto out;/* LED Setting Rule : * AABB:CCDD
drivers/net/wireguard/receive.c +3 -3
@@ -258,7 +258,7 @@ static bool decrypt_packet(struct sk_buff *skb, struct noise_keypair *keypair)if (unlikely (!READ_ONCE (keypair->receiving.is_valid) ||wg_birthdate_has_expired (keypair->receiving.birthdate,REJECT_AFTER_TIME ) || - keypair->receiving_counter.counter >=REJECT_AFTER_MESSAGES )) { +READ_ONCE (keypair->receiving_counter.counter) >=REJECT_AFTER_MESSAGES )) {WRITE_ONCE (keypair->receiving.is_valid, false);return false; }
@@ -325,7 +325,7 @@ static bool counter_validate(struct noise_replay_counter *counter, u64 their_coufor (i =1 ; i <= top; ++i) counter->backtrack[(i + index_current) & ((COUNTER_BITS_TOTAL /BITS_PER_LONG ) -1 )] =0 ; - counter->counter = their_counter; +WRITE_ONCE (counter->counter, their_counter); } index &= (COUNTER_BITS_TOTAL /BITS_PER_LONG ) -1 ;
@@ -470,7 +470,7 @@ int wg_packet_rx_poll(struct napi_struct *napi, int budget)net_dbg_ratelimited ("%s: Packet has invalid nonce %llu (max %llu)\n" , peer->device->dev->name,PACKET_CB (skb)->nonce, - keypair->receiving_counter.counter); +READ_ONCE (keypair->receiving_counter.counter)); goto next; }
drivers/net/wireless/ath/ath10k/core.c +0 -3
@@ -3381,13 +3381,10 @@ EXPORT_SYMBOL(ath10k_core_create);void ath10k_core_destroy (struct ath10k *ar) { -flush_workqueue (ar->workqueue);destroy_workqueue (ar->workqueue); -flush_workqueue (ar->workqueue_aux);destroy_workqueue (ar->workqueue_aux); -flush_workqueue (ar->workqueue_tx_complete);destroy_workqueue (ar->workqueue_tx_complete);ath10k_debug_destroy (ar);
drivers/net/wireless/ath/ath10k/sdio.c +0 -1
@@ -2651,7 +2651,6 @@ static void ath10k_sdio_remove(struct sdio_func *func)ath10k_core_destroy (ar); -flush_workqueue (ar_sdio->workqueue);destroy_workqueue (ar_sdio->workqueue); }
drivers/net/wireless/ath/ath10k/wmi-tlv.c +4 -0
@@ -844,6 +844,10 @@ ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev(struct ath10k *ar, struct sk_buff *skb, } ev = tb[WMI_TLV_TAG_STRUCT_MGMT_TX_COMPL_EVENT ]; +if (!ev) { +kfree (tb); +return -EPROTO ; + } arg->desc_id = ev->desc_id; arg->status = ev->status;
drivers/net/wireless/ath/ath9k/htc.h +1 -1
@@ -306,7 +306,6 @@ struct ath9k_htc_tx {DECLARE_BITMAP (tx_slot,MAX_TX_BUF_NUM );struct timer_list cleanup_timer;spinlock_t tx_lock; -bool initialized; };struct ath9k_htc_tx_ctl {
@@ -515,6 +514,7 @@ struct ath9k_htc_priv {unsigned long ps_usecount;bool ps_enabled;bool ps_idle; +bool initialized;#ifdef CONFIG_MAC80211_LEDS enum led_brightness brightness;
drivers/net/wireless/ath/ath9k/htc_drv_init.c +4 -0
@@ -966,6 +966,10 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev, htc_handle->drv_priv = priv; +/* Allow ath9k_wmi_event_tasklet() to operate. */ +smp_wmb (); + priv->initialized = true; +return 0 ; err_init:
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +0 -4
@@ -810,10 +810,6 @@ int ath9k_tx_init(struct ath9k_htc_priv *priv)skb_queue_head_init (&priv->tx.data_vo_queue);skb_queue_head_init (&priv->tx.tx_failed); -/* Allow ath9k_wmi_event_tasklet(WMI_TXSTATUS_EVENTID) to operate. */ -smp_wmb (); - priv->tx.initialized = true; -return 0 ; }
drivers/net/wireless/ath/ath9k/wmi.c +6 -4
@@ -155,6 +155,12 @@ void ath9k_wmi_event_tasklet(struct tasklet_struct *t) }spin_unlock_irqrestore (&wmi->wmi_lock, flags); +/* Check if ath9k_htc_probe_device() completed. */ +if (!data_race (priv->initialized)) { +kfree_skb (skb); +continue ; + } + hdr = (struct wmi_cmd_hdr *) skb->data; cmd_id =be16_to_cpu (hdr->command_id); wmi_event =skb_pull (skb,sizeof (struct wmi_cmd_hdr ));
@@ -169,10 +175,6 @@ void ath9k_wmi_event_tasklet(struct tasklet_struct *t) &wmi->drv_priv->fatal_work);break ;case WMI_TXSTATUS_EVENTID : -/* Check if ath9k_tx_init() completed. */ -if (!data_race (priv->tx.initialized)) -break ; -spin_lock_bh (&priv->tx.tx_lock);if (priv->tx.flags &ATH9K_HTC_OP_TX_DRAIN ) {spin_unlock_bh (&priv->tx.tx_lock);
drivers/net/wireless/broadcom/b43/b43.h +16 -0
@@ -1082,6 +1082,22 @@ static inline bool b43_using_pio_transfers(struct b43_wldev *dev)return dev->__using_pio_transfers; } +static inline void b43_wake_queue (struct b43_wldev *dev,int queue_prio) +{ +if (dev->qos_enabled) +ieee80211_wake_queue (dev->wl->hw, queue_prio); +else +ieee80211_wake_queue (dev->wl->hw,0 ); +} + +static inline void b43_stop_queue (struct b43_wldev *dev,int queue_prio) +{ +if (dev->qos_enabled) +ieee80211_stop_queue (dev->wl->hw, queue_prio); +else +ieee80211_stop_queue (dev->wl->hw,0 ); +} +/* Message printing */ __printf(2, 3) void b43info(struct b43_wl *wl, const char *fmt, ...); __printf(2, 3) void b43err(struct b43_wl *wl, const char *fmt, ...);
drivers/net/wireless/broadcom/b43/dma.c +2 -2
@@ -1399,7 +1399,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb) should_inject_overflow(ring)) {/* This TX ring is full. */ unsigned int skb_mapping =skb_get_queue_mapping (skb); -ieee80211_stop_queue (dev->wl->hw, skb_mapping); +b43_stop_queue (dev, skb_mapping); dev->wl->tx_queue_stopped[skb_mapping] = true; ring->stopped = true;if (b43_debug (dev,B43_DBG_DMAVERBOSE )) {
@@ -1570,7 +1570,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev, }else {/* If the driver queue is running wake the corresponding * mac80211 queue. */ -ieee80211_wake_queue (dev->wl->hw, ring->queue_prio); +b43_wake_queue (dev, ring->queue_prio);if (b43_debug (dev,B43_DBG_DMAVERBOSE )) {b43dbg (dev->wl,"Woke up TX ring %d\n" , ring->index); }
drivers/net/wireless/broadcom/b43/main.c +9 -7
@@ -2587,7 +2587,8 @@ static void b43_request_firmware(struct work_struct *work) start_ieee80211: wl->hw->queues =B43_QOS_QUEUE_NUM ; -if (!modparam_qos || dev->fw.opensource) +if (!modparam_qos || dev->fw.opensource || + dev->dev->chip_id ==BCMA_CHIP_ID_BCM4331 ) wl->hw->queues =1 ; err =ieee80211_register_hw (wl->hw);
@@ -3603,7 +3604,7 @@ static void b43_tx_work(struct work_struct *work) err =b43_dma_tx (dev, skb);if (err == -ENOSPC ) { wl->tx_queue_stopped[queue_num] = true; -ieee80211_stop_queue (wl->hw, queue_num); +b43_stop_queue (dev, queue_num);skb_queue_head (&wl->tx_queue[queue_num], skb);break ; }
@@ -3627,6 +3628,7 @@ static void b43_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) {struct b43_wl *wl =hw_to_b43_wl (hw); +u16 skb_queue_mapping;if (unlikely (skb->len <2 +2 +6 )) {/* Too short, this can't be a valid frame. */
@@ -3635,12 +3637,12 @@ static void b43_op_tx(struct ieee80211_hw *hw, }B43_WARN_ON (skb_shinfo (skb)->nr_frags); -skb_queue_tail (&wl->tx_queue[skb->queue_mapping], skb); -if (!wl->tx_queue_stopped[skb->queue_mapping]) { + skb_queue_mapping =skb_get_queue_mapping (skb); +skb_queue_tail (&wl->tx_queue[skb_queue_mapping], skb); +if (!wl->tx_queue_stopped[skb_queue_mapping])ieee80211_queue_work (wl->hw, &wl->tx_work); - }else { -ieee80211_stop_queue (wl->hw, skb->queue_mapping); - } +else +b43_stop_queue (wl->current_dev, skb_queue_mapping); } static void b43_qos_params_upload(struct b43_wldev *dev,
drivers/net/wireless/broadcom/b43/pio.c +3 -3
@@ -525,7 +525,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)if (total_len > (q->buffer_size - q->buffer_used)) {/* Not enough memory on the queue. */ err = -EBUSY ; -ieee80211_stop_queue (dev->wl->hw,skb_get_queue_mapping (skb)); +b43_stop_queue (dev,skb_get_queue_mapping (skb)); q->stopped = true; goto out; }
@@ -552,7 +552,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)if (((q->buffer_size - q->buffer_used) <roundup (2 +2 +6 ,4 )) || (q->free_packet_slots ==0 )) {/* The queue is full. */ -ieee80211_stop_queue (dev->wl->hw,skb_get_queue_mapping (skb)); +b43_stop_queue (dev,skb_get_queue_mapping (skb)); q->stopped = true; }
@@ -587,7 +587,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,list_add (&pack->list, &q->packets_list);if (q->stopped) { -ieee80211_wake_queue (dev->wl->hw, q->queue_prio); +b43_wake_queue (dev, q->queue_prio); q->stopped = false; } }
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c +2 -1
@@ -383,8 +383,9 @@ struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp)return sh; } -static void wlc_phy_timercb_phycal (struct brcms_phy *pi) +static void wlc_phy_timercb_phycal (void *ptr) { +struct brcms_phy *pi = ptr;uint delay =5 ;if (PHY_PERICAL_MPHASE_PENDING (pi)) {
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c +2 -3
@@ -57,12 +57,11 @@ void wlc_phy_shim_detach(struct phy_shim_info *physhim) }struct wlapi_timer *wlapi_init_timer (struct phy_shim_info *physhim, -void (*fn)(struct brcms_phy *pi), +void (*fn)(void *pi),void *arg,const char *name) {return (struct wlapi_timer *) -brcms_init_timer (physhim->wl, (void (*)(void *))fn, - arg, name); +brcms_init_timer (physhim->wl, fn, arg, name); }void wlapi_free_timer (struct wlapi_timer *t)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h +1 -1
@@ -131,7 +131,7 @@ void wlc_phy_shim_detach(struct phy_shim_info *physhim);/* PHY to WL utility functions */ struct wlapi_timer *wlapi_init_timer (struct phy_shim_info *physhim, -void (*fn)(struct brcms_phy *pi), +void (*fn)(void *pi),void *arg,const char *name);void wlapi_free_timer (struct wlapi_timer *t);void wlapi_add_timer (struct wlapi_timer *t,uint ms,int periodic);
drivers/net/wireless/intel/iwlegacy/3945-mac.c +0 -1
@@ -3831,7 +3831,6 @@ il3945_pci_remove(struct pci_dev *pdev)il3945_unset_hw_params (il);/*netif_stop_queue(dev); */ -flush_workqueue (il->workqueue);/* ieee80211_unregister_hw calls il3945_mac_stop, which flushes * il->workqueue... so we can't take down the workqueue
drivers/net/wireless/intel/iwlegacy/4965-mac.c +0 -1
@@ -6745,7 +6745,6 @@ il4965_pci_remove(struct pci_dev *pdev)il_eeprom_free (il);/*netif_stop_queue(dev); */ -flush_workqueue (il->workqueue);/* ieee80211_unregister_hw calls il_mac_stop, which flushes * il->workqueue... so we can't take down the workqueue
drivers/net/wireless/intel/iwlwifi/dvm/main.c +0 -1
@@ -1526,7 +1526,6 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)kfree (priv->nvm_data);/*netif_stop_queue(dev); */ -flush_workqueue (priv->workqueue);/* ieee80211_unregister_hw calls iwlagn_mac_stop, which flushes * priv->workqueue... so we can't take down the workqueue
drivers/net/wireless/intel/iwlwifi/fw/acpi.c +1 -1
@@ -555,7 +555,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)* from index 1, so the maximum value allowed here is * ACPI_SAR_PROFILES_NUM - 1. */ -if (n_profiles <=0 || n_profiles >=ACPI_SAR_PROFILE_NUM ) { +if (n_profiles >=ACPI_SAR_PROFILE_NUM ) { ret = -EINVAL ; goto out_free; }
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +6 -0
@@ -155,6 +155,12 @@ static int iwl_dbg_tlv_alloc_debug_info(struct iwl_trans *trans,if (le32_to_cpu (tlv->length) !=sizeof (*debug_info))return -EINVAL ; +/* we use this as a string, ensure input was NUL terminated */ +if (strnlen (debug_info->debug_cfg_name, +sizeof (debug_info->debug_cfg_name)) == +sizeof (debug_info->debug_cfg_name)) +return -EINVAL ; +IWL_DEBUG_FW (trans,"WRT: Loading debug cfg: %s\n" , debug_info->debug_cfg_name);
drivers/net/wireless/marvell/libertas/cmd.c +11 -2
@@ -1133,7 +1133,7 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv)if (!cmdarray[i].cmdbuf) {lbs_deb_host ("ALLOC_CMD_BUF: ptempvirtualaddr is NULL\n" ); ret =-1 ; - goto done; + goto free_cmd_array; } }
@@ -1141,8 +1141,17 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv)init_waitqueue_head (&cmdarray[i].cmdwait_q);lbs_cleanup_and_insert_cmd (priv, &cmdarray[i]); } - ret =0 ; +return 0 ; +free_cmd_array: +for (i =0 ; i <LBS_NUM_CMD_BUFFERS ; i++) { +if (cmdarray[i].cmdbuf) { +kfree (cmdarray[i].cmdbuf); + cmdarray[i].cmdbuf =NULL ; + } + } +kfree (priv->cmd_array); + priv->cmd_array =NULL ; done:return ret; }
drivers/net/wireless/marvell/mwifiex/cfg80211.c +0 -2
@@ -3155,13 +3155,11 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)unregister_netdevice (wdev->netdev);if (priv->dfs_cac_workqueue) { -flush_workqueue (priv->dfs_cac_workqueue);destroy_workqueue (priv->dfs_cac_workqueue); priv->dfs_cac_workqueue =NULL ; }if (priv->dfs_chan_sw_workqueue) { -flush_workqueue (priv->dfs_chan_sw_workqueue);destroy_workqueue (priv->dfs_chan_sw_workqueue); priv->dfs_chan_sw_workqueue =NULL ; }
drivers/net/wireless/marvell/mwifiex/debugfs.c +0 -3
@@ -976,9 +976,6 @@ mwifiex_dev_debugfs_init(struct mwifiex_private *priv) priv->dfs_dev_dir =debugfs_create_dir (priv->netdev->name, mwifiex_dfs_dir); -if (!priv->dfs_dev_dir) -return ; -MWIFIEX_DFS_ADD_FILE (info);MWIFIEX_DFS_ADD_FILE (debug);MWIFIEX_DFS_ADD_FILE (getlog);
drivers/net/wireless/marvell/mwifiex/main.c +0 -2
@@ -498,13 +498,11 @@ static void mwifiex_free_adapter(struct mwifiex_adapter *adapter)static void mwifiex_terminate_workqueue (struct mwifiex_adapter *adapter) {if (adapter->workqueue) { -flush_workqueue (adapter->workqueue);destroy_workqueue (adapter->workqueue); adapter->workqueue =NULL ; }if (adapter->rx_workqueue) { -flush_workqueue (adapter->rx_workqueue);destroy_workqueue (adapter->rx_workqueue); adapter->rx_workqueue =NULL ; }
drivers/net/wireless/microchip/wilc1000/cfg80211.c +0 -1
@@ -1562,7 +1562,6 @@ static int del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)unregister_netdevice (vif->ndev); vif->monitor_flag =0 ; -wilc_set_operation_mode (vif,0 ,0 ,0 );mutex_lock (&wl->vif_mutex);list_del_rcu (&vif->list); wl->vif_num--;
drivers/net/wireless/microchip/wilc1000/hif.c +26 -14
@@ -359,38 +359,49 @@ static void handle_connect_timeout(struct work_struct *work)void *wilc_parse_join_bss_param (struct cfg80211_bss *bss,struct cfg80211_crypto_settings *crypto) { -struct wilc_join_bss_param *param; -struct ieee80211_p2p_noa_attr noa_attr; -u8 rates_len =0 ; -const u8 *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie; +const u8 *ies_data, *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;const u8 *ht_ie, *wpa_ie, *wmm_ie, *rsn_ie; +struct ieee80211_p2p_noa_attr noa_attr; +const struct cfg80211_bss_ies *ies; +struct wilc_join_bss_param *param; +u8 rates_len =0 , ies_len;int ret; -const struct cfg80211_bss_ies *ies =rcu_dereference (bss->ies); param =kzalloc (sizeof (*param),GFP_KERNEL );if (!param)return NULL ; +rcu_read_lock (); + ies =rcu_dereference (bss->ies); + ies_data =kmemdup (ies->data, ies->len,GFP_ATOMIC ); +if (!ies_data) { +rcu_read_unlock (); +kfree (param); +return NULL ; + } + ies_len = ies->len; +rcu_read_unlock (); + param->beacon_period =cpu_to_le16 (bss->beacon_interval); param->cap_info =cpu_to_le16 (bss->capability); param->bss_type =WILC_FW_BSS_TYPE_INFRA ; param->ch =ieee80211_frequency_to_channel (bss->channel->center_freq);ether_addr_copy (param->bssid, bss->bssid); - ssid_elm =cfg80211_find_ie (WLAN_EID_SSID , ies->data, ies->len); + ssid_elm =cfg80211_find_ie (WLAN_EID_SSID , ies_data, ies_len);if (ssid_elm) {if (ssid_elm[1 ] <=IEEE80211_MAX_SSID_LEN )memcpy (param->ssid, ssid_elm +2 , ssid_elm[1 ]); } - tim_elm =cfg80211_find_ie (WLAN_EID_TIM , ies->data, ies->len); + tim_elm =cfg80211_find_ie (WLAN_EID_TIM , ies_data, ies_len);if (tim_elm && tim_elm[1 ] >=2 ) param->dtim_period = tim_elm[3 ];memset (param->p_suites,0xFF ,3 );memset (param->akm_suites,0xFF ,3 ); - rates_ie =cfg80211_find_ie (WLAN_EID_SUPP_RATES , ies->data, ies->len); + rates_ie =cfg80211_find_ie (WLAN_EID_SUPP_RATES , ies_data, ies_len);if (rates_ie) { rates_len = rates_ie[1 ];if (rates_len >WILC_MAX_RATES_SUPPORTED )
@@ -401,7 +412,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,if (rates_len <WILC_MAX_RATES_SUPPORTED ) { supp_rates_ie =cfg80211_find_ie (WLAN_EID_EXT_SUPP_RATES , - ies->data, ies->len); + ies_data, ies_len);if (supp_rates_ie) {u8 ext_rates = supp_rates_ie[1 ];
@@ -416,11 +427,11 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, } } - ht_ie =cfg80211_find_ie (WLAN_EID_HT_CAPABILITY , ies->data, ies->len); + ht_ie =cfg80211_find_ie (WLAN_EID_HT_CAPABILITY , ies_data, ies_len);if (ht_ie) param->ht_capable = true; - ret =cfg80211_get_p2p_attr (ies->data, ies->len, + ret =cfg80211_get_p2p_attr (ies_data, ies_len,IEEE80211_P2P_ATTR_ABSENCE_NOTICE , (u8 *)&noa_attr,sizeof (noa_attr));if (ret >0 ) {
@@ -444,7 +455,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, } wmm_ie =cfg80211_find_vendor_ie (WLAN_OUI_MICROSOFT ,WLAN_OUI_TYPE_MICROSOFT_WMM , - ies->data, ies->len); + ies_data, ies_len);if (wmm_ie) {struct ieee80211_wmm_param_ie *ie;
@@ -459,13 +470,13 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, wpa_ie =cfg80211_find_vendor_ie (WLAN_OUI_MICROSOFT ,WLAN_OUI_TYPE_MICROSOFT_WPA , - ies->data, ies->len); + ies_data, ies_len);if (wpa_ie) { param->mode_802_11i =1 ; param->rsn_found = true; } - rsn_ie =cfg80211_find_ie (WLAN_EID_RSN , ies->data, ies->len); + rsn_ie =cfg80211_find_ie (WLAN_EID_RSN , ies_data, ies_len);if (rsn_ie) {int rsn_ie_len =sizeof (struct element ) + rsn_ie[1 ];int offset =8 ;
@@ -499,6 +510,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, param->akm_suites[i] = crypto->akm_suites[i] &0xFF ; } +kfree (ies_data);return (void *)param; }
drivers/net/wireless/microchip/wilc1000/netdev.c +7 -22
@@ -821,8 +821,7 @@ static const struct net_device_ops wilc_netdev_ops = {void wilc_netdev_cleanup (struct wilc *wilc) { -struct wilc_vif *vif; -int srcu_idx, ifc_cnt =0 ; +struct wilc_vif *vif, *vif_tmp;if (!wilc)return ;
@@ -832,33 +831,19 @@ void wilc_netdev_cleanup(struct wilc *wilc) wilc->firmware =NULL ; } - srcu_idx =srcu_read_lock (&wilc->srcu); -list_for_each_entry_rcu (vif, &wilc->vif_list, list) { +list_for_each_entry_safe (vif, vif_tmp, &wilc->vif_list, list) { +mutex_lock (&wilc->vif_mutex); +list_del_rcu (&vif->list); + wilc->vif_num--; +mutex_unlock (&wilc->vif_mutex); +synchronize_srcu (&wilc->srcu);if (vif->ndev)unregister_netdev (vif->ndev); } -srcu_read_unlock (&wilc->srcu, srcu_idx);wilc_wfi_deinit_mon_interface (wilc, false); -flush_workqueue (wilc->hif_workqueue);destroy_workqueue (wilc->hif_workqueue); -while (ifc_cnt <WILC_NUM_CONCURRENT_IFC ) { -mutex_lock (&wilc->vif_mutex); -if (wilc->vif_num <=0 ) { -mutex_unlock (&wilc->vif_mutex); -break ; - } - vif =wilc_get_wl_to_vif (wilc); -if (!IS_ERR (vif)) -list_del_rcu (&vif->list); - - wilc->vif_num--; -mutex_unlock (&wilc->vif_mutex); -synchronize_srcu (&wilc->srcu); - ifc_cnt++; - } -wilc_wlan_cfg_deinit (wilc);wlan_deinit_locks (wilc);kfree (wilc->bus_data);
drivers/net/wireless/quantenna/qtnfmac/core.c +0 -2
@@ -816,13 +816,11 @@ void qtnf_core_detach(struct qtnf_bus *bus) bus->fw_state =QTNF_FW_STATE_DETACHED ;if (bus->workqueue) { -flush_workqueue (bus->workqueue);destroy_workqueue (bus->workqueue); bus->workqueue =NULL ; }if (bus->hprio_workqueue) { -flush_workqueue (bus->hprio_workqueue);destroy_workqueue (bus->hprio_workqueue); bus->hprio_workqueue =NULL ; }
drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c +0 -2
@@ -387,7 +387,6 @@ static int qtnf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)return 0 ; error: -flush_workqueue (pcie_priv->workqueue);destroy_workqueue (pcie_priv->workqueue);pci_set_drvdata (pdev,NULL );return ret;
@@ -416,7 +415,6 @@ static void qtnf_pcie_remove(struct pci_dev *dev)qtnf_core_detach (bus);netif_napi_del (&bus->mux_napi); -flush_workqueue (priv->workqueue);destroy_workqueue (priv->workqueue);tasklet_kill (&priv->reclaim_tq);
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1 -0
@@ -6483,6 +6483,7 @@ static void rtl8xxxu_stop(struct ieee80211_hw *hw)if (priv->usb_interrupts)rtl8xxxu_write32 (priv,REG_USB_HIMR ,0 ); +cancel_work_sync (&priv->c2hcmd_work);cancel_delayed_work_sync (&priv->ra_watchdog);rtl8xxxu_free_rx_resources (priv);
drivers/net/wireless/realtek/rtlwifi/pci.c +0 -1
@@ -1704,7 +1704,6 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw)tasklet_kill (&rtlpriv->works.irq_tasklet);cancel_work_sync (&rtlpriv->works.lps_change_work); -flush_workqueue (rtlpriv->works.rtl_wq);destroy_workqueue (rtlpriv->works.rtl_wq); }
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -1
@@ -579,9 +579,9 @@ static void rtw8821c_false_alarm_statistics(struct rtw_dev *rtwdev) dm_info->cck_fa_cnt = cck_fa_cnt;
Lines of this file are not shown. View the raw message.
drivers/pinctrl/mediatek/pinctrl-mt8192.c +0 -1
Lines of this file are not shown. View the raw message.
drivers/remoteproc/remoteproc_internal.h +10 -0
Lines of this file are not shown. View the raw message.
drivers/remoteproc/stm32_rproc.c +73 -78
151 lines not on this page · raw message
drivers/staging/media/imx/imx-media-csc-scaler.c +1 -0
Lines of this file are not shown. View the raw message.
fs/quota/dquot.c +101 -125
226 lines not on this page · raw message
include/linux/rcupdate.h +43 -0
43 lines not on this page · raw message
include/uapi/linux/in.h +32 -10
42 lines not on this page · raw message
include/uapi/scsi/fc/fc_els.h +113 -1
114 lines not on this page · raw message
io_uring/io_uring.c +10 -224
234 lines not on this page · raw message
net/ipv4/ip_sockglue.c +55 -45
100 lines not on this page · raw message
scripts/clang-tools/gen_compile_commands.py +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/hda/patch_realtek.c +63 -0
63 lines not on this page · raw message
sound/soc/meson/aiu.c +12 -37
49 lines not on this page · raw message
sound/soc/meson/axg-tdm-formatter.c +13 -37
50 lines not on this page · raw message
sound/soc/meson/axg-tdm-interface.c +27 -27
54 lines not on this page · 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.