Skip to contentSkip to conversation

6.15.3-rc1 review

PATCH In review Greg Kroah-Hartman 21 participants 817 messages Jun 17, 2025 – Jun 24, 2025 Page 1 of 7

Subsystems (10)
lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

cover 6.15.3-rc1 review

This is the start of the stable review cycle for the 6.15.3 release. There are 780 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.

Responses should be made by Thu, 19 Jun 2025 15:22:30 +0000. Anything received after that time might be too late.

The whole patch series can be found in one patch at:

	https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.3-rc1.gz

or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.15.y
and the diffstat can be found below.

thanks,

greg k-h

-------------
Pseudo-Shortlog of commits:

Greg Kroah-Hartman <[email protected]>

    Linux 6.15.3-rc1

Andrew Price <[email protected]>

    gfs2: Don't clear sb->s_fs_info in gfs2_sys_fs_add

Kees Cook <[email protected]>
overflow: Introduce __DEFINE_FLEX for having no initializer

Oliver Neukum <[email protected]>
net: usb: aqc111: debug info before sanitation

Arnd Bergmann <[email protected]>
usb: misc: onboard_usb_dev: fix build warning for CONFIG_USB_ONBOARD_DEV_USB5744=n

Nícolas F. R. A. Prado <[email protected]>
regulator: dt-bindings: mt6357: Drop fixed compatible requirement

Al Viro <[email protected]>
do_move_mount(): split the checks in subtree-of-our-ns and entire-anon cases

Eric Dumazet <[email protected]>
calipso: unlock rcu before returning -EAFNOSUPPORT

Xin Li (Intel) <[email protected]>
x86/fred/signal: Prevent immediate repeat of single step trap on return from SIGTRAP handler

Roman Kisel <[email protected]>
x86/hyperv: Fix APIC ID and VP index confusion in hv_snp_boot_ap()

Thomas Gleixner <[email protected]>
x86/iopl: Cure TIF_IO_BITMAP inconsistencies

Stefano Stabellini <[email protected]>
xen/arm: call uaccess_ttbr0_enable for dm_op hypercall

Dave Chinner <[email protected]>
xfs: don't assume perags are initialised when trimming AGs

Steven Rostedt <[email protected]>

    ring-buffer: Move cpus_read_lock() outside of buffer->mutex

Dmitry Antipov <[email protected]>
ring-buffer: Fix buffer locking in ring_buffer_subbuf_order_set()

Steven Rostedt <[email protected]>
ring-buffer: Do not trigger WARN_ON() due to a commit_overrun

Jens Axboe <[email protected]>
mm/filemap: use filemap_end_dropbehind() for read invalidation

Jens Axboe <[email protected]>

    mm/filemap: gate dropbehind invalidate on folio !dirty && !writeback

Al Viro <[email protected]>
Don't propagate mounts into detached trees

Matthew Wilcox (Oracle) <[email protected]>
9p: Add a migrate_folio method

RD Babiera <[email protected]>
usb: typec: tcpm: move tcpm_queue_vdm_unlocked to asynchronous work

Amit Sunil Dhamne <[email protected]>
usb: typec: tcpm/tcpci_maxim: Fix bounds check in process_rx()

Mathias Nyman <[email protected]>
usb: Flush altsetting 0 endpoints before reinitializating them after reset.

Pawel Laszczak <[email protected]>
usb: cdnsp: Fix issue with detecting USB 3.2 speed

Pawel Laszczak <[email protected]>
usb: cdnsp: Fix issue with detecting command completion event

Jonathan Stroud <[email protected]>
usb: misc: onboard_usb_dev: Fix usb5744 initialization sequence

Jiri Slaby (SUSE) <[email protected]>
tty: serial: 8250_omap: fix TX with DMA for am33xx

Wupeng Ma <[email protected]>
VMCI: fix race between vmci_host_setup_notify and vmci_ctx_unset_notify

Dave Penkler <[email protected]>
usb: usbtmc: Fix read_stb function and get_stb ioctl

Peter Korsgaard <[email protected]>
nvmem: zynqmp_nvmem: unbreak driver after cleanup

Oleg Nesterov <[email protected]>
posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()

Madhavan Srinivasan <[email protected]>
powerpc/kernel: Fix ppc_save_regs inclusion in build

Terry Junge <[email protected]>
HID: usbhid: Eliminate recurrent out-of-bounds bug in usbhid_parse()

David Heimann <[email protected]>
ALSA: usb-audio: Add implicit feedback quirk for RODE AI-1

Takashi Iwai <[email protected]>
ALSA: usb-audio: Kill timer properly at removal

Mike Rapoport (Microsoft) <[email protected]>
Revert "mm/execmem: Unify early execmem_cache behaviour"

Francesco Dolcini <[email protected]>
Revert "wifi: mwifiex: Fix HT40 bandwidth issue."

Suleiman Souhlal <[email protected]>
tools/resolve_btfids: Fix build when cross compiling kernel with clang.

Mike Yuan <[email protected]>

    pidfs: never refuse ppid == 0 in PIDFD_GET_INFO

Benno Lossin <[email protected]>
rust: list: fix path of assert_pinned!

Gary Guo <[email protected]>
rust: compile libcore with edition 2024 for 1.87+

Miguel Ojeda <[email protected]>
objtool/rust: relax slice condition to cover more noreturn Rust functions

Thomas Weißschuh <[email protected]>
uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again

Matthew Wilcox (Oracle) <[email protected]>
block: Fix bvec_set_folio() for very large folios

Matthew Wilcox (Oracle) <[email protected]>
bio: Fix bio_first_folio() for SPARSEMEM without VMEMMAP

Paulo Alcantara <[email protected]>
smb: client: fix perf regression with deferred closes

Keith Busch <[email protected]>
io_uring: consistently use rcu semantics with sqpoll thread

Christoph Hellwig <[email protected]>
block: don't use submit_bio_noacct_nocheck in blk_zone_wplug_bio_work

Penglei Jiang <[email protected]>

    io_uring: fix use-after-free of sq->thread in __io_uring_show_fdinfo()

Ming Lei <[email protected]>

    block: use q->elevator with ->elevator_lock held in elv_iosched_show()

Peter Zijlstra <[email protected]>
perf: Ensure bpf_perf_link path is properly serialized

Pavel Begunkov <[email protected]>
io_uring: fix spurious drain flushing

Daniel Wagner <[email protected]>
nvmet-fcloop: access fcpreq only when holding reqlock

Filipe Manana <[email protected]>
btrfs: exit after state split error at set_extent_bit()

Christian Brauner <[email protected]>
gfs2: pass through holder from the VFS for freeze/thaw

Filipe Manana <[email protected]>
btrfs: fix fsync of files with no hard links not persisting deletion

Zijun Hu <[email protected]>
fs/filesystems: Fix potential unsigned integer underflow in fs_name()

Filipe Manana <[email protected]>
btrfs: exit after state insertion failure at btrfs_convert_extent_bit()

Lucas De Marchi <[email protected]>
drm/xe/lrc: Use a temporary buffer for WA BB

Gal Pressman <[email protected]>
net: ethtool: Don't check if RSS context exists in case of context 0

Jakub Kicinski <[email protected]>
net: drv: netdevsim: don't napi_complete() from netpoll

Eric Dumazet <[email protected]>
net_sched: ets: fix a race in ets_qdisc_change()

Eric Dumazet <[email protected]>
net_sched: tbf: fix a race in tbf_change()

Eric Dumazet <[email protected]>
net_sched: red: fix a race in __red_change()

Eric Dumazet <[email protected]>
net_sched: prio: fix a race in prio_tune()

Maxime Chevallier <[email protected]>
net: phy: phy_caps: Don't skip better duplex macth on non-exact match

Shahar Shitrit <[email protected]>
net/mlx5e: Fix number of lanes to UNKNOWN when using data_rate_oper

Jianbo Liu <[email protected]>
net/mlx5e: Fix leak of Geneve TLV option object

Vlad Dogaru <[email protected]>
net/mlx5: HWS, make sure the uplink is the last destination

Yevgeny Kliteynik <[email protected]>
net/mlx5: HWS, fix missing ip_version handling in definer

Patrisious Haddad <[email protected]>
net/mlx5: Fix return value when searching for existing flow group

Amir Tzin <[email protected]>
net/mlx5: Fix ECVF vports unload on shutdown flow

Moshe Shemesh <[email protected]>
net/mlx5: Ensure fw pages are always allocated on same NUMA

Luiz Augusto von Dentz <[email protected]>
Bluetooth: MGMT: Fix sparse errors

Luiz Augusto von Dentz <[email protected]>
Bluetooth: eir: Fix possible crashes on eir_create_adv_data

Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_sync: Fix broadcast/PA when using an existing instance

Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix NULL pointer deference on eir_get_service_data

Jakub Raczynski <[email protected]>
net/mdiobus: Fix potential out-of-bounds clause 45 read/write access

Jakub Raczynski <[email protected]>
net/mdiobus: Fix potential out-of-bounds read/write access

Carlos Fernandez <[email protected]>
macsec: MACsec SCI assignment for ES = 0

Gustavo Luiz Duarte <[email protected]>

    netconsole: fix appending sysdata when sysdata_fields == SYSDATA_RELEASE

Michal Luczaj <[email protected]>
net: Fix TOCTOU issue in sk_is_readable()

Yunhui Cui <[email protected]>
ACPI: CPPC: Fix NULL pointer dereference when nosmp is used

Joe Damato <[email protected]>
e1000: Move cancel_work_sync to avoid deadlock

Anton Nadezhdin <[email protected]>
ice/ptp: fix crosstimestamp reporting

Ahmed Zaki <[email protected]>
iavf: fix reset_task for early reset event

Robert Malz <[email protected]>
i40e: retry VFLR handling if there is ongoing VF reset

Robert Malz <[email protected]>
i40e: return false from i40e_reset_vf if reset is in progress

Chen-Yu Tsai <[email protected]>
pinctrl: sunxi: dt: Consider pin base when calculating bank number from pin

Martin Blumenstingl <[email protected]>
drm/meson: fix more rounding issues with 59.94Hz modes

Martin Blumenstingl <[email protected]>
drm/meson: use vclk_freq instead of pixel_freq in debug print

Martin Blumenstingl <[email protected]>
drm/meson: fix debug log statement when setting the HDMI clocks

Gabriel Dalimonte <[email protected]>
drm/vc4: fix infinite EPROBE_DEFER loop

Haren Myneni <[email protected]>
powerpc/vas: Return -EINVAL if the offset is non-zero in mmap()

Ritesh Harjani (IBM) <[email protected]>
powerpc/powernv/memtrace: Fix out of bounds issue in memtrace mmap

Eric Dumazet <[email protected]>
net_sched: sch_sfq: fix a potential crash on gso_skb handling

Alok Tiwari <[email protected]>
scsi: iscsi: Fix incorrect error path labels for flashnode operations

Lizhi Hou <[email protected]>
accel/amdxdna: Fix incorrect PSP firmware size

Wojciech Slenska <[email protected]>
pinctrl: qcom: pinctrl-qcm2290: Add missing pins

Félix Piédallu <[email protected]>
spi: omap2-mcspi: Disable multi-mode when the previous message kept CS asserted

Félix Piédallu <[email protected]>
spi: omap2-mcspi: Disable multi mode when CS should be kept asserted after message

Dan Carpenter <[email protected]>
regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt()

Miaoqing Pan <[email protected]>
wifi: ath12k: fix uaf in ath12k_core_init()

Baochen Qiang <[email protected]>
wifi: ath12k: fix GCC_GCC_PCIE_HOT_RST definition for WCN7850

P Praneesh <[email protected]>
wifi: ath12k: refactor ath12k_hw_regs structure

Rodrigo Gobbi <[email protected]>
wifi: ath11k: validate ath11k_crypto_mode on top of ath11k_core_qmi_firmware_ready

Baochen Qiang <[email protected]>
wifi: ath11k: move some firmware stats related functions outside of debugfs

Baochen Qiang <[email protected]>
wifi: ath11k: don't wait when there is no vdev started

Baochen Qiang <[email protected]>
wifi: ath11k: don't use static variables in ath11k_debugfs_fw_stats_process()

Baochen Qiang <[email protected]>
wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request()

Caleb Connolly <[email protected]>
ath10k: snoc: fix unbalanced IRQ enable in crash recovery

Jeongjun Park <[email protected]>

    ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use()

Jonas Gorski <[email protected]>
net: dsa: b53: fix untagged traffic sent via cpu tagged with VID 0

Luiz Augusto von Dentz <[email protected]>
Bluetooth: MGMT: Protect mgmt_pending list with its own lock

Luiz Augusto von Dentz <[email protected]>
Bluetooth: MGMT: Fix UAF on mgmt_remove_adv_monitor_complete

Chandrashekar Devegowda <[email protected]>
Bluetooth: btintel_pcie: Reduce driver buffer posting to prevent race condition

Chandrashekar Devegowda <[email protected]>
Bluetooth: btintel_pcie: Increase the tx and rx descriptor count

Kiran K <[email protected]>
Bluetooth: btintel_pcie: Fix driver not posting maximum rx buffers

Pauli Virtanen <[email protected]>
Bluetooth: hci_core: fix list_for_each_entry_rcu usage

Sanjeev Yadav <[email protected]>
scsi: core: ufs: Fix a hang in the error handler

Peter Griffin <[email protected]>
pinctrl: samsung: add gs101 specific eint suspend/resume callbacks

Peter Griffin <[email protected]>
pinctrl: samsung: add dedicated SoC eint suspend/resume callbacks

Peter Griffin <[email protected]>
pinctrl: samsung: refactor drvdata suspend & resume callbacks

Gautham R. Shenoy <[email protected]>
tools/power turbostat: Fix AMD package-energy reporting

Petr Pavlu <[email protected]>
genksyms: Fix enum consts from a reference affecting new values

Al Viro <[email protected]>
do_change_type(): refuse to operate on unmounted/not ours mounts

Al Viro <[email protected]>
clone_private_mnt(): make sure that caller has CAP_SYS_ADMIN in the right userns

KONDO KAZUMA(近藤 和真) <[email protected]>
fs: allow clone_private_mount() for a path on real rootfs

Al Viro <[email protected]>
fix propagation graph breakage by MOVE_MOUNT_SET_GROUP move_mount(2)

Al Viro <[email protected]>
finish_automount(): don't leak MNT_LOCKED from parent to child

Stephen Brennan <[email protected]>
fs: convert mount flags to enum

Al Viro <[email protected]>
path_overmount(): avoid false negatives

Al Viro <[email protected]>
fs/fhandle.c: fix a race in call of has_locked_children()

Nitesh Shetty <[email protected]>
iov_iter: use iov_offset for length calculation in iov_iter_aligned_bvec

Yuuki NAGAO <[email protected]>

    ASoC: ti: omap-hdmi: Re-add dai_link->platform to fix card init

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Verify content returned by parse_int_array()

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Verify kcalloc() status when setting constraints

Amadeusz Sławiński <[email protected]>
ASoC: Intel: avs: Fix paths in MODULE_FIRMWARE hints

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Relocate DSP status registers

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Read HW capabilities when possible

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Ignore Vendor-space manipulation for ACE

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Fix possible null-ptr-deref when initing hw

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Fix PPLCxFMT calculation

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: PCM operations for LNL-based platforms

Cezary Rojewski <[email protected]>
ALSA: hda: Allow to fetch hlink by ID

Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Fix deadlock when the failing IPC is SET_D0IX

Cezary Rojewski <[email protected]>
ASoC: codecs: hda: Fix RPM usage count underflow

Nitin Rawat <[email protected]>
scsi: ufs: qcom: Prevent calling phy_exit() before phy_init()

Can Guo <[email protected]>
scsi: ufs: qcom: Map devfreq OPP freq to UniPro Core Clock freq

Ziqi Chen <[email protected]>
scsi: ufs: qcom: Check gear against max gear in vop freq_to_gear()

Nylon Chen <[email protected]>
riscv: misaligned: fix sleeping function called during misaligned access handling

Daniele Ceraolo Spurio <[email protected]>
drm/xe/pxp: Clarify PXP queue creation behavior if PXP is not ready

Daniele Ceraolo Spurio <[email protected]>
drm/xe/pxp: Use the correct define in the set_property_funcs array

Thomas Hellström <[email protected]>
drm/xe: Rework eviction rejection of bound external bos

Arnd Bergmann <[email protected]>
drm/xe/vsec: fix CONFIG_INTEL_VSEC dependency

Matthew Auld <[email protected]>
drm/xe/vm: move xe_svm_init() earlier

Ido Schimmel <[email protected]>
seg6: Fix validation of nexthop addresses

Eric Dumazet <[email protected]>
net: prevent a NULL deref in rtnl_create_link()

Eric Dumazet <[email protected]>
net: annotate data-races around cleanup_net_task

Jakub Kicinski <[email protected]>
selftests: drv-net: tso: make bkg() wait for socat to quit

Jakub Kicinski <[email protected]>
selftests: drv-net: tso: fix the GRE device name

Mirco Barone <[email protected]>
wireguard: device: enable threaded NAPI

Jakub Kicinski <[email protected]>
netlink: specs: rt-link: decode ip6gre

Jakub Kicinski <[email protected]>
netlink: specs: rt-link: add missing byte-order properties

Daniele Palmas <[email protected]>
net: wwan: mhi_wwan_mbim: use correct mux_id for multiplexing

Lachlan Hodges <[email protected]>
wifi: cfg80211/mac80211: correctly parse S1G beacon optional elements

Jonas Gorski <[email protected]>
net: dsa: b53: do not touch DLL_IQQD on bcm53115

Jonas Gorski <[email protected]>
net: dsa: b53: allow RGMII for bcm63xx RGMII ports

Jonas Gorski <[email protected]>
net: dsa: b53: do not configure bcm63xx's IMP port interface

Jonas Gorski <[email protected]>
net: dsa: b53: implement setting ageing time

Jonas Gorski <[email protected]>
net: dsa: b53: do not enable RGMII delay on bcm63xx

Jonas Gorski <[email protected]>
net: dsa: b53: do not enable EEE on bcm63xx

Meghana Malladi <[email protected]>
net: ti: icssg-prueth: Fix swapped TX stats for MII interfaces.

Florian Westphal <[email protected]>
netfilter: nf_nat: also check reverse tuple to obtain clashing entry

Florian Westphal <[email protected]>
netfilter: nf_set_pipapo_avx2: fix initial map fill

Michael Walle <[email protected]>
drm/panel-simple: fix the warnings for the Evervision VGG644804

Miri Korenblit <[email protected]>
wifi: iwlwifi: mld: avoid panic on init failure

Dibin Moolakadan Subrahmanian <[email protected]>
drm/i915/display: Fix u32 overflow in SNPS PHY HDMI PLL setup

Alok Tiwari <[email protected]>
gve: add missing NULL check for gve_alloc_pending_packet() in TX DQO

Pavel Begunkov <[email protected]>
nvme: fix implicit bool to flags conversion

Keith Busch <[email protected]>
nvme: fix command limits status code

Caleb Sander Mateos <[email protected]>
block: flip iter directions in blk_rq_integrity_map_user()

Rafael J. Wysocki <[email protected]>
PM: sleep: Fix power.is_suspended cleanup for direct-complete devices

Vitaly Prosyak <[email protected]>
drm/amdgpu/gfx10: Refine Cleaner Shader for GFX10.1.10

Przemek Kitszel <[email protected]>
iavf: get rid of the crit lock

Przemek Kitszel <[email protected]>
iavf: sprinkle netdev_assert_locked() annotations

Przemek Kitszel <[email protected]>
iavf: extract iavf_watchdog_step() out of iavf_watchdog_task()

Przemek Kitszel <[email protected]>
iavf: simplify watchdog_task in terms of adminq task scheduling

Przemek Kitszel <[email protected]>
iavf: centralize watchdog requeueing itself

Przemek Kitszel <[email protected]>
iavf: iavf_suspend(): take RTNL before netdev_lock()

Lorenzo Bianconi <[email protected]>
net: airoha: Initialize PPE UPDMEM source-mac table

Lorenzo Bianconi <[email protected]>
net: airoha: Add the capability to allocate hfwd descriptors in SRAM

Bui Quang Minh <[email protected]>
selftests: net: build net/lib dependency in all target

Ronak Doshi <[email protected]>
vmxnet3: correctly report gso type for UDP tunnels

Jinjian Song <[email protected]>
net: wwan: t7xx: Fix napi rx poll issue

Shiming Cheng <[email protected]>
net: fix udp gso skb_segment after pull from frag_list

Yongting Lin <[email protected]>
um: Fix tgkill compile error on old host OSes

Jesus Narvaez <[email protected]>
drm/i915/guc: Handle race condition where wakeref count drops below 0

Jouni Högander <[email protected]>
drm/i915/psr: Fix using wrong mask in REG_FIELD_PREP

Jesus Narvaez <[email protected]>
drm/i915/guc: Check if expecting reply before decrementing outstanding_submission_g2h

Paul Chaignon <[email protected]>
bpf: Fix L4 csum update on IPv6 in CHECKSUM_COMPLETE

Paul Chaignon <[email protected]>
bpf: Clarify the meaning of BPF_F_PSEUDO_HDR

Paul Chaignon <[email protected]>
net: Fix checksum update for ILA adj-transport

Alexis Lothoré <[email protected]>
net: stmmac: make sure that ptp_rate is not 0 before configuring EST

Alexis Lothoré <[email protected]>
net: stmmac: make sure that ptp_rate is not 0 before configuring timestamping

Álvaro Fernández Rojas <[email protected]>
net: dsa: tag_brcm: legacy: fix pskb_may_pull length

Emil Tantilov <[email protected]>
idpf: avoid mailbox timeout delays during reset

Brian Vazquez <[email protected]>
idpf: fix a race in txq wakeup

Michal Kubiak <[email protected]>
ice: fix rebuilding the Tx scheduler tree for large queue counts

Michal Kubiak <[email protected]>
ice: create new Tx scheduler nodes for new queues only

Michal Kubiak <[email protected]>
ice: fix Tx scheduler error handling in XDP callback

Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION

Dmitry Antipov <[email protected]>
Bluetooth: MGMT: reject malformed HCI_CMD_SYNC commands

Álvaro Fernández Rojas <[email protected]>
spi: bcm63xx-hsspi: fix shared reset

Álvaro Fernández Rojas <[email protected]>
spi: bcm63xx-spi: fix shared reset

Yu Kuai <[email protected]>
md/raid1,raid10: don't handle IO error for REQ_RAHEAD and REQ_NOWAIT

Horatiu Vultur <[email protected]>
net: lan966x: Make sure to insert the vlan tags also in host mode

Dan Carpenter <[email protected]>
net/mlx4_en: Prevent potential integer overflow calculating Hz

Yanqing Wang <[email protected]>
driver: net: ethernet: mtk_star_emac: fix suspend/resume issue

Charalampos Mitrodimas <[email protected]>
net: tipc: fix refcount warning in tipc_aead_encrypt

Alok Tiwari <[email protected]>
gve: Fix RX_BUFFERS_POSTED stat to report per-queue fill_cnt

Quentin Schulz <[email protected]>
net: stmmac: platform: guarantee uniqueness of bus_id

Dong Chenchen <[email protected]>
page_pool: Fix use-after-free in page_pool_recycle_in_ring

Tengteng Yang <[email protected]>
Fix sock_exceed_buf_limit not being triggered in __sk_mem_raise_allocated

Rodrigo Vivi <[email protected]>
drm/xe: Add missing documentation of rpa_freq

Rodrigo Vivi <[email protected]>
drm/xe: Make xe_gt_freq part of the Documentation

Heiko Stuebner <[email protected]>
drm/bridge: analogix_dp: Fix clk-disable removal

Damon Ding <[email protected]>
drm/bridge: analogix_dp: Add support to get panel from the DP AUX bus

Damon Ding <[email protected]>
drm/bridge: analogix_dp: Remove CONFIG_PM related check in analogix_dp_bind()/analogix_dp_unbind()

Karol Wachowski <[email protected]>
accel/ivpu: Reorder Doorbell Unregister and Command Queue Destruction

Damon Ding <[email protected]>
drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing

Nicolas Frattaroli <[email protected]>
drm/connector: only call HDMI audio helper plugged cb if non-null

Ming Lei <[email protected]>
loop: add file_start_write() and file_end_write()

Greg Kroah-Hartman <[email protected]>
USB: typec: fix const issue in typec_match()

Greg Kroah-Hartman <[email protected]>
USB: gadget: udc: fix const issue in gadget_match_driver()

Greg Kroah-Hartman <[email protected]>
USB: serial: bus: fix const issue in usb_serial_device_match()

Marcus Folkesson <[email protected]>
iio: adc: mcp3911: fix device dependent mappings for conversion result registers

Marius Cristea <[email protected]>
iio: adc: PAC1934: fix typo in documentation link

Hans de Goede <[email protected]>
mei: vsc: Cast tx_buf to (__be32 *) when passed to cpu_to_be32_array()

Roxana Nicolescu <[email protected]>
char: tlclk: Fix correct sysfs directory path for tlclk

Roxana Nicolescu <[email protected]>
misc: lis3lv02d: Fix correct sysfs directory path for lis3lv02d

Christian Schrefl <[email protected]>
rust: miscdevice: fix typo in MiscDevice::ioctl documentation

Dave Penkler <[email protected]>
staging: gpib: Fix secondary address restriction

Dave Penkler <[email protected]>
staging: gpib: Fix PCMCIA config identifier

Nicolas Pitre <[email protected]>
vt: remove VT_RESIZE and VT_RESIZEX from vt_compat_ioctl()

Yeoreum Yun <[email protected]>
coresight: prevent deactivate active config while enabling the config

Yeoreum Yun <[email protected]>
coresight: holding cscfg_csdev_lock while removing cscfg from csdev

Yeoreum Yun <[email protected]>
coresight/etm4: fix missing disable active config

Leo Yan <[email protected]>
coresight: etm4x: Fix timestamp bit field handling

Mao Jinlong <[email protected]>
coresight: tmc: fix failure to disable/enable ETF after reading

Antoniu Miclaus <[email protected]>
iio: adc: ad4851: fix ad4858 chan pointer handling

Angelo Dureghello <[email protected]>
iio: dac: adi-axi-dac: fix bus read

Qasim Ijaz <[email protected]>
fpga: fix potential null pointer deref in fpga_mgr_test_img_load_sgt()

Alexander Sverdlin <[email protected]>
counter: interrupt-cnt: Protect enable/disable OPs with mutex

Yabin Cui <[email protected]>
coresight: core: Disable helpers for devices that fail to enable

Yabin Cui <[email protected]>
coresight: catu: Introduce refcount and spinlock for enabling/disabling

Junhao He <[email protected]>
coresight: Fixes device's owner field for registered using coresight_init_driver()

WangYuli <[email protected]>
MIPS: Loongson64: Add missing '#interrupt-cells' for loongson64c_ls7a

Chenyuan Yang <[email protected]>
usb: acpi: Prevent null pointer dereference in usb_acpi_add_usb4_devlink()

Uwe Kleine-König <[email protected]>
iio: adc: ad7124: Fix 3dB filter frequency reading

Brian Pellegrino <[email protected]>

    iio: filter: admv8818: Support frequencies >= 2^32

Sam Winchenbach <[email protected]>
iio: filter: admv8818: fix range calculation

Sam Winchenbach <[email protected]>
iio: filter: admv8818: fix integer overflow

Sam Winchenbach <[email protected]>

    iio: filter: admv8818: fix band 4, state 15

Mario Limonciello <[email protected]>
thunderbolt: Fix a logic error in wake on connect

Henry Martin <[email protected]>
serial: Fix potential null-ptr-deref in mlb_usio_probe()

Lad Prabhakar <[email protected]>
usb: renesas_usbhs: Reorder clock handling and power management in probe

Andrea Righi <[email protected]>
sched_ext: idle: Skip cross-node search with !CONFIG_NUMA

Jerome Brunet <[email protected]>
PCI: endpoint: Retain fixed-size BAR size as well as aligned size

Miguel Ojeda <[email protected]>
rust: pci: fix docs related to missing Markdown code spans

Liu Dalin <[email protected]>
rtc: loongson: Add missing alarm notifications for ACPI RTC events

Brian Norris <[email protected]>
PCI/pwrctrl: Cancel outstanding rescan work when unregistering

Bjorn Helgaas <[email protected]>
PCI/DPC: Log Error Source ID only when valid

Bjorn Helgaas <[email protected]>
PCI/DPC: Initialize aer_err_info before using it

Zhe Qiao <[email protected]>
PCI/ACPI: Fix allocated memory release on error in pci_acpi_scan_root()

Henry Martin <[email protected]>
dmaengine: ti: Add NULL check in udma_probe()

Bard Liao <[email protected]>
soundwire: only compute port params in specific stream states

Kathiravan Thirumoorthy <[email protected]>
phy: qcom-qusb2: reuse the IPQ6018 settings for IPQ5424

Kathiravan Thirumoorthy <[email protected]>
Revert "phy: qcom-qusb2: add QUSB2 support for IPQ5424"

Chenyuan Yang <[email protected]>
phy: qcom-qmp-usb: Fix an NULL vs IS_ERR() bug

Mario Limonciello <[email protected]>
PCI: Explicitly put devices into D0 when initializing

Richard Zhu <[email protected]>
PCI: imx6: Save and restore the LUT setting during suspend/resume for i.MX95 SoC

Hector Martin <[email protected]>
PCI: apple: Use gpiod_set_value_cansleep in probe flow

Hans Zhang <[email protected]>
PCI: cadence: Fix runtime atomic count underflow

Jerome Brunet <[email protected]>
PCI: rcar-gen4: set ep BAR4 fixed size

Jensen Huang <[email protected]>
PCI: rockchip: Fix order of rockchip_pci_core_rsts

Wilfred Mallawa <[email protected]>
PCI: Print the actual delay time in pci_bridge_wait_for_secondary_bus()

Lukas Wunner <[email protected]>
PCI: pciehp: Ignore Link Down/Up caused by Secondary Bus Reset

Lukas Wunner <[email protected]>
PCI: pciehp: Ignore Presence Detect Changed caused by DPC

Cristian Ciocaltea <[email protected]>

    phy: rockchip: samsung-hdptx: Do no set rk_hdptx_phy->rate in case of errors

Cristian Ciocaltea <[email protected]>
phy: rockchip: samsung-hdptx: Fix clock ratio setup

Wolfram Sang <[email protected]>
rtc: sh: assign correct interrupts with DT

Danilo Krummrich <[email protected]>
rust: alloc: add missing invariant in Vec::set_len()

Pali Rohár <[email protected]>
cifs: Fix validation of SMB1 query reparse point response

Ian Rogers <[email protected]>
perf callchain: Always populate the addr_location map when adding IP

Amir Goldstein <[email protected]>

    exportfs: require ->fh_to_parent() to encode connectable file handles

Pekka Ristola <[email protected]>
rust: file: mark LocalFile as repr(transparent)

Alistair Popple <[email protected]>
fs/dax: Fix "don't skip locked entries when scanning entries"

Anubhav Shelat <[email protected]>
perf trace: Set errpid to false for rseq and set_robust_list

NeilBrown <[email protected]>
nfs_localio: change nfsd_file_put_local() to take a pointer to __rcu pointer

NeilBrown <[email protected]>
nfs_localio: protect race between nfs_uuid_put() and nfs_close_local_fh()

NeilBrown <[email protected]>
nfs_localio: duplicate nfs_close_local_fh()

NeilBrown <[email protected]>
nfs_localio: simplify interface to nfsd for getting nfsd_file

NeilBrown <[email protected]>
nfs_localio: always hold nfsd net ref with nfsd_file ref

NeilBrown <[email protected]>
nfs_localio: use cmpxchg() to install new nfs_file_localio

NeilBrown <[email protected]>
nfs: fix incorrect handling of large-number NFS errors in nfs4_do_mkdir()

Li Lingfeng <[email protected]>
nfs: ignore SB_RDONLY when remounting nfs

Li Lingfeng <[email protected]>
nfs: clear SB_RDONLY before getting superblock

Anubhav Shelat <[email protected]>
perf trace: Always print return value for syscalls returning a pid

Dapeng Mi <[email protected]>
perf record: Fix incorrect --user-regs comments

David Hildenbrand <[email protected]>
s390/uv: Improve splitting of large folios that cannot be split while dirty

David Hildenbrand <[email protected]>
s390/uv: Always return 0 from s390_wiggle_split_folio() if successful

David Hildenbrand <[email protected]>
s390/uv: Don't return 0 from make_hva_secure() if the operation was not successful

Ian Rogers <[email protected]>
perf symbol: Fix use-after-free in filename__read_build_id

Ian Rogers <[email protected]>
perf pmu: Avoid segv for missing name/alias_name in wildcarding

Jens Axboe <[email protected]>
iomap: don't lose folio dropbehind state for overwrites

Jason-JH Lin <[email protected]>
mailbox: mtk-cmdq: Refine GCE_GCTL_VALUE setting

Peng Fan <[email protected]>
mailbox: imx: Fix TXDB_V2 sending

Yue Haibing <[email protected]>
mailbox: mchp-ipc-sbi: Fix COMPILE_TEST build error

Leo Yan <[email protected]>
perf tests switch-tracking: Fix timestamp comparison

David Howells <[email protected]>
netfs: Fix undifferentiation of DIO reads from unbuffered reads

Alexey Gladkov <[email protected]>
mfd: stmpe-spi: Correct the name used in MODULE_DEVICE_TABLE

Christophe JAILLET <[email protected]>
mfd: exynos-lpass: Fix another error handling path in exynos_lpass_probe()

Christophe JAILLET <[email protected]>
mfd: exynos-lpass: Avoid calling exynos_lpass_disable() twice in exynos_lpass_remove()

Christophe JAILLET <[email protected]>
mfd: exynos-lpass: Fix an error handling path in exynos_lpass_probe()

David Howells <[email protected]>
netfs: Fix wait/wake to be consistent about the waitqueue used

David Howells <[email protected]>
netfs: Fix the request's work item to not require a ref

Paulo Alcantara <[email protected]>
netfs: Fix setting of transferred bytes with short DIO reads

David Howells <[email protected]>
netfs: Fix oops in write-retry from mis-resetting the subreq iterator

Dan Carpenter <[email protected]>
rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()

Beleswar Padhi <[email protected]>
remoteproc: k3-r5: Refactor sequential core power up/down operations

Siddharth Vadapalli <[email protected]>

    remoteproc: k3-dsp: Drop check performed in k3_dsp_rproc_{mbox_callback/kick}

Siddharth Vadapalli <[email protected]>

    remoteproc: k3-r5: Drop check performed in k3_r5_rproc_{mbox_callback/kick}

James Clark <[email protected]>
perf tools: Fix arm64 source package build

Dan Carpenter <[email protected]>
remoteproc: qcom_wcnss_iris: Add missing put_device() on error in probe

Adrian Hunter <[email protected]>
perf scripts python: exported-sql-viewer.py: Fix pattern matching with Python 3

Adrian Hunter <[email protected]>
perf intel-pt: Fix PEBS-via-PT data_src

Michael Petlan <[email protected]>
perf tests: Fix 'perf report' tests installation

Namhyung Kim <[email protected]>
perf trace: Fix leaks of 'struct thread' in set_filter_loop_pids()

Namhyung Kim <[email protected]>
perf trace: Fix leaks of 'struct thread' in fprintf_sys_enter()

Benjamin Marzinski <[email protected]>
dm-flakey: make corrupting read bios work

Benjamin Marzinski <[email protected]>
dm-flakey: error all IOs when num_features is absent

Benjamin Marzinski <[email protected]>
dm: limit swapping tables for devices with zone write plugs

Benjamin Marzinski <[email protected]>
dm: fix dm_blk_report_zones

Ian Rogers <[email protected]>
perf symbol-minimal: Fix double free in filename__read_build_id

Alexei Safin <[email protected]>
hwmon: (asus-ec-sensors) check sensor index in read_string()

Mikhail Arkhipov <[email protected]>
mtd: nand: ecc-mxic: Fix use of uninitialized variable ret

Thomas Richter <[email protected]>
perf tests metric-only perf stat: Fix tests 84 and 86 s390

Ian Rogers <[email protected]>
perf tool_pmu: Fix aggregation on duration_time

Sean Christopherson <[email protected]>
x86/irq: Ensure initial PIR loads are performed exactly once

Geert Uytterhoeven <[email protected]>
HID: HID_APPLETB_BL should depend on X86

Geert Uytterhoeven <[email protected]>
HID: HID_APPLETB_KBD should depend on X86

Wentao Guan <[email protected]>
HID: intel-thc-hid: intel-quicki2c: pass correct arguments to acpi_evaluate_object

Henry Martin <[email protected]>
backlight: pm8941: Add NULL check in wled_configure()

Benjamin Marzinski <[email protected]>
dm: handle failures in dm_table_set_restrictions

Benjamin Marzinski <[email protected]>
dm: free table mempools if not used in __bind

Benjamin Marzinski <[email protected]>
dm: don't change md if dm_table_set_restrictions() fails

Arnaldo Carvalho de Melo <[email protected]>

    perf ui browser hists: Set actions->thread before calling do_zoom_thread()

Arnaldo Carvalho de Melo <[email protected]>
tools build: Don't show libbfd build status as it is opt-in

Arnaldo Carvalho de Melo <[email protected]>
perf build: Warn when libdebuginfod devel files are not available

Arnaldo Carvalho de Melo <[email protected]>
tools build: Don't show libunwind build status as it is opt-in

Arnaldo Carvalho de Melo <[email protected]>
tools build: Don't set libunwind as available if test-all.c build succeeds

Kees Cook <[email protected]>
randstruct: gcc-plugin: Fix attribute addition

Kees Cook <[email protected]>
randstruct: gcc-plugin: Remove bogus void member

Henry Martin <[email protected]>
watchdog: lenovo_se30_wdt: Fix possible devm_ioremap() NULL pointer dereference in lenovo_se30_wdt_probe()

Sergey Shtylyov <[email protected]>
fbdev: core: fbcvt: avoid division by 0 in fb_cvt_hperiod()

Kees Cook <[email protected]>
ubsan: integer-overflow: depend on BROKEN to keep this out of CI

Henry Martin <[email protected]>
soc: aspeed: Add NULL check in aspeed_lpc_enable_snoop()

Su Hui <[email protected]>
soc: aspeed: lpc: Fix impossible judgment condition

Joel Stanley <[email protected]>
ARM: aspeed: Don't select SRAM

Julien Massot <[email protected]>
arm64: dts: mt6359: Rename RTC node to match binding expectations

Thuan Nguyen <[email protected]>
arm64: dts: renesas: white-hawk-ard-audio: Fix TPU0 groups

Konrad Dybcio <[email protected]>
arm64: dts: qcom: qcs615: Fix up UFS clocks

Konrad Dybcio <[email protected]>
arm64: dts: qcom: msm8998: Remove mdss_hdmi_phy phandle argument

Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: msm8998: Use the header with DSI phy clock IDs

Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: qcm2290: fix (some) of QUP interconnects

Quentin Schulz <[email protected]>
arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma with Haikou

Quentin Schulz <[email protected]>
arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma

Pengyu Luo <[email protected]>
arm64: dts: qcom: sm8650: add the missing l2 cache node

Vignesh Raman <[email protected]>
arm64: defconfig: mediatek: enable PHY drivers

Dmitry Baryshkov <[email protected]>
ARM: dts: qcom: apq8064: move replicator out of soc node

Dmitry Baryshkov <[email protected]>
ARM: dts: qcom: apq8064 merge hw splinlock into corresponding syscon device

Dmitry Baryshkov <[email protected]>
ARM: dts: qcom: apq8064: add missing clocks to the timer node

Andre Przywara <[email protected]>
dt-bindings: vendor-prefixes: Add Liontron name

Robin Murphy <[email protected]>
bus: fsl_mc: Fix driver_managed_dma check

Ioana Ciornei <[email protected]>
bus: fsl-mc: fix double-free on mc_dev

Ryusuke Konishi <[email protected]>
nilfs2: do not propagate ENOENT error from nilfs_btree_propagate()

Wentao Liang <[email protected]>
nilfs2: add pointer check for nilfs_direct_propagate()

Murad Masimov <[email protected]>
ocfs2: fix possible memory leak in ocfs2_finish_quota_recovery

Phillip Lougher <[email protected]>
Squashfs: check return result of sb_min_blocksize

Barnabás Czémán <[email protected]>
soc: qcom: smp2p: Fix fallback to qcom,ipc parse

Prasanth Babu Mantena <[email protected]>

    arm64: dts: ti: k3-j721e-common-proc-board: Enable OSPI1 on J721E

Aaron Kling <[email protected]>
arm64: tegra: Add uartd serial alias for Jetson TX1 module

Aaron Kling <[email protected]>
arm64: tegra: Drop remaining serial clock-names and reset-names

Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: white-hawk-single: Improve Ethernet TSN description

Peter Robinson <[email protected]>
arm64: dts: rockchip: Update eMMC for NanoPi R5 series

Andre Przywara <[email protected]>
arm64: dts: allwinner: a100: set maximum MMC frequency

Peter Robinson <[email protected]>
arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c

Abel Vesa <[email protected]>
arm64: dts: qcom: x1e001de-devkit: Fix pin config for USB0 retimer vregs

Abel Vesa <[email protected]>
arm64: dts: qcom: x1e001de-devkit: Describe USB retimers resets pin configs

Alexey Minnekhanov <[email protected]>

    arm64: dts: qcom: sda660-ifc6560: Fix dt-validate warning

Alexey Minnekhanov <[email protected]>
arm64: dts: qcom: sdm660-lavender: Add missing USB phy supply

Julien Massot <[email protected]>
arm64: dts: mt6359: Add missing 'compatible' property to regulators node

Louis-Alexis Eyraud <[email protected]>
arm64: dts: mediatek: mt8390-genio-common: Set ssusb2 default dual role mode to host

Nícolas F. R. A. Prado <[email protected]>
arm64: dts: mediatek: mt6357: Drop regulator-fixed compatibles

Adam Ford <[email protected]>
arm64: dts: imx8mn-beacon: Set SAI5 MCLK direction to output for HDMI audio

Adam Ford <[email protected]>
arm64: dts: imx8mm-beacon: Set SAI5 MCLK direction to output for HDMI audio

Adam Ford <[email protected]>
arm64: dts: imx8mp-beacon: Fix RTC capacitive load

Adam Ford <[email protected]>
arm64: dts: imx8mn-beacon: Fix RTC capacitive load

Adam Ford <[email protected]>
arm64: dts: imx8mm-beacon: Fix RTC capacitive load

Pin-yen Lin <[email protected]>

    arm64: dts: mt8183: Add port node to mt8183.dtsi

André Draszik <[email protected]>
firmware: exynos-acpm: silence EPROBE_DEFER error on boot

André Draszik <[email protected]>
firmware: exynos-acpm: fix reading longer results

Alexey Minnekhanov <[email protected]>
arm64: dts: qcom: sdm660-xiaomi-lavender: Add missing SD card detect GPIO

AngeloGioacchino Del Regno <[email protected]>
arm64: dts: mediatek: mt8195: Reparent vdec1/2 and venc1 power domains

Chen-Yu Tsai <[email protected]>
arm64: dts: mediatek: mt8188: Fix IOMMU device for rdma0

Wolfram Sang <[email protected]>
ARM: dts: at91: at91sam9263: fix NAND chip selects

Wolfram Sang <[email protected]>
ARM: dts: at91: usb_a9263: fix GPIO for Dataflash chip select

Chukun Pan <[email protected]>
arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588

Chukun Pan <[email protected]>
arm64: dts: rockchip: Add missing uart3 interrupt for RK3528

Luca Weiss <[email protected]>
arm64: dts: qcom: sm8650: Fix domain-idle-state for CPU2

Tingguo Cheng <[email protected]>
arm64: dts: qcom: qcs615: remove disallowed property in spmi bus node

Varadarajan Narayanan <[email protected]>
arm64: dts: qcom: ipq9574: Fix USB vdd info

Stephan Gerhold <[email protected]>

    arm64: dts: qcom: sc8280xp-x13s: Drop duplicate DMIC supplies

Jyothi Kumar Seerapu <[email protected]>
arm64: dts: qcom: sm8750: Correct clocks property for uart14 node

Xilin Wu <[email protected]>
arm64: dts: qcom: sm8250: Fix CPU7 opp table

Maulik Shah <[email protected]>
arm64: dts: qcom: sm8750: Fix cluster hierarchy for idle states

Manikanta Mylavarapu <[email protected]>
arm64: dts: qcom: ipq9574: fix the msi interrupt numbers of pcie3

Luca Weiss <[email protected]>
arm64: dts: qcom: sm8350: Reenable crypto & cryptobam

Dzmitry Sankouski <[email protected]>
arm64: dts: qcom: sdm845-starqltechn: remove excess reserved gpios

Dzmitry Sankouski <[email protected]>
arm64: dts: qcom: sdm845-starqltechn: refactor node order

Dzmitry Sankouski <[email protected]>
arm64: dts: qcom: sdm845-starqltechn: fix usb regulator mistake

Dzmitry Sankouski <[email protected]>
arm64: dts: qcom: sdm845-starqltechn: remove wifi

Konrad Dybcio <[email protected]>

    arm64: dts: qcom: x1e80100-romulus: Keep L12B and L15B always on

Neil Armstrong <[email protected]>
arm64: dts: qcom: sm8650: add missing cpu-cfg interconnect path in the mdss node

Neil Armstrong <[email protected]>
arm64: dts: qcom: sm8550: add missing cpu-cfg interconnect path in the mdss node

Neil Armstrong <[email protected]>
arm64: dts: qcom: sm8550: use ICC tag for all interconnect phandles

Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: qcs8300: Partially revert "arm64: dts: qcom: qcs8300: add QCrypto nodes"

Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: sa8775p: Partially revert "arm64: dts: qcom: sa8775p: add QCrypto nodes"

Neil Armstrong <[email protected]>
arm64: dts: qcom: sm8650: setup gpu thermal with higher temperatures

Mark Kettenis <[email protected]>

    arm64: dts: qcom: x1e80100: Mark usb_2 as dma-coherent

Zhiguo Niu <[email protected]>
f2fs: fix to correct check conditions in f2fs_cross_rename

Zhiguo Niu <[email protected]>

    f2fs: use d_inode(dentry) cleanup dentry->d_inode

Chao Yu <[email protected]>
f2fs: fix to skip f2fs_balance_fs() if checkpoint is disabled

Horatiu Vultur <[email protected]>
net: phy: mscc: Stop clearing the the UDPv4 checksum for L2 frames

Faicker Mo <[email protected]>
net: openvswitch: Fix the dead loop of MPLS parse

Kuniyuki Iwashima <[email protected]>
calipso: Don't call calipso functions for AF_INET sk.

Hariprasad Kelam <[email protected]>
octeontx2-pf: QOS: Refactor TC_HTB_LEAF_DEL_LAST callback

Hariprasad Kelam <[email protected]>
octeontx2-pf: QOS: Perform cache sync on send queue teardown

Horatiu Vultur <[email protected]>
net: phy: mscc: Fix memory leak when using one step timestamping

Thangaraj Samynathan <[email protected]>
net: lan743x: Fix PHY reset handling during initialization and WOL

Thangaraj Samynathan <[email protected]>

    net: lan743x: rename lan743x_reset_phy to lan743x_hw_reset_phy

Greg Kroah-Hartman <[email protected]>
net: phy: fix up const issues in to_mdio_device() and to_phy_device()

Jeremy Kerr <[email protected]>
net: mctp: start tx queue on netdev open

Christophe JAILLET <[email protected]>
net: airoha: Fix an error handling path in airoha_alloc_gdm_port()

Wei Fang <[email protected]>

    net: phy: clear phydev->devlink when the link is deleted

Yonghong Song <[email protected]>
bpf: Do not include stack ptr register in precision backtracking bookkeeping

KaFai Wan <[email protected]>
bpf: Avoid __bpf_prog_ret0_warn when jit fails

Israel Rukshin <[email protected]>
virtio-pci: Fix result size returned for the admin command completion

Stanislav Fomichev <[email protected]>
af_packet: move notifier's packet_dev_mc out of rcu critical section

Suraj Gupta <[email protected]>
net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit

Horatiu Vultur <[email protected]>
net: lan966x: Fix 1-step timestamping over ipv4 or ipv6

Jack Morgenstein <[email protected]>
RDMA/cma: Fix hang when cma_netevent_callback fails to queue_work

Stefano Garzarella <[email protected]>
vsock/virtio: fix rx_bytes accounting for stream sockets

Subbaraya Sundeep <[email protected]>
octeontx2-af: Send Link events one by one

Nikita Zhandarovich <[email protected]>
net: usb: aqc111: fix error handling of usbnet read calls

Radim Krčmář <[email protected]>
RISC-V: KVM: lock the correct mp_state during reset

Fernando Fernandez Mancera <[email protected]>
netfilter: nft_tunnel: fix geneve_opt dump

Florian Westphal <[email protected]>
netfilter: nf_tables: nft_fib: consistent l3mdev handling

Jiayuan Chen <[email protected]>
bpf, sockmap: Avoid using sk_socket after free when sending

Kees Cook <[email protected]>
Bluetooth: btintel: Check dsbr size from EFI variable

Dmitry Antipov <[email protected]>
Bluetooth: MGMT: iterate over mesh commands in mgmt_mesh_foreach()

Li RongQing <[email protected]>
vfio/type1: Fix error unwind in migration dirty bitmap allocation

Florian Westphal <[email protected]>
netfilter: nf_tables: nft_fib_ipv6: fix VRF ipv4/ipv6 result discrepancy

Florian Westphal <[email protected]>
netfilter: xtables: support arpt_mark and ipv6 optstrip for iptables-nft only builds

Di Shen <[email protected]>
bpf: Revert "bpf: remove unnecessary rcu_read_{lock,unlock}() in multi-uprobe attach logic"

Shayne Chen <[email protected]>
wifi: mt76: fix available_antennas setting

Shayne Chen <[email protected]>
wifi: mt76: mt7996: fix RX buffer size of MCU event

Peter Chiu <[email protected]>
wifi: mt76: mt7996: fix invalid NSS setting when TX path differs from NSS

Peter Chiu <[email protected]>
wifi: mt76: mt7996: set EHT max ampdu length capability

Howard Hsu <[email protected]>
wifi: mt76: mt7996: fix beamformee SS field

Michael Lo <[email protected]>
wifi: mt76: mt7925: ensure all MCU commands wait for response

Ming Yen Hsieh <[email protected]>
wifi: mt76: mt7925: refine the sniffer commnad

Ming Yen Hsieh <[email protected]>
wifi: mt76: mt7925: prevent multiple scan commands

Henry Martin <[email protected]>

    wifi: mt76: mt7915: Fix null-ptr-deref in mt7915_mmio_wed_init()

Henry Martin <[email protected]>

    wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init()

Feng Jiang <[email protected]>
wifi: mt76: scan: Fix 'mlink' dereferenced before IS_ERR_OR_NULL check

Pauli Virtanen <[email protected]>
Bluetooth: separate CIS_LINK and BIS_LINK link types

Luiz Augusto von Dentz <[email protected]>
Bluetooth: ISO: Fix not using SID from adv report

Qasim Ijaz <[email protected]>

    wifi: mt76: mt7996: avoid null deref in mt7996_stop_phy()

Qasim Ijaz <[email protected]>
wifi: mt76: mt7996: avoid NULL pointer dereference in mt7996_set_monitor()

Qasim Ijaz <[email protected]>
wifi: mt76: mt7996: prevent uninit return in mt7996_mac_sta_add_links

Charles Han <[email protected]>

    wifi: mt76: mt7996: Add NULL check in mt7996_thermal_init

Dan Carpenter <[email protected]>
wifi: mt76: mt7925: Fix logical vs bitwise typo

Michal Koutný <[email protected]>
kernfs: Relax constraint in draining guard

Kalesh AP <[email protected]>
RDMA/bnxt_re: Fix return code of bnxt_re_configure_cc

Gautam R A <[email protected]>
RDMA/bnxt_re: Fix missing error handling for tx_queue

Gautam R A <[email protected]>
RDMA/bnxt_re: Fix incorrect display of inactivity_cp in debugfs output

Shivasharan S <[email protected]>
scsi: mpt3sas: Fix _ctl_get_mpt_mctp_passthru_adapter() to return IOC pointer

ping.gao <[email protected]>
scsi: ufs: mcq: Delete ufshcd_release_scsi_cmd() in ufshcd_mcq_abort()

Hao Chang <[email protected]>
pinctrl: mediatek: Fix the invalid conditions

Toke Høiland-Jørgensen <[email protected]>
wifi: ath9k_htc: Abort software beacon handling if disabled

Longfang Liu <[email protected]>
hisi_acc_vfio_pci: bugfix live migration function without VF device driver

Longfang Liu <[email protected]>
hisi_acc_vfio_pci: bugfix the problem of uninstalling driver

Longfang Liu <[email protected]>
hisi_acc_vfio_pci: bugfix cache write-back issue

Longfang Liu <[email protected]>
hisi_acc_vfio_pci: add eq and aeq interruption restore

Longfang Liu <[email protected]>
hisi_acc_vfio_pci: fix XQE dma address error

Rajat Soni <[email protected]>
wifi: ath12k: fix memory leak in ath12k_service_ready_ext_event

Yingying Tang <[email protected]>
wifi: ath12k: Reorder and relocate the release of resources in ath12k_core_deinit()

P Praneesh <[email protected]>
wifi: ath12k: Fix invalid RSSI values in station dump

Rolf Eike Beer <[email protected]>
iommu: remove duplicate selection of DMAR_TABLE

Chin-Yen Lee <[email protected]>
wifi: rtw89: fix firmware scan delay unit for WiFi 6 chips

Alexey Kodanev <[email protected]>
wifi: rtw88: fix the 'para' buffer size to avoid reading out of bounds

Ping-Ke Shih <[email protected]>
wifi: rtw89: pci: enlarge retry times of RX tag to 1000

Ping-Ke Shih <[email protected]>
wifi: rtw89: pci: configure manual DAC mode via PCI config API only

Ilya Leoshkevich <[email protected]>
s390/bpf: Store backchain even for leaf progs

Vincent Knecht <[email protected]>
clk: qcom: gcc-msm8939: Fix mclk0 & mclk1 for 24 MHz

Rob Herring (Arm) <[email protected]>
dt-bindings: soc: fsl,qman-fqd: Fix reserved-memory.yaml reference

Tao Chen <[email protected]>
bpf: Fix WARN() in get_bpf_raw_tp_regs

Andy Shevchenko <[email protected]>
pinctrl: at91: Fix possible out-of-boundary access

Lijuan Gao <[email protected]>
pinctrl: qcom: correct the ngpios entry for QCS8300

Lijuan Gao <[email protected]>
pinctrl: qcom: correct the ngpios entry for QCS615

Anton Protopopov <[email protected]>
libbpf: Use proper errno value in nlattr

Jiayuan Chen <[email protected]>
ktls, sockmap: Fix missing uncharge operation

Dan Carpenter <[email protected]>
of: unittest: Unlock on error in unittest_data_add()

Miaoqian Lin <[email protected]>
tracing: Fix error handling in event_trigger_parse()

Steven Rostedt <[email protected]>
tracing: Rename event_trigger_alloc() to trigger_data_alloc()

Luis Gerhorst <[email protected]>
selftests/bpf: Fix caps for __xlated/jited_unpriv

Peilin Ye <[email protected]>
selftests/bpf: Avoid passing out-of-range values to __retval()

Hans Zhang <[email protected]>
efi/libstub: Describe missing 'out' parameter in efi_load_initrd

Tomas Glozar <[email protected]>
rtla: Define _GNU_SOURCE in timerlat_bpf.c

Ilan Peer <[email protected]>
wifi: iwlfiwi: mvm: Fix the rate reporting

Richard Fitzgerald <[email protected]>
clk: test: Forward-declare struct of_phandle_args in kunit/clk.h

Henry Martin <[email protected]>
clk: bcm: rpi: Add NULL check in raspberrypi_clk_register()

YiFei Zhu <[email protected]>
bpftool: Fix regression of "bpftool cgroup tree" EINVAL on older kernels

Luca Weiss <[email protected]>
clk: qcom: gpucc-sm6350: Add *_wait_val values for GDSCs

Luca Weiss <[email protected]>
clk: qcom: gcc-sm6350: Add *_wait_val values for GDSCs

Luca Weiss <[email protected]>
clk: qcom: dispcc-sm6350: Add *_wait_val values for GDSCs

Luca Weiss <[email protected]>
clk: qcom: camcc-sm6350: Add *_wait_val values for GDSCs

Steven Rostedt <[email protected]>
tracing: Move histogram trigger variables from stack to per CPU structure

Qinxin Xia <[email protected]>
iommu/arm-smmu-v3: Fix incorrect return in arm_smmu_attach_dev

Anton Protopopov <[email protected]>
bpf: Fix uninitialized values in BPF_{CORE,PROBE}_READ

Patrisious Haddad <[email protected]>
RDMA/mlx5: Fix error flow upon firmware failure for RQ destruction

Vlad Dumitrescu <[email protected]>
IB/cm: Drop lockdep assert and WARN when freeing old msg

Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_pipapo: prevent overflow in lookup table allocation

Zhongqiu Duan <[email protected]>
netfilter: nft_quota: match correctly when the quota just depleted

Huajian Yang <[email protected]>
netfilter: bridge: Move specific fragmented packet to slow_path instead of dropping it

Lorenzo Bianconi <[email protected]>
bpf: Allow XDP dev-bound programs to perform XDP_REDIRECT into maps

Anton Protopopov <[email protected]>
libbpf: Use proper errno value in linker

T.J. Mercier <[email protected]>
selftests/bpf: Fix kmem_cache iterator draining

David Howells <[email protected]>
crypto/krb5: Fix change to use SG miter to use offset

Yi Zhang <[email protected]>
scsi: smartpqi: Fix smp_processor_id() call trace for preemptible kernels

Justin Tee <[email protected]>
scsi: lpfc: Avoid potential ndlp use-after-free in dev_loss_tmo_callbk

Chao Yu <[email protected]>
f2fs: zone: fix to calculate first_zoned_segno correctly

Chao Yu <[email protected]>
f2fs: fix to detect gcing page in f2fs_is_cp_guaranteed()

Chao Yu <[email protected]>
f2fs: clean up w/ fscrypt_is_bounce_page()

Hangbin Liu <[email protected]>
bonding: assign random address if device address is same as bond

Jason Gunthorpe <[email protected]>
iommu: Protect against overflow in iommu_pgsize()

Arnd Bergmann <[email protected]>
iommu/io-pgtable-arm: dynamically allocate selftest device struct

Arnd Bergmann <[email protected]>
iommu: ipmmu-vmsa: avoid Wformat-security warning

Jonathan Wiepert <[email protected]>
Use thread-safe function pointer in libbpf_print

Tao Chen <[email protected]>
libbpf: Remove sample_period init in perf_buffer

Miri Korenblit <[email protected]>
wifi: iwlwifi: re-add IWL_AMSDU_8K case

Feng Yang <[email protected]>
libbpf: Fix event name too long error

Yihang Li <[email protected]>
scsi: hisi_sas: Call I_T_nexus after soft reset for SATA disk

Junxian Huang <[email protected]>
RDMA/hns: Include hnae3.h in hns_roce_hw_v2.h

Zhu Yanjun <[email protected]>
RDMA/rxe: Fix "trying to register non-static key in rxe_qp_do_cleanup" bug

Maharaja Kennadyrajan <[email protected]>

    wifi: ath12k: fix node corruption in ar->arvifs list

Maharaja Kennadyrajan <[email protected]>
wifi: ath12k: Prevent sending WMI commands to firmware during firmware crash

Rameshkumar Sundaram <[email protected]>
wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers

P Praneesh <[email protected]>
wifi: ath12k: replace the usage of rx desc with rx_info

P Praneesh <[email protected]>
wifi: ath12k: add rx_info to capture required field from rx descriptor

P Praneesh <[email protected]>
wifi: ath12k: change the status update in the monitor Rx

Karthikeyan Periyasamy <[email protected]>
wifi: ath12k: Replace band define G with GHZ where appropriate

P Praneesh <[email protected]>
wifi: ath12k: Avoid fetch Error bitmap and decap format from Rx TLV

P Praneesh <[email protected]>
wifi: ath12k: Add extra TLV tag parsing support in monitor Rx path

Ramasamy Kaliappan <[email protected]>
wifi: ath12k: Fix the QoS control field offset to build QoS header

P Praneesh <[email protected]>
wifi: ath12k: Add MSDU length validation for TKIP MIC error

Sarika Sharma <[email protected]>
wifi: ath12k: fix invalid access to memory

P Praneesh <[email protected]>
wifi: ath12k: Handle error cases during extended skb allocation

Dmitry Antipov <[email protected]>
wifi: rtw88: do not ignore hardware read error during DPK

Zhen XIN <[email protected]>
wifi: rtw88: sdio: call rtw_sdio_indicate_tx_status unconditionally

Zhen XIN <[email protected]>
wifi: rtw88: sdio: map mgmt frames to queue TX_DESC_QSEL_MGMT

Cosmin Ratiu <[email protected]>
bonding: Fix multiple long standing offload races

Cosmin Ratiu <[email protected]>
bonding: Mark active offloaded xfrm_states

Cosmin Ratiu <[email protected]>

    xfrm: Add explicit dev to .xdo_dev_state_{add,delete,free}

Cosmin Ratiu <[email protected]>
xfrm: Use xdo.dev instead of xdo.real_dev

Cosmin Ratiu <[email protected]>
net/mlx5: Avoid using xso.real_dev unnecessarily

Viktor Malik <[email protected]>
libbpf: Fix buffer overflow in bpf_object__init_prog

Hari Kalavakunta <[email protected]>
net: ncsi: Fix GCPS 64-bit member variables

Charles Han <[email protected]>
pinctrl: qcom: tlmm-test: Fix potential null dereference in tlmm kunit test

Vlad Dogaru <[email protected]>
net/mlx5: HWS, Fix matcher action template attach

Toke Høiland-Jørgensen <[email protected]>
page_pool: Track DMA-mapped pages and unmap them when destroying the pool

Toke Høiland-Jørgensen <[email protected]>
page_pool: Move pp_magic check into helper functions

Paolo Abeni <[email protected]>
udp: properly deal with xfrm encap and ADDRFORM

Paolo Abeni <[email protected]>
udp_tunnel: use static call for GRO hooks when possible

Paolo Abeni <[email protected]>
udp_tunnel: create a fastpath GRO lookup.

Chao Yu <[email protected]>

    f2fs: fix to do sanity check on sbi->total_valid_block_count

yohan.joung <[email protected]>
f2fs: prevent the current section from being selected as a victim during GC

Jaegeuk Kim <[email protected]>
f2fs: clean up unnecessary indentation

Aditya Kumar Singh <[email protected]>
wifi: ath12k: fix ATH12K_FLAG_REGISTERED flag handling

Aditya Kumar Singh <[email protected]>
wifi: ath12k: fix SLUB BUG - Object already free in ath12k_reg_free()

Dan Carpenter <[email protected]>
wifi: ath12k: Fix buffer overflow in debugfs

Ramya Gnanasekar <[email protected]>
wifi: ath12k: Fix WMI tag for EHT rate in peer assoc

Aaradhana Sahu <[email protected]>
wifi: ath12k: Resolve multicast packet drop by populating key_cipher in ath12k_install_key()

Raj Kumar Bhagat <[email protected]>
wifi: ath12k: fix cleanup path after mhi init

Christian Marangi <[email protected]>
net: phy: mediatek: permit to compile test GE SOC PHY driver

Chao Yu <[email protected]>
f2fs: zone: fix to avoid inconsistence in between SIT and SSA

Jiayuan Chen <[email protected]>
bpf, sockmap: Fix panic when calling skb_linearize

Jiayuan Chen <[email protected]>
bpf, sockmap: fix duplicated data transmission

Jiayuan Chen <[email protected]>
bpf: fix ktls panic with sockmap

Saket Kumar Bhaskar <[email protected]>
selftests/bpf: Fix bpf_nf selftest failure

Tao Chen <[email protected]>
bpf: Check link_create.flags parameter for multi_uprobe

Tao Chen <[email protected]>
bpf: Check link_create.flags parameter for multi_kprobe

Jacob Moroni <[email protected]>
IB/cm: use rwlock for MAD agent lock

P Praneesh <[email protected]>
wifi: ath12k: Fix invalid memory access while forming 802.11 header

P Praneesh <[email protected]>
wifi: ath12k: Fix memory corruption during MLO multicast tx

P Praneesh <[email protected]>
wifi: ath12k: Fix memory leak during vdev_id mismatch

Carlos Llamas <[email protected]>
libbpf: Fix implicit memfd_create() for bionic

Stone Zhang <[email protected]>

    wifi: ath11k: fix node corruption in ar->arvifs list

Karthikeyan Periyasamy <[email protected]>
wifi: ath12k: fix NULL access in assign channel context handler

Jocelyn Falempe <[email protected]>
drm/panic: Use a decimal fifo to avoid u64 by u64 divide

Miguel Ojeda <[email protected]>
drm/panic: clean Clippy warning

Aradhya Bhatia <[email protected]>
drm/xe/guc: Make creation of SLPC debugfs files conditional

Michal Wajdeczko <[email protected]>
drm/xe/guc: Don't expose GuC privileged debugfs files if VF

Michal Wajdeczko <[email protected]>
drm/xe/guc: Refactor GuC debugfs initialization

Roger Pau Monne <[email protected]>
xen/x86: fix initial memory balloon target

Chuck Lever <[email protected]>
svcrdma: Reduce the number of rdma_rw contexts per-QP

Detlev Casanova <[email protected]>
media: verisilicon: Free post processor buffers on error

AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: mtk_drm_drv: Unbind secondary mmsys components on err

AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: Fix kobject put for component sub-drivers

AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: mtk_drm_drv: Fix kobject put for mtk_mutex device ptr

Imre Deak <[email protected]>
drm/i915/dp_mst: Use the correct connector while computing the link BPP limit on MST

Aleksandrs Vinarskis <[email protected]>
drm/msm/dp: Prepare for link training per-segment for LTTPRs

Aleksandrs Vinarskis <[email protected]>
drm/msm/dp: Account for LTTPRs capabilities

Aleksandrs Vinarskis <[email protected]>
drm/msm/dp: Fix support of LTTPR initialization

Konrad Dybcio <[email protected]>
drm/msm/a6xx: Disable rgb565_predicator on Adreno 7c3

Terry Tritton <[email protected]>
selftests/seccomp: fix negative_ENOSYS tracer tests on arm32

Anand Moon <[email protected]>
perf/amlogic: Replace smp_processor_id() with raw_smp_processor_id() in meson_ddr_pmu_create()

Nicolas Dufresne <[email protected]>
media: synopsys: hdmirx: Count dropped frames

Nicolas Dufresne <[email protected]>
media: synopsys: hdmirx: Renamed frame_idx to sequence

Kees Cook <[email protected]>
scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops

Gustavo A. R. Silva <[email protected]>
overflow: Fix direct struct member initialization in _DEFINE_FLEX()

Mark Rutland <[email protected]>
kselftest/arm64: fp-ptrace: Fix expected FPMR value when PSTATE.SM is changed

Huang Yiwei <[email protected]>
firmware: SDEI: Allow sdei initialization without ACPI_APEI_GHES

Harry Wentland <[email protected]>
drm/amd/display: Don't check for NULL divisor in fixpt code

Biju Das <[email protected]>
drm/tegra: rgb: Fix the unbound reference count

Kees Cook <[email protected]>

    drm/vkms: Adjust vkms_state->active_planes allocation type

Biju Das <[email protected]>
drm: rcar-du: Fix memory leak in rcar_du_vsps_init()

Dmitry Baryshkov <[email protected]>
drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8953

Dmitry Baryshkov <[email protected]>
drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8917

Dmitry Baryshkov <[email protected]>
drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8937

Dmitry Baryshkov <[email protected]>
drm/msm/dpu: enable SmartDMA on SC8180X

Dmitry Baryshkov <[email protected]>
drm/msm/dpu: enable SmartDMA on SM8150

Neill Kapron <[email protected]>
selftests/seccomp: fix syscall_restart test for arm compat

Mark Rutland <[email protected]>
arm64/fpsimd: Avoid warning when sve_to_fpsimd() is unused

Kornel Dulęba <[email protected]>
arm64: Support ARM64_VA_BITS=52 when setting ARCH_MMAP_RND_BITS_MAX

Miaoqian Lin <[email protected]>
firmware: psci: Fix refcount leak in psci_dt_init

Finn Thain <[email protected]>
m68k: mac: Fix macintosh_config for Mac II

Kees Cook <[email protected]>
watchdog: exar: Shorten identity name to fit correctly

Thomas Weißschuh <[email protected]>
kunit/usercopy: Disable u64 test on 32-bit SPARC

Lizhi Xu <[email protected]>
fs/ntfs3: Add missing direct_IO in ntfs_aops_cmpr

Andrey Vatoropin <[email protected]>
fs/ntfs3: handle hdr_first_de() return value

Jose Maria Casanova Crespo <[email protected]>
drm/v3d: client ranges from axi_ids are different with V3D 7.1

Jose Maria Casanova Crespo <[email protected]>
drm/v3d: fix client obtained from axi_ids on V3D 4.1

Maíra Canal <[email protected]>
drm/v3d: Associate a V3D tech revision to all supported devices

Christophe JAILLET <[email protected]>
drm/bridge: lt9611uxc: Fix an error handling path in lt9611uxc_probe()

Casey Connolly <[email protected]>
drm/panel: samsung-sofef00: Drop s6e3fc2x01 support

Srinivasan Shanmugam <[email protected]>
drm/amdgpu: Refine Cleaner Shader MEC firmware version for GFX10.1.x GPUs

Hongbo Yao <[email protected]>
perf: arm-ni: Fix missing platform_set_drvdata()

Hongbo Yao <[email protected]>
perf: arm-ni: Unregister PMUs on probe failure

Boris Brezillon <[email protected]>
drm/panthor: Fix the panthor_gpu_coherency_init() error path

Lizhi Hou <[email protected]>
accel/amdxdna: Fix incorrect size of ERT_START_NPU commands

Boris Brezillon <[email protected]>
drm/panthor: Update panthor_mmu::irq::mask when needed

Boris Brezillon <[email protected]>
drm/panthor: Call panthor_gpu_coherency_init() after PM resume()

Boris Brezillon <[email protected]>
drm/panthor: Fix GPU_COHERENCY_ACE[_LITE] definitions

Mark Rutland <[email protected]>
arm64/fpsimd: Fix merging of FPSIMD state during signal return

Mark Rutland <[email protected]>
arm64/fpsimd: Reset FPMR upon exec()

Mark Rutland <[email protected]>
arm64/fpsimd: Avoid clobbering kernel FPSIMD state with SMSTOP

Mark Brown <[email protected]>
arm64/fpsimd: Don't corrupt FPMR when streaming mode changes

Mark Brown <[email protected]>
arm64/fpsimd: Discard stale CPU state when handling SME traps

Mark Rutland <[email protected]>
arm64/fpsimd: Avoid RES0 bits in the SME trap handler

Jonas Karlman <[email protected]>
media: rkvdec: Fix frame size enumeration

Charles Han <[email protected]>
drm/amd/pp: Fix potential NULL pointer dereference in atomctrl_initialize_mc_reg_table

Maxime Ripard <[email protected]>
drm/vc4: tests: Retry pv-muxing tests when EDEADLK

Maxime Ripard <[email protected]>
drm/vc4: tests: Stop allocating the state in test init

Maxime Ripard <[email protected]>
drm/vc4: tests: Use return instead of assert

Badal Nilawar <[email protected]>
drm/xe/d3cold: Set power state to D3Cold during s2idle/s3

Stefan Wahren <[email protected]>
drm/vc4: hdmi: Call HDMI hotplug helper on disconnect

Ian Forbes <[email protected]>
drm/vmwgfx: Fix dumb buffer leak

Vignesh Raman <[email protected]>
drm/ci: fix merge request rules

Arnd Bergmann <[email protected]>
drm: xlnx: zynqmp_dpsub: fix Kconfig dependencies for ASoC

Keisuke Nishimura <[email protected]>
drm/vmwgfx: Add error path for xa_store in vmw_bo_add_detached_resource

Ian Forbes <[email protected]>
drm/vmwgfx: Add seqno waiter for sync_files

Alexandre Ghiti <[email protected]>
ACPI: platform_profile: Avoid initializing on non-ACPI platforms

Greg Kroah-Hartman <[email protected]>
ALSA: core: fix up bus match const issues.

David Thompson <[email protected]>
EDAC/bluefield: Don't use bluefield_edac_readl() result on error

Martin Povišer <[email protected]>
ASoC: apple: mca: Constrain channels according to TDM mask

Geert Uytterhoeven <[email protected]>
spi: sh-msiof: Fix maximum DMA transfer size

Armin Wolf <[email protected]>
ACPI: thermal: Execute _SCP before reading trip points

Armin Wolf <[email protected]>
ACPI: OSI: Stop advertising support for "3.0 _SCP Extensions"

AngeloGioacchino Del Regno <[email protected]>
thermal/drivers/mediatek/lvts: Fix debugfs unregister on failure

Gabor Juhos <[email protected]>
spi: spi-qpic-snand: validate user/chip specific ECC properties

Gabor Juhos <[email protected]>
spi: spi-qpic-snand: use kmalloc() for OOB buffer allocation

Rafael J. Wysocki <[email protected]>
PM: sleep: Print PM debug messages during hibernation

Jiaqing Zhao <[email protected]>
x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges()

Bence Csókás <[email protected]>
spi: atmel-quadspi: Fix unbalanced pm_runtime by using devm_ API

Bence Csókás <[email protected]>
PM: runtime: Add new devm functions

Mingcong Bai <[email protected]>

    ACPI: resource: fix a typo for MECHREVO in irq1_edge_low_force_override[]

Zijun Hu <[email protected]>
PM: wakeup: Delete space in the end of string shown by pm_show_wakelocks()

Vijendar Mukunda <[email protected]>
ASoC: SOF: amd: add missing acp descriptor field

Thorsten Blum <[email protected]>
ASoC: Intel: avs: Fix kcalloc() sizes

Kees Cook <[email protected]>

    ASoC: SOF: ipc4-pcm: Adjust pipeline_list->pipelines allocation type

Benson Leung <[email protected]>
platform/chrome: cros_ec_typec: Set Pin Assignment E in DP PORT VDO

Dan Carpenter <[email protected]>
power: supply: max77705: Fix workqueue error handling in probe

Yaxiong Tian <[email protected]>
PM: EM: Fix potential division-by-zero error in em_compute_costs()

Alexander Shiyan <[email protected]>
power: reset: at91-reset: Optimize at91_reset()

Vishwaroop A <[email protected]>
spi: tegra210-quad: modify chip select (CS) deactivation

Vishwaroop A <[email protected]>
spi: tegra210-quad: remove redundant error handling code

Vishwaroop A <[email protected]>
spi: tegra210-quad: Fix X1_X2_X4 encoding and support x4 transfers

Thomas Weißschuh <[email protected]>
tools/nolibc: fix integer overflow in i{64,}toa_r() and

Thomas Weißschuh <[email protected]>
tools/nolibc: properly align dirent buffer

Qiuxu Zhuo <[email protected]>
EDAC/{skx_common,i10nm}: Fix the loss of saved RRL for HBM pseudo channel 0

Qiuxu Zhuo <[email protected]>
EDAC/skx_common: Fix general protection fault

Julien Massot <[email protected]>
ASoC: mediatek: mt8195: Set ETDM1/2 IN/OUT to COMP_DUMMY()

Hector Martin <[email protected]>
ASoC: tas2764: Enable main IRQs

Martin Povišer <[email protected]>
ASoC: tas2764: Reinit cache on part reset

Jemmy Wong <[email protected]>
tools/nolibc/types.h: fix mismatched parenthesis in minor()

Daniil Tatianin <[email protected]>
ACPICA: exserial: don't forget to handle FFixedHW opregions for reading

Herbert Xu <[email protected]>
crypto: api - Redo lookup on EEXIST

Andreas Gruenbacher <[email protected]>
gfs2: Don't start unnecessary transactions during log flush

Andreas Gruenbacher <[email protected]>
gfs2: Move gfs2_trans_add_databufs

Tzung-Bi Shih <[email protected]>
kunit: Fix wrong parameter to kunit_deactivate_static_stub()

Xuewen Yan <[email protected]>
sched/fair: Fixup wake_up_sync() vs DELAYED_DEQUEUE

Ovidiu Panait <[email protected]>
crypto: sun8i-ce - move fallback ahash_request to the end of the struct

Herbert Xu <[email protected]>
crypto: xts - Only add ecb if it is not already there

Herbert Xu <[email protected]>
crypto: lrw - Only add ecb if it is not already there

Yongliang Gao <[email protected]>
rcu/cpu_stall_cputime: fix the hardirq count for x86 architecture

Filipe Manana <[email protected]>
btrfs: fix wrong start offset for delalloc space release during mmap write

Filipe Manana <[email protected]>
btrfs: fix invalid data space release when truncating block in NOCOW mode

Qu Wenruo <[email protected]>
btrfs: scrub: fix a wrong error type when metadata bytenr mismatches

Qu Wenruo <[email protected]>
btrfs: scrub: update device stats when an error is detected

Gaurav Batra <[email protected]>
powerpc/pseries/iommu: Fix kmemleak in TCE table userspace view

Sheng Yong <[email protected]>
erofs: avoid using multiple devices with different type

Hongbo Li <[email protected]>
erofs: fix file handle encoding for 64-bit NIDs

Herbert Xu <[email protected]>
crypto: marvell/cesa - Avoid empty transfer descriptor

Herbert Xu <[email protected]>
crypto: marvell/cesa - Handle zero-length skcipher requests

Nícolas F. R. A. Prado <[email protected]>
kselftest: cpufreq: Get rid of double suspend in rtcwake case

Yu Kuai <[email protected]>
brd: fix discard end sector

Yu Kuai <[email protected]>
brd: fix aligned_sector from brd_do_discard()

Masami Hiramatsu (Google) <[email protected]>
x86/insn: Fix opcode map (!REX2) superscript tags

Ahmed S. Darwish <[email protected]>

    x86/cpu: Sanitize CPUID(0x80000000) output

Zizhi Wo <[email protected]>

    blk-throttle: Fix wrong tg->[bytes/io]_disp update in __tg_update_carryover()

Ovidiu Panait <[email protected]>
crypto: sun8i-ce - undo runtime PM changes during driver removal

Nam Cao <[email protected]>
selftests: coredump: Raise timeout to 2 minutes

Nam Cao <[email protected]>
selftests: coredump: Fix test failure for slow machines

Nam Cao <[email protected]>
selftests: coredump: Properly initialize pointer

Annie Li <[email protected]>
x86/microcode/AMD: Do not return error when microcode update is not necessary

John Stultz <[email protected]>
sched/core: Tweak wait_task_inactive() to force dequeue sched_delayed tasks

Eddie James <[email protected]>
powerpc/crash: Fix non-smp kexec preparation

Jiri Slaby (SUSE) <[email protected]>
powerpc: do not build ppc_save_regs.o always

Corentin Labbe <[email protected]>
crypto: sun8i-ss - do not use sg_dma_len before calling DMA functions

Ovidiu Panait <[email protected]>
crypto: sun8i-ce-cipher - fix error handling in sun8i_ce_cipher_prepare()

Qing Wang <[email protected]>
perf/core: Fix broken throttling when max_samples_per_tick=1

Andreas Gruenbacher <[email protected]>
gfs2: deallocate inodes in gfs2_create_inode

Andreas Gruenbacher <[email protected]>
gfs2: Move GIF_ALLOC_FAILED check out of gfs2_ea_dealloc

Andreas Gruenbacher <[email protected]>
gfs2: Move gfs2_dinode_dealloc

Andreas Gruenbacher <[email protected]>
gfs2: gfs2_create_inode error handling fix

Andreas Gruenbacher <[email protected]>
gfs2: replace sd_aspace with sd_inode

Sandipan Das <[email protected]>
perf/x86/amd/uncore: Prevent UMC counters from saturating

Sandipan Das <[email protected]>
perf/x86/amd/uncore: Remove unused 'struct amd_uncore_ctx::node' member

David Gow <[email protected]>
kunit: qemu_configs: Disable faulting tests on 32-bit SPARC

Thomas Weißschuh <[email protected]>
kunit: qemu_configs: sparc: Explicitly enable CONFIG_SPARC32=y

Herbert Xu <[email protected]>
crypto: zynqmp-sha - Add locking

Lukas Wunner <[email protected]>
crypto: ecdsa - Fix NIST P521 key size reported by KEYCTL_PKEY_QUERY

Lukas Wunner <[email protected]>
crypto: ecdsa - Fix enc/dec size reported by KEYCTL_PKEY_QUERY

Peter Zijlstra <[email protected]>
sched: Fix trace_sched_switch(.prev_state)

Ovidiu Panait <[email protected]>
crypto: sun8i-ce-hash - fix error handling in sun8i_ce_hash_run()

Herbert Xu <[email protected]>

    crypto: iaa - Do not clobber req->base.data

Andrew Cooper <[email protected]>
x86/idle: Remove MFENCEs for X86_BUG_CLFLUSH_MONITOR in mwait_idle_with_hints() and prefer_mwait_c1_over_halt()

Ahmed S. Darwish <[email protected]>
tools/x86/kcpuid: Fix error handling

-------------

Diffstat:

 .../regulator/mediatek,mt6357-regulator.yaml       |  12 +-
 .../devicetree/bindings/soc/fsl/fsl,qman-fqd.yaml  |   4 +-
 .../devicetree/bindings/vendor-prefixes.yaml       |   2 +
 Documentation/gpu/xe/index.rst                     |   1 +
 Documentation/gpu/xe/xe_gt_freq.rst                |  14 +
 Documentation/misc-devices/lis3lv02d.rst           |   6 +-
 Documentation/netlink/specs/rt_link.yaml           |  68 +++-
 Documentation/networking/xfrm_device.rst           |  10 +-
 Makefile                                           |   4 +-
 arch/arm/boot/dts/microchip/at91sam9263ek.dts      |   2 +-
 arch/arm/boot/dts/microchip/tny_a9263.dts          |   2 +-
 arch/arm/boot/dts/microchip/usb_a9263.dts          |   4 +-
 arch/arm/boot/dts/qcom/qcom-apq8064.dtsi           |  82 +++--
 arch/arm/mach-aspeed/Kconfig                       |   1 -
 arch/arm64/Kconfig                                 |   6 +-
 arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi     |   3 +
 .../arm64/boot/dts/freescale/imx8mm-beacon-kit.dts |   1 +
 .../boot/dts/freescale/imx8mm-beacon-som.dtsi      |   1 +
 .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts |   1 +
 .../boot/dts/freescale/imx8mn-beacon-som.dtsi      |   1 +
 .../boot/dts/freescale/imx8mp-beacon-som.dtsi      |   1 +
 arch/arm64/boot/dts/mediatek/mt6357.dtsi           |  10 -
 arch/arm64/boot/dts/mediatek/mt6359.dtsi           |   4 +-
 arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi     |  10 +-
 arch/arm64/boot/dts/mediatek/mt8183.dtsi           |   4 +
 arch/arm64/boot/dts/mediatek/mt8188.dtsi           |   2 +-
 arch/arm64/boot/dts/mediatek/mt8195.dtsi           |  50 +--
 .../boot/dts/mediatek/mt8390-genio-common.dtsi     |  12 +-
 arch/arm64/boot/dts/nvidia/tegra186.dtsi           |  12 -
 arch/arm64/boot/dts/nvidia/tegra194.dtsi           |  12 -
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     |   1 +
 arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi   |  11 +-
 arch/arm64/boot/dts/qcom/ipq9574.dtsi              |  16 +-
 arch/arm64/boot/dts/qcom/msm8998.dtsi              |  19 +-
 arch/arm64/boot/dts/qcom/qcm2290.dtsi              |  16 +-
 arch/arm64/boot/dts/qcom/qcs615.dtsi               |  17 +-
 arch/arm64/boot/dts/qcom/qcs8300.dtsi              |  12 -
 arch/arm64/boot/dts/qcom/sa8775p.dtsi              |  11 -
 .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts     |   3 -
 .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts |   2 +
 .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts |   3 +
 .../boot/dts/qcom/sdm845-samsung-starqltechn.dts   |  16 +-
 arch/arm64/boot/dts/qcom/sm8250.dtsi               |   2 +-
 arch/arm64/boot/dts/qcom/sm8350.dtsi               |   6 +-
 arch/arm64/boot/dts/qcom/sm8550.dtsi               | 391 ++++++++++++++-------
 arch/arm64/boot/dts/qcom/sm8650.dtsi               |  82 +++--
 arch/arm64/boot/dts/qcom/sm8750.dtsi               |  26 +-
 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts       |  44 +++
 .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi  |   2 +
 arch/arm64/boot/dts/qcom/x1e80100.dtsi             |   2 +
 .../dts/renesas/white-hawk-ard-audio-da7212.dtso   |   2 +-
 arch/arm64/boot/dts/renesas/white-hawk-single.dtsi |   8 +-
 .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |   8 -
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      |  12 -
 arch/arm64/boot/dts/rockchip/rk3528.dtsi           |   3 +-
 arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts    |   1 +
 .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi |   5 +-
 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi      |  15 +-
 .../boot/dts/ti/k3-j721e-common-proc-board.dts     |   1 +
 arch/arm64/configs/defconfig                       |   3 +
 arch/arm64/include/asm/esr.h                       |  12 +-
 arch/arm64/kernel/fpsimd.c                         |  21 +-
 arch/arm64/xen/hypercall.S                         |  21 +-
 arch/m68k/mac/config.c                             |   2 +-
 .../boot/dts/loongson/loongson64c_4core_ls7a.dts   |   1 +
 arch/powerpc/kernel/Makefile                       |   2 -
 arch/powerpc/kexec/crash.c                         |   5 +-
 arch/powerpc/platforms/book3s/vas-api.c            |   9 +
 arch/powerpc/platforms/powernv/memtrace.c          |   8 +-
 arch/powerpc/platforms/pseries/iommu.c             |   2 +-
 arch/riscv/kernel/traps_misaligned.c               |   4 +-
 arch/riscv/kvm/vcpu_sbi.c                          |   4 +-
 arch/s390/kernel/uv.c                              |  85 ++++-
 arch/s390/net/bpf_jit_comp.c                       |  12 +-
 arch/um/os-Linux/sigio.c                           |   3 +-
 arch/x86/events/amd/uncore.c                       |  36 +-
 arch/x86/hyperv/hv_init.c                          |  33 ++
 arch/x86/hyperv/hv_vtl.c                           |  44 +--
 arch/x86/hyperv/ivm.c                              |  22 +-
 arch/x86/include/asm/mshyperv.h                    |   6 +-
 arch/x86/include/asm/mwait.h                       |   9 +-
 arch/x86/include/asm/sighandling.h                 |  22 ++
 arch/x86/kernel/cpu/common.c                       |  17 +-
 arch/x86/kernel/cpu/microcode/core.c               |   2 +
 arch/x86/kernel/cpu/mtrr/generic.c                 |   2 +-
 arch/x86/kernel/ioport.c                           |  13 +-
 arch/x86/kernel/irq.c                              |   2 +-
 arch/x86/kernel/process.c                          |  15 +-
 arch/x86/kernel/signal_32.c                        |   4 +
 arch/x86/kernel/signal_64.c                        |   4 +
 arch/x86/lib/x86-opcode-map.txt                    |  50 +--
 arch/x86/mm/init_32.c                              |   3 -
 arch/x86/mm/init_64.c                              |   3 -
 block/blk-integrity.c                              |   7 +-
 block/blk-throttle.c                               |  22 +-
 block/blk-zoned.c                                  |   7 +-
 block/elevator.c                                   |   3 +-
 crypto/api.c                                       |  13 +-
 crypto/asymmetric_keys/public_key.c                |  13 +-
 crypto/ecdsa-p1363.c                               |   6 +-
 crypto/ecdsa-x962.c                                |   5 +-
 crypto/ecdsa.c                                     |   2 +-
 crypto/ecrdsa.c                                    |   2 +-
 crypto/krb5/rfc3961_simplified.c                   |   1 +
 crypto/lrw.c                                       |   4 +-
 crypto/rsassa-pkcs1.c                              |   2 +-
 crypto/sig.c                                       |   9 +-
 crypto/xts.c                                       |   4 +-
 drivers/accel/amdxdna/aie2_message.c               |   6 +-
 drivers/accel/amdxdna/aie2_msg_priv.h              |  10 +-
 drivers/accel/amdxdna/aie2_psp.c                   |   4 +-
 drivers/accel/ivpu/ivpu_job.c                      |   8 +-
 drivers/acpi/acpica/exserial.c                     |   6 +
 drivers/acpi/apei/Kconfig                          |   1 +
 drivers/acpi/apei/ghes.c                           |   2 +-
 drivers/acpi/cppc_acpi.c                           |   2 +-
 drivers/acpi/osi.c                                 |   1 -
 drivers/acpi/platform_profile.c                    |   3 +
 drivers/acpi/resource.c                            |   2 +-
 drivers/acpi/thermal.c                             |  10 +-
 drivers/base/power/main.c                          |   3 +-
 drivers/base/power/runtime.c                       |  44 +++
 drivers/block/brd.c                                |  11 +-
 drivers/block/loop.c                               |   8 +-
 drivers/bluetooth/btintel.c                        |  10 +-
 drivers/bluetooth/btintel_pcie.c                   |  31 +-
 drivers/bluetooth/btintel_pcie.h                   |  10 +-
 drivers/bus/fsl-mc/fsl-mc-bus.c                    |  12 +-
 drivers/char/Kconfig                               |   2 +-
 drivers/clk/bcm/clk-raspberrypi.c                  |   2 +
 drivers/clk/qcom/camcc-sm6350.c                    |  18 +
 drivers/clk/qcom/dispcc-sm6350.c                   |   3 +
 drivers/clk/qcom/gcc-msm8939.c                     |   4 +-
 drivers/clk/qcom/gcc-sm6350.c                      |   6 +
 drivers/clk/qcom/gpucc-sm6350.c                    |   6 +
 drivers/counter/interrupt-cnt.c                    |   9 +
 .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c    |   7 +-
 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c  |  17 +-
 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c  |  34 +-
 drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h       |   2 +-
 .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c    |   2 +-
 drivers/crypto/intel/iaa/iaa_crypto_main.c         |   6 +-
 drivers/crypto/marvell/cesa/cipher.c               |   3 +
 drivers/crypto/marvell/cesa/hash.c                 |   2 +-
 drivers/crypto/xilinx/zynqmp-sha.c                 |  18 +-
 drivers/dma/ti/k3-udma.c                           |   3 +-
 drivers/edac/bluefield_edac.c                      |  20 +-
 drivers/edac/i10nm_base.c                          |  35 +-
 drivers/edac/skx_common.c                          |   1 +
 drivers/edac/skx_common.h                          |  11 +-
 drivers/firmware/Kconfig                           |   1 -
 drivers/firmware/arm_sdei.c                        |  11 +-
 drivers/firmware/efi/libstub/efi-stub-helper.c     |   1 +
 drivers/firmware/psci/psci.c                       |   4 +-
 drivers/firmware/samsung/exynos-acpm-pmic.c        |  16 +-
 drivers/firmware/samsung/exynos-acpm.c             |  11 +-
 drivers/fpga/tests/fpga-mgr-test.c                 |   1 +
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |   2 +-
 .../gpu/drm/amd/amdgpu/gfx_v10_0_cleaner_shader.h  |   6 +-
 .../drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm |  13 +-
 drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c |   5 -
 .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c   |   4 -
 .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c    |   8 +
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |  58 +--
 drivers/gpu/drm/bridge/lontium-lt9611uxc.c         |   6 +-
 drivers/gpu/drm/ci/gitlab-ci.yml                   |  19 +-
 drivers/gpu/drm/display/drm_hdmi_audio_helper.c    |   3 +-
 drivers/gpu/drm/drm_panic_qr.rs                    |  71 ++--
 drivers/gpu/drm/i915/display/intel_dp.c            |   7 +-
 drivers/gpu/drm/i915/display/intel_dp.h            |   1 +
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |   5 +-
 drivers/gpu/drm/i915/display/intel_psr_regs.h      |   4 +-
 drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c |  16 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c  |  19 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c             |  31 +-
 drivers/gpu/drm/meson/meson_encoder_hdmi.c         |   2 +-
 drivers/gpu/drm/meson/meson_vclk.c                 |  55 +--
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c              |   1 -
 .../drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h   |   2 -
 .../drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h   |   1 -
 .../drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h   |   2 -
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h |  16 +-
 .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h    |  16 +-
 drivers/gpu/drm/msm/dp/dp_display.c                |  27 +-
 drivers/gpu/drm/msm/dp/dp_link.h                   |   4 +
 drivers/gpu/drm/msm/dp/dp_panel.c                  |  12 +-
 drivers/gpu/drm/panel/panel-samsung-sofef00.c      |  34 +-
 drivers/gpu/drm/panel/panel-simple.c               |   5 +-
 drivers/gpu/drm/panthor/panthor_device.c           |   8 +-
 drivers/gpu/drm/panthor/panthor_mmu.c              |   1 +
 drivers/gpu/drm/panthor/panthor_regs.h             |   4 +-
 drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c      |  10 +-
 drivers/gpu/drm/tegra/rgb.c                        |  14 +-
 drivers/gpu/drm/v3d/v3d_debugfs.c                  | 116 +++---
 drivers/gpu/drm/v3d/v3d_drv.c                      |  22 +-
 drivers/gpu/drm/v3d/v3d_drv.h                      |  11 +-
 drivers/gpu/drm/v3d/v3d_gem.c                      |  10 +-
 drivers/gpu/drm/v3d/v3d_irq.c                      |  64 +++-
 drivers/gpu/drm/v3d/v3d_perfmon.c                  |   4 +-
 drivers/gpu/drm/v3d/v3d_sched.c                    |   6 +-
 drivers/gpu/drm/vc4/tests/vc4_mock_output.c        |  36 +-
 drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c     | 154 +++++++-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |  16 +-
 drivers/gpu/drm/vkms/vkms_crtc.c                   |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_bo.c                 |  10 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_bo.h                 |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c            |  26 ++
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c            |  34 +-
 drivers/gpu/drm/xe/Kconfig                         |   3 +-
 drivers/gpu/drm/xe/xe_bo.c                         |  48 ++-
 drivers/gpu/drm/xe/xe_gt_freq.c                    |   5 +
 drivers/gpu/drm/xe/xe_guc_debugfs.c                | 167 +++++----
 drivers/gpu/drm/xe/xe_lrc.c                        |  24 +-
 drivers/gpu/drm/xe/xe_pci.c                        |   1 +
 drivers/gpu/drm/xe/xe_pxp.c                        |   8 +-
 drivers/gpu/drm/xe/xe_vm.c                         |  19 +-
 drivers/gpu/drm/xe/xe_vm.h                         |  69 ++++
 drivers/gpu/drm/xe/xe_vm_types.h                   |   8 +
 drivers/gpu/drm/xlnx/Kconfig                       |   1 +
 drivers/hid/Kconfig                                |   2 +
 drivers/hid/hid-hyperv.c                           |   4 +-
 .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c    |   7 +-
 drivers/hid/usbhid/hid-core.c                      |  25 +-
 drivers/hwmon/asus-ec-sensors.c                    |   4 +
 drivers/hwtracing/coresight/coresight-catu.c       |  27 +-
 drivers/hwtracing/coresight/coresight-catu.h       |   1 +
 drivers/hwtracing/coresight/coresight-config.h     |   2 +-
 drivers/hwtracing/coresight/coresight-core.c       |  21 +-
 drivers/hwtracing/coresight/coresight-cpu-debug.c  |   3 +-
 drivers/hwtracing/coresight/coresight-etm4x-core.c |   5 +-
 .../hwtracing/coresight/coresight-etm4x-sysfs.c    |   4 +-
 drivers/hwtracing/coresight/coresight-funnel.c     |   3 +-
 drivers/hwtracing/coresight/coresight-replicator.c |   3 +-
 drivers/hwtracing/coresight/coresight-stm.c        |   2 +-
 drivers/hwtracing/coresight/coresight-syscfg.c     |  51 ++-
 drivers/hwtracing/coresight/coresight-tmc-core.c   |   2 +-
 drivers/hwtracing/coresight/coresight-tmc-etf.c    |  11 +-
 drivers/hwtracing/coresight/coresight-tpiu.c       |   2 +-
 drivers/iio/adc/ad4851.c                           |  14 +-
 drivers/iio/adc/ad7124.c                           |   4 +-
 drivers/iio/adc/mcp3911.c                          |  39 +-
 drivers/iio/adc/pac1934.c                          |   2 +-
 drivers/iio/dac/adi-axi-dac.c                      |   8 +
 drivers/iio/filter/admv8818.c                      | 230 +++++++++---
 drivers/infiniband/core/cm.c                       |  19 +-
 drivers/infiniband/core/cma.c                      |   3 +-
 drivers/infiniband/hw/bnxt_re/debugfs.c            |  20 +-
 drivers/infiniband/hw/hns/hns_roce_ah.c            |   1 -
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c         |   1 -
 drivers/infiniband/hw/hns/hns_roce_hw_v2.h         |   1 +
 drivers/infiniband/hw/hns/hns_roce_main.c          |   1 -
 drivers/infiniband/hw/hns/hns_roce_restrack.c      |   1 -
 drivers/infiniband/hw/mlx5/qpc.c                   |  30 +-
 drivers/infiniband/sw/rxe/rxe_qp.c                 |   7 +-
 drivers/iommu/Kconfig                              |   1 -
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c        |   2 +-
 drivers/iommu/io-pgtable-arm.c                     |  13 +-
 drivers/iommu/iommu.c                              |   4 +-
 drivers/iommu/ipmmu-vmsa.c                         |   3 +-
 drivers/mailbox/Kconfig                            |   4 +-
 drivers/mailbox/imx-mailbox.c                      |  21 +-
 drivers/mailbox/mtk-cmdq-mailbox.c                 |  51 ++-
 drivers/md/dm-core.h                               |   1 +
 drivers/md/dm-flakey.c                             |  70 ++--
 drivers/md/dm-table.c                              |  67 +++-
 drivers/md/dm-zone.c                               |  86 +++--
 drivers/md/dm.c                                    |  36 +-
 drivers/md/dm.h                                    |   6 +
 drivers/md/raid1-10.c                              |  10 +
 drivers/md/raid1.c                                 |  19 +-
 drivers/md/raid10.c                                |  11 +-
 .../media/platform/synopsys/hdmirx/snps_hdmirx.c   |  14 +-
 .../media/platform/verisilicon/hantro_postproc.c   |   4 +-
 drivers/mfd/exynos-lpass.c                         |  31 +-
 drivers/mfd/stmpe-spi.c                            |   2 +-
 drivers/misc/lis3lv02d/Kconfig                     |   4 +-
 drivers/misc/mei/vsc-tp.c                          |   4 +-
 drivers/misc/vmw_vmci/vmci_host.c                  |  11 +-
 drivers/mtd/nand/ecc-mxic.c                        |   2 +-
 drivers/net/bonding/bond_main.c                    | 144 ++++----
 drivers/net/dsa/b53/b53_common.c                   |  92 ++---
 drivers/net/dsa/b53/b53_priv.h                     |   1 +
 drivers/net/dsa/b53/b53_regs.h                     |   7 +
 drivers/net/dsa/bcm_sf2.c                          |   1 +
 drivers/net/ethernet/airoha/airoha_eth.c           |  23 +-
 drivers/net/ethernet/airoha/airoha_eth.h           |  10 +
 drivers/net/ethernet/airoha/airoha_ppe.c           |  32 +-
 drivers/net/ethernet/airoha/airoha_regs.h          |  10 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  20 +-
 .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c    |  18 +-
 drivers/net/ethernet/google/gve/gve_main.c         |   2 +-
 drivers/net/ethernet/google/gve/gve_tx_dqo.c       |   3 +
 drivers/net/ethernet/intel/e1000/e1000_main.c      |   8 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |  11 +-
 drivers/net/ethernet/intel/iavf/iavf.h             |   1 -
 drivers/net/ethernet/intel/iavf/iavf_ethtool.c     |  29 +-
 drivers/net/ethernet/intel/iavf/iavf_main.c        | 302 ++++++----------
 drivers/net/ethernet/intel/iavf/iavf_virtchnl.c    |  17 +
 drivers/net/ethernet/intel/ice/ice_main.c          |  47 ++-
 drivers/net/ethernet/intel/ice/ice_ptp.c           |   1 +
 drivers/net/ethernet/intel/ice/ice_sched.c         | 181 ++++++++--
 drivers/net/ethernet/intel/idpf/idpf_lib.c         |  18 +-
 .../net/ethernet/intel/idpf/idpf_singleq_txrx.c    |   9 +-
 drivers/net/ethernet/intel/idpf/idpf_txrx.c        |  45 +--
 drivers/net/ethernet/intel/idpf/idpf_txrx.h        |   8 -
 drivers/net/ethernet/intel/idpf/idpf_virtchnl.c    |   2 +-
 drivers/net/ethernet/intel/idpf/idpf_virtchnl.h    |   1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c     |  41 ++-
 drivers/net/ethernet/intel/ixgbevf/ipsec.c         |  21 +-
 .../net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c |   2 +
 .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c    |   2 +
 .../net/ethernet/marvell/octeontx2/af/rvu_rep.c    |   2 +
 .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.c   |  18 +-
 drivers/net/ethernet/marvell/octeontx2/nic/qos.c   |   4 +-
 .../net/ethernet/marvell/octeontx2/nic/qos_sq.c    |  22 ++
 drivers/net/ethernet/mediatek/mtk_star_emac.c      |   4 +
 drivers/net/ethernet/mellanox/mlx4/en_clock.c      |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c   |   4 +-
 .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c   |  28 +-
 .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h   |   1 +
 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   |   5 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    |  12 +-
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |  21 +-
 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c  |   5 +-
 .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |   2 +-
 .../mellanox/mlx5/core/steering/hws/action.c       |  14 +-
 .../ethernet/mellanox/mlx5/core/steering/hws/bwc.c |  55 ++-
 .../ethernet/mellanox/mlx5/core/steering/hws/bwc.h |   9 +-
 .../mellanox/mlx5/core/steering/hws/definer.c      |   3 +
 .../mellanox/mlx5/core/steering/hws/fs_hws.c       |   3 +
 .../mellanox/mlx5/core/steering/hws/matcher.c      |  48 ++-
 .../mellanox/mlx5/core/steering/hws/matcher.h      |   4 +
 .../mellanox/mlx5/core/steering/hws/mlx5hws.h      |   6 +-
 drivers/net/ethernet/microchip/lan743x_main.c      |  15 +-
 .../net/ethernet/microchip/lan966x/lan966x_main.c  |   7 +
 .../net/ethernet/microchip/lan966x/lan966x_main.h  |   6 +
 .../net/ethernet/microchip/lan966x/lan966x_ptp.c   |  49 ++-
 .../ethernet/microchip/lan966x/lan966x_switchdev.c |   1 +
 .../net/ethernet/microchip/lan966x/lan966x_vlan.c  |  21 ++
 drivers/net/ethernet/netronome/nfp/crypto/ipsec.c  |  11 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_est.c   |   5 +
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   5 +
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |  11 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c   |   2 +-
 drivers/net/ethernet/ti/icssg/icssg_stats.c        |   8 +
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |   6 +-
 drivers/net/macsec.c                               |  40 ++-
 drivers/net/mctp/mctp-usb.c                        |   2 +
 drivers/net/netconsole.c                           |   3 +-
 drivers/net/netdevsim/ipsec.c                      |  15 +-
 drivers/net/netdevsim/netdev.c                     |   3 +-
 drivers/net/phy/mdio_bus.c                         |  12 +
 drivers/net/phy/mediatek/Kconfig                   |   3 +-
 drivers/net/phy/mscc/mscc_ptp.c                    |  20 +-
 drivers/net/phy/phy_caps.c                         |  18 +-
 drivers/net/phy/phy_device.c                       |   4 +-
 drivers/net/usb/aqc111.c                           |  10 +-
 drivers/net/vmxnet3/vmxnet3_drv.c                  |  26 ++
 drivers/net/wireguard/device.c                     |   1 +
 drivers/net/wireless/ath/ath10k/snoc.c             |   4 +-
 drivers/net/wireless/ath/ath11k/core.c             |  37 +-
 drivers/net/wireless/ath/ath11k/core.h             |   4 +-
 drivers/net/wireless/ath/ath11k/debugfs.c          | 148 +-------
 drivers/net/wireless/ath/ath11k/debugfs.h          |  10 +-
 drivers/net/wireless/ath/ath11k/mac.c              |  92 ++++-
 drivers/net/wireless/ath/ath11k/mac.h              |   4 +-
 drivers/net/wireless/ath/ath11k/wmi.c              |  47 ++-
 drivers/net/wireless/ath/ath12k/core.c             |  28 +-
 drivers/net/wireless/ath/ath12k/core.h             |  19 +-
 drivers/net/wireless/ath/ath12k/debugfs.c          |   4 +-
 .../net/wireless/ath/ath12k/debugfs_htt_stats.c    |   3 +
 drivers/net/wireless/ath/ath12k/dp.h               |   2 +
 drivers/net/wireless/ath/ath12k/dp_mon.c           | 351 +++++++++++++++---
 drivers/net/wireless/ath/ath12k/dp_mon.h           |   4 +-
 drivers/net/wireless/ath/ath12k/dp_rx.c            | 234 ++++++------
 drivers/net/wireless/ath/ath12k/dp_rx.h            |  29 +-
 drivers/net/wireless/ath/ath12k/dp_tx.c            |  23 +-
 drivers/net/wireless/ath/ath12k/hal.c              | 103 +++---
 drivers/net/wireless/ath/ath12k/hal.h              |  64 ++--
 drivers/net/wireless/ath/ath12k/hal_desc.h         |   3 +-
 drivers/net/wireless/ath/ath12k/hal_rx.h           |  15 +-
 drivers/net/wireless/ath/ath12k/hw.c               |  35 +-
 drivers/net/wireless/ath/ath12k/hw.h               |  12 +-
 drivers/net/wireless/ath/ath12k/mac.c              |  86 +++--
 drivers/net/wireless/ath/ath12k/mhi.c              |   7 +-
 drivers/net/wireless/ath/ath12k/pci.c              |  17 +-
 drivers/net/wireless/ath/ath12k/pci.h              |   4 +-
 drivers/net/wireless/ath/ath12k/reg.c              |   4 +
 drivers/net/wireless/ath/ath12k/wmi.c              |  39 +-
 drivers/net/wireless/ath/ath12k/wmi.h              |  16 +-
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |   3 +
 drivers/net/wireless/intel/iwlwifi/iwl-trans.h     |   1 +
 drivers/net/wireless/intel/iwlwifi/mld/mld.c       |   3 +-
 drivers/net/wireless/intel/iwlwifi/mvm/rs.c        |   2 +
 drivers/net/wireless/marvell/mwifiex/11n.c         |   6 +-
 drivers/net/wireless/mediatek/mt76/channel.c       |   4 +-
 drivers/net/wireless/mediatek/mt76/mac80211.c      |   6 +-
 drivers/net/wireless/mediatek/mt76/mt7915/mmio.c   |   6 +
 drivers/net/wireless/mediatek/mt76/mt7925/init.c   |   2 +-
 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c    |  21 +-
 drivers/net/wireless/mediatek/mt76/mt7996/dma.c    |   4 +-
 drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c |   1 +
 drivers/net/wireless/mediatek/mt76/mt7996/init.c   |  14 +-
 drivers/net/wireless/mediatek/mt76/mt7996/main.c   |  23 +-
 drivers/net/wireless/mediatek/mt76/mt7996/mmio.c   |   3 +
 drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h |   4 +
 drivers/net/wireless/realtek/rtw88/coex.c          |   2 +-
 drivers/net/wireless/realtek/rtw88/rtw8822c.c      |   3 +-
 drivers/net/wireless/realtek/rtw88/sdio.c          |  10 +-
 drivers/net/wireless/realtek/rtw89/fw.c            |   2 +-
 drivers/net/wireless/realtek/rtw89/pci.c           |  36 +-
 drivers/net/wwan/mhi_wwan_mbim.c                   |   9 +-
 drivers/net/wwan/t7xx/t7xx_netdev.c                |  11 +-
 drivers/nvme/host/constants.c                      |   2 +-
 drivers/nvme/host/core.c                           |   1 -
 drivers/nvme/host/ioctl.c                          |   2 +-
 drivers/nvme/host/pr.c                             |   2 -
 drivers/nvme/target/core.c                         |   9 +-
 drivers/nvme/target/fcloop.c                       |  31 +-
 drivers/nvme/target/io-cmd-bdev.c                  |   9 +-
 drivers/nvmem/zynqmp_nvmem.c                       |   1 +
 drivers/of/unittest.c                              |  10 +-
 drivers/pci/controller/cadence/pcie-cadence-host.c |  11 +-
 drivers/pci/controller/dwc/pci-imx6.c              |  47 +++
 drivers/pci/controller/dwc/pcie-rcar-gen4.c        |   1 +
 drivers/pci/controller/pcie-apple.c                |   4 +-
 drivers/pci/controller/pcie-rockchip.h             |   7 +-
 drivers/pci/endpoint/pci-epf-core.c                |  22 +-
 drivers/pci/hotplug/pci_hotplug_core.c             |  69 ++++
 drivers/pci/hotplug/pciehp.h                       |   1 +
 drivers/pci/hotplug/pciehp_core.c                  |  29 --
 drivers/pci/hotplug/pciehp_hpc.c                   |  78 ++--
 drivers/pci/pci-acpi.c                             |  23 +-
 drivers/pci/pci-driver.c                           |   6 -
 drivers/pci/pci.c                                  |  15 +-
 drivers/pci/pci.h                                  |   4 +
 drivers/pci/pcie/dpc.c                             |  66 ++--
 drivers/pci/pwrctrl/core.c                         |   2 +
 drivers/perf/amlogic/meson_ddr_pmu_core.c          |   2 +-
 drivers/perf/arm-ni.c                              |  40 ++-
 drivers/phy/qualcomm/phy-qcom-qmp-usb.c            |   6 +-
 drivers/phy/qualcomm/phy-qcom-qusb2.c              |  27 +-
 drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c  |  13 +-
 drivers/pinctrl/mediatek/mtk-eint.c                |   4 +-
 drivers/pinctrl/mediatek/mtk-eint.h                |   2 +-
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c   |   7 +-
 drivers/pinctrl/pinctrl-at91.c                     |   6 +-
 drivers/pinctrl/qcom/pinctrl-qcm2290.c             |   9 +
 drivers/pinctrl/qcom/pinctrl-qcs615.c              |   2 +-
 drivers/pinctrl/qcom/pinctrl-qcs8300.c             |   2 +-
 drivers/pinctrl/qcom/tlmm-test.c                   |   1 +
 drivers/pinctrl/samsung/pinctrl-exynos-arm64.c     |  52 +--
 drivers/pinctrl/samsung/pinctrl-exynos.c           | 266 ++++++++------
 drivers/pinctrl/samsung/pinctrl-exynos.h           |   8 +-
 drivers/pinctrl/samsung/pinctrl-samsung.c          |  21 +-
 drivers/pinctrl/samsung/pinctrl-samsung.h          |   8 +-
 drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c           |   8 +-
 drivers/platform/chrome/cros_ec_typec.c            |   6 +-
 drivers/power/reset/at91-reset.c                   |   5 +-
 drivers/power/supply/max77705_charger.c            |  20 +-
 drivers/ptp/ptp_private.h                          |  12 +-
 drivers/regulator/max20086-regulator.c             |   6 +-
 drivers/remoteproc/qcom_wcnss_iris.c               |   2 +
 drivers/remoteproc/ti_k3_dsp_remoteproc.c          |   8 -
 drivers/remoteproc/ti_k3_r5_remoteproc.c           | 118 ++++---
 drivers/rpmsg/qcom_smd.c                           |   2 +-
 drivers/rtc/rtc-loongson.c                         |   8 +
 drivers/rtc/rtc-sh.c                               |  12 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c              |  29 +-
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |  32 +-
 drivers/scsi/mpt3sas/mpt3sas_ctl.c                 |   3 +-
 drivers/scsi/qedf/qedf_main.c                      |   2 +-
 drivers/scsi/scsi_transport_iscsi.c                |  11 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |   4 +-
 drivers/soc/aspeed/aspeed-lpc-snoop.c              |  17 +-
 drivers/soc/qcom/smp2p.c                           |   2 +-
 drivers/soundwire/generic_bandwidth_allocation.c   |   7 +
 drivers/spi/atmel-quadspi.c                        |  17 +-
 drivers/spi/spi-bcm63xx-hsspi.c                    |   2 +-
 drivers/spi/spi-bcm63xx.c                          |   2 +-
 drivers/spi/spi-omap2-mcspi.c                      |  30 +-
 drivers/spi/spi-qpic-snand.c                       |  44 ++-
 drivers/spi/spi-sh-msiof.c                         |  13 +-
 drivers/spi/spi-tegra210-quad.c                    |  24 +-
 drivers/staging/gpib/ines/ines_gpib.c              |   2 +-
 drivers/staging/gpib/uapi/gpib_user.h              |   2 +-
 drivers/staging/media/rkvdec/rkvdec.c              |  10 +-
 drivers/thermal/mediatek/lvts_thermal.c            |  16 +-
 drivers/thunderbolt/usb4.c                         |   4 +-
 drivers/tty/serial/8250/8250_omap.c                |  25 +-
 drivers/tty/serial/milbeaut_usio.c                 |   5 +-
 drivers/tty/vt/vt_ioctl.c                          |   2 -
 drivers/ufs/core/ufs-mcq.c                         |   6 -
 drivers/ufs/core/ufshcd.c                          |   7 +-
 drivers/ufs/host/ufs-qcom.c                        |  92 ++++-
 drivers/usb/cdns3/cdnsp-gadget.c                   |  21 +-
 drivers/usb/cdns3/cdnsp-gadget.h                   |   4 +
 drivers/usb/class/usbtmc.c                         |  17 +-
 drivers/usb/core/hub.c                             |  16 +-
 drivers/usb/core/usb-acpi.c                        |   2 +
 drivers/usb/gadget/function/f_hid.c                |  12 +-
 drivers/usb/gadget/udc/core.c                      |   2 +-
 drivers/usb/misc/onboard_usb_dev.c                 | 111 +++++-
 drivers/usb/renesas_usbhs/common.c                 |  50 ++-
 drivers/usb/serial/bus.c                           |   2 +-
 drivers/usb/typec/bus.c                            |   2 +-
 drivers/usb/typec/tcpm/tcpci_maxim_core.c          |   3 +-
 drivers/usb/typec/tcpm/tcpm.c                      |  91 +++--
 drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c     |  94 +++--
 drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h     |  14 +-
 drivers/vfio/vfio_iommu_type1.c                    |   2 +-
 drivers/video/backlight/qcom-wled.c                |   6 +-
 drivers/video/fbdev/core/fbcvt.c                   |   2 +-
 drivers/virtio/virtio_pci_modern.c                 |  13 +-
 drivers/watchdog/exar_wdt.c                        |   2 +-
 drivers/watchdog/lenovo_se30_wdt.c                 |   2 +
 drivers/xen/balloon.c                              |  13 +-
 fs/9p/vfs_addr.c                                   |   6 +-
 fs/afs/write.c                                     |   9 +-
 fs/btrfs/extent-io-tree.c                          |   6 +-
 fs/btrfs/file.c                                    |   2 +-
 fs/btrfs/inode.c                                   |   7 +-
 fs/btrfs/scrub.c                                   |  34 +-
 fs/btrfs/tree-log.c                                |  24 +-
 fs/cachefiles/io.c                                 |  16 +-
 fs/ceph/addr.c                                     |   6 +-
 fs/dax.c                                           |   2 +-
 fs/erofs/fscache.c                                 |   6 +-
 fs/erofs/super.c                                   |  49 ++-
 fs/f2fs/data.c                                     |   6 +-
 fs/f2fs/f2fs.h                                     |  46 ++-
 fs/f2fs/gc.c                                       |   3 +
 fs/f2fs/namei.c                                    |  10 +-
 fs/f2fs/segment.c                                  |  12 +-
 fs/f2fs/segment.h                                  |  43 ++-
 fs/f2fs/super.c                                    |  45 ++-
 fs/filesystems.c                                   |  14 +-
 fs/gfs2/aops.c                                     |  54 +--
 fs/gfs2/aops.h                                     |   3 +-
 fs/gfs2/bmap.c                                     |   3 +-
 fs/gfs2/glock.c                                    |   3 +-
 fs/gfs2/glops.c                                    |   4 +-
 fs/gfs2/incore.h                                   |   9 +-
 fs/gfs2/inode.c                                    |  98 +++++-
 fs/gfs2/inode.h                                    |   1 +
 fs/gfs2/log.c                                      |   7 +-
 fs/gfs2/meta_io.c                                  |   2 +-
 fs/gfs2/meta_io.h                                  |   4 +-
 fs/gfs2/ops_fstype.c                               |  35 +-
 fs/gfs2/super.c                                    |  90 +----
 fs/gfs2/sys.c                                      |   1 -
 fs/gfs2/trans.c                                    |  21 ++
 fs/gfs2/trans.h                                    |   2 +
 fs/gfs2/xattr.c                                    |  11 +-
 fs/gfs2/xattr.h                                    |   2 +-
 fs/iomap/buffered-io.c                             |   2 +
 fs/kernfs/dir.c                                    |   5 +-
 fs/kernfs/file.c                                   |   3 +-
 fs/mount.h                                         |   5 -
 fs/namespace.c                                     | 122 ++++---
 fs/netfs/buffered_read.c                           |  32 +-
 fs/netfs/buffered_write.c                          |   2 +-
 fs/netfs/direct_read.c                             |  13 +-
 fs/netfs/direct_write.c                            |  12 +-
 fs/netfs/fscache_io.c                              |  10 +-
 fs/netfs/internal.h                                |  42 ++-
 fs/netfs/main.c                                    |   1 +
 fs/netfs/misc.c                                    | 219 ++++++++++++
 fs/netfs/objects.c                                 |  48 +--
 fs/netfs/read_collect.c                            | 185 ++--------
 fs/netfs/read_pgpriv2.c                            |   4 +-
 fs/netfs/read_retry.c                              |  26 +-
 fs/netfs/read_single.c                             |   6 +-
 fs/netfs/write_collect.c                           |  81 ++---
 fs/netfs/write_issue.c                             |  38 +-
 fs/netfs/write_retry.c                             |  19 +-
 fs/nfs/fscache.c                                   |   1 +
 fs/nfs/localio.c                                   |  45 +--
 fs/nfs/nfs4proc.c                                  |  32 +-
 fs/nfs/super.c                                     |  19 +
 fs/nfs_common/nfslocalio.c                         | 101 ++++--
 fs/nfsd/filecache.c                                |  32 +-
 fs/nfsd/filecache.h                                |   3 +-
 fs/nfsd/localio.c                                  |  70 +++-
 fs/nilfs2/btree.c                                  |   4 +-
 fs/nilfs2/direct.c                                 |   3 +
 fs/ntfs3/index.c                                   |   8 +
 fs/ntfs3/inode.c                                   |   5 +
 fs/ocfs2/quota_local.c                             |   2 +-
 fs/pidfs.c                                         |   2 +-
 fs/pnode.c                                         |   4 +-
 fs/smb/client/cifsproto.h                          |   3 +-
 fs/smb/client/cifssmb.c                            |  24 +-
 fs/smb/client/file.c                               |  19 +-
 fs/smb/client/smb2pdu.c                            |   4 +-
 fs/squashfs/super.c                                |   5 +
 fs/xfs/xfs_aops.c                                  |  22 +-
 fs/xfs/xfs_discard.c                               |  17 +-
 include/crypto/sig.h                               |   2 +-
 include/hyperv/hvgdk_mini.h                        |   2 +-
 include/kunit/clk.h                                |   1 +
 include/linux/arm_sdei.h                           |   4 +-
 include/linux/bio.h                                |   2 +-
 include/linux/bpf_verifier.h                       |  12 +-
 include/linux/bvec.h                               |   7 +-
 include/linux/coresight.h                          |   2 +-
 include/linux/execmem.h                            |   8 +-
 include/linux/exportfs.h                           |  10 +
 include/linux/fscache.h                            |   2 +-
 include/linux/hid.h                                |   3 +-
 include/linux/ieee80211.h                          |  79 ++++-
 include/linux/iomap.h                              |   5 +-
 include/linux/mdio.h                               |   5 +-
 include/linux/mlx5/driver.h                        |   1 +
 include/linux/mm.h                                 |  58 +++
 include/linux/mount.h                              |  78 ++--
 include/linux/netdevice.h                          |  10 +-
 include/linux/netfs.h                              |  15 +-
 include/linux/nfslocalio.h                         |  26 +-
 include/linux/nvme.h                               |   2 +-
 include/linux/overflow.h                           |  33 +-
 include/linux/pci-epf.h                            |   3 +
 include/linux/pci.h                                |   8 +
 include/linux/phy.h                                |   5 +-
 include/linux/pm_runtime.h                         |   4 +
 include/linux/poison.h                             |   4 +
 include/linux/udp.h                                |  16 +
 include/linux/virtio_vsock.h                       |   1 +
 include/net/bluetooth/hci.h                        |   3 +-
 include/net/bluetooth/hci_core.h                   |  50 ++-
 include/net/checksum.h                             |   2 +-
 include/net/netfilter/nft_fib.h                    |   9 +
 include/net/netns/ipv4.h                           |  11 +
 include/net/page_pool/types.h                      |   6 +
 include/net/sock.h                                 |   7 +-
 include/net/udp.h                                  |   1 +
 include/net/udp_tunnel.h                           |  15 +
 include/net/xfrm.h                                 |  11 +
 include/sound/hdaudio.h                            |   4 +-
 include/sound/hdaudio_ext.h                        |   6 +
 include/trace/events/netfs.h                       |   8 +-
 include/uapi/drm/xe_drm.h                          |   5 +
 include/uapi/linux/bits.h                          |   4 +-
 include/uapi/linux/bpf.h                           |   4 +-
 io_uring/fdinfo.c                                  |  12 +-
 io_uring/io_uring.c                                |  18 +-
 io_uring/register.c                                |   7 +-
 io_uring/sqpoll.c                                  |  43 ++-
 io_uring/sqpoll.h                                  |   8 +-
 kernel/bpf/core.c                                  |  29 +-
 kernel/bpf/verifier.c                              |  18 +-
 kernel/events/core.c                               |  50 ++-
 kernel/power/energy_model.c                        |   4 +
 kernel/power/hibernate.c                           |   5 +
 kernel/power/main.c                                |   3 +-
 kernel/power/power.h                               |   4 +
 kernel/power/wakelock.c                            |   3 +
 kernel/rcu/tree.c                                  |  10 +-
 kernel/rcu/tree.h                                  |   2 +-
 kernel/rcu/tree_stall.h                            |   4 +-
 kernel/sched/core.c                                |  12 +-
 kernel/sched/ext_idle.c                            |   8 +
 kernel/sched/fair.c                                |  13 +-
 kernel/time/posix-cpu-timers.c                     |   9 +
 kernel/trace/bpf_trace.c                           |  10 +-
 kernel/trace/ring_buffer.c                         |  41 ++-
 kernel/trace/trace.h                               |   8 +-
 kernel/trace/trace_events_hist.c                   | 122 ++++++-
 kernel/trace/trace_events_trigger.c                |  20 +-
 lib/Kconfig.ubsan                                  |   2 +
 lib/iov_iter.c                                     |   2 +-
 lib/kunit/static_stub.c                            |   2 +-
 lib/tests/usercopy_kunit.c                         |   1 +
 mm/execmem.c                                       |  40 +--
 mm/filemap.c                                       |  20 +-
 mm/page_alloc.c                                    |   8 +-
 net/9p/client.c                                    |   6 +-
 net/bluetooth/eir.c                                |  17 +-
 net/bluetooth/eir.h                                |   2 +-
 net/bluetooth/hci_conn.c                           |  46 ++-
 net/bluetooth/hci_core.c                           |  50 +--
 net/bluetooth/hci_event.c                          |  40 ++-
 net/bluetooth/hci_sync.c                           |  90 ++++-
 net/bluetooth/iso.c                                |  13 +-
 net/bluetooth/l2cap_core.c                         |   3 +-
 net/bluetooth/mgmt.c                               | 146 ++++----
 net/bluetooth/mgmt_util.c                          |  34 +-
 net/bluetooth/mgmt_util.h                          |   4 +-
 net/bridge/netfilter/nf_conntrack_bridge.c         |  12 +-
 net/core/dev.c                                     |   2 +-
 net/core/filter.c                                  |   5 +-
 net/core/net_namespace.c                           |   4 +-
 net/core/netmem_priv.h                             |  33 +-
 net/core/page_pool.c                               | 108 ++++--
 net/core/rtnetlink.c                               |   2 +-
 net/core/skbuff.c                                  |  16 +-
 net/core/skmsg.c                                   |  53 +--
 net/core/sock.c                                    |   8 +-
 net/core/utils.c                                   |   4 +-
 net/core/xdp.c                                     |   4 +-
 net/dsa/tag_brcm.c                                 |   2 +-
 net/ethtool/ioctl.c                                |   3 +-
 net/ipv4/netfilter/nft_fib_ipv4.c                  |  11 +-
 net/ipv4/udp.c                                     |  44 ++-
 net/ipv4/udp_offload.c                             | 177 +++++++++-
 net/ipv4/udp_tunnel_core.c                         |  15 +
 net/ipv6/ila/ila_common.c                          |   6 +-
 net/ipv6/netfilter.c                               |  12 +-
 net/ipv6/netfilter/nft_fib_ipv6.c                  |  17 +-
 net/ipv6/seg6_local.c                              |   6 +-
 net/ipv6/udp.c                                     |   2 +
 net/ipv6/udp_offload.c                             |   5 +
 net/mac80211/mlme.c                                |   7 +-
 net/mac80211/scan.c                                |  11 +-
 net/ncsi/internal.h                                |  21 +-
 net/ncsi/ncsi-pkt.h                                |  23 +-
 net/ncsi/ncsi-rsp.c                                |  21 +-
 net/netfilter/nf_nat_core.c                        |  12 +-
 net/netfilter/nft_quota.c                          |  20 +-
 net/netfilter/nft_set_pipapo.c                     |  58 ++-
 net/netfilter/nft_set_pipapo_avx2.c                |  21 +-
 net/netfilter/nft_tunnel.c                         |   8 +-
 net/netfilter/xt_TCPOPTSTRIP.c                     |   4 +-
 net/netfilter/xt_mark.c                            |   2 +-
 net/netlabel/netlabel_kapi.c                       |   5 +
 net/openvswitch/flow.c                             |   2 +-
 net/packet/af_packet.c                             |  21 +-
 net/packet/internal.h                              |   1 +
 net/sched/sch_ets.c                                |   2 +-
 net/sched/sch_prio.c                               |   2 +-
 net/sched/sch_red.c                                |   2 +-
 net/sched/sch_sfq.c                                |   5 +-
 net/sched/sch_tbf.c                                |   2 +-
 net/sunrpc/xprtrdma/svc_rdma_transport.c           |  14 +-
 net/tipc/crypto.c                                  |   6 +-
 net/tls/tls_sw.c                                   |  15 +-
 net/vmw_vsock/virtio_transport_common.c            |  26 +-
 net/wireless/scan.c                                |  18 +-
 net/xfrm/xfrm_device.c                             |   6 +-
 net/xfrm/xfrm_state.c                              |  16 +-
 rust/Makefile                                      |  14 +-
 rust/kernel/alloc/kvec.rs                          |   3 +
 rust/kernel/fs/file.rs                             |   1 +
 rust/kernel/list/arc.rs                            |   2 +-
 rust/kernel/miscdevice.rs                          |   2 +-
 rust/kernel/pci.rs                                 |  15 +-
 scripts/gcc-plugins/gcc-common.h                   |  32 ++
 scripts/gcc-plugins/randomize_layout_plugin.c      |  40 +--
 scripts/generate_rust_analyzer.py                  |  13 +-
 scripts/genksyms/genksyms.c                        |  27 +-
 sound/core/seq_device.c                            |   2 +-
 sound/hda/ext/hdac_ext_controller.c                |  19 +
 sound/hda/hda_bus_type.c                           |   6 +-
 sound/pci/hda/hda_bind.c                           |   4 +-
 sound/soc/apple/mca.c                              |  23 ++
 sound/soc/codecs/hda.c                             |   4 +-
 sound/soc/codecs/tas2764.c                         |   5 +-
 sound/soc/intel/avs/avs.h                          |   4 +-
 sound/soc/intel/avs/core.c                         |  51 ++-
 sound/soc/intel/avs/debugfs.c                      |   6 +-
 sound/soc/intel/avs/ipc.c                          |   4 +-
 sound/soc/intel/avs/loader.c                       |  11 +-
 sound/soc/intel/avs/path.c                         |   8 +-
 sound/soc/intel/avs/pcm.c                          | 129 +++++--
 sound/soc/intel/avs/registers.h                    |   2 +-
 sound/soc/mediatek/mt8195/mt8195-mt6359.c          |   4 +-
 sound/soc/sof/amd/pci-acp70.c                      |   1 +
 sound/soc/sof/ipc4-pcm.c                           |   3 +-
 sound/soc/ti/omap-hdmi.c                           |   7 +-
 sound/usb/implicit.c                               |   1 +
 sound/usb/midi.c                                   |   3 +-
 tools/arch/x86/kcpuid/kcpuid.c                     |  47 ++-
 tools/arch/x86/lib/x86-opcode-map.txt              |  50 +--
 tools/bpf/bpftool/cgroup.c                         |   2 +-
 tools/bpf/resolve_btfids/Makefile                  |   2 +-
 tools/build/Makefile.feature                       |   4 -
 tools/include/nolibc/dirent.h                      |   3 +-
 tools/include/nolibc/stdlib.h                      |   4 +-
 tools/include/nolibc/types.h                       |   2 +-
 tools/include/uapi/linux/bpf.h                     |   4 +-
 tools/lib/bpf/bpf_core_read.h                      |   6 +
 tools/lib/bpf/libbpf.c                             |  57 +--
 tools/lib/bpf/libbpf_internal.h                    |   9 +
 tools/lib/bpf/linker.c                             |   6 +-
 tools/lib/bpf/nlattr.c                             |  15 +-
 tools/objtool/check.c                              |   3 +-
 tools/perf/MANIFEST                                |   6 +
 tools/perf/Makefile.config                         |   6 +-
 tools/perf/Makefile.perf                           |   3 +-
 tools/perf/builtin-record.c                        |   2 +-
 tools/perf/builtin-trace.c                         |  11 +-
 tools/perf/scripts/python/exported-sql-viewer.py   |   5 +-
 tools/perf/tests/shell/lib/stat_output.sh          |   5 +
 tools/perf/tests/shell/stat+json_output.sh         |   5 +
 tools/perf/tests/switch-tracking.c                 |   2 +-
 tools/perf/ui/browsers/hists.c                     |   2 +-
 tools/perf/util/intel-pt.c                         | 205 ++++++++++-
 tools/perf/util/machine.c                          |   6 +-
 tools/perf/util/pmu.c                              |   3 +
 tools/perf/util/symbol-minimal.c                   | 164 ++++-----
 tools/perf/util/thread.c                           |   8 +-
 tools/perf/util/thread.h                           |   2 +-
 tools/perf/util/tool_pmu.c                         |   8 +-
 tools/power/x86/turbostat/turbostat.c              |  41 ++-
 tools/testing/kunit/qemu_configs/sparc.py          |   2 +
 tools/testing/selftests/Makefile                   |   2 +-
 tools/testing/selftests/arm64/fp/fp-ptrace.c       |  14 +-
 tools/testing/selftests/bpf/prog_tests/bpf_nf.c    |   6 +
 .../selftests/bpf/prog_tests/kmem_cache_iter.c     |   2 +-
 .../selftests/bpf/progs/verifier_load_acquire.c    |  40 ++-
 .../selftests/bpf/progs/verifier_store_release.c   |  32 +-
 tools/testing/selftests/bpf/test_loader.c          |  14 +-
 tools/testing/selftests/coredump/stackdump_test.c  |  10 +-
 tools/testing/selftests/cpufreq/cpufreq.sh         |   3 +-
 tools/testing/selftests/drivers/net/hw/tso.py      |   4 +-
 tools/testing/selftests/seccomp/seccomp_bpf.c      |  13 +-
 tools/tracing/rtla/src/timerlat_bpf.c              |   1 +
 818 files changed, 10103 insertions(+), 5457 deletions(-)
author maintainer
#1 lore raw

PATCH 1/780 tools/x86/kcpuid: Fix error handling

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ahmed S. Darwish <[email protected]>

[ Upstream commit 116edfe173d0c59ec2aa87fb91f2f31d477b61b3 ]

Error handling in kcpuid is unreliable. On malloc() failures, the code prints an error then just goes on. The error messages are also printed to standard output instead of standard error.

Use err() and errx() from <err.h> to direct all error messages to standard error and automatically exit the program. Use err() to include the errno information, and errx() otherwise. Use warnx() for warnings.

While at it, alphabetically reorder the header includes.

[ mingo: Fix capitalization in the help text while at it. ]

Fixes c6b2f240bf8d ("tools/x86: Add a kcpuid tool to show raw CPU features")
Cc H. Peter Anvin <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Josh Poimboeuf <[email protected]>
---
 tools/arch/x86/kcpuid/kcpuid.c | 47 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 24 deletions(-)
tools/arch/x86/kcpuid/kcpuid.c +23 -24
index 1b25c0a95d3f9..40a9e59c2fd56 100644
@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 
-#include <stdio.h>
+#include <err.h>
+#include <getopt.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
 
 #define ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
 #define min(a, b)	(((a) < (b)) ? (a) : (b))
@@ -145,14 +146,14 @@ static bool cpuid_store(struct cpuid_range *range, u32 f, int subleaf,
 	if (!func->leafs) {
 		func->leafs = malloc(sizeof(struct subleaf));
 		if (!func->leafs)
-			perror("malloc func leaf");
+			err(EXIT_FAILURE, NULL);
 
 		func->nr = 1;
 	} else {
 		s = func->nr;
 		func->leafs = realloc(func->leafs, (s + 1) * sizeof(*leaf));
 		if (!func->leafs)
-			perror("realloc f->leafs");
+			err(EXIT_FAILURE, NULL);
 
 		func->nr++;
 	}
@@ -211,7 +212,7 @@ struct cpuid_range *setup_cpuid_range(u32 input_eax)
 
 	range = malloc(sizeof(struct cpuid_range));
 	if (!range)
-		perror("malloc range");
+		err(EXIT_FAILURE, NULL);
 
 	if (input_eax & 0x80000000)
 		range->is_ext = true;
@@ -220,7 +221,7 @@ struct cpuid_range *setup_cpuid_range(u32 input_eax)
 
 	range->funcs = malloc(sizeof(struct cpuid_func) * idx_func);
 	if (!range->funcs)
-		perror("malloc range->funcs");
+		err(EXIT_FAILURE, NULL);
 
 	range->nr = idx_func;
 	memset(range->funcs, 0, sizeof(struct cpuid_func) * idx_func);
@@ -395,8 +396,8 @@ static int parse_line(char *line)
 	return 0;
 
 err_exit:
-	printf("Warning: wrong line format:\n");
-	printf("\tline[%d]: %s\n", flines, line);
+	warnx("Wrong line format:\n"
+	      "\tline[%d]: %s", flines, line);
 	return -1;
 }
 
@@ -418,10 +419,8 @@ static void parse_text(void)
 		file = fopen("./cpuid.csv", "r");
 	}
 
-	if (!file) {
-		printf("Fail to open '%s'\n", filename);
-		return;
-	}
+	if (!file)
+		err(EXIT_FAILURE, "%s", filename);
 
 	while (1) {
 		ret = getline(&line, &len, file);
@@ -530,7 +529,7 @@ static inline struct cpuid_func *index_to_func(u32 index)
 	func_idx = index & 0xffff;
 
 	if ((func_idx + 1) > (u32)range->nr) {
-		printf("ERR: invalid input index (0x%x)\n", index);
+		warnx("Invalid input index (0x%x)", index);
 		return NULL;
 	}
 	return &range->funcs[func_idx];
@@ -562,7 +561,7 @@ static void show_info(void)
 				return;
 			}
 
-			printf("ERR: invalid input subleaf (0x%x)\n", user_sub);
+			warnx("Invalid input subleaf (0x%x)", user_sub);
 		}
 
 		show_func(func);
@@ -593,15 +592,15 @@ static void setup_platform_cpuid(void)
 
 static void usage(void)
 {
-	printf("kcpuid [-abdfhr] [-l leaf] [-s subleaf]\n"
-		"\t-a|--all             Show both bit flags and complex bit fields info\n"
-		"\t-b|--bitflags        Show boolean flags only\n"
-		"\t-d|--detail          Show details of the flag/fields (default)\n"
-		"\t-f|--flags           Specify the cpuid csv file\n"
-		"\t-h|--help            Show usage info\n"
-		"\t-l|--leaf=index      Specify the leaf you want to check\n"
-		"\t-r|--raw             Show raw cpuid data\n"
-		"\t-s|--subleaf=sub     Specify the subleaf you want to check\n"
+	warnx("kcpuid [-abdfhr] [-l leaf] [-s subleaf]\n"
+	      "\t-a|--all             Show both bit flags and complex bit fields info\n"
+	      "\t-b|--bitflags        Show boolean flags only\n"
+	      "\t-d|--detail          Show details of the flag/fields (default)\n"
+	      "\t-f|--flags           Specify the CPUID CSV file\n"
+	      "\t-h|--help            Show usage info\n"
+	      "\t-l|--leaf=index      Specify the leaf you want to check\n"
+	      "\t-r|--raw             Show raw CPUID data\n"
+	      "\t-s|--subleaf=sub     Specify the subleaf you want to check"
 	);
 }
 
@@ -652,7 +651,7 @@ static int parse_options(int argc, char *argv[])
 			user_sub = strtoul(optarg, NULL, 0);
 			break;
 		default:
-			printf("%s: Invalid option '%c'\n", argv[0], optopt);
+			warnx("Invalid option '%c'", optopt);
 			return -1;
 	}
 
Signature · 1 line
2.39.5
author maintainer
#2 lore raw

PATCH 2/780 x86/idle: Remove MFENCEs for X86_BUG_CLFLUSH_MONITOR in mwait_idle_with_hints() and prefer_mwait_c1_over_halt()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andrew Cooper <[email protected]>

[ Upstream commit 1f13c60d84e880df6698441026e64f84c7110c49 ]

The following commit, 12 years ago:

7e98b7192046 ("x86, idle: Use static_cpu_has() for CLFLUSH workaround, add barriers")

added barriers around the CLFLUSH in mwait_idle_with_hints(), justified with:

... and add memory barriers around it since the documentation is explicit that CLFLUSH is only ordered with respect to MFENCE.

This also triggered, 11 years ago, the same adjustment in:

f8e617f45829 ("sched/idle/x86: Optimize unnecessary mwait_idle() resched IPIs")

during development, although it failed to get the static_cpu_has_bug() treatment.

X86_BUG_CLFLUSH_MONITOR (a.k.a the AAI65 errata) is specific to Intel CPUs, and the SDM currently states:

Executions of the CLFLUSH instruction are ordered with respect to each other and with respect to writes, locked read-modify-write instructions, and fence instructions[1].

With footnote 1 reading:

Earlier versions of this manual specified that executions of the CLFLUSH instruction were ordered only by the MFENCE instruction. All processors implementing the CLFLUSH instruction also order it relative to the other operations enumerated above.

i.e. The SDM was incorrect at the time, and barriers should not have been inserted. Double checking the original AAI65 errata (not available from intel.com any more) shows no mention of barriers either.

Note: If this were a general codepath, the MFENCEs would be needed, because
AMD CPUs of the same vintage do sport otherwise-unordered CLFLUSHs.

Remove the unnecessary barriers. Furthermore, use a plain alternative(), rather than static_cpu_has_bug() and/or no optimisation. The workaround is a single instruction.

Use an explicit %rax pointer rather than a general memory operand, because MONITOR takes the pointer implicitly in the same way.

[ mingo: Cleaned up the commit a bit. ]

Fixes 7e98b7192046 ("x86, idle: Use static_cpu_has() for CLFLUSH workaround, add barriers")
Cc "H. Peter Anvin" <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rik van Riel <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Juergen Gross <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
---
 arch/x86/include/asm/mwait.h | 9 +++------
 arch/x86/kernel/process.c    | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)
arch/x86/include/asm/mwait.h +3 -6
index ce857ef54cf15..54dc313bcdf01 100644
@@ -116,13 +116,10 @@ static __always_inline void __sti_mwait(unsigned long eax, unsigned long ecx)
 static __always_inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
 {
 	if (static_cpu_has_bug(X86_BUG_MONITOR) || !current_set_polling_and_test()) {
-		if (static_cpu_has_bug(X86_BUG_CLFLUSH_MONITOR)) {
-			mb();
-			clflush((void *)&current_thread_info()->flags);
-			mb();
-		}
+		const void *addr = &current_thread_info()->flags;
 
-		__monitor((void *)&current_thread_info()->flags, 0, 0);
+		alternative_input("", "clflush (%[addr])", X86_BUG_CLFLUSH_MONITOR, [addr] "a" (addr));
+		__monitor(addr, 0, 0);
 
 		if (!need_resched()) {
 			if (ecx & 1) {
arch/x86/kernel/process.c +3 -6
index 962c3ce39323e..12948380cdd06 100644
@@ -907,13 +907,10 @@ static __init bool prefer_mwait_c1_over_halt(void)
 static __cpuidle void mwait_idle(void)
 {
 	if (!current_set_polling_and_test()) {
-		if (this_cpu_has(X86_BUG_CLFLUSH_MONITOR)) {
-			mb(); /* quirk */
-			clflush((void *)&current_thread_info()->flags);
-			mb(); /* quirk */
-		}
+		const void *addr = &current_thread_info()->flags;
 
-		__monitor((void *)&current_thread_info()->flags, 0, 0);
+		alternative_input("", "clflush (%[addr])", X86_BUG_CLFLUSH_MONITOR, [addr] "a" (addr));
+		__monitor(addr, 0, 0);
 		if (!need_resched()) {
 			__sti_mwait(0, 0);
 			raw_local_irq_disable();
Signature · 1 line
2.39.5
author maintainer
#3 lore raw

PATCH 3/780 crypto: iaa - Do not clobber req->base.data

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Herbert Xu <[email protected]>

[ Upstream commit cc98d8ce934b99789d30421957fd6a20fffb1c22 ]

The req->base.data field is for the user and must not be touched by the driver, unless you save it first.

The iaa driver doesn't seem to be using the req->base.data value so just remove the assignment.

Fixes 09646c98d0bf ("crypto: iaa - Add irq support for the crypto async interface")
---
 drivers/crypto/intel/iaa/iaa_crypto_main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/crypto/intel/iaa/iaa_crypto_main.c +2 -4
index 09d9589f2d681..33a285981dfd4 100644
@@ -1187,8 +1187,7 @@ static int iaa_compress(struct crypto_tfm *tfm,	struct acomp_req *req,
 			" src_addr %llx, dst_addr %llx\n", __func__,
 			active_compression_mode->name,
 			src_addr, dst_addr);
-	} else if (ctx->async_mode)
-		req->base.data = idxd_desc;
+	}
 
 	dev_dbg(dev, "%s: compression mode %s,"
 		" desc->src1_addr %llx, desc->src1_size %d,"
@@ -1425,8 +1424,7 @@ static int iaa_decompress(struct crypto_tfm *tfm, struct acomp_req *req,
 			" src_addr %llx, dst_addr %llx\n", __func__,
 			active_compression_mode->name,
 			src_addr, dst_addr);
-	} else if (ctx->async_mode && !disable_async)
-		req->base.data = idxd_desc;
+	}
 
 	dev_dbg(dev, "%s: decompression mode %s,"
 		" desc->src1_addr %llx, desc->src1_size %d,"
Signature · 1 line
2.39.5
author maintainer
#4 lore raw

PATCH 4/780 crypto: sun8i-ce-hash - fix error handling in sun8i_ce_hash_run()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ovidiu Panait <[email protected]>

[ Upstream commit ea4dd134ef332bd9e3e734c1ba0a1521f436b678 ]

Rework error handling in sun8i_ce_hash_run() to unmap the dma buffers in case of failure. Currently, the dma unmap functions are not called if the function errors out at various points.

Fixes 56f6d5aee88d1 ("crypto: sun8i-ce - support hash algorithms")
---
 .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +21 -13
index 6072dd9f390b4..3f9d79ea01aaa 100644
@@ -343,9 +343,8 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	u32 common;
 	u64 byte_count;
 	__le32 *bf;
-	void *buf = NULL;
+	void *buf, *result;
 	int j, i, todo;
-	void *result = NULL;
 	u64 bs;
 	int digestsize;
 	dma_addr_t addr_res, addr_pad;
@@ -365,14 +364,14 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	buf = kcalloc(2, bs, GFP_KERNEL | GFP_DMA);
 	if (!buf) {
 		err = -ENOMEM;
-		goto theend;
+		goto err_out;
 	}
 	bf = (__le32 *)buf;
 
 	result = kzalloc(digestsize, GFP_KERNEL | GFP_DMA);
 	if (!result) {
 		err = -ENOMEM;
-		goto theend;
+		goto err_free_buf;
 	}
 
 	flow = rctx->flow;
@@ -398,7 +397,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	if (nr_sgs <= 0 || nr_sgs > MAX_SG) {
 		dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs);
 		err = -EINVAL;
-		goto theend;
+		goto err_free_result;
 	}
 
 	len = areq->nbytes;
@@ -411,7 +410,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	if (len > 0) {
 		dev_err(ce->dev, "remaining len %d\n", len);
 		err = -EINVAL;
-		goto theend;
+		goto err_unmap_src;
 	}
 	addr_res = dma_map_single(ce->dev, result, digestsize, DMA_FROM_DEVICE);
 	cet->t_dst[0].addr = desc_addr_val_le32(ce, addr_res);
@@ -419,7 +418,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	if (dma_mapping_error(ce->dev, addr_res)) {
 		dev_err(ce->dev, "DMA map dest\n");
 		err = -EINVAL;
-		goto theend;
+		goto err_unmap_src;
 	}
 
 	byte_count = areq->nbytes;
@@ -441,7 +440,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	}
 	if (!j) {
 		err = -EINVAL;
-		goto theend;
+		goto err_unmap_result;
 	}
 
 	addr_pad = dma_map_single(ce->dev, buf, j * 4, DMA_TO_DEVICE);
@@ -450,7 +449,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	if (dma_mapping_error(ce->dev, addr_pad)) {
 		dev_err(ce->dev, "DMA error on padding SG\n");
 		err = -EINVAL;
-		goto theend;
+		goto err_unmap_result;
 	}
 
 	if (ce->variant->hash_t_dlen_in_bits)
@@ -463,16 +462,25 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 	err = sun8i_ce_run_task(ce, flow, crypto_ahash_alg_name(tfm));
 
 	dma_unmap_single(ce->dev, addr_pad, j * 4, DMA_TO_DEVICE);
-	dma_unmap_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE);
+
+err_unmap_result:
 	dma_unmap_single(ce->dev, addr_res, digestsize, DMA_FROM_DEVICE);
+	if (!err)
+		memcpy(areq->result, result, algt->alg.hash.base.halg.digestsize);
 
+err_unmap_src:
+	dma_unmap_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE);
 
-	memcpy(areq->result, result, algt->alg.hash.base.halg.digestsize);
-theend:
-	kfree(buf);
+err_free_result:
 	kfree(result);
+
+err_free_buf:
+	kfree(buf);
+
+err_out:
 	local_bh_disable();
 	crypto_finalize_hash_request(engine, breq, err);
 	local_bh_enable();
+
 	return 0;
 }
Signature · 1 line
2.39.5
author maintainer
#5 lore raw

PATCH 5/780 sched: Fix trace_sched_switch(.prev_state)

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Peter Zijlstra <[email protected]>

[ Upstream commit 8feb053d53194382fcfb68231296fdc220497ea6 ]

Gabriele noted that in case of signal_pending_state(), the tracepoint sees a stale task-state.

Fixes fa2c3254d7cf ("sched/tracing: Don't re-read p->state when emitting sched_switch event")
Cc Valentin Schneider <[email protected]>
---
 kernel/sched/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/sched/core.c +4 -2
index c81cf642dba05..36b34e6884587 100644
@@ -6571,12 +6571,14 @@ pick_next_task(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
  * Otherwise marks the task's __state as RUNNING
  */
 static bool try_to_block_task(struct rq *rq, struct task_struct *p,
-			      unsigned long task_state)
+			      unsigned long *task_state_p)
 {
+	unsigned long task_state = *task_state_p;
 	int flags = DEQUEUE_NOCLOCK;
 
 	if (signal_pending_state(task_state, p)) {
 		WRITE_ONCE(p->__state, TASK_RUNNING);
+		*task_state_p = TASK_RUNNING;
 		return false;
 	}
 
@@ -6713,7 +6715,7 @@ static void __sched notrace __schedule(int sched_mode)
 			goto picked;
 		}
 	} else if (!preempt && prev_state) {
-		try_to_block_task(rq, prev, prev_state);
+		try_to_block_task(rq, prev, &prev_state);
 		switch_count = &prev->nvcsw;
 	}
 
Signature · 1 line
2.39.5
author maintainer
#6 lore raw

PATCH 6/780 crypto: ecdsa - Fix enc/dec size reported by KEYCTL_PKEY_QUERY

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Lukas Wunner <[email protected]>

[ Upstream commit 3828485e1c7b111290122ab6e083c2a37132b5c2 ]

KEYCTL_PKEY_QUERY system calls for ecdsa keys return the key size as max_enc_size and max_dec_size, even though such keys cannot be used for encryption/decryption. They're exclusively for signature generation or verification.

Only rsa keys with pkcs1 encoding can also be used for encryption or decryption.

Return 0 instead for ecdsa keys (as well as ecrdsa keys).

Stable-dep-of: 6b7f9397c98c ("crypto: ecdsa - Fix NIST P521 key size reported by KEYCTL_PKEY_QUERY")

---
 crypto/asymmetric_keys/public_key.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
crypto/asymmetric_keys/public_key.c +7 -2
index bf165d321440d..dd44a966947fb 100644
@@ -188,6 +188,8 @@ static int software_key_query(const struct kernel_pkey_params *params,
 	ptr = pkey_pack_u32(ptr, pkey->paramlen);
 	memcpy(ptr, pkey->params, pkey->paramlen);
 
+	memset(info, 0, sizeof(*info));
+
 	if (issig) {
 		sig = crypto_alloc_sig(alg_name, 0, 0);
 		if (IS_ERR(sig)) {
@@ -211,6 +213,9 @@ static int software_key_query(const struct kernel_pkey_params *params,
 			info->supported_ops |= KEYCTL_SUPPORTS_SIGN;
 
 		if (strcmp(params->encoding, "pkcs1") == 0) {
+			info->max_enc_size = len;
+			info->max_dec_size = len;
+
 			info->supported_ops |= KEYCTL_SUPPORTS_ENCRYPT;
 			if (pkey->key_is_private)
 				info->supported_ops |= KEYCTL_SUPPORTS_DECRYPT;
@@ -232,6 +237,8 @@ static int software_key_query(const struct kernel_pkey_params *params,
 		len = crypto_akcipher_maxsize(tfm);
 		info->max_sig_size = len;
 		info->max_data_size = len;
+		info->max_enc_size = len;
+		info->max_dec_size = len;
 
 		info->supported_ops = KEYCTL_SUPPORTS_ENCRYPT;
 		if (pkey->key_is_private)
@@ -239,8 +246,6 @@ static int software_key_query(const struct kernel_pkey_params *params,
 	}
 
 	info->key_size = len * 8;
-	info->max_enc_size = len;
-	info->max_dec_size = len;
 
 	ret = 0;
 
Signature · 1 line
2.39.5
author maintainer
#7 lore raw

PATCH 7/780 crypto: ecdsa - Fix NIST P521 key size reported by KEYCTL_PKEY_QUERY

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Lukas Wunner <[email protected]>

[ Upstream commit 6b7f9397c98c72902f9364056413c73fe6dee1d8 ]

When user space issues a KEYCTL_PKEY_QUERY system call for a NIST P521 key, the key_size is incorrectly reported as 528 bits instead of 521.

That's because the key size obtained through crypto_sig_keysize() is in bytes and software_key_query() multiplies by 8 to yield the size in bits. The underlying assumption is that the key size is always a multiple of 8. With the recent addition of NIST P521, that's no longer the case.

Fix by returning the key_size in bits from crypto_sig_keysize() and adjusting the calculations in software_key_query().

The ->key_size() callbacks of sig_alg algorithms now return the size in bits, whereas the ->digest_size() and ->max_size() callbacks return the size in bytes. This matches with the units in struct keyctl_pkey_query.

Fixes a7d45ba77d3d ("crypto: ecdsa - Register NIST P521 and extend test suite")
---
 crypto/asymmetric_keys/public_key.c | 8 ++++----
 crypto/ecdsa-p1363.c                | 6 ++++--
 crypto/ecdsa-x962.c                 | 5 +++--
 crypto/ecdsa.c                      | 2 +-
 crypto/ecrdsa.c                     | 2 +-
 crypto/rsassa-pkcs1.c               | 2 +-
 crypto/sig.c                        | 9 +++++++--
 include/crypto/sig.h                | 2 +-
 8 files changed, 22 insertions(+), 14 deletions(-)
crypto/asymmetric_keys/public_key.c +4 -4
index dd44a966947fb..89dc887d2c5c7 100644
@@ -205,6 +205,7 @@ static int software_key_query(const struct kernel_pkey_params *params,
 			goto error_free_tfm;
 
 		len = crypto_sig_keysize(sig);
+		info->key_size = len;
 		info->max_sig_size = crypto_sig_maxsize(sig);
 		info->max_data_size = crypto_sig_digestsize(sig);
 
@@ -213,8 +214,8 @@ static int software_key_query(const struct kernel_pkey_params *params,
 			info->supported_ops |= KEYCTL_SUPPORTS_SIGN;
 
 		if (strcmp(params->encoding, "pkcs1") == 0) {
-			info->max_enc_size = len;
-			info->max_dec_size = len;
+			info->max_enc_size = len / BITS_PER_BYTE;
+			info->max_dec_size = len / BITS_PER_BYTE;
 
 			info->supported_ops |= KEYCTL_SUPPORTS_ENCRYPT;
 			if (pkey->key_is_private)
@@ -235,6 +236,7 @@ static int software_key_query(const struct kernel_pkey_params *params,
 			goto error_free_tfm;
 
 		len = crypto_akcipher_maxsize(tfm);
+		info->key_size = len * BITS_PER_BYTE;
 		info->max_sig_size = len;
 		info->max_data_size = len;
 		info->max_enc_size = len;
@@ -245,8 +247,6 @@ static int software_key_query(const struct kernel_pkey_params *params,
 			info->supported_ops |= KEYCTL_SUPPORTS_DECRYPT;
 	}
 
-	info->key_size = len * 8;
-
 	ret = 0;
 
 error_free_tfm:
crypto/ecdsa-p1363.c +4 -2
index 4454f1f8f33f5..e0c55c64711c8 100644
@@ -21,7 +21,8 @@ static int ecdsa_p1363_verify(struct crypto_sig *tfm,
 			      const void *digest, unsigned int dlen)
 {
 	struct ecdsa_p1363_ctx *ctx = crypto_sig_ctx(tfm);
-	unsigned int keylen = crypto_sig_keysize(ctx->child);
+	unsigned int keylen = DIV_ROUND_UP_POW2(crypto_sig_keysize(ctx->child),
+						BITS_PER_BYTE);
 	unsigned int ndigits = DIV_ROUND_UP_POW2(keylen, sizeof(u64));
 	struct ecdsa_raw_sig sig;
 
@@ -45,7 +46,8 @@ static unsigned int ecdsa_p1363_max_size(struct crypto_sig *tfm)
 {
 	struct ecdsa_p1363_ctx *ctx = crypto_sig_ctx(tfm);
 
-	return 2 * crypto_sig_keysize(ctx->child);
+	return 2 * DIV_ROUND_UP_POW2(crypto_sig_keysize(ctx->child),
+				     BITS_PER_BYTE);
 }
 
 static unsigned int ecdsa_p1363_digest_size(struct crypto_sig *tfm)
crypto/ecdsa-x962.c +3 -2
index 90a04f4b9a2f5..ee71594d10a06 100644
@@ -82,7 +82,7 @@ static int ecdsa_x962_verify(struct crypto_sig *tfm,
 	int err;
 
 	sig_ctx.ndigits = DIV_ROUND_UP_POW2(crypto_sig_keysize(ctx->child),
-					    sizeof(u64));
+					    sizeof(u64) * BITS_PER_BYTE);
 
 	err = asn1_ber_decoder(&ecdsasignature_decoder, &sig_ctx, src, slen);
 	if (err < 0)
@@ -103,7 +103,8 @@ static unsigned int ecdsa_x962_max_size(struct crypto_sig *tfm)
 {
 	struct ecdsa_x962_ctx *ctx = crypto_sig_ctx(tfm);
 	struct sig_alg *alg = crypto_sig_alg(ctx->child);
-	int slen = crypto_sig_keysize(ctx->child);
+	int slen = DIV_ROUND_UP_POW2(crypto_sig_keysize(ctx->child),
+				     BITS_PER_BYTE);
 
 	/*
 	 * Verify takes ECDSA-Sig-Value (described in RFC 5480) as input,
crypto/ecdsa.c +1 -1
index 117526d15ddeb..a70b60a90a3c7 100644
@@ -167,7 +167,7 @@ static unsigned int ecdsa_key_size(struct crypto_sig *tfm)
 {
 	struct ecc_ctx *ctx = crypto_sig_ctx(tfm);
 
-	return DIV_ROUND_UP(ctx->curve->nbits, 8);
+	return ctx->curve->nbits;
 }
 
 static unsigned int ecdsa_digest_size(struct crypto_sig *tfm)
crypto/ecrdsa.c +1 -1
index b3dd8a3ddeb79..2c0602f0cd406 100644
@@ -249,7 +249,7 @@ static unsigned int ecrdsa_key_size(struct crypto_sig *tfm)
 	 * Verify doesn't need any output, so it's just informational
 	 * for keyctl to determine the key bit size.
 	 */
-	return ctx->pub_key.ndigits * sizeof(u64);
+	return ctx->pub_key.ndigits * sizeof(u64) * BITS_PER_BYTE;
 }
 
 static unsigned int ecrdsa_max_size(struct crypto_sig *tfm)
crypto/rsassa-pkcs1.c +1 -1
index d01ac75635e00..94fa5e9600e79 100644
@@ -301,7 +301,7 @@ static unsigned int rsassa_pkcs1_key_size(struct crypto_sig *tfm)
 {
 	struct rsassa_pkcs1_ctx *ctx = crypto_sig_ctx(tfm);
 
-	return ctx->key_size;
+	return ctx->key_size * BITS_PER_BYTE;
 }
 
 static int rsassa_pkcs1_set_pub_key(struct crypto_sig *tfm,
crypto/sig.c +7 -2
index dfc7cae908028..53a3dd6fbe3fe 100644
@@ -102,6 +102,11 @@ static int sig_default_set_key(struct crypto_sig *tfm,
 	return -ENOSYS;
 }
 
+static unsigned int sig_default_size(struct crypto_sig *tfm)
+{
+	return DIV_ROUND_UP_POW2(crypto_sig_keysize(tfm), BITS_PER_BYTE);
+}
+
 static int sig_prepare_alg(struct sig_alg *alg)
 {
 	struct crypto_alg *base = &alg->base;
@@ -117,9 +122,9 @@ static int sig_prepare_alg(struct sig_alg *alg)
 	if (!alg->key_size)
 		return -EINVAL;
 	if (!alg->max_size)
-		alg->max_size = alg->key_size;
+		alg->max_size = sig_default_size;
 	if (!alg->digest_size)
-		alg->digest_size = alg->key_size;
+		alg->digest_size = sig_default_size;
 
 	base->cra_type = &crypto_sig_type;
 	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
include/crypto/sig.h +1 -1
index 11024708c0692..fa6dafafab3f0 100644
@@ -128,7 +128,7 @@ static inline void crypto_free_sig(struct crypto_sig *tfm)
 /**
  * crypto_sig_keysize() - Get key size
  *
- * Function returns the key size in bytes.
+ * Function returns the key size in bits.
  * Function assumes that the key is already set in the transformation. If this
  * function is called without a setkey or with a failed setkey, you may end up
  * in a NULL dereference.
Signature · 1 line
2.39.5
author maintainer
#8 lore raw

PATCH 8/780 crypto: zynqmp-sha - Add locking

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Herbert Xu <[email protected]>

[ Upstream commit c7e68043620e0d5f89a37e573c667beab72d2937 ]

The hardwrae is only capable of one hash at a time, so add a lock to make sure that it isn't used concurrently.

Fixes 7ecc3e34474b ("crypto: xilinx - Add Xilinx SHA3 driver")
---
 drivers/crypto/xilinx/zynqmp-sha.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/crypto/xilinx/zynqmp-sha.c +14 -4
index 580649f9bff81..0edf8eb264b55 100644
@@ -3,18 +3,19 @@
  * Xilinx ZynqMP SHA Driver.
  * Copyright (c) 2022 Xilinx Inc.
  */
-#include <linux/cacheflush.h>
 #include <crypto/hash.h>
 #include <crypto/internal/hash.h>
 #include <crypto/sha3.h>
-#include <linux/crypto.h>
+#include <linux/cacheflush.h>
+#include <linux/cleanup.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/err.h>
 #include <linux/firmware/xlnx-zynqmp.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/spinlock.h>
 #include <linux/platform_device.h>
 
 #define ZYNQMP_DMA_BIT_MASK		32U
@@ -43,6 +44,8 @@ struct zynqmp_sha_desc_ctx {
 static dma_addr_t update_dma_addr, final_dma_addr;
 static char *ubuf, *fbuf;
 
+static DEFINE_SPINLOCK(zynqmp_sha_lock);
+
 static int zynqmp_sha_init_tfm(struct crypto_shash *hash)
 {
 	const char *fallback_driver_name = crypto_shash_alg_name(hash);
@@ -124,7 +127,8 @@ static int zynqmp_sha_export(struct shash_desc *desc, void *out)
 	return crypto_shash_export(&dctx->fbk_req, out);
 }
 
-static int zynqmp_sha_digest(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out)
+static int __zynqmp_sha_digest(struct shash_desc *desc, const u8 *data,
+			       unsigned int len, u8 *out)
 {
 	unsigned int remaining_len = len;
 	int update_size;
@@ -159,6 +163,12 @@ static int zynqmp_sha_digest(struct shash_desc *desc, const u8 *data, unsigned i
 	return ret;
 }
 
+static int zynqmp_sha_digest(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out)
+{
+	scoped_guard(spinlock_bh, &zynqmp_sha_lock)
+		return __zynqmp_sha_digest(desc, data, len, out);
+}
+
 static struct zynqmp_sha_drv_ctx sha3_drv_ctx = {
 	.sha3_384 = {
 		.init = zynqmp_sha_init,
Signature · 1 line
2.39.5
author maintainer
#9 lore raw

PATCH 9/780 kunit: qemu_configs: sparc: Explicitly enable CONFIG_SPARC32=y

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Thomas Weißschuh <[email protected]>

[ Upstream commit d16b3d0fb43cb0f9eb21b35c2d2c870b3f38ab1d ]

The configuration generated by kunit ends up with a 32bit configuration. A new kunit configuration for 64bit is to be added.
To make the difference clearer spell out the variant in the kunit reference config.

Stable-dep-of: 1d31d536871f ("kunit: qemu_configs: Disable faulting tests on 32-bit SPARC")

---
 tools/testing/kunit/qemu_configs/sparc.py | 1 +
 1 file changed, 1 insertion(+)
tools/testing/kunit/qemu_configs/sparc.py +1 -0
index 256d9573b4464..3131dd299a6e3 100644
@@ -2,6 +2,7 @@ from ..qemu_config import QemuArchParams
 
 QEMU_ARCH = QemuArchParams(linux_arch='sparc',
 			   kconfig='''
+CONFIG_SPARC32=y
 CONFIG_SERIAL_SUNZILOG=y
 CONFIG_SERIAL_SUNZILOG_CONSOLE=y
 ''',
Signature · 1 line
2.39.5
author maintainer
#10 lore raw

PATCH 10/780 kunit: qemu_configs: Disable faulting tests on 32-bit SPARC

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: David Gow <[email protected]>

[ Upstream commit 1d31d536871fe8b16c8c0de58d201c78e21eb3a2 ]

The 32-bit sparc configuration (--arch sparc) crashes on
the kunit_fault_test. It's known that some architectures don't handle deliberate segfaults in kernel mode well, so there's a config switch to disable tests which rely upon it by default.

Use this for the sparc config, making sure the default config for it passes.

---
 tools/testing/kunit/qemu_configs/sparc.py | 1 +
 1 file changed, 1 insertion(+)
tools/testing/kunit/qemu_configs/sparc.py +1 -0
index 3131dd299a6e3..2019550a1b692 100644
@@ -2,6 +2,7 @@ from ..qemu_config import QemuArchParams
 
 QEMU_ARCH = QemuArchParams(linux_arch='sparc',
 			   kconfig='''
+CONFIG_KUNIT_FAULT_TEST=n
 CONFIG_SPARC32=y
 CONFIG_SERIAL_SUNZILOG=y
 CONFIG_SERIAL_SUNZILOG_CONSOLE=y
Signature · 1 line
2.39.5
author maintainer
#11 lore raw

PATCH 11/780 perf/x86/amd/uncore: Remove unused struct amd_uncore_ctx::node member

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Sandipan Das <[email protected]>

[ Upstream commit 4f81cc2d1bf91a49d33eb6578b58db2518deef01 ]

---
 arch/x86/events/amd/uncore.c | 1 -
 1 file changed, 1 deletion(-)
arch/x86/events/amd/uncore.c +0 -1
index 49c26ce2b1152..010024f09f2c4 100644
@@ -38,7 +38,6 @@ struct amd_uncore_ctx {
 	int refcnt;
 	int cpu;
 	struct perf_event **events;
-	struct hlist_node node;
 };
 
 struct amd_uncore_pmu {
Signature · 1 line
2.39.5
author maintainer
#12 lore raw

PATCH 12/780 perf/x86/amd/uncore: Prevent UMC counters from saturating

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Sandipan Das <[email protected]>

[ Upstream commit 2492e5aba2be064d0604ae23ae0770ecc0168192 ]

Unlike L3 and DF counters, UMC counters (PERF_CTRs) set the Overflow bit (bit 48) and saturate on overflow. A subsequent pmu->read() of the event reports an incorrect accumulated count as there is no difference between the previous and the current values of the counter.

To avoid this, inspect the current counter value and proactively reset the corresponding PERF_CTR register on every pmu->read(). Combined with the periodic reads initiated by the hrtimer, the counters never get a chance saturate but the resolution reduces to 47 bits.

---
 arch/x86/events/amd/uncore.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)
arch/x86/events/amd/uncore.c +34 -1
index 010024f09f2c4..a6fa01ef35a10 100644
@@ -889,6 +889,39 @@ static void amd_uncore_umc_start(struct perf_event *event, int flags)
 	perf_event_update_userpage(event);
 }
 
+static void amd_uncore_umc_read(struct perf_event *event)
+{
+	struct hw_perf_event *hwc = &event->hw;
+	u64 prev, new, shift;
+	s64 delta;
+
+	shift = COUNTER_SHIFT + 1;
+	prev = local64_read(&hwc->prev_count);
+
+	/*
+	 * UMC counters do not have RDPMC assignments. Read counts directly
+	 * from the corresponding PERF_CTR.
+	 */
+	rdmsrl(hwc->event_base, new);
+
+	/*
+	 * Unlike the other uncore counters, UMC counters saturate and set the
+	 * Overflow bit (bit 48) on overflow. Since they do not roll over,
+	 * proactively reset the corresponding PERF_CTR when bit 47 is set so
+	 * that the counter never gets a chance to saturate.
+	 */
+	if (new & BIT_ULL(63 - COUNTER_SHIFT)) {
+		wrmsrl(hwc->event_base, 0);
+		local64_set(&hwc->prev_count, 0);
+	} else {
+		local64_set(&hwc->prev_count, new);
+	}
+
+	delta = (new << shift) - (prev << shift);
+	delta >>= shift;
+	local64_add(delta, &event->count);
+}
+
 static
 void amd_uncore_umc_ctx_scan(struct amd_uncore *uncore, unsigned int cpu)
 {
@@ -967,7 +1000,7 @@ int amd_uncore_umc_ctx_init(struct amd_uncore *uncore, unsigned int cpu)
 				.del		= amd_uncore_del,
 				.start		= amd_uncore_umc_start,
 				.stop		= amd_uncore_stop,
-				.read		= amd_uncore_read,
+				.read		= amd_uncore_umc_read,
 				.capabilities	= PERF_PMU_CAP_NO_EXCLUDE | PERF_PMU_CAP_NO_INTERRUPT,
 				.module		= THIS_MODULE,
 			};
Signature · 1 line
2.39.5
author maintainer
#13 lore raw

PATCH 13/780 gfs2: replace sd_aspace with sd_inode

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andreas Gruenbacher <[email protected]>

[ Upstream commit ae9f3bd8259a0a8f67be2420e66bb05fbb95af48 ]

Currently, sdp->sd_aspace and the per-inode metadata address spaces use sb->s_bdev->bd_mapping->host as their ->host; folios in those address spaces will thus appear to be on bdev rather than on gfs2 filesystems. This is a problem because gfs2 doesn't support cgroup writeback (SB_I_CGROUPWB), but bdev does.

Fix that by using a "dummy" gfs2 inode as ->host in those address spaces. When coming from a folio, folio->mapping->host->i_sb will then be a gfs2 super block and the SB_I_CGROUPWB flag will not be set in sb->s_iflags.

Based on a previous version from Bob Peterson from several years ago. Thanks to Tetsuo Handa, Jan Kara, and Rafael Aquini for helping figure this out.

Fixes aaa2cacf8184 ("writeback: add lockdep annotation to inode_to_wb()")
---
 fs/gfs2/glock.c      |  3 +--
 fs/gfs2/glops.c      |  4 ++--
 fs/gfs2/incore.h     |  9 ++++++++-
 fs/gfs2/meta_io.c    |  2 +-
 fs/gfs2/meta_io.h    |  4 +---
 fs/gfs2/ops_fstype.c | 31 ++++++++++++++++++-------------
 fs/gfs2/super.c      |  2 +-
 7 files changed, 32 insertions(+), 23 deletions(-)
fs/gfs2/glock.c +1 -2
index d7220a6fe8f55..ba25b884169e5 100644
@@ -1166,7 +1166,6 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
 		   const struct gfs2_glock_operations *glops, int create,
 		   struct gfs2_glock **glp)
 {
-	struct super_block *s = sdp->sd_vfs;
 	struct lm_lockname name = { .ln_number = number,
 				    .ln_type = glops->go_type,
 				    .ln_sbd = sdp };
@@ -1229,7 +1228,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
 	mapping = gfs2_glock2aspace(gl);
 	if (mapping) {
                 mapping->a_ops = &gfs2_meta_aops;
-		mapping->host = s->s_bdev->bd_mapping->host;
+		mapping->host = sdp->sd_inode;
 		mapping->flags = 0;
 		mapping_set_gfp_mask(mapping, GFP_NOFS);
 		mapping->i_private_data = NULL;
fs/gfs2/glops.c +2 -2
index eb4714f299efb..116efe335c321 100644
@@ -168,7 +168,7 @@ void gfs2_ail_flush(struct gfs2_glock *gl, bool fsync)
 static int gfs2_rgrp_metasync(struct gfs2_glock *gl)
 {
 	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
-	struct address_space *metamapping = &sdp->sd_aspace;
+	struct address_space *metamapping = gfs2_aspace(sdp);
 	struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl);
 	const unsigned bsize = sdp->sd_sb.sb_bsize;
 	loff_t start = (rgd->rd_addr * bsize) & PAGE_MASK;
@@ -225,7 +225,7 @@ static int rgrp_go_sync(struct gfs2_glock *gl)
 static void rgrp_go_inval(struct gfs2_glock *gl, int flags)
 {
 	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
-	struct address_space *mapping = &sdp->sd_aspace;
+	struct address_space *mapping = gfs2_aspace(sdp);
 	struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl);
 	const unsigned bsize = sdp->sd_sb.sb_bsize;
 	loff_t start, end;
fs/gfs2/incore.h +8 -1
index 74abbd4970f80..0a41c4e76b326 100644
@@ -795,7 +795,7 @@ struct gfs2_sbd {
 
 	/* Log stuff */
 
-	struct address_space sd_aspace;
+	struct inode *sd_inode;
 
 	spinlock_t sd_log_lock;
 
@@ -851,6 +851,13 @@ struct gfs2_sbd {
 	unsigned long sd_glock_dqs_held;
 };
 
+#define GFS2_BAD_INO 1
+
+static inline struct address_space *gfs2_aspace(struct gfs2_sbd *sdp)
+{
+	return sdp->sd_inode->i_mapping;
+}
+
 static inline void gfs2_glstats_inc(struct gfs2_glock *gl, int which)
 {
 	gl->gl_stats.stats[which]++;
fs/gfs2/meta_io.c +1 -1
index 198cc70566375..9dc8885c95d07 100644
@@ -132,7 +132,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create)
 	unsigned int bufnum;
 
 	if (mapping == NULL)
-		mapping = &sdp->sd_aspace;
+		mapping = gfs2_aspace(sdp);
 
 	shift = PAGE_SHIFT - sdp->sd_sb.sb_bsize_shift;
 	index = blkno >> shift;             /* convert block to page */
fs/gfs2/meta_io.h +1 -3
index 831d988c2ceb7..b7c8a6684d024 100644
@@ -44,9 +44,7 @@ static inline struct gfs2_sbd *gfs2_mapping2sbd(struct address_space *mapping)
 		struct gfs2_glock_aspace *gla =
 			container_of(mapping, struct gfs2_glock_aspace, mapping);
 		return gla->glock.gl_name.ln_sbd;
-	} else if (mapping->a_ops == &gfs2_rgrp_aops)
-		return container_of(mapping, struct gfs2_sbd, sd_aspace);
-	else
+	} else
 		return inode->i_sb->s_fs_info;
 }
 
fs/gfs2/ops_fstype.c +18 -13
index e83d293c36142..6ce475e1c6d64 100644
@@ -72,7 +72,6 @@ void free_sbd(struct gfs2_sbd *sdp)
 static struct gfs2_sbd *init_sbd(struct super_block *sb)
 {
 	struct gfs2_sbd *sdp;
-	struct address_space *mapping;
 
 	sdp = kzalloc(sizeof(struct gfs2_sbd), GFP_KERNEL);
 	if (!sdp)
@@ -109,16 +108,6 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
 
 	INIT_LIST_HEAD(&sdp->sd_sc_inodes_list);
 
-	mapping = &sdp->sd_aspace;
-
-	address_space_init_once(mapping);
-	mapping->a_ops = &gfs2_rgrp_aops;
-	mapping->host = sb->s_bdev->bd_mapping->host;
-	mapping->flags = 0;
-	mapping_set_gfp_mask(mapping, GFP_NOFS);
-	mapping->i_private_data = NULL;
-	mapping->writeback_index = 0;
-
 	spin_lock_init(&sdp->sd_log_lock);
 	atomic_set(&sdp->sd_log_pinned, 0);
 	INIT_LIST_HEAD(&sdp->sd_log_revokes);
@@ -1135,6 +1124,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
 	int silent = fc->sb_flags & SB_SILENT;
 	struct gfs2_sbd *sdp;
 	struct gfs2_holder mount_gh;
+	struct address_space *mapping;
 	int error;
 
 	sdp = init_sbd(sb);
@@ -1156,6 +1146,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
 	sb->s_flags |= SB_NOSEC;
 	sb->s_magic = GFS2_MAGIC;
 	sb->s_op = &gfs2_super_ops;
+
 	sb->s_d_op = &gfs2_dops;
 	sb->s_export_op = &gfs2_export_ops;
 	sb->s_qcop = &gfs2_quotactl_ops;
@@ -1181,9 +1172,21 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
 		sdp->sd_tune.gt_statfs_quantum = 30;
 	}
 
+	/* Set up an address space for metadata writes */
+	sdp->sd_inode = new_inode(sb);
+	error = -ENOMEM;
+	if (!sdp->sd_inode)
+		goto fail_free;
+	sdp->sd_inode->i_ino = GFS2_BAD_INO;
+	sdp->sd_inode->i_size = OFFSET_MAX;
+
+	mapping = gfs2_aspace(sdp);
+	mapping->a_ops = &gfs2_rgrp_aops;
+	mapping_set_gfp_mask(mapping, GFP_NOFS);
+
 	error = init_names(sdp, silent);
 	if (error)
-		goto fail_free;
+		goto fail_iput;
 
 	snprintf(sdp->sd_fsname, sizeof(sdp->sd_fsname), "%s", sdp->sd_table_name);
 
@@ -1192,7 +1195,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
 			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_FREEZABLE, 0,
 			sdp->sd_fsname);
 	if (!sdp->sd_glock_wq)
-		goto fail_free;
+		goto fail_iput;
 
 	sdp->sd_delete_wq = alloc_workqueue("gfs2-delete/%s",
 			WQ_MEM_RECLAIM | WQ_FREEZABLE, 0, sdp->sd_fsname);
@@ -1309,6 +1312,8 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
 fail_glock_wq:
 	if (sdp->sd_glock_wq)
 		destroy_workqueue(sdp->sd_glock_wq);
+fail_iput:
+	iput(sdp->sd_inode);
 fail_free:
 	free_sbd(sdp);
 	sb->s_fs_info = NULL;
fs/gfs2/super.c +1 -1
index 44e5658b896c8..4529b7dda8ca2 100644
@@ -648,7 +648,7 @@ static void gfs2_put_super(struct super_block *sb)
 	gfs2_jindex_free(sdp);
 	/*  Take apart glock structures and buffer lists  */
 	gfs2_gl_hash_clear(sdp);
-	truncate_inode_pages_final(&sdp->sd_aspace);
+	iput(sdp->sd_inode);
 	gfs2_delete_debugfs_file(sdp);
 
 	gfs2_sys_fs_del(sdp);
Signature · 1 line
2.39.5
author maintainer
#14 lore raw

PATCH 14/780 gfs2: gfs2_create_inode error handling fix

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andreas Gruenbacher <[email protected]>

[ Upstream commit af4044fd0b77e915736527dd83011e46e6415f01 ]

When gfs2_create_inode() finds a directory, make sure to return -EISDIR.

Fixes 571a4b57975a ("GFS2: bugger off early if O_CREAT open finds a directory")
---
 fs/gfs2/inode.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/gfs2/inode.c +2 -1
index 198a8cbaf5e5a..9621680814b80 100644
@@ -659,7 +659,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 	if (!IS_ERR(inode)) {
 		if (S_ISDIR(inode->i_mode)) {
 			iput(inode);
-			inode = ERR_PTR(-EISDIR);
+			inode = NULL;
+			error = -EISDIR;
 			goto fail_gunlock;
 		}
 		d_instantiate(dentry, inode);
Signature · 1 line
2.39.5
author maintainer
#15 lore raw

PATCH 15/780 gfs2: Move gfs2_dinode_dealloc

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andreas Gruenbacher <[email protected]>

[ Upstream commit bcd18105fb34e27c097f222733dba9a3e79f191c ]

Move gfs2_dinode_dealloc() and its helper gfs2_final_release_pages() from super.c to inode.c.

Stable-dep-of: 2c63986dd35f ("gfs2: deallocate inodes in gfs2_create_inode")

---
 fs/gfs2/inode.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++
 fs/gfs2/inode.h |  1 +
 fs/gfs2/super.c | 68 -------------------------------------------------
 3 files changed, 69 insertions(+), 68 deletions(-)
fs/gfs2/inode.c +68 -0
index 9621680814b80..b2d38d09af7e8 100644
@@ -439,6 +439,74 @@ static int alloc_dinode(struct gfs2_inode *ip, u32 flags, unsigned *dblocks)
 	return error;
 }
 
+static void gfs2_final_release_pages(struct gfs2_inode *ip)
+{
+	struct inode *inode = &ip->i_inode;
+	struct gfs2_glock *gl = ip->i_gl;
+
+	if (unlikely(!gl)) {
+		/* This can only happen during incomplete inode creation. */
+		BUG_ON(!test_bit(GIF_ALLOC_FAILED, &ip->i_flags));
+		return;
+	}
+
+	truncate_inode_pages(gfs2_glock2aspace(gl), 0);
+	truncate_inode_pages(&inode->i_data, 0);
+
+	if (atomic_read(&gl->gl_revokes) == 0) {
+		clear_bit(GLF_LFLUSH, &gl->gl_flags);
+		clear_bit(GLF_DIRTY, &gl->gl_flags);
+	}
+}
+
+int gfs2_dinode_dealloc(struct gfs2_inode *ip)
+{
+	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+	struct gfs2_rgrpd *rgd;
+	struct gfs2_holder gh;
+	int error;
+
+	if (gfs2_get_inode_blocks(&ip->i_inode) != 1) {
+		gfs2_consist_inode(ip);
+		return -EIO;
+	}
+
+	gfs2_rindex_update(sdp);
+
+	error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
+	if (error)
+		return error;
+
+	rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr, 1);
+	if (!rgd) {
+		gfs2_consist_inode(ip);
+		error = -EIO;
+		goto out_qs;
+	}
+
+	error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE,
+				   LM_FLAG_NODE_SCOPE, &gh);
+	if (error)
+		goto out_qs;
+
+	error = gfs2_trans_begin(sdp, RES_RG_BIT + RES_STATFS + RES_QUOTA,
+				 sdp->sd_jdesc->jd_blocks);
+	if (error)
+		goto out_rg_gunlock;
+
+	gfs2_free_di(rgd, ip);
+
+	gfs2_final_release_pages(ip);
+
+	gfs2_trans_end(sdp);
+
+out_rg_gunlock:
+	gfs2_glock_dq_uninit(&gh);
+out_qs:
+	gfs2_quota_unhold(ip);
+	return error;
+}
+
 static void gfs2_init_dir(struct buffer_head *dibh,
 			  const struct gfs2_inode *parent)
 {
fs/gfs2/inode.h +1 -0
index 9e5e1622d50a6..eafe123617e69 100644
@@ -92,6 +92,7 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type,
 struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr,
 				  u64 no_formal_ino,
 				  unsigned int blktype);
+int gfs2_dinode_dealloc(struct gfs2_inode *ip);
 
 struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
 			   int is_root);
fs/gfs2/super.c +0 -68

74 lines not on this page · raw message

Signature · 1 line
2.39.5
author maintainer
#16 lore raw

PATCH 16/780 gfs2: Move GIF_ALLOC_FAILED check out of gfs2_ea_dealloc

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andreas Gruenbacher <[email protected]>

[ Upstream commit 0cc617a54dfe6b44624c9a03e2e11a24eb9bc720 ]

Don't check for the GIF_ALLOC_FAILED flag in gfs2_ea_dealloc() and pass that information explicitly instead. This allows for a cleaner follow-up patch.

Stable-dep-of: 2c63986dd35f ("gfs2: deallocate inodes in gfs2_create_inode")

---
 fs/gfs2/super.c |  2 +-
 fs/gfs2/xattr.c | 11 ++++++-----
 fs/gfs2/xattr.h |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
fs/gfs2/super.c +1 -1
index 3f49f848c6b4e..e25a24ae2197f 100644
@@ -1314,7 +1314,7 @@ static int evict_unlinked_inode(struct inode *inode)
 	}
 
 	if (ip->i_eattr) {
-		ret = gfs2_ea_dealloc(ip);
+		ret = gfs2_ea_dealloc(ip, !test_bit(GIF_ALLOC_FAILED, &ip->i_flags));
 		if (ret)
 			goto out;
 	}
fs/gfs2/xattr.c +6 -5
index 17ae5070a90e6..df9c93de94c79 100644
@@ -1383,7 +1383,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
 	return error;
 }
 
-static int ea_dealloc_block(struct gfs2_inode *ip)
+static int ea_dealloc_block(struct gfs2_inode *ip, bool initialized)
 {
 	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
 	struct gfs2_rgrpd *rgd;
@@ -1416,7 +1416,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip)
 	ip->i_eattr = 0;
 	gfs2_add_inode_blocks(&ip->i_inode, -1);
 
-	if (likely(!test_bit(GIF_ALLOC_FAILED, &ip->i_flags))) {
+	if (initialized) {
 		error = gfs2_meta_inode_buffer(ip, &dibh);
 		if (!error) {
 			gfs2_trans_add_meta(ip->i_gl, dibh);
@@ -1435,11 +1435,12 @@ static int ea_dealloc_block(struct gfs2_inode *ip)
 /**
  * gfs2_ea_dealloc - deallocate the extended attribute fork
  * @ip: the inode
+ * @initialized: xattrs have been initialized
  *
  * Returns: errno
  */
 
-int gfs2_ea_dealloc(struct gfs2_inode *ip)
+int gfs2_ea_dealloc(struct gfs2_inode *ip, bool initialized)
 {
 	int error;
 
@@ -1451,7 +1452,7 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip)
 	if (error)
 		return error;
 
-	if (likely(!test_bit(GIF_ALLOC_FAILED, &ip->i_flags))) {
+	if (initialized) {
 		error = ea_foreach(ip, ea_dealloc_unstuffed, NULL);
 		if (error)
 			goto out_quota;
@@ -1463,7 +1464,7 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip)
 		}
 	}
 
-	error = ea_dealloc_block(ip);
+	error = ea_dealloc_block(ip, initialized);
 
 out_quota:
 	gfs2_quota_unhold(ip);
fs/gfs2/xattr.h +1 -1
index eb12eb7e37c19..3c9788e0e1375 100644
@@ -54,7 +54,7 @@ int __gfs2_xattr_set(struct inode *inode, const char *name,
 		     const void *value, size_t size,
 		     int flags, int type);
 ssize_t gfs2_listxattr(struct dentry *dentry, char *buffer, size_t size);
-int gfs2_ea_dealloc(struct gfs2_inode *ip);
+int gfs2_ea_dealloc(struct gfs2_inode *ip, bool initialized);
 
 /* Exported to acl.c */
 
Signature · 1 line
2.39.5
author maintainer
#17 lore raw

PATCH 17/780 gfs2: deallocate inodes in gfs2_create_inode

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andreas Gruenbacher <[email protected]>

[ Upstream commit 2c63986dd35fa9eb0d7d1530b5eb2244b7296e22 ]

When creating and destroying inodes, we are relying on the inode hash table to make sure that for a given inode number, only a single inode will exist. We then link that inode to its inode and iopen glock and let those glocks point back at the inode. However, when iget_failed() is called, the inode is removed from the inode hash table before gfs_evict_inode() is called, and uniqueness is no longer guaranteed.

Commit f1046a472b70 ("gfs2: gl_object races fix") was trying to work around that problem by detaching the inode glock from the inode before calling iget_failed(), but that broke the inode deallocation code in gfs_evict_inode().

To fix that, deallocate partially created inodes in gfs2_create_inode() instead of relying on gfs_evict_inode() for doing that.

This means that gfs2_evict_inode() and its helper functions will no longer see partially created inodes, and so some simplifications are possible there.

Fixes 9ffa18884cce ("gfs2: gl_object races fix")
---
 fs/gfs2/inode.c | 27 +++++++++++++++++++--------
 fs/gfs2/super.c |  6 +-----
 2 files changed, 20 insertions(+), 13 deletions(-)
fs/gfs2/inode.c +19 -8
index b2d38d09af7e8..8fd81444ffea0 100644
@@ -697,10 +697,11 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 	struct gfs2_inode *dip = GFS2_I(dir), *ip;
 	struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);
 	struct gfs2_glock *io_gl;
-	int error;
+	int error, dealloc_error;
 	u32 aflags = 0;
 	unsigned blocks = 1;
 	struct gfs2_diradd da = { .bh = NULL, .save_loc = 1, };
+	bool xattr_initialized = false;
 
 	if (!name->len || name->len > GFS2_FNAMESIZE)
 		return -ENAMETOOLONG;
@@ -813,11 +814,11 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 
 	error = gfs2_glock_get(sdp, ip->i_no_addr, &gfs2_inode_glops, CREATE, &ip->i_gl);
 	if (error)
-		goto fail_free_inode;
+		goto fail_dealloc_inode;
 
 	error = gfs2_glock_get(sdp, ip->i_no_addr, &gfs2_iopen_glops, CREATE, &io_gl);
 	if (error)
-		goto fail_free_inode;
+		goto fail_dealloc_inode;
 	gfs2_cancel_delete_work(io_gl);
 	io_gl->gl_no_formal_ino = ip->i_no_formal_ino;
 
@@ -841,8 +842,10 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 	if (error)
 		goto fail_gunlock3;
 
-	if (blocks > 1)
+	if (blocks > 1) {
 		gfs2_init_xattr(ip);
+		xattr_initialized = true;
+	}
 	init_dinode(dip, ip, symname);
 	gfs2_trans_end(sdp);
 
@@ -897,6 +900,18 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 	gfs2_glock_dq_uninit(&ip->i_iopen_gh);
 fail_gunlock2:
 	gfs2_glock_put(io_gl);
+fail_dealloc_inode:
+	set_bit(GIF_ALLOC_FAILED, &ip->i_flags);
+	dealloc_error = 0;
+	if (ip->i_eattr)
+		dealloc_error = gfs2_ea_dealloc(ip, xattr_initialized);
+	clear_nlink(inode);
+	mark_inode_dirty(inode);
+	if (!dealloc_error)
+		dealloc_error = gfs2_dinode_dealloc(ip);
+	if (dealloc_error)
+		fs_warn(sdp, "%s: %d\n", __func__, dealloc_error);
+	ip->i_no_addr = 0;
 fail_free_inode:
 	if (ip->i_gl) {
 		gfs2_glock_put(ip->i_gl);
@@ -911,10 +926,6 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 	gfs2_dir_no_add(&da);
 	gfs2_glock_dq_uninit(&d_gh);
 	if (!IS_ERR_OR_NULL(inode)) {
-		set_bit(GIF_ALLOC_FAILED, &ip->i_flags);
-		clear_nlink(inode);
-		if (ip->i_no_addr)
-			mark_inode_dirty(inode);
 		if (inode->i_state & I_NEW)
 			iget_failed(inode);
 		else
fs/gfs2/super.c +1 -5
index e25a24ae2197f..54f1efd47a3e5 100644
@@ -1258,9 +1258,6 @@ static enum evict_behavior evict_should_delete(struct inode *inode,
 	struct gfs2_sbd *sdp = sb->s_fs_info;
 	int ret;
 
-	if (unlikely(test_bit(GIF_ALLOC_FAILED, &ip->i_flags)))
-		goto should_delete;
-
 	if (gfs2_holder_initialized(&ip->i_iopen_gh) &&
 	    test_bit(GLF_DEFER_DELETE, &ip->i_iopen_gh.gh_gl->gl_flags))
 		return EVICT_SHOULD_DEFER_DELETE;
@@ -1290,7 +1287,6 @@ static enum evict_behavior evict_should_delete(struct inode *inode,
 	if (inode->i_nlink)
 		return EVICT_SHOULD_SKIP_DELETE;
 
-should_delete:
 	if (gfs2_holder_initialized(&ip->i_iopen_gh) &&
 	    test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags))
 		return gfs2_upgrade_iopen_glock(inode);
@@ -1314,7 +1310,7 @@ static int evict_unlinked_inode(struct inode *inode)
 	}
 
 	if (ip->i_eattr) {
-		ret = gfs2_ea_dealloc(ip, !test_bit(GIF_ALLOC_FAILED, &ip->i_flags));
+		ret = gfs2_ea_dealloc(ip, true);
 		if (ret)
 			goto out;
 	}
Signature · 1 line
2.39.5
author maintainer
#18 lore raw

PATCH 18/780 perf/core: Fix broken throttling when max_samples_per_tick=1

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Qing Wang <[email protected]>

[ Upstream commit f51972e6f8b9a737b2b3eb588069acb538fa72de ]

According to the throttling mechanism, the pmu interrupts number can not exceed the max_samples_per_tick in one tick. But this mechanism is ineffective when max_samples_per_tick=1, because the throttling check is skipped during the first interrupt and only performed when the second interrupt arrives.

Perhaps this bug may cause little influence in one tick, but if in a larger time scale, the problem can not be underestimated.

When max_samples_per_tick = 1:

Allowed-interrupts-per-second max-samples-per-second  default-HZ  ARCH
200                           100                     100         X86
500                           250                     250         ARM64

...
Obviously, the pmu interrupt number far exceed the user's expect.

Fixes e050e3f0a71b ("perf: Fix broken interrupt rate throttling")
---
 kernel/events/core.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
kernel/events/core.c +8 -8
index 95e703891b24f..881d768e45564 100644
@@ -10029,14 +10029,14 @@ __perf_event_account_interrupt(struct perf_event *event, int throttle)
 		hwc->interrupts = 1;
 	} else {
 		hwc->interrupts++;
-		if (unlikely(throttle &&
-			     hwc->interrupts > max_samples_per_tick)) {
-			__this_cpu_inc(perf_throttled_count);
-			tick_dep_set_cpu(smp_processor_id(), TICK_DEP_BIT_PERF_EVENTS);
-			hwc->interrupts = MAX_INTERRUPTS;
-			perf_log_throttle(event, 0);
-			ret = 1;
-		}
+	}
+
+	if (unlikely(throttle && hwc->interrupts >= max_samples_per_tick)) {
+		__this_cpu_inc(perf_throttled_count);
+		tick_dep_set_cpu(smp_processor_id(), TICK_DEP_BIT_PERF_EVENTS);
+		hwc->interrupts = MAX_INTERRUPTS;
+		perf_log_throttle(event, 0);
+		ret = 1;
 	}
 
 	if (event->attr.freq) {
Signature · 1 line
2.39.5
author maintainer
#19 lore raw

PATCH 19/780 crypto: sun8i-ce-cipher - fix error handling in sun8i_ce_cipher_prepare()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ovidiu Panait <[email protected]>

[ Upstream commit f31adc3e356f7350d4a4d68c98d3f60f2f6e26b3 ]

Fix two DMA cleanup issues on the error path in sun8i_ce_cipher_prepare():

1] If dma_map_sg() fails for areq->dst, the device driver would try to free
DMA memory it has not allocated in the first place. To fix this, on the "theend_sgs" error path, call dma unmap only if the corresponding dma map was successful.

2] If the dma_map_single() call for the IV fails, the device driver would
try to free an invalid DMA memory address on the "theend_iv" path:

   ------------[ cut here ]------------
   DMA-API: sun8i-ce 1904000.crypto: device driver tries to free an invalid DMA memory address
   WARNING: CPU: 2 PID: 69 at kernel/dma/debug.c:968 check_unmap+0x123c/0x1b90
   Modules linked in: skcipher_example(O+)
   CPU: 2 UID: 0 PID: 69 Comm: 1904000.crypto- Tainted: G           O        6.15.0-rc3+ #24 PREEMPT
   Tainted: [O]=OOT_MODULE
   Hardware name: OrangePi Zero2 (DT)
   pc : check_unmap+0x123c/0x1b90
   lr : check_unmap+0x123c/0x1b90
   ...
   Call trace:
    check_unmap+0x123c/0x1b90 (P)
    debug_dma_unmap_page+0xac/0xc0
    dma_unmap_page_attrs+0x1f4/0x5fc
    sun8i_ce_cipher_do_one+0x1bd4/0x1f40
    crypto_pump_work+0x334/0x6e0
    kthread_worker_fn+0x21c/0x438
    kthread+0x374/0x664
    ret_from_fork+0x10/0x20
   ---[ end trace 0000000000000000 ]---

To fix this, check for !dma_mapping_error() before calling dma_unmap_single() on the "theend_iv" path.

Fixes 06f751b61329 ("crypto: allwinner - Add sun8i-ce Crypto Engine")
---
 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +5 -2
index 19b7fb4a93e86..05f67661553c9 100644
@@ -275,13 +275,16 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req
 	} else {
 		if (nr_sgs > 0)
 			dma_unmap_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE);
-		dma_unmap_sg(ce->dev, areq->dst, nd, DMA_FROM_DEVICE);
+
+		if (nr_sgd > 0)
+			dma_unmap_sg(ce->dev, areq->dst, nd, DMA_FROM_DEVICE);
 	}
 
 theend_iv:
 	if (areq->iv && ivsize > 0) {
-		if (rctx->addr_iv)
+		if (!dma_mapping_error(ce->dev, rctx->addr_iv))
 			dma_unmap_single(ce->dev, rctx->addr_iv, rctx->ivlen, DMA_TO_DEVICE);
+
 		offset = areq->cryptlen - ivsize;
 		if (rctx->op_dir & CE_DECRYPTION) {
 			memcpy(areq->iv, chan->backup_iv, ivsize);
Signature · 1 line
2.39.5
author maintainer
#20 lore raw

PATCH 20/780 crypto: sun8i-ss - do not use sg_dma_len before calling DMA functions

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Corentin Labbe <[email protected]>

[ Upstream commit 2dfc7cd74a5e062a5405560447517e7aab1c7341 ]

When testing sun8i-ss with multi_v7_defconfig, all CBC algorithm fail crypto selftests.
This is strange since on sunxi_defconfig, everything was ok.
The problem was in the IV setup loop which never run because sg_dma_len was 0.

Fixes 359e893e8af4 ("crypto: sun8i-ss - rework handling of IV")
---
 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c +1 -1
index 9b9605ce8ee62..8831bcb230c2d 100644
@@ -141,7 +141,7 @@ static int sun8i_ss_setup_ivs(struct skcipher_request *areq)
 
 	/* we need to copy all IVs from source in case DMA is bi-directionnal */
 	while (sg && len) {
-		if (sg_dma_len(sg) == 0) {
+		if (sg->length == 0) {
 			sg = sg_next(sg);
 			continue;
 		}
Signature · 1 line
2.39.5
author maintainer
#21 lore raw

PATCH 21/780 powerpc: do not build ppc_save_regs.o always

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Jiri Slaby (SUSE) <[email protected]>

[ Upstream commit 497b7794aef03d525a5be05ae78dd7137c6861a5 ]

The Fixes commit below tried to add CONFIG_PPC_BOOK3S to one of the conditions to enable the build of ppc_save_regs.o. But it failed to do so, in fact. The commit omitted to add a dollar sign.

Therefore, ppc_save_regs.o is built always these days (as "(CONFIG_PPC_BOOK3S)" is never an empty string).

Fix this by adding the missing dollar sign.

Fixes fc2a5a6161a2 ("powerpc/64s: ppc_save_regs is now needed for all 64s builds")
---
 arch/powerpc/kernel/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/Makefile +1 -1
index 6ac621155ec3c..0c26b2412d173 100644
@@ -160,7 +160,7 @@ endif
 
 obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM)	+= tm.o
 
-ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)(CONFIG_PPC_BOOK3S),)
+ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)$(CONFIG_PPC_BOOK3S),)
 obj-y				+= ppc_save_regs.o
 endif
 
Signature · 1 line
2.39.5
author maintainer
#22 lore raw

PATCH 22/780 powerpc/crash: Fix non-smp kexec preparation

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Eddie James <[email protected]>

[ Upstream commit 882b25af265de8e05c66f72b9a29f6047102958f ]

In non-smp configurations, crash_kexec_prepare is never called in the crash shutdown path. One result of this is that the crashing_cpu variable is never set, preventing crash_save_cpu from storing the NT_PRSTATUS elf note in the core dump.

Fixes c7255058b543 ("powerpc/crash: save cpu register data in crash_smp_send_stop()")
---
 arch/powerpc/kexec/crash.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kexec/crash.c +4 -1
index 9ac3266e49652..a325c1c02f96d 100644
@@ -359,7 +359,10 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
 	if (TRAP(regs) == INTERRUPT_SYSTEM_RESET)
 		is_via_system_reset = 1;
 
-	crash_smp_send_stop();
+	if (IS_ENABLED(CONFIG_SMP))
+		crash_smp_send_stop();
+	else
+		crash_kexec_prepare();
 
 	crash_save_cpu(regs, crashing_cpu);
 
Signature · 1 line
2.39.5
author maintainer
#23 lore raw

PATCH 23/780 sched/core: Tweak wait_task_inactive() to force dequeue sched_delayed tasks

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: John Stultz <[email protected]>

[ Upstream commit b7ca5743a2604156d6083b88cefacef983f3a3a6 ]

It was reported that in 6.12, smpboot_create_threads() was taking much longer then in 6.6.

I narrowed down the call path to:
smpboot_create_threads()
-> kthread_create_on_cpu()

    -> kthread_bind()
       -> __kthread_bind_mask()
          ->wait_task_inactive()

Where in wait_task_inactive() we were regularly hitting the queued case, which sets a 1 tick timeout, which when called multiple times in a row, accumulates quickly into a long delay.

I noticed disabling the DELAY_DEQUEUE sched feature recovered the performance, and it seems the newly create tasks are usually sched_delayed and left on the runqueue.

So in wait_task_inactive() when we see the task p->se.sched_delayed, manually dequeue the sched_delayed task with DEQUEUE_DELAYED, so we don't have to constantly wait a tick.

---
 kernel/sched/core.c | 6 ++++++
 1 file changed, 6 insertions(+)
kernel/sched/core.c +6 -0
index 36b34e6884587..d593d6612ba07 100644
@@ -2283,6 +2283,12 @@ unsigned long wait_task_inactive(struct task_struct *p, unsigned int match_state
 		 * just go back and repeat.
 		 */
 		rq = task_rq_lock(p, &rf);
+		/*
+		 * If task is sched_delayed, force dequeue it, to avoid always
+		 * hitting the tick timeout in the queued case
+		 */
+		if (p->se.sched_delayed)
+			dequeue_task(rq, p, DEQUEUE_SLEEP | DEQUEUE_DELAYED);
 		trace_sched_wait_task(p);
 		running = task_on_cpu(rq, p);
 		queued = task_on_rq_queued(p);
Signature · 1 line
2.39.5
author maintainer
#24 lore raw

PATCH 24/780 x86/microcode/AMD: Do not return error when microcode update is not necessary

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Annie Li <[email protected]>

[ Upstream commit b43dc4ab097859c24e2a6993119c927cffc856aa ]

After

6f059e634dcd("x86/microcode: Clarify the late load logic"),

if the load is up-to-date, the AMD side returns UCODE_OK which leads to load_late_locked() returning -EBADFD.

Handle UCODE_OK in the switch case to avoid this error.

[ bp: Massage commit message. ]

Fixes 6f059e634dcd ("x86/microcode: Clarify the late load logic")
---
 arch/x86/kernel/cpu/microcode/core.c | 2 ++
 1 file changed, 2 insertions(+)
arch/x86/kernel/cpu/microcode/core.c +2 -0
index 079f046ee26d1..e8021d3e58824 100644
@@ -696,6 +696,8 @@ static int load_late_locked(void)
 		return load_late_stop_cpus(true);
 	case UCODE_NFOUND:
 		return -ENOENT;
+	case UCODE_OK:
+		return 0;
 	default:
 		return -EBADFD;
 	}
Signature · 1 line
2.39.5
author maintainer
#25 lore raw

PATCH 25/780 selftests: coredump: Properly initialize pointer

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Nam Cao <[email protected]>

[ Upstream commit e194d2067c958827810a7a7282dff8773633ad8c ]

The buffer pointer "line" is not initialized. This pointer is passed to getline().

It can still work if the stack is zero-initialized, because getline() can work with a NULL pointer as buffer.

But this is obviously broken. This bug shows up while running the test on a riscv64 machine.

Fix it by properly initializing the pointer.

---
 tools/testing/selftests/coredump/stackdump_test.c | 2 ++
 1 file changed, 2 insertions(+)
tools/testing/selftests/coredump/stackdump_test.c +2 -0
index 137b2364a0820..c23cf95c3f6df 100644
@@ -138,10 +138,12 @@ TEST_F(coredump, stackdump)
 	ASSERT_NE(file, NULL);
 
 	/* Step 4: Make sure all stack pointer values are non-zero */
+	line = NULL;
 	for (i = 0; -1 != getline(&line, &line_length, file); ++i) {
 		stack = strtoull(line, NULL, 10);
 		ASSERT_NE(stack, 0);
 	}
+	free(line);
 
 	ASSERT_EQ(i, 1 + NUM_THREAD_SPAWN);
 
Signature · 1 line
2.39.5
author maintainer
#26 lore raw

PATCH 26/780 selftests: coredump: Fix test failure for slow machines

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Nam Cao <[email protected]>

[ Upstream commit 6f5bf9f37f06668ead446e2997f2b431db8963ce ]

The test waits for coredump to finish by busy-waiting for the stack_values file to be created. The maximum wait time is 10 seconds.

This doesn't work for slow machine (qemu-system-riscv64), because coredump takes longer.

Fix it by waiting for the crashing child process to finish first.

---
 tools/testing/selftests/coredump/stackdump_test.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tools/testing/selftests/coredump/stackdump_test.c +5 -1
index c23cf95c3f6df..9da10fb5e597c 100644
@@ -96,7 +96,7 @@ TEST_F(coredump, stackdump)
 	char *test_dir, *line;
 	size_t line_length;
 	char buf[PATH_MAX];
-	int ret, i;
+	int ret, i, status;
 	FILE *file;
 	pid_t pid;
 
@@ -129,6 +129,10 @@ TEST_F(coredump, stackdump)
 	/*
 	 * Step 3: Wait for the stackdump script to write the stack pointers to the stackdump file
 	 */
+	waitpid(pid, &status, 0);
+	ASSERT_TRUE(WIFSIGNALED(status));
+	ASSERT_TRUE(WCOREDUMP(status));
+
 	for (i = 0; i < 10; ++i) {
 		file = fopen(STACKDUMP_FILE, "r");
 		if (file)
Signature · 1 line
2.39.5
author maintainer
#27 lore raw

PATCH 27/780 selftests: coredump: Raise timeout to 2 minutes

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Nam Cao <[email protected]>

[ Upstream commit c6e888d02d51d1e9f9abf1587e6a5618375cac9f ]

The test's runtime (nearly 20s) is dangerously close to the limit (30s) on qemu-system-riscv64:

$ time ./stackdump_test > /dev/null
real	0m19.210s
user	0m0.077s
sys	0m0.359s

There could be machines slower than qemu-system-riscv64. Therefore raise the test timeout to 2 minutes to be safe.

---
 tools/testing/selftests/coredump/stackdump_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/coredump/stackdump_test.c +1 -1
index 9da10fb5e597c..fe3c728cd6be5 100644
@@ -89,7 +89,7 @@ FIXTURE_TEARDOWN(coredump)
 	fprintf(stderr, "Failed to cleanup stackdump test: %s\n", reason);
 }
 
-TEST_F(coredump, stackdump)
+TEST_F_TIMEOUT(coredump, stackdump, 120)
 {
 	struct sigaction action = {};
 	unsigned long long stack;
Signature · 1 line
2.39.5
author maintainer
#28 lore raw

PATCH 28/780 crypto: sun8i-ce - undo runtime PM changes during driver removal

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ovidiu Panait <[email protected]>

[ Upstream commit 9334f427576e6d361a409959b52246b0aa10476f ]

The pm_runtime_use_autosuspend() call must be undone with pm_runtime_dont_use_autosuspend() at driver exit, but this is not currently handled in the driver.

To fix this issue and at the same time simplify error handling, switch to devm_pm_runtime_enable(). It will call both pm_runtime_disable() and pm_runtime_dont_use_autosuspend() during driver removal.

Fixes 06f751b61329 ("crypto: allwinner - Add sun8i-ce Crypto Engine")
---
 .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +6 -11
index ec1ffda9ea32e..658f520cee0ca 100644
@@ -832,13 +832,12 @@ static int sun8i_ce_pm_init(struct sun8i_ce_dev *ce)
 	err = pm_runtime_set_suspended(ce->dev);
 	if (err)
 		return err;
-	pm_runtime_enable(ce->dev);
-	return err;
-}
 
-static void sun8i_ce_pm_exit(struct sun8i_ce_dev *ce)
-{
-	pm_runtime_disable(ce->dev);
+	err = devm_pm_runtime_enable(ce->dev);
+	if (err)
+		return err;
+
+	return 0;
 }
 
 static int sun8i_ce_get_clks(struct sun8i_ce_dev *ce)
@@ -1041,7 +1040,7 @@ static int sun8i_ce_probe(struct platform_device *pdev)
 			       "sun8i-ce-ns", ce);
 	if (err) {
 		dev_err(ce->dev, "Cannot request CryptoEngine Non-secure IRQ (err=%d)\n", err);
-		goto error_irq;
+		goto error_pm;
 	}
 
 	err = sun8i_ce_register_algs(ce);
@@ -1082,8 +1081,6 @@ static int sun8i_ce_probe(struct platform_device *pdev)
 	return 0;
 error_alg:
 	sun8i_ce_unregister_algs(ce);
-error_irq:
-	sun8i_ce_pm_exit(ce);
 error_pm:
 	sun8i_ce_free_chanlist(ce, MAXFLOW - 1);
 	return err;
@@ -1104,8 +1101,6 @@ static void sun8i_ce_remove(struct platform_device *pdev)
 #endif
 
 	sun8i_ce_free_chanlist(ce, MAXFLOW - 1);
-
-	sun8i_ce_pm_exit(ce);
 }
 
 static const struct of_device_id sun8i_ce_crypto_of_match_table[] = {
Signature · 1 line
2.39.5
author maintainer
#29 lore raw

PATCH 29/780 blk-throttle: Fix wrong tg->[bytes/io]_disp update in __tg_update_carryover()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Zizhi Wo <[email protected]>

[ Upstream commit f66cf69eb8765341bbeff0e92a7d0d2027f62452 ]

In commit 6cc477c36875 ("blk-throttle: carry over directly"), the carryover bytes/ios was be carried to [bytes/io]_disp. However, its update mechanism has some issues.

In __tg_update_carryover(), we calculate "bytes" and "ios" to represent the carryover, but the computation when updating [bytes/io]_disp is incorrect. And if the sq->nr_queued is empty, we may not update tg->[bytes/io]_disp to 0 in tg_update_carryover(). We should set it to 0 in non carryover case. This patch fixes the issue.

---
 block/blk-throttle.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)
block/blk-throttle.c +16 -6
index d6dd2e0478749..7437de947120e 100644
@@ -644,6 +644,18 @@ static void __tg_update_carryover(struct throtl_grp *tg, bool rw,
 	u64 bps_limit = tg_bps_limit(tg, rw);
 	u32 iops_limit = tg_iops_limit(tg, rw);
 
+	/*
+	 * If the queue is empty, carryover handling is not needed. In such cases,
+	 * tg->[bytes/io]_disp should be reset to 0 to avoid impacting the dispatch
+	 * of subsequent bios. The same handling applies when the previous BPS/IOPS
+	 * limit was set to max.
+	 */
+	if (tg->service_queue.nr_queued[rw] == 0) {
+		tg->bytes_disp[rw] = 0;
+		tg->io_disp[rw] = 0;
+		return;
+	}
+
 	/*
 	 * If config is updated while bios are still throttled, calculate and
 	 * accumulate how many bytes/ios are waited across changes. And
@@ -656,8 +668,8 @@ static void __tg_update_carryover(struct throtl_grp *tg, bool rw,
 	if (iops_limit != UINT_MAX)
 		*ios = calculate_io_allowed(iops_limit, jiffy_elapsed) -
 			tg->io_disp[rw];
-	tg->bytes_disp[rw] -= *bytes;
-	tg->io_disp[rw] -= *ios;
+	tg->bytes_disp[rw] = -*bytes;
+	tg->io_disp[rw] = -*ios;
 }
 
 static void tg_update_carryover(struct throtl_grp *tg)
@@ -665,10 +677,8 @@ static void tg_update_carryover(struct throtl_grp *tg)
 	long long bytes[2] = {0};
 	int ios[2] = {0};
 
-	if (tg->service_queue.nr_queued[READ])
-		__tg_update_carryover(tg, READ, &bytes[READ], &ios[READ]);
-	if (tg->service_queue.nr_queued[WRITE])
-		__tg_update_carryover(tg, WRITE, &bytes[WRITE], &ios[WRITE]);
+	__tg_update_carryover(tg, READ, &bytes[READ], &ios[READ]);
+	__tg_update_carryover(tg, WRITE, &bytes[WRITE], &ios[WRITE]);
 
 	/* see comments in struct throtl_grp for meaning of these fields. */
 	throtl_log(&tg->service_queue, "%s: %lld %lld %d %d\n", __func__,
Signature · 1 line
2.39.5
author maintainer
#30 lore raw

PATCH 30/780 x86/cpu: Sanitize CPUID(0x80000000) output

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ahmed S. Darwish <[email protected]>

[ Upstream commit cc663ba3fe383a628a812f893cc98aafff39ab04 ]

CPUID(0x80000000).EAX returns the max extended CPUID leaf available. On x86-32 machines without an extended CPUID range, a CPUID(0x80000000) query will just repeat the output of the last valid standard CPUID leaf on the CPU; i.e., a garbage values. Current tip:x86/cpu code protects against this by doing:

	eax = cpuid_eax(0x80000000);
	c->extended_cpuid_level = eax;

	if ((eax & 0xffff0000) == 0x80000000) {
		// CPU has an extended CPUID range. Check for 0x80000001
		if (eax >= 0x80000001) {
			cpuid(0x80000001, ...);
		}
	}

This is correct so far. Afterwards though, the same possibly broken EAX value is used to check the availability of other extended CPUID leaves:

	if (c->extended_cpuid_level >= 0x80000007)
		...
	if (c->extended_cpuid_level >= 0x80000008)
		...
	if (c->extended_cpuid_level >= 0x8000000a)
		...
	if (c->extended_cpuid_level >= 0x8000001f)
		...

which is invalid. Fix this by immediately setting the CPU's max extended CPUID leaf to zero if CPUID(0x80000000).EAX doesn't indicate a valid CPUID extended range.

While at it, add a comment, similar to kernel/head_32.S, clarifying the CPUID(0x80000000) sanity check.

References: 8a50e5135af0 ("x86-32: Use symbolic constants, safer CPUID when enabling EFER.NX")

Fixes 3da99c977637 ("x86: make (early)_identify_cpu more the same between 32bit and 64 bit")
Cc Andrew Cooper <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc John Ogness <[email protected]>
---
 arch/x86/kernel/cpu/common.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/common.c +9 -8
index 0ff057ff11ce9..5de4a879232a6 100644
@@ -1005,17 +1005,18 @@ void get_cpu_cap(struct cpuinfo_x86 *c)
 		c->x86_capability[CPUID_D_1_EAX] = eax;
 	}
 
-	/* AMD-defined flags: level 0x80000001 */
+	/*
+	 * Check if extended CPUID leaves are implemented: Max extended
+	 * CPUID leaf must be in the 0x80000001-0x8000ffff range.
+	 */
 	eax = cpuid_eax(0x80000000);
-	c->extended_cpuid_level = eax;
+	c->extended_cpuid_level = ((eax & 0xffff0000) == 0x80000000) ? eax : 0;
 
-	if ((eax & 0xffff0000) == 0x80000000) {
-		if (eax >= 0x80000001) {
-			cpuid(0x80000001, &eax, &ebx, &ecx, &edx);
+	if (c->extended_cpuid_level >= 0x80000001) {
+		cpuid(0x80000001, &eax, &ebx, &ecx, &edx);
 
-			c->x86_capability[CPUID_8000_0001_ECX] = ecx;
-			c->x86_capability[CPUID_8000_0001_EDX] = edx;
-		}
+		c->x86_capability[CPUID_8000_0001_ECX] = ecx;
+		c->x86_capability[CPUID_8000_0001_EDX] = edx;
 	}
 
 	if (c->extended_cpuid_level >= 0x80000007) {
Signature · 1 line
2.39.5
author maintainer
#31 lore raw

PATCH 31/780 x86/insn: Fix opcode map (!REX2) superscript tags

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Masami Hiramatsu (Google) <[email protected]>

[ Upstream commit ca698ec2f07873a448d53c580795c4e023c75393 ]

Commit:

159039af8c07 ("x86/insn: x86/insn: Add support for REX2 prefix to the instruction decoder opcode map")

added (!REX2) superscript with a space, but the correct format requires ',' for concatination with other superscript tags.

Add ',' to generate correct insn attribute tables.

I confirmed with following command:

      arch/x86/lib/x86-opcode-map.txt | grep e8 | head -n 1

[0xe8] = INAT_MAKE_IMM(INAT_IMM_VWORD32) | INAT_FORCE64 | INAT_NO_REX2,

Fixes 159039af8c07 ("x86/insn: x86/insn: Add support for REX2 prefix to the instruction decoder opcode map")
Cc H. Peter Anvin <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Peter Zijlstra <[email protected]>
---
 arch/x86/lib/x86-opcode-map.txt       | 50 +++++++++++++--------------
 tools/arch/x86/lib/x86-opcode-map.txt | 50 +++++++++++++--------------
 2 files changed, 50 insertions(+), 50 deletions(-)
arch/x86/lib/x86-opcode-map.txt +25 -25
index f5dd84eb55dcd..cd3fd5155f6ec 100644
@@ -35,7 +35,7 @@
 #  - (!F3) : the last prefix is not 0xF3 (including non-last prefix case)
 #  - (66&F2): Both 0x66 and 0xF2 prefixes are specified.
 #
-# REX2 Prefix
+# REX2 Prefix Superscripts
 #  - (!REX2): REX2 is not allowed
 #  - (REX2): REX2 variant e.g. JMPABS
 
@@ -286,10 +286,10 @@ df: ESC
 # Note: "forced64" is Intel CPU behavior: they ignore 0x66 prefix
 # in 64-bit mode. AMD CPUs accept 0x66 prefix, it causes RIP truncation
 # to 16 bits. In 32-bit mode, 0x66 is accepted by both Intel and AMD.
-e0: LOOPNE/LOOPNZ Jb (f64) (!REX2)
-e1: LOOPE/LOOPZ Jb (f64) (!REX2)
-e2: LOOP Jb (f64) (!REX2)
-e3: JrCXZ Jb (f64) (!REX2)
+e0: LOOPNE/LOOPNZ Jb (f64),(!REX2)
+e1: LOOPE/LOOPZ Jb (f64),(!REX2)
+e2: LOOP Jb (f64),(!REX2)
+e3: JrCXZ Jb (f64),(!REX2)
 e4: IN AL,Ib (!REX2)
 e5: IN eAX,Ib (!REX2)
 e6: OUT Ib,AL (!REX2)
@@ -298,10 +298,10 @@ e7: OUT Ib,eAX (!REX2)
 # in "near" jumps and calls is 16-bit. For CALL,
 # push of return address is 16-bit wide, RSP is decremented by 2
 # but is not truncated to 16 bits, unlike RIP.
-e8: CALL Jz (f64) (!REX2)
-e9: JMP-near Jz (f64) (!REX2)
-ea: JMP-far Ap (i64) (!REX2)
-eb: JMP-short Jb (f64) (!REX2)
+e8: CALL Jz (f64),(!REX2)
+e9: JMP-near Jz (f64),(!REX2)
+ea: JMP-far Ap (i64),(!REX2)
+eb: JMP-short Jb (f64),(!REX2)
 ec: IN AL,DX (!REX2)
 ed: IN eAX,DX (!REX2)
 ee: OUT DX,AL (!REX2)
@@ -478,22 +478,22 @@ AVXcode: 1
 7f: movq Qq,Pq | vmovdqa Wx,Vx (66) | vmovdqa32/64 Wx,Vx (66),(evo) | vmovdqu Wx,Vx (F3) | vmovdqu32/64 Wx,Vx (F3),(evo) | vmovdqu8/16 Wx,Vx (F2),(ev)
 # 0x0f 0x80-0x8f
 # Note: "forced64" is Intel CPU behavior (see comment about CALL insn).
-80: JO Jz (f64) (!REX2)
-81: JNO Jz (f64) (!REX2)
-82: JB/JC/JNAE Jz (f64) (!REX2)
-83: JAE/JNB/JNC Jz (f64) (!REX2)
-84: JE/JZ Jz (f64) (!REX2)
-85: JNE/JNZ Jz (f64) (!REX2)
-86: JBE/JNA Jz (f64) (!REX2)
-87: JA/JNBE Jz (f64) (!REX2)
-88: JS Jz (f64) (!REX2)
-89: JNS Jz (f64) (!REX2)
-8a: JP/JPE Jz (f64) (!REX2)
-8b: JNP/JPO Jz (f64) (!REX2)
-8c: JL/JNGE Jz (f64) (!REX2)
-8d: JNL/JGE Jz (f64) (!REX2)
-8e: JLE/JNG Jz (f64) (!REX2)
-8f: JNLE/JG Jz (f64) (!REX2)
+80: JO Jz (f64),(!REX2)
+81: JNO Jz (f64),(!REX2)
+82: JB/JC/JNAE Jz (f64),(!REX2)
+83: JAE/JNB/JNC Jz (f64),(!REX2)
+84: JE/JZ Jz (f64),(!REX2)
+85: JNE/JNZ Jz (f64),(!REX2)
+86: JBE/JNA Jz (f64),(!REX2)
+87: JA/JNBE Jz (f64),(!REX2)
+88: JS Jz (f64),(!REX2)
+89: JNS Jz (f64),(!REX2)
+8a: JP/JPE Jz (f64),(!REX2)
+8b: JNP/JPO Jz (f64),(!REX2)
+8c: JL/JNGE Jz (f64),(!REX2)
+8d: JNL/JGE Jz (f64),(!REX2)
+8e: JLE/JNG Jz (f64),(!REX2)
+8f: JNLE/JG Jz (f64),(!REX2)
 # 0x0f 0x90-0x9f
 90: SETO Eb | kmovw/q Vk,Wk | kmovb/d Vk,Wk (66)
 91: SETNO Eb | kmovw/q Mv,Vk | kmovb/d Mv,Vk (66)
tools/arch/x86/lib/x86-opcode-map.txt +25 -25

74 lines not on this page · raw message

Signature · 1 line
2.39.5
author maintainer
#32 lore raw

PATCH 32/780 brd: fix aligned_sector from brd_do_discard()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Yu Kuai <[email protected]>

[ Upstream commit d4099f8893b057ad7e8d61df76bdeaf807ebd679 ]

The calculation is just wrong, fix it by round_up().

---
 drivers/block/brd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/brd.c +1 -1
index 292f127cae0ab..9549cd71e083b 100644
@@ -224,7 +224,7 @@ static int brd_do_bvec(struct brd_device *brd, struct page *page,
 
 static void brd_do_discard(struct brd_device *brd, sector_t sector, u32 size)
 {
-	sector_t aligned_sector = (sector + PAGE_SECTORS) & ~PAGE_SECTORS;
+	sector_t aligned_sector = round_up(sector, PAGE_SECTORS);
 	struct page *page;
 
 	size -= (aligned_sector - sector) * SECTOR_SIZE;
Signature · 1 line
2.39.5
author maintainer
#33 lore raw

PATCH 33/780 brd: fix discard end sector

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Yu Kuai <[email protected]>

[ Upstream commit a26a339a654b9403f0ee1004f1db4c2b2a355460 ]

brd_do_discard() just aligned start sector to page, this can only work if the discard size if at least one page. For example:

blkdiscard /dev/ram0 -o 5120 -l 1024

In this case, size = (1024 - (8192 - 5120)), which is a huge value.

Fix the problem by round_down() the end sector.

---
 drivers/block/brd.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/block/brd.c +6 -3
index 9549cd71e083b..02fa8106ef549 100644
@@ -225,18 +225,21 @@ static int brd_do_bvec(struct brd_device *brd, struct page *page,
 static void brd_do_discard(struct brd_device *brd, sector_t sector, u32 size)
 {
 	sector_t aligned_sector = round_up(sector, PAGE_SECTORS);
+	sector_t aligned_end = round_down(
+			sector + (size >> SECTOR_SHIFT), PAGE_SECTORS);
 	struct page *page;
 
-	size -= (aligned_sector - sector) * SECTOR_SIZE;
+	if (aligned_end <= aligned_sector)
+		return;
+
 	xa_lock(&brd->brd_pages);
-	while (size >= PAGE_SIZE && aligned_sector < rd_size * 2) {
+	while (aligned_sector < aligned_end && aligned_sector < rd_size * 2) {
 		page = __xa_erase(&brd->brd_pages, aligned_sector >> PAGE_SECTORS_SHIFT);
 		if (page) {
 			__free_page(page);
 			brd->brd_nr_pages--;
 		}
 		aligned_sector += PAGE_SECTORS;
-		size -= PAGE_SIZE;
 	}
 	xa_unlock(&brd->brd_pages);
 }
Signature · 1 line
2.39.5
author maintainer
#34 lore raw

PATCH 34/780 kselftest: cpufreq: Get rid of double suspend in rtcwake case

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Nícolas F. R. A. Prado <[email protected]>

[ Upstream commit 23b88515a318680337f21d0a2fceee8038ccffc8 ]

Commit 0b631ed3ce92 ("kselftest: cpufreq: Add RTC wakeup alarm") added support for automatic wakeup in the suspend routine of the cpufreq kselftest by using rtcwake, however it left the manual power state change in the common path. The end result is that when running the cpufreq kselftest with '-t suspend_rtc' or '-t hibernate_rtc', the system will go to sleep and be woken up by the RTC, but then immediately go to sleep again with no wakeup programmed, so it will sleep forever in an automated testing setup.

Fix this by moving the manual power state change so that it only happens when not using rtcwake.

---
 tools/testing/selftests/cpufreq/cpufreq.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/cpufreq/cpufreq.sh +2 -1
index e350c521b4675..3aad9db921b53 100755
@@ -244,9 +244,10 @@ do_suspend()
 					printf "Failed to suspend using RTC wake alarm\n"
 					return 1
 				fi
+			else
+				echo $filename > $SYSFS/power/state
 			fi
 
-			echo $filename > $SYSFS/power/state
 			printf "Came out of $1\n"
 
 			printf "Do basic tests after finishing $1 to verify cpufreq state\n\n"
Signature · 1 line
2.39.5
author maintainer
#35 lore raw

PATCH 35/780 crypto: marvell/cesa - Handle zero-length skcipher requests

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Herbert Xu <[email protected]>

[ Upstream commit 8a4e047c6cc07676f637608a9dd675349b5de0a7 ]

Do not access random memory for zero-length skcipher requests. Just return 0.

Fixes f63601fd616a ("crypto: marvell/cesa - add a new driver for Marvell's CESA")
---
 drivers/crypto/marvell/cesa/cipher.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/crypto/marvell/cesa/cipher.c +3 -0
index cf62db50f9585..48c5c8ea8c43e 100644
@@ -459,6 +459,9 @@ static int mv_cesa_skcipher_queue_req(struct skcipher_request *req,
 	struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
 	struct mv_cesa_engine *engine;
 
+	if (!req->cryptlen)
+		return 0;
+
 	ret = mv_cesa_skcipher_req_init(req, tmpl);
 	if (ret)
 		return ret;
Signature · 1 line
2.39.5
author maintainer
#36 lore raw

PATCH 36/780 crypto: marvell/cesa - Avoid empty transfer descriptor

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Herbert Xu <[email protected]>

[ Upstream commit 1bafd82d9a40cf09c6c40f1c09cc35b7050b1a9f ]

The user may set req->src even if req->nbytes == 0. If there is no data to hash from req->src, do not generate an empty TDMA descriptor.

Fixes db509a45339f ("crypto: marvell/cesa - add TDMA support")
---
 drivers/crypto/marvell/cesa/hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/marvell/cesa/hash.c +1 -1
index f150861ceaf69..6815eddc90681 100644
@@ -663,7 +663,7 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)
 	if (ret)
 		goto err_free_tdma;
 
-	if (iter.src.sg) {
+	if (iter.base.len > iter.src.op_offset) {
 		/*
 		 * Add all the new data, inserting an operation block and
 		 * launch command between each full SRAM block-worth of
Signature · 1 line
2.39.5
author maintainer
#37 lore raw

PATCH 37/780 erofs: fix file handle encoding for 64-bit NIDs

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Hongbo Li <[email protected]>

[ Upstream commit 510de8363f2c3d8e67fa9dfb2366e821382036e0 ]

EROFS uses NID to indicate the on-disk inode offset, which can exceed 32 bits. However, the default encode_fh uses the ino32, thus it doesn't work if the image is larger than 128GiB.

Let's introduce our own helpers to encode file handles.

It's easy to reproduce:
1. prepare an erofs image with nid bigger than U32_MAX
2. mount -t erofs foo.img /mnt/erofs
3. set exportfs with configuration: /mnt/erofs *(rw,sync, no_root_squash)
4. mount -t nfs $IP:/mnt/erofs /mnt/nfs
5. md5sum /mnt/nfs/foo # foo is the file which nid bigger than U32_MAX. # you will get ESTALE error.

In the case of overlayfs, the underlying filesystem's file handle is encoded in ovl_fb.fid, which is similar to NFS's case. If the NID of file is larger than U32_MAX, the overlay will get -ESTALE error when calls exportfs_decode_fh.

---
 fs/erofs/super.c | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)
fs/erofs/super.c +36 -8
index da6ee7c39290d..bcb99c3c2594b 100644
@@ -510,24 +510,52 @@ static int erofs_fc_parse_param(struct fs_context *fc,
 	return 0;
 }
 
-static struct inode *erofs_nfs_get_inode(struct super_block *sb,
-					 u64 ino, u32 generation)
+static int erofs_encode_fh(struct inode *inode, u32 *fh, int *max_len,
+			   struct inode *parent)
 {
-	return erofs_iget(sb, ino);
+	erofs_nid_t nid = EROFS_I(inode)->nid;
+	int len = parent ? 6 : 3;
+
+	if (*max_len < len) {
+		*max_len = len;
+		return FILEID_INVALID;
+	}
+
+	fh[0] = (u32)(nid >> 32);
+	fh[1] = (u32)(nid & 0xffffffff);
+	fh[2] = inode->i_generation;
+
+	if (parent) {
+		nid = EROFS_I(parent)->nid;
+
+		fh[3] = (u32)(nid >> 32);
+		fh[4] = (u32)(nid & 0xffffffff);
+		fh[5] = parent->i_generation;
+	}
+
+	*max_len = len;
+	return parent ? FILEID_INO64_GEN_PARENT : FILEID_INO64_GEN;
 }
 
 static struct dentry *erofs_fh_to_dentry(struct super_block *sb,
 		struct fid *fid, int fh_len, int fh_type)
 {
-	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
-				    erofs_nfs_get_inode);
+	if ((fh_type != FILEID_INO64_GEN &&
+	     fh_type != FILEID_INO64_GEN_PARENT) || fh_len < 3)
+		return NULL;
+
+	return d_obtain_alias(erofs_iget(sb,
+		((u64)fid->raw[0] << 32) | fid->raw[1]));
 }
 
 static struct dentry *erofs_fh_to_parent(struct super_block *sb,
 		struct fid *fid, int fh_len, int fh_type)
 {
-	return generic_fh_to_parent(sb, fid, fh_len, fh_type,
-				    erofs_nfs_get_inode);
+	if (fh_type != FILEID_INO64_GEN_PARENT || fh_len < 6)
+		return NULL;
+
+	return d_obtain_alias(erofs_iget(sb,
+		((u64)fid->raw[3] << 32) | fid->raw[4]));
 }
 
 static struct dentry *erofs_get_parent(struct dentry *child)
@@ -543,7 +571,7 @@ static struct dentry *erofs_get_parent(struct dentry *child)
 }
 
 static const struct export_operations erofs_export_ops = {
-	.encode_fh = generic_encode_ino32_fh,
+	.encode_fh = erofs_encode_fh,
 	.fh_to_dentry = erofs_fh_to_dentry,
 	.fh_to_parent = erofs_fh_to_parent,
 	.get_parent = erofs_get_parent,
Signature · 1 line
2.39.5
author maintainer
#38 lore raw

PATCH 38/780 erofs: avoid using multiple devices with different type

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Sheng Yong <[email protected]>

[ Upstream commit 9748f2f54f66743ac77275c34886a9f890e18409 ]

For multiple devices, both primary and extra devices should be the same type. erofs_init_device has already guaranteed that if the primary is a file-backed device, extra devices should also be regular files.

However, if the primary is a block device while the extra device is a file-backed device, erofs_init_device will get an ENOTBLK, which is not treated as an error in erofs_fc_get_tree, and that leads to an UAF:

erofs_fc_get_tree

    get_tree_bdev_flags(erofs_fc_fill_super)
      erofs_read_superblock
        erofs_init_device  // sbi->dif0 is not inited yet,
                           // return -ENOTBLK
      deactivate_locked_super
        free(sbi)
    if (err is -ENOTBLK)
      sbi->dif0.file = filp_open()  // sbi UAF

So if -ENOTBLK is hitted in erofs_init_device, it means the primary device must be a block device, and the extra device is not a block device. The error can be converted to -EINVAL.

---
 fs/erofs/super.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
fs/erofs/super.c +4 -1
index bcb99c3c2594b..6e57b9cc6ed2e 100644
@@ -165,8 +165,11 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
 				filp_open(dif->path, O_RDONLY | O_LARGEFILE, 0) :
 				bdev_file_open_by_path(dif->path,
 						BLK_OPEN_READ, sb->s_type, NULL);
-		if (IS_ERR(file))
+		if (IS_ERR(file)) {
+			if (file == ERR_PTR(-ENOTBLK))
+				return -EINVAL;
 			return PTR_ERR(file);
+		}
 
 		if (!erofs_is_fileio_mode(sbi)) {
 			dif->dax_dev = fs_dax_get_by_bdev(file_bdev(file),
Signature · 1 line
2.39.5
author maintainer
#39 lore raw

PATCH 39/780 powerpc/pseries/iommu: Fix kmemleak in TCE table userspace view

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Gaurav Batra <[email protected]>

[ Upstream commit d36e3f11fe8b55b801bdbe84ad51f612b1bd84da ]

When a device is opened by a userspace driver, via VFIO interface, DMA window is created. This DMA window has TCE Table and a corresponding data for userview of TCE table.

When the userspace driver closes the device, all the above infrastructure is free'ed and the device control given back to kernel. Both DMA window and TCE table is getting free'ed. But due to a code bug, userview of the TCE table is not getting free'ed. This is resulting in a memory leak.

Befow is the information from KMEMLEAK

unreferenced object 0xc008000022af0000 (size 16777216):
comm "senlib_unit_tes", pid 9346, jiffies 4294983174 hex dump (first 32 bytes):

    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
  backtrace (crc 0):
    kmemleak_vmalloc+0xc8/0x1a0
    __vmalloc_node_range+0x284/0x340
    vzalloc+0x58/0x70
    spapr_tce_create_table+0x4b0/0x8d0
    tce_iommu_create_table+0xcc/0x170 [vfio_iommu_spapr_tce]
    tce_iommu_create_window+0x144/0x2f0 [vfio_iommu_spapr_tce]
    tce_iommu_ioctl.part.0+0x59c/0xc90 [vfio_iommu_spapr_tce]
    vfio_fops_unl_ioctl+0x88/0x280 [vfio]
    sys_ioctl+0xf4/0x160
    system_call_exception+0x164/0x310
    system_call_vectored_common+0xe8/0x278
unreferenced object 0xc008000023b00000 (size 4194304):
  comm "senlib_unit_tes", pid 9351, jiffies 4294984116
  hex dump (first 32 bytes):
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
  backtrace (crc 0):
    kmemleak_vmalloc+0xc8/0x1a0
    __vmalloc_node_range+0x284/0x340
    vzalloc+0x58/0x70
    spapr_tce_create_table+0x4b0/0x8d0
    tce_iommu_create_table+0xcc/0x170 [vfio_iommu_spapr_tce]
    tce_iommu_create_window+0x144/0x2f0 [vfio_iommu_spapr_tce]
    tce_iommu_create_default_window+0x88/0x120 [vfio_iommu_spapr_tce]
    tce_iommu_ioctl.part.0+0x57c/0xc90 [vfio_iommu_spapr_tce]
    vfio_fops_unl_ioctl+0x88/0x280 [vfio]
    sys_ioctl+0xf4/0x160
    system_call_exception+0x164/0x310
    system_call_vectored_common+0xe8/0x278
Fixes f431a8cde7f1 ("powerpc/iommu: Reimplement the iommu_table_group_ops for pSeries")
---
 arch/powerpc/platforms/pseries/iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/pseries/iommu.c +1 -1
index d6ebc19fb99c5..eec333dd2e598 100644
@@ -197,7 +197,7 @@ static void tce_iommu_userspace_view_free(struct iommu_table *tbl)
 
 static void tce_free_pSeries(struct iommu_table *tbl)
 {
-	if (!tbl->it_userspace)
+	if (tbl->it_userspace)
 		tce_iommu_userspace_view_free(tbl);
 }
 
Signature · 1 line
2.39.5
author maintainer
#40 lore raw

PATCH 40/780 btrfs: scrub: update device stats when an error is detected

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Qu Wenruo <[email protected]>

[ Upstream commit ec1f3a207cdf314eae4d4ae145f1ffdb829f0652 ]

[BUG]
Since the migration to the new scrub_stripe interface, scrub no longer updates the device stats when hitting an error, no matter if it's a read or checksum mismatch error. E.g:

BTRFS info (device dm-2): scrub: started on devid 1
BTRFS error (device dm-2): unable to fixup (regular) error at logical 13631488 on dev /dev/mapper/test-scratch1 physical 13631488
BTRFS warning (device dm-2): checksum error at logical 13631488 on dev /dev/mapper/test-scratch1, physical 13631488, root 5, inode 257, offset 0, length 4096, links 1 (path: file) BTRFS error (device dm-2): unable to fixup (regular) error at logical 13631488 on dev /dev/mapper/test-scratch1 physical 13631488
BTRFS warning (device dm-2): checksum error at logical 13631488 on dev /dev/mapper/test-scratch1, physical 13631488, root 5, inode 257, offset 0, length 4096, links 1 (path: file) BTRFS info (device dm-2): scrub: finished on devid 1 with status: 0

Note there is no line showing the device stats error update.

[CAUSE]
In the migration to the new scrub_stripe interface, we no longer call btrfs_dev_stat_inc_and_print().

[FIX]
- Introduce a new bitmap for metadata generation errors
* A new bitmap
@meta_gen_error_bitmap is introduced to record which blocks have metadata generation mismatch errors.

* A new counter for that bitmap
@init_nr_meta_gen_errors, is also introduced to store the number of generation mismatch errors that are found during the initial read.

This is for the error reporting at scrub_stripe_report_errors().

* New dedicated error message for unrepaired generation mismatches

* Update @meta_gen_error_bitmap if a transid mismatch is hit

- Add btrfs_dev_stat_inc_and_print() calls to the following call sites
* scrub_stripe_report_errors()
* scrub_write_endio()
This is only for the write errors.

This means there is a minor behavior change:

- The timing of device stats error message
Since we concentrate the error messages at scrub_stripe_report_errors(), the device stats error messages will all show up in one go, after the detailed scrub error messages:

BTRFS error (device dm-2): unable to fixup (regular) error at logical 13631488 on dev /dev/mapper/test-scratch1 physical 13631488
BTRFS warning (device dm-2): checksum error at logical 13631488 on dev /dev/mapper/test-scratch1, physical 13631488, root 5, inode 257, offset 0, length 4096, links 1 (path: file) BTRFS error (device dm-2): unable to fixup (regular) error at logical 13631488 on dev /dev/mapper/test-scratch1 physical 13631488
BTRFS warning (device dm-2): checksum error at logical 13631488 on dev /dev/mapper/test-scratch1, physical 13631488, root 5, inode 257, offset 0, length 4096, links 1 (path: file) BTRFS error (device dm-2): bdev /dev/mapper/test-scratch1 errs: wr 0, rd 0, flush 0, corrupt 1, gen 0
BTRFS error (device dm-2): bdev /dev/mapper/test-scratch1 errs: wr 0, rd 0, flush 0, corrupt 2, gen 0

Fixes e02ee89baa66 ("btrfs: scrub: switch scrub_simple_mirror() to scrub_stripe infrastructure")
---
 fs/btrfs/scrub.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)
fs/btrfs/scrub.c +29 -3
index c3b2e29e3e019..61812298325a2 100644
@@ -153,12 +153,14 @@ struct scrub_stripe {
 	unsigned int init_nr_io_errors;
 	unsigned int init_nr_csum_errors;
 	unsigned int init_nr_meta_errors;
+	unsigned int init_nr_meta_gen_errors;
 
 	/*
 	 * The following error bitmaps are all for the current status.
 	 * Every time we submit a new read, these bitmaps may be updated.
 	 *
-	 * error_bitmap = io_error_bitmap | csum_error_bitmap | meta_error_bitmap;
+	 * error_bitmap = io_error_bitmap | csum_error_bitmap |
+	 *		  meta_error_bitmap | meta_generation_bitmap;
 	 *
 	 * IO and csum errors can happen for both metadata and data.
 	 */
@@ -166,6 +168,7 @@ struct scrub_stripe {
 	unsigned long io_error_bitmap;
 	unsigned long csum_error_bitmap;
 	unsigned long meta_error_bitmap;
+	unsigned long meta_gen_error_bitmap;
 
 	/* For writeback (repair or replace) error reporting. */
 	unsigned long write_error_bitmap;
@@ -672,7 +675,7 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr
 	}
 	if (stripe->sectors[sector_nr].generation !=
 	    btrfs_stack_header_generation(header)) {
-		bitmap_set(&stripe->meta_error_bitmap, sector_nr, sectors_per_tree);
+		bitmap_set(&stripe->meta_gen_error_bitmap, sector_nr, sectors_per_tree);
 		bitmap_set(&stripe->error_bitmap, sector_nr, sectors_per_tree);
 		btrfs_warn_rl(fs_info,
 		"tree block %llu mirror %u has bad generation, has %llu want %llu",
@@ -684,6 +687,7 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr
 	bitmap_clear(&stripe->error_bitmap, sector_nr, sectors_per_tree);
 	bitmap_clear(&stripe->csum_error_bitmap, sector_nr, sectors_per_tree);
 	bitmap_clear(&stripe->meta_error_bitmap, sector_nr, sectors_per_tree);
+	bitmap_clear(&stripe->meta_gen_error_bitmap, sector_nr, sectors_per_tree);
 }
 
 static void scrub_verify_one_sector(struct scrub_stripe *stripe, int sector_nr)
@@ -972,8 +976,22 @@ static void scrub_stripe_report_errors(struct scrub_ctx *sctx,
 			if (__ratelimit(&rs) && dev)
 				scrub_print_common_warning("header error", dev, false,
 						     stripe->logical, physical);
+		if (test_bit(sector_nr, &stripe->meta_gen_error_bitmap))
+			if (__ratelimit(&rs) && dev)
+				scrub_print_common_warning("generation error", dev, false,
+						     stripe->logical, physical);
 	}
 
+	/* Update the device stats. */
+	for (int i = 0; i < stripe->init_nr_io_errors; i++)
+		btrfs_dev_stat_inc_and_print(stripe->dev, BTRFS_DEV_STAT_READ_ERRS);
+	for (int i = 0; i < stripe->init_nr_csum_errors; i++)
+		btrfs_dev_stat_inc_and_print(stripe->dev, BTRFS_DEV_STAT_CORRUPTION_ERRS);
+	/* Generation mismatch error is based on each metadata, not each block. */
+	for (int i = 0; i < stripe->init_nr_meta_gen_errors;
+	     i += (fs_info->nodesize >> fs_info->sectorsize_bits))
+		btrfs_dev_stat_inc_and_print(stripe->dev, BTRFS_DEV_STAT_GENERATION_ERRS);
+
 	spin_lock(&sctx->stat_lock);
 	sctx->stat.data_extents_scrubbed += stripe->nr_data_extents;
 	sctx->stat.tree_extents_scrubbed += stripe->nr_meta_extents;
@@ -982,7 +1000,8 @@ static void scrub_stripe_report_errors(struct scrub_ctx *sctx,
 	sctx->stat.no_csum += nr_nodatacsum_sectors;
 	sctx->stat.read_errors += stripe->init_nr_io_errors;
 	sctx->stat.csum_errors += stripe->init_nr_csum_errors;
-	sctx->stat.verify_errors += stripe->init_nr_meta_errors;
+	sctx->stat.verify_errors += stripe->init_nr_meta_errors +
+				    stripe->init_nr_meta_gen_errors;
 	sctx->stat.uncorrectable_errors +=
 		bitmap_weight(&stripe->error_bitmap, stripe->nr_sectors);
 	sctx->stat.corrected_errors += nr_repaired_sectors;
@@ -1028,6 +1047,8 @@ static void scrub_stripe_read_repair_worker(struct work_struct *work)
 						    stripe->nr_sectors);
 	stripe->init_nr_meta_errors = bitmap_weight(&stripe->meta_error_bitmap,
 						    stripe->nr_sectors);
+	stripe->init_nr_meta_gen_errors = bitmap_weight(&stripe->meta_gen_error_bitmap,
+							stripe->nr_sectors);
 
 	if (bitmap_empty(&stripe->init_error_bitmap, stripe->nr_sectors))
 		goto out;
@@ -1142,6 +1163,9 @@ static void scrub_write_endio(struct btrfs_bio *bbio)
 		bitmap_set(&stripe->write_error_bitmap, sector_nr,
 			   bio_size >> fs_info->sectorsize_bits);
 		spin_unlock_irqrestore(&stripe->write_error_lock, flags);
+		for (int i = 0; i < (bio_size >> fs_info->sectorsize_bits); i++)
+			btrfs_dev_stat_inc_and_print(stripe->dev,
+						     BTRFS_DEV_STAT_WRITE_ERRS);
 	}
 	bio_put(&bbio->bio);
 
@@ -1508,10 +1532,12 @@ static void scrub_stripe_reset_bitmaps(struct scrub_stripe *stripe)
 	stripe->init_nr_io_errors = 0;
 	stripe->init_nr_csum_errors = 0;
 	stripe->init_nr_meta_errors = 0;
+	stripe->init_nr_meta_gen_errors = 0;
 	stripe->error_bitmap = 0;
 	stripe->io_error_bitmap = 0;
 	stripe->csum_error_bitmap = 0;
 	stripe->meta_error_bitmap = 0;
+	stripe->meta_gen_error_bitmap = 0;
 }
 
 /*
Signature · 1 line
2.39.5
author maintainer
#41 lore raw

PATCH 41/780 btrfs: scrub: fix a wrong error type when metadata bytenr mismatches

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Qu Wenruo <[email protected]>

[ Upstream commit f2c19541e421b3235efc515dad88b581f00592ae ]

When the bytenr doesn't match for a metadata tree block, we will report it as an csum error, which is incorrect and should be reported as a metadata error instead.

Fixes a3ddbaebc7c9 ("btrfs: scrub: introduce a helper to verify one metadata block")
---
 fs/btrfs/scrub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/scrub.c +1 -1
index 61812298325a2..4c525a0408125 100644
@@ -619,7 +619,7 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr
 	memcpy(on_disk_csum, header->csum, fs_info->csum_size);
 
 	if (logical != btrfs_stack_header_bytenr(header)) {
-		bitmap_set(&stripe->csum_error_bitmap, sector_nr, sectors_per_tree);
+		bitmap_set(&stripe->meta_error_bitmap, sector_nr, sectors_per_tree);
 		bitmap_set(&stripe->error_bitmap, sector_nr, sectors_per_tree);
 		btrfs_warn_rl(fs_info,
 		"tree block %llu mirror %u has bad bytenr, has %llu want %llu",
Signature · 1 line
2.39.5
author maintainer
#42 lore raw

PATCH 42/780 btrfs: fix invalid data space release when truncating block in NOCOW mode

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Filipe Manana <[email protected]>

[ Upstream commit d3914d6030aa6be2993dfc223d096ff93018c236 ]

If when truncating a block we fail to reserve data space and then we proceed anyway because we can do a NOCOW write, if we later get an error when trying to get the folio from the inode's mapping, we end up releasing data space that we haven't reserved, screwing up the bytes_may_use counter from the data space_info, eventually resulting in an underflow when all other reservations done by other tasks are released, if any, or right away if there are no other reservations at the moment.

This is because when we get an error when trying to grab the block's folio we call btrfs_delalloc_release_space(), which releases metadata (which we have reserved) and data (which we haven't reserved).

Fix this by calling btrfs_delalloc_release_space() only if we did reserve data space, that is, if we aren't falling back to NOCOW, meaning the local variable @only_release_metadata has a false value, otherwise release only metadata by calling btrfs_delalloc_release_metadata().

Fixes 6d4572a9d71d ("btrfs: allow btrfs_truncate_block() to fallback to nocow for data space reservation")
---
 fs/btrfs/inode.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +5 -2
index 90f5da3c520ac..8a3f44302788c 100644
@@ -4849,8 +4849,11 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,
 	folio = __filemap_get_folio(mapping, index,
 				    FGP_LOCK | FGP_ACCESSED | FGP_CREAT, mask);
 	if (IS_ERR(folio)) {
-		btrfs_delalloc_release_space(inode, data_reserved, block_start,
-					     blocksize, true);
+		if (only_release_metadata)
+			btrfs_delalloc_release_metadata(inode, blocksize, true);
+		else
+			btrfs_delalloc_release_space(inode, data_reserved,
+						     block_start, blocksize, true);
 		btrfs_delalloc_release_extents(inode, blocksize);
 		ret = -ENOMEM;
 		goto out;
Signature · 1 line
2.39.5
author maintainer
#43 lore raw

PATCH 43/780 btrfs: fix wrong start offset for delalloc space release during mmap write

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Filipe Manana <[email protected]>

[ Upstream commit 17a85f520469a1838379de8ad24f63e778f7c277 ]

If we're doing a mmap write against a folio that has i_size somewhere in the middle and we have multiple sectors in the folio, we may have to release excess space previously reserved, for the range going from the rounded up (to sector size) i_size to the folio's end offset. We are calculating the right amount to release and passing it to btrfs_delalloc_release_space(), but we are passing the wrong start offset of that range - we're passing the folio's start offset instead of the end offset, plus 1, of the range for which we keep the reservation. This may result in releasing more space then we should and eventually trigger an underflow of the data space_info's bytes_may_use counter.

So fix this by passing the start offset as 'end + 1' instead of 'page_start' to btrfs_delalloc_release_space().

Fixes d0b7da88f640 ("Btrfs: btrfs_page_mkwrite: Reserve space in sectorsized units")
---
 fs/btrfs/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/file.c +1 -1
index 71b8a825c4479..22455fbcb29eb 100644
@@ -1862,7 +1862,7 @@ static vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)
 		if (reserved_space < fsize) {
 			end = page_start + reserved_space - 1;
 			btrfs_delalloc_release_space(BTRFS_I(inode),
-					data_reserved, page_start,
+					data_reserved, end + 1,
 					fsize - reserved_space, true);
 		}
 	}
Signature · 1 line
2.39.5
author maintainer
#44 lore raw

PATCH 44/780 rcu/cpu_stall_cputime: fix the hardirq count for x86 architecture

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Yongliang Gao <[email protected]>

[ Upstream commit da6b85598af30e9fec34d82882d7e1e39f3da769 ]

When counting the number of hardirqs in the x86 architecture, it is essential to add arch_irq_stat_cpu to ensure accuracy.

For example, a CPU loop within the rcu_read_lock function.

Before:

[   70.910184] rcu: INFO: rcu_preempt self-detected stall on CPU
[   70.910436] rcu:     3-....: (4999 ticks this GP) idle=***
[   70.910711] rcu:              hardirqs   softirqs   csw/system
[   70.910870] rcu:      number:        0        657            0
[   70.911024] rcu:     cputime:        0          0         2498   ==> 2498(ms)
[   70.911278] rcu:     (t=5001 jiffies g=3677 q=29 ncpus=8)

After:

[   68.046132] rcu: INFO: rcu_preempt self-detected stall on CPU
[   68.046354] rcu:     2-....: (4999 ticks this GP) idle=***
[   68.046628] rcu:              hardirqs   softirqs   csw/system
[   68.046793] rcu:      number:     2498        663            0
[   68.046951] rcu:     cputime:        0          0         2496   ==> 2496(ms)
[   68.047244] rcu:     (t=5000 jiffies g=3825 q=4 ncpus=8)
---
 kernel/rcu/tree.c       | 10 +++++++---
 kernel/rcu/tree.h       |  2 +-
 kernel/rcu/tree_stall.h |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)
kernel/rcu/tree.c +7 -3
index 659f83e710486..80b10893b5038 100644
@@ -801,6 +801,10 @@ static int rcu_watching_snap_save(struct rcu_data *rdp)
 	return 0;
 }
 
+#ifndef arch_irq_stat_cpu
+#define arch_irq_stat_cpu(cpu) 0
+#endif
+
 /*
  * Returns positive if the specified CPU has passed through a quiescent state
  * by virtue of being in or having passed through an dynticks idle state since
@@ -936,9 +940,9 @@ static int rcu_watching_snap_recheck(struct rcu_data *rdp)
 			rsrp->cputime_irq     = kcpustat_field(kcsp, CPUTIME_IRQ, cpu);
 			rsrp->cputime_softirq = kcpustat_field(kcsp, CPUTIME_SOFTIRQ, cpu);
 			rsrp->cputime_system  = kcpustat_field(kcsp, CPUTIME_SYSTEM, cpu);
-			rsrp->nr_hardirqs = kstat_cpu_irqs_sum(rdp->cpu);
-			rsrp->nr_softirqs = kstat_cpu_softirqs_sum(rdp->cpu);
-			rsrp->nr_csw = nr_context_switches_cpu(rdp->cpu);
+			rsrp->nr_hardirqs = kstat_cpu_irqs_sum(cpu) + arch_irq_stat_cpu(cpu);
+			rsrp->nr_softirqs = kstat_cpu_softirqs_sum(cpu);
+			rsrp->nr_csw = nr_context_switches_cpu(cpu);
 			rsrp->jiffies = jiffies;
 			rsrp->gp_seq = rdp->gp_seq;
 		}
kernel/rcu/tree.h +1 -1
index a9a811d9d7a37..1bba2225e7448 100644
@@ -168,7 +168,7 @@ struct rcu_snap_record {
 	u64		cputime_irq;	/* Accumulated cputime of hard irqs */
 	u64		cputime_softirq;/* Accumulated cputime of soft irqs */
 	u64		cputime_system; /* Accumulated cputime of kernel tasks */
-	unsigned long	nr_hardirqs;	/* Accumulated number of hard irqs */
+	u64		nr_hardirqs;	/* Accumulated number of hard irqs */
 	unsigned int	nr_softirqs;	/* Accumulated number of soft irqs */
 	unsigned long long nr_csw;	/* Accumulated number of task switches */
 	unsigned long   jiffies;	/* Track jiffies value */
kernel/rcu/tree_stall.h +2 -2
index 925fcdad5dea2..56b21219442b6 100644
@@ -435,8 +435,8 @@ static void print_cpu_stat_info(int cpu)
 	rsr.cputime_system  = kcpustat_field(kcsp, CPUTIME_SYSTEM, cpu);
 
 	pr_err("\t         hardirqs   softirqs   csw/system\n");
-	pr_err("\t number: %8ld %10d %12lld\n",
-		kstat_cpu_irqs_sum(cpu) - rsrp->nr_hardirqs,
+	pr_err("\t number: %8lld %10d %12lld\n",
+		kstat_cpu_irqs_sum(cpu) + arch_irq_stat_cpu(cpu) - rsrp->nr_hardirqs,
 		kstat_cpu_softirqs_sum(cpu) - rsrp->nr_softirqs,
 		nr_context_switches_cpu(cpu) - rsrp->nr_csw);
 	pr_err("\tcputime: %8lld %10lld %12lld   ==> %d(ms)\n",
Signature · 1 line
2.39.5
author maintainer
#45 lore raw

PATCH 45/780 crypto: lrw - Only add ecb if it is not already there

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Herbert Xu <[email protected]>

[ Upstream commit 3d73909bddc2ebb3224a8bc2e5ce00e9df70c15d ]

Only add ecb to the cipher name if it isn't already ecb.

Also use memcmp instead of strncmp since these strings are all stored in an array of length CRYPTO_MAX_ALG_NAME.

---
 crypto/lrw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
crypto/lrw.c +2 -2
index 391ae0f7641ff..15f579a768614 100644
@@ -322,7 +322,7 @@ static int lrw_create(struct crypto_template *tmpl, struct rtattr **tb)
 
 	err = crypto_grab_skcipher(spawn, skcipher_crypto_instance(inst),
 				   cipher_name, 0, mask);
-	if (err == -ENOENT) {
+	if (err == -ENOENT && memcmp(cipher_name, "ecb(", 4)) {
 		err = -ENAMETOOLONG;
 		if (snprintf(ecb_name, CRYPTO_MAX_ALG_NAME, "ecb(%s)",
 			     cipher_name) >= CRYPTO_MAX_ALG_NAME)
@@ -356,7 +356,7 @@ static int lrw_create(struct crypto_template *tmpl, struct rtattr **tb)
 	/* Alas we screwed up the naming so we have to mangle the
 	 * cipher name.
 	 */
-	if (!strncmp(cipher_name, "ecb(", 4)) {
+	if (!memcmp(cipher_name, "ecb(", 4)) {
 		int len;
 
 		len = strscpy(ecb_name, cipher_name + 4, sizeof(ecb_name));
Signature · 1 line
2.39.5
author maintainer
#46 lore raw

PATCH 46/780 crypto: xts - Only add ecb if it is not already there

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Herbert Xu <[email protected]>

[ Upstream commit 270b6f13454cb7f2f7058c50df64df409c5dcf55 ]

Only add ecb to the cipher name if it isn't already ecb.

Also use memcmp instead of strncmp since these strings are all stored in an array of length CRYPTO_MAX_ALG_NAME.

Fixes f1c131b45410 ("crypto: xts - Convert to skcipher")
---
 crypto/xts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
crypto/xts.c +2 -2
index 31529c9ef08f8..46b7c70ea54bb 100644
@@ -363,7 +363,7 @@ static int xts_create(struct crypto_template *tmpl, struct rtattr **tb)
 
 	err = crypto_grab_skcipher(&ctx->spawn, skcipher_crypto_instance(inst),
 				   cipher_name, 0, mask);
-	if (err == -ENOENT) {
+	if (err == -ENOENT && memcmp(cipher_name, "ecb(", 4)) {
 		err = -ENAMETOOLONG;
 		if (snprintf(name, CRYPTO_MAX_ALG_NAME, "ecb(%s)",
 			     cipher_name) >= CRYPTO_MAX_ALG_NAME)
@@ -397,7 +397,7 @@ static int xts_create(struct crypto_template *tmpl, struct rtattr **tb)
 	/* Alas we screwed up the naming so we have to mangle the
 	 * cipher name.
 	 */
-	if (!strncmp(cipher_name, "ecb(", 4)) {
+	if (!memcmp(cipher_name, "ecb(", 4)) {
 		int len;
 
 		len = strscpy(name, cipher_name + 4, sizeof(name));
Signature · 1 line
2.39.5
author maintainer
#47 lore raw

PATCH 47/780 crypto: sun8i-ce - move fallback ahash_request to the end of the struct

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ovidiu Panait <[email protected]>

[ Upstream commit c822831b426307a6ca426621504d3c7f99765a39 ]

'struct ahash_request' has a flexible array at the end, so it must be the last member in a struct, to avoid overwriting other struct members.

Therefore, move 'fallback_req' to the end of the 'sun8i_ce_hash_reqctx' struct.

Fixes 56f6d5aee88d ("crypto: sun8i-ce - support hash algorithms")
---
 drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +1 -1
index 3b5c2af013d0d..83df4d7190531 100644
@@ -308,8 +308,8 @@ struct sun8i_ce_hash_tfm_ctx {
  * @flow:	the flow to use for this request
  */
 struct sun8i_ce_hash_reqctx {
-	struct ahash_request fallback_req;
 	int flow;
+	struct ahash_request fallback_req; // keep at the end
 };
 
 /*
Signature · 1 line
2.39.5
author maintainer
#48 lore raw

PATCH 48/780 sched/fair: Fixup wake_up_sync() vs DELAYED_DEQUEUE

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Xuewen Yan <[email protected]>

[ Upstream commit aa3ee4f0b7541382c9f6f43f7408d73a5d4f4042 ]

Delayed dequeued feature keeps a sleeping task enqueued until its lag has elapsed. As a result, it stays also visible in rq->nr_running. So when in wake_affine_idle(), we should use the real running-tasks in rq to check whether we should place the wake-up task to current cpu.
On the other hand, add a helper function to return the nr-delayed.

---
 kernel/sched/fair.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
kernel/sched/fair.c +11 -2
index 0fb9bf995a479..0c04ed4148525 100644
@@ -7196,6 +7196,11 @@ static bool dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
 	return true;
 }
 
+static inline unsigned int cfs_h_nr_delayed(struct rq *rq)
+{
+	return (rq->cfs.h_nr_queued - rq->cfs.h_nr_runnable);
+}
+
 #ifdef CONFIG_SMP
 
 /* Working cpumask for: sched_balance_rq(), sched_balance_newidle(). */
@@ -7357,8 +7362,12 @@ wake_affine_idle(int this_cpu, int prev_cpu, int sync)
 	if (available_idle_cpu(this_cpu) && cpus_share_cache(this_cpu, prev_cpu))
 		return available_idle_cpu(prev_cpu) ? prev_cpu : this_cpu;
 
-	if (sync && cpu_rq(this_cpu)->nr_running == 1)
-		return this_cpu;
+	if (sync) {
+		struct rq *rq = cpu_rq(this_cpu);
+
+		if ((rq->nr_running - cfs_h_nr_delayed(rq)) == 1)
+			return this_cpu;
+	}
 
 	if (available_idle_cpu(prev_cpu))
 		return prev_cpu;
Signature · 1 line
2.39.5
author maintainer
#49 lore raw

PATCH 49/780 kunit: Fix wrong parameter to kunit_deactivate_static_stub()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Tzung-Bi Shih <[email protected]>

[ Upstream commit 772e50a76ee664e75581624f512df4e45582605a ]

kunit_deactivate_static_stub() accepts real_fn_addr instead of replacement_addr. In the case, it always passes NULL to kunit_deactivate_static_stub().

Fix it.

Fixes e047c5eaa763 ("kunit: Expose 'static stub' API to redirect functions")
---
 lib/kunit/static_stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kunit/static_stub.c +1 -1
index 92b2cccd5e763..484fd85251b41 100644
@@ -96,7 +96,7 @@ void __kunit_activate_static_stub(struct kunit *test,
 
 	/* If the replacement address is NULL, deactivate the stub. */
 	if (!replacement_addr) {
-		kunit_deactivate_static_stub(test, replacement_addr);
+		kunit_deactivate_static_stub(test, real_fn_addr);
 		return;
 	}
 
Signature · 1 line
2.39.5
author maintainer
#50 lore raw

PATCH 50/780 gfs2: Move gfs2_trans_add_databufs

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andreas Gruenbacher <[email protected]>

[ Upstream commit d50a64e3c55e59e45e415c65531b0d76ad4cea36 ]

Move gfs2_trans_add_databufs() to trans.c. Pass in a glock instead of a gfs2_inode.

Stable-dep-of: 5a90f8d49922 ("gfs2: Don't start unnecessary transactions during log flush")

---
 fs/gfs2/aops.c  | 23 +----------------------
 fs/gfs2/aops.h  |  2 --
 fs/gfs2/bmap.c  |  3 ++-
 fs/gfs2/trans.c | 21 +++++++++++++++++++++
 fs/gfs2/trans.h |  2 ++
 5 files changed, 26 insertions(+), 25 deletions(-)
fs/gfs2/aops.c +1 -22
index 68fc8af14700d..ed2c708a215a4 100644
@@ -37,27 +37,6 @@
 #include "aops.h"
 
 
-void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,
-			     size_t from, size_t len)
-{
-	struct buffer_head *head = folio_buffers(folio);
-	unsigned int bsize = head->b_size;
-	struct buffer_head *bh;
-	size_t to = from + len;
-	size_t start, end;
-
-	for (bh = head, start = 0; bh != head || !start;
-	     bh = bh->b_this_page, start = end) {
-		end = start + bsize;
-		if (end <= from)
-			continue;
-		if (start >= to)
-			break;
-		set_buffer_uptodate(bh);
-		gfs2_trans_add_data(ip->i_gl, bh);
-	}
-}
-
 /**
  * gfs2_get_block_noalloc - Fills in a buffer head with details about a block
  * @inode: The inode
@@ -133,7 +112,7 @@ static int __gfs2_jdata_write_folio(struct folio *folio,
 					inode->i_sb->s_blocksize,
 					BIT(BH_Dirty)|BIT(BH_Uptodate));
 		}
-		gfs2_trans_add_databufs(ip, folio, 0, folio_size(folio));
+		gfs2_trans_add_databufs(ip->i_gl, folio, 0, folio_size(folio));
 	}
 	return gfs2_write_jdata_folio(folio, wbc);
 }
fs/gfs2/aops.h +0 -2
index a10c4334d2489..f9fa41aaeaf41 100644
@@ -9,7 +9,5 @@
 #include "incore.h"
 
 void adjust_fs_space(struct inode *inode);
-void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,
-			     size_t from, size_t len);
 
 #endif /* __AOPS_DOT_H__ */
fs/gfs2/bmap.c +2 -1
index 366516b98b3f3..b81984def58ec 100644
@@ -988,7 +988,8 @@ static void gfs2_iomap_put_folio(struct inode *inode, loff_t pos,
 	struct gfs2_sbd *sdp = GFS2_SB(inode);
 
 	if (!gfs2_is_stuffed(ip))
-		gfs2_trans_add_databufs(ip, folio, offset_in_folio(folio, pos),
+		gfs2_trans_add_databufs(ip->i_gl, folio,
+					offset_in_folio(folio, pos),
 					copied);
 
 	folio_unlock(folio);
fs/gfs2/trans.c +21 -0
index f8ae2c666fd60..075f7e9abe47c 100644
@@ -226,6 +226,27 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
 	unlock_buffer(bh);
 }
 
+void gfs2_trans_add_databufs(struct gfs2_glock *gl, struct folio *folio,
+			     size_t from, size_t len)
+{
+	struct buffer_head *head = folio_buffers(folio);
+	unsigned int bsize = head->b_size;
+	struct buffer_head *bh;
+	size_t to = from + len;
+	size_t start, end;
+
+	for (bh = head, start = 0; bh != head || !start;
+	     bh = bh->b_this_page, start = end) {
+		end = start + bsize;
+		if (end <= from)
+			continue;
+		if (start >= to)
+			break;
+		set_buffer_uptodate(bh);
+		gfs2_trans_add_data(gl, bh);
+	}
+}
+
 void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
 {
 
fs/gfs2/trans.h +2 -0
index f8ce5302280d3..790c55f59e612 100644
@@ -42,6 +42,8 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
 
 void gfs2_trans_end(struct gfs2_sbd *sdp);
 void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh);
+void gfs2_trans_add_databufs(struct gfs2_glock *gl, struct folio *folio,
+			     size_t from, size_t len);
 void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh);
 void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd);
 void gfs2_trans_remove_revoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len);
Signature · 1 line
2.39.5
author maintainer
#51 lore raw

PATCH 51/780 gfs2: Dont start unnecessary transactions during log flush

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andreas Gruenbacher <[email protected]>

[ Upstream commit 5a90f8d499225512a385585ffe3e28f687263d47 ]

Commit 8d391972ae2d ("gfs2: Remove __gfs2_writepage()") changed the log flush code in gfs2_ail1_start_one() to call aops->writepages() instead of aops->writepage(). For jdata inodes, this means that we will now try to reserve log space and start a transaction before we can determine that the pages in question have already been journaled. When this happens in the context of gfs2_logd(), it can now appear that not enough log space is available for freeing up log space, and we will lock up.

Fix that by issuing journal writes directly instead of going through aops->writepages() in the log flush code.

Fixes 8d391972ae2d ("gfs2: Remove __gfs2_writepage()")
---
 fs/gfs2/aops.c | 31 +++++++++++++++++++++++++++++++
 fs/gfs2/aops.h |  1 +
 fs/gfs2/log.c  |  7 ++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)
fs/gfs2/aops.c +31 -0
index ed2c708a215a4..eb4270e82ef8e 100644
@@ -117,6 +117,37 @@ static int __gfs2_jdata_write_folio(struct folio *folio,
 	return gfs2_write_jdata_folio(folio, wbc);
 }
 
+/**
+ * gfs2_jdata_writeback - Write jdata folios to the log
+ * @mapping: The mapping to write
+ * @wbc: The writeback control
+ *
+ * Returns: errno
+ */
+int gfs2_jdata_writeback(struct address_space *mapping, struct writeback_control *wbc)
+{
+	struct inode *inode = mapping->host;
+	struct gfs2_inode *ip = GFS2_I(inode);
+	struct gfs2_sbd *sdp = GFS2_SB(mapping->host);
+	struct folio *folio = NULL;
+	int error;
+
+	BUG_ON(current->journal_info);
+	if (gfs2_assert_withdraw(sdp, ip->i_gl->gl_state == LM_ST_EXCLUSIVE))
+		return 0;
+
+	while ((folio = writeback_iter(mapping, wbc, folio, &error))) {
+		if (folio_test_checked(folio)) {
+			folio_redirty_for_writepage(wbc, folio);
+			folio_unlock(folio);
+			continue;
+		}
+		error = __gfs2_jdata_write_folio(folio, wbc);
+	}
+
+	return error;
+}
+
 /**
  * gfs2_writepages - Write a bunch of dirty pages back to disk
  * @mapping: The mapping to write
fs/gfs2/aops.h +1 -0
index f9fa41aaeaf41..bf002522a7822 100644
@@ -9,5 +9,6 @@
 #include "incore.h"
 
 void adjust_fs_space(struct inode *inode);
+int gfs2_jdata_writeback(struct address_space *mapping, struct writeback_control *wbc);
 
 #endif /* __AOPS_DOT_H__ */
fs/gfs2/log.c +6 -1
index f9c5089783d24..115c4ac457e90 100644
@@ -31,6 +31,7 @@
 #include "dir.h"
 #include "trace_gfs2.h"
 #include "trans.h"
+#include "aops.h"
 
 static void gfs2_log_shutdown(struct gfs2_sbd *sdp);
 
@@ -131,7 +132,11 @@ __acquires(&sdp->sd_ail_lock)
 		if (!mapping)
 			continue;
 		spin_unlock(&sdp->sd_ail_lock);
-		ret = mapping->a_ops->writepages(mapping, wbc);
+		BUG_ON(GFS2_SB(mapping->host) != sdp);
+		if (gfs2_is_jdata(GFS2_I(mapping->host)))
+			ret = gfs2_jdata_writeback(mapping, wbc);
+		else
+			ret = mapping->a_ops->writepages(mapping, wbc);
 		if (need_resched()) {
 			blk_finish_plug(plug);
 			cond_resched();
Signature · 1 line
2.39.5
author maintainer
#52 lore raw

PATCH 52/780 crypto: api - Redo lookup on EEXIST

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Herbert Xu <[email protected]>

[ Upstream commit 0a3cf32da469ff1df6e016f5f82b439a63d14461 ]

When two crypto algorithm lookups occur at the same time with different names for the same algorithm, e.g., ctr(aes-generic) and ctr(aes), they will both be instantiated. However, only one of them can be registered. The second instantiation will fail with EEXIST.

Avoid failing the second lookup by making it retry, but only once because there are tricky names such as gcm_base(ctr(aes),ghash) that will always fail, despite triggering instantiation and EEXIST.

Fixes 2825982d9d66 ("[CRYPTO] api: Added event notification")
---
 crypto/api.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
crypto/api.c +11 -2
index 3416e98128a05..8592d3dccc64e 100644
@@ -220,10 +220,19 @@ static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg,
 		if (crypto_is_test_larval(larval))
 			crypto_larval_kill(larval);
 		alg = ERR_PTR(-ETIMEDOUT);
-	} else if (!alg) {
+	} else if (!alg || PTR_ERR(alg) == -EEXIST) {
+		int err = alg ? -EEXIST : -EAGAIN;
+
+		/*
+		 * EEXIST is expected because two probes can be scheduled
+		 * at the same time with one using alg_name and the other
+		 * using driver_name.  Do a re-lookup but do not retry in
+		 * case we hit a quirk like gcm_base(ctr(aes),...) which
+		 * will never match.
+		 */
 		alg = &larval->alg;
 		alg = crypto_alg_lookup(alg->cra_name, type, mask) ?:
-		      ERR_PTR(-EAGAIN);
+		      ERR_PTR(err);
 	} else if (IS_ERR(alg))
 		;
 	else if (crypto_is_test_larval(larval) &&
Signature · 1 line
2.39.5
author maintainer
#53 lore raw

PATCH 53/780 ACPICA: exserial: dont forget to handle FFixedHW opregions for reading

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Daniil Tatianin <[email protected]>

[ Upstream commit 0f8af0356a45547683a216e4921006a3c6a6d922 ]

The initial commit that introduced support for FFixedHW operation regions did add a special case in the AcpiExReadSerialBus If, but forgot to actually handle it inside the switch, so add the missing case to prevent reads from failing with AE_AML_INVALID_SPACE_ID.

---
 drivers/acpi/acpica/exserial.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/acpi/acpica/exserial.c +6 -0
index 5241f4c01c765..89a4ac447a2be 100644
@@ -201,6 +201,12 @@ acpi_ex_read_serial_bus(union acpi_operand_object *obj_desc,
 		function = ACPI_READ;
 		break;
 
+	case ACPI_ADR_SPACE_FIXED_HARDWARE:
+
+		buffer_length = ACPI_FFH_INPUT_BUFFER_SIZE;
+		function = ACPI_READ;
+		break;
+
 	default:
 		return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
 	}
Signature · 1 line
2.39.5
author maintainer
#54 lore raw

PATCH 54/780 tools/nolibc/types.h: fix mismatched parenthesis in minor()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Jemmy Wong <[email protected]>

[ Upstream commit 9c138ac9392228835b520fd4dbb07e636b34a867 ]

Fix an imbalance where opening parentheses exceed closing ones.

Fixes eba6d00d38e7c ("tools/nolibc/types: move makedev to types.h and make it a macro")
---
 tools/include/nolibc/types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/include/nolibc/types.h +1 -1
index b26a5d0c417c7..32d0929c633bb 100644
@@ -201,7 +201,7 @@ struct stat {
 /* WARNING, it only deals with the 4096 first majors and 256 first minors */
 #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))
 #define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))
-#define minor(dev) ((unsigned int)(((dev) & 0xff))
+#define minor(dev) ((unsigned int)((dev) & 0xff))
 
 #ifndef offsetof
 #define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD)
Signature · 1 line
2.39.5
author maintainer
#55 lore raw

PATCH 55/780 ASoC: tas2764: Reinit cache on part reset

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Martin Povišer <[email protected]>

[ Upstream commit 592ab3936b096da5deb64d4c906edbeb989174d6 ]

When the part is reset in component_probe, do not forget to reinit the regcache, otherwise the cache can get out of sync with the part's actual state. This fix is similar to commit 0a0342ede303 ("ASoC: tas2770: Reinit regcache on reset") which concerned the tas2770 driver.

---
 sound/soc/codecs/tas2764.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/codecs/tas2764.c +3 -0
index 08aa7ee342568..49b73b74b2d9d 100644
@@ -546,6 +546,8 @@ static uint8_t sn012776_bop_presets[] = {
 	0x06, 0x3e, 0x37, 0x30, 0xff, 0xe6
 };
 
+static const struct regmap_config tas2764_i2c_regmap;
+
 static int tas2764_codec_probe(struct snd_soc_component *component)
 {
 	struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
@@ -559,6 +561,7 @@ static int tas2764_codec_probe(struct snd_soc_component *component)
 	}
 
 	tas2764_reset(tas2764);
+	regmap_reinit_cache(tas2764->regmap, &tas2764_i2c_regmap);
 
 	if (tas2764->irq) {
 		ret = snd_soc_component_write(tas2764->component, TAS2764_INT_MASK0, 0xff);
Signature · 1 line
2.39.5
author maintainer
#56 lore raw

PATCH 56/780 ASoC: tas2764: Enable main IRQs

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Hector Martin <[email protected]>

[ Upstream commit dd50f0e38563f15819059c923bf142200453e003 ]

IRQ handling was added in commit dae191fb957f ("ASoC: tas2764: Add IRQ handling") however that same commit masks all interrupts coming from the chip. Unmask the "main" interrupts so that we can see and deal with a number of errors including clock, voltage, and current.

---
 sound/soc/codecs/tas2764.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tas2764.c +1 -1
index 49b73b74b2d9d..fbfe4d032df7b 100644
@@ -564,7 +564,7 @@ static int tas2764_codec_probe(struct snd_soc_component *component)
 	regmap_reinit_cache(tas2764->regmap, &tas2764_i2c_regmap);
 
 	if (tas2764->irq) {
-		ret = snd_soc_component_write(tas2764->component, TAS2764_INT_MASK0, 0xff);
+		ret = snd_soc_component_write(tas2764->component, TAS2764_INT_MASK0, 0x00);
 		if (ret < 0)
 			return ret;
 
Signature · 1 line
2.39.5
author maintainer
#57 lore raw

PATCH 57/780 ASoC: mediatek: mt8195: Set ETDM1/2 IN/OUT to COMP_DUMMY()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Julien Massot <[email protected]>

[ Upstream commit 7af317f7faaab09d5a78f24605057d11f5955115 ]

ETDM2_IN_BE and ETDM1_OUT_BE are defined as COMP_EMPTY(), in the case the codec dai_name will be null.

Avoid a crash if the device tree is not assigning a codec to these links.

[    1.179936] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
[    1.181065] Mem abort info:
[    1.181420]   ESR = 0x0000000096000004
[    1.181892]   EC = 0x25: DABT (current EL), IL = 32 bits
[    1.182576]   SET = 0, FnV = 0
[    1.182964]   EA = 0, S1PTW = 0
[    1.183367]   FSC = 0x04: level 0 translation fault
[    1.183983] Data abort info:
[    1.184406]   ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
[    1.185097]   CM = 0, WnR = 0, TnD = 0, TagAccess = 0
[    1.185766]   GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
[    1.186439] [0000000000000000] user address but active_mm is swapper
[    1.187239] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP
[    1.188029] Modules linked in:
[    1.188420] CPU: 7 UID: 0 PID: 70 Comm: kworker/u32:1 Not tainted 6.14.0-rc4-next-20250226+ #85
[    1.189515] Hardware name: Radxa NIO 12L (DT)
[    1.190065] Workqueue: events_unbound deferred_probe_work_func
[    1.190808] pstate: 40400009 (nZcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[    1.191683] pc : __pi_strcmp+0x24/0x140
[    1.192170] lr : mt8195_mt6359_soc_card_probe+0x224/0x7b0
[    1.192854] sp : ffff800083473970
[    1.193271] x29: ffff800083473a10 x28: 0000000000001008 x27: 0000000000000002
[    1.194168] x26: ffff800082408960 x25: ffff800082417db0 x24: ffff800082417d88
[    1.195065] x23: 000000000000001e x22: ffff800082dbf480 x21: ffff800082dc07b8
[    1.195961] x20: 0000000000000000 x19: 0000000000000013 x18: 00000000ffffffff
[    1.196858] x17: 000000040044ffff x16: 005000f2b5503510 x15: 0000000000000006
[    1.197755] x14: ffff800082407af0 x13: 6e6f69737265766e x12: 692d6b636f6c6374
[    1.198651] x11: 0000000000000002 x10: ffff80008240b920 x9 : 0000000000000018
[    1.199547] x8 : 0101010101010101 x7 : 0000000000000000 x6 : 0000000000000000
[    1.200443] x5 : 0000000000000000 x4 : 8080808080000000 x3 : 303933383978616d
[    1.201339] x2 : 0000000000000000 x1 : ffff80008240b920 x0 : 0000000000000000
[    1.202236] Call trace:
[    1.202545]  __pi_strcmp+0x24/0x140 (P)
[    1.203029]  mtk_soundcard_common_probe+0x3bc/0x5b8
[    1.203644]  platform_probe+0x70/0xe8
[    1.204106]  really_probe+0xc8/0x3a0
[    1.204556]  __driver_probe_device+0x84/0x160
[    1.205104]  driver_probe_device+0x44/0x130
[    1.205630]  __device_attach_driver+0xc4/0x170
[    1.206189]  bus_for_each_drv+0x8c/0xf8
[    1.206672]  __device_attach+0xa8/0x1c8
[    1.207155]  device_initial_probe+0x1c/0x30
[    1.207681]  bus_probe_device+0xb0/0xc0
[    1.208165]  deferred_probe_work_func+0xa4/0x100
[    1.208747]  process_one_work+0x158/0x3e0
[    1.209254]  worker_thread+0x2c4/0x3e8
[    1.209727]  kthread+0x134/0x1f0
[    1.210136]  ret_from_fork+0x10/0x20
[    1.210589] Code: 54000401 b50002c6 d503201f f86a6803 (f8408402)
[    1.211355] ---[ end trace 0000000000000000 ]---
Fixes e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link")
---
 sound/soc/mediatek/mt8195/mt8195-mt6359.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/mediatek/mt8195/mt8195-mt6359.c +2 -2
index df29a9fa5aee5..1fa664b56f30f 100644
@@ -822,12 +822,12 @@ SND_SOC_DAILINK_DEFS(ETDM1_IN_BE,
 
 SND_SOC_DAILINK_DEFS(ETDM2_IN_BE,
 		     DAILINK_COMP_ARRAY(COMP_CPU("ETDM2_IN")),
-		     DAILINK_COMP_ARRAY(COMP_EMPTY()),
+		     DAILINK_COMP_ARRAY(COMP_DUMMY()),
 		     DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE,
 		     DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")),
-		     DAILINK_COMP_ARRAY(COMP_EMPTY()),
+		     DAILINK_COMP_ARRAY(COMP_DUMMY()),
 		     DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE,
Signature · 1 line
2.39.5
author maintainer
#58 lore raw

PATCH 58/780 EDAC/skx_common: Fix general protection fault

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Qiuxu Zhuo <[email protected]>

[ Upstream commit 20d2d476b3ae18041be423671a8637ed5ffd6958 ]

After loading i10nm_edac (which automatically loads skx_edac_common), if unload only i10nm_edac, then reload it and perform error injection testing, a general protection fault may occur:

mce: [Hardware Error]: Machine check events logged

  Oops: general protection fault ...
  ...
  Workqueue: events mce_gen_pool_process
  RIP: 0010:string+0x53/0xe0
  ...
  Call Trace:
  <TASK>
  ? die_addr+0x37/0x90
  ? exc_general_protection+0x1e7/0x3f0
  ? asm_exc_general_protection+0x26/0x30
  ? string+0x53/0xe0
  vsnprintf+0x23e/0x4c0
  snprintf+0x4d/0x70
  skx_adxl_decode+0x16a/0x330 [skx_edac_common]
  skx_mce_check_error.part.0+0xf8/0x220 [skx_edac_common]
  skx_mce_check_error+0x17/0x20 [skx_edac_common]
  ...

The issue arose was because the variable 'adxl_component_count' (inside skx_edac_common), which counts the ADXL components, was not reset. During the reloading of i10nm_edac, the count was incremented by the actual number of ADXL components again, resulting in a count that was double the real number of ADXL components. This led to an out-of-bounds reference to the ADXL component array, causing the general protection fault above.

Fix this issue by resetting the 'adxl_component_count' in adxl_put(), which is called during the unloading of {skx,i10nm}_edac.

Fixes 123b15863550 ("EDAC, i10nm: make skx_common.o a separate module")
---
 drivers/edac/skx_common.c | 1 +
 1 file changed, 1 insertion(+)
drivers/edac/skx_common.c +1 -0
index fa5b442b18449..c9ade45c1a99f 100644
@@ -116,6 +116,7 @@ EXPORT_SYMBOL_GPL(skx_adxl_get);
 
 void skx_adxl_put(void)
 {
+	adxl_component_count = 0;
 	kfree(adxl_values);
 	kfree(adxl_msg);
 }
Signature · 1 line
2.39.5
author maintainer
#59 lore raw

PATCH 59/780 EDAC/{skx_common,i10nm}: Fix the loss of saved RRL for HBM pseudo channel 0

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Qiuxu Zhuo <[email protected]>

[ Upstream commit eeed3e03f4261e5e381a72ae099ff00ccafbb437 ]

When enabling the retry_rd_err_log (RRL) feature during the loading of the i10nm_edac driver with the module parameter retry_rd_err_log=2 (Linux RRL control mode), the default values of the control bits of RRL are saved so that they can be restored during the unloading of the driver.

In the current code, the RRL of pseudo channel 1 of HBM overwrites pseudo channel 0 during the loading of the driver, resulting in the loss of saved RRL for pseudo channel 0. This causes the RRL of pseudo channel 0 of HBM to be wrongly restored with the values from pseudo channel 1 when unloading the driver.

Fix this issue by creating two separate groups of RRL control registers per channel to save default RRL settings of two {sub-,pseudo-}channels.

Fixes acd4cf68fefe ("EDAC/i10nm: Retrieve and print retry_rd_err_log registers for HBM")
---
 drivers/edac/i10nm_base.c | 35 +++++++++++++++++++----------------
 drivers/edac/skx_common.h | 11 ++++++++---
 2 files changed, 27 insertions(+), 19 deletions(-)
drivers/edac/i10nm_base.c +19 -16
index 355a977019e94..355b527d839e7 100644
@@ -95,7 +95,7 @@ static u32 offsets_demand2_spr[] = {0x22c70, 0x22d80, 0x22f18, 0x22d58, 0x22c64,
 static u32 offsets_demand_spr_hbm0[] = {0x2a54, 0x2a60, 0x2b10, 0x2a58, 0x2a5c, 0x0ee0};
 static u32 offsets_demand_spr_hbm1[] = {0x2e54, 0x2e60, 0x2f10, 0x2e58, 0x2e5c, 0x0fb0};
 
-static void __enable_retry_rd_err_log(struct skx_imc *imc, int chan, bool enable,
+static void __enable_retry_rd_err_log(struct skx_imc *imc, int chan, bool enable, u32 *rrl_ctl,
 				      u32 *offsets_scrub, u32 *offsets_demand,
 				      u32 *offsets_demand2)
 {
@@ -108,10 +108,10 @@ static void __enable_retry_rd_err_log(struct skx_imc *imc, int chan, bool enable
 
 	if (enable) {
 		/* Save default configurations */
-		imc->chan[chan].retry_rd_err_log_s = s;
-		imc->chan[chan].retry_rd_err_log_d = d;
+		rrl_ctl[0] = s;
+		rrl_ctl[1] = d;
 		if (offsets_demand2)
-			imc->chan[chan].retry_rd_err_log_d2 = d2;
+			rrl_ctl[2] = d2;
 
 		s &= ~RETRY_RD_ERR_LOG_NOOVER_UC;
 		s |=  RETRY_RD_ERR_LOG_EN;
@@ -125,25 +125,25 @@ static void __enable_retry_rd_err_log(struct skx_imc *imc, int chan, bool enable
 		}
 	} else {
 		/* Restore default configurations */
-		if (imc->chan[chan].retry_rd_err_log_s & RETRY_RD_ERR_LOG_UC)
+		if (rrl_ctl[0] & RETRY_RD_ERR_LOG_UC)
 			s |=  RETRY_RD_ERR_LOG_UC;
-		if (imc->chan[chan].retry_rd_err_log_s & RETRY_RD_ERR_LOG_NOOVER)
+		if (rrl_ctl[0] & RETRY_RD_ERR_LOG_NOOVER)
 			s |=  RETRY_RD_ERR_LOG_NOOVER;
-		if (!(imc->chan[chan].retry_rd_err_log_s & RETRY_RD_ERR_LOG_EN))
+		if (!(rrl_ctl[0] & RETRY_RD_ERR_LOG_EN))
 			s &= ~RETRY_RD_ERR_LOG_EN;
-		if (imc->chan[chan].retry_rd_err_log_d & RETRY_RD_ERR_LOG_UC)
+		if (rrl_ctl[1] & RETRY_RD_ERR_LOG_UC)
 			d |=  RETRY_RD_ERR_LOG_UC;
-		if (imc->chan[chan].retry_rd_err_log_d & RETRY_RD_ERR_LOG_NOOVER)
+		if (rrl_ctl[1] & RETRY_RD_ERR_LOG_NOOVER)
 			d |=  RETRY_RD_ERR_LOG_NOOVER;
-		if (!(imc->chan[chan].retry_rd_err_log_d & RETRY_RD_ERR_LOG_EN))
+		if (!(rrl_ctl[1] & RETRY_RD_ERR_LOG_EN))
 			d &= ~RETRY_RD_ERR_LOG_EN;
 
 		if (offsets_demand2) {
-			if (imc->chan[chan].retry_rd_err_log_d2 & RETRY_RD_ERR_LOG_UC)
+			if (rrl_ctl[2] & RETRY_RD_ERR_LOG_UC)
 				d2 |=  RETRY_RD_ERR_LOG_UC;
-			if (!(imc->chan[chan].retry_rd_err_log_d2 & RETRY_RD_ERR_LOG_NOOVER))
+			if (!(rrl_ctl[2] & RETRY_RD_ERR_LOG_NOOVER))
 				d2 &=  ~RETRY_RD_ERR_LOG_NOOVER;
-			if (!(imc->chan[chan].retry_rd_err_log_d2 & RETRY_RD_ERR_LOG_EN))
+			if (!(rrl_ctl[2] & RETRY_RD_ERR_LOG_EN))
 				d2 &= ~RETRY_RD_ERR_LOG_EN;
 		}
 	}
@@ -157,6 +157,7 @@ static void __enable_retry_rd_err_log(struct skx_imc *imc, int chan, bool enable
 static void enable_retry_rd_err_log(bool enable)
 {
 	int i, j, imc_num, chan_num;
+	struct skx_channel *chan;
 	struct skx_imc *imc;
 	struct skx_dev *d;
 
@@ -171,8 +172,9 @@ static void enable_retry_rd_err_log(bool enable)
 			if (!imc->mbase)
 				continue;
 
+			chan = d->imc[i].chan;
 			for (j = 0; j < chan_num; j++)
-				__enable_retry_rd_err_log(imc, j, enable,
+				__enable_retry_rd_err_log(imc, j, enable, chan[j].rrl_ctl[0],
 							  res_cfg->offsets_scrub,
 							  res_cfg->offsets_demand,
 							  res_cfg->offsets_demand2);
@@ -186,12 +188,13 @@ static void enable_retry_rd_err_log(bool enable)
 			if (!imc->mbase || !imc->hbm_mc)
 				continue;
 
+			chan = d->imc[i].chan;
 			for (j = 0; j < chan_num; j++) {
-				__enable_retry_rd_err_log(imc, j, enable,
+				__enable_retry_rd_err_log(imc, j, enable, chan[j].rrl_ctl[0],
 							  res_cfg->offsets_scrub_hbm0,
 							  res_cfg->offsets_demand_hbm0,
 							  NULL);
-				__enable_retry_rd_err_log(imc, j, enable,
+				__enable_retry_rd_err_log(imc, j, enable, chan[j].rrl_ctl[1],
 							  res_cfg->offsets_scrub_hbm1,
 							  res_cfg->offsets_demand_hbm1,
 							  NULL);
drivers/edac/skx_common.h +8 -3
index ca5408803f878..5afd425f3b4ff 100644
@@ -79,6 +79,9 @@
  */
 #define MCACOD_EXT_MEM_ERR	0x280
 
+/* Max RRL register sets per {,sub-,pseudo-}channel. */
+#define NUM_RRL_SET		3
+
 /*
  * Each cpu socket contains some pci devices that provide global
  * information, and also some that are local to each of the two
@@ -117,9 +120,11 @@ struct skx_dev {
 		struct skx_channel {
 			struct pci_dev	*cdev;
 			struct pci_dev	*edev;
-			u32 retry_rd_err_log_s;
-			u32 retry_rd_err_log_d;
-			u32 retry_rd_err_log_d2;
+			/*
+			 * Two groups of RRL control registers per channel to save default RRL
+			 * settings of two {sub-,pseudo-}channels in Linux RRL control mode.
+			 */
+			u32 rrl_ctl[2][NUM_RRL_SET];
 			struct skx_dimm {
 				u8 close_pg;
 				u8 bank_xor_enable;
Signature · 1 line
2.39.5
author maintainer
#60 lore raw

PATCH 60/780 tools/nolibc: properly align dirent buffer

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Thomas Weißschuh <[email protected]>

[ Upstream commit 0e75768ba24d669dbf76530e21fd51cfe2fbd2a9 ]

As byte buffer is overlaid with a 'struct dirent64'. it has to satisfy the structs alignment requirements.

Fixes 665fa8dea90d ("tools/nolibc: add support for directory access")
---
 tools/include/nolibc/dirent.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/include/nolibc/dirent.h +2 -1
index c5c30d0dd6806..946a697e98e4c 100644
@@ -7,6 +7,7 @@
 #ifndef _NOLIBC_DIRENT_H
 #define _NOLIBC_DIRENT_H
 
+#include "compiler.h"
 #include "stdint.h"
 #include "types.h"
 
@@ -58,7 +59,7 @@ int closedir(DIR *dirp)
 static __attribute__((unused))
 int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
 {
-	char buf[sizeof(struct linux_dirent64) + NAME_MAX + 1];
+	char buf[sizeof(struct linux_dirent64) + NAME_MAX + 1] __nolibc_aligned_as(struct linux_dirent64);
 	struct linux_dirent64 *ldir = (void *)buf;
 	intptr_t i = (intptr_t)dirp;
 	int fd, ret;
Signature · 1 line
2.39.5
author maintainer
#61 lore raw

PATCH 61/780 tools/nolibc: fix integer overflow in i{64,}toa_r() and

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Thomas Weißschuh <[email protected]>

[ Upstream commit 4d231a7df1a85c7572b67a4666cb73adb977fbf6 ]

In twos complement the most negative number can not be negated.

Fixes b1c21e7d99cd ("tools/nolibc/stdlib: add i64toa() and u64toa()")
Fixes 66c397c4d2e1 ("tools/nolibc/stdlib: replace the ltoa() function with more efficient ones")
---
 tools/include/nolibc/stdlib.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/include/nolibc/stdlib.h +2 -2
index 86ad378ab1ea2..32b3038002c16 100644
@@ -275,7 +275,7 @@ int itoa_r(long in, char *buffer)
 	int len = 0;
 
 	if (in < 0) {
-		in = -in;
+		in = -(unsigned long)in;
 		*(ptr++) = '-';
 		len++;
 	}
@@ -411,7 +411,7 @@ int i64toa_r(int64_t in, char *buffer)
 	int len = 0;
 
 	if (in < 0) {
-		in = -in;
+		in = -(uint64_t)in;
 		*(ptr++) = '-';
 		len++;
 	}
Signature · 1 line
2.39.5
author maintainer
#62 lore raw

PATCH 62/780 spi: tegra210-quad: Fix X1_X2_X4 encoding and support x4 transfers

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Vishwaroop A <[email protected]>

[ Upstream commit dcb06c638a1174008a985849fa30fc0da7d08904 ]

This patch corrects the QSPI_COMMAND_X1_X2_X4 and QSPI_ADDRESS_X1_X2_X4 macros to properly encode the bus width for x1, x2, and x4 transfers. Although these macros were previously incorrect, they were not being used in the driver, so no functionality was affected.

The patch updates tegra_qspi_cmd_config() and tegra_qspi_addr_config() function calls to use the actual bus width from the transfer, instead of hardcoding it to 0 (which implied x1 mode). This change enables proper support for x1, x2, and x4 data transfers by correctly configuring the interface width for commands and addresses.

These modifications improve the QSPI driver's flexibility and prepare it for future use cases that may require different bus widths for commands and addresses.

Fixes 1b8342cc4a38 ("spi: tegra210-quad: combined sequence mode")
---
 drivers/spi/spi-tegra210-quad.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/spi/spi-tegra210-quad.c +4 -8
index 64e1b2f8a0001..3d9c5fb237825 100644
@@ -134,7 +134,7 @@
 #define QSPI_COMMAND_VALUE_SET(X)		(((x) & 0xFF) << 0)
 
 #define QSPI_CMB_SEQ_CMD_CFG			0x1a0
-#define QSPI_COMMAND_X1_X2_X4(x)		(((x) & 0x3) << 13)
+#define QSPI_COMMAND_X1_X2_X4(x)		((((x) >> 1) & 0x3) << 13)
 #define QSPI_COMMAND_X1_X2_X4_MASK		(0x03 << 13)
 #define QSPI_COMMAND_SDR_DDR			BIT(12)
 #define QSPI_COMMAND_SIZE_SET(x)		(((x) & 0xFF) << 0)
@@ -147,7 +147,7 @@
 #define QSPI_ADDRESS_VALUE_SET(X)		(((x) & 0xFFFF) << 0)
 
 #define QSPI_CMB_SEQ_ADDR_CFG			0x1ac
-#define QSPI_ADDRESS_X1_X2_X4(x)		(((x) & 0x3) << 13)
+#define QSPI_ADDRESS_X1_X2_X4(x)		((((x) >> 1) & 0x3) << 13)
 #define QSPI_ADDRESS_X1_X2_X4_MASK		(0x03 << 13)
 #define QSPI_ADDRESS_SDR_DDR			BIT(12)
 #define QSPI_ADDRESS_SIZE_SET(x)		(((x) & 0xFF) << 0)
@@ -1036,10 +1036,6 @@ static u32 tegra_qspi_addr_config(bool is_ddr, u8 bus_width, u8 len)
 {
 	u32 addr_config = 0;
 
-	/* Extract Address configuration and value */
-	is_ddr = 0; //Only SDR mode supported
-	bus_width = 0; //X1 mode
-
 	if (is_ddr)
 		addr_config |= QSPI_ADDRESS_SDR_DDR;
 	else
@@ -1079,13 +1075,13 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi,
 		switch (transfer_phase) {
 		case CMD_TRANSFER:
 			/* X1 SDR mode */
-			cmd_config = tegra_qspi_cmd_config(false, 0,
+			cmd_config = tegra_qspi_cmd_config(false, xfer->tx_nbits,
 							   xfer->len);
 			cmd_value = *((const u8 *)(xfer->tx_buf));
 			break;
 		case ADDR_TRANSFER:
 			/* X1 SDR mode */
-			addr_config = tegra_qspi_addr_config(false, 0,
+			addr_config = tegra_qspi_addr_config(false, xfer->tx_nbits,
 							     xfer->len);
 			address_value = *((const u32 *)(xfer->tx_buf));
 			break;
Signature · 1 line
2.39.5
author maintainer
#63 lore raw

PATCH 63/780 spi: tegra210-quad: remove redundant error handling code

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Vishwaroop A <[email protected]>

[ Upstream commit 400d9f1a27cc2fceabdb1ed93eaf0b89b6d32ba5 ]

Remove unnecessary error handling code that terminated transfers and executed delay on errors. This code was redundant as error handling is already done at a higher level in the SPI core.

Fixes 1b8342cc4a38 ("spi: tegra210-quad: combined sequence mode")
---
 drivers/spi/spi-tegra210-quad.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/spi/spi-tegra210-quad.c +0 -4
index 3d9c5fb237825..b2872853d6ed8 100644
@@ -1175,10 +1175,6 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi,
 
 exit:
 	msg->status = ret;
-	if (ret < 0) {
-		tegra_qspi_transfer_end(spi);
-		spi_transfer_delay_exec(xfer);
-	}
 
 	return ret;
 }
Signature · 1 line
2.39.5
author maintainer
#64 lore raw

PATCH 64/780 spi: tegra210-quad: modify chip select (CS) deactivation

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Vishwaroop A <[email protected]>

[ Upstream commit d8966b65413390d1b5b706886987caac05fbe024 ]

Modify the chip select (CS) deactivation and inter-transfer delay execution only during the DATA_TRANSFER phase when the cs_change flag is not set. This ensures proper CS handling and timing between transfers while eliminating redundant operations.

Fixes 1b8342cc4a38 ("spi: tegra210-quad: combined sequence mode")
---
 drivers/spi/spi-tegra210-quad.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/spi/spi-tegra210-quad.c +4 -4
index b2872853d6ed8..665c06e1473be 100644
@@ -1159,16 +1159,16 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi,
 				ret = -EIO;
 				goto exit;
 			}
-			if (!xfer->cs_change) {
-				tegra_qspi_transfer_end(spi);
-				spi_transfer_delay_exec(xfer);
-			}
 			break;
 		default:
 			ret = -EINVAL;
 			goto exit;
 		}
 		msg->actual_length += xfer->len;
+		if (!xfer->cs_change && transfer_phase == DATA_TRANSFER) {
+			tegra_qspi_transfer_end(spi);
+			spi_transfer_delay_exec(xfer);
+		}
 		transfer_phase++;
 	}
 	ret = 0;
Signature · 1 line
2.39.5
author maintainer
#65 lore raw

PATCH 65/780 power: reset: at91-reset: Optimize at91_reset()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Alexander Shiyan <[email protected]>

[ Upstream commit 62d48983f215bf1dd48665913318101fa3414dcf ]

This patch adds a small optimization to the low-level at91_reset() function, which includes:
- Removes the extra branch, since the following store operations already have proper condition checks.
- Removes the definition of the clobber register r4, since it is no longer used in the code.

Fixes fcd0532fac2a ("power: reset: at91-reset: make at91sam9g45_restart() generic")
---
 drivers/power/reset/at91-reset.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/power/reset/at91-reset.c +2 -3
index 036b18a1f90f8..511f5a8f8961c 100644
@@ -129,12 +129,11 @@ static int at91_reset(struct notifier_block *this, unsigned long mode,
 		"	str	%4, [%0, %6]\n\t"
 		/* Disable SDRAM1 accesses */
 		"1:	tst	%1, #0\n\t"
-		"	beq	2f\n\t"
 		"	strne	%3, [%1, #" __stringify(AT91_DDRSDRC_RTR) "]\n\t"
 		/* Power down SDRAM1 */
 		"	strne	%4, [%1, %6]\n\t"
 		/* Reset CPU */
-		"2:	str	%5, [%2, #" __stringify(AT91_RSTC_CR) "]\n\t"
+		"	str	%5, [%2, #" __stringify(AT91_RSTC_CR) "]\n\t"
 
 		"	b	.\n\t"
 		:
@@ -145,7 +144,7 @@ static int at91_reset(struct notifier_block *this, unsigned long mode,
 		  "r" cpu_to_le32(AT91_DDRSDRC_LPCB_POWER_DOWN),
 		  "r" (reset->data->reset_args),
 		  "r" (reset->ramc_lpr)
-		: "r4");
+	);
 
 	return NOTIFY_DONE;
 }
Signature · 1 line
2.39.5
author maintainer
#66 lore raw

PATCH 66/780 PM: EM: Fix potential division-by-zero error in em_compute_costs()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Yaxiong Tian <[email protected]>

[ Upstream commit 179c0c7044a378198adb36f2a12410ab68cc730a ]

When the device is of a non-CPU type, table[i].performance won't be initialized in the previous em_init_performance(), resulting in division by zero when calculating costs in em_compute_costs().

Since the 'cost' algorithm is only used for EAS energy efficiency calculations and is currently not utilized by other device drivers, we should add the _is_cpu_device(dev) check to prevent this division-by-zero issue.

Fixes 1b600da51073 ("PM: EM: Optimize em_cpu_energy() and remove division")
---
 kernel/power/energy_model.c | 4 ++++
 1 file changed, 4 insertions(+)
kernel/power/energy_model.c +4 -0
index d9b7e2b38c7a9..41606247c2776 100644
@@ -233,6 +233,10 @@ static int em_compute_costs(struct device *dev, struct em_perf_state *table,
 	unsigned long prev_cost = ULONG_MAX;
 	int i, ret;
 
+	/* This is needed only for CPUs and EAS skip other devices */
+	if (!_is_cpu_device(dev))
+		return 0;
+
 	/* Compute the cost of each performance state. */
 	for (i = nr_states - 1; i >= 0; i--) {
 		unsigned long power_res, cost;
Signature · 1 line
2.39.5
author maintainer
#67 lore raw

PATCH 67/780 power: supply: max77705: Fix workqueue error handling in probe

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Dan Carpenter <[email protected]>

[ Upstream commit 11741b8e382d34b13277497ab91123d8b0b5c2db ]

The create_singlethread_workqueue() doesn't return error pointers, it returns NULL. Also cleanup the workqueue on the error paths.

Fixes a6a494c8e3ce ("power: supply: max77705: Add charger driver for Maxim 77705")
---
 drivers/power/supply/max77705_charger.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/power/supply/max77705_charger.c +14 -6
index eec5e9ef795ef..329b430d0e506 100644
@@ -545,20 +545,28 @@ static int max77705_charger_probe(struct i2c_client *i2c)
 		return dev_err_probe(dev, ret, "failed to add irq chip\n");
 
 	chg->wqueue = create_singlethread_workqueue(dev_name(dev));
-	if (IS_ERR(chg->wqueue))
-		return dev_err_probe(dev, PTR_ERR(chg->wqueue), "failed to create workqueue\n");
+	if (!chg->wqueue)
+		return dev_err_probe(dev, -ENOMEM, "failed to create workqueue\n");
 
 	ret = devm_work_autocancel(dev, &chg->chgin_work, max77705_chgin_isr_work);
-	if (ret)
-		return dev_err_probe(dev, ret, "failed to initialize interrupt work\n");
+	if (ret) {
+		dev_err_probe(dev, ret, "failed to initialize interrupt work\n");
+		goto destroy_wq;
+	}
 
 	max77705_charger_initialize(chg);
 
 	ret = max77705_charger_enable(chg);
-	if (ret)
-		return dev_err_probe(dev, ret, "failed to enable charge\n");
+	if (ret) {
+		dev_err_probe(dev, ret, "failed to enable charge\n");
+		goto destroy_wq;
+	}
 
 	return devm_add_action_or_reset(dev, max77705_charger_disable, chg);
+
+destroy_wq:
+	destroy_workqueue(chg->wqueue);
+	return ret;
 }
 
 static const struct of_device_id max77705_charger_of_match[] = {
Signature · 1 line
2.39.5
author maintainer
#68 lore raw

PATCH 68/780 platform/chrome: cros_ec_typec: Set Pin Assignment E in DP PORT VDO

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Benson Leung <[email protected]>

[ Upstream commit a9635ef0ca12e7914f42bfa7ca6a019f606c2817 ]

Pin C and D are used on C-to-C cable applications including docks, and for USB-C adapters that convert from DP over USB-C to other video standards.

Pin Assignment E is intended to be used with adapter from USB-C to DP plugs or receptacles.

All Chromebook USB-C DFPs support DisplayPort Alternate Mode as the DP Source with support for all 3 pin assignments. Pin Assignment E is required in order to support if the user attaches a Pin E C-to-DP cable.

Without this, the displayport.c alt mode driver will error out of dp_altmode_probe with an -ENODEV, as it cannot find a compatible matching pin assignment between the DFP_D and UFP_D.

Fixes dbb3fc0ffa95 ("platform/chrome: cros_ec_typec: Displayport support")
---
 drivers/platform/chrome/cros_ec_typec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/chrome/cros_ec_typec.c +4 -2
index d2228720991ff..7678e3d05fd36 100644
@@ -22,8 +22,10 @@
 
 #define DRV_NAME "cros-ec-typec"
 
-#define DP_PORT_VDO	(DP_CONF_SET_PIN_ASSIGN(BIT(DP_PIN_ASSIGN_C) | BIT(DP_PIN_ASSIGN_D)) | \
-				DP_CAP_DFP_D | DP_CAP_RECEPTACLE)
+#define DP_PORT_VDO	(DP_CAP_DFP_D | DP_CAP_RECEPTACLE | \
+			 DP_CONF_SET_PIN_ASSIGN(BIT(DP_PIN_ASSIGN_C) | \
+						BIT(DP_PIN_ASSIGN_D) | \
+						BIT(DP_PIN_ASSIGN_E)))
 
 static void cros_typec_role_switch_quirk(struct fwnode_handle *fwnode)
 {
Signature · 1 line
2.39.5
author maintainer
#69 lore raw

PATCH 69/780 ASoC: SOF: ipc4-pcm: Adjust pipeline_list->pipelines allocation type

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Kees Cook <[email protected]>

[ Upstream commit 00a371adbbfb46db561db85a9d7b53b2363880a1 ]

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct snd_sof_pipeline **", but the returned type will be "struct snd_sof_widget **". These are the same size allocation (pointer size) but the types don't match. Adjust the allocation type to match the assignment.

Fixes 9c04363d222b ("ASoC: SOF: Introduce struct snd_sof_pipeline")
---
 sound/soc/sof/ipc4-pcm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/sof/ipc4-pcm.c +2 -1
index c09b424ab863d..8eee3e1aadf93 100644
@@ -784,7 +784,8 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
 
 		/* allocate memory for max number of pipeline IDs */
 		pipeline_list->pipelines = kcalloc(ipc4_data->max_num_pipelines,
-						   sizeof(struct snd_sof_widget *), GFP_KERNEL);
+						   sizeof(*pipeline_list->pipelines),
+						   GFP_KERNEL);
 		if (!pipeline_list->pipelines) {
 			sof_ipc4_pcm_free(sdev, spcm);
 			return -ENOMEM;
Signature · 1 line
2.39.5
author maintainer
#70 lore raw

PATCH 70/780 ASoC: Intel: avs: Fix kcalloc() sizes

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Thorsten Blum <[email protected]>

[ Upstream commit d20df86b056b95845f6ed52da1010059202a0c23 ]

rlist, clist, and slist are allocated using sizeof(pointer) instead of sizeof(*pointer). Fix the allocations by using sizeof(*pointer) and avoid overallocating memory on 64-bit systems.

Fixes f2f847461fb7 ("ASoC: Intel: avs: Constrain path based on BE capabilities")
---
 sound/soc/intel/avs/path.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/avs/path.c +3 -3
index cafb8c6198bed..8f1bf8d0af8f9 100644
@@ -131,9 +131,9 @@ int avs_path_set_constraint(struct avs_dev *adev, struct avs_tplg_path_template
 	list_for_each_entry(path_template, &template->path_list, node)
 		i++;
 
-	rlist = kcalloc(i, sizeof(rlist), GFP_KERNEL);
-	clist = kcalloc(i, sizeof(clist), GFP_KERNEL);
-	slist = kcalloc(i, sizeof(slist), GFP_KERNEL);
+	rlist = kcalloc(i, sizeof(*rlist), GFP_KERNEL);
+	clist = kcalloc(i, sizeof(*clist), GFP_KERNEL);
+	slist = kcalloc(i, sizeof(*slist), GFP_KERNEL);
 
 	i = 0;
 	list_for_each_entry(path_template, &template->path_list, node) {
Signature · 1 line
2.39.5
author maintainer
#71 lore raw

PATCH 71/780 ASoC: SOF: amd: add missing acp descriptor field

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Vijendar Mukunda <[email protected]>

[ Upstream commit 7c2bad7b95db5b4b978853cd4dd042ae3ec83e63 ]

Add missing acp descriptor field acp_error_stat for ACP7.0 platform.

Fixes 490be7ba2a01 ("ASoC: SOF: amd: add support for acp7.0 based platform")
---
 sound/soc/sof/amd/pci-acp70.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sof/amd/pci-acp70.c +1 -0
index 8fa1170a2161e..9108f1139ff2d 100644
@@ -33,6 +33,7 @@ static const struct sof_amd_acp_desc acp70_chip_info = {
 	.ext_intr_cntl = ACP70_EXTERNAL_INTR_CNTL,
 	.ext_intr_stat	= ACP70_EXT_INTR_STAT,
 	.ext_intr_stat1	= ACP70_EXT_INTR_STAT1,
+	.acp_error_stat = ACP70_ERROR_STATUS,
 	.dsp_intr_base	= ACP70_DSP_SW_INTR_BASE,
 	.acp_sw0_i2s_err_reason = ACP7X_SW0_I2S_ERROR_REASON,
 	.sram_pte_offset = ACP70_SRAM_PTE_OFFSET,
Signature · 1 line
2.39.5
author maintainer
#72 lore raw

PATCH 72/780 PM: wakeup: Delete space in the end of string shown by pm_show_wakelocks()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Zijun Hu <[email protected]>

[ Upstream commit f0050a3e214aa941b78ad4caf122a735a24d81a6 ]

pm_show_wakelocks() is called to generate a string when showing attributes /sys/power/wake_(lock|unlock), but the string ends with an unwanted space that was added back by mistake by commit c9d967b2ce40 ("PM: wakeup: simplify the output logic of pm_show_wakelocks()").

Remove the unwanted space.

Fixes c9d967b2ce40 ("PM: wakeup: simplify the output logic of pm_show_wakelocks()")
[ rjw: Changelog edits ]
---
 kernel/power/wakelock.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/power/wakelock.c +3 -0
index 52571dcad768b..4e941999a53ba 100644
@@ -49,6 +49,9 @@ ssize_t pm_show_wakelocks(char *buf, bool show_active)
 			len += sysfs_emit_at(buf, len, "%s ", wl->name);
 	}
 
+	if (len > 0)
+		--len;
+
 	len += sysfs_emit_at(buf, len, "\n");
 
 	mutex_unlock(&wakelocks_lock);
Signature · 1 line
2.39.5
author maintainer
#73 lore raw

PATCH 73/780 ACPI: resource: fix a typo for MECHREVO in irq1_edge_low_force_override[]

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mingcong Bai <[email protected]>

[ Upstream commit 113e04276018bd13978051d8b05a613b4d390cc9 ]

The vendor name for MECHREVO was incorrectly spelled in commit b53f09ecd602 ("ACPI: resource: Do IRQ override on MECHREV GM7XG0M").

Correct this typo in this trivial patch.

Fixes b53f09ecd602 ("ACPI: resource: Do IRQ override on MECHREV GM7XG0M")
---
 drivers/acpi/resource.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/resource.c +1 -1
index 14c7bac4100b4..7d59c6c9185fc 100644
@@ -534,7 +534,7 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
  */
 static const struct dmi_system_id irq1_edge_low_force_override[] = {
 	{
-		/* MECHREV Jiaolong17KS Series GM7XG0M */
+		/* MECHREVO Jiaolong17KS Series GM7XG0M */
 		.matches = {
 			DMI_MATCH(DMI_BOARD_NAME, "GM7XG0M"),
 		},
Signature · 1 line
2.39.5
author maintainer
#74 lore raw

PATCH 74/780 PM: runtime: Add new devm functions

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Bence Csókás <[email protected]>

[ Upstream commit 73db799bf5efc5a04654bb3ff6c9bf63a0dfa473 ]

Add devm_pm_runtime_set_active_enabled() and
devm_pm_runtime_get_noresume() for simplifying
common cases in drivers.

Stable-dep-of: 8856eafcc05e ("spi: atmel-quadspi: Fix unbalanced pm_runtime by using devm_ API")

---
 drivers/base/power/runtime.c | 44 ++++++++++++++++++++++++++++++++++++
 include/linux/pm_runtime.h   |  4 ++++
 2 files changed, 48 insertions(+)
drivers/base/power/runtime.c +44 -0
index 0e127b0329c00..205a4f8828b0a 100644
@@ -1568,6 +1568,32 @@ void pm_runtime_enable(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(pm_runtime_enable);
 
+static void pm_runtime_set_suspended_action(void *data)
+{
+	pm_runtime_set_suspended(data);
+}
+
+/**
+ * devm_pm_runtime_set_active_enabled - set_active version of devm_pm_runtime_enable.
+ *
+ * @dev: Device to handle.
+ */
+int devm_pm_runtime_set_active_enabled(struct device *dev)
+{
+	int err;
+
+	err = pm_runtime_set_active(dev);
+	if (err)
+		return err;
+
+	err = devm_add_action_or_reset(dev, pm_runtime_set_suspended_action, dev);
+	if (err)
+		return err;
+
+	return devm_pm_runtime_enable(dev);
+}
+EXPORT_SYMBOL_GPL(devm_pm_runtime_set_active_enabled);
+
 static void pm_runtime_disable_action(void *data)
 {
 	pm_runtime_dont_use_autosuspend(data);
@@ -1590,6 +1616,24 @@ int devm_pm_runtime_enable(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(devm_pm_runtime_enable);
 
+static void pm_runtime_put_noidle_action(void *data)
+{
+	pm_runtime_put_noidle(data);
+}
+
+/**
+ * devm_pm_runtime_get_noresume - devres-enabled version of pm_runtime_get_noresume.
+ *
+ * @dev: Device to handle.
+ */
+int devm_pm_runtime_get_noresume(struct device *dev)
+{
+	pm_runtime_get_noresume(dev);
+
+	return devm_add_action_or_reset(dev, pm_runtime_put_noidle_action, dev);
+}
+EXPORT_SYMBOL_GPL(devm_pm_runtime_get_noresume);
+
 /**
  * pm_runtime_forbid - Block runtime PM of a device.
  * @dev: Device to handle.
include/linux/pm_runtime.h +4 -0
index 7fb5a459847ef..756b842dcd309 100644
@@ -96,7 +96,9 @@ extern void pm_runtime_new_link(struct device *dev);
 extern void pm_runtime_drop_link(struct device_link *link);
 extern void pm_runtime_release_supplier(struct device_link *link);
 
+int devm_pm_runtime_set_active_enabled(struct device *dev);
 extern int devm_pm_runtime_enable(struct device *dev);
+int devm_pm_runtime_get_noresume(struct device *dev);
 
 /**
  * pm_suspend_ignore_children - Set runtime PM behavior regarding children.
@@ -294,7 +296,9 @@ static inline bool pm_runtime_blocked(struct device *dev) { return true; }
 static inline void pm_runtime_allow(struct device *dev) {}
 static inline void pm_runtime_forbid(struct device *dev) {}
 
+static inline int devm_pm_runtime_set_active_enabled(struct device *dev) { return 0; }
 static inline int devm_pm_runtime_enable(struct device *dev) { return 0; }
+static inline int devm_pm_runtime_get_noresume(struct device *dev) { return 0; }
 
 static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {}
 static inline void pm_runtime_get_noresume(struct device *dev) {}
Signature · 1 line
2.39.5
author maintainer
#75 lore raw

PATCH 75/780 spi: atmel-quadspi: Fix unbalanced pm_runtime by using devm_ API

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Bence Csókás <[email protected]>

[ Upstream commit 8856eafcc05ecf54d6dd2b6c67804fefd276472c ]

Fix unbalanced PM in error path of atmel_qspi_probe() by using devm_pm_runtime_*() functions.

---
 drivers/spi/atmel-quadspi.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)
drivers/spi/atmel-quadspi.c +4 -13
index 244ac01068629..e7b61dc4ce676 100644
@@ -1436,22 +1436,17 @@ static int atmel_qspi_probe(struct platform_device *pdev)
 
 	pm_runtime_set_autosuspend_delay(&pdev->dev, 500);
 	pm_runtime_use_autosuspend(&pdev->dev);
-	pm_runtime_set_active(&pdev->dev);
-	pm_runtime_enable(&pdev->dev);
-	pm_runtime_get_noresume(&pdev->dev);
+	devm_pm_runtime_set_active_enabled(&pdev->dev);
+	devm_pm_runtime_get_noresume(&pdev->dev);
 
 	err = atmel_qspi_init(aq);
 	if (err)
 		goto dma_release;
 
 	err = spi_register_controller(ctrl);
-	if (err) {
-		pm_runtime_put_noidle(&pdev->dev);
-		pm_runtime_disable(&pdev->dev);
-		pm_runtime_set_suspended(&pdev->dev);
-		pm_runtime_dont_use_autosuspend(&pdev->dev);
+	if (err)
 		goto dma_release;
-	}
+
 	pm_runtime_mark_last_busy(&pdev->dev);
 	pm_runtime_put_autosuspend(&pdev->dev);
 
@@ -1530,10 +1525,6 @@ static void atmel_qspi_remove(struct platform_device *pdev)
 		 */
 		dev_warn(&pdev->dev, "Failed to resume device on remove\n");
 	}
-
-	pm_runtime_disable(&pdev->dev);
-	pm_runtime_dont_use_autosuspend(&pdev->dev);
-	pm_runtime_put_noidle(&pdev->dev);
 }
 
 static int __maybe_unused atmel_qspi_suspend(struct device *dev)
Signature · 1 line
2.39.5
author maintainer
#76 lore raw

PATCH 76/780 x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Jiaqing Zhao <[email protected]>

[ Upstream commit 824c6384e8d9275d4ec7204f3f79a4ac6bc10379 ]

When suspending, save_processor_state() calls mtrr_save_fixed_ranges() to save fixed-range MTRRs.

On platforms without fixed-range MTRRs like the ACRN hypervisor which has removed fixed-range MTRR emulation, accessing these MSRs will trigger an unchecked MSR access error. Make sure fixed-range MTRRs are supported before access to prevent such error.

Since mtrr_state.have_fixed is only set when MTRRs are present and enabled, checking the CPU feature flag in mtrr_save_fixed_ranges() is unnecessary.

Fixes 3ebad5905609 ("[PATCH] x86: Save and restore the fixed-range MTRRs of the BSP when suspending")
---
 arch/x86/kernel/cpu/mtrr/generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/mtrr/generic.c +1 -1
index e2c6b471d2302..8c18327eb10bb 100644
@@ -593,7 +593,7 @@ static void get_fixed_ranges(mtrr_type *frs)
 
 void mtrr_save_fixed_ranges(void *info)
 {
-	if (boot_cpu_has(X86_FEATURE_MTRR))
+	if (mtrr_state.have_fixed)
 		get_fixed_ranges(mtrr_state.fixed_ranges);
 }
 
Signature · 1 line
2.39.5
author maintainer
#77 lore raw

PATCH 77/780 PM: sleep: Print PM debug messages during hibernation

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Rafael J. Wysocki <[email protected]>

[ Upstream commit 1b17d4525bca3916644c41e01522df8fa0f8b90b ]

Commit cdb8c100d8a4 ("include/linux/suspend.h: Only show pm_pr_dbg messages at suspend/resume") caused PM debug messages to only be printed during system-wide suspend and resume in progress, but it forgot about hibernation.

Address this by adding a check for hibernation in progress to pm_debug_messages_should_print().

Fixes cdb8c100d8a4 ("include/linux/suspend.h: Only show pm_pr_dbg messages at suspend/resume")
---
 kernel/power/hibernate.c | 5 +++++
 kernel/power/main.c      | 3 ++-
 kernel/power/power.h     | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)
kernel/power/hibernate.c +5 -0
index 23c0f4e6cb2ff..5af9c7ee98cd4 100644
@@ -90,6 +90,11 @@ void hibernate_release(void)
 	atomic_inc(&hibernate_atomic);
 }
 
+bool hibernation_in_progress(void)
+{
+	return !atomic_read(&hibernate_atomic);
+}
+
 bool hibernation_available(void)
 {
 	return nohibernate == 0 &&
kernel/power/main.c +2 -1
index 6254814d48171..0622e7dacf172 100644
@@ -613,7 +613,8 @@ bool pm_debug_messages_on __read_mostly;
 
 bool pm_debug_messages_should_print(void)
 {
-	return pm_debug_messages_on && pm_suspend_target_state != PM_SUSPEND_ON;
+	return pm_debug_messages_on && (hibernation_in_progress() ||
+		pm_suspend_target_state != PM_SUSPEND_ON);
 }
 EXPORT_SYMBOL_GPL(pm_debug_messages_should_print);
 
kernel/power/power.h +4 -0
index c352dea2f67b5..f8496f40b54fa 100644
@@ -71,10 +71,14 @@ extern void enable_restore_image_protection(void);
 static inline void enable_restore_image_protection(void) {}
 #endif /* CONFIG_STRICT_KERNEL_RWX */
 
+extern bool hibernation_in_progress(void);
+
 #else /* !CONFIG_HIBERNATION */
 
 static inline void hibernate_reserved_size_init(void) {}
 static inline void hibernate_image_size_init(void) {}
+
+static inline bool hibernation_in_progress(void) { return false; }
 #endif /* !CONFIG_HIBERNATION */
 
 #define power_attr(_name) \
Signature · 1 line
2.39.5
author maintainer
#78 lore raw

PATCH 78/780 spi: spi-qpic-snand: use kmalloc() for OOB buffer allocation

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Gabor Juhos <[email protected]>

[ Upstream commit f48d80503504257682e493dc17408f2f0b47bcfa ]

The qcom_spi_ecc_init_ctx_pipelined() function allocates zeroed memory for the OOB buffer, then it fills the buffer with '0xff' bytes right after the allocation. In this case zeroing the memory during allocation is superfluous, so use kmalloc() instead of kzalloc() to avoid that.

Stable-dep-of: 65cb56d49f6e ("spi: spi-qpic-snand: validate user/chip specific ECC properties")

---
 drivers/spi/spi-qpic-snand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-qpic-snand.c +1 -1
index 94948c8781e83..924aa8461963f 100644
@@ -261,7 +261,7 @@ static int qcom_spi_ecc_init_ctx_pipelined(struct nand_device *nand)
 	ecc_cfg = kzalloc(sizeof(*ecc_cfg), GFP_KERNEL);
 	if (!ecc_cfg)
 		return -ENOMEM;
-	snandc->qspi->oob_buf = kzalloc(mtd->writesize + mtd->oobsize,
+	snandc->qspi->oob_buf = kmalloc(mtd->writesize + mtd->oobsize,
 					GFP_KERNEL);
 	if (!snandc->qspi->oob_buf) {
 		kfree(ecc_cfg);
Signature · 1 line
2.39.5
author maintainer
#79 lore raw

PATCH 79/780 spi: spi-qpic-snand: validate user/chip specific ECC properties

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Gabor Juhos <[email protected]>

[ Upstream commit 65cb56d49f6edea409600a3c61effc70ee5d43d8 ]

The driver only supports 512 bytes ECC step size and 4 bit ECC strength at the moment, however it does not reject unsupported step/strength configurations. Due to this, whenever the driver is used with a flash chip which needs stronger ECC protection, the following warning is shown in the kernel log:

  [    0.574648] spi-nand spi0.0: GigaDevice SPI NAND was found.
  [    0.635748] spi-nand spi0.0: 256 MiB, block size: 128 KiB, page size: 2048, OOB size: 128
  [    0.649079] nand: WARNING: (null): the ECC used on your system is too weak compared to the one required by the NAND chip

Although the message indicates that something is wrong, but it often gets unnoticed, which can cause serious problems. For example when the user writes something into the flash chip despite the warning, the written data may won't be readable by the bootloader or by the boot ROM. In the worst case, when the attached SPI NAND chip is the boot device, the board may not be able to boot anymore.

Also, it is not even possible to create a backup of the flash, because reading its content results in bogus data. For example, dumping the first page of the flash gives this:

  # hexdump -C -n 2048 /dev/mtd0
  00000000  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  00000040  0f 0f 0f 0f 0f 0f 0f 0d  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  00000050  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  000001c0  0f 0f 0f 0f ff 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  000001d0  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  00000200  0f 0f 0f 0f f5 5b ff ff  0f 0f 0f 0f 0f 0f 0f 0f  |.....[..........|
  00000210  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  000002f0  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 1f 0f 0f  |................|
  00000300  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  000003c0  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f ff 0f 0f 0f  |................|
  000003d0  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  00000400  0f 0f 0f 0f 0f 0f 0f 0f  e9 74 c9 06 f5 5b ff ff  |.........t...[..|
  00000410  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  000005d0  0f 0f 0f 0f ff 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  000005e0  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  00000600  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f c6 be 0f c3  |................|
  00000610  e9 74 c9 06 f5 5b ff ff  0f 0f 0f 0f 0f 0f 0f 0f  |.t...[..........|
  00000620  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  00000770  0f 0f 0f 0f 8f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  00000780  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  00000800
  #

Doing the same by using the downstream kernel results in different output:

  # hexdump -C -n 2048 /dev/mtd0
  00000000  0f 0f 0f 0f 0f 0f 0f 0f  0f 0f 0f 0f 0f 0f 0f 0f  |................|
  *
  00000800
  #

This patch adds some sanity checks to the code to prevent using the driver with unsupported ECC step/strength configurations. After the change, probing of the driver fails in such cases:

  [    0.655038] spi-nand spi0.0: GigaDevice SPI NAND was found.
  [    0.659159] spi-nand spi0.0: 256 MiB, block size: 128 KiB, page size: 2048, OOB size: 128
  [    0.669138] qcom_snand 79b0000.spi: only 4 bits ECC strength is supported
  [    0.677476] nand: No suitable ECC configuration
  [    0.689909] spi-nand spi0.0: probe with driver spi-nand failed with error -95

This helps to avoid the aforementioned hassles until support for 8 bit ECC strength gets implemented.

Fixes 7304d1909080 ("spi: spi-qpic: add driver for QCOM SPI NAND flash Interface")
---
 drivers/spi/spi-qpic-snand.c | 42 +++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)
drivers/spi/spi-qpic-snand.c +37 -5
index 924aa8461963f..44a8f58e46fe1 100644
@@ -250,9 +250,11 @@ static const struct mtd_ooblayout_ops qcom_spi_ooblayout = {
 static int qcom_spi_ecc_init_ctx_pipelined(struct nand_device *nand)
 {
 	struct qcom_nand_controller *snandc = nand_to_qcom_snand(nand);
+	struct nand_ecc_props *reqs = &nand->ecc.requirements;
+	struct nand_ecc_props *user = &nand->ecc.user_conf;
 	struct nand_ecc_props *conf = &nand->ecc.ctx.conf;
 	struct mtd_info *mtd = nanddev_to_mtd(nand);
-	int cwperpage, bad_block_byte;
+	int cwperpage, bad_block_byte, ret;
 	struct qpic_ecc *ecc_cfg;
 
 	cwperpage = mtd->writesize / NANDC_STEP_SIZE;
@@ -261,11 +263,39 @@ static int qcom_spi_ecc_init_ctx_pipelined(struct nand_device *nand)
 	ecc_cfg = kzalloc(sizeof(*ecc_cfg), GFP_KERNEL);
 	if (!ecc_cfg)
 		return -ENOMEM;
+
+	if (user->step_size && user->strength) {
+		ecc_cfg->step_size = user->step_size;
+		ecc_cfg->strength = user->strength;
+	} else if (reqs->step_size && reqs->strength) {
+		ecc_cfg->step_size = reqs->step_size;
+		ecc_cfg->strength = reqs->strength;
+	} else {
+		/* use defaults */
+		ecc_cfg->step_size = NANDC_STEP_SIZE;
+		ecc_cfg->strength = 4;
+	}
+
+	if (ecc_cfg->step_size != NANDC_STEP_SIZE) {
+		dev_err(snandc->dev,
+			"only %u bytes ECC step size is supported\n",
+			NANDC_STEP_SIZE);
+		ret = -EOPNOTSUPP;
+		goto err_free_ecc_cfg;
+	}
+
+	if (ecc_cfg->strength != 4) {
+		dev_err(snandc->dev,
+			"only 4 bits ECC strength is supported\n");
+		ret = -EOPNOTSUPP;
+		goto err_free_ecc_cfg;
+	}
+
 	snandc->qspi->oob_buf = kmalloc(mtd->writesize + mtd->oobsize,
 					GFP_KERNEL);
 	if (!snandc->qspi->oob_buf) {
-		kfree(ecc_cfg);
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto err_free_ecc_cfg;
 	}
 
 	memset(snandc->qspi->oob_buf, 0xff, mtd->writesize + mtd->oobsize);
@@ -280,8 +310,6 @@ static int qcom_spi_ecc_init_ctx_pipelined(struct nand_device *nand)
 	ecc_cfg->bytes = ecc_cfg->ecc_bytes_hw + ecc_cfg->spare_bytes + ecc_cfg->bbm_size;
 
 	ecc_cfg->steps = 4;
-	ecc_cfg->strength = 4;
-	ecc_cfg->step_size = 512;
 	ecc_cfg->cw_data = 516;
 	ecc_cfg->cw_size = ecc_cfg->cw_data + ecc_cfg->bytes;
 	bad_block_byte = mtd->writesize - ecc_cfg->cw_size * (cwperpage - 1) + 1;
@@ -339,6 +367,10 @@ static int qcom_spi_ecc_init_ctx_pipelined(struct nand_device *nand)
 		ecc_cfg->strength, ecc_cfg->step_size);
 
 	return 0;
+
+err_free_ecc_cfg:
+	kfree(ecc_cfg);
+	return ret;
 }
 
 static void qcom_spi_ecc_cleanup_ctx_pipelined(struct nand_device *nand)
Signature · 1 line
2.39.5
author maintainer
#80 lore raw

PATCH 80/780 thermal/drivers/mediatek/lvts: Fix debugfs unregister on failure

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: AngeloGioacchino Del Regno <[email protected]>

[ Upstream commit b49825661af93d9b8d7236f914803f136896f8fd ]

When running the probe function for this driver, the function lvts_debugfs_init() gets called in lvts_domain_init() which, in turn, gets called in lvts_probe() before registering threaded interrupt handlers.

Even though it's unlikely, the last call may fail and, if it does, there's nothing removing the already created debugfs folder and files.

In order to fix that, instead of calling the lvts debugfs cleanup function upon failure, register a devm action that will take care of calling that upon failure or driver removal.

Since devm was used, also delete the call to lvts_debugfs_exit() in the lvts_remove() callback, as now that's done automatically.

Fixes f5f633b18234 ("thermal/drivers/mediatek: Add the Low Voltage Thermal Sensor driver")
---
 drivers/thermal/mediatek/lvts_thermal.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/thermal/mediatek/lvts_thermal.c +8 -8
index 088481d91e6e2..c0be4ca55c7b8 100644
@@ -213,6 +213,13 @@ static const struct debugfs_reg32 lvts_regs[] = {
 	LVTS_DEBUG_FS_REGS(LVTS_CLKEN),
 };
 
+static void lvts_debugfs_exit(void *data)
+{
+	struct lvts_domain *lvts_td = data;
+
+	debugfs_remove_recursive(lvts_td->dom_dentry);
+}
+
 static int lvts_debugfs_init(struct device *dev, struct lvts_domain *lvts_td)
 {
 	struct debugfs_regset32 *regset;
@@ -245,12 +252,7 @@ static int lvts_debugfs_init(struct device *dev, struct lvts_domain *lvts_td)
 		debugfs_create_regset32("registers", 0400, dentry, regset);
 	}
 
-	return 0;
-}
-
-static void lvts_debugfs_exit(struct lvts_domain *lvts_td)
-{
-	debugfs_remove_recursive(lvts_td->dom_dentry);
+	return devm_add_action_or_reset(dev, lvts_debugfs_exit, lvts_td);
 }
 
 #else
@@ -1374,8 +1376,6 @@ static void lvts_remove(struct platform_device *pdev)
 
 	for (i = 0; i < lvts_td->num_lvts_ctrl; i++)
 		lvts_ctrl_set_enable(&lvts_td->lvts_ctrl[i], false);
-
-	lvts_debugfs_exit(lvts_td);
 }
 
 static const struct lvts_ctrl_data mt7988_lvts_ap_data_ctrl[] = {
Signature · 1 line
2.39.5
author maintainer
#81 lore raw

PATCH 81/780 ACPI: OSI: Stop advertising support for "3.0 _SCP Extensions"

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Armin Wolf <[email protected]>

[ Upstream commit 8cf4fdac9bdead7bca15fc56fdecdf78d11c3ec6 ]

As specified in section 5.7.2 of the ACPI specification the feature group string "3.0 _SCP Extensions" implies that the operating system evaluates the _SCP control method with additional parameters.

However the ACPI thermal driver evaluates the _SCP control method without those additional parameters, conflicting with the above feature group string advertised to the firmware thru _OSI.

Stop advertising support for this feature string to avoid confusing the ACPI firmware.

Fixes e5f660ebef68 ("ACPI / osi: Collect _OSI handling into one single file")
---
 drivers/acpi/osi.c | 1 -
 1 file changed, 1 deletion(-)
drivers/acpi/osi.c +0 -1
index df9328c850bd3..f2c943b934be0 100644
@@ -42,7 +42,6 @@ static struct acpi_osi_entry
 osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = {
 	{"Module Device", true},
 	{"Processor Device", true},
-	{"3.0 _SCP Extensions", true},
 	{"Processor Aggregator Device", true},
 };
 
Signature · 1 line
2.39.5
author maintainer
#82 lore raw

PATCH 82/780 ACPI: thermal: Execute _SCP before reading trip points

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Armin Wolf <[email protected]>

[ Upstream commit 3f7cd28ae3d1a1d6f151178469cfaef1b07fdbcc ]

As specified in section 11.4.13 of the ACPI specification the operating system is required to evaluate the _ACx and _PSV objects after executing the _SCP control method.

Move the execution of the _SCP control method before the invocation of acpi_thermal_get_trip_points() to avoid missing updates to the _ACx and _PSV objects.

Fixes b09872a652d3 ("ACPI: thermal: Fold acpi_thermal_get_info() into its caller")
---
 drivers/acpi/thermal.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/acpi/thermal.c +6 -4
index 0c874186f8aed..5c2defe55898f 100644
@@ -803,6 +803,12 @@ static int acpi_thermal_add(struct acpi_device *device)
 
 	acpi_thermal_aml_dependency_fix(tz);
 
+	/*
+	 * Set the cooling mode [_SCP] to active cooling. This needs to happen before
+	 * we retrieve the trip point values.
+	 */
+	acpi_execute_simple_method(tz->device->handle, "_SCP", ACPI_THERMAL_MODE_ACTIVE);
+
 	/* Get trip points [_ACi, _PSV, etc.] (required). */
 	acpi_thermal_get_trip_points(tz);
 
@@ -814,10 +820,6 @@ static int acpi_thermal_add(struct acpi_device *device)
 	if (result)
 		goto free_memory;
 
-	/* Set the cooling mode [_SCP] to active cooling. */
-	acpi_execute_simple_method(tz->device->handle, "_SCP",
-				   ACPI_THERMAL_MODE_ACTIVE);
-
 	/* Determine the default polling frequency [_TZP]. */
 	if (tzp)
 		tz->polling_frequency = tzp;
Signature · 1 line
2.39.5
author maintainer
#83 lore raw

PATCH 83/780 spi: sh-msiof: Fix maximum DMA transfer size

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Geert Uytterhoeven <[email protected]>

[ Upstream commit 0941d5166629cb766000530945e54b4e49680c68 ]

The maximum amount of data to transfer in a single DMA request is calculated from the FIFO sizes (which is technically not 100% correct, but a simplification, as it is limited by the maximum word count values in the Transmit and Control Data Registers). However, in case there is both data to transmit and to receive, the transmit limit is overwritten by the receive limit.

Fix this by using the minimum applicable FIFO size instead. Move the calculation outside the loop, so it is not repeated for each individual DMA transfer.

As currently tx_fifo_size is always equal to rx_fifo_size, this bug had no real impact.

---
 drivers/spi/spi-sh-msiof.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/spi/spi-sh-msiof.c +7 -6
index 8a98c313548e3..7d8a7998f8ae7 100644
@@ -918,6 +918,7 @@ static int sh_msiof_transfer_one(struct spi_controller *ctlr,
 	void *rx_buf = t->rx_buf;
 	unsigned int len = t->len;
 	unsigned int bits = t->bits_per_word;
+	unsigned int max_wdlen = 256;
 	unsigned int bytes_per_word;
 	unsigned int words;
 	int n;
@@ -931,17 +932,17 @@ static int sh_msiof_transfer_one(struct spi_controller *ctlr,
 	if (!spi_controller_is_target(p->ctlr))
 		sh_msiof_spi_set_clk_regs(p, t);
 
+	if (tx_buf)
+		max_wdlen = min(max_wdlen, p->tx_fifo_size);
+	if (rx_buf)
+		max_wdlen = min(max_wdlen, p->rx_fifo_size);
+
 	while (ctlr->dma_tx && len > 15) {
 		/*
 		 *  DMA supports 32-bit words only, hence pack 8-bit and 16-bit
 		 *  words, with byte resp. word swapping.
 		 */
-		unsigned int l = 0;
-
-		if (tx_buf)
-			l = min(round_down(len, 4), p->tx_fifo_size * 4);
-		if (rx_buf)
-			l = min(round_down(len, 4), p->rx_fifo_size * 4);
+		unsigned int l = min(round_down(len, 4), max_wdlen * 4);
 
 		if (bits <= 8) {
 			copy32 = copy_bswap32;
Signature · 1 line
2.39.5
author maintainer
#84 lore raw

PATCH 84/780 ASoC: apple: mca: Constrain channels according to TDM mask

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Martin Povišer <[email protected]>

[ Upstream commit e717c661e2d1a660e96c40b0fe9933e23a1d7747 ]

We don't (and can't) configure the hardware correctly if the number of channels exceeds the weight of the TDM mask. Report that constraint in startup of FE.

Fixes 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver")
---
 sound/soc/apple/mca.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
sound/soc/apple/mca.c +23 -0
index b4f4696809dd2..5dd24ab90d0f0 100644
@@ -464,6 +464,28 @@ static int mca_configure_serdes(struct mca_cluster *cl, int serdes_unit,
 	return -EINVAL;
 }
 
+static int mca_fe_startup(struct snd_pcm_substream *substream,
+			  struct snd_soc_dai *dai)
+{
+	struct mca_cluster *cl = mca_dai_to_cluster(dai);
+	unsigned int mask, nchannels;
+
+	if (cl->tdm_slots) {
+		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+			mask = cl->tdm_tx_mask;
+		else
+			mask = cl->tdm_rx_mask;
+
+		nchannels = hweight32(mask);
+	} else {
+		nchannels = 2;
+	}
+
+	return snd_pcm_hw_constraint_minmax(substream->runtime,
+					    SNDRV_PCM_HW_PARAM_CHANNELS,
+					    1, nchannels);
+}
+
 static int mca_fe_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 			       unsigned int rx_mask, int slots, int slot_width)
 {
@@ -680,6 +702,7 @@ static int mca_fe_hw_params(struct snd_pcm_substream *substream,
 }
 
 static const struct snd_soc_dai_ops mca_fe_ops = {
+	.startup = mca_fe_startup,
 	.set_fmt = mca_fe_set_fmt,
 	.set_bclk_ratio = mca_set_bclk_ratio,
 	.set_tdm_slot = mca_fe_set_tdm_slot,
Signature · 1 line
2.39.5
author maintainer
#85 lore raw

PATCH 85/780 EDAC/bluefield: Dont use bluefield_edac_readl() result on error

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: David Thompson <[email protected]>

[ Upstream commit ea3b0b7f541b9511abe2b89547c95458804f38e2 ]

The bluefield_edac_readl() routine returns an uninitialized result on error paths. In those cases the calling routine should not use the uninitialized result. The driver should simply log the error, and then return early.

Fixes e41967575474 ("EDAC/bluefield: Use Arm SMC for EMI access on BlueField-2")
---
 drivers/edac/bluefield_edac.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/edac/bluefield_edac.c +15 -5
index 4942a240c30f2..ae3bb7afa103e 100644
@@ -199,8 +199,10 @@ static void bluefield_gather_report_ecc(struct mem_ctl_info *mci,
 	 * error without the detailed information.
 	 */
 	err = bluefield_edac_readl(priv, MLXBF_SYNDROM, &dram_syndrom);
-	if (err)
+	if (err) {
 		dev_err(priv->dev, "DRAM syndrom read failed.\n");
+		return;
+	}
 
 	serr = FIELD_GET(MLXBF_SYNDROM__SERR, dram_syndrom);
 	derr = FIELD_GET(MLXBF_SYNDROM__DERR, dram_syndrom);
@@ -213,20 +215,26 @@ static void bluefield_gather_report_ecc(struct mem_ctl_info *mci,
 	}
 
 	err = bluefield_edac_readl(priv, MLXBF_ADD_INFO, &dram_additional_info);
-	if (err)
+	if (err) {
 		dev_err(priv->dev, "DRAM additional info read failed.\n");
+		return;
+	}
 
 	err_prank = FIELD_GET(MLXBF_ADD_INFO__ERR_PRANK, dram_additional_info);
 
 	ecc_dimm = (err_prank >= 2 && priv->dimm_ranks[0] <= 2) ? 1 : 0;
 
 	err = bluefield_edac_readl(priv, MLXBF_ERR_ADDR_0, &edea0);
-	if (err)
+	if (err) {
 		dev_err(priv->dev, "Error addr 0 read failed.\n");
+		return;
+	}
 
 	err = bluefield_edac_readl(priv, MLXBF_ERR_ADDR_1, &edea1);
-	if (err)
+	if (err) {
 		dev_err(priv->dev, "Error addr 1 read failed.\n");
+		return;
+	}
 
 	ecc_dimm_addr = ((u64)edea1 << 32) | edea0;
 
@@ -250,8 +258,10 @@ static void bluefield_edac_check(struct mem_ctl_info *mci)
 		return;
 
 	err = bluefield_edac_readl(priv, MLXBF_ECC_CNT, &ecc_count);
-	if (err)
+	if (err) {
 		dev_err(priv->dev, "ECC count read failed.\n");
+		return;
+	}
 
 	single_error_count = FIELD_GET(MLXBF_ECC_CNT__SERR_CNT, ecc_count);
 	double_error_count = FIELD_GET(MLXBF_ECC_CNT__DERR_CNT, ecc_count);
Signature · 1 line
2.39.5
author maintainer
#86 lore raw

PATCH 86/780 ALSA: core: fix up bus match const issues.

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Greg Kroah-Hartman <[email protected]>

[ Upstream commit 62f134ab190c5fd5c9f68fe638ad8e13bb8a4cb4 ]

In commit d69d80484598 ("driver core: have match() callback in struct bus_type take a const *"), the match bus callback was changed to have the driver be a const pointer. Unfortunately that const attribute was thrown away when container_of() is called, which is not correct and was not caught by the compiler due to how container_of() is implemented. Fix this up by correctly preserving the const attribute of the driver passed to the bus match function which requires the hdac_driver match function to also take a const pointer for the driver structure.

Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Fixes d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")
---
 include/sound/hdaudio.h  | 4 ++--
 sound/core/seq_device.c  | 2 +-
 sound/hda/hda_bus_type.c | 6 +++---
 sound/pci/hda/hda_bind.c | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
include/sound/hdaudio.h +2 -2
index b098ceadbe74b..9a70048adbc06 100644
@@ -223,7 +223,7 @@ struct hdac_driver {
 	struct device_driver driver;
 	int type;
 	const struct hda_device_id *id_table;
-	int (*match)(struct hdac_device *dev, struct hdac_driver *drv);
+	int (*match)(struct hdac_device *dev, const struct hdac_driver *drv);
 	void (*unsol_event)(struct hdac_device *dev, unsigned int event);
 
 	/* fields used by ext bus APIs */
@@ -235,7 +235,7 @@ struct hdac_driver {
 #define drv_to_hdac_driver(_drv) container_of(_drv, struct hdac_driver, driver)
 
 const struct hda_device_id *
-hdac_get_device_id(struct hdac_device *hdev, struct hdac_driver *drv);
+hdac_get_device_id(struct hdac_device *hdev, const struct hdac_driver *drv);
 
 /*
  * Bus verb operators
sound/core/seq_device.c +1 -1
index 4492be5d2317c..bac9f86037342 100644
@@ -43,7 +43,7 @@ MODULE_LICENSE("GPL");
 static int snd_seq_bus_match(struct device *dev, const struct device_driver *drv)
 {
 	struct snd_seq_device *sdev = to_seq_dev(dev);
-	struct snd_seq_driver *sdrv = to_seq_drv(drv);
+	const struct snd_seq_driver *sdrv = to_seq_drv(drv);
 
 	return strcmp(sdrv->id, sdev->id) == 0 &&
 		sdrv->argsize == sdev->argsize;
sound/hda/hda_bus_type.c +3 -3
index 7545ace7b0ee4..eb72a7af2e56e 100644
@@ -21,7 +21,7 @@ MODULE_LICENSE("GPL");
  * driver id_table and returns the matching device id entry.
  */
 const struct hda_device_id *
-hdac_get_device_id(struct hdac_device *hdev, struct hdac_driver *drv)
+hdac_get_device_id(struct hdac_device *hdev, const struct hdac_driver *drv)
 {
 	if (drv->id_table) {
 		const struct hda_device_id *id  = drv->id_table;
@@ -38,7 +38,7 @@ hdac_get_device_id(struct hdac_device *hdev, struct hdac_driver *drv)
 }
 EXPORT_SYMBOL_GPL(hdac_get_device_id);
 
-static int hdac_codec_match(struct hdac_device *dev, struct hdac_driver *drv)
+static int hdac_codec_match(struct hdac_device *dev, const struct hdac_driver *drv)
 {
 	if (hdac_get_device_id(dev, drv))
 		return 1;
@@ -49,7 +49,7 @@ static int hdac_codec_match(struct hdac_device *dev, struct hdac_driver *drv)
 static int hda_bus_match(struct device *dev, const struct device_driver *drv)
 {
 	struct hdac_device *hdev = dev_to_hdac_dev(dev);
-	struct hdac_driver *hdrv = drv_to_hdac_driver(drv);
+	const struct hdac_driver *hdrv = drv_to_hdac_driver(drv);
 
 	if (hdev->type != hdrv->type)
 		return 0;
sound/pci/hda/hda_bind.c +2 -2
index 9521e5e0e6e6f..1fef350d821ef 100644
@@ -18,10 +18,10 @@
 /*
  * find a matching codec id
  */
-static int hda_codec_match(struct hdac_device *dev, struct hdac_driver *drv)
+static int hda_codec_match(struct hdac_device *dev, const struct hdac_driver *drv)
 {
 	struct hda_codec *codec = container_of(dev, struct hda_codec, core);
-	struct hda_codec_driver *driver =
+	const struct hda_codec_driver *driver =
 		container_of(drv, struct hda_codec_driver, core);
 	const struct hda_device_id *list;
 	/* check probe_id instead of vendor_id if set */
Signature · 1 line
2.39.5
author maintainer
#87 lore raw

PATCH 87/780 ACPI: platform_profile: Avoid initializing on non-ACPI platforms

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Alexandre Ghiti <[email protected]>

[ Upstream commit dd133162c9cff5951a692fab9811fadf46a46457 ]

The platform profile driver is loaded even on platforms that do not have ACPI enabled. The initialization of the sysfs entries was recently moved from platform_profile_register() to the module init call, and those entries need acpi_kobj to be initialized which is not the case when ACPI is disabled.

This results in the following warning:

 WARNING: CPU: 5 PID: 1 at fs/sysfs/group.c:131 internal_create_group+0xa22/0xdd8
 Modules linked in:
 CPU: 5 UID: 0 PID: 1 Comm: swapper/0 Tainted: G        W           6.15.0-rc7-dirty #6 PREEMPT
 Tainted: [W]=WARN
 Hardware name: riscv-virtio,qemu (DT)
 epc : internal_create_group+0xa22/0xdd8
  ra : internal_create_group+0xa22/0xdd8

 Call Trace:

 internal_create_group+0xa22/0xdd8
 sysfs_create_group+0x22/0x2e
 platform_profile_init+0x74/0xb2
 do_one_initcall+0x198/0xa9e
 kernel_init_freeable+0x6d8/0x780
 kernel_init+0x28/0x24c
 ret_from_fork+0xe/0x18

Fix this by checking if ACPI is enabled before trying to create sysfs entries.

Fixes 77be5cacb2c2 ("ACPI: platform_profile: Create class for ACPI platform profile")
[ rjw: Subject and changelog edits ]
---
 drivers/acpi/platform_profile.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/acpi/platform_profile.c +3 -0
index ffbfd32f4cf1b..b43f4459a4f61 100644
@@ -688,6 +688,9 @@ static int __init platform_profile_init(void)
 {
 	int err;
 
+	if (acpi_disabled)
+		return -EOPNOTSUPP;
+
 	err = class_register(&platform_profile_class);
 	if (err)
 		return err;
Signature · 1 line
2.39.5
author maintainer
#88 lore raw

PATCH 88/780 drm/vmwgfx: Add seqno waiter for sync_files

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ian Forbes <[email protected]>

[ Upstream commit 0039a3b35b10d9c15d3d26320532ab56cc566750 ]

Because sync_files are passive waiters they do not participate in the processing of fences like the traditional vmw_fence_wait IOCTL. If userspace exclusively uses sync_files for synchronization then nothing in the kernel actually processes fence updates as interrupts for fences are masked and ignored if the kernel does not indicate to the SVGA device that there are active waiters.

This oversight results in a bug where the entire GUI can freeze waiting on a sync_file that will never be signalled as we've masked the interrupts to signal its completion. This bug is incredibly racy as any process which interacts with the fencing code via the 3D stack can process the stuck fences on behalf of the stuck process causing it to run again. Even a simple app like eglinfo is enough to resume the stuck process. Usually this bug is seen at a login screen like GDM because there are no other 3D apps running.

By adding a seqno waiter we re-enable interrupt based processing of the dma_fences associated with the sync_file which is signalled as part of a dma_fence_callback.

This has likely been broken since it was initially added to the kernel in 2017 but has gone unnoticed until mutter recently started using sync_files heavily over the course of 2024 as part of their explicit sync support.

Fixes c906965dee22 ("drm/vmwgfx: Add export fence to file descriptor support")
---
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +26 -0
index 2e52d73eba484..ea741bc4ac3fc 100644
@@ -4086,6 +4086,23 @@ static int vmw_execbuf_tie_context(struct vmw_private *dev_priv,
 	return 0;
 }
 
+/*
+ * DMA fence callback to remove a seqno_waiter
+ */
+struct seqno_waiter_rm_context {
+	struct dma_fence_cb base;
+	struct vmw_private *dev_priv;
+};
+
+static void seqno_waiter_rm_cb(struct dma_fence *f, struct dma_fence_cb *cb)
+{
+	struct seqno_waiter_rm_context *ctx =
+		container_of(cb, struct seqno_waiter_rm_context, base);
+
+	vmw_seqno_waiter_remove(ctx->dev_priv);
+	kfree(ctx);
+}
+
 int vmw_execbuf_process(struct drm_file *file_priv,
 			struct vmw_private *dev_priv,
 			void __user *user_commands, void *kernel_commands,
@@ -4266,6 +4283,15 @@ int vmw_execbuf_process(struct drm_file *file_priv,
 		} else {
 			/* Link the fence with the FD created earlier */
 			fd_install(out_fence_fd, sync_file->file);
+			struct seqno_waiter_rm_context *ctx =
+				kmalloc(sizeof(*ctx), GFP_KERNEL);
+			ctx->dev_priv = dev_priv;
+			vmw_seqno_waiter_add(dev_priv);
+			if (dma_fence_add_callback(&fence->base, &ctx->base,
+						   seqno_waiter_rm_cb) < 0) {
+				vmw_seqno_waiter_remove(dev_priv);
+				kfree(ctx);
+			}
 		}
 	}
 
Signature · 1 line
2.39.5
author maintainer
#89 lore raw

PATCH 89/780 drm/vmwgfx: Add error path for xa_store in vmw_bo_add_detached_resource

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Keisuke Nishimura <[email protected]>

[ Upstream commit 3282422bf251db541fe07c548ca304130d37d754 ]

The xa_store() may fail due to memory allocation failure because there is no guarantee that the index is already used. This fix introduces new paths to handle the error.

This patch also aligns the order of function calls by calling vmw_bo_add_detached_resource() before ttm_prime_object_init() in order to allow consistent error handling.

Fixes d6667f0ddf46 ("drm/vmwgfx: Fix handling of dumb buffers")
---
 drivers/gpu/drm/vmwgfx/vmwgfx_bo.c      |  4 ++--
 drivers/gpu/drm/vmwgfx/vmwgfx_bo.h      |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 16 ++++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +2 -2
index 9b5b8c1f063bb..aa13e4061ff15 100644
@@ -848,9 +848,9 @@ void vmw_bo_placement_set_default_accelerated(struct vmw_bo *bo)
 	vmw_bo_placement_set(bo, domain, domain);
 }
 
-void vmw_bo_add_detached_resource(struct vmw_bo *vbo, struct vmw_resource *res)
+int vmw_bo_add_detached_resource(struct vmw_bo *vbo, struct vmw_resource *res)
 {
-	xa_store(&vbo->detached_resources, (unsigned long)res, res, GFP_KERNEL);
+	return xa_err(xa_store(&vbo->detached_resources, (unsigned long)res, res, GFP_KERNEL));
 }
 
 void vmw_bo_del_detached_resource(struct vmw_bo *vbo, struct vmw_resource *res)
drivers/gpu/drm/vmwgfx/vmwgfx_bo.h +1 -1
index 11e330c7c7f52..51790a11fe649 100644
@@ -141,7 +141,7 @@ void vmw_bo_move_notify(struct ttm_buffer_object *bo,
 			struct ttm_resource *mem);
 void vmw_bo_swap_notify(struct ttm_buffer_object *bo);
 
-void vmw_bo_add_detached_resource(struct vmw_bo *vbo, struct vmw_resource *res);
+int vmw_bo_add_detached_resource(struct vmw_bo *vbo, struct vmw_resource *res);
 void vmw_bo_del_detached_resource(struct vmw_bo *vbo, struct vmw_resource *res);
 struct vmw_surface *vmw_bo_surface(struct vmw_bo *vbo);
 
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +14 -2
index 5721c74da3e0b..1f7626f6ac0b1 100644
@@ -871,7 +871,12 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
 			vmw_resource_unreference(&res);
 			goto out_unlock;
 		}
-		vmw_bo_add_detached_resource(res->guest_memory_bo, res);
+
+		ret = vmw_bo_add_detached_resource(res->guest_memory_bo, res);
+		if (unlikely(ret != 0)) {
+			vmw_resource_unreference(&res);
+			goto out_unlock;
+		}
 	}
 
 	tmp = vmw_resource_reference(&srf->res);
@@ -1670,6 +1675,14 @@ vmw_gb_surface_define_internal(struct drm_device *dev,
 
 	}
 
+	if (res->guest_memory_bo) {
+		ret = vmw_bo_add_detached_resource(res->guest_memory_bo, res);
+		if (unlikely(ret != 0)) {
+			vmw_resource_unreference(&res);
+			goto out_unlock;
+		}
+	}
+
 	tmp = vmw_resource_reference(res);
 	ret = ttm_prime_object_init(tfile, res->guest_memory_size, &user_srf->prime,
 				    VMW_RES_SURFACE,
@@ -1684,7 +1697,6 @@ vmw_gb_surface_define_internal(struct drm_device *dev,
 	rep->handle      = user_srf->prime.base.handle;
 	rep->backup_size = res->guest_memory_size;
 	if (res->guest_memory_bo) {
-		vmw_bo_add_detached_resource(res->guest_memory_bo, res);
 		rep->buffer_map_handle =
 			drm_vma_node_offset_addr(&res->guest_memory_bo->tbo.base.vma_node);
 		rep->buffer_size = res->guest_memory_bo->tbo.base.size;
Signature · 1 line
2.39.5
author maintainer
#90 lore raw

PATCH 90/780 drm: xlnx: zynqmp_dpsub: fix Kconfig dependencies for ASoC

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Arnd Bergmann <[email protected]>

[ Upstream commit f9f087d946266bc5da7c3a17bd8fd9d01969e3cf ]

The new audio code fails to build when sounds support is in a loadable module but the GPU driver is built-in:

x86_64-linux-ld: zynqmp_dp_audio.c:(.text+0x6a8): undefined reference to `devm_snd_soc_register_card'
x86_64-linux-ld: drivers/gpu/drm/xlnx/zynqmp_dp_audio.o:(.rodata+0x1bc): undefined reference to `snd_soc_info_volsw'
x86_64-linux-ld: drivers/gpu/drm/xlnx/zynqmp_dp_audio.o:(.rodata+0x1f0): undefined reference to `snd_soc_get_volsw'
x86_64-linux-ld: drivers/gpu/drm/xlnx/zynqmp_dp_audio.o:(.rodata+0x1f4): undefined reference to `snd_soc_put_volsw'

Change the Kconfig dependency to disallow the sound support in this configuration.

Fixes 3ec5c1579305 ("drm: xlnx: zynqmp_dpsub: Add DP audio support")
---
 drivers/gpu/drm/xlnx/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/xlnx/Kconfig +1 -0
index dbecca9bdd544..cfabf5e2a0bb0 100644
@@ -22,6 +22,7 @@ config DRM_ZYNQMP_DPSUB_AUDIO
 	bool "ZynqMP DisplayPort Audio Support"
 	depends on DRM_ZYNQMP_DPSUB
 	depends on SND && SND_SOC
+	depends on SND_SOC=y || DRM_ZYNQMP_DPSUB=m
 	select SND_SOC_GENERIC_DMAENGINE_PCM
 	help
 	  Choose this option to enable DisplayPort audio support in the ZynqMP
Signature · 1 line
2.39.5
author maintainer
#91 lore raw

PATCH 91/780 drm/ci: fix merge request rules

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Vignesh Raman <[email protected]>

[ Upstream commit 10646ddac2917b31c985ceff0e4982c42a9c924b ]

Merge request pipelines were only created when changes were made to drivers/gpu/drm/ci/, causing MRs that didn't touch this path to break. Fix MR pipeline rules to trigger jobs for all changes.

Run jobs automatically for marge-bot and scheduled pipelines, but in all other cases run manually. Also remove CI_PROJECT_NAMESPACE checks specific to mesa.

---
 drivers/gpu/drm/ci/gitlab-ci.yml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/gpu/drm/ci/gitlab-ci.yml +4 -15
index f04aabe8327c6..b06b9e7d3d09b 100644
@@ -143,11 +143,11 @@ stages:
     # Pre-merge pipeline
     - if: &is-pre-merge $CI_PIPELINE_SOURCE == "merge_request_event"
     # Push to a branch on a fork
-    - if: &is-fork-push $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push"
+    - if: &is-fork-push $CI_PIPELINE_SOURCE == "push"
     # nightly pipeline
     - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
     # pipeline for direct pushes that bypassed the CI
-    - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
+    - if: &is-direct-push $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
 
 
 # Rules applied to every job in the pipeline
@@ -170,26 +170,15 @@ stages:
     - !reference [.disable-farm-mr-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
-    # Build everything in merge pipelines, if any files affecting the pipeline
-    # were changed
+    # Build everything in merge pipelines
     - if: *is-merge-attempt
-      changes: &all_paths
-      - drivers/gpu/drm/ci/**/*
       when: on_success
     # Same as above, but for pre-merge pipelines
     - if: *is-pre-merge
-      changes:
-        *all_paths
       when: manual
-    # Skip everything for pre-merge and merge pipelines which don't change
-    # anything in the build
-    - if: *is-merge-attempt
-      when: never
-    - if: *is-pre-merge
-      when: never
     # Build everything after someone bypassed the CI
     - if: *is-direct-push
-      when: on_success
+      when: manual
     # Build everything in scheduled pipelines
     - if: *is-scheduled-pipeline
       when: on_success
Signature · 1 line
2.39.5
author maintainer
#92 lore raw

PATCH 92/780 drm/vmwgfx: Fix dumb buffer leak

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Ian Forbes <[email protected]>

[ Upstream commit f42c09e614f1bda96f5690be8d0bb273234febbc ]

Dumb buffers were not being freed because the GEM reference that was acquired in gb_surface_define was not dropped like it is in the 2D case. Dropping this ref uncovered a few additional issues with freeing the resources associated with dirty tracking in vmw_bo_free/release.

Additionally the TTM object associated with the surface were also leaking which meant that when the ttm_object_file was closed at process exit the destructor unreferenced an already destroyed surface.

The solution is to remove the destructor from the vmw_user_surface associated with the dumb_buffer and immediately unreferencing the TTM object which his removes it from the ttm_object_file.

This also allows the early return in vmw_user_surface_base_release for the dumb buffer case to be removed as it should no longer occur.

The chain of references now has the GEM handle(s) owning the dumb buffer. The GEM handles have a singular GEM reference to the vmw_bo which is dropped when all handles are closed. When the GEM reference count hits zero the vmw_bo is freed which then unreferences the surface via vmw_resource_release in vmw_bo_release.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_bo.c       |  6 ++++--
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c  | 18 ++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +4 -2
index aa13e4061ff15..f30df3dc871fd 100644
@@ -51,11 +51,13 @@ static void vmw_bo_release(struct vmw_bo *vbo)
 			mutex_lock(&res->dev_priv->cmdbuf_mutex);
 			(void)vmw_resource_reserve(res, false, true);
 			vmw_resource_mob_detach(res);
+			if (res->dirty)
+				res->func->dirty_free(res);
 			if (res->coherent)
 				vmw_bo_dirty_release(res->guest_memory_bo);
 			res->guest_memory_bo = NULL;
 			res->guest_memory_offset = 0;
-			vmw_resource_unreserve(res, false, false, false, NULL,
+			vmw_resource_unreserve(res, true, false, false, NULL,
 					       0);
 			mutex_unlock(&res->dev_priv->cmdbuf_mutex);
 		}
@@ -73,9 +75,9 @@ static void vmw_bo_free(struct ttm_buffer_object *bo)
 {
 	struct vmw_bo *vbo = to_vmw_bo(&bo->base);
 
-	WARN_ON(vbo->dirty);
 	WARN_ON(!RB_EMPTY_ROOT(&vbo->res_tree));
 	vmw_bo_release(vbo);
+	WARN_ON(vbo->dirty);
 	kfree(vbo);
 }
 
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +1 -1
index a73af8a355fbf..c4d5fe5f330f9 100644
@@ -273,7 +273,7 @@ int vmw_user_resource_lookup_handle(struct vmw_private *dev_priv,
 		goto out_bad_resource;
 
 	res = converter->base_obj_to_res(base);
-	kref_get(&res->kref);
+	vmw_resource_reference(res);
 
 	*p_res = res;
 	ret = 0;
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +12 -6
index 1f7626f6ac0b1..d7a8070330ba5 100644
@@ -658,7 +658,7 @@ static void vmw_user_surface_free(struct vmw_resource *res)
 	struct vmw_user_surface *user_srf =
 	    container_of(srf, struct vmw_user_surface, srf);
 
-	WARN_ON_ONCE(res->dirty);
+	WARN_ON(res->dirty);
 	if (user_srf->master)
 		drm_master_put(&user_srf->master);
 	kfree(srf->offsets);
@@ -689,8 +689,7 @@ static void vmw_user_surface_base_release(struct ttm_base_object **p_base)
 	 * Dumb buffers own the resource and they'll unref the
 	 * resource themselves
 	 */
-	if (res && res->guest_memory_bo && res->guest_memory_bo->is_dumb)
-		return;
+	WARN_ON(res && res->guest_memory_bo && res->guest_memory_bo->is_dumb);
 
 	vmw_resource_unreference(&res);
 }
@@ -2370,12 +2369,19 @@ int vmw_dumb_create(struct drm_file *file_priv,
 	vbo = res->guest_memory_bo;
 	vbo->is_dumb = true;
 	vbo->dumb_surface = vmw_res_to_srf(res);
-
+	drm_gem_object_put(&vbo->tbo.base);
+	/*
+	 * Unset the user surface dtor since this in not actually exposed
+	 * to userspace. The suface is owned via the dumb_buffer's GEM handle
+	 */
+	struct vmw_user_surface *usurf = container_of(vbo->dumb_surface,
+						struct vmw_user_surface, srf);
+	usurf->prime.base.refcount_release = NULL;
 err:
 	if (res)
 		vmw_resource_unreference(&res);
-	if (ret)
-		ttm_ref_object_base_unref(tfile, arg.rep.handle);
+
+	ttm_ref_object_base_unref(tfile, arg.rep.handle);
 
 	return ret;
 }
Signature · 1 line
2.39.5
author maintainer
#93 lore raw

PATCH 93/780 drm/vc4: hdmi: Call HDMI hotplug helper on disconnect

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Stefan Wahren <[email protected]>

[ Upstream commit 34f051accedb642087fdcf19b3501fe150fbee49 ]

drm_atomic_helper_connector_hdmi_hotplug() must be called regardless of the connection status, otherwise the HDMI audio disconnect event won't be notified.

---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +2 -2
index 37238a12baa58..37a7d45695f23 100644
@@ -372,13 +372,13 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi,
 	 * the lock for now.
 	 */
 
+	drm_atomic_helper_connector_hdmi_hotplug(connector, status);
+
 	if (status == connector_status_disconnected) {
 		cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
 		return;
 	}
 
-	drm_atomic_helper_connector_hdmi_hotplug(connector, status);
-
 	cec_s_phys_addr(vc4_hdmi->cec_adap,
 			connector->display_info.source_physical_address, false);
 
Signature · 1 line
2.39.5
author maintainer
#94 lore raw

PATCH 94/780 drm/xe/d3cold: Set power state to D3Cold during s2idle/s3

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Badal Nilawar <[email protected]>

[ Upstream commit f945dd89fa8da3f662508165453dafdb4035d9d3 ]

According to pci core guidelines, pci_save_config is recommended when the driver explicitly needs to set the pci power state. As of now xe kmd is only doing pci_save_config while entering to s2idle/s3 state, which makes pci core think that device driver has already applied required pci power state. This leads to GPU remain in D0 state. To fix the issue setting the pci power state to D3Cold.

Fixes dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
---
 drivers/gpu/drm/xe/xe_pci.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/xe/xe_pci.c +1 -0
index f4d108dc49b1b..30f7ce06c8969 100644
@@ -922,6 +922,7 @@ static int xe_pci_suspend(struct device *dev)
 
 	pci_save_state(pdev);
 	pci_disable_device(pdev);
+	pci_set_power_state(pdev, PCI_D3cold);
 
 	return 0;
 }
Signature · 1 line
2.39.5
author maintainer
#95 lore raw

PATCH 95/780 drm/vc4: tests: Use return instead of assert

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Maxime Ripard <[email protected]>

[ Upstream commit 9e26a3740cc08ef8bcdc5e5d824792cd677affce ]

The vc4_mock_atomic_add_output() and vc4_mock_atomic_del_output() assert that the functions they are calling didn't fail. Since some of them can return EDEADLK, we can't properly deal with it.

Since both functions are expected to return an int, and all caller check the return value, let's just properly propagate the errors when they occur.

Fixes f759f5b53f1c ("drm/vc4: tests: Introduce a mocking infrastructure")
Fixes 76ec18dc5afa ("drm/vc4: tests: Add unit test suite for the PV muxing")
---
 drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 36 ++++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/gpu/drm/vc4/tests/vc4_mock_output.c +24 -12
index e70d7c3076acf..f0ddc223c1f83 100644
@@ -75,24 +75,30 @@ int vc4_mock_atomic_add_output(struct kunit *test,
 	int ret;
 
 	encoder = vc4_find_encoder_by_type(drm, type);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
+	if (!encoder)
+		return -ENODEV;
 
 	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
+	if (!crtc)
+		return -ENODEV;
 
 	output = encoder_to_vc4_dummy_output(encoder);
 	conn = &output->connector;
 	conn_state = drm_atomic_get_connector_state(state, conn);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
+	if (IS_ERR(conn_state))
+		return PTR_ERR(conn_state);
 
 	ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
-	KUNIT_EXPECT_EQ(test, ret, 0);
+	if (ret)
+		return ret;
 
 	crtc_state = drm_atomic_get_crtc_state(state, crtc);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
+	if (IS_ERR(crtc_state))
+		return PTR_ERR(crtc_state);
 
 	ret = drm_atomic_set_mode_for_crtc(crtc_state, &default_mode);
-	KUNIT_EXPECT_EQ(test, ret, 0);
+	if (ret)
+		return ret;
 
 	crtc_state->active = true;
 
@@ -113,26 +119,32 @@ int vc4_mock_atomic_del_output(struct kunit *test,
 	int ret;
 
 	encoder = vc4_find_encoder_by_type(drm, type);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
+	if (!encoder)
+		return -ENODEV;
 
 	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
+	if (!crtc)
+		return -ENODEV;
 
 	crtc_state = drm_atomic_get_crtc_state(state, crtc);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
+	if (IS_ERR(crtc_state))
+		return PTR_ERR(crtc_state);
 
 	crtc_state->active = false;
 
 	ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL);
-	KUNIT_ASSERT_EQ(test, ret, 0);
+	if (ret)
+		return ret;
 
 	output = encoder_to_vc4_dummy_output(encoder);
 	conn = &output->connector;
 	conn_state = drm_atomic_get_connector_state(state, conn);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
+	if (IS_ERR(conn_state))
+		return PTR_ERR(conn_state);
 
 	ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
-	KUNIT_ASSERT_EQ(test, ret, 0);
+	if (ret)
+		return ret;
 
 	return 0;
 }
Signature · 1 line
2.39.5
author maintainer
#96 lore raw

PATCH 96/780 drm/vc4: tests: Stop allocating the state in test init

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Maxime Ripard <[email protected]>

[ Upstream commit 7e0351ae91ed2b6178abbfae96c3c6aaa1652567 ]

The vc4-pv-muxing-combinations and vc5-pv-muxing-combinations test suites use a common test init function which, in part, allocates the drm atomic state the test will use.

That allocation relies on drm_kunit_helper_atomic_state_alloc(), and thus requires a struct drm_modeset_acquire_ctx. This context will then be stored in the allocated state->acquire_ctx field.

However, the context is local to the test init function, and is cleared as soon as drm_kunit_helper_atomic_state_alloc() is done. We thus end up with an dangling pointer to a cleared context in state->acquire_ctx for our test to consumes.

We should really allocate the context and the state in the test functions, so we can also control when we're done with it.

Fixes 30188df0c387 ("drm/tests: Drop drm_kunit_helper_acquire_ctx_alloc()")
---
 .../gpu/drm/vc4/tests/vc4_test_pv_muxing.c    | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)
drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c +27 -14
index 992e8f5c5c6ea..52c04ef33206b 100644
@@ -20,7 +20,6 @@
 
 struct pv_muxing_priv {
 	struct vc4_dev *vc4;
-	struct drm_atomic_state *state;
 };
 
 static bool check_fifo_conflict(struct kunit *test,
@@ -677,10 +676,19 @@ static void drm_vc4_test_pv_muxing(struct kunit *test)
 {
 	const struct pv_muxing_param *params = test->param_value;
 	const struct pv_muxing_priv *priv = test->priv;
-	struct drm_atomic_state *state = priv->state;
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_atomic_state *state;
+	struct drm_device *drm;
+	struct vc4_dev *vc4;
 	unsigned int i;
 	int ret;
 
+	drm_modeset_acquire_init(&ctx, 0);
+
+	vc4 = priv->vc4;
+	drm = &vc4->base;
+	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 	for (i = 0; i < params->nencoders; i++) {
 		enum vc4_encoder_type enc_type = params->encoders[i];
 
@@ -700,16 +708,29 @@ static void drm_vc4_test_pv_muxing(struct kunit *test)
 		KUNIT_EXPECT_TRUE(test, check_channel_for_encoder(test, state, enc_type,
 								  params->check_fn));
 	}
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
 }
 
 static void drm_vc4_test_pv_muxing_invalid(struct kunit *test)
 {
 	const struct pv_muxing_param *params = test->param_value;
 	const struct pv_muxing_priv *priv = test->priv;
-	struct drm_atomic_state *state = priv->state;
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_atomic_state *state;
+	struct drm_device *drm;
+	struct vc4_dev *vc4;
 	unsigned int i;
 	int ret;
 
+	drm_modeset_acquire_init(&ctx, 0);
+
+	vc4 = priv->vc4;
+	drm = &vc4->base;
+	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
+
 	for (i = 0; i < params->nencoders; i++) {
 		enum vc4_encoder_type enc_type = params->encoders[i];
 
@@ -719,14 +740,15 @@ static void drm_vc4_test_pv_muxing_invalid(struct kunit *test)
 
 	ret = drm_atomic_check_only(state);
 	KUNIT_EXPECT_LT(test, ret, 0);
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
 }
 
 static int vc4_pv_muxing_test_init(struct kunit *test)
 {
 	const struct pv_muxing_param *params = test->param_value;
-	struct drm_modeset_acquire_ctx ctx;
 	struct pv_muxing_priv *priv;
-	struct drm_device *drm;
 	struct vc4_dev *vc4;
 
 	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
@@ -737,15 +759,6 @@ static int vc4_pv_muxing_test_init(struct kunit *test)
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
 	priv->vc4 = vc4;
 
-	drm_modeset_acquire_init(&ctx, 0);
-
-	drm = &vc4->base;
-	priv->state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->state);
-
-	drm_modeset_drop_locks(&ctx);
-	drm_modeset_acquire_fini(&ctx);
-
 	return 0;
 }
 
Signature · 1 line
2.39.5
author maintainer
#97 lore raw

PATCH 97/780 drm/vc4: tests: Retry pv-muxing tests when EDEADLK

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Maxime Ripard <[email protected]>

[ Upstream commit d5be7722d1736827a850556fd4d93e0fe2608c15 ]

Some functions used by the HVS->PV muxing tests can return with EDEADLK, meaning the entire sequence should be restarted. It's not a fatal error and we should treat it as a recoverable error, and recover, instead of failing the test like we currently do.

Fixes 76ec18dc5afa ("drm/vc4: tests: Add unit test suite for the PV muxing")
---
 .../gpu/drm/vc4/tests/vc4_test_pv_muxing.c    | 113 +++++++++++++++++-
 1 file changed, 112 insertions(+), 1 deletion(-)
drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c +112 -1
index 52c04ef33206b..d1f694029169a 100644
@@ -687,16 +687,30 @@ static void drm_vc4_test_pv_muxing(struct kunit *test)
 
 	vc4 = priv->vc4;
 	drm = &vc4->base;
+
+retry:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 	for (i = 0; i < params->nencoders; i++) {
 		enum vc4_encoder_type enc_type = params->encoders[i];
 
 		ret = vc4_mock_atomic_add_output(test, state, enc_type);
+		if (ret == -EDEADLK) {
+			drm_atomic_state_clear(state);
+			ret = drm_modeset_backoff(&ctx);
+			if (!ret)
+				goto retry;
+		}
 		KUNIT_ASSERT_EQ(test, ret, 0);
 	}
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry;
+	}
 	KUNIT_EXPECT_EQ(test, ret, 0);
 
 	KUNIT_EXPECT_TRUE(test,
@@ -728,6 +742,8 @@ static void drm_vc4_test_pv_muxing_invalid(struct kunit *test)
 
 	vc4 = priv->vc4;
 	drm = &vc4->base;
+
+retry:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 
@@ -735,10 +751,22 @@ static void drm_vc4_test_pv_muxing_invalid(struct kunit *test)
 		enum vc4_encoder_type enc_type = params->encoders[i];
 
 		ret = vc4_mock_atomic_add_output(test, state, enc_type);
+		if (ret == -EDEADLK) {
+			drm_atomic_state_clear(state);
+			ret = drm_modeset_backoff(&ctx);
+			if (!ret)
+				goto retry;
+		}
 		KUNIT_ASSERT_EQ(test, ret, 0);
 	}
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry;
+	}
 	KUNIT_EXPECT_LT(test, ret, 0);
 
 	drm_modeset_drop_locks(&ctx);
@@ -813,13 +841,26 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *tes
 	drm_modeset_acquire_init(&ctx, 0);
 
 	drm = &vc4->base;
+retry_first:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 
 	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_first;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_first;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	new_hvs_state = vc4_hvs_get_new_global_state(state);
@@ -836,13 +877,26 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *tes
 	ret = drm_atomic_helper_swap_state(state, false);
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
+retry_second:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 
 	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_second;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_second;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	new_hvs_state = vc4_hvs_get_new_global_state(state);
@@ -887,16 +941,35 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test)
 	drm_modeset_acquire_init(&ctx, 0);
 
 	drm = &vc4->base;
+retry_first:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 
 	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_first;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_first;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_first;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	new_hvs_state = vc4_hvs_get_new_global_state(state);
@@ -921,13 +994,26 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test)
 	ret = drm_atomic_helper_swap_state(state, false);
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
+retry_second:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 
 	ret = vc4_mock_atomic_del_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_second;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_second;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	new_hvs_state = vc4_hvs_get_new_global_state(state);
@@ -981,25 +1067,50 @@ drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct ku
 	drm_modeset_acquire_init(&ctx, 0);
 
 	drm = &vc4->base;
+retry_first:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 
 	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_first;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_first;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
-
 	ret = drm_atomic_helper_swap_state(state, false);
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
+retry_second:
 	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
 
 	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_second;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	ret = drm_atomic_check_only(state);
+	if (ret == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		ret = drm_modeset_backoff(&ctx);
+		if (!ret)
+			goto retry_second;
+	}
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,
Signature · 1 line
2.39.5
author maintainer
#98 lore raw

PATCH 98/780 drm/amd/pp: Fix potential NULL pointer dereference in atomctrl_initialize_mc_reg_table

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Charles Han <[email protected]>

[ Upstream commit 820116a39f96bdc7d426c33a804b52f53700a919 ]

The function atomctrl_initialize_mc_reg_table() and atomctrl_initialize_mc_reg_table_v2_2() does not check the return value of smu_atom_get_data_table(). If smu_atom_get_data_table() fails to retrieve vram_info, it returns NULL which is later dereferenced.

Fixes b3892e2bb519 ("drm/amd/pp: Use atombios api directly in powerplay (v2)")
Fixes 5f92b48cf62c ("drm/amd/pm: add mc register table initialization")
---
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +8 -0
index 4bd92fd782be6..8d40ed0f0e838 100644
@@ -143,6 +143,10 @@ int atomctrl_initialize_mc_reg_table(
 	vram_info = (ATOM_VRAM_INFO_HEADER_V2_1 *)
 		smu_atom_get_data_table(hwmgr->adev,
 				GetIndexIntoMasterTable(DATA, VRAM_Info), &size, &frev, &crev);
+	if (!vram_info) {
+		pr_err("Could not retrieve the VramInfo table!");
+		return -EINVAL;
+	}
 
 	if (module_index >= vram_info->ucNumOfVRAMModule) {
 		pr_err("Invalid VramInfo table.");
@@ -180,6 +184,10 @@ int atomctrl_initialize_mc_reg_table_v2_2(
 	vram_info = (ATOM_VRAM_INFO_HEADER_V2_2 *)
 		smu_atom_get_data_table(hwmgr->adev,
 				GetIndexIntoMasterTable(DATA, VRAM_Info), &size, &frev, &crev);
+	if (!vram_info) {
+		pr_err("Could not retrieve the VramInfo table!");
+		return -EINVAL;
+	}
 
 	if (module_index >= vram_info->ucNumOfVRAMModule) {
 		pr_err("Invalid VramInfo table.");
Signature · 1 line
2.39.5
author maintainer
#99 lore raw

PATCH 99/780 media: rkvdec: Fix frame size enumeration

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Jonas Karlman <[email protected]>

[ Upstream commit f270005b99fa19fee9a6b4006e8dee37c10f1944 ]

The VIDIOC_ENUM_FRAMESIZES ioctl should return all frame sizes (i.e. width and height in pixels) that the device supports for the given pixel format.

It doesn't make a lot of sense to return the frame-sizes in a stepwise manner, which is used to enforce hardware alignments requirements for CAPTURE buffers, for coded formats.

Instead, applications should receive an indication, about the maximum supported frame size for that hardware decoder, via a continuous frame-size enumeration.

Fixes cd33c830448b ("media: rkvdec: Add the rkvdec driver")
---
 drivers/staging/media/rkvdec/rkvdec.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/staging/media/rkvdec/rkvdec.c +8 -2
index f9bef5173bf25..a9bfd5305410c 100644
@@ -213,8 +213,14 @@ static int rkvdec_enum_framesizes(struct file *file, void *priv,
 	if (!fmt)
 		return -EINVAL;
 
-	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-	fsize->stepwise = fmt->frmsize;
+	fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
+	fsize->stepwise.min_width = 1;
+	fsize->stepwise.max_width = fmt->frmsize.max_width;
+	fsize->stepwise.step_width = 1;
+	fsize->stepwise.min_height = 1;
+	fsize->stepwise.max_height = fmt->frmsize.max_height;
+	fsize->stepwise.step_height = 1;
+
 	return 0;
 }
 
Signature · 1 line
2.39.5
author maintainer
#100 lore raw

PATCH 100/780 arm64/fpsimd: Avoid RES0 bits in the SME trap handler

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mark Rutland <[email protected]>

[ Upstream commit 95507570fb2f75544af69760cd5d8f48fc5c7f20 ]

The SME trap handler consumes RES0 bits from the ESR when determining the reason for the trap, and depends upon those bits reading as zero. This may break in future when those RES0 bits are allocated a meaning and stop reading as zero.

For SME traps taken with ESR_ELx.EC == 0b011101, the specific reason for the trap is indicated by ESR_ELx.ISS.SMTC ("SME Trap Code"). This field occupies bits [2:0] of ESR_ELx.ISS, and as of ARM DDI 0487 L.a, bits [24:3] of ESR_ELx.ISS are RES0. ESR_ELx.ISS itself occupies bits [24:0] of ESR_ELx.

Extract the SMTC field specifically, matching the way we handle ESR_ELx fields elsewhere, and ensuring that the handler is future-proof.

Fixes 8bd7f91c03d8 ("arm64/sme: Implement traps and syscall handling for SME")
Cc Marc Zyngier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Will Deacon <[email protected]>
---
 arch/arm64/include/asm/esr.h | 14 ++++++++------
 arch/arm64/kernel/fpsimd.c   |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)
arch/arm64/include/asm/esr.h +8 -6
index e4f77757937e6..71f0cbf7b2887 100644
@@ -378,12 +378,14 @@
 /*
  * ISS values for SME traps
  */
-
-#define ESR_ELx_SME_ISS_SME_DISABLED	0
-#define ESR_ELx_SME_ISS_ILL		1
-#define ESR_ELx_SME_ISS_SM_DISABLED	2
-#define ESR_ELx_SME_ISS_ZA_DISABLED	3
-#define ESR_ELx_SME_ISS_ZT_DISABLED	4
+#define ESR_ELx_SME_ISS_SMTC_MASK		GENMASK(2, 0)
+#define ESR_ELx_SME_ISS_SMTC(esr)		((esr) & ESR_ELx_SME_ISS_SMTC_MASK)
+
+#define ESR_ELx_SME_ISS_SMTC_SME_DISABLED	0
+#define ESR_ELx_SME_ISS_SMTC_ILL		1
+#define ESR_ELx_SME_ISS_SMTC_SM_DISABLED	2
+#define ESR_ELx_SME_ISS_SMTC_ZA_DISABLED	3
+#define ESR_ELx_SME_ISS_SMTC_ZT_DISABLED	4
 
 /* ISS field definitions for MOPS exceptions */
 #define ESR_ELx_MOPS_ISS_MEM_INST	(UL(1) << 24)
arch/arm64/kernel/fpsimd.c +1 -1
index 8370d55f03533..1ee5f330b8ed3 100644
@@ -1436,7 +1436,7 @@ void do_sme_acc(unsigned long esr, struct pt_regs *regs)
 	 * If this not a trap due to SME being disabled then something
 	 * is being used in the wrong mode, report as SIGILL.
 	 */
-	if (ESR_ELx_ISS(esr) != ESR_ELx_SME_ISS_SME_DISABLED) {
+	if (ESR_ELx_SME_ISS_SMTC(esr) != ESR_ELx_SME_ISS_SMTC_SME_DISABLED) {
 		force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0);
 		return;
 	}
Signature · 1 line
2.39.5
author maintainer
#101 lore raw

PATCH 101/780 arm64/fpsimd: Discard stale CPU state when handling SME traps

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mark Brown <[email protected]>

[ Upstream commit d3eaab3c70905c5467e5c4ea403053d67505adeb ]

The logic for handling SME traps manipulates saved FPSIMD/SVE/SME state incorrectly, and a race with preemption can result in a task having TIF_SME set and TIF_FOREIGN_FPSTATE clear even though the live CPU state is stale (e.g. with SME traps enabled). This can result in warnings from do_sme_acc() where SME traps are not expected while TIF_SME is set:

|        /* With TIF_SME userspace shouldn't generate any traps */
|        if (test_and_set_thread_flag(TIF_SME))
|                WARN_ON(1);

This is very similar to the SVE issue we fixed in commit:

751ecf6afd6568ad ("arm64/sve: Discard stale CPU state when handling SVE traps")

The race can occur when the SME trap handler is preempted before and after manipulating the saved FPSIMD/SVE/SME state, starting and ending on the same CPU, e.g.

| void do_sme_acc(unsigned long esr, struct pt_regs *regs)
| {
|         // Trap on CPU 0 with TIF_SME clear, SME traps enabled
|         // task->fpsimd_cpu is 0.
|         // per_cpu_ptr(&fpsimd_last_state, 0) is task.
|
|         ...
|
|         // Preempted; migrated from CPU 0 to CPU 1.
|         // TIF_FOREIGN_FPSTATE is set.
|
|         get_cpu_fpsimd_context();
|
|         /* With TIF_SME userspace shouldn't generate any traps */
|         if (test_and_set_thread_flag(TIF_SME))
|                 WARN_ON(1);
|
|         if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) {
|                 unsigned long vq_minus_one =
|                         sve_vq_from_vl(task_get_sme_vl(current)) - 1;
|                 sme_set_vq(vq_minus_one);
|
|                 fpsimd_bind_task_to_cpu();
|         }
|
|         put_cpu_fpsimd_context();
|
|         // Preempted; migrated from CPU 1 to CPU 0.
|         // task->fpsimd_cpu is still 0
|         // If per_cpu_ptr(&fpsimd_last_state, 0) is still task then:
|         // - Stale HW state is reused (with SME traps enabled)
|         // - TIF_FOREIGN_FPSTATE is cleared
|         // - A return to userspace skips HW state restore
| }

Fix the case where the state is not live and TIF_FOREIGN_FPSTATE is set by calling fpsimd_flush_task_state() to detach from the saved CPU state. This ensures that a subsequent context switch will not reuse the stale CPU state, and will instead set TIF_FOREIGN_FPSTATE, forcing the new state to be reloaded from memory prior to a return to userspace.

Note: this was originallly posted as [1].

Fixes 8bd7f91c03d8 ("arm64/sme: Implement traps and syscall handling for SME")
[ Rutland: rewrite commit message ]
Cc Marc Zyngier <[email protected]>
Cc Will Deacon <[email protected]>
---
 arch/arm64/kernel/fpsimd.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/kernel/fpsimd.c +2 -0
index 1ee5f330b8ed3..c92c0a08370b2 100644
@@ -1460,6 +1460,8 @@ void do_sme_acc(unsigned long esr, struct pt_regs *regs)
 		sme_set_vq(vq_minus_one);
 
 		fpsimd_bind_task_to_cpu();
+	} else {
+		fpsimd_flush_task_state(current);
 	}
 
 	put_cpu_fpsimd_context();
Signature · 1 line
2.39.5
author maintainer
#102 lore raw

PATCH 102/780 arm64/fpsimd: Dont corrupt FPMR when streaming mode changes

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mark Brown <[email protected]>

[ Upstream commit e5fa85fce08b21ed41643cb7968bf66bbd0532e3 ]

When the effective value of PSTATE.SM is changed from 0 to 1 or from 1 to 0 by any method, an entry or exit to/from streaming SVE mode is performed, and hardware automatically resets a number of registers. As of ARM DDI 0487 L.a, this means:

* All implemented bits of the SVE vector registers are set to zero.

* All implemented bits of the SVE predicate registers are set to zero.

* All implemented bits of FFR are set to zero, if FFR is implemented in the new mode.

* FPSR is set to 0x0000_0000_0800_009f.

* FPMR is set to 0, if FPMR is implemented.

Currently task_fpsimd_load() restores FPMR before restoring SVCR (which is an accessor for PSTATE.{SM,ZA}), and so the restored value of FPMR may be clobbered if the restored value of PSTATE.SM happens to differ from the initial value of PSTATE.SM.

Fix this by moving the restore of FPMR later.

Note: this was originally posted as [1].

---
 arch/arm64/kernel/fpsimd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/kernel/fpsimd.c +3 -3
index c92c0a08370b2..9466b3c5021ac 100644
@@ -359,9 +359,6 @@ static void task_fpsimd_load(void)
 	WARN_ON(preemptible());
 	WARN_ON(test_thread_flag(TIF_KERNEL_FPSTATE));
 
-	if (system_supports_fpmr())
-		write_sysreg_s(current->thread.uw.fpmr, SYS_FPMR);
-
 	if (system_supports_sve() || system_supports_sme()) {
 		switch (current->thread.fp_type) {
 		case FP_STATE_FPSIMD:
@@ -413,6 +410,9 @@ static void task_fpsimd_load(void)
 			restore_ffr = system_supports_fa64();
 	}
 
+	if (system_supports_fpmr())
+		write_sysreg_s(current->thread.uw.fpmr, SYS_FPMR);
+
 	if (restore_sve_regs) {
 		WARN_ON_ONCE(current->thread.fp_type != FP_STATE_SVE);
 		sve_load_state(sve_pffr(&current->thread),
Signature · 1 line
2.39.5
author maintainer
#103 lore raw

PATCH 103/780 arm64/fpsimd: Avoid clobbering kernel FPSIMD state with SMSTOP

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mark Rutland <[email protected]>

[ Upstream commit 01098d893fa8a6edb2b56e178b798e3e6b674f02 ]

On system with SME, a thread's kernel FPSIMD state may be erroneously clobbered during a context switch immediately after that state is restored. Systems without SME are unaffected.

If the CPU happens to be in streaming SVE mode before a context switch to a thread with kernel FPSIMD state, fpsimd_thread_switch() will restore the kernel FPSIMD state using fpsimd_load_kernel_state() while the CPU is still in streaming SVE mode. When fpsimd_thread_switch() subsequently calls fpsimd_flush_cpu_state(), this will execute an SMSTOP, causing an exit from streaming SVE mode. The exit from streaming SVE mode will cause the hardware to reset a number of FPSIMD/SVE/SME registers, clobbering the FPSIMD state.

Fix this by calling fpsimd_flush_cpu_state() before restoring the kernel FPSIMD state.

Fixes e92bee9f861b ("arm64/fpsimd: Avoid erroneous elide of user state reload")
Cc Ard Biesheuvel <[email protected]>
Cc Mark Brown <[email protected]>
Cc Will Deacon <[email protected]>
---
 arch/arm64/kernel/fpsimd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/fpsimd.c +1 -1
index 9466b3c5021ac..72ab9649c705b 100644
@@ -1575,8 +1575,8 @@ void fpsimd_thread_switch(struct task_struct *next)
 		fpsimd_save_user_state();
 
 	if (test_tsk_thread_flag(next, TIF_KERNEL_FPSTATE)) {
-		fpsimd_load_kernel_state(next);
 		fpsimd_flush_cpu_state();
+		fpsimd_load_kernel_state(next);
 	} else {
 		/*
 		 * Fix up TIF_FOREIGN_FPSTATE to correctly describe next's
Signature · 1 line
2.39.5
author maintainer
#104 lore raw

PATCH 104/780 arm64/fpsimd: Reset FPMR upon exec()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mark Rutland <[email protected]>

[ Upstream commit a90878f297d3dba906a6261deccb1bd4a791ba52 ]

An exec() is expected to reset all FPSIMD/SVE/SME state, and barring special handling of the vector lengths, the state is expected to reset to zero. This reset is handled in fpsimd_flush_thread(), which the core exec() code calls via flush_thread().

When support was added for FPMR, no logic was added to fpsimd_flush_thread() to reset the FPMR value, and thus it is erroneously inherited across an exec().

Add the missing reset of FPMR.

Fixes 203f2b95a882 ("arm64/fpsimd: Support FEAT_FPMR")
Cc Marc Zyngier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Will Deacon <[email protected]>
---
 arch/arm64/kernel/fpsimd.c | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/kernel/fpsimd.c +3 -0
index 72ab9649c705b..7ae01f02e18b7 100644
@@ -1663,6 +1663,9 @@ void fpsimd_flush_thread(void)
 		current->thread.svcr = 0;
 	}
 
+	if (system_supports_fpmr())
+		current->thread.uw.fpmr = 0;
+
 	current->thread.fp_type = FP_STATE_FPSIMD;
 
 	put_cpu_fpsimd_context();
Signature · 1 line
2.39.5
author maintainer
#105 lore raw

PATCH 105/780 arm64/fpsimd: Fix merging of FPSIMD state during signal return

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mark Rutland <[email protected]>

[ Upstream commit c94f2f326146a34066a0070ed90b8bc656b1842f ]

For backwards compatibility reasons, when a signal return occurs which restores SVE state, the effective lower 128 bits of each of the SVE vector registers are restored from the corresponding FPSIMD vector register in the FPSIMD signal frame, overriding the values in the SVE signal frame. This is intended to be the case regardless of streaming mode.

To make this happen, restore_sve_fpsimd_context() uses fpsimd_update_current_state() to merge the lower 128 bits from the FPSIMD signal frame into the SVE register state. Unfortunately, fpsimd_update_current_state() performs this merging dependent upon TIF_SVE, which is not always correct for streaming SVE register state:

* When restoring non-streaming SVE register state there is no observable problem, as the signal return code configures TIF_SVE and the saved fp_type to match before calling fpsimd_update_current_state(), which observes either:

  - TIF_SVE set    AND  fp_type == FP_STATE_SVE
  - TIF_SVE clear  AND  fp_type == FP_STATE_FPSIMD

* On systems which have SME but not SVE, TIF_SVE cannot be set. Thus the merging will never happen for the streaming SVE register state.

* On systems which have SVE and SME, TIF_SVE can be set and cleared independently of PSTATE.SM. Thus the merging may or may not happen for streaming SVE register state.

As TIF_SVE can be cleared non-deterministically during syscalls (including at the start of sigreturn()), the merging may occur non-deterministically from the perspective of userspace.

This logic has been broken since its introduction in commit:

85ed24dad2904f7c ("arm64/sme: Implement streaming SVE signal handling")

... at which point both fpsimd_signal_preserve_current_state() and fpsimd_update_current_state() only checked TIF SVE. When PSTATE.SM==1 and TIF_SVE was clear, signal delivery would place stale FPSIMD state into the FPSIMD signal frame, and signal return would not merge this into the restored register state.

Subsequently, signal delivery was fixed as part of commit:

61da7c8e2a602f66 ("arm64/signal: Don't assume that TIF_SVE means we saved SVE state")

... but signal restore was not given a corresponding fix, and when TIF_SVE was clear, signal restore would still fail to merge the FPSIMD state into the restored SVE register state. The 'Fixes' tag did not indicate that this had been broken since its introduction.

Fix this by merging the FPSIMD state dependent upon the saved fp_type, matching what we (currently) do during signal delivery.

As described above, when backporting this commit, it will also be necessary to backport commit:

61da7c8e2a602f66 ("arm64/signal: Don't assume that TIF_SVE means we saved SVE state")

... and prior to commit:

baa8515281b30861 ("arm64/fpsimd: Track the saved FPSIMD state type separately to TIF_SVE")

... it will be necessary for fpsimd_signal_preserve_current_state() and fpsimd_update_current_state() to consider both TIF_SVE and thread_sm_enabled(&current->thread), in place of the saved fp_type.

Fixes 85ed24dad290 ("arm64/sme: Implement streaming SVE signal handling")
Cc Marc Zyngier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Will Deacon <[email protected]>
---
 arch/arm64/kernel/fpsimd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/fpsimd.c +1 -1
index 7ae01f02e18b7..1edf797d2c710 100644
@@ -1806,7 +1806,7 @@ void fpsimd_update_current_state(struct user_fpsimd_state const *state)
 	get_cpu_fpsimd_context();
 
 	current->thread.uw.fpsimd_state = *state;
-	if (test_thread_flag(TIF_SVE))
+	if (current->thread.fp_type == FP_STATE_SVE)
 		fpsimd_to_sve(current);
 
 	task_fpsimd_load();
Signature · 1 line
2.39.5
author maintainer
#106 lore raw

PATCH 106/780 drm/panthor: Fix GPU_COHERENCY_ACE[_LITE] definitions

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Boris Brezillon <[email protected]>

[ Upstream commit d1df2907fb69df56aad8e4a0734dac0778c234a7 ]

GPU_COHERENCY_ACE and GPU_COHERENCY_ACE_LITE definitions have been swapped.

Changes in v2:
- New patch

Changes in v3:
- Add Steve's R-b

---
 drivers/gpu/drm/panthor/panthor_regs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panthor/panthor_regs.h +2 -2
index b7b3b3add1662..a7a323dc5cf92 100644
@@ -133,8 +133,8 @@
 #define GPU_COHERENCY_PROT_BIT(name)			BIT(GPU_COHERENCY_  ## name)
 
 #define GPU_COHERENCY_PROTOCOL				0x304
-#define   GPU_COHERENCY_ACE				0
-#define   GPU_COHERENCY_ACE_LITE			1
+#define   GPU_COHERENCY_ACE_LITE			0
+#define   GPU_COHERENCY_ACE				1
 #define   GPU_COHERENCY_NONE				31
 
 #define MCU_CONTROL					0x700
Signature · 1 line
2.39.5
author maintainer
#107 lore raw

PATCH 107/780 drm/panthor: Call panthor_gpu_coherency_init() after PM resume()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Boris Brezillon <[email protected]>

[ Upstream commit 7d5a3b22f5b58ef89ab8770d7a44c24eecde8d66 ]

When the device is coherent, panthor_gpu_coherency_init() will read GPU_COHERENCY_FEATURES to make sure the GPU supports the ACE-Lite coherency protocol, which will fail if the clocks/power-domains are not enabled when the read is done. Move the panthor_gpu_coherency_init() call after the device has been resumed to prevent that.

Changes in v2:
- Add Liviu's R-b

Changes in v3:
- Add Steve's R-b

Fixes dd7db8d911a1 ("drm/panthor: Explicitly set the coherency mode")
---
 drivers/gpu/drm/panthor/panthor_device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/panthor/panthor_device.c +4 -4
index a9da1d1eeb707..c73c1608d6e68 100644
@@ -171,10 +171,6 @@ int panthor_device_init(struct panthor_device *ptdev)
 	struct page *p;
 	int ret;
 
-	ret = panthor_gpu_coherency_init(ptdev);
-	if (ret)
-		return ret;
-
 	init_completion(&ptdev->unplug.done);
 	ret = drmm_mutex_init(&ptdev->base, &ptdev->unplug.lock);
 	if (ret)
@@ -247,6 +243,10 @@ int panthor_device_init(struct panthor_device *ptdev)
 	if (ret)
 		goto err_rpm_put;
 
+	ret = panthor_gpu_coherency_init(ptdev);
+	if (ret)
+		return ret;
+
 	ret = panthor_mmu_init(ptdev);
 	if (ret)
 		goto err_unplug_gpu;
Signature · 1 line
2.39.5
author maintainer
#108 lore raw

PATCH 108/780 drm/panthor: Update panthor_mmu::irq::mask when needed

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Boris Brezillon <[email protected]>

[ Upstream commit 8ba64cf2f358079d09faba7529aad2b0a46c7903 ]

When we clear the faulty bits in the AS mask, we also need to update the panthor_mmu::irq::mask field otherwise our IRQ handler won't get called again until the GPU is reset.

Changes in v2:
- Add Liviu's R-b

Changes in v3:
- Add Steve's R-b

---
 drivers/gpu/drm/panthor/panthor_mmu.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/panthor/panthor_mmu.c +1 -0
index 12a02e28f50fd..7cca97d298ea1 100644
@@ -781,6 +781,7 @@ int panthor_vm_active(struct panthor_vm *vm)
 	if (ptdev->mmu->as.faulty_mask & panthor_mmu_as_fault_mask(ptdev, as)) {
 		gpu_write(ptdev, MMU_INT_CLEAR, panthor_mmu_as_fault_mask(ptdev, as));
 		ptdev->mmu->as.faulty_mask &= ~panthor_mmu_as_fault_mask(ptdev, as);
+		ptdev->mmu->irq.mask |= panthor_mmu_as_fault_mask(ptdev, as);
 		gpu_write(ptdev, MMU_INT_MASK, ~ptdev->mmu->as.faulty_mask);
 	}
 
Signature · 1 line
2.39.5
author maintainer
#109 lore raw

PATCH 109/780 accel/amdxdna: Fix incorrect size of ERT_START_NPU commands

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Lizhi Hou <[email protected]>

[ Upstream commit 6c161732ea6467c6dea0c35810ca8e8d1ae135f1 ]

When multiple ERT_START_NPU commands are combined in one buffer, the buffer size calculation is incorrect. Also, the condition to make sure the buffer size is not beyond 4K is also fixed.

---
 drivers/accel/amdxdna/aie2_message.c  |  6 +++---
 drivers/accel/amdxdna/aie2_msg_priv.h | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)
drivers/accel/amdxdna/aie2_message.c +3 -3
index bf4219e32cc19..82412eec9a4b8 100644
@@ -525,7 +525,7 @@ aie2_cmdlist_fill_one_slot_cf(void *cmd_buf, u32 offset,
 	if (!payload)
 		return -EINVAL;
 
-	if (!slot_cf_has_space(offset, payload_len))
+	if (!slot_has_space(*buf, offset, payload_len))
 		return -ENOSPC;
 
 	buf->cu_idx = cu_idx;
@@ -558,7 +558,7 @@ aie2_cmdlist_fill_one_slot_dpu(void *cmd_buf, u32 offset,
 	if (payload_len < sizeof(*sn) || arg_sz > MAX_DPU_ARGS_SIZE)
 		return -EINVAL;
 
-	if (!slot_dpu_has_space(offset, arg_sz))
+	if (!slot_has_space(*buf, offset, arg_sz))
 		return -ENOSPC;
 
 	buf->inst_buf_addr = sn->buffer;
@@ -569,7 +569,7 @@ aie2_cmdlist_fill_one_slot_dpu(void *cmd_buf, u32 offset,
 	memcpy(buf->args, sn->prop_args, arg_sz);
 
 	/* Accurate buf size to hint firmware to do necessary copy */
-	*size += sizeof(*buf) + arg_sz;
+	*size = sizeof(*buf) + arg_sz;
 	return 0;
 }
 
drivers/accel/amdxdna/aie2_msg_priv.h +4 -6
index 4e02e744b470e..6df9065b13f68 100644
@@ -319,18 +319,16 @@ struct async_event_msg_resp {
 } __packed;
 
 #define MAX_CHAIN_CMDBUF_SIZE SZ_4K
-#define slot_cf_has_space(offset, payload_size) \
-	(MAX_CHAIN_CMDBUF_SIZE - ((offset) + (payload_size)) > \
-	 offsetof(struct cmd_chain_slot_execbuf_cf, args[0]))
+#define slot_has_space(slot, offset, payload_size)		\
+	(MAX_CHAIN_CMDBUF_SIZE >= (offset) + (payload_size) +	\
+	 sizeof(typeof(slot)))
+
 struct cmd_chain_slot_execbuf_cf {
 	__u32 cu_idx;
 	__u32 arg_cnt;
 	__u32 args[] __counted_by(arg_cnt);
 };
 
-#define slot_dpu_has_space(offset, payload_size) \
-	(MAX_CHAIN_CMDBUF_SIZE - ((offset) + (payload_size)) > \
-	 offsetof(struct cmd_chain_slot_dpu, args[0]))
 struct cmd_chain_slot_dpu {
 	__u64 inst_buf_addr;
 	__u32 inst_size;
Signature · 1 line
2.39.5
author maintainer
#110 lore raw

PATCH 110/780 drm/panthor: Fix the panthor_gpu_coherency_init() error path

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Boris Brezillon <[email protected]>

[ Upstream commit 938aaed555f3add76531cd204e2d4128ecb84ace ]

The panthor_gpu_coherency_init() call has been moved around, but the error path hasn't been adjusted accordingly. Make sure we undo what has been done before this call in case of failure.

---
 drivers/gpu/drm/panthor/panthor_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panthor/panthor_device.c +1 -1
index c73c1608d6e68..1e8811c6716df 100644
@@ -245,7 +245,7 @@ int panthor_device_init(struct panthor_device *ptdev)
 
 	ret = panthor_gpu_coherency_init(ptdev);
 	if (ret)
-		return ret;
+		goto err_unplug_gpu;
 
 	ret = panthor_mmu_init(ptdev);
 	if (ret)
Signature · 1 line
2.39.5
author maintainer
#111 lore raw

PATCH 111/780 perf: arm-ni: Unregister PMUs on probe failure

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Hongbo Yao <[email protected]>

[ Upstream commit 7f57afde6a44d9e044885e1125034edd4fda02e8 ]

When a resource allocation fails in one clock domain of an NI device, we need to properly roll back all previously registered perf PMUs in other clock domains of the same device.

Otherwise, it can lead to kernel panics.

Calling arm_ni_init+0x0/0xff8 [arm_ni] @ 2374
arm-ni ARMHCB70:00: Failed to request PMU region 0x1f3c13000 arm-ni ARMHCB70:00: probe with driver arm-ni failed with error -16 list_add corruption: next->prev should be prev (fffffd01e9698a18), but was 0000000000000000. (next=ffff10001a0decc8).
pstate: 6340009 (nZCv daif +PAN -UAO +TCO +DIT -SSBS BTYPE=--)

pc : list_add_valid_or_report+0x7c/0xb8
lr : list_add_valid_or_report+0x7c/0xb8
Call trace:
 __list_add_valid_or_report+0x7c/0xb8
 perf_pmu_register+0x22c/0x3a0
 arm_ni_probe+0x554/0x70c [arm_ni]
 platform_probe+0x70/0xe8
 really_probe+0xc6/0x4d8
 driver_probe_device+0x48/0x170
 __driver_attach+0x8e/0x1c0
 bus_for_each_dev+0x64/0xf0
 driver_add+0x138/0x260
 bus_add_driver+0x68/0x138
 __platform_driver_register+0x2c/0x40
 arm_ni_init+0x14/0x2a [arm_ni]
 do_init_module+0x36/0x298
---[ end trace 0000000000000000 ]---
Kernel panic - not syncing: Oops - BUG: Fatal exception

SMP: stopping secondary CPUs

Fixes 4d5a7680f2b4 ("perf: Add driver for Arm NI-700 interconnect PMU")
---
 drivers/perf/arm-ni.c | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)
drivers/perf/arm-ni.c +21 -18
index fd7a5e60e9630..0c418a7ee10f3 100644
@@ -575,6 +575,23 @@ static int arm_ni_init_cd(struct arm_ni *ni, struct arm_ni_node *node, u64 res_s
 	return err;
 }
 
+static void arm_ni_remove(struct platform_device *pdev)
+{
+	struct arm_ni *ni = platform_get_drvdata(pdev);
+
+	for (int i = 0; i < ni->num_cds; i++) {
+		struct arm_ni_cd *cd = ni->cds + i;
+
+		if (!cd->pmu_base)
+			continue;
+
+		writel_relaxed(0, cd->pmu_base + NI_PMCR);
+		writel_relaxed(U32_MAX, cd->pmu_base + NI_PMINTENCLR);
+		perf_pmu_unregister(&cd->pmu);
+		cpuhp_state_remove_instance_nocalls(arm_ni_hp_state, &cd->cpuhp_node);
+	}
+}
+
 static void arm_ni_probe_domain(void __iomem *base, struct arm_ni_node *node)
 {
 	u32 reg = readl_relaxed(base + NI_NODE_TYPE);
@@ -656,8 +673,11 @@ static int arm_ni_probe(struct platform_device *pdev)
 				reg = readl_relaxed(pd.base + NI_CHILD_PTR(c));
 				arm_ni_probe_domain(base + reg, &cd);
 				ret = arm_ni_init_cd(ni, &cd, res->start);
-				if (ret)
+				if (ret) {
+					ni->cds[cd.id].pmu_base = NULL;
+					arm_ni_remove(pdev);
 					return ret;
+				}
 			}
 		}
 	}
@@ -665,23 +685,6 @@ static int arm_ni_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static void arm_ni_remove(struct platform_device *pdev)
-{
-	struct arm_ni *ni = platform_get_drvdata(pdev);
-
-	for (int i = 0; i < ni->num_cds; i++) {
-		struct arm_ni_cd *cd = ni->cds + i;
-
-		if (!cd->pmu_base)
-			continue;
-
-		writel_relaxed(0, cd->pmu_base + NI_PMCR);
-		writel_relaxed(U32_MAX, cd->pmu_base + NI_PMINTENCLR);
-		perf_pmu_unregister(&cd->pmu);
-		cpuhp_state_remove_instance_nocalls(arm_ni_hp_state, &cd->cpuhp_node);
-	}
-}
-
 #ifdef CONFIG_OF
 static const struct of_device_id arm_ni_of_match[] = {
 	{ .compatible = "arm,ni-700" },
Signature · 1 line
2.39.5
author maintainer
#112 lore raw

PATCH 112/780 perf: arm-ni: Fix missing platform_set_drvdata()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Hongbo Yao <[email protected]>

[ Upstream commit fc5106088d6db75df61308ef6de314d1f7959646 ]

Add missing platform_set_drvdata in arm_ni_probe(), otherwise calling platform_get_drvdata() in remove returns NULL.

Fixes 4d5a7680f2b4 ("perf: Add driver for Arm NI-700 interconnect PMU")
---
 drivers/perf/arm-ni.c | 1 +
 1 file changed, 1 insertion(+)
drivers/perf/arm-ni.c +1 -0
index 0c418a7ee10f3..de7b6cce4d68a 100644
@@ -660,6 +660,7 @@ static int arm_ni_probe(struct platform_device *pdev)
 	ni->num_cds = num_cds;
 	ni->part = part;
 	ni->id = atomic_fetch_inc(&id);
+	platform_set_drvdata(pdev, ni);
 
 	for (int v = 0; v < cfg.num_components; v++) {
 		reg = readl_relaxed(cfg.base + NI_CHILD_PTR(v));
Signature · 1 line
2.39.5
author maintainer
#113 lore raw

PATCH 113/780 drm/amdgpu: Refine Cleaner Shader MEC firmware version for GFX10.1.x GPUs

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Srinivasan Shanmugam <[email protected]>

[ Upstream commit d30f61076268fd7ce01e4ec9e4d84bfaf90365f7 ]

Update the minimum firmware version for the Cleaner Shader in the gfx_v10_0_sw_init function.

This change adjusts the minimum required firmware version for the MEC firmware from 152 to 151, allowing for broader compatibility with GFX10.1 GPUs.

Fixes 25961bad9212 ("drm/amdgpu/gfx10: Add cleaner shader for GFX10.1.10")
Cc Christian König <[email protected]>
Cc Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1 -1
index 23e6a05359c24..c68c2e2f4d61a 100644
@@ -4800,7 +4800,7 @@ static int gfx_v10_0_sw_init(struct amdgpu_ip_block *ip_block)
 		adev->gfx.cleaner_shader_size = sizeof(gfx_10_1_10_cleaner_shader_hex);
 		if (adev->gfx.me_fw_version >= 101 &&
 		    adev->gfx.pfp_fw_version  >= 158 &&
-		    adev->gfx.mec_fw_version >= 152) {
+		    adev->gfx.mec_fw_version >= 151) {
 			adev->gfx.enable_cleaner_shader = true;
 			r = amdgpu_gfx_cleaner_shader_sw_init(adev, adev->gfx.cleaner_shader_size);
 			if (r) {
Signature · 1 line
2.39.5
author maintainer
#114 lore raw

PATCH 114/780 drm/panel: samsung-sofef00: Drop s6e3fc2x01 support

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Casey Connolly <[email protected]>

[ Upstream commit e1eb7293ab4107e9e19fa609835e657fe30dfec7 ]

We never properly supported this panel and always used the wrong init sequence. Drop support so we can move it to it's own proper driver.

Fixes 5933baa36e26 ("drm/panel/samsung-sofef00: Add panel for OnePlus 6/T devices")
---
 drivers/gpu/drm/panel/panel-samsung-sofef00.c | 34 ++-----------------
 1 file changed, 2 insertions(+), 32 deletions(-)
drivers/gpu/drm/panel/panel-samsung-sofef00.c +2 -32
index 04ce925b3d9db..49cfa84b34f0c 100644
@@ -22,7 +22,6 @@ struct sofef00_panel {
 	struct mipi_dsi_device *dsi;
 	struct regulator *supply;
 	struct gpio_desc *reset_gpio;
-	const struct drm_display_mode *mode;
 };
 
 static inline
@@ -159,26 +158,11 @@ static const struct drm_display_mode enchilada_panel_mode = {
 	.height_mm = 145,
 };
 
-static const struct drm_display_mode fajita_panel_mode = {
-	.clock = (1080 + 72 + 16 + 36) * (2340 + 32 + 4 + 18) * 60 / 1000,
-	.hdisplay = 1080,
-	.hsync_start = 1080 + 72,
-	.hsync_end = 1080 + 72 + 16,
-	.htotal = 1080 + 72 + 16 + 36,
-	.vdisplay = 2340,
-	.vsync_start = 2340 + 32,
-	.vsync_end = 2340 + 32 + 4,
-	.vtotal = 2340 + 32 + 4 + 18,
-	.width_mm = 68,
-	.height_mm = 145,
-};
-
 static int sofef00_panel_get_modes(struct drm_panel *panel, struct drm_connector *connector)
 {
 	struct drm_display_mode *mode;
-	struct sofef00_panel *ctx = to_sofef00_panel(panel);
 
-	mode = drm_mode_duplicate(connector->dev, ctx->mode);
+	mode = drm_mode_duplicate(connector->dev, &enchilada_panel_mode);
 	if (!mode)
 		return -ENOMEM;
 
@@ -239,13 +223,6 @@ static int sofef00_panel_probe(struct mipi_dsi_device *dsi)
 	if (!ctx)
 		return -ENOMEM;
 
-	ctx->mode = of_device_get_match_data(dev);
-
-	if (!ctx->mode) {
-		dev_err(dev, "Missing device mode\n");
-		return -ENODEV;
-	}
-
 	ctx->supply = devm_regulator_get(dev, "vddio");
 	if (IS_ERR(ctx->supply))
 		return dev_err_probe(dev, PTR_ERR(ctx->supply),
@@ -295,14 +272,7 @@ static void sofef00_panel_remove(struct mipi_dsi_device *dsi)
 }
 
 static const struct of_device_id sofef00_panel_of_match[] = {
-	{ // OnePlus 6 / enchilada
-		.compatible = "samsung,sofef00",
-		.data = &enchilada_panel_mode,
-	},
-	{ // OnePlus 6T / fajita
-		.compatible = "samsung,s6e3fc2x01",
-		.data = &fajita_panel_mode,
-	},
+	{ .compatible = "samsung,sofef00" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sofef00_panel_of_match);
Signature · 1 line
2.39.5
author maintainer
#115 lore raw

PATCH 115/780 drm/bridge: lt9611uxc: Fix an error handling path in lt9611uxc_probe()

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Christophe JAILLET <[email protected]>

[ Upstream commit b848cd418aebdb313364b4843f41fae82281a823 ]

If lt9611uxc_audio_init() fails, some resources still need to be released before returning the error code.

Use the existing error handling path.

---
 drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/lontium-lt9611uxc.c +5 -1
index f4c3ff1fdc692..f6e714feeea54 100644
@@ -880,7 +880,11 @@ static int lt9611uxc_probe(struct i2c_client *client)
 		}
 	}
 
-	return lt9611uxc_audio_init(dev, lt9611uxc);
+	ret = lt9611uxc_audio_init(dev, lt9611uxc);
+	if (ret)
+		goto err_remove_bridge;
+
+	return 0;
 
 err_remove_bridge:
 	free_irq(client->irq, lt9611uxc);
Signature · 1 line
2.39.5
author maintainer
#116 lore raw

PATCH 116/780 drm/v3d: Associate a V3D tech revision to all supported devices

In reply to Greg Kroah-Hartman

6.15-stable review patch. If anyone has any objections, please let me know.

------------------

From: Maíra Canal <[email protected]>

[ Upstream commit 76dbd0973c555037931d2ed055a4a69e592caad4 ]

The V3D driver currently determines the GPU tech version (33, 41...) by reading a register. This approach has worked so far since this information wasn’t needed before powering on the GPU.

V3D 7.1 introduces new registers that must be written to power on the GPU, requiring us to know the V3D version beforehand. To address this, associate each supported SoC with the corresponding VideoCore GPU version as part of the device data.

To prevent possible mistakes, add an assertion to verify that the version specified in the device data matches the one reported by the hardware. If there is a mismatch, the kernel will trigger a warning.

With the goal of maintaining consistency around the driver, use enum v3d_gen to assign values to v3d->ver and for comparisons with other V3D generations. Note that all mentions of unsupported or non-existing V3D generations (such as V3D 4.0) were removed by this commit and replaced with supported generations without functional changes.

Stable-dep-of: d0e4c6537005 ("drm/v3d: fix client obtained from axi_ids on V3D 4.1")

---
 drivers/gpu/drm/v3d/v3d_debugfs.c | 126 +++++++++++++++---------------
 drivers/gpu/drm/v3d/v3d_drv.c     |  22 ++++--
 drivers/gpu/drm/v3d/v3d_drv.h     |  11 ++-
 drivers/gpu/drm/v3d/v3d_gem.c     |  10 +--
 drivers/gpu/drm/v3d/v3d_irq.c     |   6 +-
 drivers/gpu/drm/v3d/v3d_perfmon.c |   4 +-
 drivers/gpu/drm/v3d/v3d_sched.c   |   6 +-
 7 files changed, 101 insertions(+), 84 deletions(-)
drivers/gpu/drm/v3d/v3d_debugfs.c +63 -63
index 76816f2551c10..7e789e181af0a 100644
@@ -21,74 +21,74 @@ struct v3d_reg_def {
 };
 
 static const struct v3d_reg_def v3d_hub_reg_defs[] = {
-	REGDEF(33, 42, V3D_HUB_AXICFG),
-	REGDEF(33, 71, V3D_HUB_UIFCFG),
-	REGDEF(33, 71, V3D_HUB_IDENT0),
-	REGDEF(33, 71, V3D_HUB_IDENT1),
-	REGDEF(33, 71, V3D_HUB_IDENT2),
-	REGDEF(33, 71, V3D_HUB_IDENT3),
-	REGDEF(33, 71, V3D_HUB_INT_STS),
-	REGDEF(33, 71, V3D_HUB_INT_MSK_STS),
-
-	REGDEF(33, 71, V3D_MMU_CTL),
-	REGDEF(33, 71, V3D_MMU_VIO_ADDR),
-	REGDEF(33, 71, V3D_MMU_VIO_ID),
-	REGDEF(33, 71, V3D_MMU_DEBUG_INFO),
-
-	REGDEF(71, 71, V3D_GMP_STATUS(71)),
-	REGDEF(71, 71, V3D_GMP_CFG(71)),
-	REGDEF(71, 71, V3D_GMP_VIO_ADDR(71)),
+	REGDEF(V3D_GEN_33, V3D_GEN_42, V3D_HUB_AXICFG),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_HUB_UIFCFG),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_HUB_IDENT0),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_HUB_IDENT1),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_HUB_IDENT2),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_HUB_IDENT3),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_HUB_INT_STS),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_HUB_INT_MSK_STS),
+
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_MMU_CTL),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_MMU_VIO_ADDR),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_MMU_VIO_ID),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_MMU_DEBUG_INFO),
+
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_GMP_STATUS(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_GMP_CFG(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_GMP_VIO_ADDR(71)),
 };
 
 static const struct v3d_reg_def v3d_gca_reg_defs[] = {
-	REGDEF(33, 33, V3D_GCA_SAFE_SHUTDOWN),
-	REGDEF(33, 33, V3D_GCA_SAFE_SHUTDOWN_ACK),
+	REGDEF(V3D_GEN_33, V3D_GEN_33, V3D_GCA_SAFE_SHUTDOWN),
+	REGDEF(V3D_GEN_33, V3D_GEN_33, V3D_GCA_SAFE_SHUTDOWN_ACK),
 };
 
 static const struct v3d_reg_def v3d_core_reg_defs[] = {
-	REGDEF(33, 71, V3D_CTL_IDENT0),
-	REGDEF(33, 71, V3D_CTL_IDENT1),
-	REGDEF(33, 71, V3D_CTL_IDENT2),
-	REGDEF(33, 71, V3D_CTL_MISCCFG),
-	REGDEF(33, 71, V3D_CTL_INT_STS),
-	REGDEF(33, 71, V3D_CTL_INT_MSK_STS),
-	REGDEF(33, 71, V3D_CLE_CT0CS),
-	REGDEF(33, 71, V3D_CLE_CT0CA),
-	REGDEF(33, 71, V3D_CLE_CT0EA),
-	REGDEF(33, 71, V3D_CLE_CT1CS),
-	REGDEF(33, 71, V3D_CLE_CT1CA),
-	REGDEF(33, 71, V3D_CLE_CT1EA),
-
-	REGDEF(33, 71, V3D_PTB_BPCA),
-	REGDEF(33, 71, V3D_PTB_BPCS),
-
-	REGDEF(33, 42, V3D_GMP_STATUS(33)),
-	REGDEF(33, 42, V3D_GMP_CFG(33)),
-	REGDEF(33, 42, V3D_GMP_VIO_ADDR(33)),
-
-	REGDEF(33, 71, V3D_ERR_FDBGO),
-	REGDEF(33, 71, V3D_ERR_FDBGB),
-	REGDEF(33, 71, V3D_ERR_FDBGS),
-	REGDEF(33, 71, V3D_ERR_STAT),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CTL_IDENT0),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CTL_IDENT1),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CTL_IDENT2),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CTL_MISCCFG),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CTL_INT_STS),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CTL_INT_MSK_STS),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CLE_CT0CS),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CLE_CT0CA),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CLE_CT0EA),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CLE_CT1CS),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CLE_CT1CA),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_CLE_CT1EA),
+
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_PTB_BPCA),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_PTB_BPCS),
+
+	REGDEF(V3D_GEN_33, V3D_GEN_42, V3D_GMP_STATUS(33)),
+	REGDEF(V3D_GEN_33, V3D_GEN_42, V3D_GMP_CFG(33)),
+	REGDEF(V3D_GEN_33, V3D_GEN_42, V3D_GMP_VIO_ADDR(33)),
+
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_ERR_FDBGO),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_ERR_FDBGB),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_ERR_FDBGS),
+	REGDEF(V3D_GEN_33, V3D_GEN_71, V3D_ERR_STAT),
 };
 
 static const struct v3d_reg_def v3d_csd_reg_defs[] = {
-	REGDEF(41, 71, V3D_CSD_STATUS),
-	REGDEF(41, 42, V3D_CSD_CURRENT_CFG0(41)),
-	REGDEF(41, 42, V3D_CSD_CURRENT_CFG1(41)),
-	REGDEF(41, 42, V3D_CSD_CURRENT_CFG2(41)),
-	REGDEF(41, 42, V3D_CSD_CURRENT_CFG3(41)),
-	REGDEF(41, 42, V3D_CSD_CURRENT_CFG4(41)),
-	REGDEF(41, 42, V3D_CSD_CURRENT_CFG5(41)),
-	REGDEF(41, 42, V3D_CSD_CURRENT_CFG6(41)),
-	REGDEF(71, 71, V3D_CSD_CURRENT_CFG0(71)),
-	REGDEF(71, 71, V3D_CSD_CURRENT_CFG1(71)),
-	REGDEF(71, 71, V3D_CSD_CURRENT_CFG2(71)),
-	REGDEF(71, 71, V3D_CSD_CURRENT_CFG3(71)),
-	REGDEF(71, 71, V3D_CSD_CURRENT_CFG4(71)),
-	REGDEF(71, 71, V3D_CSD_CURRENT_CFG5(71)),
-	REGDEF(71, 71, V3D_CSD_CURRENT_CFG6(71)),
-	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG7),
+	REGDEF(V3D_GEN_41, V3D_GEN_71, V3D_CSD_STATUS),
+	REGDEF(V3D_GEN_41, V3D_GEN_42, V3D_CSD_CURRENT_CFG0(41)),
+	REGDEF(V3D_GEN_41, V3D_GEN_42, V3D_CSD_CURRENT_CFG1(41)),
+	REGDEF(V3D_GEN_41, V3D_GEN_42, V3D_CSD_CURRENT_CFG2(41)),
+	REGDEF(V3D_GEN_41, V3D_GEN_42, V3D_CSD_CURRENT_CFG3(41)),
+	REGDEF(V3D_GEN_41, V3D_GEN_42, V3D_CSD_CURRENT_CFG4(41)),
+	REGDEF(V3D_GEN_41, V3D_GEN_42, V3D_CSD_CURRENT_CFG5(41)),
+	REGDEF(V3D_GEN_41, V3D_GEN_42, V3D_CSD_CURRENT_CFG6(41)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_CSD_CURRENT_CFG0(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_CSD_CURRENT_CFG1(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_CSD_CURRENT_CFG2(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_CSD_CURRENT_CFG3(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_CSD_CURRENT_CFG4(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_CSD_CURRENT_CFG5(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_CSD_CURRENT_CFG6(71)),
+	REGDEF(V3D_GEN_71, V3D_GEN_71, V3D_V7_CSD_CURRENT_CFG7),
 };
 
 static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused)
@@ -164,7 +164,7 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)
 		   str_yes_no(ident2 & V3D_HUB_IDENT2_WITH_MMU));
 	seq_printf(m, "TFU:        %s\n",
 		   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TFU));
-	if (v3d->ver <= 42) {
+	if (v3d->ver <= V3D_GEN_42) {
 		seq_printf(m, "TSY:        %s\n",
 			   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TSY));
 	}
@@ -196,11 +196,11 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)
 		seq_printf(m, "  QPUs:         %d\n", nslc * qups);
 		seq_printf(m, "  Semaphores:   %d\n",
 			   V3D_GET_FIELD(ident1, V3D_IDENT1_NSEM));
-		if (v3d->ver <= 42) {
+		if (v3d->ver <= V3D_GEN_42) {
 			seq_printf(m, "  BCG int:      %d\n",
 				   (ident2 & V3D_IDENT2_BCG_INT) != 0);
 		}
-		if (v3d->ver < 40) {
+		if (v3d->ver < V3D_GEN_41) {
 			seq_printf(m, "  Override TMU: %d\n",
 				   (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0);
 		}
@@ -234,7 +234,7 @@ static int v3d_measure_clock(struct seq_file *m, void *unused)
 	int core = 0;
 	int measure_ms = 1000;
 
-	if (v3d->ver >= 40) {
+	if (v3d->ver >= V3D_GEN_41) {
 		int cycle_count_reg = V3D_PCTR_CYCLE_COUNT(v3d->ver);
 		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3,
 			       V3D_SET_FIELD_VER(cycle_count_reg,
drivers/gpu/drm/v3d/v3d_drv.c +16 -6
index 852015214e971..aa68be8fe86b7 100644
@@ -17,6 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/sched/clock.h>
@@ -92,7 +93,7 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
 		args->value = 1;
 		return 0;
 	case DRM_V3D_PARAM_SUPPORTS_PERFMON:
-		args->value = (v3d->ver >= 40);
+		args->value = (v3d->ver >= V3D_GEN_41);
 		return 0;
 	case DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT:
 		args->value = 1;
@@ -254,10 +255,10 @@ static const struct drm_driver v3d_drm_driver = {
 };
 
 static const struct of_device_id v3d_of_match[] = {
-	{ .compatible = "brcm,2711-v3d" },
-	{ .compatible = "brcm,2712-v3d" },
-	{ .compatible = "brcm,7268-v3d" },
-	{ .compatible = "brcm,7278-v3d" },
+	{ .compatible = "brcm,2711-v3d", .data = (void *)V3D_GEN_42 },
+	{ .compatible = "brcm,2712-v3d", .data = (void *)V3D_GEN_71 },
+	{ .compatible = "brcm,7268-v3d", .data = (void *)V3D_GEN_33 },
+	{ .compatible = "brcm,7278-v3d", .data = (void *)V3D_GEN_41 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, v3d_of_match);
@@ -274,6 +275,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct drm_device *drm;
 	struct v3d_dev *v3d;
+	enum v3d_gen gen;
 	int ret;
 	u32 mmu_debug;
 	u32 ident1, ident3;
@@ -287,6 +289,9 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, drm);
 
+	gen = (uintptr_t)of_device_get_match_data(dev);
+	v3d->ver = gen;
+
 	ret = map_regs(v3d, &v3d->hub_regs, "hub");
 	if (ret)
 		return ret;
@@ -316,6 +321,11 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
 	ident1 = V3D_READ(V3D_HUB_IDENT1);
 	v3d->ver = (V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_TVER) * 10 +
 		    V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_REV));
+	/* Make sure that the V3D tech version retrieved from the HW is equal
+	 * to the one advertised by the device tree.
+	 */
+	WARN_ON(v3d->ver != gen);
+
 	v3d->cores = V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_NCORES);
 	WARN_ON(v3d->cores > 1); /* multicore not yet implemented */
 
@@ -340,7 +350,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
 		}
 	}
 
-	if (v3d->ver < 41) {
+	if (v3d->ver < V3D_GEN_41) {
 		ret = map_regs(v3d, &v3d->gca_regs, "gca");
 		if (ret)
 			goto clk_disable;
drivers/gpu/drm/v3d/v3d_drv.h +9 -2
index 9deaefa0f95b7..de4a9e18f6a90 100644
@@ -94,11 +94,18 @@ struct v3d_perfmon {
 	u64 values[] __counted_by(ncounters);
 };
 
+enum v3d_gen {
+	V3D_GEN_33 = 33,
+	V3D_GEN_41 = 41,
+	V3D_GEN_42 = 42,
+	V3D_GEN_71 = 71,
+};
+
 struct v3d_dev {
 	struct drm_device drm;
 
 	/* Short representation (e.g. 33, 41) of the V3D tech version */
-	int ver;
+	enum v3d_gen ver;
 
 	/* Short representation (e.g. 5, 6) of the V3D tech revision */
 	int rev;
@@ -199,7 +206,7 @@ to_v3d_dev(struct drm_device *dev)
 static inline bool
 v3d_has_csd(struct v3d_dev *v3d)
 {
-	return v3d->ver >= 41;
+	return v3d->ver >= V3D_GEN_41;
 }
 
 #define v3d_to_pdev(v3d) to_platform_device((v3d)->drm.dev)
drivers/gpu/drm/v3d/v3d_gem.c +5 -5
index b1e681630ded0..1ea6d3832c221 100644
@@ -25,7 +25,7 @@ v3d_init_core(struct v3d_dev *v3d, int core)
 	 * type.  If you want the default behavior, you can still put
 	 * "2" in the indirect texture state's output_type field.
 	 */
-	if (v3d->ver < 40)
+	if (v3d->ver < V3D_GEN_41)
 		V3D_CORE_WRITE(core, V3D_CTL_MISCCFG, V3D_MISCCFG_OVRTMUOUT);
 
 	/* Whenever we flush the L2T cache, we always want to flush
@@ -58,7 +58,7 @@ v3d_idle_axi(struct v3d_dev *v3d, int core)
 static void
 v3d_idle_gca(struct v3d_dev *v3d)
 {
-	if (v3d->ver >= 41)
+	if (v3d->ver >= V3D_GEN_41)
 		return;
 
 	V3D_GCA_WRITE(V3D_GCA_SAFE_SHUTDOWN, V3D_GCA_SAFE_SHUTDOWN_EN);
@@ -132,13 +132,13 @@ v3d_reset(struct v3d_dev *v3d)
 static void
 v3d_flush_l3(struct v3d_dev *v3d)
 {
-	if (v3d->ver < 41) {
+	if (v3d->ver < V3D_GEN_41) {
 		u32 gca_ctrl = V3D_GCA_READ(V3D_GCA_CACHE_CTRL);
 
 		V3D_GCA_WRITE(V3D_GCA_CACHE_CTRL,
 			      gca_ctrl | V3D_GCA_CACHE_CTRL_FLUSH);
 
-		if (v3d->ver < 33) {
+		if (v3d->ver < V3D_GEN_33) {
 			V3D_GCA_WRITE(V3D_GCA_CACHE_CTRL,
 				      gca_ctrl & ~V3D_GCA_CACHE_CTRL_FLUSH);
 		}
@@ -151,7 +151,7 @@ v3d_flush_l3(struct v3d_dev *v3d)
 static void
 v3d_invalidate_l2c(struct v3d_dev *v3d, int core)
 {
-	if (v3d->ver > 32)
+	if (v3d->ver >= V3D_GEN_33)
 		return;
 
 	V3D_CORE_WRITE(core, V3D_CTL_L2CACTL,
drivers/gpu/drm/v3d/v3d_irq.c +3 -3
index 72b6a119412fa..29f63f572d35b 100644
@@ -143,7 +143,7 @@ v3d_irq(int irq, void *arg)
 	/* We shouldn't be triggering these if we have GMP in
 	 * always-allowed mode.
 	 */
-	if (v3d->ver < 71 && (intsts & V3D_INT_GMPV))
+	if (v3d->ver < V3D_GEN_71 && (intsts & V3D_INT_GMPV))
 		dev_err(v3d->drm.dev, "GMP violation\n");
 
 	/* V3D 4.2 wires the hub and core IRQs together, so if we &
@@ -200,7 +200,7 @@ v3d_hub_irq(int irq, void *arg)
 
 		V3D_WRITE(V3D_MMU_CTL, V3D_READ(V3D_MMU_CTL));
 
-		if (v3d->ver >= 41) {
+		if (v3d->ver >= V3D_GEN_41) {
 			axi_id = axi_id >> 5;
 			if (axi_id < ARRAY_SIZE(v3d41_axi_ids))
 				client = v3d41_axi_ids[axi_id];
@@ -217,7 +217,7 @@ v3d_hub_irq(int irq, void *arg)
 		status = IRQ_HANDLED;
 	}
 
-	if (v3d->ver >= 71 && (intsts & V3D_V7_HUB_INT_GMPV)) {
+	if (v3d->ver >= V3D_GEN_71 && (intsts & V3D_V7_HUB_INT_GMPV)) {
 		dev_err(v3d->drm.dev, "GMP Violation\n");
 		status = IRQ_HANDLED;
 	}
drivers/gpu/drm/v3d/v3d_perfmon.c +2 -2
index 3ebda2fa46fc4..9a3fe52558746 100644
@@ -200,10 +200,10 @@ void v3d_perfmon_init(struct v3d_dev *v3d)
 	const struct v3d_perf_counter_desc *counters = NULL;
 	unsigned int max = 0;
 
-	if (v3d->ver >= 71) {
+	if (v3d->ver >= V3D_GEN_71) {
 		counters = v3d_v71_performance_counters;
 		max = ARRAY_SIZE(v3d_v71_performance_counters);
-	} else if (v3d->ver >= 42) {
+	} else if (v3d->ver >= V3D_GEN_42) {
 		counters = v3d_v42_performance_counters;
 		max = ARRAY_SIZE(v3d_v42_performance_counters);
 	}
drivers/gpu/drm/v3d/v3d_sched.c +3 -3
index eb35482f6fb57..35f131a46d070 100644
@@ -357,11 +357,11 @@ v3d_tfu_job_run(struct drm_sched_job *sched_job)
 	V3D_WRITE(V3D_TFU_ICA(v3d->ver), job->args.ica);
 	V3D_WRITE(V3D_TFU_IUA(v3d->ver), job->args.iua);
 	V3D_WRITE(V3D_TFU_IOA(v3d->ver), job->args.ioa);
-	if (v3d->ver >= 71)
+	if (v3d->ver >= V3D_GEN_71)
 		V3D_WRITE(V3D_V7_TFU_IOC, job->args.v71.ioc);
 	V3D_WRITE(V3D_TFU_IOS(v3d->ver), job->args.ios);
 	V3D_WRITE(V3D_TFU_COEF0(v3d->ver), job->args.coef[0]);
-	if (v3d->ver >= 71 || (job->args.coef[0] & V3D_TFU_COEF0_USECOEF)) {
+	if (v3d->ver >= V3D_GEN_71 || (job->args.coef[0] & V3D_TFU_COEF0_USECOEF)) {
 		V3D_WRITE(V3D_TFU_COEF1(v3d->ver), job->args.coef[1]);
 		V3D_WRITE(V3D_TFU_COEF2(v3d->ver), job->args.coef[2]);
 		V3D_WRITE(V3D_TFU_COEF3(v3d->ver), job->args.coef[3]);
@@ -412,7 +412,7 @@ v3d_csd_job_run(struct drm_sched_job *sched_job)
 	 *
 	 * XXX: Set the CFG7 register
 	 */
-	if (v3d->ver >= 71)
+	if (v3d->ver >= V3D_GEN_71)
 		V3D_CORE_WRITE(0, V3D_V7_CSD_QUEUED_CFG7, 0);
 
 	/* CFG0 write kicks off the job. */
Signature · 1 line
2.39.5