6.6.44-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 6.6.44-rc1 review
This is the start of the stable review cycle for the 6.6.44 release. There are 568 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, 01 Aug 2024 15:14:54 +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.6.44-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.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.6.44-rc1
Seth Forshee (DigitalOcean) <[email protected]>
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Leon Romanovsky <[email protected]>
nvme-pci: add missing condition check for existence of mapped data
Pavel Begunkov <[email protected]>
io_uring: fix io_match_task must_hold
Artem Chernyshev <[email protected]>
iommu: sprd: Avoid NULL deref in sprd_iommu_hw_en
Thomas Richter <[email protected]>
s390/cpum_cf: Fix endless loop in CF_DIAG event stop
Gerd Bayer <[email protected]>
s390/pci: Allow allocation of more than 1 MSI interrupt
Gerd Bayer <[email protected]>
s390/pci: Refactor arch_setup_msi_irqs()
ethanwu <[email protected]>
ceph: fix incorrect kmalloc size of pagevec mempool
Dan Carpenter <[email protected]>
ASoC: TAS2781: Fix tasdev_load_calibrated_data()
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Conor Dooley <[email protected]>
spi: spidev: add correct compatible for Rohm BH2228FV
Venkata Prasad Potturu <[email protected]>
ASoC: sof: amd: fix for firmware reload failure in Vangogh platform
Bart Van Assche <[email protected]>
nvme-pci: Fix the instructions for disabling power management
Steve Wilkins <[email protected]>
spi: microchip-core: ensure TX and RX FIFOs are empty at start of a transfer
Steve Wilkins <[email protected]>
spi: microchip-core: fix init function not setting the master and motorola modes
Yang Yingliang <[email protected]>
spi: microchip-core: switch to use modern name
Steve Wilkins <[email protected]>
spi: microchip-core: only disable SPI controller when register value change requires it
Steve Wilkins <[email protected]>
spi: microchip-core: defer asserting chip select until just before write to TX FIFO
Naga Sureshkumar Relli <[email protected]>
spi: microchip-core: fix the issues in the isr
Daniel Baluta <[email protected]>
ASoC: SOF: imx8m: Fix DSP control regmap retrieval
Markus Elfring <[email protected]>
auxdisplay: ht16k33: Drop reference after LED registration
Al Viro <[email protected]>
lirc: rc_dev_get_from_fd(): fix file leak
Al Viro <[email protected]>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <[email protected]>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <[email protected]>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <[email protected]>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <[email protected]>
net: nexthop: Initialize all fields in dumped nexthops
Simon Horman <[email protected]>
net: stmmac: Correct byte order of perfect_match
Shigeru Yoshida <[email protected]>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo_avx2: disable softinterrupts
Wojciech Drewek <[email protected]>
ice: Fix recipe read procedure
Johannes Berg <[email protected]>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <[email protected]>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <[email protected]>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Liwei Song <[email protected]>
tools/resolve_btfids: Fix comparison of distinct pointer types warning in resolve_btfids
Hou Tao <[email protected]>
bpf, events: Use prog to emit ksymbol event for main program
Lance Richardson <[email protected]>
dma: fix call order in dmam_free_coherent
Michal Luczaj <[email protected]>
af_unix: Disable MSG_OOB handling for sockets in sockmap/sockhash
Andrii Nakryiko <[email protected]>
libbpf: Fix no-args func prototype BTF dumping syntax
Puranjay Mohan <[email protected]>
selftests/bpf: fexit_sleep: Fix stack allocation for arm64
Masahiro Yamada <[email protected]>
kbuild: avoid build error when single DTB is turned into composite DTB
Chao Yu <[email protected]>
f2fs: fix to update user block counts in block_operations()
Claudiu Beznea <[email protected]>
watchdog: rzg2l_wdt: Check return status of pm_runtime_put()
Claudiu Beznea <[email protected]>
watchdog: rzg2l_wdt: Use pm_runtime_resume_and_get()
Sheng Yong <[email protected]>
f2fs: fix start segno of large section
Johannes Berg <[email protected]>
um: time-travel: fix signal blocking race/hang
Johannes Berg <[email protected]>
um: time-travel: fix time-travel-start option
Sean Anderson <[email protected]>
phy: zynqmp: Enable reference clock correctly
Ma Ke <[email protected]>
phy: cadence-torrent: Check return value on register read
Vignesh Raghavendra <[email protected]>
dmaengine: ti: k3-udma: Fix BCHAN count with UHC and HC channels
Jeongjun Park <[email protected]>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <[email protected]>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <[email protected]>
kdb: address -Wformat-security warnings
Chao Yu <[email protected]>
f2fs: fix to truncate preallocated blocks in f2fs_file_open()
Gerald Schaefer <[email protected]>
s390/mm: Fix VM_FAULT_HWPOISON handling in do_exception()
Lukas Wunner <[email protected]>
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Ira Weiny <[email protected]>
PCI: Introduce cleanup helpers for device reference counts and locks
Johannes Berg <[email protected]>
wifi: mac80211: track capability/opmode NSS separately
Yu Zhao <[email protected]>
mm/mglru: fix ineffective protection calculation
Ryusuke Konishi <[email protected]>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
Linus Torvalds <[email protected]>
minmax: scsi: fix mis-use of 'clamp()' in sr.c
WangYuli <[email protected]>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <[email protected]>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Lucas Stach <[email protected]>
video: logo: Drop full path of the input filename in generated file
Uwe Kleine-König <[email protected]>
lib/build_OID_registry: don't mention the full path of the script in output
Ilya Dryomov <[email protected]>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <[email protected]>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <[email protected]>
drm/panfrost: Mark simple_ondemand governor as softdep
Lucas Stach <[email protected]>
drm/etnaviv: don't block scheduler when GPU is still active
Jiaxun Yang <[email protected]>
MIPS: Loongson64: Test register availability before use
Jiaxun Yang <[email protected]>
MIPS: Loongson64: reset: Prioritise firmware service
Jiaxun Yang <[email protected]>
MIPS: Loongson64: Remove memory node for builtin-dtb
Jiaxun Yang <[email protected]>
MIPS: Loongson64: env: Hook up Loongsson-2K
Jiaxun Yang <[email protected]>
MIPS: dts: loongson: Fix GMAC phy node
Jiaxun Yang <[email protected]>
MIPS: ip30: ip30-console: Add missing include
Jiaxun Yang <[email protected]>
MIPS: dts: loongson: Add ISA node
Aleksandr Mishin <[email protected]>
remoteproc: imx_rproc: Fix refcount mistake in imx_rproc_addr_init
Aleksandr Mishin <[email protected]>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Gwenael Treuveur <[email protected]>
remoteproc: stm32_rproc: Fix mailbox interrupts queuing
Ilya Dryomov <[email protected]>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Eric Biggers <[email protected]>
dm-verity: fix dm_is_verity_target() when dm-verity is builtin
Michael Ellerman <[email protected]>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <[email protected]>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <[email protected]>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <[email protected]>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <[email protected]>
rtc: abx80x: Fix return value of nvmem callback on read
Joy Chakraborty <[email protected]>
rtc: isl1208: Fix return value of nvmem callbacks
Imre Deak <[email protected]>
drm/i915/dp: Don't switch the LTTPR mode on an active link
Imre Deak <[email protected]>
drm/i915/dp: Reset intel_dp->link_trained before retraining the link
Ma Ke <[email protected]>
drm/amd/amdgpu: Fix uninitialized variable warnings
ZhenGuo Yin <[email protected]>
drm/amdgpu: reset vm state machine after gpu reset(vram lost)
Wayne Lin <[email protected]>
drm/dp_mst: Fix all mstb marked as not probed after suspend/resume
Thomas Zimmermann <[email protected]>
drm/udl: Remove DRM_CONNECTOR_POLL_HPD
Alex Deucher <[email protected]>
drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell
Nitin Gote <[email protected]>
drm/i915/gt: Do not consider preemption during execlists_dequeue for gen8
Adrian Hunter <[email protected]>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <[email protected]>
perf/x86/intel/pt: Fix topa_entry base length
Kan Liang <[email protected]>
perf/x86/intel/ds: Fix non 0 retire latency on Raptorlake
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix the bits of the CHA extended umask for SPR
Kan Liang <[email protected]>
perf stat: Fix the hard-coded metrics calculation on the hybrid
Frederic Weisbecker <[email protected]>
perf: Fix event leak upon exec and file release
Frederic Weisbecker <[email protected]>
perf: Fix event leak upon exit
Nilesh Javali <[email protected]>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <[email protected]>
scsi: qla2xxx: Complete command early within lock
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix flash read failure
Quinn Tran <[email protected]>
scsi: qla2xxx: Reduce fabric scan duplicate code
Quinn Tran <[email protected]>
scsi: qla2xxx: Use QP lock to search for bsg
Shreyas Deodhar <[email protected]>
scsi: qla2xxx: Fix for possible memory corruption
Quinn Tran <[email protected]>
scsi: qla2xxx: Unable to act on RSCN for port online
Manish Rangankar <[email protected]>
scsi: qla2xxx: During vport delete send async logout explicitly
Justin Tee <[email protected]>
scsi: lpfc: Allow DEVICE_RECOVERY mode after RSCN receipt if in PRLI_ISSUE state
Joy Chakraborty <[email protected]>
rtc: cmos: Fix return value of nvmem callbacks
Tvrtko Ursulin <[email protected]>
mm/numa_balancing: teach mpol_to_str about the balancing mode
Shenwei Wang <[email protected]>
irqchip/imx-irqsteer: Handle runtime power management correctly
Herve Codina <[email protected]>
irqdomain: Fixed unbalanced fwnode get and put
Zijun Hu <[email protected]>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Zijun Hu <[email protected]>
devres: Fix devm_krealloc() wasting memory
Ahmed Zaki <[email protected]>
ice: Add a per-VF limit on number of FDIR filters
Bailey Forrest <[email protected]>
gve: Fix an edge case for TSO skb validity check
Zijun Hu <[email protected]>
kobject_uevent: Fix OOB access within zap_modalias_env()
Takashi Iwai <[email protected]>
ASoC: amd: yc: Support mic on Lenovo Thinkpad E16 Gen 2
Peter Ujfalusi <[email protected]>
ASoC: SOF: ipc4-topology: Preserve the DMA Link ID for ChainDMA on unprepare
Nathan Chancellor <[email protected]>
kbuild: Fix '-S -c' in x86 stack protector scripts
Ross Lagerwall <[email protected]>
decompress_bunzip2: fix rare decompression failure
Ram Tummala <[email protected]>
mm: fix old/young bit handling in the faulting path
Yang Yang <[email protected]>
block: fix deadlock between sd_remove & sd_release
Fedor Pchelkin <[email protected]>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <[email protected]>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Sunmin Jeong <[email protected]>
f2fs: use meta inode for GC of COW file
Sunmin Jeong <[email protected]>
f2fs: use meta inode for GC of atomic file
Chao Yu <[email protected]>
f2fs: fix return value of f2fs_convert_inline_inode()
Chao Yu <[email protected]>
f2fs: fix to don't dirty inode for readonly filesystem
Chao Yu <[email protected]>
f2fs: fix to force buffered IO on inline_data inode
Herve Codina <[email protected]>
ASoC: fsl: fsl_qmc_audio: Check devm_kasprintf() returned value
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Huacai Chen <[email protected]>
fs/ntfs3: Update log->page_{mask,bits} if log->page_size changedQiang Ma <[email protected]>
efi/libstub: Zero initialize heap allocated struct screen_info
Johannes Berg <[email protected]>
hostfs: fix dev_t handling
tuhaowen <[email protected]>
dev/parport: fix the array out-of-bounds risk
Carlos Llamas <[email protected]>
binder: fix hang of unregistered readers
Huacai Chen <[email protected]>
PCI: loongson: Enable MSI in LS7A Root Complex
Manivannan Sadhasivam <[email protected]>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Niklas Cassel <[email protected]>
PCI: dw-rockchip: Fix initial PERST# GPIO value
Wei Liu <[email protected]>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
John David Anglin <[email protected]>
parisc: Fix warning at drivers/pci/msi/msi.h:121
Ilpo Järvinen <[email protected]>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <[email protected]>
tools/memory-model: Fix bug in lock.cat
wangdicheng <[email protected]>
ALSA: usb-audio: Add a quirk for Sonix HD USB Camera
Takashi Iwai <[email protected]>
ALSA: usb-audio: Move HD Webcam quirk to the right place
wangdicheng <[email protected]>
ALSA: usb-audio: Fix microphone sound on HD webcam.
Takashi Iwai <[email protected]>
ALSA: ump: Force 1 Group for MIDI1 FBs
Takashi Iwai <[email protected]>
ALSA: ump: Don't update FB name for static blocks
Sean Christopherson <[email protected]>
KVM: nVMX: Request immediate exit iff pending nested event needs injection
Sean Christopherson <[email protected]>
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Wentong Wu <[email protected]>
media: ivsc: csi: don't count privacy on as error
Ricardo Ribalda <[email protected]>
media: uvcvideo: Fix integer overflow calculating timestamp
Jan Kara <[email protected]>
jbd2: avoid infinite transaction commit loop
Jan Kara <[email protected]>
jbd2: precompute number of transaction descriptor blocks
Jan Kara <[email protected]>
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Harshit Mogalapalli <[email protected]>
media: imx-pxp: Fix ERR_PTR dereference in pxp_probe()
Wentong Wu <[email protected]>
media: ivsc: csi: add separate lock for v4l2 control handler
Javier Carrasco <[email protected]>
leds: mt6360: Fix memory leak in mt6360_init_isnk_properties()
Ofir Gal <[email protected]>
md/md-bitmap: fix writing non bitmap pages
Ilpo Järvinen <[email protected]>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Jay Buddhabhatti <[email protected]>
drivers: soc: xilinx: check return status of get_api_version()
Bitterblue Smith <[email protected]>
wifi: rtw88: usb: Fix disconnection after beacon loss
Rafael Beims <[email protected]>
wifi: mwifiex: Fix interface type change
Mickaël Salaün <[email protected]>
selftests/landlock: Add cred_transfer test
levi.yun <[email protected]>
trace/pid_list: Change gfp flags in pid_list_fill_irq()
Pavel Begunkov <[email protected]>
io_uring: tighten task exit cancellations
Baokun Li <[email protected]>
ext4: make sure the first directory block is not a hole
Baokun Li <[email protected]>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <[email protected]>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <[email protected]>
udf: Avoid using corrupted block bitmap buffer
Frederic Weisbecker <[email protected]>
task_work: Introduce task_work_cancel() again
Frederic Weisbecker <[email protected]>
task_work: s/task_work_cancel()/task_work_cancel_func()/
Steve French <[email protected]>
cifs: mount with "unix" mount option for SMB1 incorrectly handled
Steve French <[email protected]>
cifs: fix reconnect with SMB1 UNIX Extensions
Steve French <[email protected]>
cifs: fix potential null pointer use in destroy_workqueue in init_cifs error path
Fedor Pchelkin <[email protected]>
apparmor: use kvfree_sensitive to free data->data
Sung Joon Kim <[email protected]>
drm/amd/display: Check for NULL pointer
Shreyas Deodhar <[email protected]>
scsi: qla2xxx: Fix optrom version displayed in FDMI
Ma Ke <[email protected]>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <[email protected]>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Pavel Begunkov <[email protected]>
io_uring/io-wq: limit retrying worker initialisation
Jan Kara <[email protected]>
ext2: Verify bitmap and itable block numbers before using them
Chao Yu <[email protected]>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Igor Pylypiv <[email protected]>
ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error
Igor Pylypiv <[email protected]>
ata: libata-scsi: Do not overwrite valid sense data when CK_COND=1
Dikshita Agarwal <[email protected]>
media: venus: fix use after free in vdec_close
Joe Hattori <[email protected]>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Igor Pylypiv <[email protected]>
ata: libata-scsi: Fix offsets for the fixed format sense data
Eric Sandeen <[email protected]>
fuse: verify {g,u}id mount options correctly
Tejun Heo <[email protected]>
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Chuck Lever <[email protected]>
NFSD: Support write delegations in LAYOUTGET
Nicolas Dichtel <[email protected]>
ipv6: take care of scope when choosing the src addr
Nicolas Dichtel <[email protected]>
ipv4: fix source address selection with route leak
Pavel Begunkov <[email protected]>
kernel: rerun task_work while freezing in get_signal()
Filipe Manana <[email protected]>
btrfs: fix extent map use-after-free when adding pages to compressed bio
Chengen Du <[email protected]>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <[email protected]>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <[email protected]>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Krzysztof Kozlowski <[email protected]>
dt-bindings: thermal: correct thermal zone node name limit
Sungjong Seo <[email protected]>
exfat: fix potential deadlock on __exfat_get_dentry_set
Ard Biesheuvel <[email protected]>
x86/efistub: Revert to heap allocated boot_params for PE entrypoint
Ard Biesheuvel <[email protected]>
x86/efistub: Avoid returning EFI_SUCCESS on error
Yu Zhao <[email protected]>
mm/mglru: fix overshooting shrinker memory
Tetsuo Handa <[email protected]>
mm: mmap_lock: replace get_memcg_path_buf() with on-stack buffer
Yu Zhao <[email protected]>
mm/mglru: fix div-by-zero in vmpressure_calc_level()
Miaohe Lin <[email protected]>
mm/hugetlb: fix possible recursive locking detected warning
Aristeu Rozanski <[email protected]>
hugetlb: force allocating surplus hugepages on mempolicy allowed nodes
Jann Horn <[email protected]>
landlock: Don't lose track of restrictions on cred_transfer
Tiezhu Yang <[email protected]>
LoongArch: Check TIF_LOAD_WATCH to enable user space watchpoint
Yang Yang <[email protected]>
sbitmap: fix io hung due to race on sbitmap_word::cleared
linke li <[email protected]>
sbitmap: use READ_ONCE to access map->word
Carlos López <[email protected]>
s390/dasd: fix error checks in dasd_copy_pair_store()
Christophe Leroy <[email protected]>
powerpc/8xx: fix size given to set_huge_pte_at()
Konstantin Komarov <[email protected]>
fs/ntfs3: Keep runs for $MFT::$ATTR_DATA and $MFT::$ATTR_BITMAP
Konstantin Komarov <[email protected]>
fs/ntfs3: Missed error return
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix the format of the "nocase" mount option
Csókás, Bence <[email protected]>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <[email protected]>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
David Hildenbrand <[email protected]>
fs/proc/task_mmu: properly detect PM_MMAP_EXCLUSIVE per page of PMD-mapped THPs
David Hildenbrand <[email protected]>
fs/proc/task_mmu: don't indicate PM_MMAP_EXCLUSIVE without PM_PRESENT
Hui Zhu <[email protected]>
fs/proc/task_mmu.c: add_to_pagemap: remove useless parameter addr
David Hildenbrand <[email protected]>
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: Fix TPU suffixes
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: Fix TCLK suffixes
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: FIX PWM suffixes
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: Fix IRQ suffixes
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: Fix (H)SCIF3 suffixes
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: Fix (H)SCIF1 suffixes
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: Fix FXR_TXEN[AB] suffixes
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a779g0: Fix CANFD5 suffix
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix field-spanning write in INDEX_HDR
Andy Shevchenko <[email protected]>
fs/ntfs3: Drop stray '\' (backslash) in formatting string
Konstantin Komarov <[email protected]>
fs/ntfs3: Correct undo if ntfs_create_inode failed
Konstantin Komarov <[email protected]>
fs/ntfs3: Replace inode_trylock with inode_lock
Peng Fan <[email protected]>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <[email protected]>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <[email protected]>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <[email protected]>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <[email protected]>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Dmitry Yashin <[email protected]>
pinctrl: rockchip: update rk3308 iomux routes
Konstantin Komarov <[email protected]>
fs/ntfs3: Add missing .dirty_folio in address_space_operations
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix getting file type
Konstantin Komarov <[email protected]>
fs/ntfs3: Missed NI_FLAG_UPDATE_PARENT setting
Konstantin Komarov <[email protected]>
fs/ntfs3: Deny getting attr data block in compressed frame
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix transform resident to nonresident for compressed files
Konstantin Komarov <[email protected]>
fs/ntfs3: Merge synonym COMPRESSION_UNIT and NTFS_LZNT_CUNIT
Martin Willi <[email protected]>
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Martin Willi <[email protected]>
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
Ido Schimmel <[email protected]>
ipv4: Fix incorrect TOS in fibmatch route get reply
Ido Schimmel <[email protected]>
ipv4: Fix incorrect TOS in route get reply
Pablo Neira Ayuso <[email protected]>
net: flow_dissector: use DEBUG_NET_WARN_ON_ONCE
Joshua Washington <[email protected]>
gve: Fix XDP TX completion handling when counters overflow
Chen Hanxiao <[email protected]>
ipvs: properly dereference pe in ip_vs_add_service
Florian Westphal <[email protected]>
netfilter: nf_set_pipapo: fix initial map fill
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: constify lookup fn args where possible
Pablo Neira Ayuso <[email protected]>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <[email protected]>
bnxt_re: Fix imm_data endianness
David Ahern <[email protected]>
RDMA: Fix netdev tracker in ib_device_set_netdev
Jules Irenge <[email protected]>
RDMA/core: Remove NULL check before dev_{put, hold}Jon Pan-Doh <[email protected]>
iommu/vt-d: Fix identity map bounds in si_domain_init()
Chengchang Tang <[email protected]>
RDMA/hns: Fix insufficient extend DB for VFs.
Chengchang Tang <[email protected]>
RDMA/hns: Fix undifined behavior caused by invalid max_sge
Chengchang Tang <[email protected]>
RDMA/hns: Fix shift-out-bounds when max_inline_data is 0
Chengchang Tang <[email protected]>
RDMA/hns: Fix missing pagesize and alignment check in FRMR
Junxian Huang <[email protected]>
RDMA/hns: Fix unmatch exception handling when init eq table fails
Junxian Huang <[email protected]>
RDMA/hns: Check atomic wr length
Nick Bowler <[email protected]>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <[email protected]>
powerpc/xmon: Fix disassembly CPU feature checks
Frank Li <[email protected]>
PCI: dwc: Fix index 0 incorrectly being interpreted as a free ATU slot
Manivannan Sadhasivam <[email protected]>
PCI: qcom-ep: Disable resources unconditionally during PERST# assert
Dominique Martinet <[email protected]>
MIPS: Octeron: remove source file executable bit
Lorenzo Bianconi <[email protected]>
clk: en7523: fix rate divider for slic and spi clocks
Stephen Boyd <[email protected]>
clk: qcom: Park shared RCGs upon registration
Chen Ni <[email protected]>
clk: qcom: kpss-xcc: Return of_clk_add_hw_provider to transfer the error
Nivas Varadharajan Mugunthakumar <[email protected]>
crypto: qat - extend scope of lock in adf_cfg_add_key_value_param()
Heiko Stuebner <[email protected]>
nvmem: rockchip-otp: set add_legacy_fixed_of_cells config option
Denis Arefev <[email protected]>
net: missing check virtio
Michael S. Tsirkin <[email protected]>
vhost/vsock: always initialize seqpacket_allow
Dan Carpenter <[email protected]>
PCI: endpoint: Fix error handling in epf_ntb_epc_cleanup()
Dan Carpenter <[email protected]>
PCI: endpoint: Clean up error handling in vpci_scan_bus()
Aleksandr Mishin <[email protected]>
ASoC: amd: Adjust error handling in case of absent codec device
Dmitry Torokhov <[email protected]>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <[email protected]>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <[email protected]>
mtd: make mtd_test.c a separate module
Chen Ni <[email protected]>
ASoC: max98088: Check for clk_prepare_enable() error
Nathan Lynch <[email protected]>
powerpc/prom: Add CPU info to hardware description string later
Harald Freudenberger <[email protected]>
hwrng: core - Fix wrong quality calculation at hw rng registration
Huai-Yuan Liu <[email protected]>
scsi: lpfc: Fix a possible null pointer dereference
Aleksandr Mishin <[email protected]>
ASoC: qcom: Adjust issues in case of DT error in asoc_qcom_lpass_cpu_platform_probe()
Honggang LI <[email protected]>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Or Har-Toov <[email protected]>
RDMA/mlx5: Use sq timestamp as QP timestamp when RoCE is disabled
Leon Romanovsky <[email protected]>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <[email protected]>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <[email protected]>
Input: qt1050 - handle CHIP_ID reading error
Konrad Dybcio <[email protected]>
interconnect: qcom: qcm2290: Fix mas_snoc_bimc RPM master ID
Taniya Das <[email protected]>
clk: qcom: gpucc-sa8775p: Update wait_val fields for GPU GDSC's
Taniya Das <[email protected]>
clk: qcom: gpucc-sa8775p: Park RCG's clk source at XO during disable
Taniya Das <[email protected]>
clk: qcom: gpucc-sa8775p: Remove the CLK_IS_CRITICAL and ALWAYS_ON flags
Taniya Das <[email protected]>
clk: qcom: gcc-sa8775p: Update the GDSC wait_val fields and flags
Taniya Das <[email protected]>
clk: qcom: gpucc-sm8350: Park RCG's clk source at XO during disable
Leon Romanovsky <[email protected]>
RDMA/cache: Release GID table even if leak is detected
Neil Armstrong <[email protected]>
usb: typec-mux: nb7vpq904m: unregister typec switch on probe error and remove
Simon Trimmer <[email protected]>
ASoC: cs35l56: Accept values greater than 0 as IRQ numbers
Shenghao Ding <[email protected]>
ASoc: tas2781: Enable RCA-based playback without DSP firmware download
Chiara Meiohas <[email protected]>
RDMA/mlx5: Set mkeys for dmabuf at PAGE_SIZE
James Clark <[email protected]>
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
Shivaprasad G Bhat <[email protected]>
KVM: PPC: Book3S HV: Fix the get_one_reg of SDAR
Shivaprasad G Bhat <[email protected]>
KVM: PPC: Book3S HV: Fix the set_one_reg for MMCR3
Antoniu Miclaus <[email protected]>
iio: frequency: adrf6780: rm clk provider include
Taniya Das <[email protected]>
clk: qcom: camcc-sc7280: Add parent dependency to all camera GDSCs
Taniya Das <[email protected]>
clk: qcom: gcc-sc7280: Update force mem core bit for UFS ICE clock
Minwoo Im <[email protected]>
scsi: ufs: mcq: Fix missing argument 'hba' in MCQ_OPR_OFFSET_n
Marek Vasut <[email protected]>
PCI: rcar: Demote WARN() to dev_warn_ratelimited() in rcar_pcie_wakeup()
Aleksandr Mishin <[email protected]>
PCI: keystone: Fix NULL pointer dereference in case of DT error in ks_pcie_setup_rc_app_regs()
Siddharth Vadapalli <[email protected]>
PCI: keystone: Don't enable BAR 0 for AM654x
Siddharth Vadapalli <[email protected]>
PCI: keystone: Relocate ks_pcie_set/clear_dbi_mode()
Ilpo Järvinen <[email protected]>
PCI: Fix resource double counting on remove & rescan
Chenyuan Yang <[email protected]>
iio: Fix the sorting functionality in iio_gts_build_avail_time_table
Benjamin Coddington <[email protected]>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <[email protected]>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Dan Carpenter <[email protected]>
leds: flash: leds-qcom-flash: Test the correct variable in init
Jan Kara <[email protected]>
ext4: avoid writing unitialized memory to disk in EA inodes
Luis Henriques (SUSE) <[email protected]>
ext4: don't track ranges in fast_commit if inode has inlined data
Olga Kornievskaia <[email protected]>
NFSv4.1 another fix for EXCHGID4_FLAG_USE_PNFS_DS for DS server
NeilBrown <[email protected]>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Chuck Lever <[email protected]>
xprtrdma: Fix rpcrdma_reqs_reset()
Javier Carrasco <[email protected]>
mfd: omap-usb-tll: Use struct_size to allocate tll
Arnd Bergmann <[email protected]>
mfd: rsmu: Split core code into separate module
Adrian Hunter <[email protected]>
perf intel-pt: Fix exclude_guest setting
Adrian Hunter <[email protected]>
perf intel-pt: Fix aux_watermark calculation for 64-bit size
Dikshita Agarwal <[email protected]>
media: venus: flush all buffers in output plane streamoff
Michael Walle <[email protected]>
drm/mediatek/dp: Fix spurious kfree()
Jani Nikula <[email protected]>
drm/mediatek/dp: switch to ->edid_read callback
Luis Henriques (SUSE) <[email protected]>
ext4: fix infinite loop when replaying fast_commit
Hsiao Chien Sung <[email protected]>
drm/mediatek: Remove less-than-zero comparison of an unsigned value
Luca Ceresoli <[email protected]>
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Chen Ni <[email protected]>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <[email protected]>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <[email protected]>
perf report: Fix condition in sort__sym_cmp()
Junhao He <[email protected]>
perf pmus: Fixes always false when compare duplicates aliases
James Clark <[email protected]>
perf test: Make test_arm_callgraph_fp.sh more robust
Abhinav Kumar <[email protected]>
drm/msm/dpu: drop validity checks for clear_pending_flush() ctl op
Jonathan Marek <[email protected]>
drm/msm/dsi: set VIDEO_COMPRESSION_MODE_CTRL_WC
Hans de Goede <[email protected]>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Ming Qian <[email protected]>
media: imx-jpeg: Drop initial source change event if capture has been setup
Hsiao Chien Sung <[email protected]>
drm/mediatek: Add OVL compatible name for MT8195
Hsiao Chien Sung <[email protected]>
drm/mediatek: Turn off the layers with zero width or height
Hsiao Chien Sung <[email protected]>
drm/mediatek: Fix destination alpha error in OVL
Hsiao Chien Sung <[email protected]>
drm/mediatek: Fix XRGB setting error in Mixer
Hsiao Chien Sung <[email protected]>
drm/mediatek: Fix XRGB setting error in OVL
Hsiao Chien Sung <[email protected]>
drm/mediatek: Use 8-bit alpha in ETHDR
Hsiao Chien Sung <[email protected]>
drm/mediatek: Add missing plane settings when async update
Laurent Pinchart <[email protected]>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <[email protected]>
media: renesas: vsp1: Fix _irqsave and _irq mix
Jacopo Mondi <[email protected]>
media: rcar-csi2: Cleanup subdevice in remove()
Jacopo Mondi <[email protected]>
media: rcar-csi2: Disable runtime_pm in probe error
Jacopo Mondi <[email protected]>
media: rcar-vin: Fix YUYV8_1X16 handling for CSI-2
Sean Anderson <[email protected]>
drm: zynqmp_kms: Fix AUX bus not getting unregistered
Christophe JAILLET <[email protected]>
drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
Daniel Schaefer <[email protected]>
media: uvcvideo: Override default flags
Oleksandr Natalenko <[email protected]>
media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920
Ricardo Ribalda <[email protected]>
media: uvcvideo: Quirk for invalid dev_sof in Logitech C922
Ricardo Ribalda <[email protected]>
media: uvcvideo: Disable autosuspend for Insta360 Link
Conor Dooley <[email protected]>
media: i2c: imx219: fix msr access command sequence
Aleksandr Burakov <[email protected]>
saa7134: Unchecked i2c_transfer function result fixed
Dan Carpenter <[email protected]>
ipmi: ssif_bmc: prevent integer overflow on 32bit systems
Jiri Olsa <[email protected]>
x86/shstk: Make return uprobe work with shadow stack
Irui Wang <[email protected]>
media: mediatek: vcodec: Handle invalid decoder vsi
David Hildenbrand <[email protected]>
s390/uv: Don't call folio_wait_writeback() without a folio reference
Matthew Wilcox (Oracle) <[email protected]>
s390/mm: Convert gmap_make_secure to use a folio
Matthew Wilcox (Oracle) <[email protected]>
s390/mm: Convert make_page_secure to use a folio
ChiYuan Huang <[email protected]>
media: v4l: async: Fix NULL pointer dereference in adding ancillary links
Bryan O'Donoghue <[email protected]>
media: i2c: Fix imx412 exposure control
Ricardo Ribalda <[email protected]>
media: imon: Fix race getting ictx->lock
Zheng Yejian <[email protected]>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Mikhail Kobuk <[email protected]>
media: pci: ivtv: Add check for DMA map result
Kuro Chung <[email protected]>
drm/bridge: it6505: fix hibernate to resume no display issue
xiazhengqiao <[email protected]>
drm/bridge: Fixed a DP link training bug
Douglas Anderson <[email protected]>
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
Douglas Anderson <[email protected]>
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
Douglas Anderson <[email protected]>
drm/panel: himax-hx8394: Handle errors from mipi_dsi_dcs_set_display_on() better
Tim Van Patten <[email protected]>
drm/amdgpu: Remove GC HW IP 9.3.0 from noretry=1
Friedrich Vock <[email protected]>
drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
Lijo Lazar <[email protected]>
drm/amdgpu: Fix memory range calculation
Lijo Lazar <[email protected]>
drm/amd/pm: Fix aldebaran pcie speed reporting
Douglas Anderson <[email protected]>
drm/mipi-dsi: Fix theoretical int overflow in mipi_dsi_generic_write_seq()
Douglas Anderson <[email protected]>
drm/mipi-dsi: Fix theoretical int overflow in mipi_dsi_dcs_write_seq()
Mukul Joshi <[email protected]>
drm/amdkfd: Fix CU Masking for GFX 9.4.3
Faiz Abbas <[email protected]>
drm/arm/komeda: Fix komeda probe failing if there are no links in the secondary pipeline
Andy Yan <[email protected]>
drm/rockchip: vop2: Fix the port mux of VP2
Elliot Ayrey <[email protected]>
net: bridge: mst: Check vlan state for egress decision
Taehee Yoo <[email protected]>
xdp: fix invalid wait context of page_pool_destroy()
Neeraj Sanjay Kale <[email protected]>
Bluetooth: btnxpuart: Add handling for boot-signature timeout errors
Kiran K <[email protected]>
Bluetooth: btintel: Refactor btintel_set_ppag()
Sven Peter <[email protected]>
Bluetooth: hci_bcm4377: Use correct unit for timeouts
Amit Cohen <[email protected]>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Tengda Wu <[email protected]>
bpf: Fix null pointer dereference in resolve_prog_type() for BPF_PROG_TYPE_EXT
Alan Maguire <[email protected]>
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alexey Kodanev <[email protected]>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Alan Maguire <[email protected]>
bpf: annotate BTF show functions with __printf
Ilpo Järvinen <[email protected]>
selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops
Ilpo Järvinen <[email protected]>
selftests/resctrl: Convert perror() to ksft_perror() or ksft_print_msg()
Maciej Wieczor-Retman <[email protected]>
selftests/resctrl: Move run_benchmark() to a more fitting file
Geliang Tang <[email protected]>
selftests/bpf: Close obj in error path in xdp_adjust_tail
Geliang Tang <[email protected]>
selftests/bpf: Null checks for links in bpf_tcp_ca
Geliang Tang <[email protected]>
selftests/bpf: Close fd in error path in drop_on_reuseport
John Stultz <[email protected]>
locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
Johannes Berg <[email protected]>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <[email protected]>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <[email protected]>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Jianbo Liu <[email protected]>
xfrm: call xfrm_dev_policy_delete when kill policy
Jianbo Liu <[email protected]>
xfrm: fix netdev reference count imbalance
Aleksandr Mishin <[email protected]>
wifi: rtw89: Fix array index mistake in rtw89_sta_info_get_iter()
Zhang Rui <[email protected]>
perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake
Adrian Hunter <[email protected]>
perf: Fix default aux_watermark calculation
Adrian Hunter <[email protected]>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <[email protected]>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <[email protected]>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Tao Chen <[email protected]>
bpftool: Mount bpffs when pinmaps path not under the bpffs
Steffen Klassert <[email protected]>
xfrm: Export symbol xfrm_dev_state_delete.
Martin Kaistra <[email protected]>
wifi: rtl8xxxu: 8188f: Limit TX power index
Kuan-Chung Chen <[email protected]>
wifi: rtw89: 8852b: fix definition of KIP register number
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <[email protected]>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Steffen Klassert <[email protected]>
xfrm: Fix unregister netdevice hang on hardware offload.
Donglin Peng <[email protected]>
libbpf: Checking the btf_type kind when fixing variable offsets
Csókás, Bence <[email protected]>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <[email protected]>
net: fec: Refactor: #define magic constants
Jan Kara <[email protected]>
udf: Fix bogus checksum computation in udf_rename()
Baochen Qiang <[email protected]>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <[email protected]>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Baochen Qiang <[email protected]>
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
Thomas Gleixner <[email protected]>
jump_label: Fix concurrency issues in static_key_slow_dec()
Thomas Gleixner <[email protected]>
perf/x86: Serialize set_attr_rdpmc()
Ido Schimmel <[email protected]>
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
Ido Schimmel <[email protected]>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <[email protected]>
lib: objagg: Fix general protection fault
Jan Kara <[email protected]>
udf: Fix lock ordering in udf_evict_inode()
Geliang Tang <[email protected]>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <[email protected]>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Eric Dumazet <[email protected]>
tcp: fix races in tcp_v[46]_err()
Eric Dumazet <[email protected]>
tcp: fix race in tcp_write_err()
Eric Dumazet <[email protected]>
tcp: add tcp_done_with_error() helper
Baochen Qiang <[email protected]>
wifi: ath12k: fix wrong definition of CE ring's base address
Baochen Qiang <[email protected]>
wifi: ath11k: fix wrong definition of CE ring's base address
Jeff Johnson <[email protected]>
wifi: ath11k: Update Qualcomm Innovation Center, Inc. copyrights
P Praneesh <[email protected]>
wifi: ath12k: fix firmware crash during reo reinject
P Praneesh <[email protected]>
wifi: ath12k: fix invalid memory access while processing fragmented packets
P Praneesh <[email protected]>
wifi: ath12k: change DMA direction while mapping reinjected packets
Hagar Hemdan <[email protected]>
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Geliang Tang <[email protected]>
selftests/bpf: Fix prog numbers in test_sockmap
Ivan Babrou <[email protected]>
bpftool: Un-const bpf_func_info to fix it for llvm 17 and newer
Nithyanantham Paramasivam <[email protected]>
wifi: ath12k: Fix tx completion ring (WBM2SW) setup failure
Pradeep Kumar Chitrapu <[email protected]>
wifi: ath12k: Correct 6 GHz frequency value in rx status
Samasth Norway Ananda <[email protected]>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <[email protected]>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <[email protected]>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Marek Behún <[email protected]>
firmware: turris-mox-rwtm: Do not complete if there are no waiters
Christophe Leroy <[email protected]>
vmlinux.lds.h: catch .bss..L* sections into BSS")
Dmitry Torokhov <[email protected]>
ARM: spitz: fix GPIO assignment for backlight
Thorsten Blum <[email protected]>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Dhananjay Ugwekar <[email protected]>
cpufreq/amd-pstate: Fix the scaling_max_freq setting on shared memory CPPC systems
Luca Weiss <[email protected]>
arm64: dts: qcom: sm6350: Add missing qcom,non-secure-domain property
Chukun Pan <[email protected]>
arm64: dts: rockchip: fixes PHY reset for Lunzn Fastrhino R68S
Chukun Pan <[email protected]>
arm64: dts: rockchip: disable display subsystem for Lunzn Fastrhino R6xS
Chukun Pan <[email protected]>
arm64: dts: rockchip: remove unused usb2 nodes for Lunzn Fastrhino R6xS
Chukun Pan <[email protected]>
arm64: dts: rockchip: fix pmu_io supply for Lunzn Fastrhino R6xS
Chukun Pan <[email protected]>
arm64: dts: rockchip: fix usb regulator for Lunzn Fastrhino R6xS
Chukun Pan <[email protected]>
arm64: dts: rockchip: fix regulator name for Lunzn Fastrhino R6xS
Cristian Ciocaltea <[email protected]>
arm64: dts: rockchip: Add missing power-domains for rk356x vop_mmu
Chen Ni <[email protected]>
x86/xen: Convert comma to semicolon
Adam Ford <[email protected]>
arm64: dts: imx8mp: Fix pgc vpu locations
Lucas Stach <[email protected]>
arm64: dts: imx8mp: add HDMI power-domains
Adam Ford <[email protected]>
arm64: dts: imx8mp: Fix pgc_mlmix location
Adam Ford <[email protected]>
arm64: dts: imx8mp: Add NPU Node
Eero Tamminen <[email protected]>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r9a07g054: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r9a07g044: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r9a07g043u: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r8a779g0: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r8a779f0: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r8a779a0: Add missing hypervisor virtual timer IRQ
Cristian Ciocaltea <[email protected]>
arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-evb1-v10
Cristian Ciocaltea <[email protected]>
arm64: dts: rockchip: Fix mic-in-differential usage on rk3566-roc-pc
Cristian Ciocaltea <[email protected]>
arm64: dts: rockchip: Drop invalid mic-in-differential on rk3568-rock-3a
Jerome Brunet <[email protected]>
arm64: dts: amlogic: setup hdmi system clock
Jerome Brunet <[email protected]>
arm64: dts: amlogic: add power domain to hdmitx
Jerome Brunet <[email protected]>
arm64: dts: amlogic: gx: correct hdmi clocks
Chen-Yu Tsai <[email protected]>
arm64: dts: mediatek: mt8183-kukui-jacuzzi: Add ports node for anx7625
Hsin-Te Yuan <[email protected]>
arm64: dts: mediatek: mt8183-kukui: Fix the value of dlg,jack-det-rate mismatch
Rafał Miłecki <[email protected]>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Pin-yen Lin <[email protected]>
arm64: dts: mediatek: mt8192-asurada: Add off-on-delay-us for pp3300_mipibrdg
Chen-Yu Tsai <[email protected]>
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
AngeloGioacchino Del Regno <[email protected]>
arm64: dts: mediatek: mt8195: Fix GPU thermal zone name for SVS
Michael Walle <[email protected]>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <[email protected]>
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
Michael Walle <[email protected]>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <[email protected]>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Michael Walle <[email protected]>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Jerome Brunet <[email protected]>
arm64: dts: amlogic: sm1: fix spdif compatibles
Jonas Karlman <[email protected]>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <[email protected]>
soc: qcom: pdr: fix parsing of domains lists
Dmitry Baryshkov <[email protected]>
soc: qcom: pdr: protect locator_addr with the main mutex
Sibi Sankar <[email protected]>
soc: qcom: icc-bwmon: Fix refcount imbalance seen during bwmon_remove
Komal Bajaj <[email protected]>
arm64: dts: qcom: qdu1000: Add secure qfprom node
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: qdu1000-idp: drop unused LLCC multi-ch-bit-off
Jai Luthra <[email protected]>
arm64: dts: ti: k3-am62-verdin: Drop McASP AFIFOs
Jai Luthra <[email protected]>
arm64: dts: ti: k3-am625-beagleplay: Drop McASP AFIFOs
Jai Luthra <[email protected]>
arm64: dts: ti: k3-am62x: Drop McASP AFIFOs
Esben Haabendal <[email protected]>
memory: fsl_ifc: Make FSL_IFC config visible and selectable
Primoz Fiser <[email protected]>
OPP: ti: Fix ti_opp_supply_probe wrong return values
Primoz Fiser <[email protected]>
cpufreq: ti-cpufreq: Handle deferred probe with dev_err_probe()
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: qrb4210-rb2: make L9A always-on
Marek Vasut <[email protected]>
ARM: dts: stm32: Add arm,no-tick-in-suspend to STM32MP15xx STGEN timer
Pavel Löbl <[email protected]>
ARM: dts: sunxi: remove duplicated entries in makefile
Jay Buddhabhatti <[email protected]>
soc: xilinx: rename cpu_number1 to dummy_cpu_number
Sagar Cheluvegowda <[email protected]>
arm64: dts: qcom: sa8775p: mark ethernet devices as DMA-coherent
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Jonas Karlman <[email protected]>
arm64: dts: rockchip: Update WIFi/BT related nodes on rk3308-rock-pi-s
Jonas Karlman <[email protected]>
arm64: dts: rockchip: Add mdio and ethernet-phy nodes to rk3308-rock-pi-s
Jonas Karlman <[email protected]>
arm64: dts: rockchip: Add pinctrl for UART0 to rk3308-rock-pi-s
Jonas Karlman <[email protected]>
arm64: dts: rockchip: Add sdmmc related properties on rk3308-rock-pi-s
Stephen Boyd <[email protected]>
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Chen Ni <[email protected]>
soc: qcom: pmic_glink: Handle the return value of pmic_glink_init
Marc Gonzalez <[email protected]>
arm64: dts: qcom: msm8998: enable adreno_smmu by default
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sdm850-lenovo-yoga-c630: fix IPA firmware path
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: msm8996-xiaomi-common: drop excton from the USB PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8450: add power-domain to UFS PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8350: add power-domain to UFS PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8250: add power-domain to UFS PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm6350: add power-domain to UFS PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm6115: add power-domain to UFS PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sc8180x: add power-domain to UFS PHY
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sc8180x: switch UFS QMP PHY to new style of bindings
Bjorn Andersson <[email protected]>
arm64: dts: qcom: sc8180x: Correct PCIe slave ports
Guenter Roeck <[email protected]>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <[email protected]>
hwmon: (max6697) Fix underflow when writing limit attributes
Uwe Kleine-König <[email protected]>
pwm: atmel-tcb: Fix race condition and convert to guards
Yao Zi <[email protected]>
drm/meson: fix canvas release in bind function
Gaosheng Cui <[email protected]>
nvmet-auth: fix nvmet_auth hash error handling
Uwe Kleine-König <[email protected]>
pwm: stm32: Always do lazy disabling
Yu Kuai <[email protected]>
md: Don't wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl
Bart Van Assche <[email protected]>
block/mq-deadline: Fix the tag reservation code
Bart Van Assche <[email protected]>
block: Call .limit_depth() after .hctx has been set
Wayne Tung <[email protected]>
hwmon: (adt7475) Fix default duty on fan is disabled
Chen Ridong <[email protected]>
cgroup/cpuset: Prevent UAF in proc_cpuset_show()
Kees Cook <[email protected]>
kernfs: Convert kernfs_path_from_node_locked() from strlcpy() to strscpy()
Ilpo Järvinen <[email protected]>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <[email protected]>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <[email protected]>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <[email protected]>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <[email protected]>
hfsplus: fix to avoid false alarm of circular locking
Masahiro Yamada <[email protected]>
x86/kconfig: Add as-instr64 macro to properly evaluate AS_WRUSS
Christoph Hellwig <[email protected]>
block: initialize integrity buffer to zero before writing it to media
Christoph Hellwig <[email protected]>
ubd: untagle discard vs write zeroes not support handling
Christoph Hellwig <[email protected]>
ubd: refactor the interrupt handler
Tzung-Bi Shih <[email protected]>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Li Nan <[email protected]>
md: fix deadlock between mddev_suspend and flush bio
Frederic Weisbecker <[email protected]>
rcu/tasks: Fix stale task snaphot for Tasks Trace
Arnd Bergmann <[email protected]>
EDAC, i10nm: make skx_common.o a separate module
Chen Ni <[email protected]>
spi: atmel-quadspi: Add missing check for clk_prepare
Prajna Rajendra Kumar <[email protected]>
spi: spi-microchip-core: Fix the number of chip selects supported
-------------
Diffstat:
.../devicetree/bindings/thermal/thermal-zones.yaml | 5 +- Makefile | 4 +- arch/arm/boot/dts/allwinner/Makefile | 62 -- .../arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi | 23 - .../boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 14 +- arch/arm/boot/dts/st/stm32mp151.dtsi | 1 + arch/arm/mach-pxa/spitz.c | 30 +- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 5 + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 4 + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 10 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 10 +- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 8 +- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 130 +++- .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +- arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +- .../dts/mediatek/mt8183-kukui-audio-da7219.dtsi | 2 +- .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 +- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 - arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 1 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 +- .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 1 - arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8998.dtsi | 1 - arch/arm64/boot/dts/qcom/qdu1000.dtsi | 16 +- arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 28 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 1 + arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 + arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 + arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 +- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 + arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 5 +- arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 5 +- arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 5 +- arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 5 +- arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 5 +- arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 5 +- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 71 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 2 +- .../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 4 + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 48 +- .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 16 +- arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 4 - arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 4 - arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 - arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 - arch/loongarch/kernel/hw_breakpoint.c | 2 +- arch/loongarch/kernel/ptrace.c | 3 + arch/m68k/amiga/config.c | 9 + arch/m68k/atari/ataints.c | 6 +- arch/m68k/include/asm/cmpxchg.h | 2 +- arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 21 +- arch/mips/include/asm/mach-loongson64/boot_param.h | 2 + arch/mips/include/asm/mips-cm.h | 4 + arch/mips/kernel/smp-cps.c | 5 +- arch/mips/loongson64/env.c | 8 + arch/mips/loongson64/reset.c | 38 +- arch/mips/loongson64/smp.c | 23 +- arch/mips/pci/pcie-octeon.c | 0 arch/mips/sgi-ip30/ip30-console.c | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/kernel/prom.c | 12 +- arch/powerpc/kvm/book3s_hv.c | 4 +- arch/powerpc/kvm/powerpc.c | 4 +- arch/powerpc/mm/nohash/8xx.c | 3 +- arch/powerpc/xmon/ppc-dis.c | 33 +- arch/s390/kernel/perf_cpum_cf.c | 14 +- arch/s390/kernel/uv.c | 58 +- arch/s390/mm/fault.c | 6 +- arch/s390/pci/pci_irq.c | 110 ++-- arch/sparc/include/asm/oplib_64.h | 1 + arch/sparc/prom/init_64.c | 3 - arch/sparc/prom/p1275.c | 2 +- arch/um/drivers/ubd_kern.c | 50 +- arch/um/kernel/time.c | 4 +- arch/um/os-Linux/signal.c | 118 +++- arch/x86/Kconfig.assembler | 2 +- arch/x86/events/core.c | 3 + arch/x86/events/intel/cstate.c | 7 +- arch/x86/events/intel/ds.c | 8 +- arch/x86/events/intel/pt.c | 4 +- arch/x86/events/intel/pt.h | 4 +- arch/x86/events/intel/uncore_snbep.c | 6 +- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/include/asm/shstk.h | 2 + arch/x86/kernel/devicetree.c | 2 +- arch/x86/kernel/shstk.c | 11 + arch/x86/kernel/uprobes.c | 7 +- arch/x86/kvm/vmx/nested.c | 2 +- arch/x86/kvm/vmx/vmx.c | 11 +- arch/x86/kvm/vmx/vmx.h | 1 + arch/x86/kvm/x86.c | 4 +- arch/x86/pci/intel_mid_pci.c | 4 +- arch/x86/pci/xen.c | 4 +- arch/x86/platform/intel/iosf_mbi.c | 4 +- arch/x86/xen/p2m.c | 4 +- block/bio-integrity.c | 11 +- block/blk-mq.c | 12 +- block/genhd.c | 2 +- block/mq-deadline.c | 20 +- drivers/android/binder.c | 4 +- drivers/ata/libata-scsi.c | 176 ++--- drivers/auxdisplay/ht16k33.c | 1 + drivers/base/devres.c | 11 +- drivers/block/rbd.c | 35 +- drivers/bluetooth/btintel.c | 119 +--- drivers/bluetooth/btnxpuart.c | 52 +- drivers/bluetooth/btusb.c | 4 + drivers/bluetooth/hci_bcm4377.c | 2 +- drivers/char/hw_random/amd-rng.c | 4 +- drivers/char/hw_random/core.c | 4 +- drivers/char/ipmi/ssif_bmc.c | 6 +- drivers/char/tpm/eventlog/common.c | 2 + drivers/clk/clk-en7523.c | 9 +- drivers/clk/davinci/da8xx-cfgchip.c | 4 +- drivers/clk/qcom/camcc-sc7280.c | 5 + drivers/clk/qcom/clk-rcg2.c | 32 + drivers/clk/qcom/gcc-sa8775p.c | 40 ++ drivers/clk/qcom/gcc-sc7280.c | 3 + drivers/clk/qcom/gpucc-sa8775p.c | 41 +- drivers/clk/qcom/gpucc-sm8350.c | 5 +- drivers/clk/qcom/kpss-xcc.c | 4 +- drivers/cpufreq/amd-pstate.c | 43 +- drivers/cpufreq/ti-cpufreq.c | 2 +- drivers/crypto/intel/qat/qat_common/adf_cfg.c | 6 +- drivers/dma/ti/k3-udma.c | 4 +- drivers/edac/Makefile | 10 +- drivers/edac/skx_common.c | 21 +- drivers/edac/skx_common.h | 4 +- drivers/firmware/efi/libstub/screen_info.c | 2 + drivers/firmware/efi/libstub/x86-stub.c | 25 +- drivers/firmware/turris-mox-rwtm.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 + drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 43 +- drivers/gpu/drm/bridge/ite-it6505.c | 85 ++- drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 9 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 + drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 + drivers/gpu/drm/i915/display/intel_dp.c | 2 + .../gpu/drm/i915/display/intel_dp_link_training.c | 55 +- .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 24 +- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 2 +- drivers/gpu/drm/mediatek/mtk_dp.c | 39 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 + drivers/gpu/drm/mediatek/mtk_ethdr.c | 21 +- drivers/gpu/drm/meson/meson_drv.c | 37 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +- drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 1 + drivers/gpu/drm/qxl/qxl_display.c | 3 + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +- drivers/gpu/drm/udl/udl_modeset.c | 3 +- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 + drivers/gpu/drm/xlnx/zynqmp_kms.c | 12 +- drivers/hwmon/adt7475.c | 2 +- drivers/hwmon/max6697.c | 5 +- drivers/hwtracing/coresight/coresight-platform.c | 4 +- drivers/iio/frequency/adrf6780.c | 1 - drivers/iio/industrialio-gts-helper.c | 7 +- drivers/infiniband/core/cache.c | 14 +- drivers/infiniband/core/device.c | 22 +- drivers/infiniband/core/iwcm.c | 11 +- drivers/infiniband/core/lag.c | 3 +- drivers/infiniband/core/roce_gid_mgmt.c | 3 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +- drivers/infiniband/hw/hns/hns_roce_device.h | 6 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 40 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 5 + drivers/infiniband/hw/hns/hns_roce_qp.c | 4 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 2 +- drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 13 + drivers/infiniband/hw/mlx5/odp.c | 6 +- drivers/infiniband/sw/rxe/rxe_req.c | 7 +- drivers/input/keyboard/qt1050.c | 7 +- drivers/input/mouse/elan_i2c_core.c | 2 + drivers/interconnect/qcom/qcm2290.c | 2 +- drivers/iommu/intel/iommu.c | 2 +- drivers/iommu/sprd-iommu.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 24 +- drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +- drivers/leds/flash/leds-mt6360.c | 5 +- drivers/leds/flash/leds-qcom-flash.c | 10 +- drivers/leds/led-class.c | 1 - drivers/leds/led-triggers.c | 2 +- drivers/leds/leds-ss4200.c | 7 +- drivers/macintosh/therm_windtunnel.c | 2 +- drivers/md/dm-verity-target.c | 16 +- drivers/md/md-bitmap.c | 6 +- drivers/md/md.c | 32 +- drivers/media/i2c/imx219.c | 2 +- drivers/media/i2c/imx412.c | 9 +- drivers/media/pci/intel/ivsc/mei_csi.c | 14 +- drivers/media/pci/ivtv/ivtv-udma.c | 8 + drivers/media/pci/ivtv/ivtv-yuv.c | 6 + drivers/media/pci/ivtv/ivtvfb.c | 6 +- drivers/media/pci/saa7134/saa7134-dvb.c | 8 +- .../platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 6 + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 3 + drivers/media/platform/nxp/imx-pxp.c | 3 + drivers/media/platform/qcom/venus/vdec.c | 3 +- .../media/platform/renesas/rcar-vin/rcar-csi2.c | 5 +- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 16 +- drivers/media/platform/renesas/vsp1/vsp1_histo.c | 20 +- drivers/media/platform/renesas/vsp1/vsp1_pipe.h | 2 +- drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 8 +- drivers/media/rc/imon.c | 5 +- drivers/media/rc/lirc_dev.c | 4 +- drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +- drivers/media/usb/uvc/uvc_ctrl.c | 9 +- drivers/media/usb/uvc/uvc_driver.c | 26 +- drivers/media/usb/uvc/uvc_video.c | 21 +- drivers/media/usb/uvc/uvcvideo.h | 2 + drivers/media/v4l2-core/v4l2-async.c | 3 + drivers/memory/Kconfig | 2 +- drivers/mfd/Makefile | 6 +- drivers/mfd/omap-usb-tll.c | 3 +- drivers/mfd/rsmu_core.c | 2 + drivers/mtd/nand/raw/Kconfig | 3 +- drivers/mtd/tests/Makefile | 34 +- drivers/mtd/tests/mtd_test.c | 9 + drivers/mtd/ubi/eba.c | 3 +- drivers/net/bonding/bond_main.c | 7 +- drivers/net/dsa/b53/b53_common.c | 3 + drivers/net/dsa/mv88e6xxx/chip.c | 3 +- drivers/net/ethernet/brocade/bna/bna_types.h | 2 +- drivers/net/ethernet/brocade/bna/bnad.c | 11 +- drivers/net/ethernet/freescale/fec_main.c | 52 +- drivers/net/ethernet/google/gve/gve_tx.c | 5 +- drivers/net/ethernet/google/gve/gve_tx_dqo.c | 22 +- drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 2 +- drivers/net/ethernet/intel/ice/ice_fdir.h | 3 + drivers/net/ethernet/intel/ice/ice_switch.c | 8 +- drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 16 + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h | 1 + .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18 +- .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 2 +- .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 - .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- drivers/net/netconsole.c | 2 +- drivers/net/wireless/ath/ath11k/ce.c | 2 +- drivers/net/wireless/ath/ath11k/ce.h | 5 +- drivers/net/wireless/ath/ath11k/dbring.c | 1 + drivers/net/wireless/ath/ath11k/dbring.h | 1 + drivers/net/wireless/ath/ath11k/debug.c | 1 + drivers/net/wireless/ath/ath11k/debug.h | 2 +- drivers/net/wireless/ath/ath11k/debugfs.c | 1 + drivers/net/wireless/ath/ath11k/debugfs.h | 1 + .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +- .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 2 +- drivers/net/wireless/ath/ath11k/debugfs_sta.c | 1 + drivers/net/wireless/ath/ath11k/debugfs_sta.h | 1 + drivers/net/wireless/ath/ath11k/dp.c | 2 +- drivers/net/wireless/ath/ath11k/dp.h | 2 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 4 +- drivers/net/wireless/ath/ath11k/dp_rx.h | 3 + drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +- drivers/net/wireless/ath/ath11k/dp_tx.h | 1 + drivers/net/wireless/ath/ath11k/hal.c | 2 +- drivers/net/wireless/ath/ath11k/hal.h | 2 +- drivers/net/wireless/ath/ath11k/hal_desc.h | 1 + drivers/net/wireless/ath/ath11k/hal_rx.c | 1 + drivers/net/wireless/ath/ath11k/hal_rx.h | 1 + drivers/net/wireless/ath/ath11k/hif.h | 1 + drivers/net/wireless/ath/ath11k/htc.c | 1 + drivers/net/wireless/ath/ath11k/htc.h | 1 + drivers/net/wireless/ath/ath11k/hw.c | 2 +- drivers/net/wireless/ath/ath11k/hw.h | 2 +- drivers/net/wireless/ath/ath11k/mac.c | 15 +- drivers/net/wireless/ath/ath11k/mac.h | 1 + drivers/net/wireless/ath/ath11k/mhi.c | 2 +- drivers/net/wireless/ath/ath11k/mhi.h | 1 + drivers/net/wireless/ath/ath11k/pcic.c | 2 +- drivers/net/wireless/ath/ath11k/peer.c | 2 +- drivers/net/wireless/ath/ath11k/peer.h | 2 +- drivers/net/wireless/ath/ath11k/qmi.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.h | 2 +- drivers/net/wireless/ath/ath11k/reg.c | 1 + drivers/net/wireless/ath/ath11k/reg.h | 1 + drivers/net/wireless/ath/ath11k/rx_desc.h | 1 + drivers/net/wireless/ath/ath11k/spectral.c | 1 + drivers/net/wireless/ath/ath11k/spectral.h | 1 + drivers/net/wireless/ath/ath11k/thermal.c | 1 + drivers/net/wireless/ath/ath11k/thermal.h | 1 + drivers/net/wireless/ath/ath11k/trace.h | 1 + drivers/net/wireless/ath/ath11k/wmi.c | 2 +- drivers/net/wireless/ath/ath11k/wmi.h | 2 +- drivers/net/wireless/ath/ath11k/wow.h | 1 + drivers/net/wireless/ath/ath12k/ce.h | 6 +- drivers/net/wireless/ath/ath12k/dp.c | 18 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 27 +- drivers/net/wireless/ath/ath12k/hw.c | 8 +- drivers/net/wireless/ath/ath12k/wmi.c | 10 +- .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 15 + drivers/net/wireless/realtek/rtw88/usb.c | 2 + drivers/net/wireless/realtek/rtw89/debug.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 2 +- drivers/net/wireless/virtual/virt_wifi.c | 20 +- drivers/nvme/host/pci.c | 5 +- drivers/nvme/target/auth.c | 14 +- drivers/nvmem/rockchip-otp.c | 1 + drivers/opp/ti-opp-supply.c | 6 +- drivers/parport/procfs.c | 24 +- drivers/pci/controller/dwc/pci-keystone.c | 156 +++-- drivers/pci/controller/dwc/pcie-designware-ep.c | 13 +- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +- drivers/pci/controller/dwc/pcie-qcom-ep.c | 6 - drivers/pci/controller/pci-hyperv.c | 4 +- drivers/pci/controller/pci-loongson.c | 13 + drivers/pci/controller/pcie-rcar-host.c | 6 +- drivers/pci/controller/pcie-rockchip.c | 2 +- drivers/pci/endpoint/functions/pci-epf-vntb.c | 19 +- drivers/pci/pci.c | 6 +- drivers/pci/setup-bus.c | 6 +- drivers/phy/cadence/phy-cadence-torrent.c | 3 + drivers/phy/xilinx/phy-zynqmp.c | 14 +- drivers/pinctrl/core.c | 12 +- drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 17 +- drivers/pinctrl/pinctrl-single.c | 7 +- drivers/pinctrl/renesas/pfc-r8a779g0.c | 716 ++++++++++----------- drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +- drivers/platform/chrome/cros_ec_debugfs.c | 1 + drivers/platform/mips/cpu_hwmon.c | 3 + drivers/pwm/pwm-atmel-tcb.c | 12 +- drivers/pwm/pwm-stm32.c | 5 +- drivers/remoteproc/imx_rproc.c | 10 +- drivers/remoteproc/stm32_rproc.c | 2 +- drivers/rtc/interface.c | 9 +- drivers/rtc/rtc-abx80x.c | 12 +- drivers/rtc/rtc-cmos.c | 10 +- drivers/rtc/rtc-isl1208.c | 11 +- drivers/s390/block/dasd_devmap.c | 10 +- drivers/scsi/lpfc/lpfc_attr.c | 5 + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/qla2xxx/qla_bsg.c | 98 +-- drivers/scsi/qla2xxx/qla_def.h | 17 +- drivers/scsi/qla2xxx/qla_gbl.h | 6 +- drivers/scsi/qla2xxx/qla_gs.c | 473 +++++++------- drivers/scsi/qla2xxx/qla_init.c | 92 ++- drivers/scsi/qla2xxx/qla_inline.h | 8 + drivers/scsi/qla2xxx/qla_mid.c | 2 +- drivers/scsi/qla2xxx/qla_nvme.c | 5 +- drivers/scsi/qla2xxx/qla_os.c | 19 +- drivers/scsi/qla2xxx/qla_sup.c | 108 +++- drivers/scsi/sr_ioctl.c | 2 +- drivers/soc/qcom/icc-bwmon.c | 4 +- drivers/soc/qcom/pdr_interface.c | 8 +- drivers/soc/qcom/pmic_glink.c | 13 +- drivers/soc/qcom/rpmh-rsc.c | 7 +- drivers/soc/qcom/rpmh.c | 1 - drivers/soc/xilinx/xlnx_event_manager.c | 15 +- drivers/soc/xilinx/zynqmp_power.c | 4 +- drivers/spi/atmel-quadspi.c | 11 +- drivers/spi/spi-microchip-core.c | 211 +++--- drivers/spi/spidev.c | 1 + drivers/ufs/core/ufs-mcq.c | 10 +- drivers/usb/typec/mux/nb7vpq904m.c | 7 +- drivers/vhost/vsock.c | 4 +- drivers/video/logo/pnmtologo.c | 2 - drivers/watchdog/rzg2l_wdt.c | 22 +- fs/btrfs/compression.c | 2 +- fs/ceph/super.c | 3 +- fs/exfat/dir.c | 2 +- fs/ext2/balloc.c | 11 +- fs/ext4/extents_status.c | 2 + fs/ext4/fast_commit.c | 6 + fs/ext4/namei.c | 73 ++- fs/ext4/xattr.c | 6 + fs/f2fs/checkpoint.c | 10 +- fs/f2fs/data.c | 6 +- fs/f2fs/f2fs.h | 19 +- fs/f2fs/file.c | 47 +- fs/f2fs/gc.c | 13 +- fs/f2fs/inline.c | 8 +- fs/f2fs/inode.c | 14 +- fs/f2fs/segment.c | 6 +- fs/f2fs/segment.h | 3 +- fs/fuse/inode.c | 24 +- fs/hfs/inode.c | 3 + fs/hfsplus/bfind.c | 15 +- fs/hfsplus/extents.c | 9 +- fs/hfsplus/hfsplus_fs.h | 21 + fs/hostfs/hostfs.h | 7 +- fs/hostfs/hostfs_kern.c | 10 +- fs/hostfs/hostfs_user.c | 7 +- fs/jbd2/commit.c | 2 +- fs/jbd2/journal.c | 56 +- fs/jbd2/transaction.c | 45 +- fs/jfs/jfs_imap.c | 5 +- fs/kernfs/dir.c | 34 +- fs/nfs/nfs4client.c | 6 +- fs/nfs/nfs4proc.c | 2 +- fs/nfsd/nfs4proc.c | 5 +- fs/nilfs2/btnode.c | 25 +- fs/nilfs2/btree.c | 4 +- fs/nilfs2/segment.c | 2 +- fs/ntfs3/attrib.c | 30 +- fs/ntfs3/bitmap.c | 2 +- fs/ntfs3/dir.c | 3 +- fs/ntfs3/file.c | 5 +- fs/ntfs3/frecord.c | 2 +- fs/ntfs3/fslog.c | 5 +- fs/ntfs3/index.c | 4 +- fs/ntfs3/inode.c | 13 +- fs/ntfs3/ntfs.h | 12 +- fs/ntfs3/super.c | 4 +- fs/proc/task_mmu.c | 43 +- fs/smb/client/cifsfs.c | 8 +- fs/smb/client/connect.c | 24 +- fs/super.c | 11 + fs/udf/balloc.c | 15 +- fs/udf/file.c | 2 + fs/udf/inode.c | 11 +- fs/udf/namei.c | 2 - fs/udf/super.c | 3 +- include/asm-generic/vmlinux.lds.h | 2 +- include/drm/drm_mipi_dsi.h | 46 +- include/linux/bpf_verifier.h | 2 +- include/linux/hugetlb.h | 1 + include/linux/jbd2.h | 12 +- include/linux/mlx5/qp.h | 9 +- include/linux/objagg.h | 1 - include/linux/pci.h | 2 + include/linux/perf_event.h | 1 + include/linux/sbitmap.h | 5 + include/linux/task_work.h | 3 +- include/linux/virtio_net.h | 11 + include/net/ip_fib.h | 1 + include/net/tcp.h | 1 + include/net/xfrm.h | 36 +- include/sound/tas2781-dsp.h | 11 +- include/trace/events/rpcgss.h | 2 +- include/uapi/linux/netfilter/nf_tables.h | 2 +- include/uapi/linux/zorro_ids.h | 3 + include/ufs/ufshcd.h | 6 + io_uring/io-wq.c | 10 +- io_uring/io_uring.c | 5 +- io_uring/timeout.c | 2 +- kernel/bpf/btf.c | 10 +- kernel/cgroup/cgroup-v1.c | 2 +- kernel/cgroup/cgroup.c | 4 +- kernel/cgroup/cpuset.c | 15 +- kernel/debug/kdb/kdb_io.c | 6 +- kernel/dma/mapping.c | 2 +- kernel/events/core.c | 77 ++- kernel/events/internal.h | 2 +- kernel/events/ring_buffer.c | 4 +- kernel/irq/irqdomain.c | 7 +- kernel/irq/manage.c | 2 +- kernel/jump_label.c | 45 +- kernel/locking/rwsem.c | 6 +- kernel/rcu/tasks.h | 10 + kernel/sched/core.c | 37 +- kernel/sched/fair.c | 7 +- kernel/sched/sched.h | 2 +- kernel/signal.c | 8 + kernel/task_work.c | 34 +- kernel/time/tick-broadcast.c | 23 + kernel/trace/pid_list.c | 4 +- kernel/watchdog_perf.c | 11 +- lib/build_OID_registry | 5 +- lib/decompress_bunzip2.c | 3 +- lib/kobject_uevent.c | 17 +- lib/objagg.c | 18 +- lib/sbitmap.c | 44 +- mm/hugetlb.c | 49 +- mm/memory.c | 2 +- mm/mempolicy.c | 18 +- mm/mmap_lock.c | 175 +---- mm/vmscan.c | 84 ++- net/bridge/br_forward.c | 4 +- net/core/filter.c | 15 +- net/core/flow_dissector.c | 2 +- net/core/xdp.c | 4 +- net/ipv4/esp4.c | 3 +- net/ipv4/fib_semantics.c | 13 +- net/ipv4/fib_trie.c | 1 + net/ipv4/nexthop.c | 7 +- net/ipv4/route.c | 18 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 32 +- net/ipv4/tcp_ipv4.c | 11 +- net/ipv4/tcp_timer.c | 6 +- net/ipv6/addrconf.c | 3 +- net/ipv6/esp6.c | 3 +- net/ipv6/tcp_ipv6.c | 10 +- net/mac80211/cfg.c | 2 +- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/rate.c | 2 +- net/mac80211/sta_info.h | 6 +- net/mac80211/vht.c | 46 +- net/netfilter/ipvs/ip_vs_ctl.c | 10 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +- net/netfilter/nf_conntrack_netlink.c | 3 +- net/netfilter/nft_set_pipapo.c | 22 +- net/netfilter/nft_set_pipapo.h | 27 +- net/netfilter/nft_set_pipapo_avx2.c | 81 ++- net/packet/af_packet.c | 86 ++- net/smc/smc_core.c | 5 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- net/sunrpc/clnt.c | 3 +- net/sunrpc/xprtrdma/frwr_ops.c | 3 +- net/sunrpc/xprtrdma/verbs.c | 16 +- net/tipc/udp_media.c | 5 +- net/unix/af_unix.c | 41 +- net/unix/unix_bpf.c | 3 + net/wireless/util.c | 8 +- net/xfrm/xfrm_policy.c | 5 +- net/xfrm/xfrm_state.c | 65 +- net/xfrm/xfrm_user.c | 1 - scripts/Kconfig.include | 3 +- scripts/Makefile.lib | 6 +- scripts/gcc-x86_32-has-stack-protector.sh | 2 +- scripts/gcc-x86_64-has-stack-protector.sh | 2 +- security/apparmor/lsm.c | 7 + security/apparmor/policy.c | 2 +- security/apparmor/policy_unpack.c | 1 + security/keys/keyctl.c | 2 +- security/landlock/cred.c | 11 +- sound/core/ump.c | 13 + sound/soc/amd/acp-es8336.c | 4 +- sound/soc/amd/yc/acp6x-mach.c | 7 + sound/soc/codecs/cs35l56-shared.c | 2 +- sound/soc/codecs/max98088.c | 10 +- sound/soc/codecs/tas2781-fmwlib.c | 20 +- sound/soc/codecs/tas2781-i2c.c | 39 +- sound/soc/fsl/fsl_qmc_audio.c | 2 + sound/soc/intel/common/soc-intel-quirks.h | 2 +- sound/soc/qcom/lpass-cpu.c | 4 + sound/soc/sof/amd/pci-vangogh.c | 1 - sound/soc/sof/imx/imx8m.c | 2 +- sound/soc/sof/ipc4-topology.c | 8 +- sound/usb/mixer.c | 7 + sound/usb/quirks.c | 4 + tools/bpf/bpftool/common.c | 2 +- tools/bpf/bpftool/prog.c | 4 + tools/bpf/resolve_btfids/main.c | 2 +- tools/lib/bpf/btf_dump.c | 8 +- tools/lib/bpf/linker.c | 11 +- tools/memory-model/lock.cat | 20 +- tools/perf/arch/x86/util/intel-pt.c | 15 +- tools/perf/tests/shell/test_arm_callgraph_fp.sh | 27 +- tools/perf/tests/workloads/leafloop.c | 20 +- tools/perf/util/pmus.c | 5 +- tools/perf/util/sort.c | 2 +- tools/perf/util/stat-shadow.c | 7 + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 - .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 16 +- .../testing/selftests/bpf/prog_tests/fexit_sleep.c | 8 +- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +- .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 2 +- .../bpf/progs/btf_dump_test_case_multidim.c | 4 +- .../bpf/progs/btf_dump_test_case_syntax.c | 4 +- tools/testing/selftests/bpf/test_sockmap.c | 9 +- .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +- tools/testing/selftests/landlock/base_test.c | 74 +++ tools/testing/selftests/landlock/config | 1 + tools/testing/selftests/net/fib_tests.sh | 24 +- .../selftests/net/forwarding/devlink_lib.sh | 2 + tools/testing/selftests/resctrl/cache.c | 10 +- tools/testing/selftests/resctrl/cat_test.c | 8 +- tools/testing/selftests/resctrl/cmt_test.c | 2 +- tools/testing/selftests/resctrl/fill_buf.c | 2 +- tools/testing/selftests/resctrl/mba_test.c | 2 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- tools/testing/selftests/resctrl/resctrl.h | 4 +- tools/testing/selftests/resctrl/resctrl_val.c | 164 +++-- tools/testing/selftests/resctrl/resctrlfs.c | 94 +-- .../selftests/sigaltstack/current_stack_pointer.h | 2 +- 601 files changed, 5320 insertions(+), 3401 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/568 spi: spi-microchip-core: Fix the number of chip selects supported
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prajna Rajendra Kumar <[email protected]>
[ Upstream commit a7ed3a11202d90939a3d00ffcc8cf50703cb7b35 ]
The SPI "hard" controller in PolarFire SoC has eight CS lines, but only one CS line is wired. When the 'num-cs' property is not specified in the device tree, the driver defaults to the MAX_CS value, which has been fixed to 1 to match the hardware configuration; however, when the 'num-cs' property is explicitly defined in the device tree, it overrides the default value.
--- drivers/spi/spi-microchip-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-microchip-core.c +1 -1
@@ -21,7 +21,7 @@#include <linux/spi/spi.h> #define MAX_LEN (0xffff) -#define MAX_CS (8) +#define MAX_CS (1)#define DEFAULT_FRAMESIZE (8)#define FIFO_DEPTH (32)#define CLK_GEN_MODE1_MAX (255)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 3/568 EDAC, i10nm: make skx_common.o a separate module
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 123b158635505c89ed0d3ef45c5845ff9030a466 ]
Commit 598afa050403 ("kbuild: warn objects shared among multiple modules") was added to track down cases where the same object is linked into multiple modules. This can cause serious problems if some modules are builtin while others are not.
That test triggers this warning:
scripts/Makefile.build:236: drivers/edac/Makefile: skx_common.o is added to multiple modules: i10nm_edac skx_edac
Make this a separate module instead.
[Tony: Added more background details to commit message]
--- drivers/edac/Makefile | 10 ++++++---- drivers/edac/skx_common.c | 21 +++++++++++++++++++-- drivers/edac/skx_common.h | 4 ++-- 3 files changed, 27 insertions(+), 8 deletions(-)
drivers/edac/Makefile +6 -4
@@ -54,11 +54,13 @@ obj-$(CONFIG_EDAC_MPC85XX) += mpc85xx_edac_mod.o layerscape_edac_mod-y := fsl_ddr_edac.o layerscape_edac.o obj-$(CONFIG_EDAC_LAYERSCAPE) += layerscape_edac_mod.o -skx_edac-y := skx_common.o skx_base.o -obj-$(CONFIG_EDAC_SKX) += skx_edac.o +skx_edac_common-y := skx_common.o -i10nm_edac-y := skx_common.o i10nm_base.o -obj-$(CONFIG_EDAC_I10NM) += i10nm_edac.o +skx_edac-y := skx_base.o +obj-$(CONFIG_EDAC_SKX) += skx_edac.o skx_edac_common.o + +i10nm_edac-y := i10nm_base.o +obj-$(CONFIG_EDAC_I10NM) += i10nm_edac.o skx_edac_common.o obj-$(CONFIG_EDAC_CELL) += cell_edac.o obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o
drivers/edac/skx_common.c +19 -2
@@ -48,7 +48,7 @@ static u64 skx_tolm, skx_tohm;static LIST_HEAD (dev_edac_list);static bool skx_mem_cfg_2lm; -int __init skx_adxl_get (void ) +int skx_adxl_get (void ) {const char *const *names;int i, j;
@@ -110,12 +110,14 @@ int __init skx_adxl_get(void)return -ENODEV ; } +EXPORT_SYMBOL_GPL (skx_adxl_get); -void __exit skx_adxl_put(void) +void skx_adxl_put (void ) {kfree (adxl_values);kfree (adxl_msg); } +EXPORT_SYMBOL_GPL (skx_adxl_put);static bool skx_adxl_decode (struct decoded_addr *res,bool error_in_1st_level_mem) {
@@ -187,12 +189,14 @@ void skx_set_mem_cfg(bool mem_cfg_2lm) { skx_mem_cfg_2lm = mem_cfg_2lm; } +EXPORT_SYMBOL_GPL (skx_set_mem_cfg);void skx_set_decode (skx_decode_f decode,skx_show_retry_log_f show_retry_log) { driver_decode = decode; skx_show_retry_rd_err_log = show_retry_log; } +EXPORT_SYMBOL_GPL (skx_set_decode);int skx_get_src_id (struct skx_dev *d,int off,u8 *id) {
@@ -206,6 +210,7 @@ int skx_get_src_id(struct skx_dev *d, int off, u8 *id) *id =GET_BITFIELD (reg,12 ,14 );return 0 ; } +EXPORT_SYMBOL_GPL (skx_get_src_id);int skx_get_node_id (struct skx_dev *d,u8 *id) {
@@ -219,6 +224,7 @@ int skx_get_node_id(struct skx_dev *d, u8 *id) *id =GET_BITFIELD (reg,0 ,2 );return 0 ; } +EXPORT_SYMBOL_GPL (skx_get_node_id);static int get_width (u32 mtr) {
@@ -284,6 +290,7 @@ int skx_get_all_bus_mappings(struct res_config *cfg, struct list_head **list) *list = &dev_edac_list;return ndev; } +EXPORT_SYMBOL_GPL (skx_get_all_bus_mappings);int skx_get_hi_lo (unsigned int did,int off[],u64 *tolm,u64 *tohm) {
@@ -323,6 +330,7 @@ int skx_get_hi_lo(unsigned int did, int off[], u64 *tolm, u64 *tohm)pci_dev_put (pdev);return -ENODEV ; } +EXPORT_SYMBOL_GPL (skx_get_hi_lo);static int skx_get_dimm_attr (u32 reg,int lobit,int hibit,int add,int minval,int maxval,const char *name)
@@ -394,6 +402,7 @@ int skx_get_dimm_info(u32 mtr, u32 mcmtr, u32 amap, struct dimm_info *dimm,return 1 ; } +EXPORT_SYMBOL_GPL (skx_get_dimm_info);int skx_get_nvdimm_info (struct dimm_info *dimm,struct skx_imc *imc,int chan,int dimmno,const char *mod_str)
@@ -442,6 +451,7 @@ int skx_get_nvdimm_info(struct dimm_info *dimm, struct skx_imc *imc,return (size ==0 || size == ~0ull ) ?0 :1 ; } +EXPORT_SYMBOL_GPL (skx_get_nvdimm_info); int skx_register_mci(struct skx_imc *imc, struct pci_dev *pdev, const char *ctl_name, const char *mod_str,
@@ -512,6 +522,7 @@ int skx_register_mci(struct skx_imc *imc, struct pci_dev *pdev, imc->mci =NULL ;return rc; } +EXPORT_SYMBOL_GPL (skx_register_mci);static void skx_unregister_mci (struct skx_imc *imc) {
@@ -684,6 +695,7 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val, mce->kflags |=MCE_HANDLED_EDAC ;return NOTIFY_DONE ; } +EXPORT_SYMBOL_GPL (skx_mce_check_error);void skx_remove (void ) {
@@ -721,3 +733,8 @@ void skx_remove(void)kfree (d); } } +EXPORT_SYMBOL_GPL (skx_remove); + +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Tony Luck" ); +MODULE_DESCRIPTION ("MC Driver for Intel server processors" );
drivers/edac/skx_common.h +2 -2
@@ -231,8 +231,8 @@ typedef int (*get_dimm_config_f)(struct mem_ctl_info *mci,typedef bool (*skx_decode_f )(struct decoded_addr *res);typedef void (*skx_show_retry_log_f )(struct decoded_addr *res,char *msg,int len,bool scrub_err); -int __init skx_adxl_get (void ); -void __exit skx_adxl_put(void); +int skx_adxl_get (void ); +void skx_adxl_put (void );void skx_set_decode (skx_decode_f decode,skx_show_retry_log_f show_retry_log);void skx_set_mem_cfg (bool mem_cfg_2lm);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 2/568 spi: atmel-quadspi: Add missing check for clk_prepare
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit ef901b38d3a4610c4067cd306c1a209f32e7ca31 ]
Add check for the return value of clk_prepare() and return the error if it fails in order to catch the error.
--- drivers/spi/atmel-quadspi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/spi/atmel-quadspi.c +9 -2
@@ -756,8 +756,15 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev)struct atmel_qspi *aq =spi_controller_get_devdata (ctrl);int ret; -clk_prepare (aq->pclk); -clk_prepare (aq->qspick); + ret =clk_prepare (aq->pclk); +if (ret) +return ret; + + ret =clk_prepare (aq->qspick); +if (ret) { +clk_unprepare (aq->pclk); +return ret; + } ret =pm_runtime_force_resume (dev);if (ret <0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 4/568 rcu/tasks: Fix stale task snaphot for Tasks Trace
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frederic Weisbecker <[email protected]>
[ Upstream commit 399ced9594dfab51b782798efe60a2376cd5b724 ]
When RCU-TASKS-TRACE pre-gp takes a snapshot of the current task running on all online CPUs, no explicit ordering synchronizes properly with a context switch. This lack of ordering can permit the new task to miss pre-grace-period update-side accesses. The following diagram, courtesy of Paul, shows the possible bad scenario:
CPU 0 CPU 1
----- -----
// Pre-GP update side access
WRITE_ONCE(*X, 1);
smp_mb();
r0 = rq->curr;
RCU_INIT_POINTER(rq->curr, TASK_B)
spin_unlock(rq)
rcu_read_lock_trace()
r1 = X;
/* ignore TASK_B */Either r0==TASK_B or r1==1 is needed but neither is guaranteed.
One possible solution to solve this is to wait for an RCU grace period at the beginning of the RCU-tasks-trace grace period before taking the current tasks snaphot. However this would introduce large additional latencies to RCU-tasks-trace grace periods.
Another solution is to lock the target runqueue while taking the current task snapshot. This ensures that the update side sees the latest context switch and subsequent context switches will see the pre-grace-period update side accesses.
This commit therefore adds runqueue locking to cpu_curr_snapshot().
--- kernel/rcu/tasks.h | 10 ++++++++++ kernel/sched/core.c | 14 +++++++------- 2 files changed, 17 insertions(+), 7 deletions(-)
kernel/rcu/tasks.h +10 -0
@@ -1675,6 +1675,16 @@ static void rcu_tasks_trace_pregp_step(struct list_head *hop)// allow safe access to the hop list. for_each_online_cpu (cpu) {rcu_read_lock (); +// Note that cpu_curr_snapshot() picks up the target +// CPU's current task while its runqueue is locked with +// an smp_mb__after_spinlock(). This ensures that either +// the grace-period kthread will see that task's read-side +// critical section or the task will see the updater's pre-GP +// accesses. The trailing smp_mb() in cpu_curr_snapshot() +// does not currently play a role other than simplify +// that function's ordering semantics. If these simplified +// ordering semantics continue to be redundant, that smp_mb() +// might be removed. t =cpu_curr_snapshot (cpu);if (rcu_tasks_trace_pertask_prep (t, true))trc_add_holdout (t, hop);
kernel/sched/core.c +7 -7
@@ -4438,12 +4438,7 @@ int task_call_func(struct task_struct *p, task_call_f func, void *arg)* @cpu: The CPU on which to snapshot the task. * * Returns the task_struct pointer of the task "currently" running on -* the specified CPU. If the same task is running on that CPU throughout, -* the return value will be a pointer to that task's task_struct structure. -* If the CPU did any context switches even vaguely concurrently with the -* execution of this function, the return value will be a pointer to the -* task_struct structure of a randomly chosen task that was running on -* that CPU somewhere around the time that this function was executing. +* the specified CPU. * * If the specified CPU was offline, the return value is whatever it * is, perhaps a pointer to the task_struct structure of that CPU's idle
@@ -4457,11 +4452,16 @@ int task_call_func(struct task_struct *p, task_call_f func, void *arg)*/ struct task_struct *cpu_curr_snapshot (int cpu) { +struct rq *rq =cpu_rq (cpu);struct task_struct *t; +struct rq_flags rf; -smp_mb ();/* Pairing determined by caller's synchronization design. */ +rq_lock_irqsave (rq, &rf); +smp_mb__after_spinlock ();/* Pairing determined by caller's synchronization design. */ t =rcu_dereference (cpu_curr (cpu)); +rq_unlock_irqrestore (rq, &rf);smp_mb ();/* Pairing determined by caller's synchronization design. */ +return t; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 5/568 md: fix deadlock between mddev_suspend and flush bio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 611d5cbc0b35a752e657a83eebadf40d814d006b ]
Deadlock occurs when mddev is being suspended while some flush bio is in progress. It is a complex issue.
T1. the first flush is at the ending stage, it clears 'mddev->flush_bio'
and tries to submit data, but is blocked because mddev is suspended by T4.
T2. the second flush sets 'mddev->flush_bio', and attempts to queue
md_submit_flush_data(), which is already running (T1) and won't execute again if on the same CPU as T1.
T3. the third flush inc active_io and tries to flush, but is blocked because
'mddev->flush_bio' is not NULL (set by T2).
T4. mddev_suspend() is called and waits for active_io dec to 0 which is inc
by T3. T1 T2 T3 T4
(flush 1) (flush 2) (third 3) (suspend)
md_submit_flush_data
mddev->flush_bio = NULL;
.
. md_flush_request
. mddev->flush_bio = bio
. queue submit_flushes
. .
. . md_handle_request
. . active_io + 1
. . md_flush_request
. . wait !mddev->flush_bio
. .
. . mddev_suspend
. . wait !active_io
. .
. submit_flushes
. queue_work md_submit_flush_data
. //md_submit_flush_data is already running (T1)
.
md_handle_request
wait resumeThe root issue is non-atomic inc/dec of active_io during flush process. active_io is dec before md_submit_flush_data is queued, and inc soon after md_submit_flush_data() run.
md_flush_request
active_io + 1
submit_flushes
active_io - 1
md_submit_flush_data
md_handle_request
active_io + 1
make_request
active_io - 1
If active_io is dec after md_handle_request() instead of within submit_flushes(), make_request() can be called directly intead of md_handle_request() in md_submit_flush_data(), and active_io will only inc and dec once in the whole flush process. Deadlock will be fixed.
Additionally, the only difference between fixing the issue and before is that there is no return error handling of make_request(). But after previous patch cleaned md_write_start(), make_requst() only return error in raid5_make_request() by dm-raid, see commit 41425f96d7aa ("dm-raid456, md/raid456: fix a deadlock for dm-raid456 while io concurrent with reshape)". Since dm always splits data and flush operation into two separate io, io size of flush submitted by dm always is 0, make_request() will not be called in md_submit_flush_data(). To prevent future modifications from introducing issues, add WARN_ON to ensure make_request() no error is returned in this context.
--- drivers/md/md.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/md/md.c +15 -11
@@ -493,13 +493,9 @@ static void md_end_flush(struct bio *bio)rdev_dec_pending (rdev, mddev); -if (atomic_dec_and_test (&mddev->flush_pending)) { -/* The pair is percpu_ref_get() from md_flush_request() */ -percpu_ref_put (&mddev->active_io); - +if (atomic_dec_and_test (&mddev->flush_pending))/* The pre-request flush has finished */ queue_work (md_wq, &mddev->flush_work); - } }static void md_submit_flush_data (struct work_struct *ws);
@@ -530,12 +526,8 @@ static void submit_flushes(struct work_struct *ws)rcu_read_lock (); }rcu_read_unlock (); -if (atomic_dec_and_test (&mddev->flush_pending)) { -/* The pair is percpu_ref_get() from md_flush_request() */ -percpu_ref_put (&mddev->active_io); - +if (atomic_dec_and_test (&mddev->flush_pending))queue_work (md_wq, &mddev->flush_work); - } }static void md_submit_flush_data (struct work_struct *ws)
@@ -560,8 +552,20 @@ static void md_submit_flush_data(struct work_struct *ws)bio_endio (bio); }else { bio->bi_opf &= ~REQ_PREFLUSH ; -md_handle_request (mddev, bio); + +/* +* make_requst() will never return error here, it only +* returns error in raid5_make_request() by dm-raid. +* Since dm always splits data and flush operation into +* two separate io, io size of flush submitted by dm +* always is 0, make_request() will not be called here. +*/ +if (WARN_ON_ONCE (!mddev->pers->make_request (mddev, bio))) +bio_io_error (bio);; } + +/* The pair is percpu_ref_get() from md_flush_request() */ +percpu_ref_put (&mddev->active_io); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 6/568 platform/chrome: cros_ec_debugfs: fix wrong EC message version
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tzung-Bi Shih <[email protected]>
[ Upstream commit c2a28647bbb4e0894e8824362410f72b06ac57a4 ]
ec_read_version_supported() uses ec_params_get_cmd_versions_v1 but it wrongly uses message version 0.
Fix it.
--- drivers/platform/chrome/cros_ec_debugfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/chrome/cros_ec_debugfs.c +1 -0
@@ -329,6 +329,7 @@ static int ec_read_version_supported(struct cros_ec_dev *ec)if (!msg)return 0 ; + msg->version =1 ; msg->command =EC_CMD_GET_CMD_VERSIONS + ec->cmd_offset; msg->outsize =sizeof (*params); msg->insize =sizeof (*response);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 7/568 ubd: refactor the interrupt handler
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 5db755fbb1a0de4a4cfd5d5edfaa19853b9c56e6 ]
Instead of a separate handler function that leaves no work in the interrupt hanler itself, split out a per-request end I/O helper and clean up the coding style and variable naming while we're at it.
Stable-dep-of: 31ade7d4fdcf ("ubd: untagle discard vs write zeroes not support handling")
--- arch/um/drivers/ubd_kern.c | 49 ++++++++++++++------------------------ 1 file changed, 18 insertions(+), 31 deletions(-)
arch/um/drivers/ubd_kern.c +18 -31
@@ -456,43 +456,30 @@ static int bulk_req_safe_read(return n; } -/* Called without dev->lock held, and only in interrupt context. */ -static void ubd_handler (void ) +static void ubd_end_request (struct io_thread_req *io_req) { -int n; -int count; - -while (1 ){ - n =bulk_req_safe_read ( - thread_fd, - irq_req_buffer, - &irq_remainder, - &irq_remainder_size, -UBD_REQ_BUFFER_SIZE - ); -if (n <0 ) { -if (n == -EAGAIN ) -break ; -printk (KERN_ERR "spurious interrupt in ubd_handler, " -"err = %d\n" , -n); -return ; - } -for (count =0 ; count < n/sizeof (struct io_thread_req *); count++) { -struct io_thread_req *io_req = (*irq_req_buffer)[count]; - -if ((io_req->error ==BLK_STS_NOTSUPP ) && (req_op (io_req->req) ==REQ_OP_DISCARD )) { -blk_queue_max_discard_sectors (io_req->req->q,0 ); -blk_queue_max_write_zeroes_sectors (io_req->req->q,0 ); - } -blk_mq_end_request (io_req->req, io_req->error); -kfree (io_req); - } +if (io_req->error ==BLK_STS_NOTSUPP && +req_op (io_req->req) ==REQ_OP_DISCARD ) { +blk_queue_max_discard_sectors (io_req->req->q,0 ); +blk_queue_max_write_zeroes_sectors (io_req->req->q,0 ); } +blk_mq_end_request (io_req->req, io_req->error); +kfree (io_req); }static irqreturn_t ubd_intr (int irq,void *dev) { -ubd_handler (); +int len, i; + +while ((len =bulk_req_safe_read (thread_fd, irq_req_buffer, + &irq_remainder, &irq_remainder_size, +UBD_REQ_BUFFER_SIZE )) >=0 ) { +for (i =0 ; i < len /sizeof (struct io_thread_req *); i++) +ubd_end_request ((*irq_req_buffer)[i]); + } + +if (len <0 && len != -EAGAIN ) +pr_err ("spurious interrupt in %s, err = %d\n" , __func__, len);return IRQ_HANDLED ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 8/568 ubd: untagle discard vs write zeroes not support handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 31ade7d4fdcf382beb8cb229a1f5d77e0f239672 ]
Discard and Write Zeroes are different operation and implemented by different fallocate opcodes for ubd. If one fails the other one can work and vice versa.
Split the code to disable the operations in ubd_handler to only disable the operation that actually failed.
--- arch/um/drivers/ubd_kern.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/um/drivers/ubd_kern.c +5 -4
@@ -458,10 +458,11 @@ static int bulk_req_safe_read(static void ubd_end_request (struct io_thread_req *io_req) { -if (io_req->error ==BLK_STS_NOTSUPP && -req_op (io_req->req) ==REQ_OP_DISCARD ) { -blk_queue_max_discard_sectors (io_req->req->q,0 ); -blk_queue_max_write_zeroes_sectors (io_req->req->q,0 ); +if (io_req->error ==BLK_STS_NOTSUPP ) { +if (req_op (io_req->req) ==REQ_OP_DISCARD ) +blk_queue_max_discard_sectors (io_req->req->q,0 ); +else if (req_op (io_req->req) ==REQ_OP_WRITE_ZEROES ) +blk_queue_max_write_zeroes_sectors (io_req->req->q,0 ); }blk_mq_end_request (io_req->req, io_req->error);kfree (io_req);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 9/568 block: initialize integrity buffer to zero before writing it to media
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 899ee2c3829c5ac14bfc7d3c4a5846c0b709b78f ]
Metadata added by bio_integrity_prep is using plain kmalloc, which leads to random kernel memory being written media. For PI metadata this is limited to the app tag that isn't used by kernel generated metadata, but for non-PI metadata the entire buffer leaks kernel memory.
Fix this by adding the __GFP_ZERO flag to allocations for writes.
--- block/bio-integrity.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
block/bio-integrity.c +10 -1
@@ -217,6 +217,7 @@ bool bio_integrity_prep(struct bio *bio)unsigned long start, end;unsigned int len, nr_pages;unsigned int bytes, offset, i; +gfp_t gfp =GFP_NOIO ;if (!bi)return true;
@@ -239,11 +240,19 @@ bool bio_integrity_prep(struct bio *bio)if (!bi->profile->generate_fn || !(bi->flags &BLK_INTEGRITY_GENERATE ))return true; + +/* +* Zero the memory allocated to not leak uninitialized kernel +* memory to disk. For PI this only affects the app tag, but +* for non-integrity metadata it affects the entire metadata +* buffer. +*/ + gfp |= __GFP_ZERO; }/* Allocate kernel buffer for protection data */ len =bio_integrity_bytes (bi,bio_sectors (bio)); - buf =kmalloc (len,GFP_NOIO ); + buf =kmalloc (len, gfp);if (unlikely (buf ==NULL )) {printk (KERN_ERR "could not allocate integrity buffer\n" ); goto err_end_io;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 10/568 x86/kconfig: Add as-instr64 macro to properly evaluate AS_WRUSS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 469169803d52a5d8f0dc781090638e851a7d22b1 ]
Some instructions are only available on the 64-bit architecture.
Bi-arch compilers that default to -m32 need the explicit -m64 option to evaluate them properly.
--- arch/x86/Kconfig.assembler | 2 +- scripts/Kconfig.include | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/Kconfig.assembler +1 -1
@@ -26,6 +26,6 @@ config AS_GFNI Supported by binutils >= 2.30 and LLVM integrated assembler config AS_WRUSS - def_bool $(as-instr,wrussq %rax$(comma)(%rbx)) + def_bool $(as-instr64,wrussq %rax$(comma)(%rbx)) help Supported by binutils >= 2.31 and LLVM integrated assembler
scripts/Kconfig.include +2 -1
@@ -33,7 +33,8 @@ ld-option = $(success,$(LD) -v $(1)) # $(as-instr,<instr>) # Return y if the assembler supports <instr>, n otherwise -as-instr = $(success,printf "%b\n" "$(1)" | $(CC) $(CLANG_FLAGS) -Wa$(comma)--fatal-warnings -c -x assembler-with-cpp -o /dev/null -) +as-instr = $(success,printf "%b\n" "$(1)" | $(CC) $(CLANG_FLAGS) $(2) -Wa$(comma)--fatal-warnings -c -x assembler-with-cpp -o /dev/null -) +as-instr64 = $(as-instr,$(1),$(m64-flag)) # check if $(CC) and $(LD) exist $(error-if,$(failure,command -v $(CC)),C compiler '$(CC)' not found)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 11/568 hfsplus: fix to avoid false alarm of circular locking
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit be4edd1642ee205ed7bbf66edc0453b1be1fb8d7 ]
Syzbot report potential ABBA deadlock as below:
loop0: detected capacity change from 0 to 1024
======================================================
WARNING: possible circular locking dependency detected
6.9.0-syzkaller-10323-g8f6a15f095a6 #0 Not tainted
------------------------------------------------------
syz-executor171/5344 is trying to acquire lock:ffff88807cb980b0 (&tree->tree_lock){+.+.}-{3:3}, at: hfsplus_file_truncate+0x811/0xb50 fs/hfsplus/extents.c:595
but task is already holding lock:ffff88807a930108 (&HFSPLUS_I(inode)->extents_lock){+.+.}-{3:3}, at: hfsplus_file_truncate+0x2da/0xb50 fs/hfsplus/extents.c:576
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&HFSPLUS_I(inode)->extents_lock){+.+.}-{3:3}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__mutex_lock_common kernel/locking/mutex.c:608 [inline]
__mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752
hfsplus_file_extend+0x21b/0x1b70 fs/hfsplus/extents.c:457
hfsplus_bmap_reserve+0x105/0x4e0 fs/hfsplus/btree.c:358
hfsplus_rename_cat+0x1d0/0x1050 fs/hfsplus/catalog.c:456
hfsplus_rename+0x12e/0x1c0 fs/hfsplus/dir.c:552
vfs_rename+0xbdb/0xf00 fs/namei.c:4887
do_renameat2+0xd94/0x13f0 fs/namei.c:5044
__do_sys_rename fs/namei.c:5091 [inline]
__se_sys_rename fs/namei.c:5089 [inline]
__x64_sys_rename+0x86/0xa0 fs/namei.c:5089
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f-> #0 (&tree->tree_lock){+.+.}-{3:3}:
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__mutex_lock_common kernel/locking/mutex.c:608 [inline]
__mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752
hfsplus_file_truncate+0x811/0xb50 fs/hfsplus/extents.c:595
hfsplus_setattr+0x1ce/0x280 fs/hfsplus/inode.c:265
notify_change+0xb9d/0xe70 fs/attr.c:497
do_truncate+0x220/0x310 fs/open.c:65
handle_truncate fs/namei.c:3308 [inline]
do_open fs/namei.c:3654 [inline]
path_openat+0x2a3d/0x3280 fs/namei.c:3807
do_filp_open+0x235/0x490 fs/namei.c:3834
do_sys_openat2+0x13e/0x1d0 fs/open.c:1406
do_sys_open fs/open.c:1421 [inline]
__do_sys_creat fs/open.c:1497 [inline]
__se_sys_creat fs/open.c:1491 [inline]
__x64_sys_creat+0x123/0x170 fs/open.c:1491
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7fother info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&HFSPLUS_I(inode)->extents_lock);
lock(&tree->tree_lock);
lock(&HFSPLUS_I(inode)->extents_lock); lock(&tree->tree_lock);
This is a false alarm as tree_lock mutex are different, one is from sbi->cat_tree, and another is from sbi->ext_tree:
Thread A Thread B
- hfsplus_rename
- hfsplus_rename_cat
- hfs_find_init
- mutext_lock(cat_tree->tree_lock)
- hfsplus_setattr
- hfsplus_file_truncate
- mutex_lock(hip->extents_lock)
- hfs_find_init
- mutext_lock(ext_tree->tree_lock)
- hfs_bmap_reserve
- hfsplus_file_extend
- mutex_lock(hip->extents_lock)
So, let's call mutex_lock_nested for tree_lock mutex lock, and pass correct lock class for it.
--- fs/hfsplus/bfind.c | 15 ++------------- fs/hfsplus/extents.c | 9 ++++++--- fs/hfsplus/hfsplus_fs.h | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 16 deletions(-)
fs/hfsplus/bfind.c +2 -13
@@ -25,19 +25,8 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd) fd->key = ptr + tree->max_key_len +2 ;hfs_dbg (BNODE_REFS ,"find_init: %d (%p)\n" , tree->cnid,__builtin_return_address (0 )); -switch (tree->cnid) { -case HFSPLUS_CAT_CNID : -mutex_lock_nested (&tree->tree_lock,CATALOG_BTREE_MUTEX ); -break ; -case HFSPLUS_EXT_CNID : -mutex_lock_nested (&tree->tree_lock,EXTENTS_BTREE_MUTEX ); -break ; -case HFSPLUS_ATTR_CNID : -mutex_lock_nested (&tree->tree_lock,ATTR_BTREE_MUTEX ); -break ; -default : -BUG (); - } +mutex_lock_nested (&tree->tree_lock, +hfsplus_btree_lock_class (tree));return 0 ; }
fs/hfsplus/extents.c +6 -3
@@ -430,7 +430,8 @@ int hfsplus_free_fork(struct super_block *sb, u32 cnid,hfsplus_free_extents (sb, ext_entry, total_blocks - start, total_blocks); total_blocks = start; -mutex_lock (&fd.tree->tree_lock); +mutex_lock_nested (&fd.tree->tree_lock, +hfsplus_btree_lock_class (fd.tree)); }while (total_blocks > blocks);hfs_find_exit (&fd);
@@ -592,7 +593,8 @@ void hfsplus_file_truncate(struct inode *inode) alloc_cnt, alloc_cnt - blk_cnt);hfsplus_dump_extent (hip->first_extents); hip->first_blocks = blk_cnt; -mutex_lock (&fd.tree->tree_lock); +mutex_lock_nested (&fd.tree->tree_lock, +hfsplus_btree_lock_class (fd.tree));break ; } res =__hfsplus_ext_cache_extent (&fd, inode, alloc_cnt);
@@ -606,7 +608,8 @@ void hfsplus_file_truncate(struct inode *inode)hfsplus_free_extents (sb, hip->cached_extents, alloc_cnt - start, alloc_cnt - blk_cnt);hfsplus_dump_extent (hip->cached_extents); -mutex_lock (&fd.tree->tree_lock); +mutex_lock_nested (&fd.tree->tree_lock, +hfsplus_btree_lock_class (fd.tree));if (blk_cnt > start) { hip->extent_state |=HFSPLUS_EXT_DIRTY ;break ;
fs/hfsplus/hfsplus_fs.h +21 -0
@@ -552,6 +552,27 @@ static inline __be32 __hfsp_ut2mt(time64_t ut)return cpu_to_be32 (lower_32_bits (ut) +HFSPLUS_UTC_OFFSET ); } +static inline enum hfsplus_btree_mutex_classes +hfsplus_btree_lock_class (struct hfs_btree *tree) +{ +enum hfsplus_btree_mutex_classes class; + +switch (tree->cnid) { +case HFSPLUS_CAT_CNID : + class =CATALOG_BTREE_MUTEX ; +break ; +case HFSPLUS_EXT_CNID : + class =EXTENTS_BTREE_MUTEX ; +break ; +case HFSPLUS_ATTR_CNID : + class =ATTR_BTREE_MUTEX ; +break ; +default : +BUG (); + } +return class; +} +/* compatibility */ #define hfsp_mt2ut (t) (struct timespec64){ .tv_sec = __hfsp_mt2ut(t) }#define hfsp_ut2mt (t) __hfsp_ut2mt((t).tv_sec)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 12/568 x86/of: Return consistent error type from x86_of_pci_irq_enable()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit ec0b4c4d45cf7cf9a6c9626a494a89cb1ae7c645 ]
x86_of_pci_irq_enable() returns PCIBIOS_* code received from pci_read_config_byte() directly and also -EINVAL which are not compatible error types. x86_of_pci_irq_enable() is used as (*pcibios_enable_irq) function which should not return PCIBIOS_* codes.
Convert the PCIBIOS_* return code from pci_read_config_byte() into normal errno using pcibios_err_to_errno().
--- arch/x86/kernel/devicetree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/devicetree.c +1 -1
@@ -82,7 +82,7 @@ static int x86_of_pci_irq_enable(struct pci_dev *dev) ret =pci_read_config_byte (dev,PCI_INTERRUPT_PIN , &pin);if (ret) -return ret; +return pcibios_err_to_errno (ret);if (!pin)return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 13/568 x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 724852059e97c48557151b3aa4af424614819752 ]
intel_mid_pci_irq_enable() uses pci_read_config_byte() that returns PCIBIOS_* codes. The error handling, however, assumes the codes are normal errnos because it checks for < 0.
intel_mid_pci_irq_enable() also returns the PCIBIOS_* code back to the caller but the function is used as the (*pcibios_enable_irq) function which should return normal errnos.
Convert the error check to plain non-zero check which works for PCIBIOS_* return codes and convert the PCIBIOS_* return code using pcibios_err_to_errno() into normal errno before returning it.
--- arch/x86/pci/intel_mid_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/intel_mid_pci.c +2 -2
@@ -233,9 +233,9 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)return 0 ; ret =pci_read_config_byte (dev,PCI_INTERRUPT_LINE , &gsi); -if (ret <0 ) { +if (ret) {dev_warn (&dev->dev,"Failed to read interrupt line: %d\n" , ret); -return ret; +return pcibios_err_to_errno (ret); } id =x86_match_cpu (intel_mid_cpu_ids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/568 x86/pci/xen: Fix PCIBIOS_* return code handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit e9d7b435dfaec58432f4106aaa632bf39f52ce9f ]
xen_pcifront_enable_irq() uses pci_read_config_byte() that returns PCIBIOS_* codes. The error handling, however, assumes the codes are normal errnos because it checks for < 0.
xen_pcifront_enable_irq() also returns the PCIBIOS_* code back to the caller but the function is used as the (*pcibios_enable_irq) function which should return normal errnos.
Convert the error check to plain non-zero check which works for PCIBIOS_* return codes and convert the PCIBIOS_* return code using pcibios_err_to_errno() into normal errno before returning it.
--- arch/x86/pci/xen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/xen.c +2 -2
@@ -38,10 +38,10 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)u8 gsi; rc =pci_read_config_byte (dev,PCI_INTERRUPT_LINE , &gsi); -if (rc <0 ) { +if (rc) {dev_warn (&dev->dev,"Xen PCI: failed to read interrupt line: %d\n" , rc); -return rc; +return pcibios_err_to_errno (rc); }/* In PV DomU the Xen PCI backend puts the PIRQ in the interrupt line.*/ pirq = gsi;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/568 x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 7821fa101eab529521aa4b724bf708149d70820c ]
iosf_mbi_pci_{read,write}_mdr() use pci_{read,write}_config_dword() that return PCIBIOS_* codes but functions also return -ENODEV which are not compatible error codes. As neither of the functions are related to PCI read/write functions, they should return normal errnos.
Convert PCIBIOS_* returns code using pcibios_err_to_errno() into normal errno before returning it.
--- arch/x86/platform/intel/iosf_mbi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/platform/intel/iosf_mbi.c +2 -2
@@ -62,7 +62,7 @@ static int iosf_mbi_pci_read_mdr(u32 mcrx, u32 mcr, u32 *mdr) fail_read:dev_err (&mbi_pdev->dev,"PCI config access failed with %d\n" , result); -return result; +return pcibios_err_to_errno (result); }static int iosf_mbi_pci_write_mdr (u32 mcrx,u32 mcr,u32 mdr)
@@ -91,7 +91,7 @@ static int iosf_mbi_pci_write_mdr(u32 mcrx, u32 mcr, u32 mdr) fail_write:dev_err (&mbi_pdev->dev,"PCI config access failed with %d\n" , result); -return result; +return pcibios_err_to_errno (result); }int iosf_mbi_read (u8 port,u8 opcode,u32 offset,u32 *mdr)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/568 kernfs: Convert kernfs_path_from_node_locked() from strlcpy() to strscpy()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit ff6d413b0b59466e5acf2e42f294b1842ae130a1 ]
One of the last remaining users of strlcpy() in the kernel is kernfs_path_from_node_locked(), which passes back the problematic "length we _would_ have copied" return value to indicate truncation. Convert the chain of all callers to use the negative return value (some of which already doing this explicitly). All callers were already also checking for negative return values, so the risk to missed checks looks very low.
In this analysis, it was found that cgroup1_release_agent() actually didn't handle the "too large" condition, so this is technically also a bug fix. :)
Here's the chain of callers, and resolution identifying each one as now handling the correct return value:
kernfs_path_from_node_locked()
kernfs_path_from_node()
pr_cont_kernfs_path()
returns void
kernfs_path()
sysfs_warn_dup()
return value ignored
cgroup_path()
blkg_path()
bfq_bic_update_cgroup()
return value ignored
TRACE_IOCG_PATH()
return value ignored
TRACE_CGROUP_PATH()
return value ignored
perf_event_cgroup()
return value ignored
task_group_path()
return value ignored
damon_sysfs_memcg_path_eq()
return value ignored
get_mm_memcg_path()
return value ignored
lru_gen_seq_show()
return value ignored
cgroup_path_from_kernfs_id()
return value ignored
cgroup_show_path()
already converted "too large" error to negative value
cgroup_path_ns_locked()
cgroup_path_ns()
bpf_iter_cgroup_show_fdinfo()
return value ignored
cgroup1_release_agent()
wasn't checking "too large" error
proc_cgroup_show()
already converted "too large" to negative value
Stable-dep-of: 1be59c97c83c ("cgroup/cpuset: Prevent UAF in proc_cpuset_show()")
--- fs/kernfs/dir.c | 34 +++++++++++++++++----------------- kernel/cgroup/cgroup-v1.c | 2 +- kernel/cgroup/cgroup.c | 4 ++-- kernel/cgroup/cpuset.c | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-)
fs/kernfs/dir.c +17 -17
@@ -127,7 +127,7 @@ static struct kernfs_node *kernfs_common_ancestor(struct kernfs_node *a,* * [3] when @kn_to is %NULL result will be "(null)" * -* Return: the length of the full path. If the full length is equal to or +* Return: the length of the constructed path. If the path would have been * greater than @buflen, @buf contains the truncated path with the trailing * '\0'. On error, -errno is returned. */
@@ -138,16 +138,17 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to,struct kernfs_node *kn, *common;const char parent_str[] ="/.." ;size_t depth_from, depth_to, len =0 ; +ssize_t copied;int i, j;if (!kn_to) -return strlcpy (buf,"(null)" , buflen); +return strscpy (buf,"(null)" , buflen);if (!kn_from) kn_from =kernfs_root (kn_to)->kn;if (kn_from == kn_to) -return strlcpy (buf,"/" , buflen); +return strscpy (buf,"/" , buflen); common =kernfs_common_ancestor (kn_from, kn_to);if (WARN_ON (!common))
@@ -158,18 +159,19 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to, buf[0 ] ='\0' ; -for (i =0 ; i < depth_from; i++) - len +=strlcpy (buf + len, parent_str, - len < buflen ? buflen - len :0 ); +for (i =0 ; i < depth_from; i++) { + copied =strscpy (buf + len, parent_str, buflen - len); +if (copied <0 ) +return copied; + len += copied; + }/* Calculate how many bytes we need for the rest */ for (i = depth_to -1 ; i >=0 ; i--) {for (kn = kn_to, j =0 ; j < i; j++) kn = kn->parent; - len +=strlcpy (buf + len,"/" , - len < buflen ? buflen - len :0 ); - len +=strlcpy (buf + len, kn->name, - len < buflen ? buflen - len :0 ); + + len +=scnprintf (buf + len, buflen - len,"/%s" , kn->name); }return len;
@@ -214,7 +216,7 @@ int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen)* path (which includes '..'s) as needed to reach from @from to @to is * returned. * -* Return: the length of the full path. If the full length is equal to or +* Return: the length of the constructed path. If the path would have been * greater than @buflen, @buf contains the truncated path with the trailing * '\0'. On error, -errno is returned. */
@@ -265,12 +267,10 @@ void pr_cont_kernfs_path(struct kernfs_node *kn) sz =kernfs_path_from_node (kn,NULL , kernfs_pr_cont_buf,sizeof (kernfs_pr_cont_buf));if (sz <0 ) { -pr_cont ("(error)" ); - goto out; - } - -if (sz >=sizeof (kernfs_pr_cont_buf)) { -pr_cont ("(name too long)" ); +if (sz == -E2BIG ) +pr_cont ("(name too long)" ); +else +pr_cont ("(error)" ); goto out; }
kernel/cgroup/cgroup-v1.c +1 -1
@@ -802,7 +802,7 @@ void cgroup1_release_agent(struct work_struct *work) goto out_free; ret =cgroup_path_ns (cgrp, pathbuf,PATH_MAX , &init_cgroup_ns); -if (ret <0 || ret >=PATH_MAX ) +if (ret <0 ) goto out_free; argv[0 ] = agentbuf;
kernel/cgroup/cgroup.c +2 -2
@@ -1887,7 +1887,7 @@ int cgroup_show_path(struct seq_file *sf, struct kernfs_node *kf_node, len =kernfs_path_from_node (kf_node, ns_cgroup->kn, buf,PATH_MAX );spin_unlock_irq (&css_set_lock); -if (len >=PATH_MAX ) +if (len == -E2BIG ) len = -ERANGE ;else if (len >0 ) {seq_escape (sf, buf," \t\n\\" );
@@ -6277,7 +6277,7 @@ int proc_cgroup_show(struct seq_file *m, struct pid_namespace *ns,if (cgroup_on_dfl (cgrp) || !(tsk->flags &PF_EXITING )) { retval =cgroup_path_ns_locked (cgrp, buf,PATH_MAX , current->nsproxy->cgroup_ns); -if (retval >=PATH_MAX ) +if (retval == -E2BIG ) retval = -ENAMETOOLONG ;if (retval <0 ) goto out_unlock;
kernel/cgroup/cpuset.c +1 -1
@@ -4297,7 +4297,7 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns, retval =cgroup_path_ns (css->cgroup, buf,PATH_MAX , current->nsproxy->cgroup_ns);css_put (css); -if (retval >=PATH_MAX ) +if (retval == -E2BIG ) retval = -ENAMETOOLONG ;if (retval <0 ) goto out_free;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/568 cgroup/cpuset: Prevent UAF in proc_cpuset_show()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ridong <[email protected]>
[ Upstream commit 1be59c97c83ccd67a519d8a49486b3a8a73ca28a ]
An UAF can happen when /proc/cpuset is read as reported in [1].
This can be reproduced by the following methods:
1.add an mdelay(1000) before acquiring the cgroup_lock In the
cgroup_path_ns function.
2.$cat /proc/<pid>/cpuset repeatly.
3.$mount -t cgroup -o cpuset cpuset /sys/fs/cgroup/cpuset/
$umount /sys/fs/cgroup/cpuset/ repeatly.
The race that cause this bug can be shown as below:
(umount) | (cat /proc/<pid>/cpuset)css_release | proc_cpuset_showcss_release_work_fn | css = task_get_css(tsk, cpuset_cgrp_id);css_free_rwork_fn | cgroup_path_ns(css->cgroup, ...);cgroup_destroy_root | mutex_lock(&cgroup_mutex);rebind_subsystems |cgroup_free_root |
| // cgrp was freed, UAF | cgroup_path_ns_locked(cgrp,..);
When the cpuset is initialized, the root node top_cpuset.css.cgrp will point to &cgrp_dfl_root.cgrp. In cgroup v1, the mount operation will allocate cgroup_root, and top_cpuset.css.cgrp will point to the allocated &cgroup_root.cgrp. When the umount operation is executed, top_cpuset.css.cgrp will be rebound to &cgrp_dfl_root.cgrp.
The problem is that when rebinding to cgrp_dfl_root, there are cases where the cgroup_root allocated by setting up the root for cgroup v1 is cached. This could lead to a Use-After-Free (UAF) if it is subsequently freed. The descendant cgroups of cgroup v1 can only be freed after the css is released. However, the css of the root will never be released, yet the cgroup_root should be freed when it is unmounted. This means that obtaining a reference to the css of the root does not guarantee that css.cgrp->root will not be freed.
Fix this problem by using rcu_read_lock in proc_cpuset_show(). As cgroup_root is kfree_rcu after commit d23b5c577715 ("cgroup: Make operations on the cgroup root_list RCU safe"), css->cgroup won't be freed during the critical section.
To call cgroup_path_ns_locked, css_set_lock is needed, so it is safe to replace task_get_css with task_css.
[1] https://syzkaller.appspot.com/bug?extid=9b1ff7be974a403aa4cd
--- kernel/cgroup/cpuset.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
kernel/cgroup/cpuset.c +9 -4
@@ -21,6 +21,7 @@* License. See the file COPYING in the main directory of the Linux * distribution for more details. */ +#include "cgroup-internal.h" #include <linux/cpu.h> #include <linux/cpumask.h>
@@ -4293,10 +4294,14 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,if (!buf) goto out; - css =task_get_css (tsk, cpuset_cgrp_id); - retval =cgroup_path_ns (css->cgroup, buf,PATH_MAX , - current->nsproxy->cgroup_ns); -css_put (css); +rcu_read_lock (); +spin_lock_irq (&css_set_lock); + css =task_css (tsk, cpuset_cgrp_id); + retval =cgroup_path_ns_locked (css->cgroup, buf,PATH_MAX , + current->nsproxy->cgroup_ns); +spin_unlock_irq (&css_set_lock); +rcu_read_unlock (); +if (retval == -E2BIG ) retval = -ENAMETOOLONG ;if (retval <0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/568 hwmon: (adt7475) Fix default duty on fan is disabled
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayne Tung <[email protected]>
[ Upstream commit 39b24cced70fdc336dbc0070f8b3bde61d8513a8 ]
According to the comments on fan is disabled, we change to manual mode and set the duty cycle to 0.
For setting the duty cycle part, the register is wrong. Fix it.
--- drivers/hwmon/adt7475.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/adt7475.c +1 -1
@@ -1862,7 +1862,7 @@ static void adt7475_read_pwm(struct i2c_client *client, int index) data->pwm[CONTROL ][index] &= ~0xE0 ; data->pwm[CONTROL ][index] |= (7 <<5 ); -i2c_smbus_write_byte_data (client,PWM_CONFIG_REG (index), +i2c_smbus_write_byte_data (client,PWM_REG (index), data->pwm[INPUT ][index]); i2c_smbus_write_byte_data(client, PWM_CONFIG_REG(index),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/568 block: Call .limit_depth() after .hctx has been set
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 6259151c04d4e0085e00d2dcb471ebdd1778e72e ]
Call .limit_depth() after data->hctx has been set such that data->hctx can be used in .limit_depth() implementations.
--- block/blk-mq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
block/blk-mq.c +6 -6
@@ -447,6 +447,10 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data)if (data->cmd_flags &REQ_NOWAIT ) data->flags |=BLK_MQ_REQ_NOWAIT ; +retry: + data->ctx =blk_mq_get_ctx (q); + data->hctx =blk_mq_map_queue (q, data->cmd_flags, data->ctx); +if (q->elevator) {/* * All requests use scheduler tags when an I/O scheduler is
@@ -468,13 +472,9 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data)if (ops->limit_depth) ops->limit_depth (data->cmd_flags, data); } - } - -retry: - data->ctx =blk_mq_get_ctx (q); - data->hctx =blk_mq_map_queue (q, data->cmd_flags, data->ctx); -if (!(data->rq_flags &RQF_SCHED_TAGS )) + }else {blk_mq_tag_busy (data->hctx); + }if (data->flags &BLK_MQ_REQ_RESERVED ) data->rq_flags |=RQF_RESV ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/568 pwm: stm32: Always do lazy disabling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 7346e7a058a2c9aa9ff1cc699c7bf18a402d9f84 ]
When the state changes from enabled to disabled, polarity, duty_cycle and period are not configured in hardware and TIM_CCER_CCxE is just cleared. However if the state changes from one disabled state to another, all parameters are written to hardware because the early exit from stm32_pwm_apply() is only taken if the pwm is currently enabled.
This yields surprises like: Applying
{ .period = 1, .duty_cycle = 0, .enabled = false }succeeds if the pwm is initially on, but fails if it's already off because 1 is a too small period.
Update the check for lazy disable to always exit early if the target state is disabled, no matter what is currently configured.
--- drivers/pwm/pwm-stm32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pwm/pwm-stm32.c +3 -2
@@ -456,8 +456,9 @@ static int stm32_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, enabled = pwm->state.enabled; -if (enabled && !state->enabled) { -stm32_pwm_disable (priv, pwm->hwpwm); +if (!state->enabled) { +if (enabled) +stm32_pwm_disable (priv, pwm->hwpwm);return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/568 nvmet-auth: fix nvmet_auth hash error handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaosheng Cui <[email protected]>
[ Upstream commit 89f58f96d1e2357601c092d85b40a2109cf25ef3 ]
If we fail to call nvme_auth_augmented_challenge, or fail to kmalloc for shash, we should free the memory allocation for challenge, so add err path out_free_challenge to fix the memory leak.
--- drivers/nvme/target/auth.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/nvme/target/auth.c +8 -6
@@ -314,7 +314,7 @@ int nvmet_auth_host_hash(struct nvmet_req *req, u8 *response, req->sq->dhchap_c1, challenge, shash_len);if (ret) - goto out_free_response; + goto out_free_challenge; } pr_debug("ctrl %d qid %d host response seq %u transaction %d\n",
@@ -325,7 +325,7 @@ int nvmet_auth_host_hash(struct nvmet_req *req, u8 *response, GFP_KERNEL);if (!shash) { ret = -ENOMEM ; - goto out_free_response; + goto out_free_challenge; } shash->tfm = shash_tfm; ret =crypto_shash_init (shash);
@@ -361,9 +361,10 @@ int nvmet_auth_host_hash(struct nvmet_req *req, u8 *response, goto out; ret =crypto_shash_final (shash, response); out: +kfree (shash); +out_free_challenge:if (challenge != req->sq->dhchap_c1)kfree (challenge); -kfree (shash); out_free_response:kfree_sensitive (host_response); out_free_tfm:
@@ -426,14 +427,14 @@ int nvmet_auth_ctrl_hash(struct nvmet_req *req, u8 *response, req->sq->dhchap_c2, challenge, shash_len);if (ret) - goto out_free_response; + goto out_free_challenge; } shash =kzalloc (sizeof (*shash) +crypto_shash_descsize (shash_tfm),GFP_KERNEL );if (!shash) { ret = -ENOMEM ; - goto out_free_response; + goto out_free_challenge; } shash->tfm = shash_tfm;
@@ -470,9 +471,10 @@ int nvmet_auth_ctrl_hash(struct nvmet_req *req, u8 *response, goto out; ret =crypto_shash_final (shash, response); out: +kfree (shash); +out_free_challenge:if (challenge != req->sq->dhchap_c2)kfree (challenge); -kfree (shash); out_free_response:kfree_sensitive (ctrl_response); out_free_tfm:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/568 drm/meson: fix canvas release in bind function
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yao Zi <[email protected]>
[ Upstream commit a695949b2e9bb6b6700a764c704731a306c4bebf ]
Allocated canvases may not be released on the error exit path of meson_drv_bind_master(), leading to resource leaking. Rewrite exit path to release canvases on error.
--- drivers/gpu/drm/meson/meson_drv.c | 37 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 19 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +18 -19
@@ -250,29 +250,20 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)if (ret) goto free_drm; ret =meson_canvas_alloc (priv->canvas, &priv->canvas_id_vd1_0); -if (ret) { -meson_canvas_free (priv->canvas, priv->canvas_id_osd1); - goto free_drm; - } +if (ret) + goto free_canvas_osd1; ret =meson_canvas_alloc (priv->canvas, &priv->canvas_id_vd1_1); -if (ret) { -meson_canvas_free (priv->canvas, priv->canvas_id_osd1); -meson_canvas_free (priv->canvas, priv->canvas_id_vd1_0); - goto free_drm; - } +if (ret) + goto free_canvas_vd1_0; ret =meson_canvas_alloc (priv->canvas, &priv->canvas_id_vd1_2); -if (ret) { -meson_canvas_free (priv->canvas, priv->canvas_id_osd1); -meson_canvas_free (priv->canvas, priv->canvas_id_vd1_0); -meson_canvas_free (priv->canvas, priv->canvas_id_vd1_1); - goto free_drm; - } +if (ret) + goto free_canvas_vd1_1; priv->vsync_irq =platform_get_irq (pdev,0 ); ret =drm_vblank_init (drm,1 );if (ret) - goto free_drm; + goto free_canvas_vd1_2;/* Assign limits per soc revision/package */ for (i =0 ; i <ARRAY_SIZE (meson_drm_soc_attrs) ; ++i) {
@@ -288,11 +279,11 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)*/ ret =drm_aperture_remove_framebuffers (&meson_driver);if (ret) - goto free_drm; + goto free_canvas_vd1_2; ret =drmm_mode_config_init (drm);if (ret) - goto free_drm; + goto free_canvas_vd1_2; drm->mode_config.max_width =3840 ; drm->mode_config.max_height =2160 ; drm->mode_config.funcs = &meson_mode_config_funcs;
@@ -307,7 +298,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)if (priv->afbcd.ops) { ret = priv->afbcd.ops->init (priv);if (ret) - goto free_drm; + goto free_canvas_vd1_2; }/* Encoder Initialization */
@@ -371,6 +362,14 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) exit_afbcd:if (priv->afbcd.ops) priv->afbcd.ops->exit (priv); +free_canvas_vd1_2: +meson_canvas_free (priv->canvas, priv->canvas_id_vd1_2); +free_canvas_vd1_1: +meson_canvas_free (priv->canvas, priv->canvas_id_vd1_1); +free_canvas_vd1_0: +meson_canvas_free (priv->canvas, priv->canvas_id_vd1_0); +free_canvas_osd1: +meson_canvas_free (priv->canvas, priv->canvas_id_osd1); free_drm:drm_dev_put (drm);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/568 pwm: atmel-tcb: Fix race condition and convert to guards
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 37f7707077f5ea2515bf4b1dc7fad43f8e12993e ]
The hardware only supports a single period length for both PWM outputs. So atmel_tcb_pwm_config() checks the configuration of the other output if it's compatible with the currently requested setting. The register values are then actually updated in atmel_tcb_pwm_enable(). To make this race free the lock must be held during the whole process, so grab the lock in .apply() instead of individually in atmel_tcb_pwm_disable() and atmel_tcb_pwm_enable() which then also covers atmel_tcb_pwm_config().
To simplify handling, use the guard helper to let the compiler care for unlocking. Otherwise unlocking would be more difficult as there is more than one exit path in atmel_tcb_pwm_apply().
--- drivers/pwm/pwm-atmel-tcb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/pwm/pwm-atmel-tcb.c +5 -7
@@ -82,7 +82,8 @@ static int atmel_tcb_pwm_request(struct pwm_chip *chip, tcbpwm->period =0 ; tcbpwm->div =0 ; -spin_lock (&tcbpwmc->lock); +guard (spinlock)(&tcbpwmc->lock); +regmap_read (tcbpwmc->regmap,ATMEL_TC_REG (tcbpwmc->channel,CMR ), &cmr);/* * Get init config from Timer Counter registers if
@@ -108,7 +109,6 @@ static int atmel_tcb_pwm_request(struct pwm_chip *chip, cmr |=ATMEL_TC_WAVE |ATMEL_TC_WAVESEL_UP_AUTO |ATMEL_TC_EEVT_XC0 ;regmap_write (tcbpwmc->regmap,ATMEL_TC_REG (tcbpwmc->channel,CMR ), cmr); -spin_unlock (&tcbpwmc->lock);return 0 ; }
@@ -138,7 +138,6 @@ static void atmel_tcb_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm,if (tcbpwm->duty ==0 ) polarity = !polarity; -spin_lock (&tcbpwmc->lock);regmap_read (tcbpwmc->regmap,ATMEL_TC_REG (tcbpwmc->channel,CMR ), &cmr);/* flush old setting and set the new one */
@@ -173,8 +172,6 @@ static void atmel_tcb_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm, ATMEL_TC_SWTRG); tcbpwmc->bkup.enabled =0 ; } - -spin_unlock (&tcbpwmc->lock); } static int atmel_tcb_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm,
@@ -195,7 +192,6 @@ static int atmel_tcb_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm,if (tcbpwm->duty ==0 ) polarity = !polarity; -spin_lock (&tcbpwmc->lock);regmap_read (tcbpwmc->regmap,ATMEL_TC_REG (tcbpwmc->channel,CMR ), &cmr);/* flush old setting and set the new one */
@@ -257,7 +253,6 @@ static int atmel_tcb_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm,regmap_write (tcbpwmc->regmap,ATMEL_TC_REG (tcbpwmc->channel,CCR ),ATMEL_TC_SWTRG |ATMEL_TC_CLKEN ); tcbpwmc->bkup.enabled =1 ; -spin_unlock (&tcbpwmc->lock);return 0 ; }
@@ -342,9 +337,12 @@ static int atmel_tcb_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,static int atmel_tcb_pwm_apply (struct pwm_chip *chip,struct pwm_device *pwm,const struct pwm_state *state) { +struct atmel_tcb_pwm_chip *tcbpwmc =to_tcb_chip (chip);int duty_cycle, period;int ret; +guard (spinlock)(&tcbpwmc->lock); +if (!state->enabled) {atmel_tcb_pwm_disable (chip, pwm, state->polarity);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/568 hwmon: (max6697) Fix underflow when writing limit attributes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit cbf7467828cd4ec7ceac7a8b5b5ddb2f69f07b0e ]
Using DIV_ROUND_CLOSEST() on an unbound value can result in underflows. Indeed, module test scripts report:
temp1_max: Suspected underflow: [min=0, read 255000, written -9223372036854775808]temp1_crit: Suspected underflow: [min=0, read 255000, written -9223372036854775808]
Fix by introducing an extra set of clamping.
--- drivers/hwmon/max6697.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/max6697.c +1 -0
@@ -311,6 +311,7 @@ static ssize_t temp_store(struct device *dev,return ret;mutex_lock (&data->update_lock); + temp =clamp_val (temp,-1000000 ,1000000 );/* prevent underflow */ temp =DIV_ROUND_CLOSEST (temp,1000 ) + data->temp_offset; temp =clamp_val (temp,0 , data->type == max6581 ?255 :127 ); data->temp[nr][index] = temp;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/568 hwmon: (max6697) Fix swapped temp{1,8} critical alarms
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 1ea3fd1eb9869fcdcbc9c68f9728bfc47b9503f1 ]
The critical alarm bit for the local temperature sensor (temp1) is in bit 7 of register 0x45 (not bit 6), and the critical alarm bit for remote temperature sensor 7 (temp8) is in bit 6 (not bit 7).
This only affects MAX6581 since all other chips supported by this driver do not support those critical alarms.
--- drivers/hwmon/max6697.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/max6697.c +2 -2
@@ -429,14 +429,14 @@ static SENSOR_DEVICE_ATTR_RO(temp6_max_alarm, alarm, 20); static SENSOR_DEVICE_ATTR_RO(temp7_max_alarm, alarm, 21); static SENSOR_DEVICE_ATTR_RO(temp8_max_alarm, alarm, 23); -static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 14); +static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 15); static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 8); static SENSOR_DEVICE_ATTR_RO(temp3_crit_alarm, alarm, 9); static SENSOR_DEVICE_ATTR_RO(temp4_crit_alarm, alarm, 10); static SENSOR_DEVICE_ATTR_RO(temp5_crit_alarm, alarm, 11); static SENSOR_DEVICE_ATTR_RO(temp6_crit_alarm, alarm, 12); static SENSOR_DEVICE_ATTR_RO(temp7_crit_alarm, alarm, 13); -static SENSOR_DEVICE_ATTR_RO(temp8_crit_alarm, alarm, 15); +static SENSOR_DEVICE_ATTR_RO(temp8_crit_alarm, alarm, 14); static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 1); static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 2);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/568 arm64: dts: qcom: sc8180x: Correct PCIe slave ports
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit dc402e084a9e0cc714ffd6008dce3c63281b8142 ]
The interconnects property was clearly copy-pasted between the 4 PCIe controllers, giving all four the cpu-pcie path destination of SLAVE_0.
The four ports are all associated with CN0, but update the property for correctness sake.
--- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sc8180x.dtsi +3 -3
@@ -1853,7 +1853,7 @@ pcie3: pci@1c08000 { power-domains = <&gcc PCIE_3_GDSC>; interconnects = <&aggre2_noc MASTER_PCIE_3 0 &mc_virt SLAVE_EBI_CH0 0>, - <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>; + <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_3 0>; interconnect-names = "pcie-mem", "cpu-pcie"; phys = <&pcie3_phy>;
@@ -1952,7 +1952,7 @@ pcie1: pci@1c10000 { power-domains = <&gcc PCIE_1_GDSC>; interconnects = <&aggre2_noc MASTER_PCIE_1 0 &mc_virt SLAVE_EBI_CH0 0>, - <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>; + <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_1 0>; interconnect-names = "pcie-mem", "cpu-pcie"; phys = <&pcie1_phy>;
@@ -2051,7 +2051,7 @@ pcie2: pci@1c18000 { power-domains = <&gcc PCIE_2_GDSC>; interconnects = <&aggre2_noc MASTER_PCIE_2 0 &mc_virt SLAVE_EBI_CH0 0>, - <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>; + <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_2 0>; interconnect-names = "pcie-mem", "cpu-pcie"; phys = <&pcie2_phy>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/568 arm64: dts: qcom: sc8180x: switch UFS QMP PHY to new style of bindings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 916b5916f228a9f83a22ad91ad8c5bf788a456d7 ]
Change the UFS QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes).
Stable-dep-of: 9a80ecce60bd ("arm64: dts: qcom: sc8180x: add power-domain to UFS PHY")
--- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/qcom/sc8180x.dtsi +6 -14
@@ -2093,7 +2093,7 @@ ufs_mem_hc: ufshc@1d84000 { "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x2500>; interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>; - phys = <&ufs_mem_phy_lanes>; + phys = <&ufs_mem_phy>; phy-names = "ufsphy"; lanes-per-direction = <2>; #reset-cells = <1>;
@@ -2132,10 +2132,8 @@ ufs_mem_hc: ufshc@1d84000 { ufs_mem_phy: phy-wrapper@1d87000 { compatible = "qcom,sc8180x-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01d87000 0 0x1000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; clock-names = "ref",
@@ -2143,16 +2141,10 @@ ufs_mem_phy: phy-wrapper@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; - status = "disabled"; - ufs_mem_phy_lanes: phy@1d87400 { - reg = <0 0x01d87400 0 0x108>, - <0 0x01d87600 0 0x1e0>, - <0 0x01d87c00 0 0x1dc>, - <0 0x01d87800 0 0x108>, - <0 0x01d87a00 0 0x1e0>; - #phy-cells = <0>; - }; + #phy-cells = <0>; + + status = "disabled"; }; ipa_virt: interconnect@1e00000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 30/568 arm64: dts: qcom: sc8180x: add power-domain to UFS PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 9a80ecce60bd4919019a3cdb64604c9b183a8518 ]
The UFS PHY is powered on via the UFS_PHY_GDSC power domain. Add corresponding power-domain the the PHY node.
--- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sc8180x.dtsi +2 -0
@@ -2142,6 +2142,8 @@ ufs_mem_phy: phy-wrapper@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; + power-domains = <&gcc UFS_PHY_GDSC>; + #phy-cells = <0>; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/568 arm64: dts: qcom: sdm845: add power-domain to UFS PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit fd39ae8b9bc10419b1e4b849cdbc6755a967ade1 ]
The UFS PHY is powered on via the UFS_PHY_GDSC power domain. Add corresponding power-domain the the PHY node.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +2 -0
@@ -2634,6 +2634,8 @@ ufs_mem_phy: phy@1d87000 { clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; + power-domains = <&gcc UFS_PHY_GDSC>; + resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/568 arm64: dts: qcom: sm6115: add power-domain to UFS PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit a9eb454873a813ddc4578e5c3b37778de6fda472 ]
The UFS PHY is powered on via the UFS_PHY_GDSC power domain. Add corresponding power-domain the the PHY node.
--- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm6115.dtsi +2 -0
@@ -1043,6 +1043,8 @@ ufs_mem_phy: phy@4807000 { clocks = <&gcc GCC_UFS_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; clock-names = "ref", "ref_aux"; + power-domains = <&gcc GCC_UFS_PHY_GDSC>; + resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/568 arm64: dts: qcom: sm6350: add power-domain to UFS PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 18c2727282c5264ff5502daac26c43000e8eb202 ]
The UFS PHY is powered on via the UFS_PHY_GDSC power domain. Add corresponding power-domain the the PHY node.
--- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm6350.dtsi +2 -0
@@ -1197,6 +1197,8 @@ ufs_mem_phy: phy@1d87000 { clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; + power-domains = <&gcc UFS_PHY_GDSC>; + resets = <&ufs_mem_hc 0>; reset-names = "ufsphy";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/568 arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit ba865bdcc688932980b8e5ec2154eaa33cd4a981 ]
Change the UFS QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes).
Stable-dep-of: 154ed5ea328d ("arm64: dts: qcom: sm8250: add power-domain to UFS PHY")
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +6 -14
@@ -2169,7 +2169,7 @@ ufs_mem_hc: ufshc@1d84000 { "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>; interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>; - phys = <&ufs_mem_phy_lanes>; + phys = <&ufs_mem_phy>; phy-names = "ufsphy"; lanes-per-direction = <2>; #reset-cells = <1>;
@@ -2217,10 +2217,8 @@ ufs_mem_hc: ufshc@1d84000 { ufs_mem_phy: phy@1d87000 { compatible = "qcom,sm8250-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01d87000 0 0x1000>; + clock-names = "ref", "ref_aux"; clocks = <&rpmhcc RPMH_CXO_CLK>,
@@ -2228,16 +2226,10 @@ ufs_mem_phy: phy@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; - status = "disabled"; - ufs_mem_phy_lanes: phy@1d87400 { - reg = <0 0x01d87400 0 0x16c>, - <0 0x01d87600 0 0x200>, - <0 0x01d87c00 0 0x200>, - <0 0x01d87800 0 0x16c>, - <0 0x01d87a00 0 0x200>; - #phy-cells = <0>; - }; + #phy-cells = <0>; + + status = "disabled"; }; cryptobam: dma-controller@1dc4000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 35/568 arm64: dts: qcom: sm8250: add power-domain to UFS PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 154ed5ea328d8a97a4ef5d1447e6f06d11fe2bbe ]
The UFS PHY is powered on via the UFS_PHY_GDSC power domain. Add corresponding power-domain the the PHY node.
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm8250.dtsi +2 -0
@@ -2227,6 +2227,8 @@ ufs_mem_phy: phy@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; + power-domains = <&gcc UFS_PHY_GDSC>; + #phy-cells = <0>; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 36/568 arm64: dts: qcom: sm8350: add power-domain to UFS PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 634acc8cea1584b507801315831a330443f819b4 ]
The UFS PHY is powered on via the UFS_PHY_GDSC power domain. Add corresponding power-domain the the PHY node.
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm8350.dtsi +2 -0
@@ -1731,6 +1731,8 @@ ufs_mem_phy: phy@1d87000 { clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; + power-domains = <&gcc UFS_PHY_GDSC>; + resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 37/568 arm64: dts: qcom: sm8450: add power-domain to UFS PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 27d3f57cf5a71484ea38770d4bfd10f6ef035cf4 ]
The UFS PHY is powered on via the UFS_PHY_GDSC power domain. Add corresponding power-domain the the PHY node.
--- arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm8450.dtsi +2 -0
@@ -4200,6 +4200,8 @@ ufs_mem_phy: phy@1d87000 { <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, <&gcc GCC_UFS_0_CLKREF_EN>; + power-domains = <&gcc UFS_PHY_GDSC>; + resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 20/568 block/mq-deadline: Fix the tag reservation code
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 39823b47bbd40502632ffba90ebb34fff7c8b5e8 ]
The current tag reservation code is based on a misunderstanding of the meaning of data->shallow_depth. Fix the tag reservation code as follows:
* By default, do not reserve any tags for synchronous requests because for certain use cases reserving tags reduces performance. See also Harshit Mogalapalli, [bug-report] Performance regression with fio sequential-write on a multipath setup, 2024-03-07
(https://lore.kernel.org/linux-block/[email protected]/)
* Reduce min_shallow_depth to one because min_shallow_depth must be less than or equal any shallow_depth value.
* Scale dd->async_depth from the range [1, nr_requests] to [1, bits_per_sbitmap_word].
--- block/mq-deadline.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
block/mq-deadline.c +17 -3
@@ -621,6 +621,20 @@ static struct request *dd_dispatch_request(struct blk_mq_hw_ctx *hctx)return rq; } +/* +* 'depth' is a number in the range 1..INT_MAX representing a number of +* requests. Scale it with a factor (1 << bt->sb.shift) / q->nr_requests since +* 1..(1 << bt->sb.shift) is the range expected by sbitmap_get_shallow(). +* Values larger than q->nr_requests have the same effect as q->nr_requests. +*/ +static int dd_to_word_depth (struct blk_mq_hw_ctx *hctx,unsigned int qdepth) +{ +struct sbitmap_queue *bt = &hctx->sched_tags->bitmap_tags; +const unsigned int nrr = hctx->queue->nr_requests; + +return ((qdepth << bt->sb.shift) + nrr -1 ) / nrr; +} +/* * Called by __blk_mq_alloc_request(). The shallow_depth value set by this * function is used by __blk_mq_get_tag().
@@ -637,7 +651,7 @@ static void dd_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)* Throttle asynchronous requests and writes such that these requests * do not block the allocation of synchronous requests. */ - data->shallow_depth = dd->async_depth; + data->shallow_depth =dd_to_word_depth (data->hctx, dd->async_depth); }/* Called by blk_mq_update_nr_requests(). */
@@ -647,9 +661,9 @@ static void dd_depth_updated(struct blk_mq_hw_ctx *hctx)struct deadline_data *dd = q->elevator->elevator_data;struct blk_mq_tags *tags = hctx->sched_tags; - dd->async_depth =max (1UL ,3 * q->nr_requests /4 ); + dd->async_depth = q->nr_requests; -sbitmap_queue_min_shallow_depth (&tags->bitmap_tags, dd->async_depth); +sbitmap_queue_min_shallow_depth (&tags->bitmap_tags,1 ); }/* Called by blk_mq_init_hctx() and blk_mq_init_sched(). */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 38/568 arm64: dts: qcom: msm8996-xiaomi-common: drop excton from the USB PHY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit c1aefeae8cb7b71c1bb6d33b1bda7fc322094e16 ]
The USB PHYs don't use extcon connectors, drop the extcon property from the hsusb_phy1 node.
--- arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi +0 -1
@@ -405,7 +405,6 @@ &usb3_dwc3 { &hsusb_phy1 { status = "okay"; - extcon = <&typec>; vdda-pll-supply = <&vreg_l12a_1p8>; vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/568 md: Dont wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit a1fd37f97808db4fa1bf55da0275790c42521e45 ]
Commit 90f5f7ad4f38 ("md: Wait for md_check_recovery before attempting device removal.") explained in the commit message that failed device must be reomoved from the personality first by md_check_recovery(), before it can be removed from the array. That's the reason the commit add the code to wait for MD_RECOVERY_NEEDED.
However, this is not the case now, because remove_and_add_spares() is called directly from hot_remove_disk() from ioctl path, hence failed device(marked faulty) can be removed from the personality by ioctl.
On the other hand, the commit introduced a performance problem that if MD_RECOVERY_NEEDED is set and the array is not running, ioctl will wait for 5s before it can return failure to user.
Since the waiting is not needed now, fix the problem by removing the waiting.
--- drivers/md/md.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/md/md.c +0 -6
@@ -7684,12 +7684,6 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode, } -if (cmd ==HOT_REMOVE_DISK ) -/* need to ensure recovery thread has run */ -wait_event_interruptible_timeout (mddev->sb_wait, - !test_bit (MD_RECOVERY_NEEDED , - &mddev->recovery), -msecs_to_jiffies (5000 ));if (cmd ==STOP_ARRAY || cmd ==STOP_ARRAY_RO ) {/* Need to flush page cache, and ensure no-one else opens * and writes
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 40/568 arm64: dts: qcom: msm8998: enable adreno_smmu by default
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Gonzalez <[email protected]>
[ Upstream commit 98a0c4f2278b4d6c1c7722735c20b2247de6293f ]
15 qcom platform DTSI files define an adreno_smmu node. msm8998 is the only one with adreno_smmu disabled by default.
There's no reason why this SMMU should be disabled by default, it doesn't need any further configuration.
Bring msm8998 in line with the 14 other platforms.
This fixes GPU init failing with ENODEV:msm_dpu c901000.display-controller: failed to load adreno gpumsm_dpu c901000.display-controller: failed to bind 5000000.gpu (ops a3xx_ops): -19
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8998.dtsi +0 -1
@@ -1588,7 +1588,6 @@ adreno_smmu: iommu@5040000 { * SoC VDDMX RPM Power Domain in the Adreno driver. */ power-domains = <&gpucc GPU_GX_GDSC>; - status = "disabled"; }; gpucc: clock-controller@5065000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 41/568 soc: qcom: pmic_glink: Handle the return value of pmic_glink_init
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 0780c836673b25f5aad306630afcb1172d694cb4 ]
As platform_driver_register() and register_rpmsg_driver() can return error numbers, it should be better to check the return value and deal with the exception.
--- drivers/soc/qcom/pmic_glink.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/soc/qcom/pmic_glink.c +11 -2
@@ -376,8 +376,17 @@ static struct platform_driver pmic_glink_driver = {static int pmic_glink_init (void ) { -platform_driver_register (&pmic_glink_driver); -register_rpmsg_driver (&pmic_glink_rpmsg_driver); +int ret; + + ret =platform_driver_register (&pmic_glink_driver); +if (ret <0 ) +return ret; + + ret =register_rpmsg_driver (&pmic_glink_rpmsg_driver); +if (ret <0 ) { +platform_driver_unregister (&pmic_glink_driver); +return ret; + }return 0 ; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 42/568 soc: qcom: rpmh-rsc: Ensure irqs arent disabled by rpmh_rsc_send_data() callers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Boyd <[email protected]>
[ Upstream commit e43111f52b9ec5c2d700f89a1d61c8d10dc2d9e9 ]
Dan pointed out that Smatch is concerned about this code because it uses spin_lock_irqsave() and then calls wait_event_lock_irq() which enables irqs before going to sleep. The comment above the function says it should be called with interrupts enabled, but we simply hope that's true without really confirming that. Let's add a might_sleep() here to confirm that interrupts and preemption aren't disabled. Once we do that, we can change the lock to be non-saving, spin_lock_irq(), to clarify that we don't expect irqs to be disabled. If irqs are disabled by callers they're going to be enabled anyway in the wait_event_lock_irq() call which would be bad.
This should make Smatch happier and find bad callers faster with the might_sleep(). We can drop the WARN_ON() in the caller because we have the might_sleep() now, simplifying the code.
--- drivers/soc/qcom/rpmh-rsc.c | 7 ++++--- drivers/soc/qcom/rpmh.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/soc/qcom/rpmh-rsc.c +4 -3
@@ -646,13 +646,14 @@ int rpmh_rsc_send_data(struct rsc_drv *drv, const struct tcs_request *msg) {struct tcs_group *tcs;int tcs_id; -unsigned long flags; + +might_sleep (); tcs =get_tcs_for_msg (drv, msg);if (IS_ERR (tcs))return PTR_ERR (tcs); -spin_lock_irqsave (&drv->lock, flags); +spin_lock_irq (&drv->lock);/* Wait forever for a free tcs. It better be there eventually! */ wait_event_lock_irq(drv->tcs_wait,
@@ -670,7 +671,7 @@ int rpmh_rsc_send_data(struct rsc_drv *drv, const struct tcs_request *msg)write_tcs_reg_sync (drv, drv->regs[RSC_DRV_CMD_ENABLE ], tcs_id,0 );enable_tcs_irq (drv, tcs_id, true); } -spin_unlock_irqrestore (&drv->lock, flags); +spin_unlock_irq (&drv->lock);/* * These two can be done after the lock is released because:
drivers/soc/qcom/rpmh.c +0 -1
@@ -183,7 +183,6 @@ static int __rpmh_write(const struct device *dev, enum rpmh_state state, }if (state ==RPMH_ACTIVE_ONLY_STATE ) { -WARN_ON (irqs_disabled ()); ret =rpmh_rsc_send_data (ctrlr_to_drv (ctrlr), &rpm_msg->msg); }else {/* Clean up our call by spoofing tx_done */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 43/568 arm64: dts: rockchip: Add sdmmc related properties on rk3308-rock-pi-s
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit fc0daeccc384233eadfa9d5ddbd00159653c6bdc ]
Add cap-mmc-highspeed to allow use of high speed MMC mode using an eMMC to uSD board. Use disable-wp to signal that no physical write-protect line is present. Also add vcc_io used for card and IO line power as vmmc-supply.
--- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +3 -0
@@ -210,7 +210,10 @@ &sdio { }; &sdmmc { + cap-mmc-highspeed; cap-sd-highspeed; + disable-wp; + vmmc-supply = <&vcc_io>; status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 44/568 arm64: dts: rockchip: Add pinctrl for UART0 to rk3308-rock-pi-s
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 7affb86ef62581e3475ce3e0a7640da1f2ee29f8 ]
UAR0 CTS/RTS is not wired to any pin and is not used for the default serial console use of UART0 on ROCK Pi S.
Override the SoC defined pinctrl props to limit configuration of the two xfer pins wired to one of the GPIO pin headers.
--- arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +2 -0
@@ -232,6 +232,8 @@ u2phy_otg: otg-port { }; &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer>; status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 45/568 arm64: dts: rockchip: Add mdio and ethernet-phy nodes to rk3308-rock-pi-s
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 4b64ed510ed946a4e4ca6d51d6512bf5361f6a04 ]
Be explicit about the Ethernet port and define mdio and ethernet-phy nodes in the device tree for ROCK Pi S.
--- .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +23 -3
@@ -144,11 +144,25 @@ &emmc { &gmac { clock_in_out = "output"; + phy-handle = <&rtl8201f>; phy-supply = <&vcc_io>; - snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 50000 50000>; status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + rtl8201f: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&mac_rst>; + reset-assert-us = <20000>; + reset-deassert-us = <50000>; + reset-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + }; + }; }; &i2c1 {
@@ -159,6 +173,12 @@ &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>; + gmac { + mac_rst: mac-rst { + rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + leds { green_led: green-led { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 46/568 arm64: dts: rockchip: Update WIFi/BT related nodes on rk3308-rock-pi-s
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 12c3ec878cbe3709782e85b88124abecc3bb8617 ]
Update WiFi SDIO and BT UART related props to better reflect details about the optional onboard RTL8723DS WiFi/BT module.
Also correct the compatible used for bluetooth to match the WiFi/BT module used on the board.
--- .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +36 -4
@@ -17,6 +17,7 @@ aliases { ethernet0 = &gmac; mmc0 = &emmc; mmc1 = &sdmmc; + mmc2 = &sdio; }; chosen {
@@ -173,6 +174,20 @@ &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>; + bluetooth { + bt_reg_on: bt-reg-on { + rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_host: bt-wake-host { + rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + host_wake_bt: host-wake-bt { + rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + gmac { mac_rst: mac-rst { rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -222,11 +237,24 @@ &sdio { cap-sd-highspeed; cap-sdio-irq; keep-power-in-suspend; - max-frequency = <1000000>; + max-frequency = <100000000>; mmc-pwrseq = <&sdio_pwrseq>; + no-mmc; + no-sd; non-removable; - sd-uhs-sdr104; + sd-uhs-sdr50; + vmmc-supply = <&vcc_io>; + vqmmc-supply = <&vcc_1v8>; status = "okay"; + + rtl8723ds: wifi@1 { + reg = <1>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake>; + }; }; &sdmmc {
@@ -258,12 +286,16 @@ &uart0 { }; &uart4 { + uart-has-rtscts; status = "okay"; bluetooth { - compatible = "realtek,rtl8723bs-bt"; - device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + compatible = "realtek,rtl8723ds-bt"; + device-wake-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; host-wake-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 47/568 arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 02f838b7f8cdfb7a96b7f08e7f6716f230bdecba ]
Follow the example of other platforms and specify core_clk frequencies in the frequency table in addition to the core_clk_src frequencies. The driver should be setting the leaf frequency instead of some interim clock freq.
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
@@ -2090,7 +2090,7 @@ ufshc: ufshc@624000 { <&gcc GCC_UFS_RX_SYMBOL_0_CLK>; freq-table-hz = <100000000 200000000>, - <0 0>, + <100000000 200000000>, <0 0>, <0 0>, <0 0>,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 48/568 arm64: dts: qcom: sa8775p: mark ethernet devices as DMA-coherent
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagar Cheluvegowda <[email protected]>
[ Upstream commit 49cc31f8ab44e60d8109da7e18c0983a917d4d74 ]
Ethernet devices are cache coherent, mark it as such in the dtsi.
--- arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sa8775p.dtsi +2 -0
@@ -2350,6 +2350,7 @@ ethernet1: ethernet@23000000 { phy-names = "serdes"; iommus = <&apps_smmu 0x140 0xf>; + dma-coherent; snps,tso; snps,pbl = <32>;
@@ -2383,6 +2384,7 @@ ethernet0: ethernet@23040000 { phy-names = "serdes"; iommus = <&apps_smmu 0x120 0xf>; + dma-coherent; snps,tso; snps,pbl = <32>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 49/568 soc: xilinx: rename cpu_number1 to dummy_cpu_number
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jay Buddhabhatti <[email protected]>
[ Upstream commit 4a95449dd975e2ea6629a034f3e74b46c9634916 ]
The per cpu variable cpu_number1 is passed to xlnx_event_handler as argument "dev_id", but it is not used in this function. So drop the initialization of this variable and rename it to dummy_cpu_number. This patch is to fix the following call trace when the kernel option CONFIG_DEBUG_ATOMIC_SLEEP is enabled:
BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper/0
preempt_count: 1, expected: 0
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0 #53
Hardware name: Xilinx Versal vmk180 Eval board rev1.1 (QSPI) (DT)
Call trace:
dump_backtrace+0xd0/0xe0
show_stack+0x18/0x40
dump_stack_lvl+0x7c/0xa0
dump_stack+0x18/0x34
__might_resched+0x10c/0x140
__might_sleep+0x4c/0xa0
__kmem_cache_alloc_node+0xf4/0x168
kmalloc_trace+0x28/0x38
__request_percpu_irq+0x74/0x138
xlnx_event_manager_probe+0xf8/0x298
platform_probe+0x68/0xd8--- drivers/soc/xilinx/xlnx_event_manager.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/soc/xilinx/xlnx_event_manager.c +4 -11
@@ -3,6 +3,7 @@* Xilinx Event Management Driver * * Copyright (C) 2021 Xilinx, Inc. +* Copyright (C) 2024 Advanced Micro Devices, Inc. * * Abhyuday Godhasara <[email protected]> */
@@ -19,7 +20,7 @@#include <linux/platform_device.h> #include <linux/slab.h> -static DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number1); +static DEFINE_PER_CPU_READ_MOSTLY(int, dummy_cpu_number);static int virq_sgi;static int event_manager_availability = -EACCES ;
@@ -555,7 +556,6 @@ static void xlnx_disable_percpu_irq(void *data)static int xlnx_event_init_sgi (struct platform_device *pdev) {int ret =0 ; -int cpu;/* * IRQ related structures are used for the following: * for each SGI interrupt ensure its mapped by GIC IRQ domain
@@ -592,11 +592,8 @@ static int xlnx_event_init_sgi(struct platform_device *pdev) sgi_fwspec.param[0 ] = sgi_num; virq_sgi =irq_create_fwspec_mapping (&sgi_fwspec); - cpu =get_cpu (); -per_cpu (cpu_number1, cpu) = cpu; ret =request_percpu_irq (virq_sgi, xlnx_event_handler,"xlnx_event_mgmt" , - &cpu_number1); -put_cpu (); + &dummy_cpu_number);WARN_ON (ret);if (ret) {
@@ -612,16 +609,12 @@ static int xlnx_event_init_sgi(struct platform_device *pdev)static void xlnx_event_cleanup_sgi (struct platform_device *pdev) { -int cpu =smp_processor_id (); - -per_cpu (cpu_number1, cpu) = cpu; -cpuhp_remove_state (CPUHP_AP_ONLINE_DYN );on_each_cpu (xlnx_disable_percpu_irq,NULL ,1 );irq_clear_status_flags (virq_sgi,IRQ_PER_CPU ); -free_percpu_irq (virq_sgi, &cpu_number1); +free_percpu_irq (virq_sgi, &dummy_cpu_number);irq_dispose_mapping (virq_sgi); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 50/568 ARM: dts: sunxi: remove duplicated entries in makefile
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Löbl <[email protected]>
[ Upstream commit bba474656dd85b13e4c5d5bdb73ca08d9136df21 ]
During introduction of DTS vendor subdirectories in 724ba6751532, sun8i section of the makefile got duplicated. Clean that up.
--- arch/arm/boot/dts/allwinner/Makefile | 62 ---------------------------- 1 file changed, 62 deletions(-)
arch/arm/boot/dts/allwinner/Makefile +0 -62
@@ -259,68 +259,6 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-v3s-licheepi-zero.dtb \ sun8i-v3s-licheepi-zero-dock.dtb \ sun8i-v40-bananapi-m2-berry.dtb -dtb-$(CONFIG_MACH_SUN8I) += \ - sun8i-a23-evb.dtb \ - sun8i-a23-gt90h-v4.dtb \ - sun8i-a23-inet86dz.dtb \ - sun8i-a23-ippo-q8h-v5.dtb \ - sun8i-a23-ippo-q8h-v1.2.dtb \ - sun8i-a23-polaroid-mid2407pxe03.dtb \ - sun8i-a23-polaroid-mid2809pxe04.dtb \ - sun8i-a23-q8-tablet.dtb \ - sun8i-a33-et-q8-v1.6.dtb \ - sun8i-a33-ga10h-v1.1.dtb \ - sun8i-a33-inet-d978-rev2.dtb \ - sun8i-a33-ippo-q8h-v1.2.dtb \ - sun8i-a33-olinuxino.dtb \ - sun8i-a33-q8-tablet.dtb \ - sun8i-a33-sinlinx-sina33.dtb \ - sun8i-a83t-allwinner-h8homlet-v2.dtb \ - sun8i-a83t-bananapi-m3.dtb \ - sun8i-a83t-cubietruck-plus.dtb \ - sun8i-a83t-tbs-a711.dtb \ - sun8i-h2-plus-bananapi-m2-zero.dtb \ - sun8i-h2-plus-libretech-all-h3-cc.dtb \ - sun8i-h2-plus-orangepi-r1.dtb \ - sun8i-h2-plus-orangepi-zero.dtb \ - sun8i-h3-bananapi-m2-plus.dtb \ - sun8i-h3-bananapi-m2-plus-v1.2.dtb \ - sun8i-h3-beelink-x2.dtb \ - sun8i-h3-libretech-all-h3-cc.dtb \ - sun8i-h3-mapleboard-mp130.dtb \ - sun8i-h3-nanopi-duo2.dtb \ - sun8i-h3-nanopi-m1.dtb\ - \ - sun8i-h3-nanopi-m1-plus.dtb \ - sun8i-h3-nanopi-neo.dtb \ - sun8i-h3-nanopi-neo-air.dtb \ - sun8i-h3-nanopi-r1.dtb \ - sun8i-h3-orangepi-2.dtb \ - sun8i-h3-orangepi-lite.dtb \ - sun8i-h3-orangepi-one.dtb \ - sun8i-h3-orangepi-pc.dtb \ - sun8i-h3-orangepi-pc-plus.dtb \ - sun8i-h3-orangepi-plus.dtb \ - sun8i-h3-orangepi-plus2e.dtb \ - sun8i-h3-orangepi-zero-plus2.dtb \ - sun8i-h3-rervision-dvk.dtb \ - sun8i-h3-zeropi.dtb \ - sun8i-h3-emlid-neutis-n5h3-devboard.dtb \ - sun8i-r16-bananapi-m2m.dtb \ - sun8i-r16-nintendo-nes-classic.dtb \ - sun8i-r16-nintendo-super-nes-classic.dtb \ - sun8i-r16-parrot.dtb \ - sun8i-r40-bananapi-m2-ultra.dtb \ - sun8i-r40-oka40i-c.dtb \ - sun8i-s3-elimo-initium.dtb \ - sun8i-s3-lichee-zero-plus.dtb \ - sun8i-s3-pinecube.dtb \ - sun8i-t113s-mangopi-mq-r-t113.dtb \ - sun8i-t3-cqa3t-bv3.dtb \ - sun8i-v3-sl631-imx179.dtb \ - sun8i-v3s-licheepi-zero.dtb \ - sun8i-v3s-licheepi-zero-dock.dtb \ - sun8i-v40-bananapi-m2-berry.dtb dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ sun9i-a80-cubieboard4.dtb
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 51/568 ARM: dts: stm32: Add arm,no-tick-in-suspend to STM32MP15xx STGEN timer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit 4306c047415a227bc72f0e7ba9bde1ccdac10435 ]
STM32MP15xx RM0436 Rev 6 section 46.3 System timer generator (STGEN) states "
Arm recommends that the system counter is in an always-on power domain. This is not supported in the current implementation, therefore STGEN should be saved and restored before Standby mode entry, and restored at Standby exit by secure software.
...
"
Instead of piling up workarounds in the firmware which is difficult to update, add "arm,no-tick-in-suspend" DT property into the timer node to indicate the timer is stopped in suspend, and let the kernel fix the timer up.
--- arch/arm/boot/dts/st/stm32mp151.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/st/stm32mp151.dtsi +1 -0
@@ -50,6 +50,7 @@ timer { <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>, <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>; interrupt-parent = <&intc>; + arm,no-tick-in-suspend; }; clocks {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 52/568 arm64: dts: qcom: qrb4210-rb2: make L9A always-on
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit d6c6b85bf5582bbe2efefa9a083178b5f7eef439 ]
The L9A regulator is used to further control voltage regulators on the board. It can be used to disable VBAT_mains, 1.8V, 3.3V, 5V rails). Make sure that is stays always on to prevent undervolting of these volage rails.
--- arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +2 -0
@@ -364,6 +364,8 @@ vreg_l8a_0p664: l8 { vreg_l9a_1p8: l9 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <2000000>; + regulator-always-on; + regulator-boot-on; }; vreg_l10a_1p8: l10 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/568 cpufreq: ti-cpufreq: Handle deferred probe with dev_err_probe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Primoz Fiser <[email protected]>
[ Upstream commit 101388b8ef1027be72e399beeb97293cce67bb24 ]
Handle deferred probing gracefully by using dev_err_probe() to not spam console with unnecessary error messages.
--- drivers/cpufreq/ti-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/ti-cpufreq.c +1 -1
@@ -418,7 +418,7 @@ static int ti_cpufreq_probe(struct platform_device *pdev) ret =dev_pm_opp_set_config (opp_data->cpu_dev, &config);if (ret <0 ) { -dev_err (opp_data->cpu_dev,"Failed to set OPP config\n" ); +dev_err_probe (opp_data->cpu_dev, ret,"Failed to set OPP config\n" ); goto fail_put_node; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/568 OPP: ti: Fix ti_opp_supply_probe wrong return values
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Primoz Fiser <[email protected]>
[ Upstream commit 3a1ac6b8f603a9310274990a0ad563a5fb709f59 ]
Function ti_opp_supply_probe() since commit 6baee034cb55 ("OPP: ti:
Migrate to dev_pm_opp_set_config_regulators()") returns wrong values when all goes well and hence driver probing eventually fails.
--- drivers/opp/ti-opp-supply.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/opp/ti-opp-supply.c +4 -2
@@ -400,10 +400,12 @@ static int ti_opp_supply_probe(struct platform_device *pdev) } ret =dev_pm_opp_set_config_regulators (cpu_dev, ti_opp_config_regulators); -if (ret <0 ) +if (ret <0 ) {_free_optimized_voltages (dev, &opp_data); +return ret; + } -return ret; +return 0 ; }static struct platform_driver ti_opp_supply_driver = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/568 memory: fsl_ifc: Make FSL_IFC config visible and selectable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Esben Haabendal <[email protected]>
[ Upstream commit 9ba0cae3cac07c21c583f9ff194f74043f90d29c ]
While use of fsl_ifc driver with NAND flash is fine, as the fsl_ifc_nand driver selects FSL_IFC automatically, we need the CONFIG_FSL_IFC option to be selectable for platforms using fsl_ifc with NOR flash.
--- drivers/memory/Kconfig | 2 +- drivers/mtd/nand/raw/Kconfig | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/memory/Kconfig +1 -1
@@ -167,7 +167,7 @@ config FSL_CORENET_CF represents a coherency violation. config FSL_IFC - bool "Freescale IFC driver" if COMPILE_TEST + bool "Freescale IFC driver" depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST depends on HAS_IOMEM
drivers/mtd/nand/raw/Kconfig +1 -2
@@ -234,8 +234,7 @@ config MTD_NAND_FSL_IFC tristate "Freescale IFC NAND controller" depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST depends on HAS_IOMEM - select FSL_IFC - select MEMORY + depends on FSL_IFC help Various Freescale chips e.g P1010, include a NAND Flash machine with built-in hardware ECC capabilities.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/568 arm64: dts: ti: k3-am62x: Drop McASP AFIFOs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jai Luthra <[email protected]>
[ Upstream commit 6ee3ca0ec7fabc63603afdb3485da04164dc8747 ]
McASP AFIFOs are not necessary with UDMA-P/BCDMA as there is buffering on the DMA IP. Drop these for better audio latency.
--- arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi +0 -2
@@ -481,8 +481,6 @@ &mcasp1 { 0 0 0 0 0 0 0 0 >; - tx-num-evt = <32>; - rx-num-evt = <32>; }; &dss {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 39/568 arm64: dts: qcom: sdm850-lenovo-yoga-c630: fix IPA firmware path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit cae4c862d8b2d7debb07e6d831e079520163ac4f ]
Specify firmware path for the IPA network controller on the Lenovo Yoga C630 laptop. Without this property IPA tries to load firmware from the default location, which likely will fail.
--- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +1 -0
@@ -488,6 +488,7 @@ ecsh: hid@5c { &ipa { qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + firmware-name = "qcom/sdm850/LENOVO/81JL/ipa_fws.elf"; status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/568 arm64: dts: ti: k3-am625-beagleplay: Drop McASP AFIFOs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jai Luthra <[email protected]>
[ Upstream commit 3b4a03357aee07a32a44a49bb6a71f5e82b1ecc1 ]
McASP AFIFOs are not necessary with UDMA-P/BCDMA as there is buffering on the DMA IP. Drop these for better audio latency.
--- arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts +0 -2
@@ -903,6 +903,4 @@ &mcasp1 { 0 0 0 0 0 0 0 0 >; - tx-num-evt = <32>; - rx-num-evt = <32>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/568 arm64: dts: qcom: qdu1000-idp: drop unused LLCC multi-ch-bit-off
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 468cf125e4796e8ef9815e2d8d018f44cf8f1225 ]
There is no "multi-ch-bit-off" property in LLCC, according to bindings and Linux driver:
qdu1000-idp.dtb: system-cache-controller@19200000: 'multi-ch-bit-off' does not match any of the regexes: 'pinctrl-[0-9]+'
Stable-dep-of: 367fb3f0aaa6 ("arm64: dts: qcom: qdu1000: Add secure qfprom node")
--- arch/arm64/boot/dts/qcom/qdu1000.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/qcom/qdu1000.dtsi +0 -1
@@ -1452,7 +1452,6 @@ system-cache-controller@19200000 { "llcc_broadcast_base", "multi_channel_register"; interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>; - multi-ch-bit-off = <24 2>; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/568 arm64: dts: qcom: qdu1000: Add secure qfprom node
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Komal Bajaj <[email protected]>
[ Upstream commit 367fb3f0aaa6eac9101dc683dd27c268b4cc702e ]
Add secure qfprom node and also add properties for multi channel DDR. This is required for LLCC driver to pick the correct LLCC configuration.
--- arch/arm64/boot/dts/qcom/qdu1000.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm64/boot/dts/qcom/qdu1000.dtsi +15 -0
@@ -1452,6 +1452,21 @@ system-cache-controller@19200000 { "llcc_broadcast_base", "multi_channel_register"; interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>; + + nvmem-cells = <&multi_chan_ddr>; + nvmem-cell-names = "multi-chan-ddr"; + }; + + sec_qfprom: efuse@221c8000 { + compatible = "qcom,qdu1000-sec-qfprom", "qcom,sec-qfprom"; + reg = <0 0x221c8000 0 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + + multi_chan_ddr: multi-chan-ddr@12b { + reg = <0x12b 0x1>; + bits = <0 2>; + }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/568 soc: qcom: icc-bwmon: Fix refcount imbalance seen during bwmon_remove
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sibi Sankar <[email protected]>
[ Upstream commit 24086640ab39396eb1a92d1cb1cd2f31b2677c52 ]
The following warning is seen during bwmon_remove due to refcount imbalance, fix this by releasing the OPPs after use.
Logs:
WARNING: at drivers/opp/core.c:1640 _opp_table_kref_release+0x150/0x158 Hardware name: Qualcomm Technologies, Inc. X1E80100 CRD (DT) ... Call trace: _opp_table_kref_release+0x150/0x158 dev_pm_opp_remove_table+0x100/0x1b4 devm_pm_opp_of_table_release+0x10/0x1c devm_action_release+0x14/0x20 devres_release_all+0xa4/0x104 device_unbind_cleanup+0x18/0x60 device_release_driver_internal+0x1ec/0x228 driver_detach+0x50/0x98 bus_remove_driver+0x6c/0xbc driver_unregister+0x30/0x60 platform_driver_unregister+0x14/0x20 bwmon_driver_exit+0x18/0x524 [icc_bwmon] __arm64_sys_delete_module+0x184/0x264 invoke_syscall+0x48/0x118 el0_svc_common.constprop.0+0xc8/0xe8 do_el0_svc+0x20/0x2c el0_svc+0x34/0xdc el0t_64_sync_handler+0x13c/0x158 el0t_64_sync+0x190/0x194
--[ end trace 0000000000000000 ]---
--- drivers/soc/qcom/icc-bwmon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/qcom/icc-bwmon.c +3 -1
@@ -565,7 +565,7 @@ static void bwmon_start(struct icc_bwmon *bwmon)int window;/* No need to check for errors, as this must have succeeded before. */ -dev_pm_opp_find_bw_ceil (bwmon->dev, &bw_low,0 ); +dev_pm_opp_put (dev_pm_opp_find_bw_ceil (bwmon->dev, &bw_low,0 ));bwmon_clear_counters (bwmon, true);
@@ -772,11 +772,13 @@ static int bwmon_probe(struct platform_device *pdev) opp =dev_pm_opp_find_bw_floor (dev, &bwmon->max_bw_kbps,0 );if (IS_ERR (opp))return dev_err_probe (dev,PTR_ERR (opp),"failed to find max peak bandwidth\n" ); +dev_pm_opp_put (opp); bwmon->min_bw_kbps =0 ; opp =dev_pm_opp_find_bw_ceil (dev, &bwmon->min_bw_kbps,0 );if (IS_ERR (opp))return dev_err_probe (dev,PTR_ERR (opp),"failed to find min peak bandwidth\n" ); +dev_pm_opp_put (opp); bwmon->dev = dev;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/568 soc: qcom: pdr: protect locator_addr with the main mutex
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 107924c14e3ddd85119ca43c26a4ee1056fa9b84 ]
If the service locator server is restarted fast enough, the PDR can rewrite locator_addr fields concurrently. Protect them by placing modification of those fields under the main pdr->lock.
--- drivers/soc/qcom/pdr_interface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/soc/qcom/pdr_interface.c +4 -2
@@ -76,12 +76,12 @@ static int pdr_locator_new_server(struct qmi_handle *qmi, locator_hdl);struct pdr_service *pds; +mutex_lock (&pdr->lock);/* Create a local client port for QMI communication */ pdr->locator_addr.sq_family =AF_QIPCRTR ; pdr->locator_addr.sq_node = svc->node; pdr->locator_addr.sq_port = svc->port; -mutex_lock (&pdr->lock); pdr->locator_init_complete = true;mutex_unlock (&pdr->lock);
@@ -104,10 +104,10 @@ static void pdr_locator_del_server(struct qmi_handle *qmi,mutex_lock (&pdr->lock); pdr->locator_init_complete = false; -mutex_unlock (&pdr->lock); pdr->locator_addr.sq_node =0 ; pdr->locator_addr.sq_port =0 ; +mutex_unlock (&pdr->lock); }static const struct qmi_ops pdr_locator_ops = {
@@ -365,12 +365,14 @@ static int pdr_get_domain_list(struct servreg_get_domain_list_req *req,if (ret <0 )return ret; +mutex_lock (&pdr->lock); ret =qmi_send_request (&pdr->locator_hdl, &pdr->locator_addr, &txn,SERVREG_GET_DOMAIN_LIST_REQ ,SERVREG_GET_DOMAIN_LIST_REQ_MAX_LEN , servreg_get_domain_list_req_ei, req); +mutex_unlock (&pdr->lock);if (ret <0 ) {qmi_txn_cancel (&txn);return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/568 soc: qcom: pdr: fix parsing of domains lists
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 57f20d51f35780f240ecf39d81cda23612800a92 ]
While parsing the domains list, start offsets from 0 rather than from domains_read. The domains_read is equal to the total count of the domains we have seen, while the domains list in the message starts from offset 0.
--- drivers/soc/qcom/pdr_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/pdr_interface.c +1 -1
@@ -417,7 +417,7 @@ static int pdr_locate_service(struct pdr_handle *pdr, struct pdr_service *pds)if (ret <0 ) goto out; -for (i = domains_read; i < resp->domain_list_len; i++) { +for (i =0 ; i < resp->domain_list_len; i++) { entry = &resp->domain_list[i];if (strnlen (entry->name,sizeof (entry->name)) ==sizeof (entry->name))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/568 arm64: dts: rockchip: Increase VOP clk rate on RK3328
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 0f2ddb128fa20f8441d903285632f2c69e90fae1 ]
The VOP on RK3328 needs to run at a higher rate in order to produce a proper 3840x2160 signal.
Change to use 300MHz for VIO clk and 400MHz for VOP clk, same rates used by vendor 4.4 kernel.
--- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +2 -2
@@ -822,8 +822,8 @@ cru: clock-controller@ff440000 { <0>, <24000000>, <24000000>, <24000000>, <15000000>, <15000000>, - <100000000>, <100000000>, - <100000000>, <100000000>, + <300000000>, <100000000>, + <400000000>, <100000000>, <50000000>, <100000000>, <100000000>, <100000000>, <50000000>, <50000000>,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/568 arm64: dts: amlogic: sm1: fix spdif compatibles
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit b0aba467c329a89e8b325eda0cf60776958353fe ]
The spdif input and output of g12 and sm1 are compatible but sm1 should use the related compatible since it exists.
--- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +2 -2
@@ -339,7 +339,7 @@ tdmin_lb: audio-controller@3c0 { }; spdifin: audio-controller@400 { - compatible = "amlogic,g12a-spdifin", + compatible = "amlogic,sm1-spdifin", "amlogic,axg-spdifin"; reg = <0x0 0x400 0x0 0x30>; #sound-dai-cells = <0>;
@@ -353,7 +353,7 @@ spdifin: audio-controller@400 { }; spdifout_a: audio-controller@480 { - compatible = "amlogic,g12a-spdifout", + compatible = "amlogic,sm1-spdifout", "amlogic,axg-spdifout"; reg = <0x0 0x480 0x0 0x50>; #sound-dai-cells = <0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/568 ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit 0df3c7d7a73d75153090637392c0b73a63cdc24a ]
The i.MX6 cannot add any RGMII delays. The PHY has to add both the RX and TX delays on the RGMII interface. Fix the interface mode. While at it, use the new phy-connection-type property name.
--- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +1 -1
@@ -259,7 +259,7 @@ smarc_flash: flash@0 { &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-connection-type = "rgmii-id"; phy-handle = <ðphy>; mdio {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 67/568 ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit edfea889a049abe80f0d55c0365bf60fbade272f ]
The PHY reset line is connected to both the SoC (GPIO1_25) and the CPLD. We must not use the GPIO1_25 as it will drive against the output buffer of the CPLD. Instead there is another GPIO (GPIO2_01), an input to the CPLD, which will tell the CPLD to assert the PHY reset line.
--- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +2 -2
@@ -269,7 +269,7 @@ mdio { ethphy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; - reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; reset-assert-us = <1000>; }; };
@@ -516,7 +516,7 @@ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 - MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x1b0b0 /* RST_GBE0_PHY# */ + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 /* RST_GBE0_PHY# */ >; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/568 ARM: dts: imx6qdl-kontron-samx6i: fix board reset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit b972d6b3b46345023aee56a95df8e2c137aa4ee4 ]
On i.MX6 the board is reset by the watchdog. But in turn to do a complete board reset, we have to assert the WDOG_B output which is routed also to the CPLD which then do a complete power-cycle of the board.
--- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +1 -0
@@ -817,5 +817,6 @@ &wdog1 { /* CPLD is feeded by watchdog (hardwired) */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog1>; + fsl,ext-reset-output; status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 69/568 ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit 74e1c956a68a65d642447d852e95b3fbb69bebaa ]
There is a comment in the imx6q variant dtsi claiming that these modules will have one more chip select than the imx6dl variant. This is wrong. Ordinary GPIOs are used for chip selects and both variants of the module share the very same PCB and both have this GPIO routed to the SPI0_CS1# pin of the SMARC connector.
Fix it by moving the third chip select description to the common dtsi.
--- .../dts/nxp/imx/imx6q-kontron-samx6i.dtsi | 23 ------------------- .../dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 5 +++- 2 files changed, 4 insertions(+), 24 deletions(-)
arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi +0 -23
@@ -5,31 +5,8 @@ #include "imx6q.dtsi" #include "imx6qdl-kontron-samx6i.dtsi" -#include <dt-bindings/gpio/gpio.h> / { model = "Kontron SMARC sAMX6i Quad/Dual"; compatible = "kontron,imx6q-samx6i", "fsl,imx6q"; }; - -/* Quad/Dual SoMs have 3 chip-select signals */ -&ecspi4 { - cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>, - <&gpio3 29 GPIO_ACTIVE_LOW>, - <&gpio3 25 GPIO_ACTIVE_LOW>; -}; - -&pinctrl_ecspi4 { - fsl,pins = < - MX6QDL_PAD_EIM_D21__ECSPI4_SCLK 0x100b1 - MX6QDL_PAD_EIM_D28__ECSPI4_MOSI 0x100b1 - MX6QDL_PAD_EIM_D22__ECSPI4_MISO 0x100b1 - - /* SPI4_IMX_CS2# - connected to internal flash */ - MX6QDL_PAD_EIM_D24__GPIO3_IO24 0x1b0b0 - /* SPI4_IMX_CS0# - connected to SMARC SPI0_CS0# */ - MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 - /* SPI4_CS3# - connected to SMARC SPI0_CS1# */ - MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x1b0b0 - >; -};
arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +4 -1
@@ -244,7 +244,8 @@ &ecspi4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ecspi4>; cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>, - <&gpio3 29 GPIO_ACTIVE_LOW>; + <&gpio3 29 GPIO_ACTIVE_LOW>, + <&gpio3 25 GPIO_ACTIVE_LOW>; status = "okay"; /* default boot source: workaround #1 for errata ERR006282 */
@@ -464,6 +465,8 @@ MX6QDL_PAD_EIM_D22__ECSPI4_MISO 0x100b1 MX6QDL_PAD_EIM_D24__GPIO3_IO24 0x1b0b0 /* SPI_IMX_CS0# - connected to SMARC SPI0_CS0# */ MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 + /* SPI4_CS3# - connected to SMARC SPI0_CS1# */ + MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x1b0b0 >; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 70/568 ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit df35c6e9027cf9affe699e632a48082ab1bbba4c ]
The PCIe reset line is active low. Fix it.
--- arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +1 -1
@@ -732,7 +732,7 @@ &pcie { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pcie>; wake-up-gpio = <&gpio6 18 GPIO_ACTIVE_HIGH>; - reset-gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>; + reset-gpio = <&gpio3 13 GPIO_ACTIVE_LOW>; }; /* LCD_BKLT_PWM */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 71/568 arm64: dts: mediatek: mt8195: Fix GPU thermal zone name for SVS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit b2b6f2edb82a08abe8942535bc77da55a0f43e14 ]
This SoC has two GPU related thermal zones: the primary zone must be called "gpu-thermal" for SVS to pick it up.
--- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8195.dtsi +1 -1
@@ -3395,7 +3395,7 @@ vpu1_crit: trip-crit { }; }; - gpu0-thermal { + gpu-thermal { polling-delay = <1000>; polling-delay-passive = <250>; thermal-sensors = <&lvts_ap MT8195_AP_GPU0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 72/568 arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit e9a9055fdcdc1e5a27cef118c5b4f09cdd2fa28e ]
The "output-enable" property is set on uart1's RTS pin. This is bogus because the hardware does not actually have a controllable output buffer. Secondly, the implementation incorrectly treats this property as a request to switch the pin to GPIO output. This does not fit the intended semantic of "output-enable" and it does not have any affect either because the pin is muxed to the UART function, not the GPIO function.
Drop the property.
--- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +0 -2
@@ -775,7 +775,6 @@ pins-tx { }; pins-rts { pinmux = <PINMUX_GPIO47__FUNC_URTS1>; - output-enable; }; pins-cts { pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
@@ -794,7 +793,6 @@ pins-tx { }; pins-rts { pinmux = <PINMUX_GPIO47__FUNC_URTS1>; - output-enable; }; pins-cts { pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 73/568 arm64: dts: mediatek: mt8192-asurada: Add off-on-delay-us for pp3300_mipibrdg
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pin-yen Lin <[email protected]>
[ Upstream commit 897a7edba9330974726c564dfdbf4fb5e203b9ac ]
Set off-on-delay-us to 500000 us for pp3300_mipibrdg to make sure it complies with the panel's unprepare delay (the time to power down completely) of the power sequence. Explicit configuration on the regulator node is required because mt8192-asurada uses the same power supply for the panel and the anx7625 DP bridge.
For example, the power sequence could be violated in this sequence:
1. Bridge on: panel goes off, but regulator doesn't turn off (refcount=1).
2. Bridge off: regulator turns off (refcount=0).
3. Bridge resume -> regulator turns on but the bridge driver doesn't check the delay.
Or in this sequence:
1. Bridge on: panel goes off. The regulator doesn't turn off (refcount=1), but the .unprepared_time in panel_edp is still updated.
2. Bridge off, regulator goes off (refcount=0).
3. Panel on, but the panel driver uses the wrong .unprepared_time to check the unprepare delay.
--- arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi +1 -0
@@ -147,6 +147,7 @@ pp3300_mipibrdg: regulator-3v3-mipibrdg { regulator-boot-on; gpio = <&pio 127 GPIO_ACTIVE_HIGH>; vin-supply = <&pp3300_g>; + off-on-delay-us = <500000>; }; /* separately switched 3.3V power rail */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 74/568 arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Miłecki <[email protected]>
[ Upstream commit aebba1030a5766cdf894ed4ab0cac7aed5aee9c1 ]
Value "emmc_rst" is a group name and should be part of the "groups" property.
This fixes:arch/arm64/boot/dts/mediatek/mt7622-rfb1.dtb: pinctrl@10211000: emmc-pins-default:mux:function: ['emmc', 'emmc_rst'] is too long
from schema $id: http://devicetree.org/schemas/pinctrl/mediatek,mt7622-pinctrl.yaml#arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dtb: pinctrl@10211000: emmc-pins-default:mux:function: ['emmc', 'emmc_rst'] is too long
from schema $id: http://devicetree.org/schemas/pinctrl/mediatek,mt7622-pinctrl.yaml#
--- arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 ++-- arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +2 -2
@@ -318,8 +318,8 @@ asm_sel { /* eMMC is shared pin with parallel NAND */ emmc_pins_default: emmc-pins-default { mux { - function = "emmc", "emmc_rst"; - groups = "emmc"; + function = "emmc"; + groups = "emmc", "emmc_rst"; }; /* "NDL0","NDL1","NDL2","NDL3","NDL4","NDL5","NDL6","NDL7",
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +2 -2
@@ -244,8 +244,8 @@ &pio { /* eMMC is shared pin with parallel NAND */ emmc_pins_default: emmc-pins-default { mux { - function = "emmc", "emmc_rst"; - groups = "emmc"; + function = "emmc"; + groups = "emmc", "emmc_rst"; }; /* "NDL0","NDL1","NDL2","NDL3","NDL4","NDL5","NDL6","NDL7",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 75/568 arm64: dts: mediatek: mt8183-kukui: Fix the value of `dlg,jack-det-rate` mismatch
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsin-Te Yuan <[email protected]>
[ Upstream commit 95173af725e6f41eb470466a52ddf2054439409c ]
According to Documentation/devicetree/bindings/sound/dialog,da7219.yaml, the value of dlg,jack-det-rate property should be "32_64" instead of "32ms_64ms".
--- arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi +1 -1
@@ -28,7 +28,7 @@ da7219_aad { dlg,btn-cfg = <50>; dlg,mic-det-thr = <500>; dlg,jack-ins-deb = <20>; - dlg,jack-det-rate = "32ms_64ms"; + dlg,jack-det-rate = "32_64"; dlg,jack-rem-deb = <1>; dlg,a-d-btn-thr = <0xa>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 76/568 arm64: dts: mediatek: mt8183-kukui-jacuzzi: Add ports node for anx7625
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit 4055416e6c51347e7dd5784065263fe0ced0bb7d ]
The anx7625 binding requires a "ports" node as a container for the "port" nodes. The jacuzzi dtsi file is missing it.
Add a "ports" node under the anx7625 node, and move the port related nodes and properties under it.
--- .../dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi +14 -11
@@ -156,21 +156,24 @@ anx_bridge: anx7625@58 { vdd18-supply = <&pp1800_mipibrdg>; vdd33-supply = <&vddio_mipibrdg>; - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - anx7625_in: endpoint { - remote-endpoint = <&dsi_out>; + port@0 { + reg = <0>; + + anx7625_in: endpoint { + remote-endpoint = <&dsi_out>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - anx7625_out: endpoint { - remote-endpoint = <&panel_in>; + anx7625_out: endpoint { + remote-endpoint = <&panel_in>; + }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/568 arm64: dts: ti: k3-am62-verdin: Drop McASP AFIFOs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jai Luthra <[email protected]>
[ Upstream commit fb01352801f08740e9f37cbd71f73866c7044927 ]
McASP AFIFOs are not necessary with UDMA-P/BCDMA as there is buffering on the DMA IP. Drop these for better audio latency.
--- arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 4 ---- 1 file changed, 4 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi +0 -4
@@ -1309,8 +1309,6 @@ &mcasp0 { 0 0 0 0 >; tdm-slots = <2>; - rx-num-evt = <32>; - tx-num-evt = <32>; #sound-dai-cells = <0>; status = "disabled"; };
@@ -1327,8 +1325,6 @@ &mcasp1 { 0 0 0 0 >; tdm-slots = <2>; - rx-num-evt = <32>; - tx-num-evt = <32>; #sound-dai-cells = <0>; status = "disabled"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 78/568 arm64: dts: amlogic: add power domain to hdmitx
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit f1ab099d6591a353899a2ee09c89de0fc908e2d2 ]
HDMI Tx needs HDMI Tx memory power domain turned on. This power domain is handled under the VPU power domain.
The HDMI Tx currently works because it is enabling the PD by directly poking the power controller register. It is should not do that but properly use the power domain controller.
Fix this by adding the power domain to HDMI Tx.
Stable-dep-of: 1443b6ea806d ("arm64: dts: amlogic: setup hdmi system clock")
--- arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 ++++ 4 files changed, 10 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12.dtsi +4 -0
@@ -367,6 +367,10 @@ ðmac { power-domains = <&pwrc PWRC_G12A_ETH_ID>; }; +&hdmi_tx { + power-domains = <&pwrc PWRC_G12A_VPU_ID>; +}; + &vpu { power-domains = <&pwrc PWRC_G12A_VPU_ID>; };
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +1 -0
@@ -315,6 +315,7 @@ &hdmi_tx { <&clkc CLKID_HDMI_PCLK>, <&clkc CLKID_GCLK_VENCI_INT0>; clock-names = "isfr", "iahb", "venci"; + power-domains = <&pwrc PWRC_GXBB_VPU_ID>; }; &sysctrl {
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +1 -0
@@ -327,6 +327,7 @@ &hdmi_tx { <&clkc CLKID_HDMI_PCLK>, <&clkc CLKID_GCLK_VENCI_INT0>; clock-names = "isfr", "iahb", "venci"; + power-domains = <&pwrc PWRC_GXBB_VPU_ID>; }; &sysctrl {
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +4 -0
@@ -518,6 +518,10 @@ &gpio_intc { "amlogic,meson-gpio-intc"; }; +&hdmi_tx { + power-domains = <&pwrc PWRC_SM1_VPU_ID>; +}; + &pcie { power-domains = <&pwrc PWRC_SM1_PCIE_ID>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 79/568 arm64: dts: amlogic: setup hdmi system clock
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit 1443b6ea806dfcdcee6c894784332c9c947ac319 ]
HDMI Tx needs the system clock set on the xtal rate.
This clock is managed by the main clock controller of the related SoCs.
Currently 2 part of the display drivers race to setup the HDMI system clock by directly poking the controller register. The clock API should be used to setup the rate instead.
Use assigned-clock to setup the HDMI system clock.
--- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 5 +++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 5 +++++ 3 files changed, 15 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +5 -0
@@ -215,6 +215,11 @@ hdmi_tx: hdmi-tx@0 { #sound-dai-cells = <0>; status = "disabled"; + assigned-clocks = <&clkc CLKID_HDMI_SEL>, + <&clkc CLKID_HDMI>; + assigned-clock-parents = <&xtal>, <0>; + assigned-clock-rates = <0>, <24000000>; + /* VPU VENC Input */ hdmi_tx_venc_port: port@0 { reg = <0>;
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +5 -0
@@ -316,6 +316,11 @@ &hdmi_tx { <&clkc CLKID_GCLK_VENCI_INT0>; clock-names = "isfr", "iahb", "venci"; power-domains = <&pwrc PWRC_GXBB_VPU_ID>; + + assigned-clocks = <&clkc CLKID_HDMI_SEL>, + <&clkc CLKID_HDMI>; + assigned-clock-parents = <&xtal>, <0>; + assigned-clock-rates = <0>, <24000000>; }; &sysctrl {
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +5 -0
@@ -328,6 +328,11 @@ &hdmi_tx { <&clkc CLKID_GCLK_VENCI_INT0>; clock-names = "isfr", "iahb", "venci"; power-domains = <&pwrc PWRC_GXBB_VPU_ID>; + + assigned-clocks = <&clkc CLKID_HDMI_SEL>, + <&clkc CLKID_HDMI>; + assigned-clock-parents = <&xtal>, <0>; + assigned-clock-rates = <0>, <24000000>; }; &sysctrl {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 80/568 arm64: dts: rockchip: Drop invalid mic-in-differential on rk3568-rock-3a
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 406a554b382200abfabd1df423a425f6efee53e0 ]
The 'mic-in-differential' DT property supported by the RK809/RK817 audio codec driver is actually valid if prefixed with 'rockchip,':
DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dtb
rk3568-rock-3a.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
However, the board doesn't make use of differential signaling, hence drop the incorrect property and the now unnecessary 'codec' node.
--- arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 4 ---- 1 file changed, 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +0 -4
@@ -530,10 +530,6 @@ regulator-state-mem { }; }; }; - - codec { - mic-in-differential; - }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 81/568 arm64: dts: rockchip: Fix mic-in-differential usage on rk3566-roc-pc
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit e643e4eb4bef6a2f95bf0c61a20c991bccecb212 ]
The 'mic-in-differential' DT property supported by the RK809/RK817 audio codec driver is actually valid if prefixed with 'rockchip,':
DTC_CHK arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dtb
rk3566-roc-pc.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
Make use of the correct property name.
--- arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts +1 -1
@@ -268,7 +268,7 @@ rk809: pmic@20 { vcc9-supply = <&vcc3v3_sys>; codec { - mic-in-differential; + rockchip,mic-in-differential; }; regulators {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 82/568 arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-evb1-v10
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit ec03073888ad23223ebb986e62583c20a9ed3c07 ]
The 'mic-in-differential' DT property supported by the RK809/RK817 audio codec driver is actually valid if prefixed with 'rockchip,':
DTC_CHK arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dtb
rk3568-evb1-v10.dtb: pmic@20: codec: 'mic-in-differential' does not match any of the regexes: 'pinctrl-[0-9]+'
from schema $id: http://devicetree.org/schemas/mfd/rockchip,rk809.yaml#
Make use of the correct property name.
--- arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts +1 -1
@@ -475,7 +475,7 @@ regulator-state-mem { }; codec { - mic-in-differential; + rockchip,mic-in-differential; }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 83/568 arm64: dts: renesas: r8a779a0: Add missing hypervisor virtual timer IRQ
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 6fca24a07e1de664c3d0b280043302e0387726df ]
Add the missing fifth interrupt to the device node that represents the ARM architected timer. While at it, add an interrupt-names property for clarity,
--- arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a779a0.dtsi +4 -1
@@ -2910,6 +2910,9 @@ timer { interrupts-extended = <&gic GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, - <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; + <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>, + <&gic GIC_PPI 12 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "sec-phys", "phys", "virt", "hyp-phys", + "hyp-virt"; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 84/568 arm64: dts: renesas: r8a779f0: Add missing hypervisor virtual timer IRQ
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit b1c34567aebe300f9a0f70320eaeef0b3d56ffc7 ]
Add the missing fifth interrupt to the device node that represents the ARM architected timer. While at it, add an interrupt-names property for clarity,
--- arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a779f0.dtsi +4 -1
@@ -1181,7 +1181,10 @@ timer { interrupts-extended = <&gic GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, - <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; + <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>, + <&gic GIC_PPI 12 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "sec-phys", "phys", "virt", "hyp-phys", + "hyp-virt"; }; ufs30_clk: ufs30-clk {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 85/568 arm64: dts: renesas: r8a779g0: Add missing hypervisor virtual timer IRQ
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 6775165fc95052a03acc91e25bc20fcf286910a7 ]
Add the missing fifth interrupt to the device node that represents the ARM architected timer. While at it, add an interrupt-names property for clarity,
--- arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a779g0.dtsi +4 -1
@@ -2350,6 +2350,9 @@ timer { interrupts-extended = <&gic GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, - <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; + <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>, + <&gic GIC_PPI 12 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "sec-phys", "phys", "virt", "hyp-phys", + "hyp-virt"; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 86/568 arm64: dts: renesas: r9a07g043u: Add missing hypervisor virtual timer IRQ
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 4036bae6dfd782d414040e7d714abc525b2e8792 ]
Add the missing fifth interrupt to the device node that represents the ARM architected timer. While at it, add an interrupt-names property for clarity,
--- arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r9a07g043u.dtsi +4 -1
@@ -50,7 +50,10 @@ timer { interrupts-extended = <&gic GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, - <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; + <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>, + <&gic GIC_PPI 12 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "sec-phys", "phys", "virt", "hyp-phys", + "hyp-virt"; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 87/568 arm64: dts: renesas: r9a07g044: Add missing hypervisor virtual timer IRQ
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit ecbc5206a1a0532258144a4703cccf4e70f3fe6c ]
Add the missing fifth interrupt to the device node that represents the ARM architected timer. While at it, add an interrupt-names property for clarity,
--- arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r9a07g044.dtsi +4 -1
@@ -1288,6 +1288,9 @@ timer { interrupts-extended = <&gic GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, - <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; + <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>, + <&gic GIC_PPI 12 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "sec-phys", "phys", "virt", "hyp-phys", + "hyp-virt"; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 88/568 arm64: dts: renesas: r9a07g054: Add missing hypervisor virtual timer IRQ
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2918674704aad620215c41979a331021fe3f1ec4 ]
Add the missing fifth interrupt to the device node that represents the ARM architected timer. While at it, add an interrupt-names property for clarity,
--- arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r9a07g054.dtsi +4 -1
@@ -1295,6 +1295,9 @@ timer { interrupts-extended = <&gic GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, <&gic GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, - <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; + <&gic GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>, + <&gic GIC_PPI 12 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "sec-phys", "phys", "virt", "hyp-phys", + "hyp-virt"; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 89/568 m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eero Tamminen <[email protected]>
[ Upstream commit f70065a9fd988983b2c693631b801f25a615fc04 ]
Avoid freeze on Atari TT / MegaSTe boot with continuous messages of:
unexpected interrupt from 112
Which was due to VBL interrupt being enabled in SCU sys mask, but there being no handler for that any more.
(Bug and fix were first verified on real Atari TT HW by Christian,
this patch later on in Hatari emulator.)
--- arch/m68k/atari/ataints.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
arch/m68k/atari/ataints.c +1 -5
@@ -302,11 +302,7 @@ void __init atari_init_IRQ(void)if (ATARIHW_PRESENT (SCU )) {/* init the SCU if present */ - tt_scu.sys_mask =0x10 ;/* enable VBL (for the cursor) and -* disable HSYNC interrupts (who -* needs them?) MFP and SCC are -* enabled in VME mask -*/ + tt_scu.sys_mask =0x0 ;/* disable all interrupts */ tt_scu.vme_mask =0x60 ;/* enable MFP and SCC ints */ }else {/* If no SCU and no Hades, the HSYNC interrupt needs to be
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 90/568 arm64: dts: imx8mp: Add NPU Node
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 4bedc468b725d55655dc8c9f5528932f4d77ccb0 ]
The NPU is based on the Vivante GC8000 and its power-domain is controlled my pgc_mlmix. Since the power-domain uses some of these clocks, setup the clock parent and rates inside the power-domain, and add the NPU node.
The data sheet states the CLK_ML_AHB should be 300MHz for nominal, but 800MHz clock will divide down to 266 instead. Boards which operate in over-drive mode should update the clocks on their boards accordingly. When the driver loads, the NPU numerates as:
etnaviv-gpu 38500000.npu: model: GC8000, revision: 8002
Stable-dep-of: 106f68fc9da3 ("arm64: dts: imx8mp: Fix pgc_mlmix location")
--- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +21 -0
@@ -886,6 +886,15 @@ pgc_mlmix: power-domain@24 { clocks = <&clk IMX8MP_CLK_ML_AXI>, <&clk IMX8MP_CLK_ML_AHB>, <&clk IMX8MP_CLK_NPU_ROOT>; + assigned-clocks = <&clk IMX8MP_CLK_ML_CORE>, + <&clk IMX8MP_CLK_ML_AXI>, + <&clk IMX8MP_CLK_ML_AHB>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>, + <&clk IMX8MP_SYS_PLL1_800M>, + <&clk IMX8MP_SYS_PLL1_800M>; + assigned-clock-rates = <800000000>, + <800000000>, + <300000000>; }; }; };
@@ -1970,6 +1979,18 @@ vpumix_blk_ctrl: blk-ctrl@38330000 { interconnect-names = "g1", "g2", "vc8000e"; }; + npu: npu@38500000 { + compatible = "vivante,gc"; + reg = <0x38500000 0x200000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX8MP_CLK_NPU_ROOT>, + <&clk IMX8MP_CLK_NPU_ROOT>, + <&clk IMX8MP_CLK_ML_AXI>, + <&clk IMX8MP_CLK_ML_AHB>; + clock-names = "core", "shader", "bus", "reg"; + power-domains = <&pgc_mlmix>; + }; + gic: interrupt-controller@38800000 { compatible = "arm,gic-v3"; reg = <0x38800000 0x10000>,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 91/568 arm64: dts: imx8mp: Fix pgc_mlmix location
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 106f68fc9da3d4835070b55a2229d2c54ef5cba1 ]
The pgc_mlmix shows a power-domain@24, but the reg value is IMX8MP_POWER_DOMAIN_MLMIX which is set to 4.
The stuff after the @ symbol should match the stuff referenced by 'reg' so reorder the pgc_mlmix so it to appear as power-domain@4.
--- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +17 -17
@@ -785,6 +785,23 @@ pgc_usb2_phy: power-domain@3 { reg = <IMX8MP_POWER_DOMAIN_USB2_PHY>; }; + pgc_mlmix: power-domain@4 { + #power-domain-cells = <0>; + reg = <IMX8MP_POWER_DOMAIN_MLMIX>; + clocks = <&clk IMX8MP_CLK_ML_AXI>, + <&clk IMX8MP_CLK_ML_AHB>, + <&clk IMX8MP_CLK_NPU_ROOT>; + assigned-clocks = <&clk IMX8MP_CLK_ML_CORE>, + <&clk IMX8MP_CLK_ML_AXI>, + <&clk IMX8MP_CLK_ML_AHB>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>, + <&clk IMX8MP_SYS_PLL1_800M>, + <&clk IMX8MP_SYS_PLL1_800M>; + assigned-clock-rates = <800000000>, + <800000000>, + <300000000>; + }; + pgc_audio: power-domain@5 { #power-domain-cells = <0>; reg = <IMX8MP_POWER_DOMAIN_AUDIOMIX>;
@@ -879,23 +896,6 @@ pgc_vpu_vc8000e: power-domain@22 { reg = <IMX8MP_POWER_DOMAIN_VPU_VC8000E>; clocks = <&clk IMX8MP_CLK_VPU_VC8KE_ROOT>; }; - - pgc_mlmix: power-domain@24 { - #power-domain-cells = <0>; - reg = <IMX8MP_POWER_DOMAIN_MLMIX>; - clocks = <&clk IMX8MP_CLK_ML_AXI>, - <&clk IMX8MP_CLK_ML_AHB>, - <&clk IMX8MP_CLK_NPU_ROOT>; - assigned-clocks = <&clk IMX8MP_CLK_ML_CORE>, - <&clk IMX8MP_CLK_ML_AXI>, - <&clk IMX8MP_CLK_ML_AHB>; - assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>, - <&clk IMX8MP_SYS_PLL1_800M>, - <&clk IMX8MP_SYS_PLL1_800M>; - assigned-clock-rates = <800000000>, - <800000000>, - <300000000>; - }; }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 92/568 arm64: dts: imx8mp: add HDMI power-domains
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas Stach <[email protected]>
[ Upstream commit f6772c5882d2229b4e0d9aadbcac3eb922e822c0 ]
This adds the PGC and HDMI blk-ctrl nodes providing power control for HDMI subsystem peripherals.
Stable-dep-of: 2f8405fb077b ("arm64: dts: imx8mp: Fix pgc vpu locations")
--- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +38 -0
@@ -849,6 +849,23 @@ pgc_mediamix: power-domain@10 { <&clk IMX8MP_CLK_MEDIA_APB_ROOT>; }; + pgc_hdmimix: power-domain@14 { + #power-domain-cells = <0>; + reg = <IMX8MP_POWER_DOMAIN_HDMIMIX>; + clocks = <&clk IMX8MP_CLK_HDMI_ROOT>, + <&clk IMX8MP_CLK_HDMI_APB>; + assigned-clocks = <&clk IMX8MP_CLK_HDMI_AXI>, + <&clk IMX8MP_CLK_HDMI_APB>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>, + <&clk IMX8MP_SYS_PLL1_133M>; + assigned-clock-rates = <500000000>, <133000000>; + }; + + pgc_hdmi_phy: power-domain@15 { + #power-domain-cells = <0>; + reg = <IMX8MP_POWER_DOMAIN_HDMI_PHY>; + }; + pgc_mipi_phy2: power-domain@16 { #power-domain-cells = <0>; reg = <IMX8MP_POWER_DOMAIN_MIPI_PHY2>;
@@ -1840,6 +1857,27 @@ hsio_blk_ctrl: blk-ctrl@32f10000 { #power-domain-cells = <1>; #clock-cells = <0>; }; + + hdmi_blk_ctrl: blk-ctrl@32fc0000 { + compatible = "fsl,imx8mp-hdmi-blk-ctrl", "syscon"; + reg = <0x32fc0000 0x1000>; + clocks = <&clk IMX8MP_CLK_HDMI_APB>, + <&clk IMX8MP_CLK_HDMI_ROOT>, + <&clk IMX8MP_CLK_HDMI_REF_266M>, + <&clk IMX8MP_CLK_HDMI_24M>, + <&clk IMX8MP_CLK_HDMI_FDCC_TST>; + clock-names = "apb", "axi", "ref_266m", "ref_24m", "fdcc"; + power-domains = <&pgc_hdmimix>, <&pgc_hdmimix>, + <&pgc_hdmimix>, <&pgc_hdmimix>, + <&pgc_hdmimix>, <&pgc_hdmimix>, + <&pgc_hdmimix>, <&pgc_hdmi_phy>, + <&pgc_hdmimix>, <&pgc_hdmimix>; + power-domain-names = "bus", "irqsteer", "lcdif", + "pai", "pvi", "trng", + "hdmi-tx", "hdmi-tx-phy", + "hdcp", "hrv"; + #power-domain-cells = <1>; + }; }; pcie: pcie@33800000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 93/568 arm64: dts: imx8mp: Fix pgc vpu locations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 2f8405fb077bcb8e98c8cd87c2a0a238b15d8da8 ]
The various pgv_vpu nodes have a mismatch between the value after the @ symbol and what is referenced by 'reg' so reorder the nodes to align.
--- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 55 ++++++++++++----------- 1 file changed, 28 insertions(+), 27 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +28 -27
@@ -834,6 +834,12 @@ pgc_gpumix: power-domain@7 { assigned-clock-rates = <800000000>, <400000000>; }; + pgc_vpumix: power-domain@8 { + #power-domain-cells = <0>; + reg = <IMX8MP_POWER_DOMAIN_VPUMIX>; + clocks = <&clk IMX8MP_CLK_VPU_ROOT>; + }; + pgc_gpu3d: power-domain@9 { #power-domain-cells = <0>; reg = <IMX8MP_POWER_DOMAIN_GPU3D>;
@@ -849,6 +855,28 @@ pgc_mediamix: power-domain@10 { <&clk IMX8MP_CLK_MEDIA_APB_ROOT>; }; + pgc_vpu_g1: power-domain@11 { + #power-domain-cells = <0>; + power-domains = <&pgc_vpumix>; + reg = <IMX8MP_POWER_DOMAIN_VPU_G1>; + clocks = <&clk IMX8MP_CLK_VPU_G1_ROOT>; + }; + + pgc_vpu_g2: power-domain@12 { + #power-domain-cells = <0>; + power-domains = <&pgc_vpumix>; + reg = <IMX8MP_POWER_DOMAIN_VPU_G2>; + clocks = <&clk IMX8MP_CLK_VPU_G2_ROOT>; + + }; + + pgc_vpu_vc8000e: power-domain@13 { + #power-domain-cells = <0>; + power-domains = <&pgc_vpumix>; + reg = <IMX8MP_POWER_DOMAIN_VPU_VC8000E>; + clocks = <&clk IMX8MP_CLK_VPU_VC8KE_ROOT>; + }; + pgc_hdmimix: power-domain@14 { #power-domain-cells = <0>; reg = <IMX8MP_POWER_DOMAIN_HDMIMIX>;
@@ -886,33 +914,6 @@ pgc_ispdwp: power-domain@18 { reg = <IMX8MP_POWER_DOMAIN_MEDIAMIX_ISPDWP>; clocks = <&clk IMX8MP_CLK_MEDIA_ISP_ROOT>; }; - - pgc_vpumix: power-domain@19 { - #power-domain-cells = <0>; - reg = <IMX8MP_POWER_DOMAIN_VPUMIX>; - clocks = <&clk IMX8MP_CLK_VPU_ROOT>; - }; - - pgc_vpu_g1: power-domain@20 { - #power-domain-cells = <0>; - power-domains = <&pgc_vpumix>; - reg = <IMX8MP_POWER_DOMAIN_VPU_G1>; - clocks = <&clk IMX8MP_CLK_VPU_G1_ROOT>; - }; - - pgc_vpu_g2: power-domain@21 { - #power-domain-cells = <0>; - power-domains = <&pgc_vpumix>; - reg = <IMX8MP_POWER_DOMAIN_VPU_G2>; - clocks = <&clk IMX8MP_CLK_VPU_G2_ROOT>; - }; - - pgc_vpu_vc8000e: power-domain@22 { - #power-domain-cells = <0>; - power-domains = <&pgc_vpumix>; - reg = <IMX8MP_POWER_DOMAIN_VPU_VC8000E>; - clocks = <&clk IMX8MP_CLK_VPU_VC8KE_ROOT>; - }; }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 94/568 x86/xen: Convert comma to semicolon
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 349d271416c61f82b853336509b1d0dc04c1fcbb ]
Replace a comma between expression statements by a semicolon.
--- arch/x86/xen/p2m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/xen/p2m.c +2 -2
@@ -731,7 +731,7 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,* immediate unmapping. */ map_ops[i].status = GNTST_general_error; - unmap[0 ].host_addr = map_ops[i].host_addr, + unmap[0 ].host_addr = map_ops[i].host_addr; unmap[0 ].handle = map_ops[i].handle; map_ops[i].handle =INVALID_GRANT_HANDLE ;if (map_ops[i].flags & GNTMAP_device_map)
@@ -741,7 +741,7 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,if (kmap_ops) { kmap_ops[i].status = GNTST_general_error; - unmap[1 ].host_addr = kmap_ops[i].host_addr, + unmap[1 ].host_addr = kmap_ops[i].host_addr; unmap[1 ].handle = kmap_ops[i].handle; kmap_ops[i].handle =INVALID_GRANT_HANDLE ;if (kmap_ops[i].flags & GNTMAP_device_map)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 95/568 arm64: dts: rockchip: Add missing power-domains for rk356x vop_mmu
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 9d42c3ee3ce37cdad6f98c9e77bfbd0d791ac7da ]
The iommu@fe043e00 on RK356x SoC shares the VOP power domain, but the power-domains property was not provided when the node has been added.
The consequence is that an attempt to reload the rockchipdrm module will freeze the entire system. That is because on probe time, pm_runtime_get_suppliers() gets called for vop@fe040000, which blocks when pm_runtime_get_sync() is being invoked for iommu@fe043e00.
Fix the issue by adding the missing property.
--- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk356x.dtsi +1 -0
@@ -749,6 +749,7 @@ vop_mmu: iommu@fe043e00 { clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; clock-names = "aclk", "iface"; #iommu-cells = <0>; + power-domains = <&power RK3568_PD_VO>; status = "disabled"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 77/568 arm64: dts: amlogic: gx: correct hdmi clocks
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit 0602ba0dcd0e76067a0b7543e92b2de3fb231073 ]
The clocks provided to HDMI tx are not consistent between gx and g12:
* gx receives the peripheral clock as 'isfr' while g12 receives it as 'iahb'
* g12 gets the HDMI system clock as 'isfr' but gx does not even get it. It surely needs that clock since the driver is directly poking around the clock controller's registers for that clock.
Align gx SoCs with g12 and provide:
* the HDMI peripheral clock as 'iahb'
* the HDMI system clock as 'isfr'
--- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +2 -2
@@ -311,8 +311,8 @@ &hdmi_tx { <&reset RESET_HDMI_SYSTEM_RESET>, <&reset RESET_HDMI_TX>; reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; - clocks = <&clkc CLKID_HDMI_PCLK>, - <&clkc CLKID_CLK81>, + clocks = <&clkc CLKID_HDMI>, + <&clkc CLKID_HDMI_PCLK>, <&clkc CLKID_GCLK_VENCI_INT0>; clock-names = "isfr", "iahb", "venci"; };
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +2 -2
@@ -323,8 +323,8 @@ &hdmi_tx { <&reset RESET_HDMI_SYSTEM_RESET>, <&reset RESET_HDMI_TX>; reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; - clocks = <&clkc CLKID_HDMI_PCLK>, - <&clkc CLKID_CLK81>, + clocks = <&clkc CLKID_HDMI>, + <&clkc CLKID_HDMI_PCLK>, <&clkc CLKID_GCLK_VENCI_INT0>; clock-names = "isfr", "iahb", "venci"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 97/568 arm64: dts: rockchip: fix usb regulator for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 9e823ba92118510c0d1c050b67bb000f9b9a73d7 ]
Remove the non-existent usb_host regulator and fix the supply according to the schematic. Also remove the unnecessary always-on and boot-on for the usb_otg regulator.
--- .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +4 -12
@@ -78,15 +78,6 @@ vcc5v0_sys: vcc5v0-sys-regulator { vin-supply = <&vcc12v_dcin>; }; - vcc5v0_usb_host: vcc5v0-usb-host-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_usb_host"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { compatible = "regulator-fixed"; enable-active-high;
@@ -94,8 +85,9 @@ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_usb_otg_en>; regulator-name = "vcc5v0_usb_otg"; - regulator-always-on; - regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_sys>; }; };
@@ -460,7 +452,7 @@ &usb2phy0 { }; &usb2phy0_host { - phy-supply = <&vcc5v0_usb_host>; + phy-supply = <&vcc5v0_sys>; status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 98/568 arm64: dts: rockchip: fix pmu_io supply for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit cfeac8e5d05815521f5c5568680735a92ee91fe4 ]
Fixes pmu_io_domains supply according to the schematic. Among them, the vccio3 is responsible for the io voltage of sdcard. There is no sdcard slot on the R68S, and it's connected to vcc_3v3, so describe the supply of vccio3 separately.
--- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts +4 -0
@@ -11,6 +11,10 @@ aliases { }; }; +&pmu_io_domains { + vccio3-supply = <&vccio_sd>; +}; + &sdmmc0 { bus-width = <4>; cap-mmc-highspeed;
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +2 -2
@@ -397,8 +397,8 @@ vcc5v0_usb_otg_en: vcc5v0-usb-otg-en { &pmu_io_domains { pmuio1-supply = <&vcc3v3_pmu>; pmuio2-supply = <&vcc3v3_pmu>; - vccio1-supply = <&vccio_acodec>; - vccio3-supply = <&vccio_sd>; + vccio1-supply = <&vcc_3v3>; + vccio2-supply = <&vcc_1v8>; vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; vccio6-supply = <&vcc_1v8>;
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts +4 -0
@@ -102,6 +102,10 @@ eth_phy1_reset_pin: eth-phy1-reset-pin { }; }; +&pmu_io_domains { + vccio3-supply = <&vcc_3v3>; +}; + &sdhci { bus-width = <8>; max-frequency = <200000000>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 99/568 arm64: dts: rockchip: remove unused usb2 nodes for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit cd77139a307fbabe75e6b5cb8a3753e3c700f394 ]
Fix the following error when booting:
[ 15.851853] platform fd800000.usb: deferred probe pending [ 15.852384] platform fd840000.usb: deferred probe pending [ 15.852881] platform fd880000.usb: deferred probe pending
This is due to usb2phy1 is not enabled. There is no USB 2.0 port on the board, just remove it.
--- .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 16 ---------------- 1 file changed, 16 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +0 -16
@@ -421,28 +421,12 @@ &uart2 { status = "okay"; }; -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - &usb_host0_xhci { dr_mode = "host"; extcon = <&usb2phy0>; status = "okay"; }; -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; -}; - &usb_host1_xhci { status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 100/568 arm64: dts: rockchip: disable display subsystem for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 2bf5d445df2ec89689d15ea259a916260c936959 ]
The R66S and R68S boards do not have HDMI output, so disable the display subsystem.
--- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +4 -0
@@ -115,6 +115,10 @@ &cpu3 { cpu-supply = <&vdd_cpu>; }; +&display_subsystem { + status = "disabled"; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 101/568 arm64: dts: rockchip: fixes PHY reset for Lunzn Fastrhino R68S
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit e261bd74000ca80e5483ba8a8bda509de8cbe7fd ]
Fixed the PHY address and reset GPIOs (does not match the corresponding pinctrl) for gmac0 and gmac1.
--- .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts +6 -6
@@ -39,7 +39,7 @@ &gmac0_tx_bus2 &gmac0_rx_bus2 &gmac0_rgmii_clk &gmac0_rgmii_bus>; - snps,reset-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>; + snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; snps,reset-active-low; /* Reset time is 15ms, 50ms for rtl8211f */ snps,reset-delays-us = <0 15000 50000>;
@@ -61,7 +61,7 @@ &gmac1m1_tx_bus2 &gmac1m1_rx_bus2 &gmac1m1_rgmii_clk &gmac1m1_rgmii_bus>; - snps,reset-gpio = <&gpio0 RK_PB1 GPIO_ACTIVE_LOW>; + snps,reset-gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; snps,reset-active-low; /* Reset time is 15ms, 50ms for rtl8211f */ snps,reset-delays-us = <0 15000 50000>;
@@ -71,18 +71,18 @@ &gmac1m1_rgmii_clk }; &mdio0 { - rgmii_phy0: ethernet-phy@0 { + rgmii_phy0: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; + reg = <0x1>; pinctrl-0 = <ð_phy0_reset_pin>; pinctrl-names = "default"; }; }; &mdio1 { - rgmii_phy1: ethernet-phy@0 { + rgmii_phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; + reg = <0x1>; pinctrl-0 = <ð_phy1_reset_pin>; pinctrl-names = "default"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 102/568 arm64: dts: qcom: sm6350: Add missing qcom,non-secure-domain property
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit 81008068ee4f2c4c26e97a0404405bb4b450241b ]
By default the DSP domains are secure, add the missing qcom,non-secure-domain property to mark them as non-secure.
--- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm6350.dtsi +2 -0
@@ -1299,6 +1299,7 @@ fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; label = "adsp"; + qcom,non-secure-domain; #address-cells = <1>; #size-cells = <0>;
@@ -1559,6 +1560,7 @@ fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; label = "cdsp"; + qcom,non-secure-domain; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 103/568 cpufreq/amd-pstate: Fix the scaling_max_freq setting on shared memory CPPC systems
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dhananjay Ugwekar <[email protected]>
[ Upstream commit 738d7d03571c7e38565bd245c0815a2c74665018 ]
On shared memory CPPC systems, with amd_pstate=active mode, the change in scaling_max_freq doesn't get written to the shared memory region. Due to this, the writes to the scaling_max_freq sysfs file don't take effect. Fix this by propagating the scaling_max_freq changes to the shared memory region.
--- drivers/cpufreq/amd-pstate.c | 43 +++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 20 deletions(-)
drivers/cpufreq/amd-pstate.c +23 -20
@@ -175,6 +175,26 @@ static int amd_pstate_get_energy_pref_index(struct amd_cpudata *cpudata)return index; } +static void pstate_update_perf (struct amd_cpudata *cpudata,u32 min_perf, +u32 des_perf,u32 max_perf,bool fast_switch) +{ +if (fast_switch) +wrmsrl (MSR_AMD_CPPC_REQ ,READ_ONCE (cpudata->cppc_req_cached)); +else +wrmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , +READ_ONCE (cpudata->cppc_req_cached)); +} + +DEFINE_STATIC_CALL (amd_pstate_update_perf, pstate_update_perf); + +static inline void amd_pstate_update_perf (struct amd_cpudata *cpudata, +u32 min_perf,u32 des_perf, +u32 max_perf,bool fast_switch) +{ +static_call (amd_pstate_update_perf)(cpudata, min_perf, des_perf, + max_perf, fast_switch); +} +static int amd_pstate_set_epp (struct amd_cpudata *cpudata,u32 epp) {int ret;
@@ -191,6 +211,9 @@ static int amd_pstate_set_epp(struct amd_cpudata *cpudata, u32 epp)if (!ret) cpudata->epp_cached = epp; }else { +amd_pstate_update_perf (cpudata, cpudata->min_limit_perf,0U , + cpudata->max_limit_perf, false); + perf_ctrls.energy_perf = epp; ret =cppc_set_epp_perf (cpudata->cpu, &perf_ctrls,1 );if (ret) {
@@ -361,16 +384,6 @@ static inline int amd_pstate_init_perf(struct amd_cpudata *cpudata)return static_call (amd_pstate_init_perf)(cpudata); } -static void pstate_update_perf (struct amd_cpudata *cpudata,u32 min_perf, -u32 des_perf,u32 max_perf,bool fast_switch) -{ -if (fast_switch) -wrmsrl (MSR_AMD_CPPC_REQ ,READ_ONCE (cpudata->cppc_req_cached)); -else -wrmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , -READ_ONCE (cpudata->cppc_req_cached)); -} -static void cppc_update_perf (struct amd_cpudata *cpudata,u32 min_perf,u32 des_perf,u32 max_perf,bool fast_switch)
@@ -384,16 +397,6 @@ static void cppc_update_perf(struct amd_cpudata *cpudata,cppc_set_perf (cpudata->cpu, &perf_ctrls); } -DEFINE_STATIC_CALL (amd_pstate_update_perf, pstate_update_perf); - -static inline void amd_pstate_update_perf (struct amd_cpudata *cpudata, -u32 min_perf,u32 des_perf, -u32 max_perf,bool fast_switch) -{ -static_call (amd_pstate_update_perf)(cpudata, min_perf, des_perf, - max_perf, fast_switch); -} -static inline bool amd_pstate_sample (struct amd_cpudata *cpudata) {u64 aperf, mperf, tsc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 104/568 m68k: cmpxchg: Fix return value for default case in __arch_xchg()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
[ Upstream commit 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 ]
The return value of __invalid_xchg_size() is assigned to tmp instead of the return variable x. Assign it to x instead.
--- arch/m68k/include/asm/cmpxchg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/include/asm/cmpxchg.h +1 -1
@@ -32,7 +32,7 @@ static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, in x = tmp;break ;default : - tmp =__invalid_xchg_size (x, ptr, size); + x =__invalid_xchg_size (x, ptr, size);break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 105/568 ARM: spitz: fix GPIO assignment for backlight
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
[ Upstream commit 78ab3d352f2982bf3f7e506bfbaba7afee1ed8a9 ]
GPIOs controlling backlight on Spitz and Akita are coming from GPIO expanders, not the pxa27xx-gpio block, correct it.
Additionally GPIO lookup tables operate with pin numbers rather than legacy GPIO numbers, fix that as well. Use raw numbers instead of legacy GPIO names to avoid confusion.
--- arch/arm/mach-pxa/spitz.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)
arch/arm/mach-pxa/spitz.c +10 -20
@@ -520,10 +520,8 @@ static struct gpiod_lookup_table spitz_ads7846_gpio_table = {static struct gpiod_lookup_table spitz_lcdcon_gpio_table = { .dev_id ="spi2.1" , .table = { -GPIO_LOOKUP ("gpio-pxa" ,SPITZ_GPIO_BACKLIGHT_CONT , -"BL_CONT" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("gpio-pxa" ,SPITZ_GPIO_BACKLIGHT_ON , -"BL_ON" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.1" ,6 ,"BL_CONT" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("sharp-scoop.1" ,7 ,"BL_ON" ,GPIO_ACTIVE_HIGH ), { }, }, };
@@ -531,10 +529,8 @@ static struct gpiod_lookup_table spitz_lcdcon_gpio_table = {static struct gpiod_lookup_table akita_lcdcon_gpio_table = { .dev_id ="spi2.1" , .table = { -GPIO_LOOKUP ("gpio-pxa" ,AKITA_GPIO_BACKLIGHT_CONT , -"BL_CONT" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("gpio-pxa" ,AKITA_GPIO_BACKLIGHT_ON , -"BL_ON" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("i2c-max7310" ,3 ,"BL_ON" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("i2c-max7310" ,4 ,"BL_CONT" ,GPIO_ACTIVE_LOW ), { }, }, };
@@ -941,12 +937,9 @@ static inline void spitz_i2c_init(void) {}static struct gpiod_lookup_table spitz_audio_gpio_table = { .dev_id ="spitz-audio" , .table = { -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_L -SPITZ_SCP_GPIO_BASE , -"mute-l" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_R -SPITZ_SCP_GPIO_BASE , -"mute-r" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("sharp-scoop.1" ,SPITZ_GPIO_MIC_BIAS -SPITZ_SCP2_GPIO_BASE , -"mic" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,3 ,"mute-l" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,4 ,"mute-r" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.1" ,8 ,"mic" ,GPIO_ACTIVE_HIGH ), { }, }, };
@@ -954,12 +947,9 @@ static struct gpiod_lookup_table spitz_audio_gpio_table = {static struct gpiod_lookup_table akita_audio_gpio_table = { .dev_id ="spitz-audio" , .table = { -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_L -SPITZ_SCP_GPIO_BASE , -"mute-l" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_R -SPITZ_SCP_GPIO_BASE , -"mute-r" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("i2c-max7310" ,AKITA_GPIO_MIC_BIAS -AKITA_IOEXP_GPIO_BASE , -"mic" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,3 ,"mute-l" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,4 ,"mute-r" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("i2c-max7310" ,2 ,"mic" ,GPIO_ACTIVE_HIGH ), { }, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 106/568 vmlinux.lds.h: catch .bss..L* sections into BSS")
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 1a7b7326d587c9a5e8ff067e70d6aaf0333f4bb3 ]
Commit 9a427556fb8e ("vmlinux.lds.h: catch compound literals into data and BSS") added catches for .data..L* and .rodata..L* but missed .bss..L*
Since commit 5431fdd2c181 ("ptrace: Convert ptrace_attach() to use lock guards") the following appears at build:
LD .tmp_vmlinux.kallsyms1
powerpc64-linux-ld: warning: orphan section .bss..Lubsan_data33' from kernel/ptrace.o' being placed in section `.bss..Lubsan_data33'
NM .tmp_vmlinux.kallsyms1.syms KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 powerpc64-linux-ld: warning: orphan section `.bss..Lubsan_data33' from `kernel/ptrace.o' being placed in section `.bss..Lubsan_data33' NM .tmp_vmlinux.kallsyms2.syms KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux
powerpc64-linux-ld: warning: orphan section .bss..Lubsan_data33' from kernel/ptrace.o' being placed in section `.bss..Lubsan_data33'
Lets add .bss..L* to BSS_MAIN macro to catch those sections into BSS.
--- include/asm-generic/vmlinux.lds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -101,7 +101,7 @@#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral* .data.$__unnamed_* .data.$L*#define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*#define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]* .rodata..L* -#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..compoundliteral* +#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..L* .bss..compoundliteral*#define SBSS_MAIN .sbss .sbss.[0-9a-zA-Z_]*#else #define TEXT_MAIN .text
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 107/568 firmware: turris-mox-rwtm: Do not complete if there are no waiters
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit 0bafb172b111ab27251af0eb684e7bde9570ce4c ]
Do not complete the "command done" completion if there are no waiters. This can happen if a wait_for_completion() timed out or was interrupted.
--- drivers/firmware/turris-mox-rwtm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/firmware/turris-mox-rwtm.c +4 -1
@@ -2,7 +2,7 @@/* * Turris Mox rWTM firmware driver * -* Copyright (C) 2019 Marek Behún <[email protected]> +* Copyright (C) 2019, 2024 Marek Behún <[email protected]> */ #include <linux/armada-37xx-rwtm-mailbox.h>
@@ -174,6 +174,9 @@ static void mox_rwtm_rx_callback(struct mbox_client *cl, void *data)struct mox_rwtm *rwtm =dev_get_drvdata (cl->dev);struct armada_37xx_rwtm_rx_msg *msg = data; +if (completion_done (&rwtm->cmd_done)) +return ; + rwtm->reply = *msg;complete (&rwtm->cmd_done); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 108/568 firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit 8467cfe821ac3526f7598682ad5f90689fa8cc49 ]
The wait_for_completion_timeout() function returns 0 if timed out, and a positive value if completed. Fix the usage of this function.
--- drivers/firmware/turris-mox-rwtm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/firmware/turris-mox-rwtm.c +6 -9
@@ -202,9 +202,8 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)if (ret <0 )return ret; - ret =wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 ); -if (ret <0 ) -return ret; +if (!wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 )) +return -ETIMEDOUT ; ret =mox_get_status (MBOX_CMD_BOARD_INFO , reply->retval);if (ret == -ENODATA ) {
@@ -238,9 +237,8 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)if (ret <0 )return ret; - ret =wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 ); -if (ret <0 ) -return ret; +if (!wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 )) +return -ETIMEDOUT ; ret =mox_get_status (MBOX_CMD_ECDSA_PUB_KEY , reply->retval);if (ret == -ENODATA ) {
@@ -277,9 +275,8 @@ static int check_get_random_support(struct mox_rwtm *rwtm)if (ret <0 )return ret; - ret =wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 ); -if (ret <0 ) -return ret; +if (!wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 )) +return -ETIMEDOUT ;return mox_get_status (MBOX_CMD_GET_RANDOM , rwtm->reply.retval); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 109/568 firmware: turris-mox-rwtm: Initialize completion before mailbox
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit 49e24c80d3c81c43e2a56101449e1eea32fcf292 ]
Initialize the completion before the mailbox channel is requested.
--- drivers/firmware/turris-mox-rwtm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/firmware/turris-mox-rwtm.c +1 -2
@@ -499,6 +499,7 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)platform_set_drvdata (pdev, rwtm);mutex_init (&rwtm->busy); +init_completion (&rwtm->cmd_done); rwtm->mbox_client.dev = dev; rwtm->mbox_client.rx_callback = mox_rwtm_rx_callback;
@@ -512,8 +513,6 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev) goto remove_files; } -init_completion (&rwtm->cmd_done); - ret =mox_get_board_info (rwtm);if (ret <0 )dev_warn (dev,"Cannot read board information: %i\n" , ret);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 110/568 wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samasth Norway Ananda <[email protected]>
[ Upstream commit c636fa85feb450ca414a10010ed05361a73c93a6 ]
The band_idx variable in the function wlc_lcnphy_tx_iqlo_cal() will never be set to 1 as BCM4313 is the only device for which the LCN PHY code is used. This is a 2G-only device.
--- .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c +9 -9
@@ -2567,7 +2567,6 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi,struct lcnphy_txgains cal_gains, temp_gains;u16 hash; -u8 band_idx;int j;u16 ncorr_override[5 ];u16 syst_coeffs[] = {0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,
@@ -2599,6 +2598,9 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi,u16 *values_to_save;struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy; +if (WARN_ON (CHSPEC_IS5G (pi->radio_chanspec))) +return ; + values_to_save =kmalloc_array (20 ,sizeof (u16),GFP_ATOMIC );if (NULL == values_to_save)return ;
@@ -2662,20 +2664,18 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi, hash = (target_gains->gm_gain <<8 ) | (target_gains->pga_gain <<4 ) | (target_gains->pad_gain); - band_idx = (CHSPEC_IS5G (pi->radio_chanspec) ?1 :0 ); - cal_gains = *target_gains;memset (ncorr_override,0 ,sizeof (ncorr_override)); -for (j =0 ; j < iqcal_gainparams_numgains_lcnphy[band_idx]; j++) { -if (hash == tbl_iqcal_gainparams_lcnphy[band_idx][j][0 ]) { +for (j =0 ; j < iqcal_gainparams_numgains_lcnphy[0 ]; j++) { +if (hash == tbl_iqcal_gainparams_lcnphy[0 ][j][0 ]) { cal_gains.gm_gain = - tbl_iqcal_gainparams_lcnphy[band_idx][j][1 ]; + tbl_iqcal_gainparams_lcnphy[0 ][j][1 ]; cal_gains.pga_gain = - tbl_iqcal_gainparams_lcnphy[band_idx][j][2 ]; + tbl_iqcal_gainparams_lcnphy[0 ][j][2 ]; cal_gains.pad_gain = - tbl_iqcal_gainparams_lcnphy[band_idx][j][3 ]; + tbl_iqcal_gainparams_lcnphy[0 ][j][3 ];memcpy (ncorr_override, - &tbl_iqcal_gainparams_lcnphy[band_idx][j][3 ], + &tbl_iqcal_gainparams_lcnphy[0 ][j][3 ],sizeof (ncorr_override));break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 111/568 wifi: ath12k: Correct 6 GHz frequency value in rx status
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pradeep Kumar Chitrapu <[email protected]>
[ Upstream commit c3c84a74bd797f76d7da036c9fef947d674bbc18 ]
The frequency in the rx status is currently being filled incorrectly for the 6 GHz band. The channel number received is invalid in this case, resulting in packet drops. Fix this issue by correcting the frequency calculation.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 9 ++++++--- drivers/net/wireless/ath/ath12k/wmi.c | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +6 -3
@@ -2376,8 +2376,10 @@ void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, channel_num = meta_data; center_freq = meta_data >>16 ; -if (center_freq >=5935 && center_freq <=7105 ) { +if (center_freq >=ATH12K_MIN_6G_FREQ && + center_freq <=ATH12K_MAX_6G_FREQ ) { rx_status->band =NL80211_BAND_6GHZ ; + rx_status->freq = center_freq; }else if (channel_num >=1 && channel_num <=14 ) { rx_status->band =NL80211_BAND_2GHZ ; }else if (channel_num >=36 && channel_num <=173 ) {
@@ -2395,8 +2397,9 @@ void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, rx_desc, sizeof(*rx_desc)); } - rx_status->freq =ieee80211_channel_to_frequency (channel_num, - rx_status->band); +if (rx_status->band !=NL80211_BAND_6GHZ ) + rx_status->freq =ieee80211_channel_to_frequency (channel_num, + rx_status->band);ath12k_dp_rx_h_rate (ar, rx_desc, rx_status); }
drivers/net/wireless/ath/ath12k/wmi.c +7 -3
@@ -5772,8 +5772,10 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb)if (rx_ev.status &WMI_RX_STATUS_ERR_MIC ) status->flag |=RX_FLAG_MMIC_ERROR ; -if (rx_ev.chan_freq >=ATH12K_MIN_6G_FREQ ) { +if (rx_ev.chan_freq >=ATH12K_MIN_6G_FREQ && + rx_ev.chan_freq <=ATH12K_MAX_6G_FREQ ) { status->band =NL80211_BAND_6GHZ ; + status->freq = rx_ev.chan_freq; }else if (rx_ev.channel >=1 && rx_ev.channel <=14 ) { status->band =NL80211_BAND_2GHZ ; }else if (rx_ev.channel >=36 && rx_ev.channel <=ATH12K_MAX_5G_CHAN ) {
@@ -5794,8 +5796,10 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb) sband = &ar->mac.sbands[status->band]; - status->freq =ieee80211_channel_to_frequency (rx_ev.channel, - status->band); +if (status->band !=NL80211_BAND_6GHZ ) + status->freq =ieee80211_channel_to_frequency (rx_ev.channel, + status->band); + status->signal = rx_ev.snr +ATH12K_DEFAULT_NOISE_FLOOR ; status->rate_idx =ath12k_mac_bitrate_to_idx (sband, rx_ev.rate /100 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 112/568 wifi: ath12k: Fix tx completion ring (WBM2SW) setup failure
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nithyanantham Paramasivam <[email protected]>
[ Upstream commit 0ce9ab2785e4e9ca0752390d8e5ab65bd08f0e78 ]
We observe intermittent ping failures from the access point (AP) to station (STA) in any mode (AP-STA or Mesh) configured. Specifically, the transmission completion status is not received at tx completion ring id 4 (WBM2SW ring4) for the packets transmitted via TCL DATA ring id 3. This prevents freeing up tx descriptors and leads to buffer exhaustion.
Currently, during initialization of the WBM2SW ring, we are directly mapping the ring number to the ring mask to obtain the ring mask group index. This approach is causing setup failures for WBM2SW ring 4. Similarly, during runtime, when receiving incoming transmission completion status, the validation of the ring number by mapping the interrupted ring mask. This is resulting in validation failure. Thereby preventing entry into the completion handler ath12k_dp_tx_completion_handler().
The existing design assumed that the ring numbers would always be sequential and could be directly mapped with the ring mask. However, this assumption does not hold true for WBM2SW ring 4. Therefore, modify the design such that, instead of mapping the ring number, the ring ID is mapped with the ring mask.
According to this design:
1. During initialization of the WBM2SW ring, mapping the ring ID to the ring mask will ensure obtaining the correct ring mask group ID.
2. During runtime, validating the interrupted ring mask group ID within the transmission completion group is sufficient. This approach allows the ring ID to be derived from the interrupted ring mask and enables entry into the completion handler.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp.c | 18 +++++++++++++----- drivers/net/wireless/ath/ath12k/hw.c | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath12k/dp.c +13 -5
@@ -127,7 +127,9 @@ static int ath12k_dp_srng_find_ring_in_mask(int ring_num, const u8 *grp_mask)static int ath12k_dp_srng_calculate_msi_group (struct ath12k_base *ab,enum hal_ring_type type,int ring_num) { +const struct ath12k_hal_tcl_to_wbm_rbm_map *map;const u8 *grp_mask; +int i;switch (type) {case HAL_WBM2SW_RELEASE :
@@ -135,6 +137,14 @@ static int ath12k_dp_srng_calculate_msi_group(struct ath12k_base *ab, grp_mask = &ab->hw_params->ring_mask->rx_wbm_rel[0 ]; ring_num =0 ; }else { + map = ab->hw_params->hal_ops->tcl_to_wbm_rbm_map; +for (i =0 ; i < ab->hw_params->max_tx_ring; i++) { +if (ring_num == map[i].wbm_ring_num) { + ring_num = i; +break ; + } + } + grp_mask = &ab->hw_params->ring_mask->tx[0 ]; }break ;
@@ -876,11 +886,9 @@ int ath12k_dp_service_srng(struct ath12k_base *ab,enum dp_monitor_mode monitor_mode;u8 ring_mask; -while (i < ab->hw_params->max_tx_ring) { -if (ab->hw_params->ring_mask->tx[grp_id] & -BIT (ab->hw_params->hal_ops->tcl_to_wbm_rbm_map[i].wbm_ring_num)) -ath12k_dp_tx_completion_handler (ab, i); - i++; +if (ab->hw_params->ring_mask->tx[grp_id]) { + i =fls (ab->hw_params->ring_mask->tx[grp_id]) -1 ; +ath12k_dp_tx_completion_handler (ab, i); }if (ab->hw_params->ring_mask->rx_err[grp_id]) {
drivers/net/wireless/ath/ath12k/hw.c +1 -1
@@ -576,8 +576,8 @@ static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = {static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_wcn7850 = { .tx = {ATH12K_TX_RING_MASK_0 , +ATH12K_TX_RING_MASK_1 ,ATH12K_TX_RING_MASK_2 , -ATH12K_TX_RING_MASK_4 , }, .rx_mon_dest = { },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 113/568 bpftool: Un-const bpf_func_info to fix it for llvm 17 and newer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Babrou <[email protected]>
[ Upstream commit f4aba3471cfb9ccf69b476463f19b4c50fef6b14 ]
LLVM 17 started treating const structs as constants:
* https://github.com/llvm/llvm-project/commit/0b2d5b967d98
Combined with pointer laundering via ptr_to_u64, which takes a const ptr, but in reality treats the underlying memory as mutable, this makes clang always pass zero to btf__type_by_id, which breaks full name resolution.
Disassembly before (LLVM 16) and after (LLVM 17):
- 8b 75 cc mov -0x34(%rbp),%esi
- e8 47 8d 02 00 call 3f5b0 <btf__type_by_id>
+ 31 f6 xor %esi,%esi
+ e8 a9 8c 02 00 call 3f510 <btf__type_by_id>It's a bigger project to fix this properly (and a question whether LLVM itself should detect this), but for right now let's just fix bpftool.
For more information, see this thread in bpf mailing list:
* https://lore.kernel.org/bpf/CABWYdi0ymezpYsQsPv7qzpx2fWuTkoD1-wG1eT-9x-TSREFrQg@mail.gmail.com/T/
--- tools/bpf/bpftool/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/common.c +1 -1
@@ -410,7 +410,7 @@ void get_prog_full_name(const struct bpf_prog_info *prog_info, int prog_fd, {const char *prog_name = prog_info->name;const struct btf_type *func_type; -const struct bpf_func_info finfo = {}; +struct bpf_func_info finfo = {};struct bpf_prog_info info = {};__u32 info_len =sizeof (info);struct btf *prog_btf =NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 114/568 selftests/bpf: Fix prog numbers in test_sockmap
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 6c8d7598dfed759bf1d9d0322b4c2b42eb7252d8 ]
bpf_prog5 and bpf_prog7 are removed from progs/test_sockmap_kern.h in commit d79a32129b21 ("bpf: Selftests, remove prints from sockmap tests"), now there are only 9 progs in it, not 11:
SEC("sk_skb1")
int bpf_prog1(struct __sk_buff *skb)
SEC("sk_skb2")
int bpf_prog2(struct __sk_buff *skb)
SEC("sk_skb3")
int bpf_prog3(struct __sk_buff *skb)
SEC("sockops")
int bpf_sockmap(struct bpf_sock_ops *skops)
SEC("sk_msg1")
int bpf_prog4(struct sk_msg_md *msg)
SEC("sk_msg2")
int bpf_prog6(struct sk_msg_md *msg)
SEC("sk_msg3")
int bpf_prog8(struct sk_msg_md *msg)
SEC("sk_msg4")
int bpf_prog9(struct sk_msg_md *msg)
SEC("sk_msg5")
int bpf_prog10(struct sk_msg_md *msg)This patch updates the array sizes of prog_fd[], prog_attach_type[] and prog_type[] from 11 to 9 accordingly.
--- tools/testing/selftests/bpf/test_sockmap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
tools/testing/selftests/bpf/test_sockmap.c +1 -5
@@ -63,7 +63,7 @@ int passed;int failed;int map_fd[9 ];struct bpf_map *maps[9 ]; -int prog_fd[11 ]; +int prog_fd[9 ];int txmsg_pass;int txmsg_redir;
@@ -1793,8 +1793,6 @@ int prog_attach_type[] = {BPF_SK_MSG_VERDICT ,BPF_SK_MSG_VERDICT , BPF_SK_MSG_VERDICT, -BPF_SK_MSG_VERDICT , - BPF_SK_MSG_VERDICT, }; int prog_type[] = {
@@ -1807,8 +1805,6 @@ int prog_type[] = {BPF_PROG_TYPE_SK_MSG ,BPF_PROG_TYPE_SK_MSG , BPF_PROG_TYPE_SK_MSG, -BPF_PROG_TYPE_SK_MSG , - BPF_PROG_TYPE_SK_MSG, };static int populate_progs (char *bpf_file)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 96/568 arm64: dts: rockchip: fix regulator name for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 2dad31528de9ea8b05245ce6ac4f76ebf8dae947 ]
Make the regulator name the same as those marked by schematics.
--- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +4 -4
@@ -39,9 +39,9 @@ status_led: led-status { }; }; - dc_12v: dc-12v-regulator { + vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; - regulator-name = "dc_12v"; + regulator-name = "vcc12v_dcin"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <12000000>;
@@ -65,7 +65,7 @@ vcc3v3_sys: vcc3v3-sys-regulator { regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_sys: vcc5v0-sys-regulator {
@@ -75,7 +75,7 @@ vcc5v0_sys: vcc5v0-sys-regulator { regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_usb_host: vcc5v0-usb-host-regulator {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 116/568 wifi: ath12k: change DMA direction while mapping reinjected packets
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 33322e3ef07409278a18c6919c448e369d66a18e ]
For fragmented packets, ath12k reassembles each fragment as a normal packet and then reinjects it into HW ring. In this case, the DMA direction should be DMA_TO_DEVICE, not DMA_FROM_DEVICE. Otherwise, an invalid payload may be reinjected into the HW and subsequently delivered to the host.
Given that arbitrary memory can be allocated to the skb buffer, knowledge about the data contained in the reinjected buffer is lacking. Consequently, there’s a risk of private information being leaked.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +2 -2
@@ -3024,7 +3024,7 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar, buf_paddr =dma_map_single (ab->dev, defrag_skb->data, defrag_skb->len +skb_tailroom (defrag_skb), -DMA_FROM_DEVICE ); +DMA_TO_DEVICE );if (dma_mapping_error (ab->dev, buf_paddr))return -ENOMEM ;
@@ -3110,7 +3110,7 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar,spin_unlock_bh (&dp->rx_desc_lock); err_unmap_dma:dma_unmap_single (ab->dev, buf_paddr, defrag_skb->len +skb_tailroom (defrag_skb), -DMA_FROM_DEVICE ); +DMA_TO_DEVICE );return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 117/568 wifi: ath12k: fix invalid memory access while processing fragmented packets
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 073f9f249eecd64ab9d59c91c4a23cfdcc02afe4 ]
The monitor ring and the reo reinject ring share the same ring mask index. When the driver receives an interrupt for the reo reinject ring, the monitor ring is also processed, leading to invalid memory access. Since monitor support is not yet enabled in ath12k, the ring mask for the monitor ring should be removed.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/hw.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/wireless/ath/ath12k/hw.c +1 -5
@@ -540,9 +540,6 @@ static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = { }, .rx_mon_dest = { 0, 0, 0, -ATH12K_RX_MON_RING_MASK_0 , -ATH12K_RX_MON_RING_MASK_1 , - ATH12K_RX_MON_RING_MASK_2, }, .rx = { 0, 0, 0, 0,
@@ -568,8 +565,7 @@ static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = { ATH12K_HOST2RXDMA_RING_MASK_0, }, .tx_mon_dest = { -ATH12K_TX_MON_RING_MASK_0 , - ATH12K_TX_MON_RING_MASK_1, + 0, 0, 0, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 118/568 wifi: ath12k: fix firmware crash during reo reinject
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit a57ab7cced454f69b8ee8aa5f5019ea8de4674da ]
When handling fragmented packets, the ath12k driver reassembles each fragment into a normal packet and then reinjects it into the HW ring. However, a firmware crash occurs during this reinjection process. The issue arises because the driver populates peer metadata in reo_ent_ring->queue_addr_lo, while the firmware expects the physical address obtained from the corresponding peer’s queue descriptor. Fix it by filling peer's queue descriptor's physical address in queue_addr_lo.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +6 -8
@@ -2988,7 +2988,7 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar,struct hal_srng *srng;dma_addr_t link_paddr, buf_paddr;u32 desc_bank, msdu_info, msdu_ext_info, mpdu_info; -u32 cookie, hal_rx_desc_sz, dest_ring_info0; +u32 cookie, hal_rx_desc_sz, dest_ring_info0, queue_addr_hi;int ret;struct ath12k_rx_desc_info *desc_info;u8 dst_ind;
@@ -3080,13 +3080,11 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar, reo_ent_ring->rx_mpdu_info.peer_meta_data = reo_dest_ring->rx_mpdu_info.peer_meta_data; -/* Firmware expects physical address to be filled in queue_addr_lo in -* the MLO scenario and in case of non MLO peer meta data needs to be -* filled. -* TODO: Need to handle for MLO scenario. -*/ - reo_ent_ring->queue_addr_lo = reo_dest_ring->rx_mpdu_info.peer_meta_data; - reo_ent_ring->info0 =le32_encode_bits (dst_ind, + reo_ent_ring->queue_addr_lo =cpu_to_le32 (lower_32_bits (rx_tid->paddr)); + queue_addr_hi =upper_32_bits (rx_tid->paddr); + reo_ent_ring->info0 =le32_encode_bits (queue_addr_hi, +HAL_REO_ENTR_RING_INFO0_QUEUE_ADDR_HI ) | +le32_encode_bits (dst_ind,HAL_REO_ENTR_RING_INFO0_DEST_IND ); reo_ent_ring->info1 = le32_encode_bits(rx_tid->cur_sn,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 119/568 wifi: ath11k: Update Qualcomm Innovation Center, Inc. copyrights
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Johnson <[email protected]>
[ Upstream commit ea77e9398b326d65b052096840b883271f8a7a48 ]
Update the copyright for all ath11k files modified on behalf of Qualcomm Innovation Center, Inc. in 2021 through 2023.
Stable-dep-of: 5714e25f1d18 ("wifi: ath11k: fix wrong definition of CE ring's base address")
--- drivers/net/wireless/ath/ath11k/ce.c | 2 +- drivers/net/wireless/ath/ath11k/ce.h | 1 + drivers/net/wireless/ath/ath11k/dbring.c | 1 + drivers/net/wireless/ath/ath11k/dbring.h | 1 + drivers/net/wireless/ath/ath11k/debug.c | 1 + drivers/net/wireless/ath/ath11k/debug.h | 2 +- drivers/net/wireless/ath/ath11k/debugfs.c | 1 + drivers/net/wireless/ath/ath11k/debugfs.h | 1 + drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +- drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h | 2 +- drivers/net/wireless/ath/ath11k/debugfs_sta.c | 1 + drivers/net/wireless/ath/ath11k/debugfs_sta.h | 1 + drivers/net/wireless/ath/ath11k/dp.c | 2 +- drivers/net/wireless/ath/ath11k/dp.h | 2 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 1 + drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +- drivers/net/wireless/ath/ath11k/dp_tx.h | 1 + drivers/net/wireless/ath/ath11k/hal.c | 2 +- drivers/net/wireless/ath/ath11k/hal.h | 2 +- drivers/net/wireless/ath/ath11k/hal_desc.h | 1 + drivers/net/wireless/ath/ath11k/hal_rx.c | 1 + drivers/net/wireless/ath/ath11k/hal_rx.h | 1 + drivers/net/wireless/ath/ath11k/hif.h | 1 + drivers/net/wireless/ath/ath11k/htc.c | 1 + drivers/net/wireless/ath/ath11k/htc.h | 1 + drivers/net/wireless/ath/ath11k/hw.c | 2 +- drivers/net/wireless/ath/ath11k/hw.h | 2 +- drivers/net/wireless/ath/ath11k/mac.h | 1 + drivers/net/wireless/ath/ath11k/mhi.c | 2 +- drivers/net/wireless/ath/ath11k/mhi.h | 1 + drivers/net/wireless/ath/ath11k/pcic.c | 2 +- drivers/net/wireless/ath/ath11k/peer.c | 2 +- drivers/net/wireless/ath/ath11k/peer.h | 2 +- drivers/net/wireless/ath/ath11k/qmi.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.h | 2 +- drivers/net/wireless/ath/ath11k/reg.c | 1 + drivers/net/wireless/ath/ath11k/reg.h | 1 + drivers/net/wireless/ath/ath11k/rx_desc.h | 1 + drivers/net/wireless/ath/ath11k/spectral.c | 1 + drivers/net/wireless/ath/ath11k/spectral.h | 1 + drivers/net/wireless/ath/ath11k/thermal.c | 1 + drivers/net/wireless/ath/ath11k/thermal.h | 1 + drivers/net/wireless/ath/ath11k/trace.h | 1 + drivers/net/wireless/ath/ath11k/wmi.c | 2 +- drivers/net/wireless/ath/ath11k/wmi.h | 2 +- drivers/net/wireless/ath/ath11k/wow.h | 1 + 46 files changed, 46 insertions(+), 19 deletions(-)
drivers/net/wireless/ath/ath11k/ce.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "dp_rx.h"
drivers/net/wireless/ath/ath11k/ce.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_CE_H
drivers/net/wireless/ath/ath11k/dbring.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
drivers/net/wireless/ath/ath11k/dbring.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DBRING_H
drivers/net/wireless/ath/ath11k/debug.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/vmalloc.h>
drivers/net/wireless/ath/ath11k/debug.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _ATH11K_DEBUG_H_
drivers/net/wireless/ath/ath11k/debugfs.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/vmalloc.h>
drivers/net/wireless/ath/ath11k/debugfs.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _ATH11K_DEBUGFS_H_
drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/vmalloc.h>
drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef DEBUG_HTT_STATS_H
drivers/net/wireless/ath/ath11k/debugfs_sta.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/vmalloc.h>
drivers/net/wireless/ath/ath11k/debugfs_sta.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _ATH11K_DEBUGFS_STA_H_
drivers/net/wireless/ath/ath11k/dp.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <crypto/hash.h>
drivers/net/wireless/ath/ath11k/dp.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DP_H
drivers/net/wireless/ath/ath11k/dp_rx.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/ieee80211.h>
drivers/net/wireless/ath/ath11k/dp_tx.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
drivers/net/wireless/ath/ath11k/dp_tx.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021, 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DP_TX_H
drivers/net/wireless/ath/ath11k/hal.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/dma-mapping.h> #include "hal_tx.h"
drivers/net/wireless/ath/ath11k/hal.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_HAL_H
drivers/net/wireless/ath/ath11k/hal_desc.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
drivers/net/wireless/ath/ath11k/hal_rx.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "debug.h"
drivers/net/wireless/ath/ath11k/hal_rx.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_HAL_RX_H
drivers/net/wireless/ath/ath11k/hif.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _HIF_H_
drivers/net/wireless/ath/ath11k/htc.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/skbuff.h> #include <linux/ctype.h>
drivers/net/wireless/ath/ath11k/htc.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_HTC_H
drivers/net/wireless/ath/ath11k/hw.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. -* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/types.h>
drivers/net/wireless/ath/ath11k/hw.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_HW_H
drivers/net/wireless/ath/ath11k/mac.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_MAC_H
drivers/net/wireless/ath/ath11k/mhi.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2020 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/msi.h>
drivers/net/wireless/ath/ath11k/mhi.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _ATH11K_MHI_H#define _ATH11K_MHI_H
drivers/net/wireless/ath/ath11k/pcic.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
drivers/net/wireless/ath/ath11k/peer.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
drivers/net/wireless/ath/ath11k/peer.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_PEER_H
drivers/net/wireless/ath/ath11k/qmi.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/elf.h>
drivers/net/wireless/ath/ath11k/qmi.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_QMI_H
drivers/net/wireless/ath/ath11k/reg.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/rtnetlink.h>
drivers/net/wireless/ath/ath11k/reg.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_REG_H
drivers/net/wireless/ath/ath11k/rx_desc.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_RX_DESC_H #define ATH11K_RX_DESC_H
drivers/net/wireless/ath/ath11k/spectral.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/relay.h>
drivers/net/wireless/ath/ath11k/spectral.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_SPECTRAL_H
drivers/net/wireless/ath/ath11k/thermal.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/device.h>
drivers/net/wireless/ath/ath11k/thermal.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _ATH11K_THERMAL_
drivers/net/wireless/ath/ath11k/trace.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ )
drivers/net/wireless/ath/ath11k/wmi.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021, 2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/skbuff.h> #include <linux/ctype.h>
drivers/net/wireless/ath/ath11k/wmi.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_WMI_H
drivers/net/wireless/ath/ath11k/wow.h +1 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2020 The Linux Foundation. All rights reserved. +* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _WOW_H_
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 120/568 wifi: ath11k: fix wrong definition of CE rings base address
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 5714e25f1d1875b300fb337dadfaa75324c1161a ]
Base address of CE ring is defined as u32, currently this works because coherent DMA mask configured as 32 bit:
#define ATH11K_PCI_COHERENT_DMA_MASK 32
However this mask could be changed once firmware bugs are fixed to fully support 36 bit DMA addressing. So to protect against any future changes to the DMA mask, change the type of the fields that are dependent upon it.
This is found during code review. Compile tested only.
--- drivers/net/wireless/ath/ath11k/ce.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/ce.h +3 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_CE_H
@@ -146,7 +146,7 @@ struct ath11k_ce_ring {/* Host address space */ void *base_addr_owner_space_unaligned;/* CE address space */ -u32 base_addr_ce_space_unaligned; +dma_addr_t base_addr_ce_space_unaligned;/* Actual start of descriptors. * Aligned to descriptor-size boundary.
@@ -156,7 +156,7 @@ struct ath11k_ce_ring {void *base_addr_owner_space;/* CE address space */ -u32 base_addr_ce_space; +dma_addr_t base_addr_ce_space;/* HAL ring id */ u32 hal_ring_id;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 121/568 wifi: ath12k: fix wrong definition of CE rings base address
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 0ae570703754858a77cc42b3c9fff42e9f084608 ]
Base address of CE ring is defined as u32, currently this works because DMA mask configured as 32 bit:
#define ATH12K_PCI_DMA_MASK 32
However this mask could be changed once firmware bugs are fixed to fully support 36 bit DMA addressing. So to protect against any future changes to the DMA mask, change the type of the fields that are dependent upon it.
This is found during code review. Compile tested only.
--- drivers/net/wireless/ath/ath12k/ce.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/ce.h +3 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_CE_H
@@ -119,7 +119,7 @@ struct ath12k_ce_ring {/* Host address space */ void *base_addr_owner_space_unaligned;/* CE address space */ -u32 base_addr_ce_space_unaligned; +dma_addr_t base_addr_ce_space_unaligned;/* Actual start of descriptors. * Aligned to descriptor-size boundary.
@@ -129,7 +129,7 @@ struct ath12k_ce_ring {void *base_addr_owner_space;/* CE address space */ -u32 base_addr_ce_space; +dma_addr_t base_addr_ce_space;/* HAL ring id */ u32 hal_ring_id;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 122/568 tcp: add tcp_done_with_error() helper
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 5e514f1cba090e1c8fff03e92a175eccfe46305f ]
tcp_reset() ends with a sequence that is carefuly ordered.
We need to fix [e]poll bugs in the following patches, it makes sense to use a common helper.
Stable-dep-of: 853c3bd7b791 ("tcp: fix race in tcp_write_err()")
--- include/net/tcp.h | 1 + net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 32 +++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 12 deletions(-)
include/net/tcp.h +1 -0
@@ -624,6 +624,7 @@ void tcp_skb_collapse_tstamp(struct sk_buff *skb,/* tcp_input.c */ void tcp_rearm_rto (struct sock *sk);void tcp_synack_rtt_meas (struct sock *sk,struct request_sock *req); +void tcp_done_with_error (struct sock *sk,int err);void tcp_reset (struct sock *sk,struct sk_buff *skb);void tcp_fin (struct sock *sk);void tcp_check_space (struct sock *sk);
net/ipv4/tcp.c +1 -1
@@ -591,7 +591,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)*/ mask |=EPOLLOUT |EPOLLWRNORM ; } -/* This barrier is coupled with smp_wmb() in tcp_reset() */ +/* This barrier is coupled with smp_wmb() in tcp_done_with_error() */ smp_rmb ();if (READ_ONCE (sk->sk_err) || !skb_queue_empty_lockless (&sk->sk_error_queue))
net/ipv4/tcp_input.c +21 -11
@@ -4367,9 +4367,26 @@ static enum skb_drop_reason tcp_sequence(const struct tcp_sock *tp,return SKB_NOT_DROPPED_YET ; } + +void tcp_done_with_error (struct sock *sk,int err) +{ +/* This barrier is coupled with smp_rmb() in tcp_poll() */ +WRITE_ONCE (sk->sk_err, err); +smp_wmb (); + +tcp_write_queue_purge (sk); +tcp_done (sk); + +if (!sock_flag (sk,SOCK_DEAD )) +sk_error_report (sk); +} +EXPORT_SYMBOL (tcp_done_with_error); +/* When we get a reset we do this. */ void tcp_reset (struct sock *sk,struct sk_buff *skb) { +int err; +trace_tcp_receive_reset (sk);/* mptcp can't tell us to ignore reset pkts,
@@ -4381,24 +4398,17 @@ void tcp_reset(struct sock *sk, struct sk_buff *skb)/* We want the right error as BSD sees it (and indeed as we do). */ switch (sk->sk_state) {case TCP_SYN_SENT : -WRITE_ONCE (sk->sk_err,ECONNREFUSED ); + err =ECONNREFUSED ;break ;case TCP_CLOSE_WAIT : -WRITE_ONCE (sk->sk_err,EPIPE ); + err =EPIPE ;break ;case TCP_CLOSE :return ;default : -WRITE_ONCE (sk->sk_err,ECONNRESET ); + err =ECONNRESET ; } -/* This barrier is coupled with smp_rmb() in tcp_poll() */ -smp_wmb (); - -tcp_write_queue_purge (sk); -tcp_done (sk); - -if (!sock_flag (sk,SOCK_DEAD )) -sk_error_report (sk); +tcp_done_with_error (sk, err); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 123/568 tcp: fix race in tcp_write_err()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 853c3bd7b7917670224c9fe5245bd045cac411dd ]
I noticed flakes in a packetdrill test, expecting an epoll_wait() to return EPOLLERR | EPOLLHUP on a failed connect() attempt, after multiple SYN retransmits. It sometimes return EPOLLERR only.
The issue is that tcp_write_err():
1) writes an error in sk->sk_err,
2) calls sk_error_report(),
3) then calls tcp_done().
tcp_done() is writing SHUTDOWN_MASK into sk->sk_shutdown, among other things.
Problem is that the awaken user thread (from 2) sk_error_report()) might call tcp_poll() before tcp_done() has written sk->sk_shutdown.
tcp_poll() only sees a non zero sk->sk_err and returns EPOLLERR.
This patch fixes the issue by making sure to call sk_error_report() after tcp_done().
tcp_write_err() also lacks an smp_wmb().
We can reuse tcp_done_with_error() to factor out the details, as Neal suggested.
--- net/ipv4/tcp_timer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
net/ipv4/tcp_timer.c +1 -5
@@ -69,11 +69,7 @@ u32 tcp_clamp_probe0_to_user_timeout(const struct sock *sk, u32 when)static void tcp_write_err (struct sock *sk) { -WRITE_ONCE (sk->sk_err,READ_ONCE (sk->sk_err_soft) ? :ETIMEDOUT ); -sk_error_report (sk); - -tcp_write_queue_purge (sk); -tcp_done (sk); +tcp_done_with_error (sk,READ_ONCE (sk->sk_err_soft) ? :ETIMEDOUT );__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONTIMEOUT ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 124/568 tcp: fix races in tcp_v[46]_err()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit fde6f897f2a184546bf5516ac736523ef24dc6a7 ]
These functions have races when they:
1) Write sk->sk_err
2) call sk_error_report(sk)
3) call tcp_done(sk)
As described in prior patches in this series:
An smp_wmb() is missing.
We should call tcp_done() before sk_error_report(sk) to have consistent tcp_poll() results on SMP hosts.
Use tcp_done_with_error() where we centralized the correct sequence.
--- net/ipv4/tcp_ipv4.c | 11 +++-------- net/ipv6/tcp_ipv6.c | 10 +++------- 2 files changed, 6 insertions(+), 15 deletions(-)
net/ipv4/tcp_ipv4.c +3 -8
@@ -602,15 +602,10 @@ int tcp_v4_err(struct sk_buff *skb, u32 info)ip_icmp_error (sk, skb, err, th->dest, info, (u8 *)th); -if (!sock_owned_by_user (sk)) { -WRITE_ONCE (sk->sk_err, err); - -sk_error_report (sk); - -tcp_done (sk); - }else { +if (!sock_owned_by_user (sk)) +tcp_done_with_error (sk, err); +else WRITE_ONCE (sk->sk_err_soft, err); - } goto out; }
net/ipv6/tcp_ipv6.c +3 -7
@@ -488,14 +488,10 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,ipv6_icmp_error (sk, skb, err, th->dest,ntohl (info), (u8 *)th); -if (!sock_owned_by_user (sk)) { -WRITE_ONCE (sk->sk_err, err); -sk_error_report (sk);/* Wake people up to see the error (see connect in sock.c) */ - -tcp_done (sk); - }else { +if (!sock_owned_by_user (sk)) +tcp_done_with_error (sk, err); +else WRITE_ONCE (sk->sk_err_soft, err); - } goto out;case TCP_LISTEN :break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 125/568 net/smc: set rmbs SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangguan Wang <[email protected]>
[ Upstream commit 3ac14b9dfbd345e891d48d89f6c2fa519848f0f4 ]
SG_MAX_SINGLE_ALLOC is used to limit maximum number of entries that will be allocated in one piece of scatterlist. When the entries of scatterlist exceeds SG_MAX_SINGLE_ALLOC, sg chain will be used. From commit 7c703e54cc71 ("arch: switch the default on ARCH_HAS_SG_CHAIN"), we can know that the macro CONFIG_ARCH_NO_SG_CHAIN is used to identify whether sg chain is supported. So, SMC-R's rmb buffer should be limited by SG_MAX_SINGLE_ALLOC only when the macro CONFIG_ARCH_NO_SG_CHAIN is defined.
--- net/smc/smc_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/smc/smc_core.c +3 -2
@@ -1974,7 +1974,6 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini)*/ static u8 smc_compress_bufsize (int size,bool is_smcd,bool is_rmb) { -const unsigned int max_scat =SG_MAX_SINGLE_ALLOC *PAGE_SIZE ;u8 compressed;if (size <=SMC_BUF_MIN_SIZE )
@@ -1984,9 +1983,11 @@ static u8 smc_compress_bufsize(int size, bool is_smcd, bool is_rmb) compressed =min_t (u8,ilog2 (size) +1 , is_smcd ?SMCD_DMBE_SIZES :SMCR_RMBE_SIZES ); +#ifdef CONFIG_ARCH_NO_SG_CHAIN if (!is_smcd && is_rmb)/* RMBs are backed by & limited to max size of scatterlists */ - compressed =min_t (u8, compressed,ilog2 (max_scat >>14 )); + compressed =min_t (u8, compressed,ilog2 ((SG_MAX_SINGLE_ALLOC *PAGE_SIZE ) >>14 )); +#endif return compressed; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 126/568 selftests/bpf: Check length of recv in test_sockmap
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit de1b5ea789dc28066cc8dc634b6825bd6148f38b ]
The value of recv in msg_loop may be negative, like EWOULDBLOCK, so it's necessary to check if it is positive before accumulating it to bytes_recvd.
--- tools/testing/selftests/bpf/test_sockmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/test_sockmap.c +2 -1
@@ -680,7 +680,8 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt, } } - s->bytes_recvd += recv; +if (recv >0 ) + s->bytes_recvd += recv;if (opt->check_recved_len && s->bytes_recvd > total_bytes) { errno =EMSGSIZE ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 127/568 udf: Fix lock ordering in udf_evict_inode()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 8832fc1e502687869606bb0a7b79848ed3bf036f ]
udf_evict_inode() calls udf_setsize() to truncate deleted inode. However inode deletion through udf_evict_inode() can happen from inode reclaim context and udf_setsize() grabs mapping->invalidate_lock which isn't generally safe to acquire from fs reclaim context since we allocate pages under mapping->invalidate_lock for example in a page fault path. This is however not a real deadlock possibility as by the time udf_evict_inode() is called, nobody can be accessing the inode, even less work with its page cache. So this is just a lockdep triggering false positive. Fix the problem by moving mapping->invalidate_lock locking outsize of udf_setsize() into udf_setattr() as grabbing mapping->invalidate_lock from udf_evict_inode() is pointless.
--- fs/udf/file.c | 2 ++ fs/udf/inode.c | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-)
fs/udf/file.c +2 -0
@@ -232,7 +232,9 @@ static int udf_setattr(struct mnt_idmap *idmap, struct dentry *dentry,if ((attr->ia_valid &ATTR_SIZE ) && attr->ia_size !=i_size_read (inode)) { +filemap_invalidate_lock (inode->i_mapping); error =udf_setsize (inode, attr->ia_size); +filemap_invalidate_unlock (inode->i_mapping);if (error)return error; }
fs/udf/inode.c +4 -7
@@ -1252,7 +1252,6 @@ int udf_setsize(struct inode *inode, loff_t newsize)if (IS_APPEND (inode) ||IS_IMMUTABLE (inode))return -EPERM ; -filemap_invalidate_lock (inode->i_mapping); iinfo =UDF_I (inode);if (newsize > inode->i_size) {if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_IN_ICB ) {
@@ -1265,11 +1264,11 @@ int udf_setsize(struct inode *inode, loff_t newsize) } err =udf_expand_file_adinicb (inode);if (err) - goto out_unlock; +return err; } err =udf_extend_file (inode, newsize);if (err) - goto out_unlock; +return err; set_size:truncate_setsize (inode, newsize); }else {
@@ -1287,14 +1286,14 @@ int udf_setsize(struct inode *inode, loff_t newsize) err =block_truncate_page (inode->i_mapping, newsize, udf_get_block);if (err) - goto out_unlock; +return err;truncate_setsize (inode, newsize);down_write (&iinfo->i_data_sem);udf_clear_extent_cache (inode); err =udf_truncate_extents (inode);up_write (&iinfo->i_data_sem);if (err) - goto out_unlock; +return err; } update_time: inode->i_mtime =inode_set_ctime_current (inode);
@@ -1302,8 +1301,6 @@ int udf_setsize(struct inode *inode, loff_t newsize)udf_sync_inode (inode); elsemark_inode_dirty (inode ); -out_unlock: -filemap_invalidate_unlock (inode->i_mapping);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 128/568 lib: objagg: Fix general protection fault
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit b4a3a89fffcdf09702b1f161b914e52abca1894d ]
The library supports aggregation of objects into other objects only if the parent object does not have a parent itself. That is, nesting is not supported.
Aggregation happens in two cases: Without and with hints, where hints are a pre-computed recommendation on how to aggregate the provided objects.
Nesting is not possible in the first case due to a check that prevents it, but in the second case there is no check because the assumption is that nesting cannot happen when creating objects based on hints. The violation of this assumption leads to various warnings and eventually to a general protection fault [1].
Before fixing the root cause, error out when nesting happens and warn.
[1]
general protection fault, probably for non-canonical address 0xdead000000000d90: 0000 [#1] PREEMPT SMP PTI CPU: 1 PID: 1083 Comm: kworker/1:9 Tainted: G W 6.9.0-rc6-custom-gd9b4f1cca7fb #7 Hardware name: Mellanox Technologies Ltd. MSN3700/VMOD0005, BIOS 5.11 01/06/2019 Workqueue: mlxsw_core mlxsw_sp_acl_tcam_vregion_rehash_work RIP: 0010:mlxsw_sp_acl_erp_bf_insert+0x25/0x80 [...] Call Trace: <TASK> mlxsw_sp_acl_atcam_entry_add+0x256/0x3c0 mlxsw_sp_acl_tcam_entry_create+0x5e/0xa0 mlxsw_sp_acl_tcam_vchunk_migrate_one+0x16b/0x270 mlxsw_sp_acl_tcam_vregion_rehash_work+0xbe/0x510 process_one_work+0x151/0x370 worker_thread+0x2cb/0x3e0 kthread+0xd0/0x100 ret_from_fork+0x34/0x50 ret_from_fork_asm+0x1a/0x30 </TASK>
--- lib/objagg.c | 3 +++ 1 file changed, 3 insertions(+)
lib/objagg.c +3 -0
@@ -167,6 +167,9 @@ static int objagg_obj_parent_assign(struct objagg *objagg, {void *delta_priv; +if (WARN_ON (!objagg_obj_is_root (parent))) +return -EINVAL ; + delta_priv = objagg->ops->delta_create (objagg->priv, parent->obj, objagg_obj->obj);if (IS_ERR (delta_priv))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 129/568 mlxsw: spectrum_acl_erp: Fix object nesting warning
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 97d833ceb27dc19f8777d63f90be4a27b5daeedf ]
ACLs in Spectrum-2 and newer ASICs can reside in the algorithmic TCAM (A-TCAM) or in the ordinary circuit TCAM (C-TCAM). The former can contain more ACLs (i.e., tc filters), but the number of masks in each region (i.e., tc chain) is limited.
In order to mitigate the effects of the above limitation, the device allows filters to share a single mask if their masks only differ in up to 8 consecutive bits. For example, dst_ip/25 can be represented using dst_ip/24 with a delta of 1 bit. The C-TCAM does not have a limit on the number of masks being used (and therefore does not support mask aggregation), but can contain a limited number of filters.
The driver uses the "objagg" library to perform the mask aggregation by passing it objects that consist of the filter's mask and whether the filter is to be inserted into the A-TCAM or the C-TCAM since filters in different TCAMs cannot share a mask.
The set of created objects is dependent on the insertion order of the filters and is not necessarily optimal. Therefore, the driver will periodically ask the library to compute a more optimal set ("hints") by looking at all the existing objects.
When the library asks the driver whether two objects can be aggregated the driver only compares the provided masks and ignores the A-TCAM / C-TCAM indication. This is the right thing to do since the goal is to move as many filters as possible to the A-TCAM. The driver also forbids two identical masks from being aggregated since this can only happen if one was intentionally put in the C-TCAM to avoid a conflict in the A-TCAM.
The above can result in the following set of hints:
H1: {mask X, A-TCAM} -> H2: {mask Y, A-TCAM} // X is Y + delta
H3: {mask Y, C-TCAM} -> H4: {mask Z, A-TCAM} // Y is Z + delta
After getting the hints from the library the driver will start migrating filters from one region to another while consulting the computed hints and instructing the device to perform a lookup in both regions during the transition.
Assuming a filter with mask X is being migrated into the A-TCAM in the new region, the hints lookup will return H1. Since H2 is the parent of H1, the library will try to find the object associated with it and create it if necessary in which case another hints lookup (recursive) will be performed. This hints lookup for {mask Y, A-TCAM} will either return H2 or H3 since the driver passes the library an object comparison function that ignores the A-TCAM / C-TCAM indication.
This can eventually lead to nested objects which are not supported by the library [1].
Fix by removing the object comparison function from both the driver and the library as the driver was the only user. That way the lookup will only return exact matches.
I do not have a reliable reproducer that can reproduce the issue in a timely manner, but before the fix the issue would reproduce in several minutes and with the fix it does not reproduce in over an hour.
Note that the current usefulness of the hints is limited because they include the C-TCAM indication and represent aggregation that cannot actually happen. This will be addressed in net-next.
[1]
WARNING: CPU: 0 PID: 153 at lib/objagg.c:170 objagg_obj_parent_assign+0xb5/0xd0 Modules linked in: CPU: 0 PID: 153 Comm: kworker/0:18 Not tainted 6.9.0-rc6-custom-g70fbc2c1c38b #42 Hardware name: Mellanox Technologies Ltd. MSN3700C/VMOD0008, BIOS 5.11 10/10/2018 Workqueue: mlxsw_core mlxsw_sp_acl_tcam_vregion_rehash_work RIP: 0010:objagg_obj_parent_assign+0xb5/0xd0 [...] Call Trace: <TASK> __objagg_obj_get+0x2bb/0x580 objagg_obj_get+0xe/0x80 mlxsw_sp_acl_erp_mask_get+0xb5/0xf0 mlxsw_sp_acl_atcam_entry_add+0xe8/0x3c0 mlxsw_sp_acl_tcam_entry_create+0x5e/0xa0 mlxsw_sp_acl_tcam_vchunk_migrate_one+0x16b/0x270 mlxsw_sp_acl_tcam_vregion_rehash_work+0xbe/0x510 process_one_work+0x151/0x370
--- .../ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 ------------- include/linux/objagg.h | 1 - lib/objagg.c | 15 --------------- 3 files changed, 29 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c +0 -13
@@ -1217,18 +1217,6 @@ static bool mlxsw_sp_acl_erp_delta_check(void *priv, const void *parent_obj,return err ? false : true; } -static int mlxsw_sp_acl_erp_hints_obj_cmp (const void *obj1,const void *obj2) -{ -const struct mlxsw_sp_acl_erp_key *key1 = obj1; -const struct mlxsw_sp_acl_erp_key *key2 = obj2; - -/* For hints purposes, two objects are considered equal -* in case the masks are the same. Does not matter what -* the "ctcam" value is. -*/ -return memcmp (key1->mask, key2->mask,sizeof (key1->mask)); -} -static void *mlxsw_sp_acl_erp_delta_create (void *priv,void *parent_obj,void *obj) {
@@ -1308,7 +1296,6 @@ static void mlxsw_sp_acl_erp_root_destroy(void *priv, void *root_priv)static const struct objagg_ops mlxsw_sp_acl_erp_objagg_ops = { .obj_size =sizeof (struct mlxsw_sp_acl_erp_key ), .delta_check = mlxsw_sp_acl_erp_delta_check, - .hints_obj_cmp = mlxsw_sp_acl_erp_hints_obj_cmp, .delta_create = mlxsw_sp_acl_erp_delta_create, .delta_destroy = mlxsw_sp_acl_erp_delta_destroy, .root_create = mlxsw_sp_acl_erp_root_create,
include/linux/objagg.h +0 -1
@@ -8,7 +8,6 @@ struct objagg_ops {size_t obj_size;bool (*delta_check)(void *priv,const void *parent_obj,const void *obj); -int (*hints_obj_cmp)(const void *obj1,const void *obj2);void * (*delta_create)(void *priv,void *parent_obj,void *obj);void (*delta_destroy)(void *priv,void *delta_priv);void * (*root_create)(void *priv,void *obj,unsigned int root_id);
lib/objagg.c +0 -15
@@ -906,20 +906,6 @@ static const struct objagg_opt_algo *objagg_opt_algos[] = { [OBJAGG_OPT_ALGO_SIMPLE_GREEDY] = &objagg_opt_simple_greedy, }; -static int objagg_hints_obj_cmp (struct rhashtable_compare_arg *arg, -const void *obj) -{ -struct rhashtable *ht = arg->ht; -struct objagg_hints *objagg_hints = - container_of(ht, struct objagg_hints, node_ht); -const struct objagg_ops *ops = objagg_hints->ops; -const char *ptr = obj; - - ptr += ht->p.key_offset; -return ops->hints_obj_cmp ? ops->hints_obj_cmp (ptr, arg->key) : -memcmp (ptr, arg->key, ht->p.key_len); -} -/** * objagg_hints_get - obtains hints instance * @objagg: objagg instance
@@ -958,7 +944,6 @@ struct objagg_hints *objagg_hints_get(struct objagg *objagg, offsetof(struct objagg_hints_node , obj); objagg_hints->ht_params.head_offset = offsetof(struct objagg_hints_node , ht_node); - objagg_hints->ht_params.obj_cmpfn = objagg_hints_obj_cmp; err =rhashtable_init (&objagg_hints->node_ht, &objagg_hints->ht_params);if (err)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 130/568 mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 75d8d7a63065b18df9555dbaab0b42d4c6f20943 ]
ACLs that reside in the algorithmic TCAM (A-TCAM) in Spectrum-2 and newer ASICs can share the same mask if their masks only differ in up to 8 consecutive bits. For example, consider the following filters:
# tc filter add dev swp1 ingress pref 1 proto ip flower dst_ip 192.0.2.0/24 action drop # tc filter add dev swp1 ingress pref 1 proto ip flower dst_ip 198.51.100.128/25 action drop
The second filter can use the same mask as the first (dst_ip/24) with a delta of 1 bit.
However, the above only works because the two filters have different values in the common unmasked part (dst_ip/24). When entries have the same value in the common unmasked part they create undesired collisions in the device since many entries now have the same key. This leads to firmware errors such as [1] and to a reduced scale.
Fix by adjusting the hash table key to only include the value in the common unmasked part. That is, without including the delta bits. That way the driver will detect the collision during filter insertion and spill the filter into the circuit TCAM (C-TCAM).
Add a test case that fails without the fix and adjust existing cases that check C-TCAM spillage according to the above limitation.
[1]mlxsw_spectrum2 0000:06:00.0: EMAD reg access failed (tid=3379b18a00003394,reg_id=3027(ptce3),type=write,status=8(resource not available))
--- .../mellanox/mlxsw/spectrum_acl_atcam.c | 18 +++--- .../mlxsw/spectrum_acl_bloom_filter.c | 2 +- .../mellanox/mlxsw/spectrum_acl_tcam.h | 9 +-- .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +++++++++++++++++-- 4 files changed, 63 insertions(+), 21 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c +8 -10
@@ -391,7 +391,8 @@ mlxsw_sp_acl_atcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp,if (err)return err; - lkey_id = aregion->ops->lkey_id_get (aregion, aentry->enc_key, erp_id); + lkey_id = aregion->ops->lkey_id_get (aregion, aentry->ht_key.enc_key, + erp_id);if (IS_ERR (lkey_id))return PTR_ERR (lkey_id); aentry->lkey_id = lkey_id;
@@ -399,7 +400,7 @@ mlxsw_sp_acl_atcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, kvdl_index =mlxsw_afa_block_first_kvdl_index (rulei->act_block); mlxsw_reg_ptce3_pack(ptce3_pl, true, MLXSW_REG_PTCE3_OP_WRITE_WRITE, priority, region->tcam_region_info, - aentry->enc_key, erp_id, + aentry->ht_key.enc_key, erp_id, aentry->delta_info.start, aentry->delta_info.mask, aentry->delta_info.value,
@@ -428,7 +429,7 @@ mlxsw_sp_acl_atcam_region_entry_remove(struct mlxsw_sp *mlxsw_sp, mlxsw_reg_ptce3_pack(ptce3_pl, false, MLXSW_REG_PTCE3_OP_WRITE_WRITE, 0, region->tcam_region_info, - aentry->enc_key, erp_id, + aentry->ht_key.enc_key, erp_id, aentry->delta_info.start, aentry->delta_info.mask, aentry->delta_info.value,
@@ -457,7 +458,7 @@ mlxsw_sp_acl_atcam_region_entry_action_replace(struct mlxsw_sp *mlxsw_sp, kvdl_index =mlxsw_afa_block_first_kvdl_index (rulei->act_block); mlxsw_reg_ptce3_pack(ptce3_pl, true, MLXSW_REG_PTCE3_OP_WRITE_UPDATE, priority, region->tcam_region_info, - aentry->enc_key, erp_id, + aentry->ht_key.enc_key, erp_id, aentry->delta_info.start, aentry->delta_info.mask, aentry->delta_info.value,
@@ -480,15 +481,13 @@ __mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp,int err;mlxsw_afk_encode (afk, region->key_info, &rulei->values, - aentry->ht_key.full_enc_key, mask); + aentry->ht_key.enc_key, mask); erp_mask =mlxsw_sp_acl_erp_mask_get (aregion, mask, false);if (IS_ERR (erp_mask))return PTR_ERR (erp_mask); aentry->erp_mask = erp_mask; aentry->ht_key.erp_id =mlxsw_sp_acl_erp_mask_erp_id (erp_mask); -memcpy (aentry->enc_key, aentry->ht_key.full_enc_key, -sizeof (aentry->enc_key));/* Compute all needed delta information and clear the delta bits * from the encrypted key.
@@ -497,9 +496,8 @@ __mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp, aentry->delta_info.start =mlxsw_sp_acl_erp_delta_start (delta); aentry->delta_info.mask =mlxsw_sp_acl_erp_delta_mask (delta); aentry->delta_info.value = -mlxsw_sp_acl_erp_delta_value (delta, - aentry->ht_key.full_enc_key); -mlxsw_sp_acl_erp_delta_clear (delta, aentry->enc_key); +mlxsw_sp_acl_erp_delta_value (delta, aentry->ht_key.enc_key); +mlxsw_sp_acl_erp_delta_clear (delta, aentry->ht_key.enc_key);/* Add rule to the list of A-TCAM rules, assuming this * rule is intended to A-TCAM. In case this rule does
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c +1 -1
@@ -249,7 +249,7 @@ __mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion,memcpy (chunk + pad_bytes, &erp_region_id,sizeof (erp_region_id));memcpy (chunk + key_offset, - &aentry->enc_key[chunk_key_offsets[chunk_index]], + &aentry->ht_key.enc_key[chunk_key_offsets[chunk_index]], chunk_key_len); chunk += chunk_len; }
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h +3 -6
@@ -167,9 +167,9 @@ struct mlxsw_sp_acl_atcam_region { };struct mlxsw_sp_acl_atcam_entry_ht_key { -char full_enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN ];/* Encoded -* key. -*/ +char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN ];/* Encoded key, minus +* delta bits. +*/ u8 erp_id; };
@@ -181,9 +181,6 @@ struct mlxsw_sp_acl_atcam_entry {struct rhash_head ht_node;struct list_head list;/* Member in entries_list */ struct mlxsw_sp_acl_atcam_entry_ht_key ht_key; -char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN ];/* Encoded key, -* minus delta bits. -*/ struct {u16 start;u8 mask;
tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh +51 -4
79 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 131/568 perf/x86: Serialize set_attr_rdpmc()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit bb9bb45f746b0f9457de9c3fc4da143a6351bdc9 ]
Yue and Xingwei reported a jump label failure. It's caused by the lack of serialization in set_attr_rdpmc():
CPU0 CPU1
Assume: x86_pmu.attr_rdpmc == 0
if (val != x86_pmu.attr_rdpmc) {
if (val == 0)
...
else if (x86_pmu.attr_rdpmc == 0)
static_branch_dec(&rdpmc_never_available_key);
if (val != x86_pmu.attr_rdpmc) {
if (val == 0)
...
else if (x86_pmu.attr_rdpmc == 0)
FAIL, due to imbalance ---> static_branch_dec(&rdpmc_never_available_key);The reported BUG() is a consequence of the above and of another bug in the jump label core code. The core code needs a separate fix, but that cannot prevent the imbalance problem caused by set_attr_rdpmc().
Prevent this by serializing set_attr_rdpmc() locally.
--- arch/x86/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/events/core.c +3 -0
@@ -2547,6 +2547,7 @@ static ssize_t set_attr_rdpmc(struct device *cdev,struct device_attribute *attr, const char *buf, size_t count) { + static DEFINE_MUTEX(rdpmc_mutex);unsigned long val;ssize_t ret;
@@ -2560,6 +2561,8 @@ static ssize_t set_attr_rdpmc(struct device *cdev,if (x86_pmu.attr_rdpmc_broken)return -ENOTSUPP ; +guard (mutex)(&rdpmc_mutex); +if (val != x86_pmu.attr_rdpmc) {/* * Changing into or out of never available or always available,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/568 jump_label: Fix concurrency issues in static_key_slow_dec()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 83ab38ef0a0b2407d43af9575bb32333fdd74fb2 ]
The commit which tried to fix the concurrency issues of concurrent static_key_slow_inc() failed to fix the equivalent issues vs. static_key_slow_dec():
CPU0 CPU1
static_key_slow_dec()
static_key_slow_try_dec()
key->enabled == 1 val = atomic_fetch_add_unless(&key->enabled, -1, 1); if (val == 1) return false;
jump_label_lock();
if (atomic_dec_and_test(&key->enabled)) {
--> key->enabled == 0
__jump_label_update()static_key_slow_dec() static_key_slow_try_dec() key->enabled == 0 val = atomic_fetch_add_unless(&key->enabled, -1, 1); --> key->enabled == -1 <- FAIL
There is another bug in that code, when there is a concurrent static_key_slow_inc() which enables the key as that sets key->enabled to -1 so on the other CPU
val = atomic_fetch_add_unless(&key->enabled, -1, 1);
will succeed and decrement to -2, which is invalid.
Cure all of this by replacing the atomic_fetch_add_unless() with a atomic_try_cmpxchg() loop similar to static_key_fast_inc_not_disabled().
--- kernel/jump_label.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-)
kernel/jump_label.c +29 -16
@@ -131,7 +131,7 @@ bool static_key_fast_inc_not_disabled(struct static_key *key)STATIC_KEY_CHECK_USE (key);/* * Negative key->enabled has a special meaning: it sends -* static_key_slow_inc() down the slow path, and it is non-zero +* static_key_slow_inc/dec() down the slow path, and it is non-zero * so it counts as "enabled" in jump_label_update(). Note that * atomic_inc_unless_negative() checks >= 0, so roll our own. */
@@ -150,7 +150,7 @@ bool static_key_slow_inc_cpuslocked(struct static_key *key)lockdep_assert_cpus_held ();/* -* Careful if we get concurrent static_key_slow_inc() calls; +* Careful if we get concurrent static_key_slow_inc/dec() calls; * later calls must wait for the first one to _finish_ the * jump_label_update() process. At the same time, however, * the jump_label_update() call below wants to see
@@ -247,20 +247,32 @@ EXPORT_SYMBOL_GPL(static_key_disable);static bool static_key_slow_try_dec (struct static_key *key) { -int val; - - val =atomic_fetch_add_unless (&key->enabled,-1 ,1 ); -if (val ==1 ) -return false; +int v;/* -* The negative count check is valid even when a negative -* key->enabled is in use by static_key_slow_inc(); a -* __static_key_slow_dec() before the first static_key_slow_inc() -* returns is unbalanced, because all other static_key_slow_inc() -* instances block while the update is in progress. +* Go into the slow path if key::enabled is less than or equal than +* one. One is valid to shut down the key, anything less than one +* is an imbalance, which is handled at the call site. +* +* That includes the special case of '-1' which is set in +* static_key_slow_inc_cpuslocked(), but that's harmless as it is +* fully serialized in the slow path below. By the time this task +* acquires the jump label lock the value is back to one and the +* retry under the lock must succeed. */ -WARN (val <0 ,"jump label: negative count!\n" ); + v =atomic_read (&key->enabled); +do { +/* +* Warn about the '-1' case though; since that means a +* decrement is concurrent with a first (0->1) increment. IOW +* people are trying to disable something that wasn't yet fully +* enabled. This suggests an ordering problem on the user side. +*/ +WARN_ON_ONCE (v <0 ); +if (v <=1 ) +return false; + }while (!likely (atomic_try_cmpxchg (&key->enabled, &v, v -1 ))); +return true; }
@@ -271,10 +283,11 @@ static void __static_key_slow_dec_cpuslocked(struct static_key *key)if (static_key_slow_try_dec (key))return ; -jump_label_lock (); -if (atomic_dec_and_test (&key->enabled)) +guard (mutex)(&jump_label_mutex); +if (atomic_cmpxchg (&key->enabled,1 ,0 ))jump_label_update (key); -jump_label_unlock (); +else +WARN_ON_ONCE (!static_key_slow_try_dec (key)); }static void __static_key_slow_dec (struct static_key *key)
Signature · 1 line
2.43.0