Linux 6.12.17
Greg Kroah-Hartman
maintainerI'm announcing the release of the 6.12.17 kernel.
All users of the 6.12 kernel series must upgrade.
The updated 6.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.12.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
------------
Documentation/networking/strparser.rst | 9 Makefile | 2 arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 123 + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 1 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts | 1 arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 6 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts | 6 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 22 arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 4 arch/arm64/include/asm/mman.h | 9 arch/powerpc/include/asm/book3s/64/hash-4k.h | 12 arch/powerpc/lib/code-patching.c | 4 arch/s390/boot/startup.c | 2 arch/x86/events/intel/core.c | 20 arch/x86/events/intel/ds.c | 2 arch/x86/kvm/lapic.c | 11 arch/x86/kvm/lapic.h | 8 arch/x86/kvm/vmx/nested.c | 5 arch/x86/kvm/vmx/vmx.c | 21 arch/x86/kvm/vmx/vmx.h | 1 arch/x86/kvm/x86.c | 17 drivers/accel/ivpu/Kconfig | 1 drivers/accel/ivpu/Makefile | 1 drivers/accel/ivpu/ivpu_coredump.c | 39 drivers/accel/ivpu/ivpu_coredump.h | 25 drivers/accel/ivpu/ivpu_drv.c | 5 drivers/accel/ivpu/ivpu_drv.h | 1 drivers/accel/ivpu/ivpu_fw.c | 7 drivers/accel/ivpu/ivpu_fw.h | 6 drivers/accel/ivpu/ivpu_fw_log.h | 8 drivers/accel/ivpu/ivpu_hw.c | 3 drivers/accel/ivpu/ivpu_ipc.c | 26 drivers/accel/ivpu/ivpu_ipc.h | 2 drivers/accel/ivpu/ivpu_jsm_msg.c | 8 drivers/accel/ivpu/ivpu_jsm_msg.h | 2 drivers/accel/ivpu/ivpu_pm.c | 85 drivers/bluetooth/btqca.c | 118 - drivers/clocksource/jcore-pit.c | 15 drivers/edac/qcom_edac.c | 4 drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 4 drivers/firmware/imx/Kconfig | 1 drivers/gpio/gpiolib.c | 48 drivers/gpio/gpiolib.h | 4 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 32 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 3 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 202 - drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 1130 ++++++++++ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 2 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 5 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 6 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c | 140 + drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 133 - drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h | 4 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 59 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c | 3 drivers/gpu/drm/i915/display/intel_ddi.c | 2 drivers/gpu/drm/i915/display/intel_display.c | 18 drivers/gpu/drm/i915/display/intel_dp_link_training.c | 15 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 2 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 2 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 2 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 3 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 2 drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 53 drivers/gpu/drm/msm/msm_drv.h | 11 drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 11 drivers/gpu/drm/nouveau/nouveau_svm.c | 9 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 8 drivers/gpu/drm/xe/xe_oa.c | 265 +- drivers/gpu/drm/xe/xe_oa_types.h | 6 drivers/gpu/drm/xe/xe_query.c | 2 drivers/gpu/drm/xe/xe_ring_ops.c | 5 drivers/gpu/drm/xe/xe_sched_job_types.h | 2 drivers/input/mouse/synaptics.c | 56 drivers/input/mouse/synaptics.h | 1 drivers/irqchip/irq-gic-v3.c | 53 drivers/irqchip/irq-jcore-aic.c | 2 drivers/md/raid0.c | 4 drivers/md/raid1.c | 4 drivers/md/raid10.c | 4 drivers/mtd/nand/raw/cadence-nand-controller.c | 42 drivers/mtd/spi-nor/sst.c | 2 drivers/net/ethernet/google/gve/gve.h | 10 drivers/net/ethernet/google/gve/gve_main.c | 6 drivers/net/ethernet/ibm/ibmvnic.c | 27 drivers/net/ethernet/ibm/ibmvnic.h | 3 drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 2 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 drivers/net/geneve.c | 16 drivers/net/gtp.c | 5 drivers/net/pse-pd/pd692x0.c | 45 drivers/net/pse-pd/pse_core.c | 94 drivers/nvme/host/ioctl.c | 3 drivers/nvme/host/tcp.c | 7 drivers/pci/devres.c | 61 drivers/pci/pci.c | 16 drivers/platform/cznic/Kconfig | 1 drivers/power/supply/axp20x_battery.c | 31 drivers/power/supply/da9150-fg.c | 4 drivers/s390/net/ism_drv.c | 14 drivers/soc/loongson/loongson2_guts.c | 5 drivers/tee/optee/supp.c | 35 drivers/usb/gadget/function/f_midi.c | 2 fs/btrfs/compression.c | 3 fs/btrfs/extent_io.c | 174 + fs/btrfs/inode.c | 3 fs/btrfs/subpage.c | 202 - fs/btrfs/subpage.h | 39 fs/smb/client/inode.c | 4 fs/smb/client/smb2ops.c | 4 fs/xfs/scrub/common.h | 5 fs/xfs/scrub/repair.h | 11 fs/xfs/scrub/scrub.c | 12 include/linux/netdevice.h | 2 include/linux/pci.h | 2 include/linux/pse-pd/pse.h | 16 include/linux/serio.h | 3 include/linux/skmsg.h | 2 include/net/gro.h | 3 include/net/strparser.h | 2 include/net/tcp.h | 22 include/uapi/drm/xe_drm.h | 17 io_uring/io_uring.c | 2 io_uring/rw.c | 13 kernel/acct.c | 134 - kernel/bpf/arena.c | 2 kernel/bpf/bpf_cgrp_storage.c | 2 kernel/bpf/btf.c | 2 kernel/bpf/ringbuf.c | 4 kernel/bpf/syscall.c | 43 kernel/sched/ext.c | 150 - kernel/trace/ftrace.c | 36 kernel/trace/trace.c | 277 -- kernel/trace/trace_functions.c | 6 lib/iov_iter.c | 3 mm/madvise.c | 11 mm/migrate_device.c | 13 net/bpf/test_run.c | 5 net/core/dev.c | 37 net/core/drop_monitor.c | 29 net/core/flow_dissector.c | 49 net/core/gro.c | 3 net/core/skbuff.c | 10 net/core/skmsg.c | 7 net/core/sock_map.c | 8 net/ipv4/arp.c | 2 net/ipv4/tcp.c | 29 net/ipv4/tcp_bpf.c | 36 net/ipv4/tcp_fastopen.c | 4 net/ipv4/tcp_input.c | 20 net/ipv4/tcp_ipv4.c | 2 net/sched/cls_api.c | 2 net/strparser/strparser.c | 11 net/vmw_vsock/af_vsock.c | 3 net/vmw_vsock/virtio_transport.c | 10 net/vmw_vsock/vsock_bpf.c | 2 sound/core/seq/seq_clientmgr.c | 12 sound/pci/hda/hda_codec.c | 4 sound/pci/hda/patch_conexant.c | 1 sound/pci/hda/patch_cs8409-tables.c | 6 sound/pci/hda/patch_cs8409.c | 20 sound/pci/hda/patch_cs8409.h | 5 sound/pci/hda/patch_realtek.c | 1 sound/soc/fsl/fsl_micfil.c | 2 sound/soc/fsl/imx-audmix.c | 31 sound/soc/rockchip/rockchip_i2s_tdm.c | 4 sound/soc/sh/rz-ssi.c | 10 sound/soc/sof/ipc4-topology.c | 12 sound/soc/sof/pcm.c | 2 sound/soc/sof/stream-ipc.c | 6 tools/testing/selftests/bpf/bpf_testmod/bpf_testmod-events.h | 8 tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c | 2 tools/testing/selftests/bpf/prog_tests/raw_tp_null.c | 25 tools/testing/selftests/bpf/progs/raw_tp_null.c | 32 tools/testing/selftests/mm/Makefile | 9 181 files changed, 3556 insertions(+), 1540 deletions(-)
Aaron Kling (1):
drm/nouveau/pmu: Fix gp10b firmware guard
Abel Wu (1):
bpf: Fix deadlock when freeing cgroup storage
Alan Maguire (1):
bpf: Fix softlockup in arena_map_free on 64k page kernel
Alex Deucher (2):
drm/amdgpu/gfx9: manually control gfxoff for CS on RV drm/amdgpu: bump version for RV/PCO compute fix
Alexander Shiyan (1):
arm64: dts: rockchip: Fix broken tsadc pinctrl names for rk3588
Amit Kumar Mahapatra (1):
mtd: spi-nor: sst: Fix SST write failure
Andrey Vatoropin (1):
power: supply: da9150-fg: fix potential overflow
Andrii Nakryiko (2):
bpf: unify VM_WRITE vs VM_MAYWRITE use in BPF map mmaping logic
bpf: avoid holding freeze_mutex during mmap operation
Andy Yan (1):
arm64: dts: rockchip: Fix lcdpwr_en pin for Cool Pi GenBook
Artur Rojek (1):
irqchip/jcore-aic, clocksource/drivers/jcore: Fix jcore-pit interrupt request
Ashutosh Dixit (3):
drm/xe/oa: Separate batch submission from waiting for completion drm/xe/oa/uapi: Define and parse OA sync properties drm/xe/oa: Add input fence dependencies
Bart Van Assche (1):
md/raid*: Fix the set_queue_limits implementations
Bartosz Golaszewski (1):
gpiolib: protect gpio_chip with SRCU in array_info paths in multi get/set
Breno Leitao (2):
net: Add non-RCU dev_getbyhwaddr() helper
arp: switch to dev_getbyhwaddr() in arp_req_set_public()
Caleb Sander Mateos (2):
nvme-tcp: fix connect failure on receiving partial ICResp PDU nvme/ioctl: add missing space in err message
Catalin Marinas (1):
arm64: mte: Do not allow PROT_MTE on MAP_HUGETLB user mappings
Chao Gao (1):
KVM: nVMX: Defer SVI update to vmcs01 on EOI when L2 is active w/o VID
Charlene Liu (1):
drm/amd/display: update dcn351 used clock offset
Chen-Yu Tsai (1):
arm64: dts: mediatek: mt8183: Disable DSI display output by default
Cheng Jiang (1):
Bluetooth: qca: Update firmware-name to support board specific nvm
Chris Morgan (1):
power: supply: axp20x_battery: Fix fault handling for AXP717
Christian Brauner (2):
acct: perform last write from workqueue
acct: block access to kernel internal filesystems
Christophe Leroy (3):
powerpc/code-patching: Disable KASAN report during patching via temporary mm powerpc/64s: Rewrite __real_pte() and __rpte_to_hidx() as static inline powerpc/code-patching: Fix KASAN hit by not flagging text patching area as VM_ALLOC
Claudiu Beznea (1):
ASoC: renesas: rz-ssi: Terminate all the DMA transactions
Cong Wang (2):
flow_dissector: Fix handling of mixed port and port-range keys
flow_dissector: Fix port range key handling in BPF conversion
Damien Le Moal (1):
nvme: tcp: Fix compilation warning with W=1
Dan Carpenter (1):
ASoC: renesas: rz-ssi: Add a check for negative sample_space
Darrick J. Wong (1):
xfs: fix online repair probing when CONFIG_XFS_ONLINE_REPAIR=n
David Hildenbrand (2):
nouveau/svm: fix missing folio unlock + put after make_device_exclusive_range() mm/migrate_device: don't add folio to be freed to LRU in migrate_device_finalize()
David Sterba (1):
btrfs: use btrfs_inode in extent_writepage()
Dmitry Baryshkov (2):
drm/msm/dpu: skip watchdog timer programming through TOP on >= SM8450 drm/msm/dpu: enable DPU_WB_INPUT_CTRL for DPU 5.x
Dmitry Torokhov (2):
Input: serio - define serio_pause_rx guard to pause and resume serio ports
Input: synaptics - fix crash when enabling pass-through port
Fabien Parent (1):
arm64: dts: mediatek: mt8183-pumpkin: add HDMI support
Gavrilov Ilia (1):
drop_monitor: fix incorrect initialization order
Geert Uytterhoeven (2):
firmware: imx: IMX_SCMI_MISC_DRV should depend on ARCH_MXC
platform: cznic: CZNIC_PLATFORMS should depend on ARCH_MVEBU
Greg Kroah-Hartman (1):
Linux 6.12.17
Haoxiang Li (3):
soc: loongson: loongson2_guts: Add check for devm_kstrdup()
nfp: bpf: Add check for nfp_app_ctrl_msg_alloc()
smb: client: Add check for next_buffer in receive_encrypted_standard()
Heiko Carstens (1):
s390/boot: Fix ESSA detection
Hugo Villeneuve (1):
drm: panel: jd9365da-h3: fix reset signal polarity
Imre Deak (2):
drm/i915/dp: Fix error handling during 128b/132b link training drm/i915/ddi: Fix HDMI port width programming in DDI_BUF_CTL
Jacek Lawrynowicz (2):
accel/ivpu: Limit FW version string length accel/ivpu: Fix error handling in recovery/reset
Jakub Kicinski (1):
tcp: adjust rcvq_space after updating scaling ratio
Jay Cornwall (1):
drm/amdkfd: Move gfx12 trap handler to separate file
Jessica Zhang (1):
drm/msm/dpu: Disable dither in phys encoder cleanup
Jiayuan Chen (3):
strparser: Add read_sock callback
bpf: Fix wrong copied_seq calculation
bpf: Disable non stream socket for strparser
Jill Donahue (1):
USB: gadget: f_midi: f_midi_complete to call queue_work
John Keeping (1):
ASoC: rockchip: i2s-tdm: fix shift config for SND_SOC_DAIFMT_DSP_[AB]
John Veness (1):
ALSA: hda/conexant: Add quirk for HP ProBook 450 G4 mute LED
Joshua Washington (1):
gve: set xdp redirect target only when it is available
Julian Ruess (1):
s390/ism: add release function for struct device
Junnan Wu (1):
vsock/virtio: fix variables initialization during resuming
Kailang Yang (1):
ALSA: hda/realtek: Fixup ALC225 depop procedure
Kan Liang (1):
perf/x86/intel: Fix event constraints for LNC
Karol Wachowski (1):
accel/ivpu: Add coredump support
Kevin Brodsky (1):
selftests/mm: build with -O2
Komal Bajaj (1):
EDAC/qcom: Correct interrupt enable register configuration
Kory Maincent (4):
net: pse-pd: Avoid setting max_uA in regulator constraints
net: pse-pd: Use power limit at driver side instead of current limit
net: pse-pd: pd692x0: Fix power limit retrieval
net: pse-pd: Fix deadlock in current limit functions
Krzysztof Karas (1):
drm/i915/gt: Use spin_lock_irqsave() in interruptible context
Krzysztof Kozlowski (3):
drm/msm/dsi/phy: Protect PHY_CMN_CLK_CFG0 updated from driver side drm/msm/dsi/phy: Protect PHY_CMN_CLK_CFG1 against clock driver drm/msm/dsi/phy: Do not overwite PHY_CMN_CLK_CFG1 when choosing bitclk source
Kumar Kartikeya Dwivedi (1):
selftests/bpf: Add tests for raw_tp null handling
Kuniyuki Iwashima (4):
geneve: Fix use-after-free in geneve_find_dev().
gtp: Suppress list corruption splat in gtp_net_exit_batch_rtnl().
geneve: Suppress list corruption splat in geneve_destroy_tunnels().
net: Add rx_skb of kfree_skb to raw_tp_null_args[].
Lancelot SIX (1):
drm/amdkfd: Ensure consistent barrier state saved in gfx12 trap handler
Lohita Mudimela (1):
drm/amd/display: Refactoring if and endif statements to enable DC_LOGGER
Lukasz Czechowski (2):
arm64: dts: rockchip: Move uart5 pin configuration to px30 ringneck SoM
arm64: dts: rockchip: Disable DMA for uart5 on px30-ringneck
Marc Zyngier (1):
irqchip/gic-v3: Fix rk3399 workaround when secure interrupts are enabled
Marijn Suijten (1):
drm/msm/dpu: Don't leak bits_per_component into random DSC_ENC fields
Michal Luczaj (2):
sockmap, vsock: For connectible sockets allow only connected vsock/bpf: Warn on socket without transport
Nick Child (2):
ibmvnic: Add stat for tx direct vs tx batched
ibmvnic: Don't reference skb after sending to VIOS
Nick Hu (1):
net: axienet: Set mac_managed_pm
Nikita Zhandarovich (1):
ASoC: fsl_micfil: Enable default case in micfil_set_quality()
Niravkumar L Rabara (3):
mtd: rawnand: cadence: fix error code in cadence_nand_init()
mtd: rawnand: cadence: use dma_map_resource for sdma address
mtd: rawnand: cadence: fix incorrect device in dma_unmap_single
Paolo Abeni (1):
net: allow small head cache usage with large MAX_SKB_FRAGS values
Patrick Wildt (1):
arm64: dts: rockchip: adjust SMMU interrupt type on rk3588
Paulo Alcantara (1):
smb: client: fix chmod(2) regression with ATTR_READONLY
Pavel Begunkov (3):
io_uring/rw: forbid multishot async reads
io_uring: prevent opcode speculation lib/iov_iter: fix import_iovec_ubuf iovec management
Peng Fan (1):
firmware: arm_scmi: imx: Correct tx size of scmi_imx_misc_ctrl_set
Peter Ujfalusi (3):
ASoC: SOF: ipc4-topology: Harden loops for looking up ALH copiers
ASoC: SOF: stream-ipc: Check for cstream nullity in sof_ipc_msg_data()
ASoC: SOF: pcm: Clear the susbstream pointer to NULL on close
Philipp Stanner (3):
PCI: Make pcim_request_all_regions() a public function
PCI: Export pci_intx_unmanaged() and pcim_intx()
PCI: Remove devres from pci_intx()
Pierre Riteau (1):
net/sched: cls_api: fix error handling causing NULL dereference
Qu Wenruo (8):
btrfs: do not assume the full page range is not dirty in extent_writepage_io()
btrfs: move the delalloc range bitmap search into extent_io.c
btrfs: mark all dirty sectors as locked inside writepage_delalloc()
btrfs: remove unused btrfs_folio_start_writer_lock()
btrfs: unify to use writer locks for subpage locking
btrfs: rename btrfs_folio_(set|start|end)_writer_lock()
btrfs: fix double accounting race when btrfs_run_delalloc_range() failed
btrfs: fix double accounting race when extent_writepage_io() failed
Ricardo Cañuelo Navarro (1):
mm,madvise,hugetlb: check for 0-length range after end address adjustment
Rob Clark (1):
drm/msm: Avoid rounding up to one jiffy
Sabrina Dubroca (1):
tcp: drop secpath at the same time as we currently drop dst
Sean Christopherson (2):
KVM: x86: Get vcpu->arch.apic_base directly and drop kvm_get_apic_base()
KVM: x86: Inline kvm_get_apic_mode() in lapic.h
Sebastian Andrzej Siewior (1):
ftrace: Correct preemption accounting for function tracing.
Shengjiu Wang (1):
ASoC: imx-audmix: remove cpu_mclk which is from cpu dai device
Shigeru Yoshida (1):
bpf, test_run: Fix use-after-free issue in eth_skb_pkt_type()
Steven Rostedt (5):
tracing: Switch trace.c code over to use guard()
tracing: Have the error of __tracing_resize_ring_buffer() passed to user
ftrace: Fix accounting of adding subops to a manager ops
ftrace: Do not add duplicate entries in subops manager ops
tracing: Fix using ret variable in tracing_set_tracer()
Sumit Garg (1):
tee: optee: Fix supplicant wait loop
Takashi Iwai (2):
PCI: Restore original INTX_DISABLE bit by pcim_intx()
ALSA: seq: Drop UMP events when no UMP-conversion is set
Tejun Heo (3):
sched_ext: Factor out move_task_between_dsqs() from scx_dispatch_from_dsq()
sched_ext: Fix migration disabled handling in targeted dispatches
sched_ext: Fix incorrect assumption about migration disabled tasks in task_can_run_on_remote_rq()
Tianling Shen (1):
arm64: dts: rockchip: change eth phy mode to rgmii-id for orangepi r1 plus lts
Tomasz Rusinowicz (1):
accel/ivpu: Add FW state dump on TDR
Umesh Nerlige Ramappa (1):
xe/oa: Fix query mode of operation for OAR/OAC
Ville Syrjälä (1):
drm/i915: Make sure all planes in use by the joiner have their crtc included
Vitaly Rodionov (1):
ALSA: hda/cirrus: Correct the full scale volume set logic
Wentao Liang (1):
ALSA: hda: Add error check for snd_ctl_rename_id() in snd_hda_create_dig_out_ctls()
Yan Zhai (1):
bpf: skip non exist keys in generic_map_lookup_batch
Zijun Hu (1):
Bluetooth: qca: Fix poor RF performance for WCN6855
loanchen (1):
drm/amd/display: Correct register address in dcn35
Greg Kroah-Hartman
maintainerDocumentation/networking/strparser.rst +8 -1
@@ -112,7 +112,7 @@ Functions Callbacks ========= -There are six callbacks: +There are seven callbacks: ::
@@ -182,6 +182,13 @@ There are six callbacks: the length of the message. skb->len - offset may be greater then full_len since strparser does not trim the skb. + :: + + int (*read_sock)(struct strparser *strp, read_descriptor_t *desc, + sk_read_actor_t recv_actor); + + The read_sock callback is used by strparser instead of + sock->ops->read_sock, if provided. :: int (*read_sock_done)(struct strparser *strp, int err);
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 12 -SUBLEVEL = 16 +SUBLEVEL = 17 EXTRAVERSION = NAME = Baby Opossum Posse
arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts +121 -2
145 lines not on this page · raw message
arch/arm64/boot/dts/mediatek/mt8183.dtsi +1 -0
@@ -1835,6 +1835,7 @@ dsi0: dsi@14014000 { resets = <&mmsys MT8183_MMSYS_SW0_RST_B_DISP_DSI0>; phys = <&mipi_tx0>; phy-names = "dphy"; + status = "disabled"; }; dpi0: dpi@14015000 {
arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts +0 -1
@@ -226,7 +226,6 @@ &uart0 { }; &uart5 { - pinctrl-0 = <&uart5_xfer>; rts-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; status = "okay"; };
arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi +6 -0
@@ -373,6 +373,12 @@ &u2phy_host { status = "okay"; }; +&uart5 { + /delete-property/ dmas; + /delete-property/ dma-names; + pinctrl-0 = <&uart5_xfer>; +}; + /* Mule UCAN */ &usb_host0_ehci { status = "okay";
arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts +4 -2
@@ -15,9 +15,11 @@ / { }; &gmac2io { + /delete-property/ tx_delay; + /delete-property/ rx_delay; + phy-handle = <&yt8531c>; - tx_delay = <0x19>; - rx_delay = <0x05>; + phy-mode = "rgmii-id"; mdio { /delete-node/ ethernet-phy@1;
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +11 -11
@@ -549,10 +549,10 @@ usb_host2_xhci: usb@fcd00000 { mmu600_pcie: iommu@fc900000 { compatible = "arm,smmu-v3"; reg = <0x0 0xfc900000 0x0 0x200000>; - interrupts = <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH 0>; + interrupts = <GIC_SPI 369 IRQ_TYPE_EDGE_RISING 0>, + <GIC_SPI 371 IRQ_TYPE_EDGE_RISING 0>, + <GIC_SPI 374 IRQ_TYPE_EDGE_RISING 0>, + <GIC_SPI 367 IRQ_TYPE_EDGE_RISING 0>; interrupt-names = "eventq", "gerror", "priq", "cmdq-sync"; #iommu-cells = <1>; status = "disabled";
@@ -561,10 +561,10 @@ mmu600_pcie: iommu@fc900000 { mmu600_php: iommu@fcb00000 { compatible = "arm,smmu-v3"; reg = <0x0 0xfcb00000 0x0 0x200000>; - interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH 0>; + interrupts = <GIC_SPI 381 IRQ_TYPE_EDGE_RISING 0>, + <GIC_SPI 383 IRQ_TYPE_EDGE_RISING 0>, + <GIC_SPI 386 IRQ_TYPE_EDGE_RISING 0>, + <GIC_SPI 379 IRQ_TYPE_EDGE_RISING 0>; interrupt-names = "eventq", "gerror", "priq", "cmdq-sync"; #iommu-cells = <1>; status = "disabled";
@@ -2626,9 +2626,9 @@ tsadc: tsadc@fec00000 { rockchip,hw-tshut-temp = <120000>; rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */ rockchip,hw-tshut-polarity = <0>; /* tshut polarity 0:LOW 1:HIGH */ - pinctrl-0 = <&tsadc_gpio_func>; - pinctrl-1 = <&tsadc_shut>; - pinctrl-names = "gpio", "otpout"; + pinctrl-0 = <&tsadc_shut_org>; + pinctrl-1 = <&tsadc_gpio_func>; + pinctrl-names = "default", "sleep"; #thermal-sensor-cells = <1>; status = "disabled"; };
arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +2 -2
@@ -101,7 +101,7 @@ vcc3v3_lcd: vcc3v3-lcd-regulator { compatible = "regulator-fixed"; regulator-name = "vcc3v3_lcd"; enable-active-high; - gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; + gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&lcdpwr_en>; vin-supply = <&vcc3v3_sys>;
@@ -207,7 +207,7 @@ &pcie3x4 { &pinctrl { lcd { lcdpwr_en: lcdpwr-en { - rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>; }; bl_en: bl-en {
arch/arm64/include/asm/mman.h +6 -3
@@ -41,9 +41,12 @@ static inline unsigned long arch_calc_vm_flag_bits(struct file *file,* backed by tags-capable memory. The vm_flags may be overridden by a * filesystem supporting MTE (RAM-based). */ -if (system_supports_mte () && - ((flags &MAP_ANONYMOUS ) ||shmem_file (file))) -return VM_MTE_ALLOWED ; +if (system_supports_mte ()) { +if ((flags &MAP_ANONYMOUS ) && !(flags &MAP_HUGETLB )) +return VM_MTE_ALLOWED ; +if (shmem_file (file)) +return VM_MTE_ALLOWED ; + }return 0 ; }
arch/powerpc/include/asm/book3s/64/hash-4k.h +10 -2
@@ -77,9 +77,17 @@/* * With 4K page size the real_pte machinery is all nops. */ -#define __real_pte (e, p, o) ((real_pte_t){(e)}) +static inline real_pte_t __real_pte (pte_t pte,pte_t *ptep,int offset) +{ +return (real_pte_t ){pte}; +} +#define __rpte_to_pte (r) ((r).pte) -#define __rpte_to_hidx (r,index) (pte_val(__rpte_to_pte(r)) >> H_PAGE_F_GIX_SHIFT) + +static inline unsigned long __rpte_to_hidx (real_pte_t rpte,unsigned long index) +{ +return pte_val (__rpte_to_pte (rpte)) >>H_PAGE_F_GIX_SHIFT ; +}#define pte_iterate_hashed_subpages (rpte, psize, va, index, shift) \ do { \
arch/powerpc/lib/code-patching.c +3 -1
@@ -108,7 +108,7 @@ static int text_area_cpu_up(unsigned int cpu)unsigned long addr;int err; - area =get_vm_area (PAGE_SIZE ,VM_ALLOC ); + area =get_vm_area (PAGE_SIZE ,0 );if (!area) {WARN_ONCE (1 ,"Failed to create text area for cpu %d\n" , cpu);
@@ -493,7 +493,9 @@ static int __do_patch_instructions_mm(u32 *addr, u32 *code, size_t len, bool rep orig_mm =start_using_temp_mm (patching_mm); +kasan_disable_current (); err =__patch_instructions (patch_addr, code, len, repeat_instr); +kasan_enable_current ();/* context synchronisation performed by __patch_instructions */ stop_using_temp_mm (patching_mm, orig_mm);
arch/s390/boot/startup.c +1 -1
@@ -75,7 +75,7 @@ static int cmma_test_essa(void) : [reg1] "=&d" (reg1), [reg2] "=&a" (reg2), [rc] "+&d" (rc), - [tmp] "=&d" (tmp), + [tmp] "+&d" (tmp), "+Q" (get_lowcore()->program_new_psw), "=Q" (old) : [psw_old] "a" (&old),
arch/x86/events/intel/core.c +7 -13
@@ -397,34 +397,28 @@ static struct event_constraint intel_lnc_event_constraints[] = {METRIC_EVENT_CONSTRAINT (INTEL_TD_METRIC_FETCH_LAT ,6 ),METRIC_EVENT_CONSTRAINT (INTEL_TD_METRIC_MEM_BOUND ,7 ), +INTEL_EVENT_CONSTRAINT (0x20 ,0xf ), + +INTEL_UEVENT_CONSTRAINT (0x012a ,0xf ), +INTEL_UEVENT_CONSTRAINT (0x012b ,0xf ),INTEL_UEVENT_CONSTRAINT (0x0148 ,0x4 ),INTEL_UEVENT_CONSTRAINT (0x0175 ,0x4 ),INTEL_EVENT_CONSTRAINT (0x2e ,0x3ff ),INTEL_EVENT_CONSTRAINT (0x3c ,0x3ff ), -/* -* Generally event codes < 0x90 are restricted to counters 0-3. -* The 0x2E and 0x3C are exception, which has no restriction. -*/ -INTEL_EVENT_CONSTRAINT_RANGE (0x01 ,0x8f ,0xf ), -INTEL_UEVENT_CONSTRAINT (0x01a3 ,0xf ), -INTEL_UEVENT_CONSTRAINT (0x02a3 ,0xf ),INTEL_UEVENT_CONSTRAINT (0x08a3 ,0x4 ),INTEL_UEVENT_CONSTRAINT (0x0ca3 ,0x4 ),INTEL_UEVENT_CONSTRAINT (0x04a4 ,0x1 ),INTEL_UEVENT_CONSTRAINT (0x08a4 ,0x1 ),INTEL_UEVENT_CONSTRAINT (0x10a4 ,0x1 ),INTEL_UEVENT_CONSTRAINT (0x01b1 ,0x8 ), +INTEL_UEVENT_CONSTRAINT (0x01cd ,0x3fc ),INTEL_UEVENT_CONSTRAINT (0x02cd ,0x3 ), -INTEL_EVENT_CONSTRAINT (0xce ,0x1 ),INTEL_EVENT_CONSTRAINT_RANGE (0xd0 ,0xdf ,0xf ), -/* -* Generally event codes >= 0x90 are likely to have no restrictions. -* The exception are defined as above. -*/ -INTEL_EVENT_CONSTRAINT_RANGE (0x90 ,0xfe ,0x3ff ), + +INTEL_UEVENT_CONSTRAINT (0x00e0 ,0xf ),EVENT_CONSTRAINT_END };
arch/x86/events/intel/ds.c +1 -1
@@ -1178,7 +1178,7 @@ struct event_constraint intel_lnc_pebs_event_constraints[] = {INTEL_FLAGS_UEVENT_CONSTRAINT (0x100 ,0x100000000ULL ),/* INST_RETIRED.PREC_DIST */ INTEL_FLAGS_UEVENT_CONSTRAINT (0x0400 ,0x800000000ULL ), -INTEL_HYBRID_LDLAT_CONSTRAINT (0x1cd ,0x3ff ), +INTEL_HYBRID_LDLAT_CONSTRAINT (0x1cd ,0x3fc ),INTEL_HYBRID_STLAT_CONSTRAINT (0x2cd ,0x3 ),INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD (0x11d0 ,0xf ),/* MEM_INST_RETIRED.STLB_MISS_LOADS */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x12d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_STORES */
arch/x86/kvm/lapic.c +11 -0
@@ -816,6 +816,17 @@ static inline void apic_clear_isr(int vec, struct kvm_lapic *apic) } } +void kvm_apic_update_hwapic_isr (struct kvm_vcpu *vcpu) +{ +struct kvm_lapic *apic = vcpu->arch.apic; + +if (WARN_ON_ONCE (!lapic_in_kernel (vcpu)) || !apic->apicv_active) +return ; + +kvm_x86_call (hwapic_isr_update)(vcpu,apic_find_highest_isr (apic)); +} +EXPORT_SYMBOL_GPL (kvm_apic_update_hwapic_isr); +int kvm_lapic_find_highest_irr (struct kvm_vcpu *vcpu) {/* This may race with setting of irr in __apic_accept_irq() and
arch/x86/kvm/lapic.h +6 -2
@@ -117,11 +117,10 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src, struct kvm_lapic_irq *irq, int *r, struct dest_map *dest_map);void kvm_apic_send_ipi (struct kvm_lapic *apic,u32 icr_low,u32 icr_high); -u64 kvm_get_apic_base (struct kvm_vcpu *vcpu);int kvm_set_apic_base (struct kvm_vcpu *vcpu,struct msr_data *msr_info);int kvm_apic_get_state (struct kvm_vcpu *vcpu,struct kvm_lapic_state *s);int kvm_apic_set_state (struct kvm_vcpu *vcpu,struct kvm_lapic_state *s); -enum lapic_mode kvm_get_apic_mode (struct kvm_vcpu *vcpu); +void kvm_apic_update_hwapic_isr (struct kvm_vcpu *vcpu);int kvm_lapic_find_highest_irr (struct kvm_vcpu *vcpu);u64 kvm_get_lapic_tscdeadline_msr (struct kvm_vcpu *vcpu);
@@ -271,6 +270,11 @@ static inline enum lapic_mode kvm_apic_mode(u64 apic_base)return apic_base & (MSR_IA32_APICBASE_ENABLE |X2APIC_ENABLE ); } +static inline enum lapic_mode kvm_get_apic_mode (struct kvm_vcpu *vcpu) +{ +return kvm_apic_mode (vcpu->arch.apic_base); +} +static inline u8 kvm_xapic_id (struct kvm_lapic *apic) {return kvm_lapic_get_reg (apic,APIC_ID ) >>24 ;
arch/x86/kvm/vmx/nested.c +5 -0
@@ -5043,6 +5043,11 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,kvm_make_request (KVM_REQ_APICV_UPDATE , vcpu); } +if (vmx->nested.update_vmcs01_hwapic_isr) { + vmx->nested.update_vmcs01_hwapic_isr = false; +kvm_apic_update_hwapic_isr (vcpu); + } +if ((vm_exit_reason !=-1 ) && (enable_shadow_vmcs ||nested_vmx_is_evmptr12_valid (vmx))) vmx->nested.need_vmcs12_to_shadow_sync = true;
arch/x86/kvm/vmx/vmx.c +21 -0
@@ -6858,6 +6858,27 @@ void vmx_hwapic_isr_update(struct kvm_vcpu *vcpu, int max_isr)u16 status;u8 old; +/* +* If L2 is active, defer the SVI update until vmcs01 is loaded, as SVI +* is only relevant for if and only if Virtual Interrupt Delivery is +* enabled in vmcs12, and if VID is enabled then L2 EOIs affect L2's +* vAPIC, not L1's vAPIC. KVM must update vmcs01 on the next nested +* VM-Exit, otherwise L1 with run with a stale SVI. +*/ +if (is_guest_mode (vcpu)) { +/* +* KVM is supposed to forward intercepted L2 EOIs to L1 if VID +* is enabled in vmcs12; as above, the EOIs affect L2's vAPIC. +* Note, userspace can stuff state while L2 is active; assert +* that VID is disabled if and only if the vCPU is in KVM_RUN +* to avoid false positives if userspace is setting APIC state. +*/ +WARN_ON_ONCE (vcpu->wants_to_run && +nested_cpu_has_vid (get_vmcs12 (vcpu))); +to_vmx (vcpu)->nested.update_vmcs01_hwapic_isr = true; +return ; + } +if (max_isr ==-1 ) max_isr =0 ;
arch/x86/kvm/vmx/vmx.h +1 -0
@@ -176,6 +176,7 @@ struct nested_vmx {bool reload_vmcs01_apic_access_page;bool update_vmcs01_cpu_dirty_logging;bool update_vmcs01_apicv_status; +bool update_vmcs01_hwapic_isr;/* * Enlightened VMCS has been enabled. It does not mean that L1 has to
arch/x86/kvm/x86.c +3 -14
@@ -667,17 +667,6 @@ static void drop_user_return_notifiers(void)kvm_on_user_return (&msrs->urn); } -u64 kvm_get_apic_base (struct kvm_vcpu *vcpu) -{ -return vcpu->arch.apic_base; -} - -enum lapic_mode kvm_get_apic_mode (struct kvm_vcpu *vcpu) -{ -return kvm_apic_mode (kvm_get_apic_base (vcpu)); -} -EXPORT_SYMBOL_GPL (kvm_get_apic_mode); -int kvm_set_apic_base (struct kvm_vcpu *vcpu,struct msr_data *msr_info) {enum lapic_mode old_mode =kvm_get_apic_mode (vcpu);
@@ -4314,7 +4303,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) msr_info->data =1 <<24 ;break ;case MSR_IA32_APICBASE : - msr_info->data =kvm_get_apic_base (vcpu); + msr_info->data = vcpu->arch.apic_base;break ; case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_read (vcpu, msr_info->index, &msr_info->data);
@@ -10159,7 +10148,7 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu) kvm_run->if_flag =kvm_x86_call (get_if_flag)(vcpu); kvm_run->cr8 =kvm_get_cr8 (vcpu); - kvm_run->apic_base =kvm_get_apic_base (vcpu); + kvm_run->apic_base = vcpu->arch.apic_base; kvm_run->ready_for_interrupt_injection = pic_in_kernel(vcpu->kvm) ||
@@ -11718,7 +11707,7 @@ static void __get_sregs_common(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) sregs->cr4 =kvm_read_cr4 (vcpu); sregs->cr8 =kvm_get_cr8 (vcpu); sregs->efer = vcpu->arch.efer; - sregs->apic_base =kvm_get_apic_base (vcpu); + sregs->apic_base = vcpu->arch.apic_base; }static void __get_sregs (struct kvm_vcpu *vcpu,struct kvm_sregs *sregs)
drivers/accel/ivpu/Kconfig +1 -0
@@ -8,6 +8,7 @@ config DRM_ACCEL_IVPU select FW_LOADER select DRM_GEM_SHMEM_HELPER select GENERIC_ALLOCATOR + select WANT_DEV_COREDUMP help Choose this option if you have a system with an 14th generation Intel CPU (Meteor Lake) or newer. Intel NPU (formerly called Intel VPU)
drivers/accel/ivpu/Makefile +1 -0
@@ -19,5 +19,6 @@ intel_vpu-y := \ ivpu_sysfs.o intel_vpu-$(CONFIG_DEBUG_FS) += ivpu_debugfs.o +intel_vpu-$(CONFIG_DEV_COREDUMP) += ivpu_coredump.o obj-$(CONFIG_DRM_ACCEL_IVPU) += intel_vpu.o
drivers/accel/ivpu/ivpu_coredump.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2020-2024 Intel Corporation +*/ + +#include <linux/devcoredump.h> +#include <linux/firmware.h> + +#include "ivpu_coredump.h" +#include "ivpu_fw.h" +#include "ivpu_gem.h" +#include "vpu_boot_api.h" + +#define CRASH_DUMP_HEADER "Intel NPU crash dump" +#define CRASH_DUMP_HEADERS_SIZE SZ_4K + +void ivpu_dev_coredump (struct ivpu_device *vdev) +{ +struct drm_print_iterator pi = {}; +struct drm_printer p; +size_t coredump_size; +char *coredump; + + coredump_size =CRASH_DUMP_HEADERS_SIZE +FW_VERSION_HEADER_SIZE + +ivpu_bo_size (vdev->fw->mem_log_crit) +ivpu_bo_size (vdev->fw->mem_log_verb); + coredump =vmalloc (coredump_size); +if (!coredump) +return ; + + pi.data = coredump; + pi.remain = coredump_size; + p =drm_coredump_printer (&pi); + +drm_printf (&p,"%s\n" ,CRASH_DUMP_HEADER ); +drm_printf (&p,"FW version: %s\n" , vdev->fw->version); +ivpu_fw_log_print (vdev, false, &p); + +dev_coredumpv (vdev->drm.dev, coredump, pi.offset,GFP_KERNEL ); +}
drivers/accel/ivpu/ivpu_coredump.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2020-2024 Intel Corporation +*/ + +#ifndef __IVPU_COREDUMP_H__ +#define __IVPU_COREDUMP_H__ + +#include <drm/drm_print.h> + +#include "ivpu_drv.h" +#include "ivpu_fw_log.h" + +#ifdef CONFIG_DEV_COREDUMP +void ivpu_dev_coredump (struct ivpu_device *vdev); +#else +static inline void ivpu_dev_coredump (struct ivpu_device *vdev) +{ +struct drm_printer p =drm_info_printer (vdev->drm.dev); + +ivpu_fw_log_print (vdev, false, &p); +} +#endif + +#endif /* __IVPU_COREDUMP_H__ */
drivers/accel/ivpu/ivpu_drv.c +3 -2
@@ -14,7 +14,7 @@#include <drm/drm_ioctl.h> #include <drm/drm_prime.h> -#include "vpu_boot_api.h" +#include "ivpu_coredump.h" #include "ivpu_debugfs.h" #include "ivpu_drv.h" #include "ivpu_fw.h"
@@ -29,6 +29,7 @@#include "ivpu_ms.h" #include "ivpu_pm.h" #include "ivpu_sysfs.h" +#include "vpu_boot_api.h" #ifndef DRIVER_VERSION_STR #define DRIVER_VERSION_STR __stringify(DRM_IVPU_DRIVER_MAJOR) "." \
@@ -382,7 +383,7 @@ int ivpu_boot(struct ivpu_device *vdev)ivpu_err (vdev,"Failed to boot the firmware: %d\n" , ret);ivpu_hw_diagnose_failure (vdev);ivpu_mmu_evtq_dump (vdev); -ivpu_fw_log_dump (vdev); +ivpu_dev_coredump (vdev);return ret; }
drivers/accel/ivpu/ivpu_drv.h +1 -0
@@ -152,6 +152,7 @@ struct ivpu_device {int tdr;int autosuspend;int d0i3_entry_msg; +int state_dump_msg; } timeout; };
drivers/accel/ivpu/ivpu_fw.c +4 -3
@@ -25,7 +25,6 @@#define FW_SHAVE_NN_MAX_SIZE SZ_2M#define FW_RUNTIME_MIN_ADDR (FW_GLOBAL_MEM_START)#define FW_RUNTIME_MAX_ADDR (FW_GLOBAL_MEM_END - FW_SHARED_MEM_SIZE) -#define FW_VERSION_HEADER_SIZE SZ_4K#define FW_FILE_IMAGE_OFFSET (VPU_FW_HEADER_SIZE + FW_VERSION_HEADER_SIZE)#define WATCHDOG_MSS_REDIRECT 32
@@ -191,8 +190,10 @@ static int ivpu_fw_parse(struct ivpu_device *vdev)ivpu_dbg (vdev,FW_BOOT ,"Header version: 0x%x, format 0x%x\n" , fw_hdr->header_version, fw_hdr->image_format); -ivpu_info (vdev,"Firmware: %s, version: %s" , fw->name, - (const char *)fw_hdr +VPU_FW_HEADER_SIZE ); +if (!scnprintf (fw->version,sizeof (fw->version),"%s" , fw->file->data +VPU_FW_HEADER_SIZE )) +ivpu_warn (vdev,"Missing firmware version\n" ); + +ivpu_info (vdev,"Firmware: %s, version: %s\n" , fw->name, fw->version);if (IVPU_FW_CHECK_API_COMPAT (vdev, fw_hdr,BOOT ,3 ))return -EINVAL ;
drivers/accel/ivpu/ivpu_fw.h +5 -1
@@ -1,11 +1,14 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2020-2023 Intel Corporation +* Copyright (C) 2020-2024 Intel Corporation */ #ifndef __IVPU_FW_H__#define __IVPU_FW_H__ +#define FW_VERSION_HEADER_SIZE SZ_4K +#define FW_VERSION_STR_SIZE SZ_256 +struct ivpu_device ;struct ivpu_bo ;struct vpu_boot_params ;
@@ -13,6 +16,7 @@ struct vpu_boot_params;struct ivpu_fw_info {const struct firmware *file;const char *name; +char version[FW_VERSION_STR_SIZE ];struct ivpu_bo *mem;struct ivpu_bo *mem_shave_nn;struct ivpu_bo *mem_log_crit;
drivers/accel/ivpu/ivpu_fw_log.h +0 -8
@@ -8,8 +8,6 @@#include <linux/types.h> -#include <drm/drm_print.h> -#include "ivpu_drv.h" #define IVPU_FW_LOG_DEFAULT 0
@@ -28,11 +26,5 @@ extern unsigned int ivpu_log_level;void ivpu_fw_log_print (struct ivpu_device *vdev,bool only_new_msgs,struct drm_printer *p);void ivpu_fw_log_clear (struct ivpu_device *vdev); -static inline void ivpu_fw_log_dump (struct ivpu_device *vdev) -{ -struct drm_printer p =drm_info_printer (vdev->drm.dev); - -ivpu_fw_log_print (vdev, false, &p); -}#endif /* __IVPU_FW_LOG_H__ */
drivers/accel/ivpu/ivpu_hw.c +3 -0
@@ -89,12 +89,14 @@ static void timeouts_init(struct ivpu_device *vdev) vdev->timeout.tdr =2000000 ; vdev->timeout.autosuspend =-1 ; vdev->timeout.d0i3_entry_msg =500 ; + vdev->timeout.state_dump_msg =10 ; }else if (ivpu_is_simics (vdev)) { vdev->timeout.boot =50 ; vdev->timeout.jsm =500 ; vdev->timeout.tdr =10000 ; vdev->timeout.autosuspend =-1 ; vdev->timeout.d0i3_entry_msg =100 ; + vdev->timeout.state_dump_msg =10 ; }else { vdev->timeout.boot =1000 ; vdev->timeout.jsm =500 ;
@@ -104,6 +106,7 @@ static void timeouts_init(struct ivpu_device *vdev)else vdev->timeout.autosuspend =100 ; vdev->timeout.d0i3_entry_msg =5 ; + vdev->timeout.state_dump_msg =10 ; } }
drivers/accel/ivpu/ivpu_ipc.c +26 -0
@@ -353,6 +353,32 @@ int ivpu_ipc_send_receive(struct ivpu_device *vdev, struct vpu_jsm_msg *req,return ret; } +int ivpu_ipc_send_and_wait (struct ivpu_device *vdev,struct vpu_jsm_msg *req, +u32 channel,unsigned long timeout_ms) +{ +struct ivpu_ipc_consumer cons; +int ret; + + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; + +ivpu_ipc_consumer_add (vdev, &cons, channel,NULL ); + + ret =ivpu_ipc_send (vdev, &cons, req); +if (ret) { +ivpu_warn_ratelimited (vdev,"IPC send failed: %d\n" , ret); + goto consumer_del; + } + +msleep (timeout_ms); + +consumer_del: +ivpu_ipc_consumer_del (vdev, &cons); +ivpu_rpm_put (vdev); +return ret; +} +static bool ivpu_ipc_match_consumer (struct ivpu_device *vdev,struct ivpu_ipc_consumer *cons,struct ivpu_ipc_hdr *ipc_hdr,struct vpu_jsm_msg *jsm_msg)
drivers/accel/ivpu/ivpu_ipc.h +2 -0
@@ -107,5 +107,7 @@ int ivpu_ipc_send_receive_internal(struct ivpu_device *vdev, struct vpu_jsm_msgint ivpu_ipc_send_receive (struct ivpu_device *vdev,struct vpu_jsm_msg *req,enum vpu_ipc_msg_type expected_resp,struct vpu_jsm_msg *resp,u32 channel,unsigned long timeout_ms); +int ivpu_ipc_send_and_wait (struct ivpu_device *vdev,struct vpu_jsm_msg *req, +u32 channel,unsigned long timeout_ms);#endif /* __IVPU_IPC_H__ */
drivers/accel/ivpu/ivpu_jsm_msg.c +8 -0
@@ -555,3 +555,11 @@ int ivpu_jsm_dct_disable(struct ivpu_device *vdev)return ivpu_ipc_send_receive_internal (vdev, &req,VPU_JSM_MSG_DCT_DISABLE_DONE , &resp,VPU_IPC_CHAN_ASYNC_CMD , vdev->timeout.jsm); } + +int ivpu_jsm_state_dump (struct ivpu_device *vdev) +{ +struct vpu_jsm_msg req = { .type =VPU_JSM_MSG_STATE_DUMP }; + +return ivpu_ipc_send_and_wait (vdev, &req,VPU_IPC_CHAN_ASYNC_CMD , + vdev->timeout.state_dump_msg); +}
drivers/accel/ivpu/ivpu_jsm_msg.h +2 -0
@@ -43,4 +43,6 @@ int ivpu_jsm_metric_streamer_info(struct ivpu_device *vdev, u64 metric_group_mas u64 buffer_size, u32 *sample_size, u64 *info_size);int ivpu_jsm_dct_enable (struct ivpu_device *vdev,u32 active_us,u32 inactive_us);int ivpu_jsm_dct_disable (struct ivpu_device *vdev); +int ivpu_jsm_state_dump (struct ivpu_device *vdev); +#endif
drivers/accel/ivpu/ivpu_pm.c +47 -38
145 lines not on this page · raw message
drivers/bluetooth/btqca.c +88 -30
163 lines not on this page · raw message
drivers/clocksource/jcore-pit.c +14 -1
@@ -114,6 +114,18 @@ static int jcore_pit_local_init(unsigned cpu) pit->periodic_delta =DIV_ROUND_CLOSEST (NSEC_PER_SEC ,HZ * buspd);clockevents_config_and_register (&pit->ced, freq,1 ,ULONG_MAX ); +enable_percpu_irq (pit->ced.irq,IRQ_TYPE_NONE ); + +return 0 ; +} + +static int jcore_pit_local_teardown (unsigned cpu) +{ +struct jcore_pit *pit =this_cpu_ptr (jcore_pit_percpu); + +pr_info ("Local J-Core PIT teardown on cpu %u\n" , cpu); + +disable_percpu_irq (pit->ced.irq);return 0 ; }
@@ -168,6 +180,7 @@ static int __init jcore_pit_init(struct device_node *node)return -ENOMEM ; } +irq_set_percpu_devid (pit_irq); err =request_percpu_irq (pit_irq, jcore_timer_interrupt,"jcore_pit" , jcore_pit_percpu);if (err) {
@@ -237,7 +250,7 @@ static int __init jcore_pit_init(struct device_node *node)cpuhp_setup_state (CPUHP_AP_JCORE_TIMER_STARTING ,"clockevents/jcore:starting" , - jcore_pit_local_init,NULL ); + jcore_pit_local_init, jcore_pit_local_teardown);return 0 ; }
drivers/edac/qcom_edac.c +2 -2
@@ -95,7 +95,7 @@ static int qcom_llcc_core_setup(struct llcc_drv_data *drv, struct regmap *llcc_b* Configure interrupt enable registers such that Tag, Data RAM related * interrupts are propagated to interrupt controller for servicing */ - ret =regmap_update_bits (llcc_bcast_regmap, drv->edac_reg_offset->cmn_interrupt_2_enable, + ret =regmap_update_bits (llcc_bcast_regmap, drv->edac_reg_offset->cmn_interrupt_0_enable,TRP0_INTERRUPT_ENABLE ,TRP0_INTERRUPT_ENABLE );if (ret)
@@ -113,7 +113,7 @@ static int qcom_llcc_core_setup(struct llcc_drv_data *drv, struct regmap *llcc_bif (ret)return ret; - ret =regmap_update_bits (llcc_bcast_regmap, drv->edac_reg_offset->cmn_interrupt_2_enable, + ret =regmap_update_bits (llcc_bcast_regmap, drv->edac_reg_offset->cmn_interrupt_0_enable,DRP0_INTERRUPT_ENABLE ,DRP0_INTERRUPT_ENABLE );if (ret)
drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c +2 -2
@@ -254,8 +254,8 @@ static int scmi_imx_misc_ctrl_set(const struct scmi_protocol_handle *ph,if (num > max_num)return -EINVAL ; - ret = ph->xops->xfer_get_init (ph,SCMI_IMX_MISC_CTRL_SET ,sizeof (*in), -0 , &t); + ret = ph->xops->xfer_get_init (ph,SCMI_IMX_MISC_CTRL_SET , +sizeof (*in) + num *sizeof (__le32),0 , &t);if (ret)return ret;
drivers/firmware/imx/Kconfig +1 -0
@@ -25,6 +25,7 @@ config IMX_SCU config IMX_SCMI_MISC_DRV tristate "IMX SCMI MISC Protocol driver" + depends on ARCH_MXC || COMPILE_TEST default y if ARCH_MXC help The System Controller Management Interface firmware (SCMI FW) is
drivers/gpio/gpiolib.c +33 -15
135 lines not on this page · raw message
drivers/gpio/gpiolib.h +2 -2
@@ -110,7 +110,7 @@ extern const char *const gpio_suffixes[];* * @desc: Array of pointers to the GPIO descriptors * @size: Number of elements in desc -* @chip: Parent GPIO chip +* @gdev: Parent GPIO device * @get_mask: Get mask used in fastpath * @set_mask: Set mask used in fastpath * @invert_mask: Invert mask used in fastpath
@@ -122,7 +122,7 @@ extern const char *const gpio_suffixes[];struct gpio_array {struct gpio_desc **desc;unsigned int size; -struct gpio_chip *chip; +struct gpio_device *gdev;unsigned long *get_mask;unsigned long *set_mask;unsigned long invert_mask[];
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -119,9 +119,10 @@* - 3.58.0 - Add GFX12 DCC support * - 3.59.0 - Cleared VRAM * - 3.60.0 - Add AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE (Vulkan requirement) +* - 3.61.0 - Contains fix for RV/PCO compute queues */ #define KMS_DRIVER_MAJOR 3 -#define KMS_DRIVER_MINOR 60 +#define KMS_DRIVER_MINOR 61#define KMS_DRIVER_PATCHLEVEL 0/*
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +30 -2
@@ -7415,6 +7415,34 @@ static void gfx_v9_0_ring_emit_cleaner_shader(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0 );/* RESERVED field, programmed to zero */ } +static void gfx_v9_0_ring_begin_use_compute (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; + +amdgpu_gfx_enforce_isolation_ring_begin_use (ring); + +/* Raven and PCO APUs seem to have stability issues +* with compute and gfxoff and gfx pg. Disable gfx pg during +* submission and allow again afterwards. +*/ +if (amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (9 ,1 ,0 )) +gfx_v9_0_set_powergating_state (adev,AMD_PG_STATE_UNGATE ); +} + +static void gfx_v9_0_ring_end_use_compute (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; + +/* Raven and PCO APUs seem to have stability issues +* with compute and gfxoff and gfx pg. Disable gfx pg during +* submission and allow again afterwards. +*/ +if (amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (9 ,1 ,0 )) +gfx_v9_0_set_powergating_state (adev,AMD_PG_STATE_GATE ); + +amdgpu_gfx_enforce_isolation_ring_end_use (ring); +} +static const struct amd_ip_funcs gfx_v9_0_ip_funcs = { .name ="gfx_v9_0" , .early_init = gfx_v9_0_early_init,
@@ -7591,8 +7619,8 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = { .emit_wave_limit = gfx_v9_0_emit_wave_limit, .reset = gfx_v9_0_reset_kcq, .emit_cleaner_shader = gfx_v9_0_ring_emit_cleaner_shader, - .begin_use = amdgpu_gfx_enforce_isolation_ring_begin_use, - .end_use = amdgpu_gfx_enforce_isolation_ring_end_use, + .begin_use = gfx_v9_0_ring_begin_use_compute, + .end_use = gfx_v9_0_ring_end_use_compute, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +2 -1
@@ -4117,7 +4117,8 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {0x0000ffff ,0x8bfe7e7e ,0x8bea6a6a ,0xb97af804 ,0xbe804ec2 ,0xbf94fffe , -0xbe804a6c ,0xbfb10000 , +0xbe804a6c ,0xbe804ec2 , +0xbf94fffe ,0xbfb10000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 , 0xbf9f0000, 0x00000000,
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +1 -201
347 lines not on this page · raw message
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm new file +1130 -0
1,130 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile +1 -1
@@ -174,7 +174,7 @@ AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN32) ############################################################################### # DCN35 ############################################################################### -CLK_MGR_DCN35 = dcn35_smu.o dcn35_clk_mgr.o +CLK_MGR_DCN35 = dcn35_smu.o dcn351_clk_mgr.o dcn35_clk_mgr.o AMD_DAL_CLK_MGR_DCN35 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn35/,$(CLK_MGR_DCN35))
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +4 -1
@@ -355,8 +355,11 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *pBREAK_TO_DEBUGGER ();return NULL ; } +if (ctx->dce_version ==DCN_VERSION_3_51 ) +dcn351_clk_mgr_construct (ctx, clk_mgr, pp_smu, dccg); +else +dcn35_clk_mgr_construct (ctx, clk_mgr, pp_smu, dccg); -dcn35_clk_mgr_construct (ctx, clk_mgr, pp_smu, dccg);return &clk_mgr->base.base; }break ;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +3 -2
@@ -50,12 +50,13 @@#include "link.h" #include "logger_types.h" + + +#include "yellow_carp_offset.h" #undef DC_LOGGER#define DC_LOGGER \ clk_mgr->base.base.ctx->logger -#include "yellow_carp_offset.h" -#define regCLK1_CLK_PLL_REQ 0x0237#define regCLK1_CLK_PLL_REQ_BASE_IDX 0
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +3 -3
@@ -53,9 +53,6 @@#include "logger_types.h" -#undef DC_LOGGER -#define DC_LOGGER \ - clk_mgr->base.base.ctx->logger#define MAX_INSTANCE 7
@@ -77,6 +74,9 @@ static const struct IP_BASE CLK_BASE = { { { { 0x00016C00, 0x02401800, 0, 0, 0, { { 0x0001B200, 0x0242DC00, 0, 0, 0, 0, 0, 0 } }, { { 0x0001B400, 0x0242E000, 0, 0, 0, 0, 0, 0 } } } }; +#undef DC_LOGGER +#define DC_LOGGER \ + clk_mgr->base.base.ctx->logger#define regCLK1_CLK_PLL_REQ 0x0237#define regCLK1_CLK_PLL_REQ_BASE_IDX 0
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c new file +140 -0
134 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +101 -32
133 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h +4 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +59 -0
59 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_display.c +18 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_dp_link_training.c +14 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c +36 -17
53 lines not on this page · raw message
drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml +9 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/xe/xe_oa.c +175 -90
265 lines not on this page · raw message
drivers/gpu/drm/xe/xe_sched_job_types.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/input/mouse/synaptics.c +42 -14
56 lines not on this page · raw message
drivers/irqchip/irq-gic-v3.c +40 -13
53 lines not on this page · raw message
drivers/mtd/nand/raw/cadence-nand-controller.c +31 -11
42 lines not on this page · raw message
drivers/net/ethernet/google/gve/gve_main.c +5 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/netronome/nfp/bpf/cmsg.c +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/pse-pd/pd692x0.c +10 -35
45 lines not on this page · raw message
drivers/net/pse-pd/pse_core.c +43 -51
94 lines not on this page · raw message
drivers/pci/devres.c +24 -37
61 lines not on this page · raw message
drivers/power/supply/axp20x_battery.c +15 -16
Lines of this file are not shown. View the raw message.
fs/btrfs/extent_io.c +130 -44
174 lines not on this page · raw message
fs/btrfs/subpage.c +25 -177
202 lines not on this page · raw message
kernel/acct.c +84 -50
134 lines not on this page · raw message
kernel/bpf/syscall.c +22 -21
43 lines not on this page · raw message
kernel/sched/ext.c +103 -47
150 lines not on this page · raw message
kernel/trace/trace.c +96 -181
277 lines not on this page · raw message
net/core/flow_dissector.c +29 -20
49 lines not on this page · raw message
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod-events.h +8 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +2 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/raw_tp_null.c new file +25 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/progs/raw_tp_null.c new file +32 -0
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.