Linux 7.1.10
Greg Kroah-Hartman
maintainerI'm announcing the release of the 7.1.10 kernel.
All users of the 7.1 kernel series must upgrade.
The updated 7.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-7.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 arch/m68k/Kconfig.cpu | 4 arch/microblaze/kernel/head.S | 2 arch/openrisc/include/asm/processor.h | 2 arch/openrisc/kernel/signal.c | 5 arch/powerpc/platforms/pseries/lparcfg.c | 2 arch/powerpc/platforms/pseries/papr-phy-attest.c | 12 arch/powerpc/platforms/pseries/pci.c | 2 arch/riscv/kernel/ftrace.c | 5 arch/riscv/kernel/unaligned_access_speed.c | 8 arch/riscv/lib/strnlen.S | 10 block/genhd.c | 12 crypto/ccm.c | 2 drivers/accel/amdxdna/aie2_ctx.c | 16 drivers/base/regmap/regmap-sdw-mbq.c | 4 drivers/clk/qcom/dispcc-eliza.c | 2 drivers/clk/spacemit/ccu-k3.c | 4 drivers/crypto/qce/core.c | 2 drivers/crypto/starfive/jh7110-aes.c | 2 drivers/crypto/tegra/tegra-se-aes.c | 22 drivers/firewire/ohci.c | 4 drivers/gpio/gpio-ml-ioh.c | 71 + drivers/gpio/gpio-sloppy-logic-analyzer.c | 2 drivers/gpio/gpiolib.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 31 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 10 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 50 + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 13 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 21 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 5 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 85 -- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 5 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 48 + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 21 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 21 drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 21 drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 42 - drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 26 drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 9 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 2 drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 31 drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 7 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c | 7 drivers/gpu/drm/clients/drm_log.c | 12 drivers/gpu/drm/display/drm_hdmi_state_helper.c | 3 drivers/gpu/drm/drm_gem_shmem_helper.c | 6 drivers/gpu/drm/mediatek/mtk_dsi.c | 32 drivers/gpu/drm/panthor/panthor_fw.c | 3 drivers/gpu/drm/radeon/radeon_fence.c | 7 drivers/gpu/drm/radeon/radeon_kms.c | 1 drivers/gpu/drm/xe/xe_bo.h | 14 drivers/gpu/drm/xe/xe_device.c | 6 drivers/gpu/drm/xe/xe_guc_ads.c | 93 +- drivers/gpu/drm/xe/xe_guc_ads_types.h | 5 drivers/gpu/drm/xe/xe_guc_pc.c | 43 + drivers/gpu/drm/xe/xe_lrc.c | 7 drivers/gpu/drm/xe/xe_oa.c | 13 drivers/gpu/drm/xe/xe_pxp.c | 162 +++- drivers/gpu/drm/xe/xe_pxp_types.h | 27 drivers/input/joystick/iforce/iforce-packets.c | 11 drivers/input/joystick/iforce/iforce-usb.c | 3 drivers/input/joystick/psxpad-spi.c | 1 drivers/input/joystick/xpad.c | 2 drivers/input/keyboard/atkbd.c | 20 drivers/input/misc/cs40l50-vibra.c | 10 drivers/input/mouse/byd.c | 2 drivers/input/mouse/focaltech.c | 2 drivers/input/rmi4/rmi_f54.c | 43 - drivers/input/rmi4/rmi_f55.c | 4 drivers/input/touchscreen/hynitron_cstxxx.c | 13 drivers/input/touchscreen/sur40.c | 23 drivers/mmc/host/atmel-mci.c | 2 drivers/mmc/host/loongson2-mmc.c | 8 drivers/mmc/host/omap_hsmmc.c | 2 drivers/mmc/host/sdhci.c | 16 drivers/mmc/host/sdhci.h | 2 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 133 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 drivers/net/ethernet/google/gve/gve_ptp.c | 6 drivers/net/ethernet/google/gve/gve_rx_dqo.c | 5 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 4 drivers/net/ipvlan/ipvlan_main.c | 4 drivers/net/macvlan.c | 4 drivers/net/ovpn/crypto.c | 26 drivers/net/ovpn/crypto.h | 4 drivers/net/ovpn/crypto_aead.c | 19 drivers/net/ovpn/crypto_aead.h | 1 drivers/net/ovpn/io.c | 10 drivers/net/ovpn/main.c | 19 drivers/net/ovpn/ovpnpriv.h | 4 drivers/net/ovpn/peer.c | 8 drivers/net/ovpn/tcp.c | 9 drivers/net/phy/realtek/realtek_main.c | 2 drivers/net/tap.c | 3 drivers/net/veth.c | 2 drivers/pmdomain/arm/scmi_perf_domain.c | 2 drivers/pmdomain/mediatek/mt8183-pm-domains.h | 7 drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c | 2 drivers/pmdomain/mediatek/mtk-pm-domains.c | 30 drivers/pmdomain/qcom/rpmhpd.c | 4 drivers/regulator/fp9931.c | 54 - drivers/s390/cio/vfio_ccw_async.c | 16 drivers/s390/cio/vfio_ccw_chp.c | 31 drivers/s390/cio/vfio_ccw_cp.c | 74 +- drivers/s390/cio/vfio_ccw_cp.h | 10 drivers/s390/cio/vfio_ccw_drv.c | 21 drivers/s390/cio/vfio_ccw_fsm.c | 8 drivers/s390/cio/vfio_ccw_ops.c | 39 - drivers/s390/cio/vfio_ccw_private.h | 10 drivers/s390/crypto/zcrypt_ccamisc.c | 20 drivers/s390/crypto/zcrypt_ep11misc.c | 16 drivers/s390/crypto/zcrypt_msgtype6.c | 366 ++++++---- drivers/s390/net/qeth_core_main.c | 3 drivers/s390/net/qeth_l3_main.c | 5 drivers/scsi/scsi_error.c | 6 drivers/spi/spi-virtio.c | 2 drivers/tee/optee/ffa_abi.c | 3 drivers/ufs/core/ufshcd.c | 4 drivers/video/fbdev/core/fb_io_fops.c | 8 drivers/video/fbdev/core/fbmem.c | 5 drivers/video/fbdev/core/fbsysfs.c | 15 fs/ceph/caps.c | 17 fs/ceph/file.c | 9 fs/ceph/mds_client.c | 11 fs/ceph/mds_client.h | 1 fs/ceph/mdsmap.c | 2 fs/erofs/Kconfig | 3 fs/xfs/libxfs/xfs_exchmaps.c | 10 fs/xfs/libxfs/xfs_rtrefcount_btree.c | 4 fs/xfs/libxfs/xfs_sb.c | 4 fs/xfs/scrub/agheader.c | 2 fs/xfs/scrub/agheader_repair.c | 152 +++- fs/xfs/scrub/alloc.c | 5 fs/xfs/scrub/attr_repair.c | 3 fs/xfs/scrub/bmap.c | 5 fs/xfs/scrub/dirtree_repair.c | 22 fs/xfs/scrub/inode_repair.c | 2 fs/xfs/scrub/nlinks.c | 13 fs/xfs/scrub/nlinks_repair.c | 7 fs/xfs/scrub/parent.c | 2 fs/xfs/scrub/rtbitmap_repair.c | 46 - fs/xfs/scrub/tempfile.c | 1 fs/xfs/scrub/trace.h | 2 fs/xfs/xfs_buf_item_recover.c | 57 + fs/xfs/xfs_dquot.c | 3 fs/xfs/xfs_dquot_item_recover.c | 2 fs/xfs/xfs_rtalloc.c | 2 include/linux/rseq_entry.h | 1 include/linux/tick.h | 2 include/net/ip_vs.h | 2 include/net/netdev_lock.h | 6 include/net/sctp/auth.h | 3 include/scsi/scsi_host.h | 6 kernel/events/core.c | 8 kernel/pid.c | 6 kernel/trace/ftrace.c | 33 lib/rhashtable.c | 2 net/ceph/cls_lock_client.c | 13 net/ceph/decode.c | 18 net/ceph/osd_client.c | 5 net/ceph/osdmap.c | 5 net/core/dev.c | 26 net/core/dev_addr_lists.c | 2 net/core/link_watch.c | 2 net/core/lock_debug.c | 2 net/core/netdev_queues.c | 2 net/ethtool/netlink.c | 4 net/ipv4/tcp_input.c | 6 net/ipv4/tcp_timer.c | 4 net/ipv6/addrconf.c | 2 net/l2tp/l2tp_debugfs.c | 4 net/l2tp/l2tp_ppp.c | 56 + net/mptcp/fastopen.c | 7 net/mptcp/options.c | 67 + net/mptcp/pm.c | 6 net/mptcp/protocol.c | 6 net/mptcp/protocol.h | 1 net/netfilter/ipset/ip_set_bitmap_gen.h | 2 net/netfilter/ipset/ip_set_core.c | 19 net/netfilter/ipset/ip_set_list_set.c | 10 net/netfilter/ipvs/ip_vs_core.c | 11 net/netfilter/ipvs/ip_vs_xmit.c | 3 net/netfilter/nf_flow_table_core.c | 7 net/netfilter/nf_tables_offload.c | 2 net/packet/af_packet.c | 7 net/sched/act_api.c | 10 net/sched/cls_bpf.c | 18 net/sched/cls_u32.c | 3 net/sctp/auth.c | 75 ++ net/sctp/sm_make_chunk.c | 3 net/tls/tls_sw.c | 5 net/unix/garbage.c | 1 net/xdp/xsk_buff_pool.c | 2 security/selinux/ss/policydb.c | 34 security/selinux/ss/services.c | 28 sound/hda/codecs/realtek/alc662.c | 1 sound/soc/codecs/cs35l41-lib.c | 2 sound/soc/codecs/cs35l45-tables.c | 32 sound/soc/codecs/cs4265.c | 4 sound/soc/codecs/lpass-tx-macro.c | 4 sound/soc/codecs/lpass-wsa-macro.c | 8 sound/soc/codecs/tas2562.c | 9 sound/soc/codecs/tas2781-i2c.c | 18 sound/soc/intel/common/sof-function-topology-lib.c | 7 sound/soc/sof/ipc4-pcm.c | 25 sound/soc/sof/ipc4-topology.c | 33 sound/soc/sof/sof-audio.c | 9 sound/soc/xilinx/xlnx_formatter_pcm.c | 10 sound/usb/quirks.c | 2 tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc | 27 tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 216 files changed, 2502 insertions(+), 929 deletions(-)
Abel Vesa (1):
pmdomain: qcom: rpmhpd: Add missing MXC and MMCX power domains for Eliza
Abhishek Rajput (1):
drm/mediatek: Convert legacy DRM logging to drm_* helpers in mtk_dsi.c
Ajrat Makhmutov (1):
ALSA: hda/realtek: Enable headset mic on F+ FLAPTOP r
Aleksandr Nogikh (1):
firewire: ohci: fix NULL pointer dereference in ar_context_release
Alex Deucher (3):
drm/amdgpu/gmc12.1: implement tlb inv semaphore drm/amdgpu/gmc12.1: fix MMHUB0 check in pasid tlb flush drm/amdgpu: fix missing check in vm_flush()
Alexey Velichayshiy (1):
netfilter: nf_tables_offload: suppress WARN_ON_ONCE for ENOMEM in abort path
Ali Ahmet Memis (1):
openrisc: signal: do not restore privileged SR bits on sigreturn
Andrey Golovko (1):
regmap: sdw-mbq: don't call an unset readable_reg callback
AngeloGioacchino Del Regno (2):
pmdomains: mediatek: Avoid setting RTFF's CLK_DIS before NRESTORE drm/mediatek: mtk_dsi: Enable HS clock only at pre-enable
Asad Kamal (1):
drm/amdgpu: fix aperture iounmap skipped on device removal
Bard Liao (1):
ASoC: SOF: topology: Use acpi mach from the machine driver
Binbin Zhou (1):
mmc: loongson2: Fix sg iteration in data reorder functions
Bryam Vargas (6):
selinux: require every boolean value to be defined
selinux: reject a class permission count below its inherited common
selinux: do not cancel a policy conversion that never started
selinux: reject an unclaimed class value in security_get_classes()
selinux: reject a permission value exceeding the class permission count
Input: synaptics-rmi4 - bound the F54 report size to the allocated buffer
Candice Li (2):
drm/amdgpu: reject oversized IBs with per-ring packet limits drm/amdgpu: validate GEM_CREATE domain combinations
Cengiz Can (1):
gpio: sloppy-logic-analyzer: fix use-after-free via debugfs trigger on unbind
Chao Shi (1):
block: stop the timeout timer when releasing a never added disk
Charles Keepax (1):
regmap: sdw-mbq: Fix swap of timeout and retry times
Christian A. Ehrhardt (1):
drm/shmem_helper: Check VMA boundaries for PMD mappings
Christoph Hellwig (1):
xfs: check v5 superblock features early
Christophe Leroy (CS GROUP) (1):
gpiolib: Check gc->get_direction() before calling gpiod_get_direction()
Chuck Lever (1):
net/tls: Fail tls_sw_splice_read() after a failed async decrypt
Daniele Ceraolo Spurio (1):
drm/xe/pxp: add termination on resume
Darrick J. Wong (18):
xfs: mark nonzero sb_gquotino as corrupt on metadir filesystems
xfs: check cowextsize in xrep_inode_cowextsize
xfs: fix transaction block reservation in xrep_rtbitmap
xfs: zero i_nlink before repair puts inode on unlinked list
xfs: only check mergeability of bnobt records
xfs: don't double-lock when deleting a self-referential directory
xfs: set the prev pointer when reinserting an inode on the unlinked list
xfs: pass runtime errors from xrep_iunlink_mark_ondisk_rec up to callers
xfs: nlink scrub must take IOLOCK before determining ILOCK state
xfs: load next_agino from the correct xfarray in xrep_iunlink_relink_prev
xfs: don't zap the attr fork on repair when there are queued pptr updates
xfs: don't walk off the end of a null sc->sa.agi_bp in AGI repair
xfs: fix allocated inodes that show up in the unlinked list
xfs: fix another iunlink infinite loop bug in online fsck
xfs: don't return EFSCORRUPTED when scrubbing corrupt parent pointers
xfs: avoid UAF on sc->tempip in xrep_tempfile_create
xfs: don't ignore runtime errors in xrep_iunlink_reload_next
xfs: check xfarray iteration errors when committing unlinked inode lists
David Rosca (6):
drm/amdgpu: Reject UVD message with invalid number of h265 refs drm/amdgpu: Reject UVD message with dimensions above 4096 drm/amdgpu: Implement insert_end for VCE 3 drm/amdgpu: Fix UVD min buffer sizes
drm/amdgpu: Fix UVD dpb min size calculation for H264 drm/amdgpu: Fix UVD decode image min size calculation
Dawid Wróbel (2):
ASoC: codecs: lpass-tx-macro: Fix enum kcontrol accesses
ASoC: codecs: lpass-wsa-macro: Fix enum kcontrol accesses
Dmitry Osipenko (1):
pmdomain: mediatek: Fix mt8183 hang on boot
Dmitry Torokhov (6):
Input: synaptics-rmi4 - fix F55 transmitter electrode count typo
Input: synaptics-rmi4 - zero report size on F54 work error
Input: synaptics-rmi4 - block s_input when F54 queue is busy
Input: synaptics-rmi4 - propagate F54 worker errors to V4L2 queue
Input: sur40 - fix input device registration ordering
Input: sur40 - fix V4L error path cleanup
Donglin Lyu (1):
Input: atkbd - skip deactivate for HONOR ZQC-P
Eric Dumazet (4):
ipvlan: inherit needed_headroom and needed_tailroom from phy_dev
macvlan: inherit needed_headroom and needed_tailroom from lowerdev
af_packet: Don't send zero-byte data in tpacket_snd().
l2tp: fix tunnel and session refcount leak on seq_file release
Eric Farman (10):
s390/vfio_ccw: Free all memory if cp_init() fails s390/vfio_ccw: Limit the number of channel program segments s390/vfio_ccw: Cancel existing workqueues s390/vfio_ccw: Ensure index for read/write regions are within range s390/vfio_ccw: Ensure first IDAW remains constant s390/vfio_ccw: Fix out of bounds check on CCW array s390/vfio_ccw: Move cp cleanup out of not operational s390/vfio_ccw: Selectively expand io_mutex s390/vfio_ccw: Calculate idal length based on idaw type s390/vfio_ccw: Implement a crw lock
Florian Westphal (3):
rhashtable: fix false-positive lockdep splat on rhltable destruction
netfilter: ipset: fix list type element drift bug
netfilter: ipset: let destroy callbacks adjust ext mem size
Gang Yan (1):
selftests: mptcp: join: mark tests with data corruption as failed
Gao Xiang (1):
erofs: fix EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS on some UP platforms
George Wilson (3):
powerpc/pseries: pci - logic bug
powerpc/pseries: lparcfg - fix kbuf[] underflow powerpc/pseries: papr-phy-attest - validate cmd.length, plug mem leak
Greg Kroah-Hartman (1):
Linux 7.1.10
Guanghui Yang (1):
xfs: propagate errors from xfs_rtginode_load
Guangshuo Li (2):
pmdomain: mediatek: fix remaining %pOF after of_node_put() drm/radeon: fix autosuspend cleanup during teardown
Haibo Chen (1):
mmc: sdhci: make tuning_err a signed int
Harald Freudenberger (5):
s390/zcrypt: Fix CPRB memory allocation in zcrypt misc code s390/zcrypt: Improve CCA CPRB length and overflow checks s390/zcrypt: Improve EP11 CPRB length and overflow checks s390/zcrypt: Improve EP11 CPRB domain handling with ASN.1 parsing s390/zcrypt: Pad trailing CCA or EP11 message with zeros
Herbert Xu (1):
crypto: ccm - Set rfc4309 maxauthsize from child
Hidayath Khan (1):
s390/qeth: validate user buffer length in SNMP and ARP query ioctls
Hongjie Fang (1):
scsi: core: pair EH runtime PM get and put
HyeongJun An (1):
Input: cs40l50-vibra - validate custom data from user space
Ibrahim Hashimov (1):
xfs: bounds-check buffer log item's dirty bitmap
Jakub Kicinski (6):
net: rename netdev_ops_assert_locked()
net: expect instance lock in netdev_queue_get_dma_dev()
eth: bnxt: cancel IRQ notifier before freeing affinity mask
eth: bnxt: keep the aRFS rmap updated when TPH is enabled
eth: bnxt: decrease indent in bnxt_request_irq()
eth: bnxt: avoid deadlock when canceling IRQ affinity notifier
Jamal Hadi Salim (2):
net/sched: act_api: fix TOCTOU NULL deref on a->goto_chain net/sched: cls_bpf: reject dev-bound programs bound to a different device
Jasper Wise (1):
spi: virtio: mark device ready before registering the controller
Jesse Zhang (4):
drm/amdgpu/userq: serialize queue map against GPU reset drm/amdgpu: fix JPEG v5.3.0 queue reset failure in DPG mode drm/amdgpu: fix JPEG v5.0.0 queue reset failure in DPG mode drm/amdgpu: fix JPEG v4.0.5 queue reset failure in DPG mode
Jia Yao (3):
drm/xe/guc_ads: allocate UM queues in a separate BO drm/xe/guc_ads: allocate UM queues in VRAM on dGFX drm/xe/guc_ads: use uncached mapping for UM queue BO
Jianing Li (1):
Input: hynitron_cstxxx - validate touch count and finger IDs
Jiawen Wu (1):
net: ngbe: fix NULL pointer dereference in non-MSI-X interrupt enabling
Jiayuan Chen (1):
tcp: fix icsk_ack.ato bitfield overflow
John Harrison (1):
drm/connector/hdmi: Fix out of bounds memory read
Jon Hunter (1):
arm64: tegra: Add EL2 virtual timer interrupt for Tegra194
Jonas Köppeler (1):
veth: fix queue index used to wake the peer txq in veth_poll
Jordan Rhee (2):
gve: fix NULL dereference due to missing ptp adjfine
gve: fix zero-length skb frag with header-split
Josh Poimboeuf (1):
ftrace: Fix off-by-one fentry site disable in ftrace_free_mem()
Julian Anastasov (1):
ipvs: revalidate ihl to prevent out-of-bounds access
Junjie Cao (2):
gpio: ml-ioh: use raw_spinlock_t for the register lock
gpio: ml-ioh: share the register lock across channels
Junrui Luo (1):
drm/amdgpu: disallow multiple FENCE chunks in one submit
Jérémy Jean (3):
sctp: validate cookie AUTH state before use
netfilter: flowtable: publish GC-visible tuple last
pid: reject allocations through dead ancestor pid namespaces
Karl Mehltretter (2):
pmdomain: mediatek: mfg: initialize prev_o in mtk_mfg_attach_dev()
tick: Include ktime.h and jiffies.h in linux/tick.h
Kefu Chai (1):
libceph: tolerate addrvecs with multiple entries of the same type
Krzysztof Kozlowski (1):
clk: qcom: dispcc-eliza: Fix disp_cc_mdss_mdp_clk_src RCG stall on Eliza EVK
Kuniyuki Iwashima (1):
af_unix: Unlink scc_entry in unix_del_edge().
Kyle Zeng (1):
perf: Reject exited events as group leaders
Kyohei Kadota (1):
Input: xpad - add support for ZENAIM LEVERLESS
Leon Hwang (3):
ftrace: Protect direct_functions in ftrace_find_rec_direct
ftrace: Protect direct_functions in update_ftrace_direct_del
ftrace: Protect direct_functions in update_ftrace_direct_mod
Lijo Lazar (2):
drm/amdgpu: Use virtual alloc during coredump drm/amdgpu: Prefer default discovery offset
Lin Jiapeng (1):
xfs: fix exchange-range reflink flag clearing issue with INO1_WRITTEN
Linmao Li (4):
Input: psxpad-spi - set driver data before use
Input: byd - synchronize timer deletion before freeing private data drm/xe/oa: Fix sync entry leak on OA config emit failure drm/xe/oa: Check managed mutex initialization errors
Lizhi Hou (1):
accel/amdxdna: Skip unmapped range in aie2_populate_range()
Long Li (2):
xfs: fix ilock leak on error in xfs_dq_get_next_id
xfs: don't swallow dquot recovery verification errors
Mark Brown (1):
ASoC: tas2562: Validate values for volume writes
Matthew Brost (1):
drm/xe: Order ring writes before ring tail updates
Matthieu Baerts (NGI0) (2):
mptcp: avoid combining some incoming suboptions
mptcp: options: reset DSS fields in case of unexpected size
Max Kellermann (2):
ceph: avoid fs reclaim while using current->journal_info
ceph: fix hanging __ceph_get_caps() with stale mds_wanted
Melbin K Mathew (2):
fbdev: bound mode sysfs output to the sysfs buffer
fbdev: clear fb_info->mode before deleting a videomode
Michael Neuling (1):
riscv: lib: Fix ZBB strnlen reading past count boundary
Mingyu Wang (1):
fbdev: core: Fix pointer desynchronization in fb_io_read()
Mostafa Saleh (1):
optee: ffa: Add NULL check in optee_ffa_lend_protmem
Myeonghun Pak (1):
mmc: sdhci: unmap the bounce buffer before device release
Nareshkumar Gollakoti (1):
drm/xe: Set GT rp min frequency as 1.2GHz default for BMG/CRI
Nathan Lucas (2):
drm/amd/display: fix BT.2020 YCbCr limited output CSC matrix drm/amd/display: fix BT.2020 YCbCr output CSC matrices for DCE
Niels Pressel (1):
rseq: Prevent hard lockup on granted time slice extension
Oleksij Rempel (1):
net: phy: realtek: fix EEE advertisement write on the internal PHY MMD path
Osama Abdelkader (1):
drm/panthor: skip zero-sized firmware sections
Paolo Abeni (1):
mptcp: reclaim forward-allocated memory on RX path errors
Pavitra Jha (2):
libceph: fix multiple unsafe decodes in decode_locker()
libceph: fix OOB read in decode_watchers() via missing bounds check
Pei Xiao (1):
mmc: atmel-mci: Fix use-after-free in atmci_remove due to race condition
Pengpeng Hou (1):
Input: iforce - validate input packet lengths
Peter Ujfalusi (6):
ASoC: SOF: sof-audio: Fix error path in sof_widget_setup_unlocked()
ASoC: SOF: ipc4-pcm: Continue the pipeline trigger in case of IPC timeout
ASoC: cs4265: sort the register default table
ASoC: cs35l45: sort the register default table
ASoC: cs35l41: sort the register default table
ASoC: SOF: ipc4-topology: Refresh copier IPC payload before widget setup
Praveen Talari (1):
pmdomain: arm: Fix -EINVAL from scmi_pd_set_perf_state() on state 0
Pu Lehui (1):
riscv: ftrace: Fix ftrace_modify_call failure on kprobed functions
Qiang Ma (1):
xfs: clear zapped attr fork state when bmap repair finds no attr fork
Qiang Yu (1):
drm/amdgpu: read TRUNCATE_COORD_MODE on gfx12
Qing Luo (1):
mptcp: pm: fix data race in add_addr timer callback
Raag Jadav (1):
drm/xe: Fix xe_device_probe() failure
Ralf Lici (4):
ovpn: fix NULL dereference when killing missing key
ovpn: finish crypto callback cleanup before peer release
ovpn: run deferred work on a module-owned workqueue
ovpn: defer key slot crypto freeing to workqueue
Ramin Moussavi (1):
microblaze: restore the page alignment of swapper_pg_dir
Raphael Zimmer (1):
libceph: Avoid using invalid osd indices from primary_temp
Richard Davies (1):
Input: focaltech - fix array out-of-bounds in focaltech_process_rel_packet
Robby Cai (1):
regulator: fp9931: Fix VPOS/VNEG voltage selector table
Rosen Penev (1):
ASoC: xilinx: formatter_pcm: pass aud_drv_data to irq handlers
Rui Qi (2):
selftests/ftrace: Convert ELF entry point to file offset in uprobe test
riscv: hwprobe: Register unaligned probes before usermode
Samuel Pitoiset (1):
drm/amd/display: Fix NULL pointer dereference in amdgpu_dm_crtc_set_vblank()
Shenghao Ding (1):
ASoC: tas2781: fix clang build error for goto bypassing cleanup variable
Shixiong Ou (3):
drm/log: Fix division by zero when scale module parameter is 0 drm/log: Fix out-of-bounds read on empty message length drm/log: Fix infinite loop when scale is too large for display
Siddharth Vadapalli (1):
net: ethernet: ti: am65-cpsw-nuss: Fix port_id extraction from SRC TAG
Takashi Iwai (1):
ALSA: usb-audio: Fix mixer regression on SteelSeries Arctis Nova 5
Thorsten Blum (2):
crypto: starfive - use scatterlist length before DMA mapping
crypto: qce - fix error path in devm_qce_register_algs
Travis K. Bangs (1):
drm/amd: Disable DP audio spread spectrum for Cyan Skillfish
Uwe Kleine-König (1):
m68k: Define NR_CPUS to 1
Vinay Belgaumkar (1):
drm/xe: Fix a bug in pc_adjust_freq_bounds()
Vladislav Dronov (1):
crypto: tegra - fix rctx->cryptlen calculation in tegra_gcm_do_one_req()
Wang Jiang (1):
drm/radeon: restore hardware polling in fence_is_signaled to fix performance regression
Wei Fang (2):
net: packet: fix wrong transport_header when sending VLAN-tagged frame
net: tap: fix wrong transport_header when sending VLAN-tagged frame
William Palacek (1):
drm/amdkfd: Add bounds check for CRAT subtype length
Wyatt Feng (1):
mptcp: fastopen: only mark MPTFO subflows with SYN data
Xiang Mei (1):
xfs: fix off-by-one in rtrefcount btree root level validation
Xiang Mei (Microsoft) (1):
netfilter: ipset: fix refcount race between list:set GC and swap
Yang Wang (2):
drm/amdgpu: fix nbif 6.3.1 l1 low power not functional drm/amdgpu: check ASPM on the dGPU host link
Yiming Zhu (1):
ceph: fix MDS random selection readiness predicate
Yixun Lan (2):
clk: spacemit: k3: fix USB2 bus clock
clk: spacemit: k3: set hdma clock as critical
Zhan Xusheng (1):
mmc: omap_hsmmc: fix busy_timeout overflow in ns conversion on 32-bit
Zhang Changzhong (1):
net/sched: cls_u32: skip hash tables in u32_bind_class()
Zhefu Zhang (1):
Input: atkbd - skip deactivate for Xiaomi Book Pro 14's internal keyboard
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 7 PATCHLEVEL = 1 -SUBLEVEL = 9 +SUBLEVEL = 10 EXTRAVERSION = NAME = Baby Opossum Posse
arch/arm64/boot/dts/nvidia/tegra194.dtsi +2 -0
@@ -3163,6 +3163,8 @@ timer { <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, <GIC_PPI 10 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 15 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; interrupt-parent = <&gic>; always-on;
arch/m68k/Kconfig.cpu +4 -0
@@ -548,6 +548,10 @@ config CACHE_COPYBACK endchoice endif # HAVE_CACHE_CB +config NR_CPUS + int + default "1" + # Coldfire cores that do not have a data cache configured can do coherent DMA. config COLDFIRE_COHERENT_DMA bool
arch/microblaze/kernel/head.S +2 -0
@@ -39,6 +39,8 @@ #include <asm/processor.h> .section .data +/* The MMU requires a page aligned page directory. */ +.align 12 .global swapper_pg_dir swapper_pg_dir: .space PAGE_SIZE
arch/openrisc/include/asm/processor.h +2 -0
@@ -26,6 +26,8 @@ | SPR_SR_DCE | SPR_SR_SM)#define USER_SR (SPR_SR_DME | SPR_SR_IME | SPR_SR_ICE \ | SPR_SR_DCE | SPR_SR_IEE | SPR_SR_TEE) +/* SR bits user space may change via sigreturn, the rest stay kernel owned */ +#define SPR_SR_USER_MASK (SPR_SR_F | SPR_SR_CY | SPR_SR_OV)/* * User space process size. This is hardcoded into a few places,
arch/openrisc/kernel/signal.c +3 -2
@@ -74,6 +74,7 @@ static long save_fp_state(struct sigcontext __user *sc)static int restore_sigcontext (struct pt_regs *regs,struct sigcontext __user *sc) { +unsigned long old_sr = regs->sr;int err =0 ;/* Always make any pending restarted system calls return -EINTR */
@@ -89,8 +90,8 @@ static int restore_sigcontext(struct pt_regs *regs, err |=__copy_from_user (®s->sr, &sc->regs.sr,sizeof (unsigned long )); err |=restore_fp_state (sc); -/* make sure the SM-bit is cleared so user-mode cannot fool us */ - regs->sr &= ~SPR_SR_SM ; +/* keep the privileged SR bits kernel owned, restore only user flags */ + regs->sr = (old_sr & ~SPR_SR_USER_MASK ) | (regs->sr &SPR_SR_USER_MASK ); regs->orig_gpr11 =-1 ;/* Avoid syscall restart checks */
arch/powerpc/platforms/pseries/lparcfg.c +1 -1
@@ -697,7 +697,7 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,if (!firmware_has_feature (FW_FEATURE_SPLPAR ))return -EINVAL ; -if (count >sizeof (kbuf)) +if (count ==0 || count >sizeof (kbuf))return -EINVAL ;if (copy_from_user (kbuf, buf, count))
arch/powerpc/platforms/pseries/papr-phy-attest.c +11 -1
@@ -230,10 +230,17 @@ static long papr_phy_attest_create_handle(struct papr_phy_attest_io_block __userreturn -ENOMEM ;if (copy_from_user (¶ms->cmd, ulc, -sizeof (struct papr_phy_attest_io_block ))) +sizeof (struct papr_phy_attest_io_block ))) { +kfree (params);return -EFAULT ; + } params->cmd_len =be32_to_cpu (params->cmd.length); +if (params->cmd_len ==0 || params->cmd_len >sizeof (params->cmd)) { +kfree (params); +return -EINVAL ; + } + seq = (struct papr_rtas_sequence ) { .begin = phy_attest_sequence_begin, .end = phy_attest_sequence_end,
@@ -246,6 +253,9 @@ static long papr_phy_attest_create_handle(struct papr_phy_attest_io_block __user &papr_phy_attest_handle_ops, "[papr-physical-attestation]"); +if (fd <0 ) +kfree (params); +return fd; }
arch/powerpc/platforms/pseries/pci.c +1 -1
@@ -132,7 +132,7 @@ static int pseries_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs)/* First integer stores max config */ max_config_vfs =of_read_number (&max_vfs[0 ],1 ); -if (max_config_vfs < num_vfs && num_vfs >MAX_VFS_FOR_MAP_PE ) { +if (max_config_vfs < num_vfs || num_vfs >MAX_VFS_FOR_MAP_PE ) { dev_err(&pdev->dev, "Num VFs %x > %x Configurable VFs\n", num_vfs, (num_vfs > MAX_VFS_FOR_MAP_PE) ?
arch/riscv/kernel/ftrace.c +4 -1
@@ -12,6 +12,7 @@#include <linux/stop_machine.h> #include <asm/cacheflush.h> #include <asm/text-patching.h> +#include <asm/insn.h> #ifdef CONFIG_DYNAMIC_FTRACE void ftrace_arch_code_modify_prepare (void )
@@ -63,7 +64,9 @@ static int __ftrace_modify_call(unsigned long source, unsigned long target, boolif (copy_from_kernel_nofault (replaced, (void *)source,2 *MCOUNT_INSN_SIZE ))return -EFAULT ; -if (replaced[0 ] != call[0 ]) { +/* Bypass the check if the auipc insn is a kprobe breakpoint */ +if (replaced[0 ] != call[0 ] && + !(riscv_insn_is_ebreak (replaced[0 ]) ||riscv_insn_is_c_ebreak (replaced[0 ]))) {pr_err ("%p: expected (%08x) but got (%08x)\n" , (void *)source, call[0 ], replaced[0 ]);return -EINVAL ;
arch/riscv/kernel/unaligned_access_speed.c +7 -1
@@ -436,4 +436,10 @@ static int __init check_unaligned_access_all_cpus(void)return 0 ; } -late_initcall (check_unaligned_access_all_cpus); +/* +* Run after clocksource_done_booting() so measure_cycles() uses a stable +* clocksource, but before rootfs_initcall() enables usermode helpers. Those +* helpers can reach hwprobe and populate the vDSO cache, so async hwprobe +* probes must be registered first. +*/ +fs_initcall_sync (check_unaligned_access_all_cpus);
arch/riscv/lib/strnlen.S +9 -1
@@ -83,8 +83,13 @@ strnlen_zbb: sub t3, t3, t2 slli t2, t2, 3 - /* Aligned boundary. */ + /* + * Aligned boundary. Use the address of the last valid byte + * (s + count - 1) to avoid loading a word past the count + * boundary in the loop below. count == 0 is handled above. + */ add t4, a0, a1 + addi t4, t4, -1 andi t4, t4, -SZREG /* Get the first word. */
@@ -120,6 +125,9 @@ strnlen_zbb: bgtu t3, a0, 2f + /* All remaining bytes are in the first word, no loop needed. */ + bgeu t0, t4, 2f + /* Prepare for the word comparison loop. */ addi t2, t0, SZREG li t3, -1
block/genhd.c +8 -4
@@ -1281,14 +1281,18 @@ static void disk_release(struct device *dev)/* * To undo the all initialization from blk_mq_init_allocated_queue in * case of a probe failure where add_disk is never called we have to -* call blk_mq_exit_queue here. We can't do this for the more common -* teardown case (yet) as the tagset can be gone by the time the disk -* is released once it was added. +* call blk_mq_exit_queue here, after stopping the timer and work items +* that I/O issued before add_disk may have left pending. We can't do +* this for the more common teardown case (yet) as the tagset can be +* gone by the time the disk is released once it was added. */ if (queue_is_mq (disk->queue) &&test_bit (GD_OWNS_QUEUE , &disk->state) && - !test_bit (GD_ADDED , &disk->state)) + !test_bit (GD_ADDED , &disk->state)) { +blk_sync_queue (disk->queue); +blk_mq_cancel_work_sync (disk->queue);blk_mq_exit_queue (disk->queue); + }blkcg_exit_disk (disk);
crypto/ccm.c +1 -1
@@ -747,7 +747,7 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl, inst->alg.ivsize =8 ; inst->alg.chunksize =crypto_aead_alg_chunksize (alg); - inst->alg.maxauthsize =16 ; + inst->alg.maxauthsize =crypto_aead_alg_maxauthsize (alg); inst->alg.base.cra_ctxsize =sizeof (struct crypto_rfc4309_ctx );
drivers/accel/amdxdna/aie2_ctx.c +16 -0
@@ -963,6 +963,16 @@ static int aie2_populate_range(struct amdxdna_gem_obj *abo) found = false;down_write (&xdna->notifier_lock);list_for_each_entry (mapp, &abo->mem.umap_list, node) { +/* +* Skip entries that have already been unmapped. +* +* If userspace unmaps the address and later submits I/O using +* it, the IOMMU will reject the access and report a fault. +* Ignore such entries here. +*/ +if (mapp->unmapped) +continue ; +if (mapp->invalid &&kref_get_unless_zero (&mapp->refcnt)) { found = true;break ;
@@ -970,6 +980,12 @@ static int aie2_populate_range(struct amdxdna_gem_obj *abo) }if (!found) { +/* +* This also covers the case where all mappings have been +* removed. There are no invalid mappings left to process. +* Any subsequent I/O using the unmapped address will be +* rejected by the IOMMU. +*/ abo->mem.map_invalid = false;up_write (&xdna->notifier_lock);return 0 ;
drivers/base/regmap/regmap-sdw-mbq.c +2 -2
@@ -56,10 +56,10 @@ static int regmap_sdw_mbq_poll_busy(struct sdw_slave *slave, unsigned int reg, reg =SDW_SDCA_CTL (SDW_SDCA_CTL_FUNC (reg),0 ,SDCA_CTL_ENTITY_0_FUNCTION_STATUS ,0 ); -if (ctx->readable_reg (dev, reg)) { +if (!ctx->readable_reg || ctx->readable_reg (dev, reg)) { ret =read_poll_timeout (sdw_read_no_pm, val, val <0 || !(val &SDCA_CTL_ENTITY_0_FUNCTION_BUSY ), - ctx->cfg.timeout_us, ctx->cfg.retry_us, + ctx->cfg.retry_us, ctx->cfg.timeout_us, false, slave, reg);if (val <0 )return val;
drivers/clk/qcom/dispcc-eliza.c +1 -1
@@ -757,7 +757,7 @@ static struct clk_rcg2 disp_cc_mdss_mdp_clk_src = { .parent_data = disp_cc_parent_data_11, .num_parents = ARRAY_SIZE(disp_cc_parent_data_11), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_shared_ops, + .ops = &clk_rcg2_shared_no_init_park_ops, }, };
drivers/clk/spacemit/ccu-k3.c +2 -2
@@ -777,7 +777,7 @@ static const struct clk_parent_data sdh2_parents[] = {CCU_MUX_DIV_GATE_FC_DEFINE (sdh2_clk, sdh2_parents,APMU_SDH2_CLK_RES_CTRL ,8 ,3 ,BIT (11 ),5 ,3 ,BIT (4 ),0 ); -CCU_GATE_DEFINE (usb2_bus_clk,CCU_PARENT_HW (axi_clk),APMU_USB_CLK_RES_CTRL ,BIT (0 ),0 ); +CCU_GATE_DEFINE (usb2_bus_clk,CCU_PARENT_HW (axi_clk),APMU_USB_CLK_RES_CTRL ,BIT (1 ),0 );CCU_GATE_DEFINE (usb3_porta_bus_clk,CCU_PARENT_HW (axi_clk),APMU_USB_CLK_RES_CTRL ,BIT (4 ),0 );CCU_GATE_DEFINE (usb3_portb_bus_clk,CCU_PARENT_HW (axi_clk),APMU_USB_CLK_RES_CTRL ,BIT (8 ),0 );CCU_GATE_DEFINE (usb3_portc_bus_clk,CCU_PARENT_HW (axi_clk),APMU_USB_CLK_RES_CTRL ,BIT (12 ),0 );
@@ -1021,7 +1021,7 @@ CCU_MUX_DIV_GATE_DEFINE(isim_vclk_out3, isim_vclk_parents, APMU_SNR_ISIM_VCLK_CT/* APMU clocks end */ /* DCIU clocks start */ -CCU_GATE_DEFINE (hdma_clk,CCU_PARENT_HW (axi_clk),DCIU_DMASYS_CLK_EN ,BIT (0 ),0 ); +CCU_GATE_DEFINE (hdma_clk,CCU_PARENT_HW (axi_clk),DCIU_DMASYS_CLK_EN ,BIT (0 ),CLK_IS_CRITICAL );CCU_GATE_DEFINE (dma350_clk,CCU_PARENT_HW (axi_clk),DCIU_DMASYS_SDMA_CLK_EN ,BIT (0 ),0 );CCU_GATE_DEFINE (c2_tcm_pipe_clk,CCU_PARENT_HW (axi_clk),DCIU_C2_TCM_PIPE_CLK ,BIT (0 ),0 );CCU_GATE_DEFINE (c3_tcm_pipe_clk,CCU_PARENT_HW (axi_clk),DCIU_C3_TCM_PIPE_CLK ,BIT (0 ),0 );
drivers/crypto/qce/core.c +1 -1
@@ -59,7 +59,7 @@ static int devm_qce_register_algs(struct qce_device *qce) ret = ops->register_algs (qce);if (ret) {for (j = i -1 ; j >=0 ; j--) - ops->unregister_algs (qce); + qce_ops[j]->unregister_algs (qce);return ret; } }
drivers/crypto/starfive/jh7110-aes.c +1 -1
@@ -677,7 +677,7 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areqif (cryp->total_in)sg_zero_buffer (rctx->in_sg,sg_nents (rctx->in_sg), -sg_dma_len (rctx->in_sg) - cryp->total_in, + rctx->in_sg->length - cryp->total_in, cryp->total_in); ctx->rctx = rctx;
drivers/crypto/tegra/tegra-se-aes.c +3 -19
@@ -45,7 +45,6 @@ struct tegra_aes_reqctx {struct tegra_aead_ctx {struct tegra_se *se; -unsigned int authsize;u32 alg;u32 key_id;u32 keylen;
@@ -1290,7 +1289,7 @@ static int tegra_gcm_do_one_req(struct crypto_engine *engine, void *areq)if (rctx->encrypt) rctx->cryptlen = req->cryptlen;else - rctx->cryptlen = req->cryptlen - ctx->authsize; + rctx->cryptlen = req->cryptlen - rctx->authsize;memcpy (rctx->iv, req->iv,GCM_AES_IV_SIZE ); rctx->iv[3 ] = (1 <<24 );
@@ -1394,8 +1393,6 @@ static int tegra_aead_cra_init(struct crypto_aead *tfm)static int tegra_ccm_setauthsize (struct crypto_aead *tfm,unsigned int authsize) { -struct tegra_aead_ctx *ctx =crypto_aead_ctx (tfm); -switch (authsize) {case 4 :case 6 :
@@ -1404,28 +1401,15 @@ static int tegra_ccm_setauthsize(struct crypto_aead *tfm, unsigned int authsizecase 12 :case 14 :case 16 : -break ; +return 0 ;default :return -EINVAL ; } - - ctx->authsize = authsize; - -return 0 ; }static int tegra_gcm_setauthsize (struct crypto_aead *tfm,unsigned int authsize) { -struct tegra_aead_ctx *ctx =crypto_aead_ctx (tfm); -int ret; - - ret =crypto_gcm_check_authsize (authsize); -if (ret) -return ret; - - ctx->authsize = authsize; - -return 0 ; +return crypto_gcm_check_authsize (authsize); }static void tegra_aead_cra_exit (struct crypto_aead *tfm)
drivers/firewire/ohci.c +3 -1
@@ -540,11 +540,13 @@ static void ar_context_link_page(struct ar_context *ctx, unsigned int index)static void ar_context_release (struct ar_context *ctx) { -struct device *dev = ctx->ohci->card.device; +struct device *dev;if (!ctx->buffer)return ; + dev = ctx->ohci->card.device; +for (int i =0 ; i <AR_BUFFERS ; ++i) {dma_addr_t dma_addr = ctx->dma_addrs[i];if (dma_addr)
drivers/gpio/gpio-ml-ioh.c +38 -33
201 lines not on this page · raw message
drivers/gpio/gpio-sloppy-logic-analyzer.c +1 -1
@@ -301,7 +301,7 @@ static int gpio_la_poll_probe(struct platform_device *pdev)debugfs_create_ulong ("delay_ns_acquisition" ,0400 , priv->debug_dir, &priv->acq_delay);debugfs_create_file_unsafe ("buf_size" ,0600 , priv->debug_dir, priv, &fops_buf_size);debugfs_create_file_unsafe ("capture" ,0200 , priv->debug_dir, priv, &fops_capture); -debugfs_create_file_unsafe ("trigger" ,0200 , priv->debug_dir, priv, &fops_trigger); +debugfs_create_file ("trigger" ,0200 , priv->debug_dir, priv, &fops_trigger);return 0 ; }
drivers/gpio/gpiolib.c +2 -1
@@ -5408,7 +5408,8 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *gc) flags =READ_ONCE (desc->flags); is_irq =test_bit (GPIOD_FLAG_USED_AS_IRQ , &flags);if (is_irq ||test_bit (GPIOD_FLAG_REQUESTED , &flags)) { -gpiod_get_direction (desc); +if (gc->get_direction) +gpiod_get_direction (desc); is_out =test_bit (GPIOD_FLAG_IS_OUT , &flags); value =gpio_chip_get_value (gc, desc); active_low =test_bit (GPIOD_FLAG_ACTIVE_LOW , &flags);
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +30 -1
@@ -42,6 +42,26 @@#include "amdgpu_ras.h" #include "amdgpu_hmm.h" +/* +* Maximum IB length (dwords) for rings whose emit_ib packet format +* documents a 20-bit size field. +*/ +#define AMDGPU_GFX_SDMA_IB_PACKET_SIZE_MAX_DW 0xFFFFF +#define AMDGPU_MM_IB_PACKET_SIZE_MAX_DW 0x7FFFF0 + +static u32 amdgpu_cs_ib_packet_size_max_dw (enum amdgpu_ring_type type) +{ +switch (type) { +case AMDGPU_RING_TYPE_GFX : +case AMDGPU_RING_TYPE_COMPUTE : +case AMDGPU_RING_TYPE_SDMA : +case AMDGPU_RING_TYPE_VPE : +return AMDGPU_GFX_SDMA_IB_PACKET_SIZE_MAX_DW ; +default : +return AMDGPU_MM_IB_PACKET_SIZE_MAX_DW ; + } +} + static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, struct amdgpu_device *adev, struct drm_file *filp,
@@ -233,6 +253,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,if (size <sizeof (struct drm_amdgpu_cs_chunk_fence )) goto free_partial_kdata; +/* Only a single user fence is allowed to simplify handling. */ +if (p->uf_bo) + goto free_partial_kdata; + ret =amdgpu_cs_p1_user_fence (p, p->chunks[i].kdata, &uf_offset);if (ret)
@@ -350,7 +374,6 @@ static int amdgpu_cs_p2_ib(struct amdgpu_cs_parser *p, job = p->jobs[r]; ring =amdgpu_job_ring (job); - ib = &job->ibs[job->num_ibs++];/* submissions to kernel queues are disabled */ if (ring->no_user_submission)
@@ -379,6 +402,12 @@ static int amdgpu_cs_p2_ib(struct amdgpu_cs_parser *p,return -EINVAL ; } +if (chunk_ib->ib_bytes /4 > +amdgpu_cs_ib_packet_size_max_dw (ring->funcs->type)) +return -EINVAL ; + + ib = &job->ibs[job->num_ibs++]; +if (chunk_ib->flags &AMDGPU_IB_FLAG_PREAMBLE ) job->preamble_status |=AMDGPU_PREAMBLE_IB_PRESENT ;
drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c +7 -3
@@ -513,7 +513,7 @@ void amdgpu_coredump(struct amdgpu_device *adev, bool skip_vram_check,if (job && job->pasid) size +=sizeof (struct amdgpu_coredump_ib_info ) * job->num_ibs; - coredump =kzalloc (size,GFP_NOWAIT ); + coredump =kvzalloc (size,GFP_NOWAIT );if (!coredump)return ;
@@ -556,8 +556,12 @@ void amdgpu_coredump(struct amdgpu_device *adev, bool skip_vram_check, total_ring_size += ring->ring_size; ring_count++; } - coredump->rings_dw =kzalloc (total_ring_size,GFP_NOWAIT ); - coredump->rings =kcalloc (ring_count,sizeof (struct amdgpu_coredump_ring ),GFP_NOWAIT ); +if (ring_count) { + coredump->rings_dw =kvzalloc (total_ring_size,GFP_NOWAIT ); + coredump->rings =kvcalloc (ring_count, +sizeof (struct amdgpu_coredump_ring ), +GFP_NOWAIT ); + }if (coredump->rings && coredump->rings_dw) {for (i =0 , off =0 , idx =0 ; i < adev->num_rings && idx < ring_count; i++) { ring = adev->rings[i];
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +49 -1
68 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +13 -0
@@ -310,6 +310,19 @@ static int amdgpu_discovery_get_tmr_info(struct amdgpu_device *adev, goto out; } }else { +if (adev->discovery.offset) { +u32 signature; + +/* If VRAM holds a valid discovery signature at the default +* discovery offset, use it as-is. +*/ +amdgpu_device_vram_access (adev, adev->discovery.offset, + &signature,sizeof (signature), + false); +if (le32_to_cpu (signature) ==BINARY_SIGNATURE ) + goto out; + } + tmr_size =RREG32 (mmDRIVER_SCRATCH_2);if (tmr_size) {/* It's preferred to transition to PSP mailbox reg interface
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +21 -0
@@ -397,6 +397,25 @@ const struct drm_gem_object_funcs amdgpu_gem_object_funcs = { .vm_ops = &amdgpu_gem_vm_ops, }; +static bool amdgpu_gem_are_domains_valid (u32 domains) +{ +u32 normal =AMDGPU_GEM_DOMAIN_CPU | +AMDGPU_GEM_DOMAIN_GTT | +AMDGPU_GEM_DOMAIN_VRAM ; +/* Treat all non CPU/GTT/VRAM domains as special domains. */ +u32 special =AMDGPU_GEM_DOMAIN_MASK & ~normal; +u32 normal_mask = domains & normal; +u32 special_mask = domains & special; + +if (!special_mask) +return true; + +if (normal_mask) +return false; + +return !(special_mask & (special_mask -1 )); +} +/* * GEM ioctls. */
@@ -421,6 +440,8 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,/* reject invalid gem domains */ if (args->in.domains & ~AMDGPU_GEM_DOMAIN_MASK )return -EINVAL ; +if (!amdgpu_gem_are_domains_valid (args->in.domains)) +return -EINVAL ;if (!amdgpu_is_tmz (adev) && (flags &AMDGPU_GEM_CREATE_ENCRYPTED )) {DRM_NOTE_ONCE ("Cannot allocate secure buffer since TMZ is disabled\n" );
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -8
@@ -2260,8 +2260,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)*/ void amdgpu_ttm_fini (struct amdgpu_device *adev) { -int idx; -if (!adev->mman.initialized)return ;
@@ -2284,13 +2282,9 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)amdgpu_ttm_unmark_vram_reserved (adev,AMDGPU_RESV_FW_VRAM_USAGE );amdgpu_ttm_unmark_vram_reserved (adev,AMDGPU_RESV_DRV_VRAM_USAGE ); -if (drm_dev_enter (adev_to_drm (adev), &idx)) { - -if (adev->mman.aper_base_kaddr) -iounmap (adev->mman.aper_base_kaddr); +if (adev->mman.aper_base_kaddr) { +iounmap (adev->mman.aper_base_kaddr); adev->mman.aper_base_kaddr =NULL ; - -drm_dev_exit (idx); }if (!adev->gmc.is_app_apu)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +5 -0
@@ -700,7 +700,12 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)if (!adev->userq_halt_for_enforce_isolation || ((queue->queue_type !=AMDGPU_HW_IP_GFX ) && (queue->queue_type !=AMDGPU_HW_IP_COMPUTE ))) { +/* Serialize the map against an in-progress GPU reset (MES is +* unresponsive during recovery), matching amdgpu_userq_cleanup(). +*/ +down_read (&adev->reset_domain->sem); r =amdgpu_userq_map_helper (queue); +up_read (&adev->reset_domain->sem);if (r) {drm_file_err (uq_mgr->file,"Failed to map Queue\n" );mutex_unlock (&uq_mgr->userq_mutex);
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +18 -67
151 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -1
@@ -810,6 +810,7 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job,mutex_unlock (&id_mgr->lock); gds_switch_needed &= !!ring->funcs->emit_gds_switch; + spm_update_needed &= !!adev->gfx.rlc.funcs->update_spm_vmid; vm_flush_needed &= !!ring->funcs->emit_vm_flush && job->vm_pd_addr !=AMDGPU_BO_INVALID_OFFSET ; pasid_mapping_needed &= adev->gmc.gmc_funcs->emit_pasid_mapping &&
@@ -821,7 +822,7 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, &job->base.s_fence->scheduled == isolation->spearhead;if (!vm_flush_needed && !gds_switch_needed && !need_pipe_sync && - !cleaner_shader_needed) + !cleaner_shader_needed && !spm_update_needed)return ;amdgpu_ring_ib_begin (ring);
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +5 -0
@@ -1823,6 +1823,11 @@ static void gfx_v12_0_constants_init(struct amdgpu_device *adev)gfx_v12_0_get_tcc_info (adev); adev->gfx.config.pa_sc_tile_steering_override =0 ; +/* Set whether texture coordinate truncation is conformant. */ + tmp =RREG32_SOC15 (GC ,0 , regTA_CNTL2); + adev->gfx.config.ta_cntl2_truncate_coord_mode = +REG_GET_FIELD (tmp,TA_CNTL2 ,TRUNCATE_COORD_MODE ); +/* XXX SH_MEM regs */ /* where to put LDS, scratch, GPUVM in FSA64 space */ mutex_lock (&adev->srbm_mutex);
drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c +47 -1
91 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c +17 -4
@@ -772,15 +772,28 @@ static int jpeg_v4_0_5_ring_reset(struct amdgpu_ring *ring,unsigned int vmid, struct amdgpu_fence *timedout_fence) { + struct amdgpu_device *adev = ring->adev; +u32 pg_flags = adev->pg_flags;int r;amdgpu_ring_reset_helper_begin (ring, timedout_fence); - r =jpeg_v4_0_5_stop (ring->adev); -if (r) -return r; - r =jpeg_v4_0_5_start (ring->adev); + +/* +* The DPG stop path only clears the JPEG_PG_MODE bit and never resets a +* hung JRBC, so the post-reset ring test times out and the driver falls +* back to a full MODE1 reset. Temporarily force the static power-gating +* path so the stop/start sequence actually power-cycles the JPEG block +* (JMI soft reset + static power off/on), matching the working jpeg_v4_0 +* reset. +*/ + adev->pg_flags &= ~AMD_PG_SUPPORT_JPEG_DPG ; + r =jpeg_v4_0_5_stop (adev); +if (!r) + r =jpeg_v4_0_5_start (adev); + adev->pg_flags = pg_flags;if (r)return r; +return amdgpu_ring_reset_helper_end (ring, timedout_fence); }
drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c +17 -4
@@ -648,15 +648,28 @@ static int jpeg_v5_0_0_ring_reset(struct amdgpu_ring *ring,unsigned int vmid, struct amdgpu_fence *timedout_fence) { + struct amdgpu_device *adev = ring->adev; +u32 pg_flags = adev->pg_flags;int r;amdgpu_ring_reset_helper_begin (ring, timedout_fence); - r =jpeg_v5_0_0_stop (ring->adev); -if (r) -return r; - r =jpeg_v5_0_0_start (ring->adev); + +/* +* The DPG stop path only clears the JPEG_PG_MODE bit and never resets a +* hung JRBC, so the post-reset ring test times out and the driver falls +* back to a full MODE1 reset. Temporarily force the static power-gating +* path so the stop/start sequence actually power-cycles the JPEG block +* (JMI soft reset + ONO1 power off/on), matching the working jpeg_v4_0 +* reset. +*/ + adev->pg_flags &= ~AMD_PG_SUPPORT_JPEG_DPG ; + r =jpeg_v5_0_0_stop (adev); +if (!r) + r =jpeg_v5_0_0_start (adev); + adev->pg_flags = pg_flags;if (r)return r; +return amdgpu_ring_reset_helper_end (ring, timedout_fence); }
drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c +17 -4
@@ -631,15 +631,28 @@ static int jpeg_v5_3_0_ring_reset(struct amdgpu_ring *ring,unsigned int vmid, struct amdgpu_fence *timedout_fence) { + struct amdgpu_device *adev = ring->adev; +u32 pg_flags = adev->pg_flags;int r;amdgpu_ring_reset_helper_begin (ring, timedout_fence); - r =jpeg_v5_3_0_stop (ring->adev); -if (r) -return r; - r =jpeg_v5_3_0_start (ring->adev); + +/* +* The DPG stop path only clears the JPEG_PG_MODE bit and never resets a +* hung JRBC, so the post-reset ring test times out and the driver falls +* back to a full MODE1 reset. Temporarily force the static power-gating +* path so the stop/start sequence actually power-cycles the JPEG block +* (JMI soft reset + static power off/on), matching the working jpeg_v4_0 +* reset. +*/ + adev->pg_flags &= ~AMD_PG_SUPPORT_JPEG_DPG ; + r =jpeg_v5_3_0_stop (adev); +if (!r) + r =jpeg_v5_3_0_start (adev); + adev->pg_flags = pg_flags;if (r)return r; +return amdgpu_ring_reset_helper_end (ring, timedout_fence); }
drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c +17 -25
79 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +22 -4
@@ -875,6 +875,23 @@ static void vce_v3_0_ring_emit_ib(struct amdgpu_ring *ring,amdgpu_ring_write (ring, ib->length_dw); } +static void vce_v3_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr, +u64 seq,unsigned flags) +{ +WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); + +amdgpu_ring_write (ring,VCE_CMD_FENCE ); +amdgpu_ring_write (ring, addr); +amdgpu_ring_write (ring,upper_32_bits (addr)); +amdgpu_ring_write (ring, seq); +amdgpu_ring_write (ring,VCE_CMD_TRAP ); +} + +static void vce_v3_0_ring_insert_end (struct amdgpu_ring *ring) +{ +amdgpu_ring_write (ring,VCE_CMD_END ); +} +static void vce_v3_0_emit_vm_flush (struct amdgpu_ring *ring,unsigned int vmid,uint64_t pd_addr) {
@@ -884,7 +901,6 @@ static void vce_v3_0_emit_vm_flush(struct amdgpu_ring *ring,amdgpu_ring_write (ring,VCE_CMD_FLUSH_TLB );amdgpu_ring_write (ring, vmid); -amdgpu_ring_write (ring,VCE_CMD_END ); }static void vce_v3_0_emit_pipeline_sync (struct amdgpu_ring *ring)
@@ -953,17 +969,19 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_vm_funcs = { .set_wptr = vce_v3_0_ring_set_wptr, .patch_cs_in_place = amdgpu_vce_ring_parse_cs_vm, .emit_frame_size = -6 +/* vce_v3_0_emit_vm_flush */ +5 +/* vce_v3_0_emit_vm_flush */ 4 +/* vce_v3_0_emit_pipeline_sync */ - 6 + 6, /* amdgpu_vce_ring_emit_fence x2 vm fence */ +5 +5 +/* vce_v3_0_ring_emit_fence x2 vm fence */ + 1, /* vce_v3_0_ring_insert_end */ .emit_ib_size = 5, /* vce_v3_0_ring_emit_ib */ .emit_ib = vce_v3_0_ring_emit_ib, .emit_vm_flush = vce_v3_0_emit_vm_flush, .emit_pipeline_sync = vce_v3_0_emit_pipeline_sync, - .emit_fence = amdgpu_vce_ring_emit_fence, + .emit_fence = vce_v3_0_ring_emit_fence, .test_ring = amdgpu_vce_ring_test_ring, .test_ib = amdgpu_vce_ring_test_ib, .insert_nop = amdgpu_ring_insert_nop, + .insert_end = vce_v3_0_ring_insert_end, .pad_ib = amdgpu_ring_generic_pad_ib, .begin_use = amdgpu_vce_ring_begin_use, .end_use = amdgpu_vce_ring_end_use,
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +9 -0
@@ -1404,6 +1404,15 @@ int kfd_parse_crat_table(void *crat_image, struct list_head *device_list, sub_type_hdr = (struct crat_subtype_generic *)(crat_table+1 );while ((char *)sub_type_hdr +sizeof (struct crat_subtype_generic ) < ((char *)crat_image) + image_len) { +/* Validate subtype fits within remaining image */ +if ((char *)sub_type_hdr + sub_type_hdr->length > + (char *)crat_image + image_len) { +pr_warn ("CRAT subtype length %u exceeds image bounds\n" , + sub_type_hdr->length); + ret = -EINVAL ; +break ; + } +if (sub_type_hdr->flags &CRAT_SUBTYPE_FLAGS_ENABLED ) { ret =kfd_parse_subtype (sub_type_hdr, device_list);if (ret)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -0
@@ -2079,6 +2079,11 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) init_data.flags.unify_link_enc_assignment = true; init_data.flags.usb4_bw_alloc_support = true; } + +/* DCN201 audio desyncs using DP SS */ +if (adev->apu_flags &AMD_APU_IS_CYAN_SKILLFISH2 ) + init_data.flags.ignore_dpref_ss = true; +retrieve_dmi_info (&adev->dm);if (adev->dm.edp0_on_dp1_quirk) init_data.flags.support_edp0_on_dp1 = true;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +1 -1
@@ -287,7 +287,7 @@ static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable) irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, acrtc->crtc_id); -if (enable) { +if (enable && acrtc_state->stream) {struct dc *dc = adev->dm.dc;struct drm_vblank_crtc *vblank =drm_crtc_vblank_crtc (crtc);struct psr_settings *psr = &acrtc_state->stream->link->psr_settings;
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +20 -11
@@ -57,7 +57,8 @@ enum dc_color_space_type {COLOR_SPACE_RGB_LIMITED_TYPE ,COLOR_SPACE_YCBCR601_TYPE ,COLOR_SPACE_YCBCR709_TYPE , -COLOR_SPACE_YCBCR2020_TYPE , +COLOR_SPACE_YCBCR2020_LIMITED_TYPE , +COLOR_SPACE_YCBCR2020_FULL_TYPE ,COLOR_SPACE_YCBCR601_LIMITED_TYPE ,COLOR_SPACE_YCBCR709_LIMITED_TYPE , COLOR_SPACE_YCBCR709_BLACK_TYPE,
@@ -109,9 +110,15 @@ static const struct out_csc_color_matrix_type output_csc_matrix[] = { {0xE00 ,0xF349 ,0xFEB7 ,0x1000 ,0x6CE ,0x16E3 ,0x24F ,0x200 , 0xFCCB, 0xF535, 0xE00, 0x1000} }, - { COLOR_SPACE_YCBCR2020_TYPE, +/* Corrected. Not included in the TODO above. */ + { COLOR_SPACE_YCBCR2020_LIMITED_TYPE, + { 0x0E04, 0xF31D, 0xFEDF, 0x1004, +0x0733 ,0x1294 ,0x01A0 ,0x0201 , + 0xFC16, 0xF5E6, 0x0E04, 0x1004} }, +/* Corrected. Not included in the TODO above. */ + { COLOR_SPACE_YCBCR2020_FULL_TYPE, { 0x1000, 0xF149, 0xFEB7, 0x1004, -0x0868 ,0x15B2 ,0x01E6 ,0x201 , +0x0868 ,0x15B2 ,0x01E6 ,0 , 0xFB88, 0xF478, 0x1000, 0x1004} }, { COLOR_SPACE_YCBCR709_BLACK_TYPE, { 0x0000, 0x0000, 0x0000, 0x1000,
@@ -178,14 +185,14 @@ static bool is_ycbcr709_type(return ret; } -static bool is_ycbcr2020_type ( -enum dc_color_space color_space) +static bool is_ycbcr2020_limited_type (enum dc_color_space color_space) { -bool ret = false; +return color_space ==COLOR_SPACE_2020_YCBCR_LIMITED ; +} -if (color_space ==COLOR_SPACE_2020_YCBCR_LIMITED || color_space ==COLOR_SPACE_2020_YCBCR_FULL ) - ret = true; -return ret; +static bool is_ycbcr2020_full_type (enum dc_color_space color_space) +{ +return color_space ==COLOR_SPACE_2020_YCBCR_FULL ; } static bool is_ycbcr709_limited_type(
@@ -214,8 +221,10 @@ static enum dc_color_space_type get_color_space_type(enum dc_color_space color_s type =COLOR_SPACE_YCBCR601_LIMITED_TYPE ; else if (is_ycbcr709_limited_type(color_space)) type =COLOR_SPACE_YCBCR709_LIMITED_TYPE ; - else if (is_ycbcr2020_type(color_space)) - type =COLOR_SPACE_YCBCR2020_TYPE ; + else if (is_ycbcr2020_limited_type(color_space)) + type =COLOR_SPACE_YCBCR2020_LIMITED_TYPE ; + else if (is_ycbcr2020_full_type(color_space)) + type =COLOR_SPACE_YCBCR2020_FULL_TYPE ; else if (color_space == COLOR_SPACE_YCBCR709) type =COLOR_SPACE_YCBCR709_BLACK_TYPE ; else if (color_space == COLOR_SPACE_YCBCR709_BLACK)
drivers/gpu/drm/amd/display/dc/dce/dce_transform.c +4 -3
@@ -115,10 +115,11 @@ static const struct out_csc_color_matrix global_color_matrix[] = { { 0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} }, { COLOR_SPACE_2020_RGB_LIMITEDRANGE, { 0x1B67, 0, 0, 0x201, 0, 0x1B67, 0, 0x201, 0, 0, 0x1B67, 0x201} }, -{ COLOR_SPACE_2020_YCBCR_LIMITED, { 0x1000, 0xF149, 0xFEB7, 0x1004, 0x0868, - 0x15B2, 0x01E6, 0x201, 0xFB88, 0xF478, 0x1000, 0x1004} }, +/* COLOR_SPACE_2020_YCBCR_* values corrected. Not included in the TODO above. */ +{ COLOR_SPACE_2020_YCBCR_LIMITED, { 0x0E04, 0xF31D, 0xFEDF, 0x1004, 0x0733, + 0x1294, 0x01A0, 0x201, 0xFC16, 0xF5E6, 0x0E04, 0x1004} }, { COLOR_SPACE_2020_YCBCR_FULL, { 0x1000, 0xF149, 0xFEB7, 0x1004, 0x0868, 0x15B2, - 0x01E6, 0x201, 0xFB88, 0xF478, 0x1000, 0x1004} } + 0x01E6, 0, 0xFB88, 0xF478, 0x1000, 0x1004} } }; static bool setup_scaling_configuration(
drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c +4 -3
@@ -93,10 +93,11 @@ static const struct out_csc_color_matrix global_color_matrix[] = { { 0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} }, { COLOR_SPACE_2020_RGB_LIMITEDRANGE, { 0x1B67, 0, 0, 0x201, 0, 0x1B67, 0, 0x201, 0, 0, 0x1B67, 0x201} }, -{ COLOR_SPACE_2020_YCBCR_LIMITED, { 0x1000, 0xF149, 0xFEB7, 0x1004, 0x0868, - 0x15B2, 0x01E6, 0x201, 0xFB88, 0xF478, 0x1000, 0x1004} }, +/* COLOR_SPACE_2020_YCBCR_* values corrected. Not included in the TODO above. */ +{ COLOR_SPACE_2020_YCBCR_LIMITED, { 0x0E04, 0xF31D, 0xFEDF, 0x1004, 0x0733, + 0x1294, 0x01A0, 0x201, 0xFC16, 0xF5E6, 0x0E04, 0x1004} }, { COLOR_SPACE_2020_YCBCR_FULL, { 0x1000, 0xF149, 0xFEB7, 0x1004, 0x0868, 0x15B2, - 0x01E6, 0x201, 0xFB88, 0xF478, 0x1000, 0x1004} } + 0x01E6, 0, 0xFB88, 0xF478, 0x1000, 0x1004} } }; enum csc_color_mode {
drivers/gpu/drm/clients/drm_log.c +12 -0
@@ -160,6 +160,9 @@ static void drm_log_draw_kmsg_record(struct drm_log_scanout *scanout, {u32 prefix_len =0 ; +if (!len) +return ; +if (len >TS_PREFIX_LEN && s[0 ] =='[' && s[6 ] =='.' && s[TS_PREFIX_LEN ] ==']' ) prefix_len =TS_PREFIX_LEN +1 ;
@@ -215,6 +218,12 @@ static int drm_log_setup_modeset(struct drm_client_dev *client, scanout->scaled_font_w = scanout->font->width * scale; scanout->rows = height / scanout->scaled_font_h; scanout->columns = width / scanout->scaled_font_w; +if (!scanout->rows || !scanout->columns) { +drm_client_buffer_delete (scanout->buffer); + scanout->buffer =NULL ; + mode_set->fb =NULL ; +return -EINVAL ; + } scanout->front_color =drm_draw_color_from_xrgb8888 (0xffffff , format); scanout->prefix_color =drm_draw_color_from_xrgb8888 (0x4e9a06 , format);return 0 ;
@@ -419,6 +428,9 @@ void drm_log_register(struct drm_device *dev) {struct drm_log *new; +if (!scale) + scale =1 ; + new =kzalloc_obj (*new);if (!new) goto err_warn;
drivers/gpu/drm/display/drm_hdmi_state_helper.c +2 -1
@@ -1096,7 +1096,8 @@ drm_atomic_helper_connector_hdmi_update_audio_infoframe(struct drm_connector *comutex_lock (&connector->hdmi.infoframes.lock); -memcpy (&infoframe->data, frame,sizeof (infoframe->data)); +BUILD_BUG_ON (sizeof (*frame) >sizeof (infoframe->data)); +memcpy (&infoframe->data, frame,sizeof (*frame)); infoframe->set = true; ret =write_infoframe (connector, &funcs->audio,"Audio" , infoframe);
drivers/gpu/drm/drm_gem_shmem_helper.c +5 -1
@@ -577,9 +577,13 @@ static vm_fault_t try_insert_pfn(struct vm_fault *vmf, unsigned int order, #ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP }else if (order ==PMD_ORDER ) {unsigned long paddr = pfn <<PAGE_SHIFT ; +struct vm_area_struct *vma = vmf->vma; +unsigned long start =ALIGN_DOWN (vmf->address,PMD_SIZE ); +unsigned long end = start +PMD_SIZE ; +bool in_range = vma->vm_start <= start && end <= vma->vm_end;bool aligned = (vmf->address & ~PMD_MASK ) == (paddr & ~PMD_MASK ); -if (aligned && +if (aligned && in_range &&folio_test_pmd_mappable (page_folio (pfn_to_page (pfn)))) {vm_fault_t ret;
drivers/gpu/drm/mediatek/mtk_dsi.c +20 -12
@@ -511,6 +511,7 @@ static void mtk_dsi_config_vdo_timing_per_line_lp(struct mtk_dsi *dsi)u32 delta;struct mtk_phy_timing *timing = &dsi->phy_timing;struct videomode *vm = &dsi->vm; +struct drm_device *drm = dsi->bridge.dev;if (dsi->format ==MIPI_DSI_FMT_RGB565 ) dsi_tmp_buf_bpp =2 ;
@@ -544,7 +545,7 @@ static void mtk_dsi_config_vdo_timing_per_line_lp(struct mtk_dsi *dsi) horizontal_backporch_byte / horizontal_front_back_byte; }else { -DRM_WARN ("HFP + HBP less than d-phy, FPS will under 60Hz\n" ); +drm_warn (drm,"HFP + HBP less than d-phy, FPS will under 60Hz\n" ); } if ((dsi->mode_flags & MIPI_DSI_HS_PKT_END_ALIGNED) &&
@@ -624,12 +625,13 @@ static s32 mtk_dsi_wait_for_irq_done(struct mtk_dsi *dsi, u32 irq_flag, {s32 ret =0 ;unsigned long jiffies =msecs_to_jiffies (timeout); +struct drm_device *drm = dsi->bridge.dev; ret =wait_event_interruptible_timeout (dsi->irq_wait_queue, dsi->irq_data & irq_flag, jiffies);if (ret ==0 ) { -DRM_WARN ("Wait DSI IRQ(0x%08x) Timeout\n" , irq_flag); +drm_warn (drm,"Wait DSI IRQ(0x%08x) Timeout\n" , irq_flag);mtk_dsi_enable (dsi);mtk_dsi_reset_engine (dsi);
@@ -664,9 +666,10 @@ static s32 mtk_dsi_switch_to_cmd_mode(struct mtk_dsi *dsi, u8 irq_flag, u32 t) {mtk_dsi_irq_data_clear (dsi, irq_flag);mtk_dsi_set_cmd_mode (dsi); +struct drm_device *drm = dsi->bridge.dev;if (!mtk_dsi_wait_for_irq_done (dsi, irq_flag, t)) { -DRM_ERROR ("failed to switch cmd mode\n" ); +drm_err (drm,"failed to switch cmd mode\n" );return -ETIME ; }else {return 0 ;
@@ -740,8 +743,6 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi)mtk_dsi_set_vm_cmd (dsi);mtk_dsi_config_vdo_timing (dsi);mtk_dsi_set_interrupt_enable (dsi); -mtk_dsi_lane_ready (dsi); -mtk_dsi_clk_hs_mode (dsi,1 );return 0 ; err_disable_engine_clk:
@@ -849,11 +850,15 @@ static void mtk_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) {struct mtk_dsi *dsi =bridge_to_dsi (bridge); +struct drm_device *drm = bridge->dev;int ret; ret =mtk_dsi_poweron (dsi);if (ret <0 ) -DRM_ERROR ("failed to power on dsi\n" ); +drm_err (drm,"failed to power on dsi\n" ); + +mtk_dsi_lane_ready (dsi); +mtk_dsi_clk_hs_mode (dsi,1 ); } static void mtk_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge,
@@ -916,7 +921,7 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi) ret =drm_simple_encoder_init (drm, &dsi->encoder,DRM_MODE_ENCODER_DSI );if (ret) { -DRM_ERROR ("Failed to encoder init to drm\n" ); +drm_err (drm,"Failed to encoder init to drm\n" );return ret; }
@@ -932,7 +937,7 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi) dsi->connector =drm_bridge_connector_init (drm, &dsi->encoder);if (IS_ERR (dsi->connector)) { -DRM_ERROR ("Unable to create bridge connector\n" ); +drm_err (drm,"Unable to create bridge connector\n" ); ret =PTR_ERR (dsi->connector); goto err_cleanup_encoder; }
@@ -985,6 +990,7 @@ static int mtk_dsi_host_attach(struct mipi_dsi_host *host, {struct mtk_dsi *dsi =host_to_dsi (host);struct device *dev = host->dev; +struct drm_device *drm = dsi->bridge.dev;int ret; dsi->lanes = device->lanes;
@@ -1006,7 +1012,7 @@ static int mtk_dsi_host_attach(struct mipi_dsi_host *host, ret =component_add (host->dev, &mtk_dsi_component_ops);if (ret) { -DRM_ERROR ("failed to add dsi_host component: %d\n" , ret); +drm_err (drm,"failed to add dsi_host component: %d\n" , ret);drm_bridge_remove (&dsi->bridge);return ret; }
@@ -1028,11 +1034,12 @@ static void mtk_dsi_wait_for_idle(struct mtk_dsi *dsi) {int ret;u32 val; +struct drm_device *drm = dsi->bridge.dev; ret =readl_poll_timeout (dsi->regs +DSI_INTSTA , val, !(val &DSI_BUSY ),4 ,2000000 );if (ret) { -DRM_WARN ("polling dsi wait not busy timeout!\n" ); +drm_warn (drm,"polling dsi wait not busy timeout!\n" );mtk_dsi_enable (dsi);mtk_dsi_reset_engine (dsi);
@@ -1120,6 +1127,7 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host, const struct mipi_dsi_msg *msg) {struct mtk_dsi *dsi =host_to_dsi (host); +struct drm_device *drm = dsi->bridge.dev;ssize_t recv_cnt;u8 read_data[16 ];void *src_addr;
@@ -1150,7 +1158,7 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host, }if (!msg->rx_buf) { -DRM_ERROR ("dsi receive buffer size may be NULL\n" ); +drm_err (drm,"dsi receive buffer size may be NULL\n" ); ret = -EINVAL ; goto restore_dsi_mode; }
@@ -1174,7 +1182,7 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,if (recv_cnt)memcpy (msg->rx_buf, src_addr, recv_cnt); -DRM_INFO ("dsi get %zd byte data from the panel address(0x%x)\n" , +drm_info (drm,"dsi get %zd byte data from the panel address(0x%x)\n" , recv_cnt, *((u8 *)(msg->tx_buf))); restore_dsi_mode:
drivers/gpu/drm/panthor/panthor_fw.c +3 -0
@@ -600,6 +600,9 @@ static int panthor_fw_load_section_entry(struct panthor_device *ptdev,return -EINVAL ; } +if (!section_size) +return 0 ; + name_len = iter->size - iter->offset; section =drmm_kzalloc (&ptdev->base,sizeof (*section),GFP_KERNEL );
drivers/gpu/drm/radeon/radeon_fence.c +7 -0
@@ -360,6 +360,13 @@ static bool radeon_fence_is_signaled(struct dma_fence *f)if (atomic64_read (&rdev->fence_drv[ring].last_seq) >= seq)return true; +if (down_read_trylock (&rdev->exclusive_lock)) { +radeon_fence_activity (rdev, ring); +up_read (&rdev->exclusive_lock); + +if (atomic64_read (&rdev->fence_drv[ring].last_seq) >= seq) +return true; + }return false; }
drivers/gpu/drm/radeon/radeon_kms.c +1 -0
@@ -71,6 +71,7 @@ void radeon_driver_unload_kms(struct drm_device *dev)if (radeon_is_px (dev)) {pm_runtime_get_sync (dev->dev);pm_runtime_forbid (dev->dev); +pm_runtime_dont_use_autosuspend (dev->dev); }radeon_acpi_fini (rdev);
drivers/gpu/drm/xe/xe_bo.h +14 -0
@@ -6,6 +6,7 @@#ifndef _XE_BO_H_#define _XE_BO_H_ +#include <drm/drm_prime.h> #include <drm/ttm/ttm_tt.h> #include "xe_bo_types.h"
@@ -548,6 +549,19 @@ void xe_bo_dev_fini(struct xe_bo_dev *bo_device);struct sg_table *xe_bo_sg (struct xe_bo *bo); +/** +* xe_bo_sg_is_contiguous() - Check if a BO's DMA address space is contiguous. +* @bo: the BO to check (must have a valid sg table, i.e. !xe_bo_is_vram()) +* @len: required contiguous length in bytes +* +* Returns true if the first @len bytes of the BO are mapped to a contiguous +* DMA address range. +*/ +static inline bool xe_bo_sg_is_contiguous (struct xe_bo *bo,size_t len) +{ +return drm_prime_get_contiguous_size (xe_bo_sg (bo)) >= len; +} +/* * xe_sg_segment_size() - Provides upper limit for sg segment size. * @dev: device pointer
drivers/gpu/drm/xe/xe_device.c +5 -1
@@ -1043,7 +1043,11 @@ int xe_device_probe(struct xe_device *xe)if (err) goto err_unregister_display; -return devm_add_action_or_reset (xe->drm.dev, xe_device_sanitize, xe); + err =devm_add_action_or_reset (xe->drm.dev, xe_device_sanitize, xe); +if (err) + goto err_unregister_display; + +return 0 ; err_unregister_display:xe_display_unregister (xe);
drivers/gpu/drm/xe/xe_guc_ads.c +61 -32
140 lines not on this page · raw message
drivers/gpu/drm/xe/xe_guc_ads_types.h +5 -0
@@ -16,6 +16,11 @@ struct xe_bo;struct xe_guc_ads {/** @bo: Xe BO for GuC ads blob */ struct xe_bo *bo; +/** +* @um_queue_bo: Dedicated BO for the HW fault ring (UM queues). +* NULL if the platform does not support USM. +*/ +struct xe_bo *um_queue_bo;/** @golden_lrc_size: golden LRC size */ size_t golden_lrc_size;/** @regset_size: size of register set passed to GuC for save/restore */
drivers/gpu/drm/xe/xe_guc_pc.c +39 -4
60 lines not on this page · raw message
drivers/gpu/drm/xe/xe_lrc.c +7 -0
@@ -1820,6 +1820,13 @@ void xe_lrc_write_ring(struct xe_lrc *lrc, const void *data, size_t size)__xe_lrc_write_ring (lrc, ring, &noop,sizeof (noop)); } + +/* +* The ring and the LRC context image are both WC, so the ring tail +* update which publishes these writes can become visible to the device +* first. Ensure the ring contents are visible before returning. +*/ +xe_device_wmb (xe); }u64 xe_lrc_descriptor (struct xe_lrc *lrc)
drivers/gpu/drm/xe/xe_oa.c +9 -4
@@ -1568,6 +1568,10 @@ static long xe_oa_config_locked(struct xe_oa_stream *stream, u64 arg) config =xchg (&stream->oa_config, config);drm_dbg (&stream->oa->xe->drm,"changed to oa config uuid=%s\n" , stream->oa_config->uuid); + }else { +while (param.num_syncs--) +xe_sync_entry_cleanup (¶m.syncs[param.num_syncs]); +kfree (param.syncs); } err_config_put:
@@ -2691,9 +2695,7 @@ static int xe_oa_init_gt(struct xe_gt *gt)__xe_oa_init_oa_units (gt); -drmm_mutex_init (>_to_xe (gt)->drm, >->oa.gt_lock); - -return 0 ; +return drmm_mutex_init (>_to_xe (gt)->drm, >->oa.gt_lock); }static void xe_oa_print_gt_oa_units (struct xe_gt *gt)
@@ -2833,7 +2835,10 @@ int xe_oa_init(struct xe_device *xe) oa->xe = xe; oa->oa_formats = oa_formats; -drmm_mutex_init (&oa->xe->drm, &oa->metrics_lock); + ret =drmm_mutex_init (&oa->xe->drm, &oa->metrics_lock); +if (ret) + goto exit; +idr_init_base (&oa->metrics_idr,1 ); ret =xe_oa_init_oa_units (oa);
drivers/gpu/drm/xe/xe_pxp.c +120 -42
275 lines not on this page · raw message
drivers/gpu/drm/xe/xe_pxp_types.h +19 -8
@@ -85,17 +85,20 @@ struct xe_pxp {/** @gsc_res: kernel-owned objects for PXP submissions to the GSCCS */ struct xe_pxp_gsc_client_resources gsc_res; -/** @irq: wrapper for the worker and queue used for PXP irq support */ +/** @events: wrapper for the worker and queue used for PXP event handling */ struct { -/** @irq.work: worker that manages irq events. */ +/** @events.work: worker that manages termination events. */ struct work_struct work; -/** @irq.wq: workqueue on which to queue the irq work. */ +/** @events.wq: workqueue on which to queue the work. */ struct workqueue_struct *wq; -/** @irq.events: pending events, protected with xe->irq.lock. */ -u32 events; -#define PXP_TERMINATION_REQUEST BIT(0) -#define PXP_TERMINATION_COMPLETE BIT(1) - } irq; +/** @events.pending: pending events */ +atomic_t pending; +#define PXP_TERMINATION_REQUEST_IRQ BIT(0) +#define PXP_TERMINATION_REQUEST_ON_RESUME BIT(1) +#define PXP_TERMINATION_REQUEST (PXP_TERMINATION_REQUEST_IRQ | \ + PXP_TERMINATION_REQUEST_ON_RESUME) +#define PXP_TERMINATION_COMPLETE_IRQ BIT(2) + } events;/** @mutex: protects the pxp status and the queue list */ struct mutex mutex;
@@ -130,6 +133,14 @@ struct xe_pxp {* suspend cycles. */ u32 last_suspend_key_instance; +/** +* @needs_termination_on_resume: indicates if PXP termination is needed +* on resume. This is set if PXP was active when we suspend and it is +* cleared when we queue the termination on resume. Since the suspend +* and resume calls cannot execute at the same time, this variable does +* not need to be protected by the PXP lock. +*/ + bool needs_termination_on_resume; };#endif /* __XE_PXP_TYPES_H__ */
drivers/input/joystick/iforce/iforce-packets.c +10 -1
@@ -155,6 +155,9 @@ void iforce_process_packet(struct iforce *iforce,switch (packet_id) {case 0x01 :/* joystick position data */ +if (len <7 ) +break ; +input_report_abs (dev,ABS_X , (__s16 )get_unaligned_le16 (data)); input_report_abs(dev, ABS_Y,
@@ -170,6 +173,9 @@ void iforce_process_packet(struct iforce *iforce,break ;case 0x03 :/* wheel position data */ +if (len <7 ) +break ; +input_report_abs (dev,ABS_WHEEL , (__s16 )get_unaligned_le16 (data));input_report_abs (dev,ABS_GAS ,255 - data[2 ]);
@@ -181,6 +187,9 @@ void iforce_process_packet(struct iforce *iforce,break ;case 0x02 :/* status report */ +if (len <2 ) +break ; +input_report_key (dev,BTN_DEAD , data[0 ] &0x02 );input_sync (dev);
@@ -200,7 +209,7 @@ void iforce_process_packet(struct iforce *iforce, } } -for (j =3 ; j < len; j +=2 ) +for (j =3 ; j +sizeof (u16) <= len; j +=sizeof (u16))mark_core_as_ready (iforce,get_unaligned_le16 (data + j));break ;
drivers/input/joystick/iforce/iforce-usb.c +3 -0
@@ -158,6 +158,9 @@ static void iforce_usb_irq(struct urb *urb) goto exit; } +if (!urb->actual_length) + goto exit; +iforce_process_packet (iforce, iforce_usb->data_in[0 ], iforce_usb->data_in +1 , urb->actual_length -1 );
drivers/input/joystick/psxpad-spi.c +1 -0
@@ -373,6 +373,7 @@ static int psxpad_spi_probe(struct spi_device *spi)return err; } +spi_set_drvdata (spi, pad);pm_runtime_enable (&spi->dev);return 0 ;
drivers/input/joystick/xpad.c +2 -0
@@ -394,6 +394,7 @@ static const struct xpad_device { { 0x3285, 0x0646, "Nacon Pro Compact", 0, XTYPE_XBOXONE }, { 0x3285, 0x0662, "Nacon Revolution5 Pro", 0, XTYPE_XBOX360 }, { 0x3285, 0x0663, "Nacon Evol-X", 0, XTYPE_XBOXONE }, + { 0x3507, 0x000b, "ZENAIM LEVERLESS", 0, XTYPE_XBOX360 }, { 0x3537, 0x1004, "GameSir T4 Kaleid", 0, XTYPE_XBOX360 }, { 0x3537, 0x100f, "GameSir Nova 2 Lite", 0, XTYPE_XBOX360 }, { 0x3537, 0x1010, "GameSir G7 SE", 0, XTYPE_XBOXONE },
@@ -557,6 +558,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOX360_VENDOR (0x31e3 ),/* Wooting Keyboards */ XPAD_XBOX360_VENDOR (0x3285 ),/* Nacon GC-100 */ XPAD_XBOXONE_VENDOR (0x3285 ),/* Nacon Evol-X */ +XPAD_XBOX360_VENDOR (0x3507 ),/* ZENAIM Controllers */ XPAD_XBOX360_VENDOR (0x3537 ),/* GameSir Controllers */ XPAD_XBOXONE_VENDOR (0x3537 ),/* GameSir Controllers */ XPAD_XBOX360_VENDOR(0x3651), /* CRKD Controllers */
drivers/input/keyboard/atkbd.c +18 -2
@@ -1916,6 +1916,13 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { }, .callback = atkbd_deactivate_fixup, }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HONOR" ), + DMI_MATCH(DMI_PRODUCT_NAME, "BCC-N"), + }, + .callback = atkbd_deactivate_fixup, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "HONOR"),
@@ -1923,6 +1930,14 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { }, .callback = atkbd_deactivate_fixup, }, + { +/* HONOR MagicBook Pro 14 2026 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HONOR" ), + DMI_MATCH(DMI_PRODUCT_NAME, "ZQC-P"), + }, + .callback = atkbd_deactivate_fixup, + }, {/* Lenovo Yoga Air 14 (83QK) */ .matches = {
@@ -1932,9 +1947,10 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { .callback = atkbd_deactivate_fixup, }, { + /* Xiaomi Book Pro 14 (TM2424) */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "HONOR"), - DMI_MATCH(DMI_PRODUCT_NAME, "BCC-N"), + DMI_MATCH(DMI_SYS_VENDOR, "XIAOMI"), + DMI_MATCH(DMI_PRODUCT_NAME, "Xiaomi Book Pro 14"), }, .callback = atkbd_deactivate_fixup, },
drivers/input/misc/cs40l50-vibra.c +8 -2
@@ -139,10 +139,10 @@ static struct cs40l50_effect *cs40l50_find_effect(int id, struct list_head *effestatic int cs40l50_effect_bank_set (struct cs40l50_work *work_data,struct cs40l50_effect *effect) { -s16 bank_type = work_data->custom_data[0 ] &CS40L50_CUSTOM_DATA_MASK ; +u32 bank_type = work_data->custom_data[0 ] &CS40L50_CUSTOM_DATA_MASK ;if (bank_type >=CS40L50_WVFRM_BANK_NUM ) { -dev_err (work_data->vib->dev,"Invalid bank (%d)\n" , bank_type); +dev_err (work_data->vib->dev,"Invalid bank (%u)\n" , bank_type);return -EINVAL ; }
@@ -326,6 +326,12 @@ static int cs40l50_add(struct input_dev *dev, struct ff_effect *effect,return -EINVAL ; } +if (periodic->custom_len <CS40L50_OWT_CUSTOM_DATA_SIZE ) { +dev_err (vib->dev,"Invalid custom data length (%u)\n" , + periodic->custom_len); +return -EINVAL ; + } + work_data.custom_data =memdup_array_user (effect->u.periodic.custom_data, effect->u.periodic.custom_len,sizeof (s16));
drivers/input/mouse/byd.c +1 -1
@@ -423,7 +423,7 @@ static void byd_disconnect(struct psmouse *psmouse)struct byd_data *priv = psmouse->private;if (priv) { -timer_delete (&priv->timer); +timer_shutdown_sync (&priv->timer);kfree (psmouse->private); psmouse->private =NULL ; }
drivers/input/mouse/focaltech.c +1 -1
@@ -197,7 +197,7 @@ static void focaltech_process_rel_packet(struct psmouse *psmouse, {struct focaltech_data *priv = psmouse->private;struct focaltech_hw_state *state = &priv->state; -int finger1, finger2; +unsigned int finger1, finger2; state->pressed = packet[0 ] >>7 ; finger1 = ((packet[0 ] >>4 ) &0x7 ) -1 ;
drivers/input/rmi4/rmi_f54.c +32 -11
104 lines not on this page · raw message
drivers/input/rmi4/rmi_f55.c +2 -2
@@ -54,10 +54,10 @@ static int rmi_f55_detect(struct rmi_function *fn) f55->num_tx_electrodes = f55->qry[F55_NUM_TX_OFFSET ]; f55->cfg_num_rx_electrodes = f55->num_rx_electrodes; - f55->cfg_num_tx_electrodes = f55->num_rx_electrodes; + f55->cfg_num_tx_electrodes = f55->num_tx_electrodes; drv_data->num_rx_electrodes = f55->cfg_num_rx_electrodes; - drv_data->num_tx_electrodes = f55->cfg_num_rx_electrodes; + drv_data->num_tx_electrodes = f55->cfg_num_tx_electrodes;if (f55->qry[F55_PHYS_CHAR_OFFSET ] &F55_CAP_SENSOR_ASSIGN ) {int i, total;
drivers/input/touchscreen/hynitron_cstxxx.c +10 -3
@@ -313,6 +313,12 @@ static void cst3xx_touch_report(struct i2c_client *client)return ; touch_cnt = buf[5 ] &CST3XX_TOUCH_COUNT_MASK ; +if (touch_cnt > ts_data->chip->max_touch_num) { +dev_err (&client->dev,"cst3xx invalid touch count (%d vs %d max)\n" , + touch_cnt, ts_data->chip->max_touch_num); +return ; + } +/* * Check the check bit of the last touch slot. The check bit is * always present after touch point 1 for valid data, and then
@@ -335,9 +341,10 @@ static void cst3xx_touch_report(struct i2c_client *client) finger_id = (buf[idx] >>4 ) &0x0f ;/* Sanity check we don't have more fingers than we expect */ -if (ts_data->chip->max_touch_num < finger_id) { -dev_err (&client->dev,"cst3xx touch read failure\n" ); -break ; +if (finger_id >= ts_data->chip->max_touch_num) { +dev_err (&client->dev, +"cst3xx invalid finger id %d\n" , finger_id); +return ; }/* sw value of 0 means no touch, 0x03 means touch */
drivers/input/touchscreen/sur40.c +13 -10
@@ -725,21 +725,13 @@ static int sur40_probe(struct usb_interface *interface, goto err_free_input; } -/* register the polled input device */ - error =input_register_device (input); -if (error) { -dev_err (&interface->dev, -"Unable to register polled input device." ); - goto err_free_buffer; - } -/* register the video master device */ snprintf (sur40->v4l2.name,sizeof (sur40->v4l2.name),"%s" ,DRIVER_LONG ); error =v4l2_device_register (sur40->dev, &sur40->v4l2);if (error) {dev_err (&interface->dev,"Unable to register video master device." ); - goto err_unreg_v4l2; + goto err_free_buffer; }/* initialize the lock and subdevice */
@@ -795,6 +787,14 @@ static int sur40_probe(struct usb_interface *interface,if (error) {dev_err (&interface->dev,"Unable to register video subdevice." ); + goto err_free_ctrl; + } + +/* register the polled input device */ + error =input_register_device (input); +if (error) { +dev_err (&interface->dev, +"Unable to register polled input device." ); goto err_unreg_video; }
@@ -806,6 +806,8 @@ static int sur40_probe(struct usb_interface *interface, err_unreg_video:video_unregister_device (&sur40->vdev); +err_free_ctrl: +v4l2_ctrl_handler_free (&sur40->hdl); err_unreg_v4l2:v4l2_device_unregister (&sur40->v4l2); err_free_buffer:
@@ -823,11 +825,12 @@ static void sur40_disconnect(struct usb_interface *interface) {struct sur40_state *sur40 =usb_get_intfdata (interface); +input_unregister_device (sur40->input); +v4l2_ctrl_handler_free (&sur40->hdl);video_unregister_device (&sur40->vdev);v4l2_device_unregister (&sur40->v4l2); -input_unregister_device (sur40->input);kfree (sur40->bulk_in_buffer);kfree (sur40);
drivers/mmc/host/atmel-mci.c +2 -0
@@ -2610,6 +2610,8 @@ static void atmci_remove(struct platform_device *pdev)free_irq (platform_get_irq (pdev,0 ), host); +cancel_work_sync (&host->bh_work); +clk_disable_unprepare (host->mck);pm_runtime_disable (dev);
drivers/mmc/host/loongson2-mmc.c +4 -4
@@ -641,8 +641,8 @@ static void ls2k0500_mmc_reorder_cmd_data(struct loongson2_mmc_host *host,return ;for_each_sg (cmd->data->sg, sg, cmd->data->sg_len, i) { - data =sg_virt (&sg[i]); -for (j =0 ; j < (sg_dma_len (&sg[i]) /4 ); j++) + data =sg_virt (sg); +for (j =0 ; j < (sg_dma_len (sg) /4 ); j++)if (cmd->opcode ==SD_SWITCH ) data[j] =bitrev8x4 (data[j]);else
@@ -758,8 +758,8 @@ static void ls2k2000_mmc_reorder_cmd_data(struct loongson2_mmc_host *host,return ;for_each_sg (cmd->data->sg, sg, cmd->data->sg_len, i) { - data =sg_virt (&sg[i]); -for (j =0 ; j < (sg_dma_len (&sg[i]) /4 ); j++) + data =sg_virt (sg); +for (j =0 ; j < (sg_dma_len (sg) /4 ); j++) data[j] =bitrev8x4 (data[j]); } }
drivers/mmc/host/omap_hsmmc.c +1 -1
@@ -1357,7 +1357,7 @@ omap_hsmmc_prepare_data(struct omap_hsmmc_host *host, struct mmc_request *req)if (req->data ==NULL ) {OMAP_HSMMC_WRITE (host->base,BLK ,0 );if (req->cmd->flags &MMC_RSP_BUSY ) { - timeout = req->cmd->busy_timeout *NSEC_PER_MSEC ; + timeout = (u64 )req->cmd->busy_timeout *NSEC_PER_MSEC ;/* * Set an arbitrary 100ms data timeout for commands with
drivers/mmc/host/sdhci.c +16 -0
@@ -4187,6 +4187,14 @@ void __sdhci_read_caps(struct sdhci_host *host, const u16 *ver, }EXPORT_SYMBOL_GPL (__sdhci_read_caps); +static void sdhci_unmap_bounce_buffer (void *data) +{ +struct sdhci_host *host = data; + +dma_unmap_single (mmc_dev (host->mmc), host->bounce_addr, + host->bounce_buffer_size,DMA_BIDIRECTIONAL ); +} +static void sdhci_allocate_bounce_buffer (struct sdhci_host *host) {struct mmc_host *mmc = host->mmc;
@@ -4247,6 +4255,14 @@ static void sdhci_allocate_bounce_buffer(struct sdhci_host *host) } host->bounce_buffer_size = bounce_size; + ret =devm_add_action_or_reset (mmc_dev (mmc), + sdhci_unmap_bounce_buffer, host); +if (ret) { +devm_kfree (mmc_dev (mmc), host->bounce_buffer); + host->bounce_buffer =NULL ; + host->bounce_buffer_size =0 ; +return ; + } out:/* Lie about this since we're bouncing */
drivers/mmc/host/sdhci.h +1 -1
@@ -659,7 +659,7 @@ struct sdhci_host {unsigned int tuning_count;/* Timer count for re-tuning */ unsigned int tuning_mode;/* Re-tuning mode supported by host */ -unsigned int tuning_err;/* Error code for re-tuning */ +int tuning_err;/* Error code for re-tuning */ #define SDHCI_TUNING_MODE_1 0#define SDHCI_TUNING_MODE_2 1#define SDHCI_TUNING_MODE_3 2
drivers/net/ethernet/broadcom/bnxt/bnxt.c +90 -43
214 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnxt/bnxt.h +3 -0
@@ -1268,6 +1268,8 @@ struct bnxt_irq {struct bnxt *bp;int msix_nr;int ring_nr; +u16 tag; +u16 new_tag;struct irq_affinity_notify affinity_notify; };
@@ -2644,6 +2646,7 @@ struct bnxt {#define BNXT_RING_COAL_NOW_SP_EVENT 17#define BNXT_FW_RESET_NOTIFY_SP_EVENT 18#define BNXT_FW_EXCEPTION_SP_EVENT 19 +#define BNXT_TPH_UPDATE_SP_EVENT 20#define BNXT_LINK_CFG_CHANGE_SP_EVENT 21#define BNXT_THERMAL_THRESHOLD_SP_EVENT 22#define BNXT_FW_ECHO_REQUEST_SP_EVENT 23
drivers/net/ethernet/google/gve/gve_ptp.c +6 -0
@@ -26,6 +26,11 @@ int gve_clock_nic_ts_read(struct gve_priv *priv)return 0 ; } +static int gve_ptp_adjfine (struct ptp_clock_info *ptp,long scaled_ppm) +{ +return -EOPNOTSUPP ; +} +static int gve_ptp_gettimex64 (struct ptp_clock_info *info,struct timespec64 *ts,struct ptp_system_timestamp *sts)
@@ -60,6 +65,7 @@ static long gve_ptp_do_aux_work(struct ptp_clock_info *info)static const struct ptp_clock_info gve_ptp_caps = { .owner =THIS_MODULE , .name ="gve clock" , + .adjfine = gve_ptp_adjfine, .gettimex64 = gve_ptp_gettimex64, .settime64 = gve_ptp_settime64, .do_aux_work = gve_ptp_do_aux_work,
drivers/net/ethernet/google/gve/gve_rx_dqo.c +5 -0
@@ -886,6 +886,11 @@ static int gve_rx_dqo(struct napi_struct *napi, struct gve_rx_ring *rx, rx->rx_hsplit_unsplit_pkt += unsplit; rx->rx_hsplit_bytes += hdr_len;u64_stats_update_end (&rx->statss); + +if (!buf_len) { +gve_free_buffer (rx, buf_state); +return 0 ; + } }else if (!rx->ctx.skb_head && rx->dqo.page_pool &&netmem_is_net_iov (buf_state->page_info.netmem)) {/* when header split is disabled, the header went to the packet
drivers/net/ethernet/ti/am65-cpsw-nuss.c +2 -0
@@ -1312,6 +1312,8 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_rx_flow *flow,k3_udma_glue_rx_cppi5_to_dma_addr (rx_chn->rx_chn, &buf_dma); pkt_len =cppi5_hdesc_get_pktlen (desc_rx);cppi5_desc_get_tags_ids (&desc_rx->hdr, &port_id,NULL ); +/* Port ID is contained in the lower 8-bits of the 16-bit Source Tag */ + port_id &=0xFF ;dev_dbg (dev,"%s rx port_id:%d\n" , __func__, port_id); port =am65_common_get_port (common, port_id); ndev = port->ndev;
drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +3 -1
@@ -180,8 +180,10 @@ static void ngbe_irq_enable(struct wx *wx, bool queues)/* mask interrupt */ if (queues)wx_intr_enable (wx,NGBE_INTR_ALL ); -else +else if (wx->pdev->msix_enabled)wx_intr_enable (wx,NGBE_INTR_MISC (wx)); +else +wx_intr_enable (wx,BIT (0 )); }/**
drivers/net/ipvlan/ipvlan_main.c +4 -0
@@ -146,6 +146,8 @@ static int ipvlan_init(struct net_device *dev) dev->lltx = true;netif_inherit_tso_max (dev, phy_dev); dev->hard_header_len = phy_dev->hard_header_len; + dev->needed_headroom = phy_dev->needed_headroom; + dev->needed_tailroom = phy_dev->needed_tailroom;netdev_lockdep_set_classes (dev);
@@ -773,6 +775,8 @@ static int ipvlan_device_event(struct notifier_block *unused,case NETDEV_FEAT_CHANGE :list_for_each_entry (ipvlan, &port->ipvlans, pnode) {netif_inherit_tso_max (ipvlan->dev, dev); + ipvlan->dev->needed_headroom = dev->needed_headroom; + ipvlan->dev->needed_tailroom = dev->needed_tailroom;netdev_update_features (ipvlan->dev); }break ;
drivers/net/macvlan.c +4 -0
@@ -950,6 +950,8 @@ static int macvlan_init(struct net_device *dev) dev->lltx = true;netif_inherit_tso_max (dev, lowerdev); dev->hard_header_len = lowerdev->hard_header_len; + dev->needed_headroom = lowerdev->needed_headroom; + dev->needed_tailroom = lowerdev->needed_tailroom;macvlan_set_lockdep_class (dev); vlan->pcpu_stats = netdev_alloc_pcpu_stats(struct vlan_pcpu_stats);
@@ -1824,6 +1826,8 @@ static int macvlan_device_event(struct notifier_block *unused,case NETDEV_FEAT_CHANGE :list_for_each_entry (vlan, &port->vlans, list) {netif_inherit_tso_max (vlan->dev, dev); + vlan->dev->needed_headroom = dev->needed_headroom; + vlan->dev->needed_tailroom = dev->needed_tailroom;netdev_update_features (vlan->dev); }break ;
drivers/net/ovpn/crypto.c +11 -15
@@ -18,20 +18,12 @@#include "crypto_aead.h" #include "crypto.h" -static void ovpn_ks_destroy_rcu (struct rcu_head *head) -{ -struct ovpn_crypto_key_slot *ks; - - ks = container_of(head, struct ovpn_crypto_key_slot, rcu); -ovpn_aead_crypto_key_slot_destroy (ks); -} -void ovpn_crypto_key_slot_release (struct kref *kref) {struct ovpn_crypto_key_slot *ks; ks = container_of(kref, struct ovpn_crypto_key_slot, refcount); -call_rcu (&ks->rcu, ovpn_ks_destroy_rcu); +queue_rcu_work (ovpn_wq, &ks->free_work); }/* can only be invoked when all peer references have been dropped (i.e. RCU
@@ -58,15 +50,19 @@ void ovpn_crypto_state_release(struct ovpn_crypto_state *cs)bool ovpn_crypto_kill_key (struct ovpn_crypto_state *cs,u8 key_id) {struct ovpn_crypto_key_slot *ks =NULL ; +struct ovpn_crypto_key_slot *tmp; +int slot =0 ;spin_lock_bh (&cs->lock); -if (rcu_access_pointer (cs->slots[0 ])->key_id == key_id) { - ks =rcu_replace_pointer (cs->slots[0 ],NULL , -lockdep_is_held (&cs->lock)); - }else if (rcu_access_pointer (cs->slots[1 ])->key_id == key_id) { - ks =rcu_replace_pointer (cs->slots[1 ],NULL , -lockdep_is_held (&cs->lock)); + tmp =rcu_access_pointer (cs->slots[slot]); +if (!tmp || tmp->key_id != key_id) { + slot =1 ; + tmp =rcu_access_pointer (cs->slots[slot]); } + +if (tmp && tmp->key_id == key_id) + ks =rcu_replace_pointer (cs->slots[slot],NULL , +lockdep_is_held (&cs->lock));spin_unlock_bh (&cs->lock);if (ks)
drivers/net/ovpn/crypto.h +3 -1
@@ -10,6 +10,8 @@#ifndef _NET_OVPN_OVPNCRYPTO_H_#define _NET_OVPN_OVPNCRYPTO_H_ +#include <linux/workqueue.h> +#include "pktid.h" #include "proto.h"
@@ -45,8 +47,8 @@ struct ovpn_crypto_key_slot {struct ovpn_pktid_recv pid_recv____cacheline_aligned_in_smp ;struct ovpn_pktid_xmit pid_xmit____cacheline_aligned_in_smp ; +struct rcu_work free_work;struct kref refcount;
Lines of this file are not shown. View the raw message.
drivers/pmdomain/arm/scmi_perf_domain.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/pmdomain/mediatek/mt8183-pm-domains.h +5 -2
Lines of this file are not shown. View the raw message.
drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/pmdomain/mediatek/mtk-pm-domains.c +15 -15
Lines of this file are not shown. View the raw message.
drivers/regulator/fp9931.c +12 -42
54 lines not on this page · raw message
drivers/s390/cio/vfio_ccw_cp.c +55 -19
74 lines not on this page · raw message
drivers/s390/crypto/zcrypt_msgtype6.c +253 -113
366 lines not on this page · raw message
fs/xfs/scrub/agheader_repair.c +125 -27
152 lines not on this page · raw message
fs/xfs/scrub/rtbitmap_repair.c +28 -18
46 lines not on this page · raw message
fs/xfs/xfs_buf_item_recover.c +41 -16
57 lines not on this page · raw message
net/l2tp/l2tp_ppp.c +53 -3
56 lines not on this page · raw message
net/mptcp/options.c +65 -2
67 lines not on this page · raw message
net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
Lines of this file are not shown. View the raw message.
net/sctp/auth.c +75 -0
75 lines not on this page · raw message
sound/soc/intel/common/sof-function-topology-lib.c +6 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc +25 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/net/mptcp/mptcp_join.sh +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.