6.12.53-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainercover 6.12.53-rc1 review
This is the start of the stable review cycle for the 6.12.53 release. There are 262 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 Wed, 15 Oct 2025 14:42:41 +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.12.53-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.12.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.12.53-rc1
Miaoqian Lin <[email protected]>
usb: cdns3: cdnsp-pci: remove redundant pci_disable_device() call
Konrad Dybcio <[email protected]>
arm64: dts: qcom: qcm2290: Disable USB SS bus instances in park mode
Sven Peter <[email protected]>
usb: typec: tipd: Clear interrupts first
Oleksij Rempel <[email protected]>
net: usb: asix: hold PM usage ref to avoid PM/MDIO + RTNL deadlock
Dominique Martinet <[email protected]>
net/9p: Fix buffer overflow in USB transport layer
Salah Triki <[email protected]>
bus: fsl-mc: Check return value of platform_get_resource()
Bartosz Golaszewski <[email protected]>
pinctrl: check the return value of pinmux_ops::get_function_name()
Jens Wiklander <[email protected]>
tee: fix register_shm_helper()
Zhen Ni <[email protected]>
remoteproc: pru: Fix potential NULL pointer dereference in pru_rproc_set_ctable()
Lei Lu <[email protected]>
sunrpc: fix null pointer dereference on zero-length checksum
Zhen Ni <[email protected]>
Input: uinput - zero-initialize uinput_ff_upload_compat to avoid info leak
Marek Vasut <[email protected]>
Input: atmel_mxt_ts - allow reset GPIO to sleep
Ling Xu <[email protected]>
misc: fastrpc: Skip reference for DMA handles
Ling Xu <[email protected]>
misc: fastrpc: fix possible map leak in fastrpc_put_args
Ling Xu <[email protected]>
misc: fastrpc: Fix fastrpc_map_lookup operation
Ling Xu <[email protected]>
misc: fastrpc: Save actual DMA size in fastrpc_map structure
Guangshuo Li <[email protected]>
nvdimm: ndtest: Return -ENOMEM if devm_kcalloc() fails in ndtest_probe()
Yang Shi <[email protected]>
mm: hugetlb: avoid soft lockup when mprotect to large memory area
Janne Grunau <[email protected]>
fbdev: simplefb: Fix use after free in simplefb_detach_genpds()
Sean Christopherson <[email protected]>
KVM: SVM: Skip fastpath emulation on VM-Exit if next RIP isn't valid
Jan Kara <[email protected]>
ext4: fix checks for orphan inodes
Namjae Jeon <[email protected]>
ksmbd: add max ip connections parameter
Matvey Kovalev <[email protected]>
ksmbd: fix error code overwriting in smb2_get_info_filesystem()
Yunseong Kim <[email protected]>
ksmbd: Fix race condition in RPC handle list access
Youling Tang <[email protected]>
LoongArch: Automatically disable kaslr if boot from kexec_file
Zheng Qixing <[email protected]>
dm: fix NULL pointer dereference in __dm_suspend()
Zheng Qixing <[email protected]>
dm: fix queue start/stop imbalance under suspend/load/resume races
Bartosz Golaszewski <[email protected]>
mfd: vexpress-sysreg: Check the return value of devm_gpiochip_add_data()
Cosmin Tanislav <[email protected]>
mfd: rz-mtu3: Fix MTU5 NFCR register offset
Deepak Sharma <[email protected]>
net: nfc: nci: Add parameter validation for packet data
Larshin Sergey <[email protected]>
fs: udf: fix OOB read in lengthAllocDescs handling
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd937x: make stub functions inline
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd937x: set the comp soundwire port correctly
Ranjani Sridharan <[email protected]>
ASoC: SOF: ipc3-topology: Fix multi-core and static pipelines tear down
Ma Ke <[email protected]>
ASoC: wcd934x: fix error handling in wcd934x_codec_parse_data()
Jens Axboe <[email protected]>
io_uring/waitid: always prune wait queue entry in io_waitid_wait()
Naman Jain <[email protected]>
uio_hv_generic: Let userspace take care of interrupt mask
Phillip Lougher <[email protected]>
Squashfs: fix uninit-value in squashfs_get_parent
Jarkko Sakkinen <[email protected]>
tpm: Disable TPM2_TCG_HMAC by default
Yazhou Tang <[email protected]>
bpf: Reject negative offsets for ALU ops
zhang jiao <[email protected]>
vhost: vringh: Modify the return value check
Jakub Kicinski <[email protected]>
Revert "net/mlx5e: Update and set Xon/Xoff upon MTU set"
Enzo Matsumiya <[email protected]>
smb: client: fix crypto buffers in non-linear memory
Moshe Shemesh <[email protected]>
net/mlx5: fw reset, add reset timeout work
Shay Drory <[email protected]>
net/mlx5: pagealloc: Fix reclaim race during command interface teardown
Moshe Shemesh <[email protected]>
net/mlx5: Stop polling for command response if interface goes down
Yeounsu Moon <[email protected]>
net: dlink: handle copy_thresh allocation failure
Kohei Enju <[email protected]>
net: ena: return 0 in ena_get_rxfh_key_size() when RSS hash key is not configurable
Kohei Enju <[email protected]>
nfp: fix RSS hash key size when RSS is not supported
Alok Tiwari <[email protected]>
idpf: fix mismatched free function for dma_alloc_coherent
Alok Tiwari <[email protected]>
PCI: j721e: Fix incorrect error message in probe()
Erick Karanja <[email protected]>
mtd: rawnand: atmel: Fix error handling path in atmel_nand_controller_add_nands
Donet Tom <[email protected]>
drivers/base/node: fix double free in register_one_node()
Dan Carpenter <[email protected]>
ocfs2: fix double free in user_cluster_connect()
Nishanth Menon <[email protected]>
hwrng: ks-sa - fix division by zero in ks_sa_rng_init
Fan Wu <[email protected]>
KEYS: X.509: Fix Basic Constraints CA flag parsing
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_sync: Fix using random address for BIG/PA advertisements
Pauli Virtanen <[email protected]>
Bluetooth: ISO: don't leak skb in ISO_CONT RX
Pauli Virtanen <[email protected]>
Bluetooth: ISO: free rx_skb if not consumed
Luiz Augusto von Dentz <[email protected]>
Bluetooth: ISO: Fix possible UAF on iso_conn_free
Luiz Augusto von Dentz <[email protected]>
Bluetooth: MGMT: Fix not exposing debug UUID on MGMT_OP_READ_EXP_FEATURES_INFO
Michael S. Tsirkin <[email protected]>
vhost: vringh: Fix copy_to_iter return value check
I Viswanath <[email protected]>
ptp: Add a upper bound on max_vclocks
I Viswanath <[email protected]>
net: usb: Remove disruptive netif_wake_queue in rtl8150_set_multicast
Bernard Metzler <[email protected]>
RDMA/siw: Always report immediate post SQ errors
Lu Baolu <[email protected]>
iommu/vt-d: Disallow dirty tracking if incoherent page walk
Marek Vasut <[email protected]>
PCI: rcar-gen4: Fix inverted break condition in PHY initialization
Marek Vasut <[email protected]>
PCI: rcar-gen4: Assure reset occurs before DBI access
Marek Vasut <[email protected]>
PCI: rcar-gen4: Add missing 1ms delay after PWR reset assertion
Cristian Ciocaltea <[email protected]>
usb: vhci-hcd: Prevent suspending virtually attached devices
Ranjan Kumar <[email protected]>
scsi: mpt3sas: Fix crash in transport port remove by using ioc_info()
Fernando Fernandez Mancera <[email protected]>
netfilter: nfnetlink: reset nlh pointer during batch replay
Slavin Liu <[email protected]>
ipvs: Defer ip_vs_ftp unregister during netns cleanup
Anthony Iliopoulos <[email protected]>
NFSv4.1: fix backchannel max_resp_sz verification check
Lin Yujun <[email protected]>
coresight: Fix incorrect handling for return value of devm_kzalloc
Jie Gan <[email protected]>
coresight: tpda: fix the logic to setup the element size
Leo Yan <[email protected]>
coresight: trbe: Return NULL pointer for allocation failures
Leo Yan <[email protected]>
coresight: etm4x: Support atclk
Leo Yan <[email protected]>
coresight: catu: Support atclk
Leo Yan <[email protected]>
coresight: tmc: Support atclk
Yuanfang Zhang <[email protected]>
coresight-etm4x: Conditionally access register TRCEXTINSELR
Ivan Abramov <[email protected]>
dm vdo: return error on corrupted metadata in start_restoring_volume functions
Stephan Gerhold <[email protected]>
remoteproc: qcom: q6v5: Avoid disabling handover IRQ twice
Nagarjuna Kristam <[email protected]>
PCI: tegra194: Fix duplicate PLL disable in pex_ep_event_pex_rst_assert()
Fedor Pchelkin <[email protected]>
wifi: rtw89: avoid circular locking dependency in ser_state_run()
Gui-Dong Han <[email protected]>
RDMA/rxe: Fix race in do_task() when draining
Chenghai Huang <[email protected]>
crypto: hisilicon/qm - set NULL to qm->debug.qm_diff_regs
Zilin Guan <[email protected]>
vfio/pds: replace bitmap_free with vfree
Michael Karcher <[email protected]>
sparc: fix accurate exception reporting in copy_{from,to}_user for M7
Michael Karcher <[email protected]>
sparc: fix accurate exception reporting in copy_to_user for Niagara 4
Michael Karcher <[email protected]>
sparc: fix accurate exception reporting in copy_{from_to}_user for Niagara
Michael Karcher <[email protected]>
sparc: fix accurate exception reporting in copy_{from_to}_user for UltraSPARC III
Michael Karcher <[email protected]>
sparc: fix accurate exception reporting in copy_{from_to}_user for UltraSPARC
Richard Fitzgerald <[email protected]>
ASoC: Intel: sof_sdw: Prevent jump to NULL add_sidecar callback
Aditya Kumar Singh <[email protected]>
wifi: mac80211: fix Rx packet handling when pubsta information is not available
Vineeth Pillai (Google) <[email protected]>
iommu/vt-d: debugfs: Fix legacy mode page table dump logic
Baochen Qiang <[email protected]>
wifi: ath10k: avoid unnecessary wait for service ready message
Baochen Qiang <[email protected]>
wifi: ath12k: fix wrong logging ID used for CE
Bagas Sanjaya <[email protected]>
Documentation: trace: historgram-design: Separate sched_waking histogram section heading and the following diagram
Vlad Dumitrescu <[email protected]>
IB/sa: Fix sa_local_svc_timeout_ms read race
Parav Pandit <[email protected]>
RDMA/core: Resolve MAC of next-hop device without ARP support
Michal Pecio <[email protected]>
Revert "usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running"
wangzijie <[email protected]>
f2fs: fix zero-sized extent for precache extents
Benjamin Tissoires <[email protected]>
HID: hidraw: tighten ioctl command parsing
Qianfeng Rong <[email protected]>
scsi: qla2xxx: Fix incorrect sign of error code in qla_nvme_xmt_ls_rsp()
Qianfeng Rong <[email protected]>
scsi: qla2xxx: Fix incorrect sign of error code in START_SP_W_RETRIES()
Qianfeng Rong <[email protected]>
scsi: qla2xxx: edif: Fix incorrect sign of error code
Colin Ian King <[email protected]>
ACPI: NFIT: Fix incorrect ndr_desc being reportedin dev_err message
Sebastian Andrzej Siewior <[email protected]>
ALSA: pcm: Disable bottom softirqs as part of spin_lock_irq() on PREEMPT_RT
Chao Yu <[email protected]>
f2fs: fix to mitigate overhead of f2fs_zero_post_eof_page()
Chao Yu <[email protected]>
f2fs: fix to truncate first page in error path of f2fs_truncate()
Chao Yu <[email protected]>
f2fs: fix to update map->m_next_extent correctly in f2fs_map_blocks()
Zhi-Jun You <[email protected]>
wifi: mt76: mt7915: fix mt7981 pre-calibration
Lorenzo Bianconi <[email protected]>
wifi: mt76: mt7996: Convert mt7996_wed_rro_addr to LE
Lorenzo Bianconi <[email protected]>
wifi: mt76: mt7996: Fix RX packets configuration for primary WED device
Abdun Nihaal <[email protected]>
wifi: mt76: fix potential memory leak in mt76_wmac_probe()
Håkon Bugge <[email protected]>
RDMA/cm: Rate limit destroy CM ID timeout error message
Donet Tom <[email protected]>
drivers/base/node: handle error properly in register_one_node()
Christophe Leroy <[email protected]>
watchdog: mpc8xxx_wdt: Reload the watchdog timer when enabling the watchdog
Zhang Tengfei <[email protected]>
ipvs: Use READ_ONCE/WRITE_ONCE for ipvs->enable
Zhen Ni <[email protected]>
netfilter: ipset: Remove unused htable_bits in macro ahash_region
Hans de Goede <[email protected]>
iio: consumers: Fix offset handling in iio_convert_raw_to_processed()
Hans de Goede <[email protected]>
iio: consumers: Fix handling of negative channel scale in iio_convert_raw_to_processed()
Moon Hee Lee <[email protected]>
fs/ntfs3: reject index allocation if $BITMAP is empty but blocks exist
Vitaly Grigoryev <[email protected]>
fs: ntfs3: Fix integer overflow in run_unpack()
Qianfeng Rong <[email protected]>
drm/msm/dpu: fix incorrect type for ret
Takashi Iwai <[email protected]>
ASoC: Intel: bytcr_rt5651: Fix invalid quirk input mapping
Takashi Iwai <[email protected]>
ASoC: Intel: bytcr_rt5640: Fix invalid quirk input mapping
Takashi Iwai <[email protected]>
ASoC: Intel: bytcht_es8316: Fix invalid quirk input mapping
Alexander Lobakin <[email protected]>
idpf: fix Rx descriptor ready check barrier in splitq
Liao Yuanhong <[email protected]>
wifi: iwlwifi: Remove redundant header files
Wang Liang <[email protected]>
pps: fix warning in pps_register_cdev when register device fail
Colin Ian King <[email protected]>
misc: genwqe: Fix incorrect cmd field being reported in error
Seppo Takalo <[email protected]>
tty: n_gsm: Don't block input queue by waiting MSC
William Wu <[email protected]>
usb: gadget: configfs: Correctly set use_os_string at bind
Xichao Zhao <[email protected]>
usb: phy: twl6030: Fix incorrect type for ret
Qianfeng Rong <[email protected]>
drm/amdkfd: Fix error code sign for EINVAL in svm_ioctl()
Eric Dumazet <[email protected]>
tcp: fix __tcp_close() to only send RST when required
Alok Tiwari <[email protected]>
PCI: tegra: Fix devm_kcalloc() argument order for port->phys allocation
Stefan Kerkmann <[email protected]>
wifi: mwifiex: send world regulatory domain to driver
Timur Kristóf <[email protected]>
drm/amd/pm: Disable SCLK switching on Oland with high pixel clocks (v3)
Timur Kristóf <[email protected]>
drm/amd/pm: Disable MCLK switching with non-DC at 120 Hz+ (v2)
Timur Kristóf <[email protected]>
drm/amd/pm: Treat zero vblank time as too short in si_dpm (v3)
Timur Kristóf <[email protected]>
drm/amd/pm: Adjust si_upload_smc_data register programming (v3)
Timur Kristóf <[email protected]>
drm/amd/pm: Fix si_upload_smc_data (v3)
Timur Kristóf <[email protected]>
drm/amd/pm: Disable ULV even if unsupported (v3)
Timur Kristóf <[email protected]>
drm/amdgpu: Power up UVD 3 for FW validation (v2)
Yuanfang Zhang <[email protected]>
coresight: Only register perf symlink for sinks with alloc_buffer
Eric Dumazet <[email protected]>
inet: ping: check sock_net() in ping_get_port() and ping_lookup()
Zhushuai Yin <[email protected]>
crypto: hisilicon/qm - check whether the input function and PF are on the same device
Chenghai Huang <[email protected]>
crypto: hisilicon - re-enable address prefetch after device resuming
Chenghai Huang <[email protected]>
crypto: hisilicon/zip - remove unnecessary validation for high-performance mode configurations
Arnd Bergmann <[email protected]>
media: st-delta: avoid excessive stack usage
Qianfeng Rong <[email protected]>
ALSA: lx_core: use int type to store negative error codes
Nirmoy Das <[email protected]>
PCI/ACPI: Fix pci_acpi_preserve_config() memory leak
Patrisious Haddad <[email protected]>
RDMA/mlx5: Fix vport loopback forcing for MPV device
Or Har-Toov <[email protected]>
RDMA/mlx5: Better estimate max_qp_wr to reflect WQE count
Zhang Shurong <[email protected]>
media: rj54n1cb0c: Fix memleak in rj54n1_probe()
Thorsten Blum <[email protected]>
crypto: octeontx2 - Call strscpy() with correct size argument
Thomas Fourier <[email protected]>
scsi: myrs: Fix dma_alloc_coherent() error check
Niklas Cassel <[email protected]>
scsi: pm80xx: Fix array-index-out-of-of-bounds on rmmod
Arnd Bergmann <[email protected]>
hwrng: nomadik - add ARM_AMBA dependency
Thomas Fourier <[email protected]>
crypto: keembay - Add missing check after sg_nents_for_len()
Liao Yuanhong <[email protected]>
drm/amd/display: Remove redundant semicolons
Dan Carpenter <[email protected]>
serial: max310x: Add error checking in probe()
Komal Bajaj <[email protected]>
usb: misc: qcom_eud: Access EUD_MODE_MANAGER2 through secure calls
Dan Carpenter <[email protected]>
usb: host: max3421-hcd: Fix error pointer dereference in probe cleanup
Jonas Karlman <[email protected]>
phy: rockchip: naneng-combphy: Enable U3 OTG port for RK3568
Jacopo Mondi <[email protected]>
media: zoran: Remove zoran_fh structure
Chia-I Wu <[email protected]>
drm/bridge: it6505: select REGMAP_I2C
Chao Yu <[email protected]>
f2fs: fix condition in __allow_reserved_blocks()
Brahmajit Das <[email protected]>
drm/radeon/r600_cs: clean up of dead code in r600_cs
Brigham Campbell <[email protected]>
drm/panel: novatek-nt35560: Fix invalid return value
Daniel Borkmann <[email protected]>
bpf: Enforce expected_attach_type for tailcall compatibility
D. Wythe <[email protected]>
libbpf: Fix error when st-prefix_ops and ops from differ btf
Kunihiko Hayashi <[email protected]>
i2c: designware: Add disabling clocks when probe fails
Kunihiko Hayashi <[email protected]>
i2c: designware: Fix clock issue when PM is disabled
Leilk.Liu <[email protected]>
i2c: mediatek: fix potential incorrect use of I2C_MASTER_WRRD
Dmitry Baryshkov <[email protected]>
thermal/drivers/qcom/lmh: Add missing IRQ includes
Dmitry Baryshkov <[email protected]>
thermal/drivers/qcom: Make LMH select QCOM_SCM
Vadim Pasternak <[email protected]>
hwmon: (mlxreg-fan) Separate methods of fan setting coming from different subsystems
Qi Xi <[email protected]>
once: fix race by moving DO_ONCE to separate section
Andrea Righi <[email protected]>
bpf: Mark kfuncs as __noclone
Jonas Gorski <[email protected]>
spi: fix return code when spi device has too many chipselects
Zhouyi Zhou <[email protected]>
tools/nolibc: make time_t robust if __kernel_old_time_t is missing in host headers
Rafael J. Wysocki <[email protected]>
smp: Fix up and expand the smp_call_function_many() kerneldoc
Hengqi Chen <[email protected]>
bpf, arm64: Call bpf_jit_binary_pack_finalize() in bpf_jit_free()
Paul Chaignon <[email protected]>
bpf: Explicitly check accesses to bpf_sock_addr
Akhilesh Patil <[email protected]>
selftests: watchdog: skip ping loop if WDIOF_KEEPALIVEPING not supported
Stanley Chu <[email protected]>
i3c: master: svc: Recycle unused IBI slot
Stanley Chu <[email protected]>
i3c: master: svc: Use manual response for IBI events
Daniel Wagner <[email protected]>
nvmet-fc: move lsop put work to nvmet_fc_ls_req_op
Hengqi Chen <[email protected]>
riscv, bpf: Sign extend struct ops return values properly
Dmitry Antipov <[email protected]>
ACPICA: Fix largest possible resource descriptor index
Uwe Kleine-König <[email protected]>
pwm: tiehrpwm: Fix corner case in clock divisor calculation
Uwe Kleine-König <[email protected]>
pwm: tiehrpwm: Fix various off-by-one errors in duty-cycle calculation
Uwe Kleine-König <[email protected]>
pwm: tiehrpwm: Make code comment in .free() more useful
Uwe Kleine-König <[email protected]>
pwm: tiehrpwm: Don't drop runtime PM reference in .free()
AngeloGioacchino Del Regno <[email protected]>
arm64: dts: mediatek: mt8516-pumpkin: Fix machine compatible
AngeloGioacchino Del Regno <[email protected]>
arm64: dts: mediatek: mt8395-kontron-i1200: Fix MT6360 regulator nodes
AngeloGioacchino Del Regno <[email protected]>
arm64: dts: mediatek: mt6795-xperia-m5: Fix mmc0 latch-ck value
Bean Huo <[email protected]>
mmc: core: Fix variable shadowing in mmc_route_rpmb_frames()
AngeloGioacchino Del Regno <[email protected]>
arm64: dts: mediatek: mt6331: Fix pmic, regulators, rtc, keys node names
Chen-Yu Tsai <[email protected]>
arm64: dts: mediatek: mt8186-tentacruel: Fix touchscreen model
Johan Hovold <[email protected]>
cpuidle: qcom-spm: fix device and OF node leaks at probe
Johan Hovold <[email protected]>
soc: mediatek: mtk-svs: fix device leaks on mt8192 probe failure
Johan Hovold <[email protected]>
soc: mediatek: mtk-svs: fix device leaks on mt8183 probe failure
Johan Hovold <[email protected]>
firmware: firmware: meson-sm: fix compile-test default
Nicolas Frattaroli <[email protected]>
PM / devfreq: rockchip-dfi: double count on RK3588
Eric Dumazet <[email protected]>
nbd: restrict sockets to TCP and UDP
Guoqing Jiang <[email protected]>
arm64: dts: mediatek: mt8195: Remove suspend-breaking reset from pcie0
Thomas Weißschuh <[email protected]>
selftests: vDSO: vdso_test_abi: Correctly skip whole test with missing vDSO
Thomas Weißschuh <[email protected]>
selftests: vDSO: Fix -Wunitialized in powerpc VDSO_CALL() wrapper
Genjian Zhang <[email protected]>
null_blk: Fix the description of the cache_size module argument
Qianfeng Rong <[email protected]>
pinctrl: renesas: Use int type to store negative error codes
Andy Yan <[email protected]>
power: supply: cw2015: Fix a alignment coding style issue
Dan Carpenter <[email protected]>
PM / devfreq: mtk-cci: Fix potential error pointer dereference in probe()
Jihed Chaibi <[email protected]>
ARM: dts: omap: am335x-cm-t335: Remove unused mcasp num-serializer property
Jihed Chaibi <[email protected]>
ARM: dts: ti: omap: omap3-devkit8000-lcd: Fix ti,keep-vref-on property to use correct boolean syntax in DTS
Jihed Chaibi <[email protected]>
ARM: dts: ti: omap: am335x-baltos: Fix ti,en-ck32k-xtal property in DTS to use correct boolean syntax
Thomas Weißschuh <[email protected]>
vdso: Add struct __kernel_old_timeval forward declaration to gettime.h
Rafael J. Wysocki <[email protected]>
PM: sleep: core: Clear power.must_resume in noirq suspend error path
Qianfeng Rong <[email protected]>
block: use int to store blk_stack_limits() return value
Andrei Lalaev <[email protected]>
leds: leds-lp55xx: Use correct address for memory programming
Benjamin Berg <[email protected]>
selftests/nolibc: fix EXPECT_NZ macro
Qianfeng Rong <[email protected]>
regulator: scmi: Use int type to store negative error codes
Janne Grunau <[email protected]>
arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map
Nicolas Ferre <[email protected]>
ARM: at91: pm: fix MCKx restore routine
Li Nan <[email protected]>
blk-mq: check kobject state_in_sysfs before deleting in blk_mq_unregister_hctx
Da Xue <[email protected]>
pinctrl: meson-gxl: add missing i2c_d pinmux
Sneh Mankad <[email protected]>
soc: qcom: rpmh-rsc: Unconditionally clear _TRIGGER bit for TCS
Huisong Li <[email protected]>
ACPI: processor: idle: Fix memory leak when register cpuidle device failed
Joy Zou <[email protected]>
arm64: dts: imx95: Correct the lpuart7 and lpuart8 srcid
Frieder Schrempf <[email protected]>
arm64: dts: imx93-kontron: Fix USB port assignment
Annette Kobou <[email protected]>
arm64: dts: imx93-kontron: Fix GPIO for panel regulator
Junnan Wu <[email protected]>
firmware: arm_scmi: Mark VirtIO ready before registering scmi_virtio_driver
Florian Fainelli <[email protected]>
cpufreq: scmi: Account for malformed DT in scmi_dev_used_by_cpus()
Ilya Leoshkevich <[email protected]>
s390/bpf: Write back tail call counter for BPF_TRAMP_F_CALL_ORIG
Ilya Leoshkevich <[email protected]>
s390/bpf: Write back tail call counter for BPF_PSEUDO_CALL
Fenglin Wu <[email protected]>
leds: flash: leds-qcom-flash: Update torch current clamp setting
Geert Uytterhoeven <[email protected]>
ARM: dts: renesas: porter: Fix CAN pin group
Yureka Lilian <[email protected]>
libbpf: Fix reuse of DEVMAP
Tao Chen <[email protected]>
bpf: Remove migrate_disable in kprobe_multi_link_prog_run
Matt Bobrowski <[email protected]>
bpf/selftests: Fix test_tcpnotify_user
Geert Uytterhoeven <[email protected]>
regmap: Remove superfluous check for !config in __regmap_init()
Biju Das <[email protected]>
arm64: dts: renesas: rzg2lc-smarc: Disable CAN-FD channel0
Lad Prabhakar <[email protected]>
pinctrl: renesas: rzg2l: Fix invalid unsigned return in rzg3s_oen_read()
Qu Wenruo <[email protected]>
btrfs: return any hit error from extent_writepage_io()
Randy Dunlap <[email protected]>
lsm: CONFIG_LSM can depend on CONFIG_SECURITY
Uros Bizjak <[email protected]>
x86/vdso: Fix output operand size of RDPID
Qiuxu Zhuo <[email protected]>
EDAC/i10nm: Skip DIMM enumeration on a disabled memory controller
Stefan Metzmacher <[email protected]>
smb: server: fix IRD/ORD negotiation with the client
Leo Yan <[email protected]>
perf: arm_spe: Prevent overflow in PERF_IDX2OFF()
Leo Yan <[email protected]>
coresight: trbe: Prevent overflow in PERF_IDX2OFF()
Jeremy Linton <[email protected]>
uprobes: uprobe_warn should use passed task
Christophe Leroy <[email protected]>
powerpc/603: Really copy kernel PGD entries into all PGDIRs
Christophe Leroy <[email protected]>
powerpc/8xx: Remove left-over instruction and comments in DataStoreTLBMiss handler
Andreas Gruenbacher <[email protected]>
gfs2: Fix GLF_INVALIDATE_IN_PROGRESS flag clearing in do_xmote
Bala-Vignesh-Reddy <[email protected]>
selftests: arm64: Check fread return value in exec_target
Johannes Nixdorf <[email protected]>
seccomp: Fix a race with WAIT_KILLABLE_RECV if the tracer replies too fast
Geert Uytterhoeven <[email protected]>
init: INITRAMFS_PRESERVE_MTIME should depend on BLK_DEV_INITRD
Jeff Layton <[email protected]>
filelock: add FL_RECLAIM to show_fl_flags() macro
-------------
Diffstat:
Documentation/trace/histogram-design.rst | 4 +- Makefile | 4 +- arch/arm/boot/dts/renesas/r8a7791-porter.dts | 2 +- arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi | 2 +- arch/arm/boot/dts/ti/omap/am335x-cm-t335.dts | 2 - .../dts/ti/omap/omap3-devkit8000-lcd-common.dtsi | 2 +- arch/arm/mach-at91/pm_suspend.S | 4 +- arch/arm64/boot/dts/apple/t8103-j457.dts | 12 +- .../boot/dts/freescale/imx93-kontron-bl-osm-s.dts | 32 ++- arch/arm64/boot/dts/freescale/imx95.dtsi | 4 +- arch/arm64/boot/dts/mediatek/mt6331.dtsi | 10 +- .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 2 +- .../boot/dts/mediatek/mt8186-corsola-krabby.dtsi | 8 +- .../mt8186-corsola-tentacruel-sku262144.dts | 4 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 - .../dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 16 +- arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts | 2 +- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 1 + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 5 +- arch/arm64/net/bpf_jit_comp.c | 3 +- arch/loongarch/kernel/relocate.c | 4 + arch/powerpc/include/asm/book3s/32/pgalloc.h | 10 +- arch/powerpc/include/asm/nohash/pgalloc.h | 2 +- arch/powerpc/kernel/head_8xx.S | 9 +- arch/riscv/net/bpf_jit_comp64.c | 42 +++- arch/s390/net/bpf_jit_comp.c | 26 +- arch/sparc/lib/M7memcpy.S | 20 +- arch/sparc/lib/Memcpy_utils.S | 9 + arch/sparc/lib/NG4memcpy.S | 2 +- arch/sparc/lib/NGmemcpy.S | 29 ++- arch/sparc/lib/U1memcpy.S | 19 +- arch/sparc/lib/U3memcpy.S | 2 +- arch/x86/include/asm/segment.h | 8 +- arch/x86/kvm/svm/svm.c | 12 +- block/blk-mq-sysfs.c | 6 +- block/blk-settings.c | 3 +- crypto/asymmetric_keys/x509_cert_parser.c | 16 +- drivers/acpi/acpica/aclocal.h | 2 +- drivers/acpi/nfit/core.c | 2 +- drivers/acpi/processor_idle.c | 3 + drivers/base/node.c | 4 + drivers/base/power/main.c | 14 +- drivers/base/regmap/regmap.c | 2 +- drivers/block/nbd.c | 8 + drivers/block/null_blk/main.c | 2 +- drivers/bus/fsl-mc/fsl-mc-bus.c | 3 + drivers/char/hw_random/Kconfig | 1 + drivers/char/hw_random/ks-sa-rng.c | 4 + drivers/char/tpm/Kconfig | 2 +- drivers/cpufreq/scmi-cpufreq.c | 10 + drivers/cpuidle/cpuidle-qcom-spm.c | 7 +- drivers/crypto/hisilicon/debugfs.c | 1 + drivers/crypto/hisilicon/hpre/hpre_main.c | 3 +- drivers/crypto/hisilicon/qm.c | 7 +- drivers/crypto/hisilicon/sec2/sec_main.c | 80 +++---- drivers/crypto/hisilicon/zip/zip_main.c | 17 +- .../crypto/intel/keembay/keembay-ocs-hcu-core.c | 5 +- .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 2 +- drivers/devfreq/event/rockchip-dfi.c | 7 +- drivers/devfreq/mtk-cci-devfreq.c | 3 +- drivers/edac/i10nm_base.c | 14 ++ drivers/firmware/arm_scmi/transports/virtio.c | 3 + drivers/firmware/meson/Kconfig | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 29 ++- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 1 - drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 7 + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 92 +++++--- drivers/gpu/drm/bridge/Kconfig | 1 + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 2 +- drivers/gpu/drm/panel/panel-novatek-nt35560.c | 2 +- drivers/gpu/drm/radeon/r600_cs.c | 4 +- drivers/hid/hidraw.c | 262 +++++++++++---------- drivers/hwmon/mlxreg-fan.c | 24 +- drivers/hwtracing/coresight/coresight-catu.c | 22 +- drivers/hwtracing/coresight/coresight-catu.h | 1 + drivers/hwtracing/coresight/coresight-core.c | 5 +- drivers/hwtracing/coresight/coresight-etm4x-core.c | 31 ++- drivers/hwtracing/coresight/coresight-etm4x.h | 6 +- drivers/hwtracing/coresight/coresight-tmc-core.c | 22 +- drivers/hwtracing/coresight/coresight-tmc.h | 2 + drivers/hwtracing/coresight/coresight-tpda.c | 3 + drivers/hwtracing/coresight/coresight-trbe.c | 11 +- drivers/i2c/busses/i2c-designware-platdrv.c | 5 +- drivers/i2c/busses/i2c-mt65xx.c | 17 +- drivers/i3c/master/svc-i3c-master.c | 31 ++- drivers/iio/inkern.c | 30 +-- drivers/infiniband/core/addr.c | 10 +- drivers/infiniband/core/cm.c | 4 +- drivers/infiniband/core/sa_query.c | 6 +- drivers/infiniband/hw/mlx5/main.c | 67 +++++- drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + drivers/infiniband/sw/rxe/rxe_task.c | 8 +- drivers/infiniband/sw/siw/siw_verbs.c | 25 +- drivers/input/misc/uinput.c | 1 + drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- drivers/iommu/intel/debugfs.c | 17 +- drivers/iommu/intel/iommu.h | 3 +- drivers/leds/flash/leds-qcom-flash.c | 62 +++-- drivers/leds/leds-lp55xx-common.c | 2 +- drivers/md/dm-core.h | 1 + drivers/md/dm-vdo/indexer/volume-index.c | 4 +- drivers/md/dm.c | 13 +- drivers/media/i2c/rj54n1cb0c.c | 9 +- drivers/media/pci/zoran/zoran.h | 6 - drivers/media/pci/zoran/zoran_driver.c | 3 +- .../media/platform/st/sti/delta/delta-mjpeg-dec.c | 20 +- drivers/mfd/rz-mtu3.c | 2 +- drivers/mfd/vexpress-sysreg.c | 6 +- drivers/misc/fastrpc.c | 89 ++++--- drivers/misc/genwqe/card_ddcb.c | 2 +- drivers/mmc/core/block.c | 6 +- drivers/mtd/nand/raw/atmel/nand-controller.c | 4 +- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 5 +- drivers/net/ethernet/dlink/dl2k.c | 7 +- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 8 +- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 +- .../ethernet/mellanox/mlx5/core/en/port_buffer.h | 12 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 17 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 24 ++ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 7 +- .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +- drivers/net/usb/asix_devices.c | 29 +++ drivers/net/usb/rtl8150.c | 2 - drivers/net/wireless/ath/ath10k/wmi.c | 39 ++- drivers/net/wireless/ath/ath12k/ce.c | 2 +- drivers/net/wireless/ath/ath12k/debug.h | 1 + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 1 - drivers/net/wireless/marvell/mwifiex/cfg80211.c | 7 +- drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 6 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 29 +-- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 8 +- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 11 +- drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 2 +- drivers/net/wireless/realtek/rtw89/ser.c | 3 +- drivers/nvme/target/fc.c | 19 +- drivers/pci/controller/cadence/pci-j721e.c | 2 +- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 26 +- drivers/pci/controller/dwc/pcie-tegra194.c | 4 +- drivers/pci/controller/pci-tegra.c | 2 +- drivers/pci/pci-acpi.c | 6 +- drivers/perf/arm_spe_pmu.c | 3 +- drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 12 + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 10 + drivers/pinctrl/pinmux.c | 2 +- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- drivers/pinctrl/renesas/pinctrl.c | 3 +- drivers/power/supply/cw2015_battery.c | 3 +- drivers/pps/kapi.c | 5 +- drivers/pps/pps.c | 5 +- drivers/ptp/ptp_private.h | 1 + drivers/ptp/ptp_sysfs.c | 2 +- drivers/pwm/pwm-tiehrpwm.c | 154 +++++------- drivers/regulator/scmi-regulator.c | 3 +- drivers/remoteproc/pru_rproc.c | 3 +- drivers/remoteproc/qcom_q6v5.c | 3 - drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +- drivers/scsi/myrs.c | 8 +- drivers/scsi/pm8001/pm8001_sas.c | 9 +- drivers/scsi/qla2xxx/qla_edif.c | 4 +- drivers/scsi/qla2xxx/qla_init.c | 4 +- drivers/scsi/qla2xxx/qla_nvme.c | 2 +- drivers/soc/mediatek/mtk-svs.c | 23 ++ drivers/soc/qcom/rpmh-rsc.c | 7 +- drivers/spi/spi.c | 2 +- drivers/tee/tee_shm.c | 8 + drivers/thermal/qcom/Kconfig | 3 +- drivers/thermal/qcom/lmh.c | 2 + drivers/tty/n_gsm.c | 25 +- drivers/tty/serial/max310x.c | 2 + drivers/uio/uio_hv_generic.c | 7 +- drivers/usb/cdns3/cdnsp-pci.c | 5 +- drivers/usb/gadget/configfs.c | 2 + drivers/usb/host/max3421-hcd.c | 2 +- drivers/usb/host/xhci-ring.c | 11 +- drivers/usb/misc/Kconfig | 1 + drivers/usb/misc/qcom_eud.c | 33 ++- drivers/usb/phy/phy-twl6030-usb.c | 3 +- drivers/usb/typec/tipd/core.c | 24 +- drivers/usb/usbip/vhci_hcd.c | 22 ++ drivers/vfio/pci/pds/dirty.c | 2 +- drivers/vhost/vringh.c | 14 +- drivers/video/fbdev/simplefb.c | 31 ++- drivers/watchdog/mpc8xxx_wdt.c | 2 + fs/btrfs/extent_io.c | 9 +- fs/ext4/ext4.h | 10 + fs/ext4/file.c | 2 +- fs/ext4/inode.c | 2 +- fs/ext4/orphan.c | 6 +- fs/ext4/super.c | 4 +- fs/f2fs/data.c | 9 +- fs/f2fs/f2fs.h | 4 +- fs/f2fs/file.c | 49 ++-- fs/gfs2/glock.c | 2 - fs/nfs/nfs4proc.c | 2 +- fs/ntfs3/index.c | 10 + fs/ntfs3/run.c | 12 +- fs/ocfs2/stack_user.c | 1 + fs/smb/client/smb2ops.c | 17 +- fs/smb/server/ksmbd_netlink.h | 5 +- fs/smb/server/mgmt/user_session.c | 26 +- fs/smb/server/server.h | 1 + fs/smb/server/smb2pdu.c | 3 +- fs/smb/server/transport_ipc.c | 3 + fs/smb/server/transport_rdma.c | 97 +++++++- fs/smb/server/transport_tcp.c | 27 ++- fs/squashfs/inode.c | 7 + fs/squashfs/squashfs_fs_i.h | 2 +- fs/udf/inode.c | 3 + include/asm-generic/vmlinux.lds.h | 1 + include/linux/bpf.h | 1 + include/linux/btf.h | 2 +- include/linux/once.h | 4 +- include/trace/events/filelock.h | 3 +- include/uapi/linux/hidraw.h | 2 + include/vdso/gettime.h | 1 + init/Kconfig | 1 + io_uring/waitid.c | 3 +- kernel/bpf/core.c | 5 + kernel/bpf/verifier.c | 4 +- kernel/events/uprobes.c | 2 +- kernel/seccomp.c | 12 +- kernel/smp.c | 11 +- kernel/trace/bpf_trace.c | 9 +- mm/hugetlb.c | 2 + net/9p/trans_usbg.c | 16 +- net/bluetooth/hci_sync.c | 10 +- net/bluetooth/iso.c | 11 +- net/bluetooth/mgmt.c | 10 +- net/core/filter.c | 16 +- net/ipv4/ping.c | 14 +- net/ipv4/tcp.c | 9 +- net/mac80211/rx.c | 28 ++- net/netfilter/ipset/ip_set_hash_gen.h | 8 +- net/netfilter/ipvs/ip_vs_conn.c | 4 +- net/netfilter/ipvs/ip_vs_core.c | 11 +- net/netfilter/ipvs/ip_vs_ctl.c | 6 +- net/netfilter/ipvs/ip_vs_est.c | 16 +- net/netfilter/ipvs/ip_vs_ftp.c | 4 +- net/netfilter/nfnetlink.c | 2 + net/nfc/nci/ntf.c | 135 ++++++++--- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- security/Kconfig | 1 + sound/core/pcm_native.c | 21 +- sound/pci/lx6464es/lx_core.c | 4 +- sound/soc/codecs/wcd934x.c | 17 +- sound/soc/codecs/wcd937x.c | 4 +- sound/soc/codecs/wcd937x.h | 6 +- sound/soc/intel/boards/bytcht_es8316.c | 20 +- sound/soc/intel/boards/bytcr_rt5640.c | 7 +- sound/soc/intel/boards/bytcr_rt5651.c | 26 +- sound/soc/intel/boards/sof_sdw.c | 2 +- sound/soc/sof/ipc3-topology.c | 10 +- tools/include/nolibc/std.h | 2 +- tools/lib/bpf/libbpf.c | 46 ++-- tools/testing/nvdimm/test/ndtest.c | 13 +- tools/testing/selftests/arm64/pauth/exec_target.c | 7 +- .../selftests/bpf/progs/test_tcpnotify_kern.c | 1 - tools/testing/selftests/bpf/test_tcpnotify_user.c | 20 +- tools/testing/selftests/nolibc/nolibc-test.c | 4 +- tools/testing/selftests/vDSO/vdso_call.h | 7 +- tools/testing/selftests/vDSO/vdso_test_abi.c | 9 +- tools/testing/selftests/watchdog/watchdog-test.c | 6 + 265 files changed, 2074 insertions(+), 1143 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/262 filelock: add FL_RECLAIM to show_fl_flags() macro
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
[ Upstream commit c593b9d6c446510684da400833f9d632651942f0 ]
Show the FL_RECLAIM flag symbolically in tracepoints.
--- include/trace/events/filelock.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/trace/events/filelock.h +2 -1
@@ -27,7 +27,8 @@ { FL_SLEEP, "FL_SLEEP" }, \ { FL_DOWNGRADE_PENDING, "FL_DOWNGRADE_PENDING" }, \ { FL_UNLOCK_PENDING, "FL_UNLOCK_PENDING" }, \ - { FL_OFDLCK, "FL_OFDLCK" }) + { FL_OFDLCK, "FL_OFDLCK" }, \ + { FL_RECLAIM, "FL_RECLAIM"}) #define show_fl_type(val) \ __print_symbolic(val, \
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 2/262 init: INITRAMFS_PRESERVE_MTIME should depend on BLK_DEV_INITRD
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 74792608606a525a0e0df7e8d48acd8000561389 ]
INITRAMFS_PRESERVE_MTIME is only used in init/initramfs.c and init/initramfs_test.c. Hence add a dependency on BLK_DEV_INITRD, to prevent asking the user about this feature when configuring a kernel without initramfs support.
--- init/Kconfig | 1 + 1 file changed, 1 insertion(+)
init/Kconfig +1 -0
@@ -1440,6 +1440,7 @@ config BOOT_CONFIG_EMBED_FILE config INITRAMFS_PRESERVE_MTIME bool "Preserve cpio archive mtimes in initramfs" + depends on BLK_DEV_INITRD default y help Each entry in an initramfs cpio archive carries an mtime value. When
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 3/262 seccomp: Fix a race with WAIT_KILLABLE_RECV if the tracer replies too fast
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Nixdorf <[email protected]>
[ Upstream commit cce436aafc2abad691fdd37de63ec8a4490b42ce ]
Normally the tracee starts in SECCOMP_NOTIFY_INIT, sends an event to the tracer, and starts to wait interruptibly. With SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV, if the tracer receives the message (SECCOMP_NOTIFY_SENT is reached) while the tracee was waiting and is subsequently interrupted, the tracee begins to wait again uninterruptibly (but killable).
This fails if SECCOMP_NOTIFY_REPLIED is reached before the tracee is interrupted, as the check only considered SECCOMP_NOTIFY_SENT as a condition to begin waiting again. In this case the tracee is interrupted even though the tracer already acted on its behalf. This breaks the assumption SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV wanted to ensure, namely that the tracer can be sure the syscall is not interrupted or restarted on the tracee after it is received on the tracer. Fix this by also considering SECCOMP_NOTIFY_REPLIED when evaluating whether to switch to uninterruptible waiting.
With the condition changed the loop in seccomp_do_user_notification() would exit immediately after deciding that noninterruptible waiting is required if the operation already reached SECCOMP_NOTIFY_REPLIED, skipping the code that processes pending addfd commands first. Prevent this by executing the remaining loop body one last time in this case.
--- kernel/seccomp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
kernel/seccomp.c +5 -7
@@ -1124,7 +1124,7 @@ static void seccomp_handle_addfd(struct seccomp_kaddfd *addfd, struct seccomp_knstatic bool should_sleep_killable (struct seccomp_filter *match,struct seccomp_knotif *n) { -return match->wait_killable_recv && n->state ==SECCOMP_NOTIFY_SENT ; +return match->wait_killable_recv && n->state >=SECCOMP_NOTIFY_SENT ; } static int seccomp_do_user_notification(int this_syscall,
@@ -1171,13 +1171,11 @@ static int seccomp_do_user_notification(int this_syscall,if (err !=0 ) {/* -* Check to see if the notifcation got picked up and -* whether we should switch to wait killable. +* Check to see whether we should switch to wait +* killable. Only return the interrupted error if not. */ -if (!wait_killable &&should_sleep_killable (match, &n)) -continue ; - - goto interrupted; +if (!(!wait_killable &&should_sleep_killable (match, &n))) + goto interrupted; } addfd = list_first_entry_or_null(&n.addfd,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 4/262 selftests: arm64: Check fread return value in exec_target
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bala-Vignesh-Reddy <[email protected]>
[ Upstream commit a679e5683d3eef22ca12514ff8784b2b914ebedc ]
Fix -Wunused-result warning generated when compiled with gcc 13.3.0, by checking fread's return value and handling errors, preventing potential failures when reading from stdin.
Fixes compiler warning:
warning: ignoring return value of 'fread' declared with attribute 'warn_unused_result' [-Wunused-result]
--- tools/testing/selftests/arm64/pauth/exec_target.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/testing/selftests/arm64/pauth/exec_target.c +6 -1
@@ -13,7 +13,12 @@ int main(void)unsigned long hwcaps;size_t val; -fread (&val,sizeof (size_t ),1 , stdin); +size_t size =fread (&val,sizeof (size_t ),1 , stdin); + +if (size !=1 ) { +fprintf (stderr,"Could not read input from stdin\n" ); +return EXIT_FAILURE ; + }/* don't try to execute illegal (unimplemented) instructions) caller * should have checked this and keep worker simple
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 5/262 gfs2: Fix GLF_INVALIDATE_IN_PROGRESS flag clearing in do_xmote
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 061df28b82af6b22fb5fa529a8f2ef00474ee004 ]
Commit 865cc3e9cc0b ("gfs2: fix a deadlock on withdraw-during-mount") added a statement to do_xmote() to clear the GLF_INVALIDATE_IN_PROGRESS flag a second time after it has already been cleared. Fix that.
--- fs/gfs2/glock.c | 2 -- 1 file changed, 2 deletions(-)
fs/gfs2/glock.c +0 -2
@@ -801,8 +801,6 @@ __acquires(&gl->gl_lockref.lock)clear_bit (GLF_DEMOTE_IN_PROGRESS , &gl->gl_flags);gfs2_glock_queue_work (gl,GL_GLOCK_DFT_HOLD );return ; - }else { -clear_bit (GLF_INVALIDATE_IN_PROGRESS , &gl->gl_flags); } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 6/262 powerpc/8xx: Remove left-over instruction and comments in DataStoreTLBMiss handler
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit d9e46de4bf5c5f987075afd5f240bb2a8a5d71ed ]
Commit ac9f97ff8b32 ("powerpc/8xx: Inconditionally use task PGDIR in DTLB misses") removed the test that needed the valeur in SPRN_EPN but failed to remove the read.
Remove it.
And remove related comments, including the very same comment in InstructionTLBMiss that should have been removed by commit 33c527522f39 ("powerpc/8xx: Inconditionally use task PGDIR in ITLB misses").
Also update the comment about absence of a second level table which has been handled implicitely since commit 5ddb75cee5af ("powerpc/8xx:
remove tests on PGDIR entry validity").
--- arch/powerpc/kernel/head_8xx.S | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
arch/powerpc/kernel/head_8xx.S +1 -8
@@ -162,7 +162,7 @@ instruction_counter: * For the MPC8xx, this is a software tablewalk to load the instruction * TLB. The task switch loads the M_TWB register with the pointer to the first * level table. - * If we discover there is no second level table (value is zero) or if there + * If there is no second level table (value is zero) or if there * is an invalid pte, we load that into the TLB, which causes another fault * into the TLB Error interrupt where we can handle such problems. * We have to use the MD_xxx registers for the tablewalk because the
@@ -183,9 +183,6 @@ instruction_counter: mtspr SPRN_SPRG_SCRATCH2, r10 mtspr SPRN_M_TW, r11 - /* If we are faulting a kernel address, we have to use the - * kernel page tables. - */ mfspr r10, SPRN_SRR0 /* Get effective address of fault */ INVALIDATE_ADJACENT_PAGES_CPU15(r10, r11) mtspr SPRN_MD_EPN, r10
@@ -228,10 +225,6 @@ instruction_counter: mtspr SPRN_SPRG_SCRATCH2, r10 mtspr SPRN_M_TW, r11 - /* If we are faulting a kernel address, we have to use the - * kernel page tables. - */ - mfspr r10, SPRN_MD_EPN mfspr r10, SPRN_M_TWB /* Get level 1 table */ lwz r11, (swapper_pg_dir-PAGE_OFFSET)@l(r10) /* Get level 1 entry */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 7/262 powerpc/603: Really copy kernel PGD entries into all PGDIRs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit f2863371f017eb03c230addc253783fa4c7e90f5 ]
Commit 82ef440f9a38 ("powerpc/603: Copy kernel PGD entries into all PGDIRs and preallocate execmem page tables") was supposed to extend to powerpc 603 the copy of kernel PGD entries into all PGDIRs implemented in a previous patch on the 8xx. But 603 is book3s/32 and uses a duplicate of pgd_alloc() defined in another header.
So really do the copy at the correct place for the 603.
--- arch/powerpc/include/asm/book3s/32/pgalloc.h | 10 ++++++++-- arch/powerpc/include/asm/nohash/pgalloc.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/book3s/32/pgalloc.h +8 -2
@@ -7,8 +7,14 @@static inline pgd_t *pgd_alloc (struct mm_struct *mm) { -return kmem_cache_alloc (PGT_CACHE (PGD_INDEX_SIZE ), -pgtable_gfp_flags (mm,GFP_KERNEL )); +pgd_t *pgd =kmem_cache_alloc (PGT_CACHE (PGD_INDEX_SIZE ), +pgtable_gfp_flags (mm,GFP_KERNEL )); + +#ifdef CONFIG_PPC_BOOK3S_603 +memcpy (pgd +USER_PTRS_PER_PGD , swapper_pg_dir +USER_PTRS_PER_PGD , + (MAX_PTRS_PER_PGD -USER_PTRS_PER_PGD ) *sizeof (pgd_t)); +#endif +return pgd; }static inline void pgd_free (struct mm_struct *mm,pgd_t *pgd)
arch/powerpc/include/asm/nohash/pgalloc.h +1 -1
@@ -22,7 +22,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)pgd_t *pgd =kmem_cache_alloc (PGT_CACHE (PGD_INDEX_SIZE ),pgtable_gfp_flags (mm,GFP_KERNEL )); -#if defined(CONFIG_PPC_8xx) || defined(CONFIG_PPC_BOOK3S_603 ) +#ifdef CONFIG_PPC_8xxmemcpy (pgd +USER_PTRS_PER_PGD , swapper_pg_dir +USER_PTRS_PER_PGD , (MAX_PTRS_PER_PGD -USER_PTRS_PER_PGD ) *sizeof (pgd_t));#endif
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 8/262 uprobes: uprobe_warn should use passed task
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeremy Linton <[email protected]>
[ Upstream commit ba1afc94deb849eab843a372b969444581add2c9 ]
uprobe_warn() is passed a task structure, yet its using current. For the most part this shouldn't matter, but since a task structure is provided, lets use it.
--- kernel/events/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/uprobes.c +1 -1
@@ -114,7 +114,7 @@ struct xol_area {static void uprobe_warn (struct task_struct *t,const char *msg) { -pr_warn ("uprobe: %s:%d failed to %s\n" , current->comm, current->pid, msg); +pr_warn ("uprobe: %s:%d failed to %s\n" , t->comm, t->pid, msg); }/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 9/262 coresight: trbe: Prevent overflow in PERF_IDX2OFF()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit 105f56877f2d5f82d71e20b45eb7be7c24c3d908 ]
Cast nr_pages to unsigned long to avoid overflow when handling large AUX buffer sizes (>= 2 GiB).
--- drivers/hwtracing/coresight/coresight-trbe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-trbe.c +2 -1
@@ -22,7 +22,8 @@#include "coresight-self-hosted-trace.h" #include "coresight-trbe.h" -#define PERF_IDX2OFF (idx, buf) ((idx) % ((buf)->nr_pages << PAGE_SHIFT)) +#define PERF_IDX2OFF (idx, buf) \ + ((idx) % ((unsigned long)(buf)->nr_pages << PAGE_SHIFT))/* * A padding packet that will help the user space tools
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 10/262 perf: arm_spe: Prevent overflow in PERF_IDX2OFF()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit a29fea30dd93da16652930162b177941abd8c75e ]
Cast nr_pages to unsigned long to avoid overflow when handling large AUX buffer sizes (>= 2 GiB).
--- drivers/perf/arm_spe_pmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/perf/arm_spe_pmu.c +2 -1
@@ -96,7 +96,8 @@ struct arm_spe_pmu {#define to_spe_pmu (p) (container_of(p, struct arm_spe_pmu, pmu))/* Convert a free-running index from perf into an SPE buffer offset */ -#define PERF_IDX2OFF (idx, buf) ((idx) % ((buf)->nr_pages << PAGE_SHIFT)) +#define PERF_IDX2OFF (idx, buf) \ + ((idx) % ((unsigned long)(buf)->nr_pages << PAGE_SHIFT))/* Keep track of our dynamic hotplug state */ static enum cpuhp_state arm_spe_pmu_online;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 11/262 smb: server: fix IRD/ORD negotiation with the client
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Metzmacher <[email protected]>
[ Upstream commit fad988a2158d743da7971884b93482a73735b25e ]
Already do real negotiation in smb_direct_handle_connect_request() where we see the requested initiator_depth and responder_resources from the client.
We should detect legacy iwarp clients using MPA v1 with the custom IRD/ORD negotiation.
We need to send the custom IRD/ORD in big endian, but we need to try to let clients with broken requests using little endian (older cifs.ko) to work.
Note the reason why this uses u8 forinitiator_depth and responder_resources is
that the rdma layer also uses it.
--- fs/smb/server/transport_rdma.c | 99 +++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 14 deletions(-)
fs/smb/server/transport_rdma.c +85 -14
@@ -152,6 +152,10 @@ struct smb_direct_transport {struct work_struct disconnect_work;bool negotiation_requested; + +bool legacy_iwarp; +u8 initiator_depth; +u8 responder_resources; };#define KSMBD_TRANS (t) ((struct ksmbd_transport *)&((t)->transport))
@@ -346,6 +350,9 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) t->cm_id = cm_id; cm_id->context = t; + t->initiator_depth =SMB_DIRECT_CM_INITIATOR_DEPTH ; + t->responder_resources =1 ; + t->status =SMB_DIRECT_CS_NEW ;init_waitqueue_head (&t->wait_status);
@@ -1623,21 +1630,21 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,static int smb_direct_accept_client (struct smb_direct_transport *t) {struct rdma_conn_param conn_param; -struct ib_port_immutable port_immutable; -u32 ird_ord_hdr[2 ]; +__be32 ird_ord_hdr[2 ];int ret; +/* +* smb_direct_handle_connect_request() +* already negotiated t->initiator_depth +* and t->responder_resources +*/ memset (&conn_param,0 ,sizeof (conn_param)); - conn_param.initiator_depth =min_t (u8, t->cm_id->device->attrs.max_qp_rd_atom, -SMB_DIRECT_CM_INITIATOR_DEPTH ); - conn_param.responder_resources =0 ; - - t->cm_id->device->ops.get_port_immutable (t->cm_id->device, - t->cm_id->port_num, - &port_immutable); -if (port_immutable.core_cap_flags &RDMA_CORE_PORT_IWARP ) { - ird_ord_hdr[0 ] = conn_param.responder_resources; - ird_ord_hdr[1 ] =1 ; + conn_param.initiator_depth = t->initiator_depth; + conn_param.responder_resources = t->responder_resources; + +if (t->legacy_iwarp) { + ird_ord_hdr[0 ] =cpu_to_be32 (conn_param.responder_resources); + ird_ord_hdr[1 ] =cpu_to_be32 (conn_param.initiator_depth); conn_param.private_data = ird_ord_hdr; conn_param.private_data_len =sizeof (ird_ord_hdr); }else {
@@ -2023,10 +2030,13 @@ static bool rdma_frwr_is_supported(struct ib_device_attr *attrs)return true; } -static int smb_direct_handle_connect_request (struct rdma_cm_id *new_cm_id) +static int smb_direct_handle_connect_request (struct rdma_cm_id *new_cm_id, +struct rdma_cm_event *event) {struct smb_direct_transport *t;struct task_struct *handler; +u8 peer_initiator_depth; +u8 peer_responder_resources;int ret;if (!rdma_frwr_is_supported (&new_cm_id->device->attrs)) {
@@ -2040,6 +2050,67 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id)if (!t)return -ENOMEM ; + peer_initiator_depth = event->param.conn.initiator_depth; + peer_responder_resources = event->param.conn.responder_resources; +if (rdma_protocol_iwarp (new_cm_id->device, new_cm_id->port_num) && + event->param.conn.private_data_len ==8 ) { +/* +* Legacy clients with only iWarp MPA v1 support +* need a private blob in order to negotiate +* the IRD/ORD values. +*/ +const __be32 *ird_ord_hdr = event->param.conn.private_data; +u32 ird32 =be32_to_cpu (ird_ord_hdr[0 ]); +u32 ord32 =be32_to_cpu (ird_ord_hdr[1 ]); + +/* +* cifs.ko sends the legacy IRD/ORD negotiation +* event if iWarp MPA v2 was used. +* +* Here we check that the values match and only +* mark the client as legacy if they don't match. +*/ +if ((u32 )event->param.conn.initiator_depth != ird32 || + (u32 )event->param.conn.responder_resources != ord32) { +/* +* There are broken clients (old cifs.ko) +* using little endian and also +* struct rdma_conn_param only uses u8 +* for initiator_depth and responder_resources, +* so we truncate the value to U8_MAX. +* +* smb_direct_accept_client() will then +* do the real negotiation in order to +* select the minimum between client and +* server. +*/ + ird32 =min_t (u32, ird32,U8_MAX ); + ord32 =min_t (u32, ord32,U8_MAX ); + + t->legacy_iwarp = true; + peer_initiator_depth = (u8 )ird32; + peer_responder_resources = (u8 )ord32; + } + } + +/* +* First set what the we as server are able to support +*/ + t->initiator_depth =min_t (u8, t->initiator_depth, + new_cm_id->device->attrs.max_qp_rd_atom); + +/* +* negotiate the value by using the minimum +* between client and server if the client provided +* non 0 values. +*/ +if (peer_initiator_depth !=0 ) + t->initiator_depth =min_t (u8, t->initiator_depth, + peer_initiator_depth); +if (peer_responder_resources !=0 ) + t->responder_resources =min_t (u8, t->responder_resources, + peer_responder_resources); + ret =smb_direct_connect (t);if (ret) goto out_err;
@@ -2064,7 +2135,7 @@ static int smb_direct_listen_handler(struct rdma_cm_id *cm_id, {switch (event->event) {case RDMA_CM_EVENT_CONNECT_REQUEST : { -int ret =smb_direct_handle_connect_request (cm_id); +int ret =smb_direct_handle_connect_request (cm_id, event);if (ret) {pr_err ("Can't create transport: %d\n" , ret);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 12/262 EDAC/i10nm: Skip DIMM enumeration on a disabled memory controller
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiuxu Zhuo <[email protected]>
[ Upstream commit 2e6fe1bbefd9c059c3787d1c620fe67343a94dff ]
When loading the i10nm_edac driver on some Intel Granite Rapids servers, a call trace may appear as follows:
UBSAN: shift-out-of-bounds in drivers/edac/skx_common.c:453:16 shift exponent -66 is negative ... __ubsan_handle_shift_out_of_bounds+0x1e3/0x390 skx_get_dimm_info.cold+0x47/0xd40 [skx_edac_common] i10nm_get_dimm_config+0x23e/0x390 [i10nm_edac] skx_register_mci+0x159/0x220 [skx_edac_common] i10nm_init+0xcb0/0x1ff0 [i10nm_edac] ...
This occurs because some BIOS may disable a memory controller if there aren't any memory DIMMs populated on this memory controller. The DIMMMTR register of this disabled memory controller contains the invalid value ~0, resulting in the call trace above.
Fix this call trace by skipping DIMM enumeration on a disabled memory controller.
--- drivers/edac/i10nm_base.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/edac/i10nm_base.c +14 -0
@@ -967,6 +967,15 @@ static bool i10nm_check_ecc(struct skx_imc *imc, int chan)return !!GET_BITFIELD (mcmtr,2 ,2 ); } +static bool i10nm_channel_disabled (struct skx_imc *imc,int chan) +{ +u32 mcmtr =I10NM_GET_MCMTR (imc, chan); + +edac_dbg (1 ,"mc%d ch%d mcmtr reg %x\n" , imc->mc, chan, mcmtr); + +return (mcmtr == ~0 ||GET_BITFIELD (mcmtr,18 ,18 )); +} +static int i10nm_get_dimm_config (struct mem_ctl_info *mci,struct res_config *cfg) {
@@ -980,6 +989,11 @@ static int i10nm_get_dimm_config(struct mem_ctl_info *mci,if (!imc->mbase)continue ; +if (i10nm_channel_disabled (imc, i)) { +edac_dbg (1 ,"mc%d ch%d is disabled.\n" , imc->mc, i); +continue ; + } + ndimms =0 ;if (res_cfg->type !=GNR )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 13/262 x86/vdso: Fix output operand size of RDPID
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uros Bizjak <[email protected]>
[ Upstream commit ac9c408ed19d535289ca59200dd6a44a6a2d6036 ]
RDPID instruction outputs to a word-sized register (64-bit on x86_64 and 32-bit on x86_32). Use an unsigned long variable to store the correct size.
LSL outputs to 32-bit register, use %k operand prefix to always print the 32-bit name of the register.
Use RDPID insn mnemonic while at it as the minimum binutils version of 2.30 supports it.
[ bp: Merge two patches touching the same function into a single one. ]
--- arch/x86/include/asm/segment.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/include/asm/segment.h +4 -4
@@ -244,7 +244,7 @@ static inline unsigned long vdso_encode_cpunode(int cpu, unsigned long node)static inline void vdso_read_cpunode (unsigned *cpu,unsigned *node) { -unsigned int p; +unsigned long p;/* * Load CPU and node number from the GDT. LSL is faster than RDTSCP
@@ -254,10 +254,10 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)* * If RDPID is available, use it. */ -alternative_io ("lsl %[seg],%[p]" , -".byte 0xf3,0x0f,0xc7,0xf8" ,/* RDPID %eax/rax */ +alternative_io ("lsl %[seg],%k[p]" , +"rdpid %[p]" , X86_FEATURE_RDPID, - [p] "=a" (p), [seg] "r" (__CPUNODE_SEG)); + [p] "=r" (p), [seg] "r" (__CPUNODE_SEG)); if (cpu) *cpu = (p & VDSO_CPUNODE_MASK);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 14/262 lsm: CONFIG_LSM can depend on CONFIG_SECURITY
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 54d94c422fed9575b74167333c1757847a4e6899 ]
When CONFIG_SECURITY is not set, CONFIG_LSM (builtin_lsm_order) does not need to be visible and settable since builtin_lsm_order is defined in security.o, which is only built when CONFIG_SECURITY=y.
So make CONFIG_LSM depend on CONFIG_SECURITY.
--- security/Kconfig | 1 + 1 file changed, 1 insertion(+)
security/Kconfig +1 -0
@@ -264,6 +264,7 @@ endchoice config LSM string "Ordered list of enabled LSMs" + depends on SECURITY default "landlock,lockdown,yama,loadpin,safesetid,smack,selinux,tomoyo,apparmor,ipe,bpf" if DEFAULT_SECURITY_SMACK default "landlock,lockdown,yama,loadpin,safesetid,apparmor,selinux,smack,tomoyo,ipe,bpf" if DEFAULT_SECURITY_APPARMOR default "landlock,lockdown,yama,loadpin,safesetid,tomoyo,ipe,bpf" if DEFAULT_SECURITY_TOMOYO
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 15/262 btrfs: return any hit error from extent_writepage_io()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 2d83ed6c6c4607b42ee7927e92a9d2fa31d6f30b ]
Since the support of bs < ps support, extent_writepage_io() will submit multiple blocks inside the folio.
But if we hit error submitting one sector, but the next sector can still be submitted successfully, the function extent_writepage_io() will still return 0.
This will make btrfs to silently ignore the error without setting error flag for the filemap.
Fix it by recording the first error hit, and always return that value.
--- fs/btrfs/extent_io.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/btrfs/extent_io.c +5 -4
@@ -1479,7 +1479,7 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,struct btrfs_fs_info *fs_info = inode->root->fs_info;unsigned long range_bitmap =0 ;bool submitted_io = false; -bool error = false; +int found_error =0 ;const u64 folio_start =folio_pos (folio);u64 cur;int bit;
@@ -1536,7 +1536,8 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,*/ btrfs_mark_ordered_io_finished (inode, folio, cur, fs_info->sectorsize, false); - error = true; +if (!found_error) + found_error = ret;continue ; } submitted_io = true;
@@ -1553,11 +1554,11 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,* If we hit any error, the corresponding sector will still be dirty * thus no need to clear PAGECACHE_TAG_DIRTY. */ -if (!submitted_io && !error) { +if (!submitted_io && !found_error) {btrfs_folio_set_writeback (fs_info, folio, start, len);btrfs_folio_clear_writeback (fs_info, folio, start, len); } -return ret; +return found_error; }/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 16/262 pinctrl: renesas: rzg2l: Fix invalid unsigned return in rzg3s_oen_read()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lad Prabhakar <[email protected]>
[ Upstream commit 8912b2862b9b74a0dc4e3ea1aacdec2f8abd7e1d ]
rzg3s_oen_read() returns a u32 value, but previously propagated a negative error code from rzg3s_pin_to_oen_bit(), resulting in an unintended large positive value due to unsigned conversion. This caused incorrect output-enable reporting for certain pins.
Without this patch, pins P1_0-P1_4 and P7_0-P7_4 are incorrectly reported as "output enabled" in the pinconf-pins debugfs file. With this fix, only P1_0-P1_1 and P7_0-P7_1 are shown as "output enabled", which matches the hardware manual.
Fix this by returning 0 when the OEN bit lookup fails, treating the pin as output-disabled by default.
--- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/renesas/pinctrl-rzg2l.c +1 -1
@@ -1074,7 +1074,7 @@ static u32 rzg3s_oen_read(struct rzg2l_pinctrl *pctrl, unsigned int _pin) bit =rzg3s_pin_to_oen_bit (pctrl, _pin);if (bit <0 ) -return bit; +return 0 ;return !(readb (pctrl->base +ETH_MODE ) &BIT (bit)); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 17/262 arm64: dts: renesas: rzg2lc-smarc: Disable CAN-FD channel0
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit ae014fbc99c7f986ee785233e7a5336834e39af4 ]
On RZ/G2LC SMARC EVK, CAN-FD channel0 is not populated, and currently we are deleting a wrong and nonexistent node. Fixing the wrong node would invoke a dtb warning message, as channel0 is a required property. Disable CAN-FD channel0 instead of deleting the node.
--- arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi +4 -1
@@ -48,7 +48,10 @@ sound_card { #if (SW_SCIF_CAN || SW_RSPI_CAN) &canfd { pinctrl-0 = <&can1_pins>; - /delete-node/ channel@0; + + channel0 { + status = "disabled"; + }; }; #else &canfd {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 18/262 regmap: Remove superfluous check for !config in __regmap_init()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 5c36b86d2bf68fbcad16169983ef7ee8c537db59 ]
The first thing __regmap_init() do is check if config is non-NULL, so there is no need to check for this again later.
--- drivers/base/regmap/regmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/regmap/regmap.c +1 -1
@@ -828,7 +828,7 @@ struct regmap *__regmap_init(struct device *dev, map->read_flag_mask = bus->read_flag_mask; } -if (config && config->read && config->write) { +if (config->read && config->write) { map->reg_read = _regmap_bus_read;if (config->reg_update_bits) map->reg_update_bits = config->reg_update_bits;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 19/262 bpf/selftests: Fix test_tcpnotify_user
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Bobrowski <[email protected]>
[ Upstream commit c80d79720647ed77ebc0198abd5a0807efdaff0b ]
Based on a bisect, it appears that commit 7ee988770326 ("timers:
Implement the hierarchical pull model") has somehow inadvertently broken BPF selftest test_tcpnotify_user. The error that is being generated by this test is as follows:
FAILED: Wrong stats Expected 10 calls, got 8
It looks like the change allows timer functions to be run on CPUs different from the one they are armed on. The test had pinned itself to CPU 0, and in the past the retransmit attempts also occurred on CPU
0. The test had set the max_entries attribute for BPF_MAP_TYPE_PERF_EVENT_ARRAY to 2 and was calling bpf_perf_event_output() with BPF_F_CURRENT_CPU, so the entry was likely to be in range. With the change to allow timers to run on other CPUs, the current CPU tasked with performing the retransmit might be bumped and in turn fall out of range, as the event will be filtered out via __bpf_perf_event_output() using:
if (unlikely(index >= array->map.max_entries))
return -E2BIG;A possible change would be to explicitly set the max_entries attribute for perf_event_map in test_tcpnotify_kern.c to a value that's at least as large as the number of CPUs. As it turns out however, if the field is left unset, then the libbpf will determine the number of CPUs available on the underlying system and update the max_entries attribute accordingly in map_set_def_max_entries().
A further problem with the test is that it has a thread that continues running up until the program exits. The main thread cleans up some LIBBPF data structures, while the other thread continues to use them, which inevitably will trigger a SIGSEGV. This can be dealt with by telling the thread to run for as long as necessary and doing a pthread_join on it before exiting the program.
Finally, I don't think binding the process to CPU 0 is meaningful for this test any more, so get rid of that.
--- .../selftests/bpf/progs/test_tcpnotify_kern.c | 1 - .../selftests/bpf/test_tcpnotify_user.c | 20 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c +0 -1
@@ -23,7 +23,6 @@ struct {struct { __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY); - __uint(max_entries, 2); __type(key, int); __type(value, __u32); } perf_event_map SEC(".maps");
tools/testing/selftests/bpf/test_tcpnotify_user.c +10 -10
@@ -15,20 +15,18 @@#include <bpf/libbpf.h> #include <sys/ioctl.h> #include <linux/rtnetlink.h> -#include <signal.h> #include <linux/perf_event.h> -#include <linux/err.h> -#include "bpf_util.h" #include "cgroup_helpers.h" #include "test_tcpnotify.h" -#include "trace_helpers.h" #include "testing_helpers.h" #define SOCKET_BUFFER_SIZE (getpagesize() < 8192L ? getpagesize() : 8192L)pthread_t tid; +static bool exit_thread; +int rx_callbacks;static void dummyfn (void *ctx,int cpu,void *data,__u32 size)
@@ -45,7 +43,7 @@ void tcp_notifier_poller(struct perf_buffer *pb) {int err; -while (1 ) { +while (!exit_thread) { err =perf_buffer__poll (pb,100 );if (err <0 && err != -EINTR ) {printf ("failed perf_buffer__poll: %d\n" , err);
@@ -78,15 +76,10 @@ int main(int argc, char **argv)int error =EXIT_FAILURE ;struct bpf_object *obj;char test_script[80 ]; -cpu_set_t cpuset;__u32 key =0 ;libbpf_set_strict_mode (LIBBPF_STRICT_ALL ); -CPU_ZERO (&cpuset); -CPU_SET (0 , &cpuset); -pthread_setaffinity_np (pthread_self (),sizeof (cpu_set_t), &cpuset); - cg_fd =cgroup_setup_and_join (cg_path);if (cg_fd <0 ) goto err;
@@ -151,6 +144,13 @@ int main(int argc, char **argv)sleep (10 ); + exit_thread = true; +int ret =pthread_join (tid,NULL ); +if (ret) { +printf ("FAILED: pthread_join\n" ); + goto err; + } +if (verify_result (&g)) {printf ("FAILED: Wrong stats Expected %d calls, got %d\n" , g.ncalls, rx_callbacks);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 20/262 bpf: Remove migrate_disable in kprobe_multi_link_prog_run
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Chen <[email protected]>
[ Upstream commit abdaf49be5424db74e19d167c10d7dad79a0efc2 ]
Graph tracer framework ensures we won't migrate, kprobe_multi_link_prog_run called all the way from graph tracer, which disables preemption in function_graph_enter_regs, as Jiri and Yonghong suggested, there is no need to use migrate_disable. As a result, some overhead may will be reduced. And add cant_sleep check for __this_cpu_inc_return.
--- kernel/trace/bpf_trace.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
kernel/trace/bpf_trace.c +7 -2
@@ -2759,19 +2759,24 @@ kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link,struct bpf_run_ctx *old_run_ctx;int err; +/* +* graph tracer framework ensures we won't migrate, so there is no need +* to use migrate_disable for bpf_prog_run again. The check here just for +* __this_cpu_inc_return. +*/ +cant_sleep (); +if (unlikely (__this_cpu_inc_return (bpf_prog_active) !=1 )) {bpf_prog_inc_misses_counter (link->link.prog); err =0 ; goto out; } -migrate_disable ();rcu_read_lock (); old_run_ctx =bpf_set_run_ctx (&run_ctx.session_ctx.run_ctx); err =bpf_prog_run (link->link.prog, regs);bpf_reset_run_ctx (old_run_ctx);rcu_read_unlock (); -migrate_enable (); out:__this_cpu_dec (bpf_prog_active);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 21/262 libbpf: Fix reuse of DEVMAP
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yureka Lilian <[email protected]>
[ Upstream commit 6c6b4146deb12d20f42490d5013f2043df942161 ]
Previously, re-using pinned DEVMAP maps would always fail, because get_map_info on a DEVMAP always returns flags with BPF_F_RDONLY_PROG set, but BPF_F_RDONLY_PROG being set on a map during creation is invalid.
Thus, ignore the BPF_F_RDONLY_PROG flag in the flags returned from get_map_info when checking for compatibility with an existing DEVMAP.
The same problem is handled in a third-party ebpf library:
- https://github.com/cilium/ebpf/issues/925
- https://github.com/cilium/ebpf/pull/930
--- tools/lib/bpf/libbpf.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/lib/bpf/libbpf.c +10 -0
@@ -5056,6 +5056,16 @@ static bool map_is_reuse_compat(const struct bpf_map *map, int map_fd)return false; } +/* +* bpf_get_map_info_by_fd() for DEVMAP will always return flags with +* BPF_F_RDONLY_PROG set, but it generally is not set at map creation time. +* Thus, ignore the BPF_F_RDONLY_PROG flag in the flags returned from +* bpf_get_map_info_by_fd() when checking for compatibility with an +* existing DEVMAP. +*/ +if (map->def.type ==BPF_MAP_TYPE_DEVMAP || map->def.type ==BPF_MAP_TYPE_DEVMAP_HASH ) + map_info.map_flags &= ~BPF_F_RDONLY_PROG ; + return (map_info.type == map->def.type && map_info.key_size == map->def.key_size && map_info.value_size == map->def.value_size &&
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 22/262 ARM: dts: renesas: porter: Fix CAN pin group
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 287066b295051729fb08c3cff12ae17c6fe66133 ]
According to the schematics, the CAN transceiver is connected to pins GP7_3 and GP7_4, which correspond to CAN0 data group B.
--- arch/arm/boot/dts/renesas/r8a7791-porter.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/renesas/r8a7791-porter.dts +1 -1
@@ -290,7 +290,7 @@ vin0_pins: vin0 { }; can0_pins: can0 { - groups = "can0_data"; + groups = "can0_data_b"; function = "can0"; };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 23/262 leds: flash: leds-qcom-flash: Update torch current clamp setting
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fenglin Wu <[email protected]>
[ Upstream commit 5974e8f6c3e47ab097c3dd8ece7324d1f88fe739 ]
There is a register to clamp the flash current per LED channel when safety timer is disabled. It needs to be updated according to the maximum torch LED current setting to ensure the torch current won't be clamped unexpectedly.
--- drivers/leds/flash/leds-qcom-flash.c | 62 ++++++++++++++++------------ 1 file changed, 36 insertions(+), 26 deletions(-)
drivers/leds/flash/leds-qcom-flash.c +36 -26
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/bitfield.h>
@@ -114,36 +114,39 @@ enum {REG_THERM_THRSH1 ,REG_THERM_THRSH2 ,REG_THERM_THRSH3 , +REG_TORCH_CLAMP , REG_MAX_COUNT, };static const struct reg_field mvflash_3ch_regs[REG_MAX_COUNT ] = { -REG_FIELD (0x08 ,0 ,7 ),/* status1 */ -REG_FIELD (0x09 ,0 ,7 ),/* status2 */ -REG_FIELD (0x0a ,0 ,7 ),/* status3 */ -REG_FIELD_ID (0x40 ,0 ,7 ,3 ,1 ),/* chan_timer */ -REG_FIELD_ID (0x43 ,0 ,6 ,3 ,1 ),/* itarget */ -REG_FIELD (0x46 ,7 ,7 ),/* module_en */ -REG_FIELD (0x47 ,0 ,5 ),/* iresolution */ -REG_FIELD_ID (0x49 ,0 ,2 ,3 ,1 ),/* chan_strobe */ -REG_FIELD (0x4c ,0 ,2 ),/* chan_en */ -REG_FIELD (0x56 ,0 ,2 ),/* therm_thrsh1 */ -REG_FIELD (0x57 ,0 ,2 ),/* therm_thrsh2 */ -REG_FIELD (0x58 ,0 ,2 ),/* therm_thrsh3 */ + [REG_STATUS1 ] =REG_FIELD (0x08 ,0 ,7 ), + [REG_STATUS2 ] =REG_FIELD (0x09 ,0 ,7 ), + [REG_STATUS3 ] =REG_FIELD (0x0a ,0 ,7 ), + [REG_CHAN_TIMER ] =REG_FIELD_ID (0x40 ,0 ,7 ,3 ,1 ), + [REG_ITARGET ] =REG_FIELD_ID (0x43 ,0 ,6 ,3 ,1 ), + [REG_MODULE_EN ] =REG_FIELD (0x46 ,7 ,7 ), + [REG_IRESOLUTION ] =REG_FIELD (0x47 ,0 ,5 ), + [REG_CHAN_STROBE ] =REG_FIELD_ID (0x49 ,0 ,2 ,3 ,1 ), + [REG_CHAN_EN ] =REG_FIELD (0x4c ,0 ,2 ), + [REG_THERM_THRSH1 ] =REG_FIELD (0x56 ,0 ,2 ), + [REG_THERM_THRSH2 ] =REG_FIELD (0x57 ,0 ,2 ), + [REG_THERM_THRSH3 ] =REG_FIELD (0x58 ,0 ,2 ), + [REG_TORCH_CLAMP ] =REG_FIELD (0xec ,0 ,6 ), };static const struct reg_field mvflash_4ch_regs[REG_MAX_COUNT ] = { -REG_FIELD (0x06 ,0 ,7 ),/* status1 */ -REG_FIELD (0x07 ,0 ,6 ),/* status2 */ -REG_FIELD (0x09 ,0 ,7 ),/* status3 */ -REG_FIELD_ID (0x3e ,0 ,7 ,4 ,1 ),/* chan_timer */ -REG_FIELD_ID (0x42 ,0 ,6 ,4 ,1 ),/* itarget */ -REG_FIELD (0x46 ,7 ,7 ),/* module_en */ -REG_FIELD (0x49 ,0 ,3 ),/* iresolution */ -REG_FIELD_ID (0x4a ,0 ,6 ,4 ,1 ),/* chan_strobe */ -REG_FIELD (0x4e ,0 ,3 ),/* chan_en */ -REG_FIELD (0x7a ,0 ,2 ),/* therm_thrsh1 */ -REG_FIELD (0x78 ,0 ,2 ),/* therm_thrsh2 */ + [REG_STATUS1 ] =REG_FIELD (0x06 ,0 ,7 ), + [REG_STATUS2 ] =REG_FIELD (0x07 ,0 ,6 ), + [REG_STATUS3 ] =REG_FIELD (0x09 ,0 ,7 ), + [REG_CHAN_TIMER ] =REG_FIELD_ID (0x3e ,0 ,7 ,4 ,1 ), + [REG_ITARGET ] =REG_FIELD_ID (0x42 ,0 ,6 ,4 ,1 ), + [REG_MODULE_EN ] =REG_FIELD (0x46 ,7 ,7 ), + [REG_IRESOLUTION ] =REG_FIELD (0x49 ,0 ,3 ), + [REG_CHAN_STROBE ] =REG_FIELD_ID (0x4a ,0 ,6 ,4 ,1 ), + [REG_CHAN_EN ] =REG_FIELD (0x4e ,0 ,3 ), + [REG_THERM_THRSH1 ] =REG_FIELD (0x7a ,0 ,2 ), + [REG_THERM_THRSH2 ] =REG_FIELD (0x78 ,0 ,2 ), + [REG_TORCH_CLAMP ] =REG_FIELD (0xed ,0 ,6 ), }; struct qcom_flash_data {
@@ -156,6 +159,7 @@ struct qcom_flash_data {u8 max_channels;u8 chan_en_bits;u8 revision; +u8 torch_clamp; };struct qcom_flash_led {
@@ -702,6 +706,7 @@ static int qcom_flash_register_led_device(struct device *dev,u32 current_ua, timeout_us;u32 channels[4 ];int i, rc, count; +u8 torch_clamp; count =fwnode_property_count_u32 (node,"led-sources" );if (count <=0 ) {
@@ -751,6 +756,12 @@ static int qcom_flash_register_led_device(struct device *dev, current_ua =min_t (u32, current_ua,TORCH_CURRENT_MAX_UA * led->chan_count); led->max_torch_current_ma = current_ua /UA_PER_MA ; + torch_clamp = (current_ua / led->chan_count) /TORCH_IRES_UA ; +if (torch_clamp !=0 ) + torch_clamp--; + + flash_data->torch_clamp =max_t (u8, flash_data->torch_clamp, torch_clamp); +if (fwnode_property_present (node,"flash-max-microamp" )) { flash->led_cdev.flags |=LED_DEV_CAP_FLASH ;
@@ -918,8 +929,7 @@ static int qcom_flash_led_probe(struct platform_device *pdev) flash_data->leds_count++; } -return 0 ; - +return regmap_field_write (flash_data->r_fields[REG_TORCH_CLAMP ], flash_data->torch_clamp); release:fwnode_handle_put (child);while (flash_data->v4l2_flash[flash_data->leds_count] && flash_data->leds_count)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 24/262 s390/bpf: Write back tail call counter for BPF_PSEUDO_CALL
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Leoshkevich <[email protected]>
[ Upstream commit c861a6b147137d10b5ff88a2c492ba376cd1b8b0 ]
The tailcall_bpf2bpf_hierarchy_1 test hangs on s390. Its call graph is as follows:
entry()
subprog_tail()
bpf_tail_call_static(0) -> entry + tail_call_start
subprog_tail()
bpf_tail_call_static(0) -> entry + tail_call_startentry() copies its tail call counter to the subprog_tail()'s frame, which then increments it. However, the incremented result is discarded, leading to an astronomically large number of tail calls.
Fix by writing the incremented counter back to the entry()'s frame.
--- arch/s390/net/bpf_jit_comp.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
arch/s390/net/bpf_jit_comp.c +16 -7
@@ -1775,13 +1775,6 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, jit->seen |=SEEN_FUNC ;/* * Copy the tail call counter to where the callee expects it. -* -* Note 1: The callee can increment the tail call counter, but -* we do not load it back, since the x86 JIT does not do this -* either. -* -* Note 2: We assume that the verifier does not let us call the -* main program, which clears the tail call counter on entry. */ /* mvc STK_OFF_TCCNT(4,%r15),N(%r15) */ _EMIT6(0xd203f000 | STK_OFF_TCCNT,
@@ -1807,6 +1800,22 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp,call_r1 (jit);/* lgr %b0,%r2: load return value into %b0 */ EMIT4 (0xb9040000 ,BPF_REG_0 ,REG_2 ); + +/* +* Copy the potentially updated tail call counter back. +*/ + +if (insn->src_reg ==BPF_PSEUDO_CALL ) +/* +* mvc frame_off+tail_call_cnt(%r15), +* tail_call_cnt(4,%r15) +*/ +_EMIT6 (0xd203f000 | (jit->frame_off + + offsetof(struct prog_frame , + tail_call_cnt)), +0xf000 | offsetof(struct prog_frame , + tail_call_cnt)); +break ; }case BPF_JMP |BPF_TAIL_CALL : {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 25/262 s390/bpf: Write back tail call counter for BPF_TRAMP_F_CALL_ORIG
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Leoshkevich <[email protected]>
[ Upstream commit bc3905a71f02511607d3ccf732360580209cac4c ]
The tailcall_bpf2bpf_hierarchy_fentry test hangs on s390. Its call graph is as follows:
entry()
subprog_tail()
trampoline()
fentry()
the rest of subprog_tail() # via BPF_TRAMP_F_CALL_ORIG return to entry()
The problem is that the rest of subprog_tail() increments the tail call counter, but the trampoline discards the incremented value. This results in an astronomically large number of tail calls.
Fix by making the trampoline write the incremented tail call counter back.
--- arch/s390/net/bpf_jit_comp.c | 3 +++ 1 file changed, 3 insertions(+)
arch/s390/net/bpf_jit_comp.c +3 -0
@@ -2808,6 +2808,9 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,/* stg %r2,retval_off(%r15) */ EMIT6_DISP_LH (0xe3000000 ,0x0024 ,REG_2 ,REG_0 ,REG_15 , tjit->retval_off); +/* mvc tccnt_off(%r15),tail_call_cnt(4,%r15) */ +_EMIT6 (0xd203f000 | tjit->tccnt_off, +0xf000 | offsetof(struct prog_frame , tail_call_cnt)); im->ip_after_call = jit->prg_buf + jit->prg;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 26/262 cpufreq: scmi: Account for malformed DT in scmi_dev_used_by_cpus()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit cd5d4621ba846dad9b2e6b0c2d1518d083fcfa13 ]
Broadcom STB platforms were early adopters (2017) of the SCMI framework and as a result, not all deployed systems have a Device Tree entry where SCMI protocol 0x13 (PERFORMANCE) is declared as a clock provider, nor are the CPU Device Tree node(s) referencing protocol 0x13 as their clock provider. This was clarified in commit e11c480b6df1 ("dt-bindings:
firmware: arm,scmi: Extend bindings for protocol@13") in 2023.
For those platforms, we allow the checks done by scmi_dev_used_by_cpus() to continue, and in the event of not having done an early return, we key off the documented compatible string and give them a pass to continue to use scmi-cpufreq.
--- drivers/cpufreq/scmi-cpufreq.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/cpufreq/scmi-cpufreq.c +10 -0
@@ -15,6 +15,7 @@#include <linux/energy_model.h> #include <linux/export.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/pm_opp.h> #include <linux/slab.h> #include <linux/scmi_protocol.h>
@@ -398,6 +399,15 @@ static bool scmi_dev_used_by_cpus(struct device *scmi_dev)return true; } +/* +* Older Broadcom STB chips had a "clocks" property for CPU node(s) +* that did not match the SCMI performance protocol node, if we got +* there, it means we had such an older Device Tree, therefore return +* true to preserve backwards compatibility. +*/ +if (of_machine_is_compatible ("brcm,brcmstb" )) +return true; +return false; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 27/262 firmware: arm_scmi: Mark VirtIO ready before registering scmi_virtio_driver
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junnan Wu <[email protected]>
[ Upstream commit e8faa8a466f61f4ae07069ed6b0872f602f1cba9 ]
After commit 20bda12a0ea0 (“firmware: arm_scmi: Make VirtIO transport a standalone driver”), the VirtIO transport probes independently. During scmi_virtio_probe, scmi_probe() is called, which intune invokes scmi_protocol_acquire() that sends a message over the virtqueue and waits for a reply.
Previously, DRIVER_OK was only set after scmi_vio_probe, in the core virtio via virtio_dev_probe(). According to the Virtio spec (3.1 Device Initialization):
| The driver MUST NOT send any buffer available notifications to the | device before setting DRIVER_OK.
Some type-1 hypervisors block available-buffer notifications until the driver is marked OK. In such cases, scmi_vio_probe stalls in scmi_wait_for_reply(), and the probe never completes.
Resolve this by setting DRIVER_OK immediately after the device-specific setup, so scmi_probe() can safely send notifications.
Note after splitting the transports into modules, the probe sequence changed a bit. We can no longer rely on virtio_device_ready() being called by the core in virtio_dev_probe(), because scmi_vio_probe() doesn’t complete until the core SCMI stack runs scmi_probe(), which immediately issues the initial BASE protocol exchanges.
Message-Id: <[email protected]>
--- drivers/firmware/arm_scmi/transports/virtio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/firmware/arm_scmi/transports/virtio.c +3 -0
@@ -870,6 +870,9 @@ static int scmi_vio_probe(struct virtio_device *vdev)/* Ensure initialized scmi_vdev is visible */ smp_store_mb (scmi_vdev, vdev); +/* Set device ready */ +virtio_device_ready (vdev); + ret =platform_driver_register (&scmi_virtio_driver);if (ret) { vdev->priv =NULL ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 28/262 arm64: dts: imx93-kontron: Fix GPIO for panel regulator
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Annette Kobou <[email protected]>
[ Upstream commit f3e011388dd08d15e0414e3b6b974f946305e7af ]
The regulator uses the wrong GPIO. Fix this.
--- .../boot/dts/freescale/imx93-kontron-bl-osm-s.dts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts +11 -1
@@ -33,7 +33,9 @@ pwm-beeper { reg_vcc_panel: regulator-vcc-panel { compatible = "regulator-fixed"; - gpio = <&gpio4 3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_vcc_panel>; + gpio = <&gpio2 21 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-max-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
@@ -161,3 +163,11 @@ &usdhc2 { vmmc-supply = <®_vdd_3v3>; status = "okay"; }; + +&iomuxc { + pinctrl_reg_vcc_panel: regvccpanelgrp { + fsl,pins = < + MX93_PAD_GPIO_IO21__GPIO2_IO21 0x31e /* PWM_2 */ + >; + }; +};
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 29/262 arm64: dts: imx93-kontron: Fix USB port assignment
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frieder Schrempf <[email protected]>
[ Upstream commit c94737568b290e0547bff344046f02df49ed6373 ]
The assignment of the USB ports is wrong and needs to be swapped. The OTG (USB-C) port is on the first port and the host port with the onboard hub is on the second port.
--- .../dts/freescale/imx93-kontron-bl-osm-s.dts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts +10 -10
@@ -137,6 +137,16 @@ &tpm6 { }; &usbotg1 { + adp-disable; + hnp-disable; + srp-disable; + disable-over-current; + dr_mode = "otg"; + usb-role-switch; + status = "okay"; +}; + +&usbotg2 { #address-cells = <1>; #size-cells = <0>; disable-over-current;
@@ -149,16 +159,6 @@ usb1@1 { }; }; -&usbotg2 { - adp-disable; - hnp-disable; - srp-disable; - disable-over-current; - dr_mode = "otg"; - usb-role-switch; - status = "okay"; -}; - &usdhc2 { vmmc-supply = <®_vdd_3v3>; status = "okay";
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 30/262 arm64: dts: imx95: Correct the lpuart7 and lpuart8 srcid
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joy Zou <[email protected]>
[ Upstream commit 6fdaf3b1839c861931db0dd11747c056a76b68f9 ]
According to the imx95 RM, the lpuart7 rx and tx DMA's srcid are 88 and 87, and the lpuart8 rx and tx DMA's srcid are 90 and 89. So correct them.
--- arch/arm64/boot/dts/freescale/imx95.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx95.dtsi +2 -2
@@ -822,7 +822,7 @@ lpuart7: serial@42690000 { interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; clocks = <&scmi_clk IMX95_CLK_LPUART7>; clock-names = "ipg"; - dmas = <&edma2 26 0 FSL_EDMA_RX>, <&edma2 25 0 0>; + dmas = <&edma2 88 0 FSL_EDMA_RX>, <&edma2 87 0 0>; dma-names = "rx", "tx"; status = "disabled"; };
@@ -834,7 +834,7 @@ lpuart8: serial@426a0000 { interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; clocks = <&scmi_clk IMX95_CLK_LPUART8>; clock-names = "ipg"; - dmas = <&edma2 28 0 FSL_EDMA_RX>, <&edma2 27 0 0>; + dmas = <&edma2 90 0 FSL_EDMA_RX>, <&edma2 89 0 0>; dma-names = "rx", "tx"; status = "disabled"; };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 31/262 ACPI: processor: idle: Fix memory leak when register cpuidle device failed
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huisong Li <[email protected]>
[ Upstream commit 11b3de1c03fa9f3b5d17e6d48050bc98b3704420 ]
The cpuidle device's memory is leaked when cpuidle device registration fails in acpi_processor_power_init(). Free it as appropriate.
--- drivers/acpi/processor_idle.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/acpi/processor_idle.c +3 -0
@@ -1410,6 +1410,9 @@ int acpi_processor_power_init(struct acpi_processor *pr)if (retval) {if (acpi_processor_registered ==0 )cpuidle_unregister_driver (&acpi_idle_driver); + +per_cpu (acpi_cpuidle_device, pr->id) =NULL ; +kfree (dev);return retval; } acpi_processor_registered++;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 32/262 soc: qcom: rpmh-rsc: Unconditionally clear _TRIGGER bit for TCS
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sneh Mankad <[email protected]>
[ Upstream commit f87412d18edb5b8393eb8cb1c2d4a54f90185a21 ]
Unconditionally clear the TCS_AMC_MODE_TRIGGER bit when a transaction completes. Previously this bit was only cleared when a wake TCS was borrowed as an AMC TCS but not for dedicated AMC TCS. Leaving this bit set for AMC TCS and entering deeper low power modes can generate a false completion IRQ.
Prevent this scenario by always clearing the TCS_AMC_MODE_TRIGGER bit upon receiving a completion IRQ.
--- drivers/soc/qcom/rpmh-rsc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/soc/qcom/rpmh-rsc.c +2 -5
@@ -453,13 +453,10 @@ static irqreturn_t tcs_tx_done(int irq, void *p)trace_rpmh_tx_done (drv, i, req); -/* -* If wake tcs was re-purposed for sending active -* votes, clear AMC trigger & enable modes and +/* Clear AMC trigger & enable modes and * disable interrupt for this TCS */ -if (!drv->tcs[ACTIVE_TCS ].num_tcs) -__tcs_set_trigger (drv, i, false); +__tcs_set_trigger (drv, i, false); skip:/* Reclaim the TCS */ write_tcs_reg (drv, drv->regs[RSC_DRV_CMD_ENABLE ], i,0 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 33/262 pinctrl: meson-gxl: add missing i2c_d pinmux
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Da Xue <[email protected]>
[ Upstream commit d8c2a9edd181f0cc4a66eec954b3d8f6a1d954a7 ]
Amlogic GXL has 4 I2C attached to gpio-periphs. I2C_D is on GPIOX_10/11.
Add the relevant func 3 pinmux per the datasheet for S805X/S905X/S905D.
--- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pinctrl/meson/pinctrl-meson-gxl.c +10 -0
@@ -187,6 +187,9 @@ static const unsigned int i2c_sda_c_pins[] = { GPIODV_28 };static const unsigned int i2c_sck_c_dv19_pins[] = {GPIODV_19 };static const unsigned int i2c_sda_c_dv18_pins[] = {GPIODV_18 }; +static const unsigned int i2c_sck_d_pins[] = {GPIOX_11 }; +static const unsigned int i2c_sda_d_pins[] = {GPIOX_10 }; +static const unsigned int eth_mdio_pins[] = {GPIOZ_0 };static const unsigned int eth_mdc_pins[] = {GPIOZ_1 };static const unsigned int eth_clk_rx_clk_pins[] = {GPIOZ_2 };
@@ -411,6 +414,8 @@ static const struct meson_pmx_group meson_gxl_periphs_groups[] = {GPIO_GROUP (GPIO_TEST_N ),/* Bank X */ +GROUP (i2c_sda_d,5 ,5 ), +GROUP (i2c_sck_d,5 ,4 ),GROUP (sdio_d0,5 ,31 ),GROUP (sdio_d1,5 ,30 ), GROUP(sdio_d2, 5, 29),
@@ -651,6 +656,10 @@ static const char * const i2c_c_groups[] = { "i2c_sck_c", "i2c_sda_c", "i2c_sda_c_dv18", "i2c_sck_c_dv19", }; +static const char *const i2c_d_groups[] = { +"i2c_sck_d" ,"i2c_sda_d" , +}; +static const char *const eth_groups[] = {"eth_mdio" ,"eth_mdc" ,"eth_clk_rx_clk" ,"eth_rx_dv" ,"eth_rxd0" ,"eth_rxd1" ,"eth_rxd2" ,"eth_rxd3" ,
@@ -777,6 +786,7 @@ static const struct meson_pmx_func meson_gxl_periphs_functions[] = {FUNCTION (i2c_a),FUNCTION (i2c_b),FUNCTION (i2c_c), +FUNCTION (i2c_d),FUNCTION (eth),FUNCTION (pwm_a), FUNCTION(pwm_b),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 34/262 blk-mq: check kobject state_in_sysfs before deleting in blk_mq_unregister_hctx
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 4c7ef92f6d4d08a27d676e4c348f4e2922cab3ed ]
In __blk_mq_update_nr_hw_queues() the return value of blk_mq_sysfs_register_hctxs() is not checked. If sysfs creation for hctx fails, later changing the number of hw_queues or removing disk will trigger the following warning:
kernfs: can not remove 'nr_tags', no directory
WARNING: CPU: 2 PID: 637 at fs/kernfs/dir.c:1707 kernfs_remove_by_name_ns+0x13f/0x160 Call Trace: remove_files.isra.1+0x38/0xb0 sysfs_remove_group+0x4d/0x100 sysfs_remove_groups+0x31/0x60 __kobject_del+0x23/0xf0 kobject_del+0x17/0x40 blk_mq_unregister_hctx+0x5d/0x80 blk_mq_sysfs_unregister_hctxs+0x94/0xd0 blk_mq_update_nr_hw_queues+0x124/0x760 nullb_update_nr_hw_queues+0x71/0xf0 [null_blk] nullb_device_submit_queues_store+0x92/0x120 [null_blk]
kobjct_del() was called unconditionally even if sysfs creation failed. Fix it by checkig the kobject creation statusbefore deleting it.
--- block/blk-mq-sysfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
block/blk-mq-sysfs.c +4 -2
@@ -150,9 +150,11 @@ static void blk_mq_unregister_hctx(struct blk_mq_hw_ctx *hctx)return ;hctx_for_each_ctx (hctx, ctx, i) -kobject_del (&ctx->kobj); +if (ctx->kobj.state_in_sysfs) +kobject_del (&ctx->kobj); -kobject_del (&hctx->kobj); +if (hctx->kobj.state_in_sysfs) +kobject_del (&hctx->kobj); }static int blk_mq_register_hctx (struct blk_mq_hw_ctx *hctx)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 35/262 ARM: at91: pm: fix MCKx restore routine
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Ferre <[email protected]>
[ Upstream commit 296302d3d81360e09fa956e9be9edc8223b69a12 ]
The at91_mckx_ps_restore() assembly function is responsible for setting back MCKx system bus clocks after exiting low power modes.
Fix a typo and use tmp3 variable instead of tmp2 to correctly set MCKx to previously saved state.
Tmp2 was used without the needed changes in CSS and DIV. Moreover the required bit 7, telling that MCR register's content is to be changed (CMD/write), was not set.
Fix function comment to match tmp variables actually used.
--- arch/arm/mach-at91/pm_suspend.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-at91/pm_suspend.S +2 -2
@@ -872,7 +872,7 @@ e_done: /** * at91_mckx_ps_restore: restore MCK1..4 settings * - * Side effects: overwrites tmp1, tmp2 + * Side effects: overwrites tmp1, tmp2 and tmp3 */ .macro at91_mckx_ps_restore #ifdef CONFIG_SOC_SAMA7
@@ -916,7 +916,7 @@ r_ps: bic tmp3, tmp3, #AT91_PMC_MCR_V2_ID_MSK orr tmp3, tmp3, tmp1 orr tmp3, tmp3, #AT91_PMC_MCR_V2_CMD - str tmp2, [pmc, #AT91_PMC_MCR_V2] + str tmp3, [pmc, #AT91_PMC_MCR_V2] wait_mckrdy tmp1
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 36/262 arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Janne Grunau <[email protected]>
[ Upstream commit 6e08cdd604edcec2c277af17c7d36caf827057ff ]
PCIe port01 of t8103-j457 (iMac, M1, 2 USB-C ports, 2021) is unused and disabled. Linux' PCI subsystem assigns the ethernet nic from port02 to bus 02. This results into assigning pcie0_dart_1 from the disabled port as iommu. The pcie0_dart_1 instance is disabled and probably fused off (it is on the M2 Pro Mac mini which has a disabled PCIe port as well).
Without iommu the ethernet nic is not expected work.
Adjusts the "bus-range" and the PCIe devices "reg" property to PCI subsystem's bus number.
--- arch/arm64/boot/dts/apple/t8103-j457.dts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/apple/t8103-j457.dts +10 -2
@@ -21,6 +21,14 @@ aliases { }; }; +/* + * Adjust pcie0's iommu-map to account for the disabled port01. + */ +&pcie0 { + iommu-map = <0x100 &pcie0_dart_0 1 1>, + <0x200 &pcie0_dart_2 1 1>; +}; + &bluetooth0 { brcm,board-type = "apple,santorini"; };
@@ -36,10 +44,10 @@ &wifi0 { */ &port02 { - bus-range = <3 3>; + bus-range = <2 2>; status = "okay"; ethernet0: ethernet@0,0 { - reg = <0x30000 0x0 0x0 0x0 0x0>; + reg = <0x20000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ local-mac-address = [00 10 18 00 00 00]; };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 37/262 regulator: scmi: Use int type to store negative error codes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 9d35d068fb138160709e04e3ee97fe29a6f8615b ]
Change the 'ret' variable from u32 to int to store negative error codes or zero returned by of_property_read_u32().
Storing the negative error codes in unsigned type, doesn't cause an issue at runtime but it's ugly as pants. Additionally, assigning negative error codes to unsigned type may trigger a GCC warning when the -Wsign-conversion flag is enabled.
No effect on runtime.
--- drivers/regulator/scmi-regulator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/regulator/scmi-regulator.c +2 -1
@@ -257,7 +257,8 @@ static int process_scmi_regulator_of_node(struct scmi_device *sdev,struct device_node *np, struct scmi_regulator_info *rinfo) { - u32 dom, ret; + u32 dom; +int ret; ret =of_property_read_u32 (np,"reg" , &dom);if (ret)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 38/262 selftests/nolibc: fix EXPECT_NZ macro
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit 6d33ce3634f99e0c6c9ce9fc111261f2c411cb48 ]
The expect non-zero macro was incorrect and never used. Fix its definition.
--- tools/testing/selftests/nolibc/nolibc-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/nolibc/nolibc-test.c +2 -2
@@ -196,8 +196,8 @@ int expect_zr(int expr, int llen) } -#define EXPECT_NZ (cond, expr, val) \ - do { if (!(cond)) result(llen, SKIPPED); else ret += expect_nz(expr, llen; } while (0) +#define EXPECT_NZ (cond, expr) \ + do { if (!(cond)) result(llen, SKIPPED); else ret += expect_nz(expr, llen); } while (0)static __attribute__((unused))int expect_nz (int expr,int llen)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 39/262 leds: leds-lp55xx: Use correct address for memory programming
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Lalaev <[email protected]>
[ Upstream commit d6058316d16ee0d1861c0550051b2492efb54b79 ]
Memory programming doesn't work for devices without page support. For example, LP5562 has 3 engines but doesn't support pages, the start address is changed depending on engine number. According to datasheet [1], the PROG MEM register addresses for each engine are as follows:
Engine 1: 0x10
Engine 2: 0x30
Engine 3: 0x50
However, the current implementation incorrectly calculates the address of PROG MEM register using the engine index starting from 1:
prog_mem_base = 0x10
LP55xx_BYTES_PER_PAGE = 0x20
Engine 1: 0x10 + 0x20 * 1 = 0x30
Engine 2: 0x10 + 0x20 * 2 = 0x50
Engine 3: 0x10 + 0x20 * 3 = 0x70
This results in writing to the wrong engine memory, causing pattern programming to fail.
To correct it, the engine index should be decreased:
Engine 1: 0x10 + 0x20 * 0 = 0x10
Engine 2: 0x10 + 0x20 * 1 = 0x30
Engine 3: 0x10 + 0x20 * 2 = 0x50
1 - https://www.ti.com/lit/ds/symlink/lp5562.pdf
--- drivers/leds/leds-lp55xx-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/leds-lp55xx-common.c +1 -1
@@ -212,7 +212,7 @@ int lp55xx_update_program_memory(struct lp55xx_chip *chip,* For LED chip that support page, PAGE is already set in load_engine. */ if (!cfg->pages_per_engine) - start_addr += LP55xx_BYTES_PER_PAGE * idx; + start_addr += LP55xx_BYTES_PER_PAGE * (idx -1 );for (page =0 ; page < program_length / LP55xx_BYTES_PER_PAGE; page++) {/* Write to the next page each 32 bytes (if supported) */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 40/262 block: use int to store blk_stack_limits() return value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit b0b4518c992eb5f316c6e40ff186cbb7a5009518 ]
Change the 'ret' variable in blk_stack_limits() from unsigned int to int, as it needs to store negative value -1.
Storing the negative error codes in unsigned type, or performing equality comparisons (e.g., ret == -1), doesn't cause an issue at runtime [1] but can be confusing. Additionally, assigning negative error codes to unsigned type may trigger a GCC warning when the -Wsign-conversion flag is enabled.
No effect on runtime.
--- block/blk-settings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/blk-settings.c +2 -1
@@ -552,7 +552,8 @@ static unsigned int blk_round_down_sectors(unsigned int sectors, unsigned int lbint blk_stack_limits (struct queue_limits *t,struct queue_limits *b,sector_t start) { -unsigned int top, bottom, alignment, ret =0 ; +unsigned int top, bottom, alignment; +int ret =0 ; t->features |= (b->features &BLK_FEAT_INHERIT_MASK );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 41/262 PM: sleep: core: Clear power.must_resume in noirq suspend error path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit be82483d1b60baf6747884bd74cb7de484deaf76 ]
If system suspend is aborted in the "noirq" phase (for instance, due to an error returned by one of the device callbacks), power.is_noirq_suspended will not be set for some devices and device_resume_noirq() will return early for them. Consequently, noirq resume callbacks will not run for them at all because the noirq suspend callbacks have not run for them yet.
If any of them has power.must_resume set and late suspend has been skipped for it (due to power.smart_suspend), early resume should be skipped for it either, or its state may become inconsistent (for instance, if the early resume assumes that it will always follow noirq resume).
Make that happen by clearing power.must_resume in device_resume_noirq() for devices with power.is_noirq_suspended clear that have been left in suspend by device_suspend_late(), which will subsequently cause device_resume_early() to leave the device in suspend and avoid changing its state.
--- drivers/base/power/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/base/power/main.c +13 -1
@@ -628,8 +628,20 @@ static void device_resume_noirq(struct device *dev, pm_message_t state, bool asyif (dev->power.syscore || dev->power.direct_complete) goto Out; -if (!dev->power.is_noirq_suspended) +if (!dev->power.is_noirq_suspended) { +/* +* This means that system suspend has been aborted in the noirq +* phase before invoking the noirq suspend callback for the +* device, so if device_suspend_late() has left it in suspend, +* device_resume_early() should leave it in suspend either in +* case the early resume of it depends on the noirq resume that +* has not run. +*/ +if (dev_pm_skip_suspend (dev)) + dev->power.must_resume = false; + goto Out; + }if (!dpm_wait_for_superior (dev, async)) goto Out;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 42/262 vdso: Add struct __kernel_old_timeval forward declaration to gettime.h
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 437054b1bbe11be87ab0a522b8ccbae3f785c642 ]
The prototype of __vdso_gettimeofday() uses this struct. However gettime.h's own includes do not provide a definition for it.
Add a forward declaration, similar to other used structs.
--- include/vdso/gettime.h | 1 + 1 file changed, 1 insertion(+)
include/vdso/gettime.h +1 -0
@@ -5,6 +5,7 @@#include <linux/types.h> struct __kernel_timespec ; +struct __kernel_old_timeval ;struct timezone ;#if !defined(CONFIG_64BIT ) || defined(BUILD_VDSO32_64 )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 43/262 ARM: dts: ti: omap: am335x-baltos: Fix ti,en-ck32k-xtal property in DTS to use correct boolean syntax
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jihed Chaibi <[email protected]>
[ Upstream commit 9658a92fad1889ff92fa4bd668cd61052687245a ]
The ti,en-ck32k-xtal property, defined as a boolean in the Device Tree schema, was incorrectly assigned a value (<1>) in the DTS file, causing a validation error: "size (4) error for type flag". The driver uses of_property_read_bool(), expecting a boolean. Remove the value to fix the dtbs_check error.
--- arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi +1 -1
@@ -270,7 +270,7 @@ &tps { vcc7-supply = <&vbat>; vccio-supply = <&vbat>; - ti,en-ck32k-xtal = <1>; + ti,en-ck32k-xtal; regulators { vrtc_reg: regulator@0 {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 44/262 ARM: dts: ti: omap: omap3-devkit8000-lcd: Fix ti,keep-vref-on property to use correct boolean syntax in DTS
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jihed Chaibi <[email protected]>
[ Upstream commit 5af5b85505bc859adb338fe5d6e4842e72cdf932 ]
The ti,keep-vref-on property, defined as a boolean flag in the Device Tree schema, was incorrectly assigned a value (<1>) in the DTS file, causing a validation error: "size (4) error for type flag". Remove the value to match the schema and ensure compatibility with the driver using device_property_read_bool(). This fixes the dtbs_check error.
--- arch/arm/boot/dts/ti/omap/omap3-devkit8000-lcd-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/ti/omap/omap3-devkit8000-lcd-common.dtsi +1 -1
@@ -65,7 +65,7 @@ ads7846@0 { ti,debounce-max = /bits/ 16 <10>; ti,debounce-tol = /bits/ 16 <5>; ti,debounce-rep = /bits/ 16 <1>; - ti,keep-vref-on = <1>; + ti,keep-vref-on; ti,settle-delay-usec = /bits/ 16 <150>; wakeup-source;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 45/262 ARM: dts: omap: am335x-cm-t335: Remove unused mcasp num-serializer property
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jihed Chaibi <[email protected]>
[ Upstream commit 27322753c8b913fba05250e7b5abb1da31e6ed23 ]
The dtbs_check validation for am335x-cm-t335.dtb flags an error for an unevaluated 'num-serializer' property in the mcasp0 node.
This property is obsolete; it is not defined in the davinci-mcasp-audio schema and is not used by the corresponding (or any) driver.
Remove this unused property to fix the schema validation warning.
--- arch/arm/boot/dts/ti/omap/am335x-cm-t335.dts | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/ti/omap/am335x-cm-t335.dts +0 -2
@@ -483,8 +483,6 @@ &mcasp1 { op-mode = <0>; /* MCASP_IIS_MODE */ tdm-slots = <2>; - /* 16 serializers */ - num-serializer = <16>; serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0 >;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 46/262 PM / devfreq: mtk-cci: Fix potential error pointer dereference in probe()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit fc33bf0e097c6834646b98a7b3da0ae5b617f0f9 ]
The drv->sram_reg pointer could be set to ERR_PTR(-EPROBE_DEFER) which would lead to a error pointer dereference. Use IS_ERR_OR_NULL() to check that the pointer is valid.
--- drivers/devfreq/mtk-cci-devfreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/devfreq/mtk-cci-devfreq.c +2 -1
@@ -386,7 +386,8 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) out_free_resources:if (regulator_is_enabled (drv->proc_reg))regulator_disable (drv->proc_reg); -if (drv->sram_reg &®ulator_is_enabled (drv->sram_reg)) +if (!IS_ERR_OR_NULL (drv->sram_reg) && +regulator_is_enabled (drv->sram_reg))regulator_disable (drv->sram_reg);return ret;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 47/262 power: supply: cw2015: Fix a alignment coding style issue
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit def5612170a8c6c4c6a3ea5bd6c3cfc8de6ba4b1 ]
Fix the checkpatch warning:
CHECK: Alignment should match open parenthesis
--- drivers/power/supply/cw2015_battery.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/power/supply/cw2015_battery.c +1 -2
@@ -702,8 +702,7 @@ static int cw_bat_probe(struct i2c_client *client)if (!cw_bat->battery_workqueue)return -ENOMEM ; -devm_delayed_work_autocancel (&client->dev, - &cw_bat->battery_delay_work, cw_bat_work); +devm_delayed_work_autocancel (&client->dev, &cw_bat->battery_delay_work, cw_bat_work);queue_delayed_work (cw_bat->battery_workqueue, &cw_bat->battery_delay_work,msecs_to_jiffies (10 ));return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 48/262 pinctrl: renesas: Use int type to store negative error codes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 9f062fc5b0ff44550088912ab89f9da40226a826 ]
Change the 'ret' variable in sh_pfc_pinconf_group_set() from unsigned int to int, as it needs to store either negative error codes or zero returned by sh_pfc_pinconf_set().
No effect on runtime.
--- drivers/pinctrl/renesas/pinctrl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/renesas/pinctrl.c +2 -1
@@ -726,7 +726,8 @@ static int sh_pfc_pinconf_group_set(struct pinctrl_dev *pctldev, unsigned group,struct sh_pfc_pinctrl *pmx =pinctrl_dev_get_drvdata (pctldev);const unsigned int *pins;unsigned int num_pins; -unsigned int i, ret; +unsigned int i; +int ret; pins = pmx->pfc->info->groups[group].pins; num_pins = pmx->pfc->info->groups[group].nr_pins;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 49/262 null_blk: Fix the description of the cache_size module argument
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Genjian Zhang <[email protected]>
[ Upstream commit 7942b226e6b84df13b46b76c01d3b6e07a1b349e ]
When executing modinfo null_blk, there is an error in the description of module parameter mbps, and the output information of cache_size is incomplete.The output of modinfo before and after applying this patch is as follows:
Before:
[...]
parm: cache_size:ulong
[...]
parm: mbps:Cache size in MiB for memory-backed device.
Default: 0 (none) (uint)
[...]
After:
[...]
parm: cache_size:Cache size in MiB for memory-backed device.
Default: 0 (none) (ulong)
[...]
parm: mbps:Limit maximum bandwidth (in MiB/s).
Default: 0 (no limit) (uint)
[...]
--- drivers/block/null_blk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/null_blk/main.c +1 -1
@@ -223,7 +223,7 @@ MODULE_PARM_DESC(discard, "Support discard operations (requires memory-backed nustatic unsigned long g_cache_size;module_param_named (cache_size, g_cache_size, ulong,0444 ); -MODULE_PARM_DESC (mbps,"Cache size in MiB for memory-backed device. Default: 0 (none)" ); +MODULE_PARM_DESC (cache_size,"Cache size in MiB for memory-backed device. Default: 0 (none)" );static bool g_fua = true;module_param_named (fua, g_fua, bool,0444 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 50/262 selftests: vDSO: Fix -Wunitialized in powerpc VDSO_CALL() wrapper
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 9f15e0f9ef514b8e1a80707931f6d07362e8ebc4 ]
The _rval register variable is meant to be an output operand of the asm statement but is instead used as input operand.
clang 20.1 notices this and triggers -Wuninitialized warnings:
tools/testing/selftests/timers/auxclock.c:154:10: error: variable '_rval' is uninitialized when used here [-Werror,-Wuninitialized]
154 | return VDSO_CALL(self->vdso_clock_gettime64, 2, clockid, ts);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~tools/testing/selftests/timers/../vDSO/vdso_call.h:59:10: note: expanded from macro 'VDSO_CALL'
59 | : "r" (_rval) \
| ^~~~~tools/testing/selftests/timers/auxclock.c:154:10: note: variable '_rval' is declared here tools/testing/selftests/timers/../vDSO/vdso_call.h:47:2: note: expanded from macro 'VDSO_CALL'
47 | register long _rval asm ("r3"); \
| ^It seems the list of input and output operands have been switched around. However as the argument registers are not always initialized they can not be marked as pure inputs as that would trigger -Wuninitialized warnings. Adding _rval as another input and output operand does also not work as it would collide with the existing _r3 variable.
Instead reuse _r3 for both the argument and the return value.
--- tools/testing/selftests/vDSO/vdso_call.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
tools/testing/selftests/vDSO/vdso_call.h +3 -4
@@ -44,7 +44,6 @@ registerlong _r6 asm ("r6" ); \ registerlong _r7 asm ("r7" ); \ registerlong _r8 asm ("r8" ); \ - registerlong _rval asm ("r3" ); \ \ LOADARGS_##nr(fn, args); \ \
@@ -54,13 +53,13 @@" bns+ 1f\n" \" neg 3, 3\n" \"1:" \ - : "+r" (_r0), "=r" (_r3), "+r" (_r4), "+r" (_r5), \ + : "+r" (_r0), "+r" (_r3), "+r" (_r4), "+r" (_r5), \" +r" (_r6), " +r" (_r7), " +r" (_r8) \ - : "r" (_rval) \ +: \ : " r9", " r10", " r11", " r12", " cr0", " cr1", " cr5", \ "cr6", "cr7", "xer", "lr", "ctr", "memory" \ ); \ - _rval; \ + _r3; \ }) #else
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 51/262 selftests: vDSO: vdso_test_abi: Correctly skip whole test with missing vDSO
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 4b59a9f7628fd82b24f2148f62cf327a84d26555 ]
If AT_SYSINFO_EHDR is missing the whole test needs to be skipped. Currently this results in the following output:
TAP version 13
1..16
# AT_SYSINFO_EHDR is not present!
This output is incorrect, as "1..16" still requires the subtest lines to be printed, which isn't done however.
Switch to the correct skipping functions, so the output now correctly indicates that no subtests are being run:
TAP version 13
1..0 # SKIP AT_SYSINFO_EHDR is not present!
--- tools/testing/selftests/vDSO/vdso_test_abi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/testing/selftests/vDSO/vdso_test_abi.c +4 -5
@@ -182,12 +182,11 @@ int main(int argc, char **argv)unsigned long sysinfo_ehdr =getauxval (AT_SYSINFO_EHDR );ksft_print_header (); -ksft_set_plan (VDSO_TEST_PLAN ); -if (!sysinfo_ehdr) { -ksft_print_msg ("AT_SYSINFO_EHDR is not present!\n" ); -return KSFT_SKIP ; - } +if (!sysinfo_ehdr) +ksft_exit_skip ("AT_SYSINFO_EHDR is not present!\n" ); + +ksft_set_plan (VDSO_TEST_PLAN ); version = versions[VDSO_VERSION ]; name = (const char **)&names[VDSO_NAMES ];
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 52/262 arm64: dts: mediatek: mt8195: Remove suspend-breaking reset from pcie0
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoqing Jiang <[email protected]>
[ Upstream commit 3374b5fb26b300809ecd6aed9f414987dd17c313 ]
When test suspend resume with 6.8 based kernel, system can't resume and I got below error which can be also reproduced with 6.16 rc6+ kernel.
mtk-pcie-gen3 112f0000.pcie: PCIe link down, current LTSSM state: detect.quiet (0x0) mtk-pcie-gen3 112f0000.pcie: PM: dpm_run_callback(): genpd_resume_noirq returns -110 mtk-pcie-gen3 112f0000.pcie: PM: failed to resume noirq: error -110
After investigation, looks pcie0 has the same problem as pcie1 as decribed in commit 3d7fdd8e38aa ("arm64: dts: mediatek: mt8195:
Remove suspend-breaking reset from pcie1").
--- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 --- 1 file changed, 3 deletions(-)
arch/arm64/boot/dts/mediatek/mt8195.dtsi +0 -3
@@ -1563,9 +1563,6 @@ pcie0: pcie@112f0000 { power-domains = <&spm MT8195_POWER_DOMAIN_PCIE_MAC_P0>; - resets = <&infracfg_ao MT8195_INFRA_RST2_PCIE_P0_SWRST>; - reset-names = "mac"; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0 0 0 1 &pcie_intc0 0>,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 53/262 nbd: restrict sockets to TCP and UDP
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9f7c02e031570e8291a63162c6c046dc15ff85b0 ]
Recently, syzbot started to abuse NBD with all kinds of sockets.
Commit cf1b2326b734 ("nbd: verify socket is supported during setup") made sure the socket supported a shutdown() method.
Explicitely accept TCP and UNIX stream sockets.
--- drivers/block/nbd.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/block/nbd.c +8 -0
@@ -1156,6 +1156,14 @@ static struct socket *nbd_get_socket(struct nbd_device *nbd, unsigned long fd,if (!sock)return NULL ; +if (!sk_is_tcp (sock->sk) && + !sk_is_stream_unix (sock->sk)) { +dev_err (disk_to_dev (nbd->disk),"Unsupported socket: should be TCP or UNIX.\n" ); + *err = -EINVAL ; +sockfd_put (sock); +return NULL ; + } +if (sock->ops->shutdown == sock_no_shutdown) {dev_err (disk_to_dev (nbd->disk),"Unsupported socket: shutdown callout must be supported.\n" ); *err = -EINVAL ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 54/262 PM / devfreq: rockchip-dfi: double count on RK3588
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit f89c7fb83ae95578e355bed1a7aeea5f3ca5a067 ]
On RK3588 with LPDDR4X memory, the cycle count as returned by
perf stat -a -e rockchip_ddr/cycles/ sleep 1
consistently reads half as much as what the actual DDR frequency is at. For a LPDDR4X module running at 2112MHz, I get more like 1056059916 cycles per second, which is almost bang-on half what it should be. No, I'm not mixing up megatransfers and megahertz.
Consulting the downstream driver, this appears to be because the RK3588 hardware specifically (and RK3528 as well, for future reference) needs a multiplier of 2 to get to the correct frequency with everything but LPDDR5.
The RK3588's actual memory bandwidth measurements in MB/s are correct however, as confirmed with stress-ng --stream. This makes me think the access counters are not affected in the same way. This tracks with the vendor kernel not multiplying the access counts either.
Solve this by adding a new member to the dfi struct, which each SoC can set to whatever they want, but defaults to 1 if left unset by the SoC init functions. The event_get_count op can then use this multiplier if the cycle count is requested.
The cycle multiplier is not used in rockchip_dfi_get_event because the vendor driver doesn't use it there either, and we don't do other actual bandwidth unit conversion stuff in there anyway.
--- drivers/devfreq/event/rockchip-dfi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/devfreq/event/rockchip-dfi.c +6 -1
@@ -116,6 +116,7 @@ struct rockchip_dfi {int buswidth[DMC_MAX_CHANNELS ];int ddrmon_stride;bool ddrmon_ctrl_single; +unsigned int count_multiplier;/* number of data clocks per count */ };static int rockchip_dfi_enable (struct rockchip_dfi *dfi)
@@ -435,7 +436,7 @@ static u64 rockchip_ddr_perf_event_get_count(struct perf_event *event)switch (event->attr.config) {case PERF_EVENT_CYCLES : - count = total.c[0 ].clock_cycles; + count = total.c[0 ].clock_cycles * dfi->count_multiplier;break ;case PERF_EVENT_READ_BYTES :for (i =0 ; i < dfi->max_channels; i++)
@@ -656,6 +657,9 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi)break ; } +if (!dfi->count_multiplier) + dfi->count_multiplier =1 ; + ret =perf_pmu_register (pmu,"rockchip_ddr" ,-1 );if (ret)return ret;
@@ -752,6 +756,7 @@ static int rk3588_dfi_init(struct rockchip_dfi *dfi) dfi->max_channels =4 ; dfi->ddrmon_stride =0x4000 ; + dfi->count_multiplier =2 ;return 0 ; };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 55/262 firmware: firmware: meson-sm: fix compile-test default
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 0454346d1c5f7fccb3ef6e3103985de8ab3469f3 ]
Enabling compile testing should not enable every individual driver (we have "allyesconfig" for that).
--- drivers/firmware/meson/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/meson/Kconfig +1 -1
@@ -5,7 +5,7 @@ config MESON_SM tristate "Amlogic Secure Monitor driver" depends on ARCH_MESON || COMPILE_TEST - default y + default ARCH_MESON depends on ARM64_4K_PAGES help Say y here to enable the Amlogic secure monitor driver
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 56/262 soc: mediatek: mtk-svs: fix device leaks on mt8183 probe failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 6ab4f79ea92324f7f2eb22692054a34bbba7cf35 ]
Make sure to drop the references taken by of_find_device_by_node() when looking up the thermal sensor and opp devices during probe on probe failure (e.g. probe deferral) and on driver unbind.
--- drivers/soc/mediatek/mtk-svs.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/soc/mediatek/mtk-svs.c +15 -0
@@ -2167,6 +2167,13 @@ static struct device *svs_add_device_link(struct svs_platform *svsp,return dev; } +static void svs_put_device (void *_dev) +{ +struct device *dev = _dev; + +put_device (dev); +} +static int svs_mt8192_platform_probe (struct svs_platform *svsp) {struct device *dev;
@@ -2218,11 +2225,13 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp) {struct device *dev;u32 idx; +int ret; dev =svs_add_device_link (svsp,"thermal-sensor" );if (IS_ERR (dev))return dev_err_probe (svsp->dev,PTR_ERR (dev),"failed to get thermal device\n" ); +put_device (dev);for (idx =0 ; idx < svsp->bank_max; idx++) {struct svs_bank *svsb = &svsp->banks[idx];
@@ -2232,6 +2241,7 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp)case SVSB_SWID_CPU_LITTLE :case SVSB_SWID_CPU_BIG : svsb->opp_dev =get_cpu_device (bdata->cpu_id); +get_device (svsb->opp_dev);break ;case SVSB_SWID_CCI : svsb->opp_dev =svs_add_device_link (svsp,"cci" );
@@ -2248,6 +2258,11 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp)return dev_err_probe (svsp->dev,PTR_ERR (svsb->opp_dev),"failed to get OPP device for bank %d\n" , idx); + + ret =devm_add_action_or_reset (svsp->dev, svs_put_device, + svsb->opp_dev); +if (ret) +return ret; }return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 57/262 soc: mediatek: mtk-svs: fix device leaks on mt8192 probe failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit f1a68ba5739e42353609438e27a83b08d7f5cfd6 ]
Make sure to drop the references taken by of_find_device_by_node() when looking up the thermal sensor and opp devices during probe on probe failure (e.g. probe deferral) and on driver unbind.
--- drivers/soc/mediatek/mtk-svs.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/soc/mediatek/mtk-svs.c +8 -0
@@ -2178,6 +2178,7 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp) {struct device *dev;u32 idx; +int ret; svsp->rst =devm_reset_control_get_optional (svsp->dev,"svs_rst" );if (IS_ERR (svsp->rst))
@@ -2188,6 +2189,7 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp)if (IS_ERR (dev))return dev_err_probe (svsp->dev,PTR_ERR (dev),"failed to get lvts device\n" ); +put_device (dev);for (idx =0 ; idx < svsp->bank_max; idx++) {struct svs_bank *svsb = &svsp->banks[idx];
@@ -2197,6 +2199,7 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp)case SVSB_SWID_CPU_LITTLE :case SVSB_SWID_CPU_BIG : svsb->opp_dev =get_cpu_device (bdata->cpu_id); +get_device (svsb->opp_dev);break ;case SVSB_SWID_CCI : svsb->opp_dev =svs_add_device_link (svsp,"cci" );
@@ -2216,6 +2219,11 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp)return dev_err_probe (svsp->dev,PTR_ERR (svsb->opp_dev),"failed to get OPP device for bank %d\n" , idx); + + ret =devm_add_action_or_reset (svsp->dev, svs_put_device, + svsb->opp_dev); +if (ret) +return ret; }return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 58/262 cpuidle: qcom-spm: fix device and OF node leaks at probe
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit cdc06f912670c8c199d5fa9e78b64b7ed8e871d0 ]
Make sure to drop the reference to the saw device taken by of_find_device_by_node() after retrieving its driver data during probe().
Also drop the reference to the CPU node sooner to avoid leaking it in case there is no saw node or device.
--- drivers/cpuidle/cpuidle-qcom-spm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/cpuidle/cpuidle-qcom-spm.c +5 -2
@@ -96,20 +96,23 @@ static int spm_cpuidle_register(struct device *cpuidle_dev, int cpu)return -ENODEV ; saw_node =of_parse_phandle (cpu_node,"qcom,saw" ,0 ); +of_node_put (cpu_node);if (!saw_node)return -ENODEV ; pdev =of_find_device_by_node (saw_node);of_node_put (saw_node); -of_node_put (cpu_node);if (!pdev)return -ENODEV ; data =devm_kzalloc (cpuidle_dev,sizeof (*data),GFP_KERNEL ); -if (!data) +if (!data) { +put_device (&pdev->dev);return -ENOMEM ; + } data->spm =dev_get_drvdata (&pdev->dev); +put_device (&pdev->dev);if (!data->spm)return -EINVAL ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 59/262 arm64: dts: mediatek: mt8186-tentacruel: Fix touchscreen model
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit 0370911565869384f19b35ea9e71ee7a57b48a33 ]
The touchscreen controller used with the original Krabby design is the Elan eKTH6918, which is in the same family as eKTH6915, but supporting a larger screen size with more sense lines.
OTOH, the touchscreen controller that actually shipped on the Tentacruel devices is the Elan eKTH6A12NAY. A compatible string was added for it specifically because it has different power sequencing timings.
Fix up the touchscreen nodes for both these. This also includes adding a previously missing reset line. Also add "no-reset-on-power-off" since the power is always on, and putting it in reset would consume more power.
--- arch/arm64/boot/dts/mediatek/mt8186-corsola-krabby.dtsi | 8 ++++---- .../dts/mediatek/mt8186-corsola-tentacruel-sku262144.dts | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/mediatek/mt8186-corsola-krabby.dtsi +4 -4
@@ -71,14 +71,14 @@ &i2c1 { i2c-scl-internal-delay-ns = <10000>; touchscreen: touchscreen@10 { - compatible = "hid-over-i2c"; + compatible = "elan,ekth6915"; reg = <0x10>; interrupts-extended = <&pio 12 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; pinctrl-0 = <&touchscreen_pins>; - post-power-on-delay-ms = <10>; - hid-descr-addr = <0x0001>; - vdd-supply = <&pp3300_s3>; + reset-gpios = <&pio 60 GPIO_ACTIVE_LOW>; + vcc33-supply = <&pp3300_s3>; + no-reset-on-power-off; }; };
arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262144.dts +4 -0
@@ -42,3 +42,7 @@ MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP) CROS_STD_MAIN_KEYMAP >; }; + +&touchscreen { + compatible = "elan,ekth6a12nay"; +};
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 60/262 arm64: dts: mediatek: mt6331: Fix pmic, regulators, rtc, keys node names
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 98967109c9c0e2de4140827628c63f96314099ab ]
The node names for "pmic", "regulators", "rtc", and "keys" are dictated by the PMIC MFD binding: change those to adhere to it.
--- arch/arm64/boot/dts/mediatek/mt6331.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/mediatek/mt6331.dtsi +5 -5
@@ -6,12 +6,12 @@ #include <dt-bindings/input/input.h> &pwrap { - pmic: mt6331 { + pmic: pmic { compatible = "mediatek,mt6331"; interrupt-controller; #interrupt-cells = <2>; - mt6331regulator: mt6331regulator { + mt6331regulator: regulators { compatible = "mediatek,mt6331-regulator"; mt6331_vdvfs11_reg: buck-vdvfs11 {
@@ -258,7 +258,7 @@ mt6331_vrtc_reg: ldo-vrtc { }; mt6331_vdig18_reg: ldo-vdig18 { - regulator-name = "dvdd18_dig"; + regulator-name = "vdig18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-ramp-delay = <0>;
@@ -266,11 +266,11 @@ mt6331_vdig18_reg: ldo-vdig18 { }; }; - mt6331rtc: mt6331rtc { + mt6331rtc: rtc { compatible = "mediatek,mt6331-rtc"; }; - mt6331keys: mt6331keys { + mt6331keys: keys { compatible = "mediatek,mt6331-keys"; power { linux,keycodes = <KEY_POWER>;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 61/262 mmc: core: Fix variable shadowing in mmc_route_rpmb_frames()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bean Huo <[email protected]>
[ Upstream commit 072755cca7e743c28a273fcb69b0e826109473d7 ]
Rename the inner 'frm' variable to 'resp_frm' in the write path of mmc_route_rpmb_frames() to avoid shadowing the outer 'frm' variable.
The function declares 'frm' at function scope pointing to the request frame, but then redeclares another 'frm' variable inside the write block pointing to the response frame. This shadowing makes the code confusing and error-prone.
Using 'resp_frm' for the response frame makes the distinction clear and improves code readability.
--- drivers/mmc/core/block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/core/block.c +3 -3
@@ -2876,15 +2876,15 @@ static int mmc_route_rpmb_frames(struct device *dev, u8 *req,return -ENOMEM ;if (write) { -struct rpmb_frame *frm = (struct rpmb_frame *)resp; +struct rpmb_frame *resp_frm = (struct rpmb_frame *)resp;/* Send write request frame(s) */ set_idata (idata[0 ],MMC_WRITE_MULTIPLE_BLOCK ,1 |MMC_CMD23_ARG_REL_WR , req, req_len);/* Send result request frame */ -memset (frm,0 ,sizeof (*frm)); - frm->req_resp =cpu_to_be16 (RPMB_RESULT_READ ); +memset (resp_frm,0 ,sizeof (*resp_frm)); + resp_frm->req_resp =cpu_to_be16 (RPMB_RESULT_READ );set_idata (idata[1 ],MMC_WRITE_MULTIPLE_BLOCK ,1 , resp, resp_len);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 62/262 arm64: dts: mediatek: mt6795-xperia-m5: Fix mmc0 latch-ck value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 236681fb64102f25ed11df55999e6985c1bc2f7d ]
Change the latch-ck value from 0x14 to 4: as only bits [0-3] are actually used, the final value that gets written to the register field for DAT_LATCH_CK_SEL is just 0x4.
This also fixes dtbs_check warnings.
--- arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts +1 -1
@@ -212,7 +212,7 @@ proximity@48 { &mmc0 { /* eMMC controller */ - mediatek,latch-ck = <0x14>; /* hs400 */ + mediatek,latch-ck = <4>; /* hs400 */ mediatek,hs200-cmd-int-delay = <1>; mediatek,hs400-cmd-int-delay = <1>; mediatek,hs400-ds-dly3 = <0x1a>;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 63/262 arm64: dts: mediatek: mt8395-kontron-i1200: Fix MT6360 regulator nodes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 09a1e9c973973aff26e66a5673c19442d91b9e3d ]
All of the MT6360 regulator nodes were wrong and would not probe because the regulator names are supposed to be lower case, but they are upper case in this devicetree.
Change all nodes to be lower case to get working regulators.
--- .../mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts +8 -8
@@ -351,7 +351,7 @@ regulator { LDO_VIN2-supply = <&vsys>; LDO_VIN3-supply = <&vsys>; - mt6360_buck1: BUCK1 { + mt6360_buck1: buck1 { regulator-name = "emi_vdd2"; regulator-min-microvolt = <600000>; regulator-max-microvolt = <1800000>;
@@ -361,7 +361,7 @@ MT6360_OPMODE_LP regulator-always-on; }; - mt6360_buck2: BUCK2 { + mt6360_buck2: buck2 { regulator-name = "emi_vddq"; regulator-min-microvolt = <300000>; regulator-max-microvolt = <1300000>;
@@ -371,7 +371,7 @@ MT6360_OPMODE_LP regulator-always-on; }; - mt6360_ldo1: LDO1 { + mt6360_ldo1: ldo1 { regulator-name = "mt6360_ldo1"; /* Test point */ regulator-min-microvolt = <1200000>; regulator-max-microvolt = <3600000>;
@@ -379,7 +379,7 @@ mt6360_ldo1: LDO1 { MT6360_OPMODE_LP>; }; - mt6360_ldo2: LDO2 { + mt6360_ldo2: ldo2 { regulator-name = "panel1_p1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -387,7 +387,7 @@ mt6360_ldo2: LDO2 { MT6360_OPMODE_LP>; }; - mt6360_ldo3: LDO3 { + mt6360_ldo3: ldo3 { regulator-name = "vmc_pmu"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>;
@@ -395,7 +395,7 @@ mt6360_ldo3: LDO3 { MT6360_OPMODE_LP>; }; - mt6360_ldo5: LDO5 { + mt6360_ldo5: ldo5 { regulator-name = "vmch_pmu"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@@ -403,7 +403,7 @@ mt6360_ldo5: LDO5 { MT6360_OPMODE_LP>; }; - mt6360_ldo6: LDO6 { + mt6360_ldo6: ldo6 { regulator-name = "mt6360_ldo6"; /* Test point */ regulator-min-microvolt = <500000>; regulator-max-microvolt = <2100000>;
@@ -411,7 +411,7 @@ mt6360_ldo6: LDO6 { MT6360_OPMODE_LP>; }; - mt6360_ldo7: LDO7 { + mt6360_ldo7: ldo7 { regulator-name = "emi_vmddr_en"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 64/262 arm64: dts: mediatek: mt8516-pumpkin: Fix machine compatible
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit ffe6a5d1dd4d4d8af0779526cf4e40522647b25f ]
This devicetree contained only the SoC compatible but lacked the machine specific one: add a "mediatek,mt8516-pumpkin" compatible to the list to fix dtbs_check warnings.
--- arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "Pumpkin MT8516"; - compatible = "mediatek,mt8516"; + compatible = "mediatek,mt8516-pumpkin", "mediatek,mt8516"; memory@40000000 { device_type = "memory";
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 65/262 pwm: tiehrpwm: Dont drop runtime PM reference in .free()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 21a5e91fda50fc662ce1a12bd0aae9d103455b43 ]
The pwm driver calls pm_runtime_get_sync() when the hardware becomes enabled and pm_runtime_put_sync() when it becomes disabled. The PWM's state is kept when a consumer goes away, so the call to pm_runtime_put_sync() in the .free() callback is unbalanced resulting in a non-functional device and a reference underlow for the second consumer.
The easiest fix for that issue is to just not drop the runtime PM reference in .free(), so do that.
--- drivers/pwm/pwm-tiehrpwm.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/pwm/pwm-tiehrpwm.c +0 -5
@@ -391,11 +391,6 @@ static void ehrpwm_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) {struct ehrpwm_pwm_chip *pc =to_ehrpwm_pwm_chip (chip); -if (pwm_is_enabled (pwm)) { -dev_warn (pwmchip_parent (chip),"Removing PWM device without disabling\n" ); -pm_runtime_put_sync (pwmchip_parent (chip)); - } -/* set period value to zero on free */ pc->period_cycles[pwm->hwpwm] =0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 66/262 pwm: tiehrpwm: Make code comment in .free() more useful
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 878dbfc12cc52b17d79d205560c0fafcf5332b13 ]
Instead of explaining trivia to everyone who can read C describe the higher-level effect of setting pc->period_cycles[pwm->hwpwm] to zero.
--- drivers/pwm/pwm-tiehrpwm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-tiehrpwm.c +1 -1
@@ -391,7 +391,7 @@ static void ehrpwm_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) {struct ehrpwm_pwm_chip *pc =to_ehrpwm_pwm_chip (chip); -/* set period value to zero on free */ +/* Don't let a pwm without consumer block requests to the other channel */ pc->period_cycles[pwm->hwpwm] =0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 67/262 pwm: tiehrpwm: Fix various off-by-one errors in duty-cycle calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit bc7ce5bfc504eea9eac0eb0215017b9fcfc62c59 ]
In Up-Count Mode the timer is reset to zero one tick after it reaches TBPRD, so the period length is (TBPRD + 1) * T_TBCLK. This matches both the documentation and measurements. So the value written to the TBPRD has to be one less than the calculated period_cycles value.
A complication here is that for a 100% relative duty-cycle the value written to the CMPx register has to be TBPRD + 1 which might overflow if TBPRD is 0xffff. To handle that the calculation of the AQCTLx register has to be moved to ehrpwm_pwm_config() and the edge at CTR = CMPx has to be skipped.
Additionally the AQCTL_PRD register field has to be 0 because that defines the hardware's action when the maximal counter value is reached, which is (as above) one clock tick before the period's end. The period start edge has to happen when the counter is reset and so is defined in the AQCTL_ZRO field.
--- drivers/pwm/pwm-tiehrpwm.c | 143 +++++++++++++++---------------------- 1 file changed, 58 insertions(+), 85 deletions(-)
drivers/pwm/pwm-tiehrpwm.c +58 -85
@@ -36,7 +36,7 @@#define CLKDIV_MAX 7#define HSPCLKDIV_MAX 7 -#define PERIOD_MAX 0xFFFF +#define PERIOD_MAX 0x10000/* compare module registers */ #define CMPA 0x12
@@ -65,14 +65,10 @@#define AQCTL_ZRO_FRCHIGH BIT(1)#define AQCTL_ZRO_FRCTOGGLE (BIT(1) | BIT(0)) -#define AQCTL_CHANA_POLNORMAL (AQCTL_CAU_FRCLOW | AQCTL_PRD_FRCHIGH | \ - AQCTL_ZRO_FRCHIGH) -#define AQCTL_CHANA_POLINVERSED (AQCTL_CAU_FRCHIGH | AQCTL_PRD_FRCLOW | \ - AQCTL_ZRO_FRCLOW) -#define AQCTL_CHANB_POLNORMAL (AQCTL_CBU_FRCLOW | AQCTL_PRD_FRCHIGH | \ - AQCTL_ZRO_FRCHIGH) -#define AQCTL_CHANB_POLINVERSED (AQCTL_CBU_FRCHIGH | AQCTL_PRD_FRCLOW | \ - AQCTL_ZRO_FRCLOW) +#define AQCTL_CHANA_POLNORMAL (AQCTL_CAU_FRCLOW | AQCTL_ZRO_FRCHIGH) +#define AQCTL_CHANA_POLINVERSED (AQCTL_CAU_FRCHIGH | AQCTL_ZRO_FRCLOW) +#define AQCTL_CHANB_POLNORMAL (AQCTL_CBU_FRCLOW | AQCTL_ZRO_FRCHIGH) +#define AQCTL_CHANB_POLINVERSED (AQCTL_CBU_FRCHIGH | AQCTL_ZRO_FRCLOW)#define AQSFRC_RLDCSF_MASK (BIT(7) | BIT(6))#define AQSFRC_RLDCSF_ZRO 0
@@ -108,7 +104,6 @@ struct ehrpwm_pwm_chip {unsigned long clk_rate;void __iomem *mmio_base;unsigned long period_cycles[NUM_PWM_CHANNEL ]; -enum pwm_polarity polarity[NUM_PWM_CHANNEL ];struct clk *tbclk;struct ehrpwm_context ctx; };
@@ -177,51 +172,20 @@ static int set_prescale_div(unsigned long rqst_prescaler, u16 *prescale_div,return 1 ; } -static void configure_polarity (struct ehrpwm_pwm_chip *pc,int chan) -{ -u16 aqctl_val, aqctl_mask; -unsigned int aqctl_reg; - -/* -* Configure PWM output to HIGH/LOW level on counter -* reaches compare register value and LOW/HIGH level -* on counter value reaches period register value and -* zero value on counter -*/ -if (chan ==1 ) { - aqctl_reg =AQCTLB ; - aqctl_mask =AQCTL_CBU_MASK ; - -if (pc->polarity[chan] ==PWM_POLARITY_INVERSED ) - aqctl_val =AQCTL_CHANB_POLINVERSED ; -else - aqctl_val =AQCTL_CHANB_POLNORMAL ; - }else { - aqctl_reg =AQCTLA ; - aqctl_mask =AQCTL_CAU_MASK ; - -if (pc->polarity[chan] ==PWM_POLARITY_INVERSED ) - aqctl_val =AQCTL_CHANA_POLINVERSED ; -else - aqctl_val =AQCTL_CHANA_POLNORMAL ; - } - - aqctl_mask |=AQCTL_PRD_MASK |AQCTL_ZRO_MASK ; -ehrpwm_modify (pc->mmio_base, aqctl_reg, aqctl_mask, aqctl_val); -} -/* * period_ns = 10^9 * (ps_divval * period_cycles) / PWM_CLK_RATE * duty_ns = 10^9 * (ps_divval * duty_cycles) / PWM_CLK_RATE */ static int ehrpwm_pwm_config (struct pwm_chip *chip,struct pwm_device *pwm, -u64 duty_ns,u64 period_ns) +u64 duty_ns,u64 period_ns,enum pwm_polarity polarity) {struct ehrpwm_pwm_chip *pc =to_ehrpwm_pwm_chip (chip);u32 period_cycles, duty_cycles;u16 ps_divval, tb_divval;unsigned int i, cmp_reg;unsigned long long c; +u16 aqctl_val, aqctl_mask; +unsigned int aqctl_reg;if (period_ns >NSEC_PER_SEC )return -ERANGE ;
@@ -231,15 +195,10 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,do_div (c,NSEC_PER_SEC ); period_cycles = (unsigned long )c; -if (period_cycles <1 ) { - period_cycles =1 ; - duty_cycles =1 ; - }else { - c = pc->clk_rate; - c = c * duty_ns; -do_div (c,NSEC_PER_SEC ); - duty_cycles = (unsigned long )c; - } + c = pc->clk_rate; + c = c * duty_ns; +do_div (c,NSEC_PER_SEC ); + duty_cycles = (unsigned long )c;/* * Period values should be same for multiple PWM channels as IP uses
@@ -271,46 +230,67 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,return -EINVAL ; } -pm_runtime_get_sync (pwmchip_parent (chip)); - -/* Update clock prescaler values */ -ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_CLKDIV_MASK , tb_divval); -/* Update period & duty cycle with presacler division */ period_cycles = period_cycles / ps_divval; duty_cycles = duty_cycles / ps_divval; -/* Configure shadow loading on Period register */ -ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_PRDLD_MASK ,TBCTL_PRDLD_SHDW ); +if (period_cycles <1 ) + period_cycles =1 ; -ehrpwm_write (pc->mmio_base,TBPRD , period_cycles); +pm_runtime_get_sync (pwmchip_parent (chip)); -/* Configure ehrpwm counter for up-count mode */ -ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_CTRMODE_MASK , -TBCTL_CTRMODE_UP ); +/* Update clock prescaler values */ +ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_CLKDIV_MASK , tb_divval); -if (pwm->hwpwm ==1 ) +if (pwm->hwpwm ==1 ) {/* Channel 1 configured with compare B register */ cmp_reg =CMPB ; -else + + aqctl_reg =AQCTLB ; + aqctl_mask =AQCTL_CBU_MASK ; + +if (polarity ==PWM_POLARITY_INVERSED ) + aqctl_val =AQCTL_CHANB_POLINVERSED ; +else + aqctl_val =AQCTL_CHANB_POLNORMAL ; + +/* if duty_cycle is big, don't toggle on CBU */ +if (duty_cycles > period_cycles) + aqctl_val &= ~AQCTL_CBU_MASK ; + + }else {/* Channel 0 configured with compare A register */ cmp_reg =CMPA ; -ehrpwm_write (pc->mmio_base, cmp_reg, duty_cycles); + aqctl_reg =AQCTLA ; + aqctl_mask =AQCTL_CAU_MASK ; -pm_runtime_put_sync (pwmchip_parent (chip)); +if (polarity ==PWM_POLARITY_INVERSED ) + aqctl_val =AQCTL_CHANA_POLINVERSED ; +else + aqctl_val =AQCTL_CHANA_POLNORMAL ; -return 0 ; -} +/* if duty_cycle is big, don't toggle on CAU */ +if (duty_cycles > period_cycles) + aqctl_val &= ~AQCTL_CAU_MASK ; + } -static int ehrpwm_pwm_set_polarity (struct pwm_chip *chip, -struct pwm_device *pwm, -enum pwm_polarity polarity) -{ -struct ehrpwm_pwm_chip *pc =to_ehrpwm_pwm_chip (chip); + aqctl_mask |=AQCTL_PRD_MASK |AQCTL_ZRO_MASK ; +ehrpwm_modify (pc->mmio_base, aqctl_reg, aqctl_mask, aqctl_val); + +/* Configure shadow loading on Period register */ +ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_PRDLD_MASK ,TBCTL_PRDLD_SHDW ); + +ehrpwm_write (pc->mmio_base,TBPRD , period_cycles -1 ); + +/* Configure ehrpwm counter for up-count mode */ +ehrpwm_modify (pc->mmio_base,TBCTL ,TBCTL_CTRMODE_MASK , +TBCTL_CTRMODE_UP ); + +if (!(duty_cycles > period_cycles)) +ehrpwm_write (pc->mmio_base, cmp_reg, duty_cycles); -/* Configuration of polarity in hardware delayed, do at enable */ - pc->polarity[pwm->hwpwm] = polarity; +pm_runtime_put_sync (pwmchip_parent (chip));return 0 ; }
@@ -339,9 +319,6 @@ static int ehrpwm_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)ehrpwm_modify (pc->mmio_base,AQCSFRC , aqcsfrc_mask, aqcsfrc_val); -/* Channels polarity can be configured from action qualifier module */ -configure_polarity (pc, pwm->hwpwm); -/* Enable TBCLK */ ret =clk_enable (pc->tbclk);if (ret) {
@@ -406,10 +383,6 @@ static int ehrpwm_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,ehrpwm_pwm_disable (chip, pwm); enabled = false; } - - err =ehrpwm_pwm_set_polarity (chip, pwm, state->polarity); -if (err) -return err; }if (!state->enabled) {
@@ -418,7 +391,7 @@ static int ehrpwm_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,return 0 ; } - err =ehrpwm_pwm_config (chip, pwm, state->duty_cycle, state->period); + err =ehrpwm_pwm_config (chip, pwm, state->duty_cycle, state->period, state->polarity);if (err)return err;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 68/262 pwm: tiehrpwm: Fix corner case in clock divisor calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 00f83f0e07e44e2f1fb94b223e77ab7b18ee2d7d ]
The function set_prescale_div() is responsible for calculating the clock divisor settings such that the input clock rate is divided down such that the required period length is at most 0x10000 clock ticks. If period_cycles is an integer multiple of 0x10000, the divisor period_cycles / 0x10000 is good enough. So round up in the calculation of the required divisor and compare it using >= instead of >.
--- drivers/pwm/pwm-tiehrpwm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-tiehrpwm.c +2 -2
@@ -161,7 +161,7 @@ static int set_prescale_div(unsigned long rqst_prescaler, u16 *prescale_div, *prescale_div = (1 << clkdiv) * (hspclkdiv ? (hspclkdiv *2 ) :1 ); -if (*prescale_div > rqst_prescaler) { +if (*prescale_div >= rqst_prescaler) { *tb_clk_div = (clkdiv <<TBCTL_CLKDIV_SHIFT ) | (hspclkdiv <<TBCTL_HSPCLKDIV_SHIFT );return 0 ;
@@ -224,7 +224,7 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, pc->period_cycles[pwm->hwpwm] = period_cycles;/* Configure clock prescaler to support Low frequency PWM wave */ -if (set_prescale_div (period_cycles/PERIOD_MAX , &ps_divval, +if (set_prescale_div (DIV_ROUND_UP (period_cycles,PERIOD_MAX ), &ps_divval, &tb_divval)) {dev_err (pwmchip_parent (chip),"Unsupported values\n" );return -EINVAL ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 69/262 ACPICA: Fix largest possible resource descriptor index
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 8ca944fea4d6d9019e01f2d6f6e766f315a9d73f ]
ACPI_RESOURCE_NAME_LARGE_MAX should be equal to the last actually used resource descriptor index (ACPI_RESOURCE_NAME_CLOCK_INPUT).
Otherwise 'resource_index' in 'acpi_ut_validate_resource()' may be clamped incorrectly and resulting value may issue an out-of-bounds access for 'acpi_gbl_resource_types' array. Compile tested only.
--- drivers/acpi/acpica/aclocal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/acpica/aclocal.h +1 -1
@@ -1141,7 +1141,7 @@ struct acpi_port_info {#define ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION 0x91#define ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG 0x92#define ACPI_RESOURCE_NAME_CLOCK_INPUT 0x93 -#define ACPI_RESOURCE_NAME_LARGE_MAX 0x94 +#define ACPI_RESOURCE_NAME_LARGE_MAX 0x93/***************************************************************************** *
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 70/262 riscv, bpf: Sign extend struct ops return values properly
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hengqi Chen <[email protected]>
[ Upstream commit fd2e08128944a7679e753f920e9eda72057e427c ]
The ns_bpf_qdisc selftest triggers a kernel panic:
Unable to handle kernel paging request at virtual address ffffffffa38dbf58
Current test_progs pgtable: 4K pagesize, 57-bit VAs, pgdp=0x00000001109cc000
[ffffffffa38dbf58] pgd=000000011fffd801, p4d=000000011fffd401, pud=000000011fffd001, pmd=0000000000000000
Oops [#1]
Modules linked in: bpf_testmod(OE) xt_conntrack nls_iso8859_1 [...] [last unloaded: bpf_testmod(OE)]
CPU: 1 UID: 0 PID: 23584 Comm: test_progs Tainted: G W OE 6.17.0-rc1-g2465bb83e0b4 #1 NONE
Tainted: [W]=WARN, [O]=OOT_MODULE, [E]=UNSIGNED_MODULE
Hardware name: Unknown Unknown Product/Unknown Product, BIOS 2024.01+dfsg-1ubuntu5.1 01/01/2024
epc : __qdisc_run+0x82/0x6f0
ra : __qdisc_run+0x6e/0x6f0
epc : ffffffff80bd5c7a ra : ffffffff80bd5c66 sp : ff2000000eecb550
gp : ffffffff82472098 tp : ff60000096895940 t0 : ffffffff8001f180
t1 : ffffffff801e1664 t2 : 0000000000000000 s0 : ff2000000eecb5d0
s1 : ff60000093a6a600 a0 : ffffffffa38dbee8 a1 : 0000000000000001
a2 : ff2000000eecb510 a3 : 0000000000000001 a4 : 0000000000000000
a5 : 0000000000000010 a6 : 0000000000000000 a7 : 0000000000735049
s2 : ffffffffa38dbee8 s3 : 0000000000000040 s4 : ff6000008bcda000
s5 : 0000000000000008 s6 : ff60000093a6a680 s7 : ff60000093a6a6f0
s8 : ff60000093a6a6ac s9 : ff60000093140000 s10: 0000000000000000
s11: ff2000000eecb9d0 t3 : 0000000000000000 t4 : 0000000000ff0000
t5 : 0000000000000000 t6 : ff60000093a6a8b6
status: 0000000200000120 badaddr: ffffffffa38dbf58 cause: 000000000000000d
[<ffffffff80bd5c7a>] __qdisc_run+0x82/0x6f0
[<ffffffff80b6fe58>] __dev_queue_xmit+0x4c0/0x1128
[<ffffffff80b80ae0>] neigh_resolve_output+0xd0/0x170
[<ffffffff80d2daf6>] ip6_finish_output2+0x226/0x6c8
[<ffffffff80d31254>] ip6_finish_output+0x10c/0x2a0
[<ffffffff80d31446>] ip6_output+0x5e/0x178
[<ffffffff80d2e232>] ip6_xmit+0x29a/0x608
[<ffffffff80d6f4c6>] inet6_csk_xmit+0xe6/0x140
[<ffffffff80c985e4>] __tcp_transmit_skb+0x45c/0xaa8
[<ffffffff80c995fe>] tcp_connect+0x9ce/0xd10
[<ffffffff80d66524>] tcp_v6_connect+0x4ac/0x5e8
[<ffffffff80cc19b8>] __inet_stream_connect+0xd8/0x318
[<ffffffff80cc1c36>] inet_stream_connect+0x3e/0x68
[<ffffffff80b42b20>] __sys_connect_file+0x50/0x88
[<ffffffff80b42bee>] __sys_connect+0x96/0xc8
[<ffffffff80b42c40>] __riscv_sys_connect+0x20/0x30
[<ffffffff80e5bcae>] do_trap_ecall_u+0x256/0x378
[<ffffffff80e69af2>] handle_exception+0x14a/0x156
Code: 892a 0363 1205 489c 8bc1 c7e5 2d03 084a 2703 080a (2783) 0709
---[ end trace 0000000000000000 ]---The bpf_fifo_dequeue prog returns a skb which is a pointer. The pointer is treated as a 32bit value and sign extend to 64bit in epilogue. This behavior is right for most bpf prog types but wrong for struct ops which requires RISC-V ABI.
So let's sign extend struct ops return values according to the function model and RISC-V ABI([0]).
[0]: https://riscv.org/wp-content/uploads/2024/12/riscv-calling.pdf
--- arch/riscv/net/bpf_jit_comp64.c | 42 ++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
arch/riscv/net/bpf_jit_comp64.c +41 -1
@@ -559,6 +559,39 @@ static void emit_atomic(u8 rd, u8 rs, s16 off, s32 imm, bool is64, } } +/* +* Sign-extend the register if necessary +*/ +static int sign_extend (u8 rd,u8 rs,u8 sz,bool sign,struct rv_jit_context *ctx) +{ +if (!sign && (sz ==1 || sz ==2 )) { +if (rd != rs) +emit_mv (rd, rs, ctx); +return 0 ; + } + +switch (sz) { +case 1 : +emit_sextb (rd, rs, ctx); +break ; +case 2 : +emit_sexth (rd, rs, ctx); +break ; +case 4 : +emit_sextw (rd, rs, ctx); +break ; +case 8 : +if (rd != rs) +emit_mv (rd, rs, ctx); +break ; +default : +pr_err ("bpf-jit: invalid size %d for sign_extend\n" , sz); +return -EINVAL ; + } + +return 0 ; +} +#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)#define BPF_FIXUP_REG_MASK GENMASK(31, 27)#define REG_DONT_CLEAR_MARKER 0/* RV_REG_ZERO unused in pt_regmap */
@@ -1020,8 +1053,15 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,restore_args (min_t (int, nr_arg_slots,RV_MAX_REG_ARGS ), args_off, ctx);if (save_ret) { -emit_ld (RV_REG_A0 , -retval_off,RV_REG_FP , ctx);emit_ld (regmap[BPF_REG_0 ], -(retval_off -8 ),RV_REG_FP , ctx); +if (is_struct_ops) { + ret =sign_extend (RV_REG_A0 , regmap[BPF_REG_0 ], m->ret_size, + m->ret_flags &BTF_FMODEL_SIGNED_ARG , ctx); +if (ret) + goto out; + }else { +emit_ld (RV_REG_A0 , -retval_off,RV_REG_FP , ctx); + } }emit_ld (RV_REG_S1 , -sreg_off,RV_REG_FP , ctx);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 71/262 nvmet-fc: move lsop put work to nvmet_fc_ls_req_op
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Wagner <[email protected]>
[ Upstream commit db5a5406fb7e5337a074385c7a3e53c77f2c1bd3 ]
It’s possible for more than one async command to be in flight from __nvmet_fc_send_ls_req. For each command, a tgtport reference is taken.
In the current code, only one put work item is queued at a time, which results in a leaked reference.
To fix this, move the work item to the nvmet_fc_ls_req_op struct, which already tracks all resources related to the command.
--- drivers/nvme/target/fc.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/nvme/target/fc.c +9 -10
@@ -54,6 +54,8 @@ struct nvmet_fc_ls_req_op { /* for an LS RQST XMT */int ls_error;struct list_head lsreq_list;/* tgtport->ls_req_list */ bool req_queued; + +struct work_struct put_work; };
@@ -111,8 +113,6 @@ struct nvmet_fc_tgtport {struct nvmet_fc_port_entry *pe;struct kref ref;u32 max_sg_cnt; - -struct work_struct put_work; };struct nvmet_fc_port_entry {
@@ -235,12 +235,13 @@ static int nvmet_fc_tgt_a_get(struct nvmet_fc_tgt_assoc *assoc);static void nvmet_fc_tgt_q_put (struct nvmet_fc_tgt_queue *queue);static int nvmet_fc_tgt_q_get (struct nvmet_fc_tgt_queue *queue);static void nvmet_fc_tgtport_put (struct nvmet_fc_tgtport *tgtport); -static void nvmet_fc_put_tgtport_work (struct work_struct *work) +static void nvmet_fc_put_lsop_work (struct work_struct *work) { -struct nvmet_fc_tgtport *tgtport = - container_of(work, struct nvmet_fc_tgtport, put_work); +struct nvmet_fc_ls_req_op *lsop = + container_of(work, struct nvmet_fc_ls_req_op, put_work); -nvmet_fc_tgtport_put (tgtport); +nvmet_fc_tgtport_put (lsop->tgtport); +kfree (lsop); }static int nvmet_fc_tgtport_get (struct nvmet_fc_tgtport *tgtport); static void nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport,
@@ -367,7 +368,7 @@ __nvmet_fc_finish_ls_req(struct nvmet_fc_ls_req_op *lsop) DMA_BIDIRECTIONAL); out_putwork: -queue_work (nvmet_wq, &tgtport->put_work); +queue_work (nvmet_wq, &lsop->put_work); } static int
@@ -388,6 +389,7 @@ __nvmet_fc_send_ls_req(struct nvmet_fc_tgtport *tgtport, lsreq->done = done; lsop->req_queued = false;INIT_LIST_HEAD (&lsop->lsreq_list); +INIT_WORK (&lsop->put_work, nvmet_fc_put_lsop_work); lsreq->rqstdma = fc_dma_map_single(tgtport->dev, lsreq->rqstaddr, lsreq->rqstlen + lsreq->rsplen,
@@ -447,8 +449,6 @@ nvmet_fc_disconnect_assoc_done(struct nvmefc_ls_req *lsreq, int status)__nvmet_fc_finish_ls_req (lsop);/* fc-nvme target doesn't care about success or failure of cmd */ - -kfree (lsop); }/*
@@ -1412,7 +1412,6 @@ nvmet_fc_register_targetport(struct nvmet_fc_port_info *pinfo,kref_init (&newrec->ref);ida_init (&newrec->assoc_cnt); newrec->max_sg_cnt = template->max_sgl_segments; -INIT_WORK (&newrec->put_work, nvmet_fc_put_tgtport_work); ret =nvmet_fc_alloc_ls_iodlist (newrec);if (ret) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 72/262 i3c: master: svc: Use manual response for IBI events
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanley Chu <[email protected]>
[ Upstream commit a7869b0a2540fd122eccec00ae7d4243166b0a60 ]
Driver wants to nack the IBI request when the target is not in the known address list. In below code, svc_i3c_master_nack_ibi() will cause undefined behavior when using AUTOIBI with auto response rule, because hw always auto ack the IBI request.
switch (ibitype) {
case SVC_I3C_MSTATUS_IBITYPE_IBI:
dev = svc_i3c_master_dev_from_addr(master, ibiaddr);
if (!dev || !is_events_enabled(master, SVC_I3C_EVENT_IBI))
svc_i3c_master_nack_ibi(master);
...
break;AutoIBI has another issue that the controller doesn't quit AutoIBI state after IBIWON polling timeout when there is a SDA glitch(high->low->high).
1. SDA high->low: raising an interrupt to execute IBI ISR
2. SDA low->high
3. Driver writes an AutoIBI request
4. AutoIBI process does not start because SDA is not low
5. IBIWON polling times out
6. Controller reamins in AutoIBI state and doesn't accept EmitStop request
Emitting broadcast address with IBIRESP_MANUAL avoids both issues.
--- drivers/i3c/master/svc-i3c-master.c | 30 ++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-)
drivers/i3c/master/svc-i3c-master.c +25 -5
@@ -438,9 +438,24 @@ static void svc_i3c_master_ibi_work(struct work_struct *work)*/ writel (SVC_I3C_MINT_IBIWON , master->regs +SVC_I3C_MSTATUS ); -/* Acknowledge the incoming interrupt with the AUTOIBI mechanism */ -writel (SVC_I3C_MCTRL_REQUEST_AUTO_IBI | -SVC_I3C_MCTRL_IBIRESP_AUTO , +/* +* Write REQUEST_START_ADDR request to emit broadcast address for arbitration, +* instend of using AUTO_IBI. +* +* Using AutoIBI request may cause controller to remain in AutoIBI state when +* there is a glitch on SDA line (high->low->high). +* 1. SDA high->low, raising an interrupt to execute IBI isr. +* 2. SDA low->high. +* 3. IBI isr writes an AutoIBI request. +* 4. The controller will not start AutoIBI process because SDA is not low. +* 5. IBIWON polling times out. +* 6. Controller reamins in AutoIBI state and doesn't accept EmitStop request. +*/ +writel (SVC_I3C_MCTRL_REQUEST_START_ADDR | +SVC_I3C_MCTRL_TYPE_I3C | +SVC_I3C_MCTRL_IBIRESP_MANUAL | +SVC_I3C_MCTRL_DIR (SVC_I3C_MCTRL_DIR_WRITE ) | +SVC_I3C_MCTRL_ADDR (I3C_BROADCAST_ADDR ), master->regs +SVC_I3C_MCTRL );/* Wait for IBIWON, should take approximately 100us */
@@ -460,10 +475,15 @@ static void svc_i3c_master_ibi_work(struct work_struct *work)switch (ibitype) {case SVC_I3C_MSTATUS_IBITYPE_IBI : dev =svc_i3c_master_dev_from_addr (master, ibiaddr); -if (!dev || !is_events_enabled (master,SVC_I3C_EVENT_IBI )) +if (!dev || !is_events_enabled (master,SVC_I3C_EVENT_IBI )) {svc_i3c_master_nack_ibi (master); -else + }else { +if (dev->info.bcr &I3C_BCR_IBI_PAYLOAD ) +svc_i3c_master_ack_ibi (master, true); +else +svc_i3c_master_ack_ibi (master, false);svc_i3c_master_handle_ibi (master, dev); + }break ;case SVC_I3C_MSTATUS_IBITYPE_HOT_JOIN :if (is_events_enabled (master,SVC_I3C_EVENT_HOTJOIN ))
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 73/262 i3c: master: svc: Recycle unused IBI slot
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanley Chu <[email protected]>
[ Upstream commit 3448a934ba6f803911ac084d05a2ffce507ea6c6 ]
In svc_i3c_master_handle_ibi(), an IBI slot is fetched from the pool to store the IBI payload. However, when an error condition is encountered, the function returns without recycling the IBI slot, resulting in an IBI slot leak.
--- drivers/i3c/master/svc-i3c-master.c | 1 + 1 file changed, 1 insertion(+)
drivers/i3c/master/svc-i3c-master.c +1 -0
@@ -377,6 +377,7 @@ static int svc_i3c_master_handle_ibi(struct svc_i3c_master *master, SVC_I3C_MSTATUS_COMPLETE(val), 0, 1000);if (ret) {dev_err (master->dev,"Timeout when polling for COMPLETE\n" ); +i3c_generic_ibi_recycle_slot (data->ibi_pool, slot);return ret; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 74/262 selftests: watchdog: skip ping loop if WDIOF_KEEPALIVEPING not supported
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akhilesh Patil <[email protected]>
[ Upstream commit e8cfc524eaf3c0ed88106177edb6961e202e6716 ]
Check if watchdog device supports WDIOF_KEEPALIVEPING option before entering keep_alive() ping test loop. Fix watchdog-test silently looping if ioctl based ping is not supported by the device. Exit from test in such case instead of getting stuck in loop executing failing keep_alive()
watchdog_info:
identity: m41t93 rtc Watchdog
firmware_version: 0
Support/Status: Set timeout (in seconds)
Support/Status: Watchdog triggers a management or other external alarm not a reboot
Watchdog card disabled.
Watchdog timeout set to 5 seconds.
Watchdog ping rate set to 2 seconds.
Watchdog card enabled.WDIOC_KEEPALIVE not supported by this device
without this change
Watchdog card disabled.
Watchdog timeout set to 5 seconds.
Watchdog ping rate set to 2 seconds.
Watchdog card enabled.
Watchdog Ticking Away!
(Where test stuck here forver silently)
Updated change log at commit time:
Shuah Khan <[email protected]>
--- tools/testing/selftests/watchdog/watchdog-test.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/testing/selftests/watchdog/watchdog-test.c +6 -0
@@ -332,6 +332,12 @@ int main(int argc, char *argv[])if (oneshot) goto end; +/* Check if WDIOF_KEEPALIVEPING is supported */ +if (!(info.options &WDIOF_KEEPALIVEPING )) { +printf ("WDIOC_KEEPALIVE not supported by this device\n" ); + goto end; + } +printf ("Watchdog Ticking Away!\n" );/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 75/262 bpf: Explicitly check accesses to bpf_sock_addr
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit 6fabca2fc94d33cdf7ec102058983b086293395f ]
Syzkaller found a kernel warning on the following sock_addr program:
0: r0 = 0
1: r2 = *(u32 *)(r1 +60)
2: exitwhich triggers:
verifier bug: error during ctx access conversion (0)
This is happening because offset 60 in bpf_sock_addr corresponds to an implicit padding of 4 bytes, right after msg_src_ip4. Access to this padding isn't rejected in sock_addr_is_valid_access and it thus later fails to convert the access.
This patch fixes it by explicitly checking the various fields of bpf_sock_addr in sock_addr_is_valid_access.
I checked the other ctx structures and is_valid_access functions and didn't find any other similar cases. Other cases of (properly handled) padding are covered in new tests in a subsequent patch.
--- net/core/filter.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
net/core/filter.c +10 -6
@@ -9233,13 +9233,17 @@ static bool sock_addr_is_valid_access(int off, int size,return false; info->reg_type =PTR_TO_SOCKET ;break ; -default : -if (type ==BPF_READ ) { -if (size != size_default) -return false; - }else { + case bpf_ctx_range(struct bpf_sock_addr, user_family): + case bpf_ctx_range(struct bpf_sock_addr, family): + case bpf_ctx_range(struct bpf_sock_addr, type): + case bpf_ctx_range(struct bpf_sock_addr, protocol): +if (type !=BPF_READ )return false; - } +if (size != size_default) +return false; +break ; +default : +return false; }return true;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 76/262 bpf, arm64: Call bpf_jit_binary_pack_finalize() in bpf_jit_free()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hengqi Chen <[email protected]>
[ Upstream commit 6ff4a0fa3e1b2b9756254b477fb2f0fbe04ff378 ]
The current implementation seems incorrect and does NOT match the comment above, use bpf_jit_binary_pack_finalize() instead.
--- arch/arm64/net/bpf_jit_comp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/net/bpf_jit_comp.c +1 -2
@@ -2754,8 +2754,7 @@ void bpf_jit_free(struct bpf_prog *prog)* before freeing it. */ if (jit_data) { -bpf_arch_text_copy (&jit_data->ro_header->size, &jit_data->header->size, -sizeof (jit_data->header->size)); +bpf_jit_binary_pack_finalize (jit_data->ro_header, jit_data->header);kfree (jit_data); } hdr =bpf_jit_binary_pack_hdr (prog);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 77/262 smp: Fix up and expand the smp_call_function_many() kerneldoc
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit ccf09357ffef2ab472369ab9cdf470c9bc9b821a ]
The smp_call_function_many() kerneldoc comment got out of sync with the function definition (bool parameter "wait" is incorrectly described as a bitmask in it), so fix it up by copying the "wait" description from the smp_call_function() kerneldoc and add information regarding the handling of the local CPU to it.
--- kernel/smp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
kernel/smp.c +5 -6
@@ -891,16 +891,15 @@ static void smp_call_function_many_cond(const struct cpumask *mask,* @mask: The set of cpus to run on (only runs on online subset). * @func: The function to run. This must be fast and non-blocking. * @info: An arbitrary pointer to pass to the function. -* @wait: Bitmask that controls the operation. If %SCF_WAIT is set, wait -* (atomically) until function has completed on other CPUs. If -* %SCF_RUN_LOCAL is set, the function will also be run locally -* if the local CPU is set in the @cpumask. -* -* If @wait is true, then returns once @func has returned. +* @wait: If true, wait (atomically) until function has completed +* on other CPUs. * * You must not call this function with disabled interrupts or from a * hardware interrupt handler or from a bottom half handler. Preemption * must be disabled when calling this function. +* +* @func is not called on the local CPU even if @mask contains it. Consider +* using on_each_cpu_cond_mask() instead if this is not desirable. */ void smp_call_function_many (const struct cpumask *mask,smp_call_func_t func,void *info,bool wait)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 78/262 tools/nolibc: make time_t robust if __kernel_old_time_t is missing in host headers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhouyi Zhou <[email protected]>
[ Upstream commit 0ff52df6b32a6b04a7c9dfe3d7a387aff215b482 ]
Commit d5094bcb5bfd ("tools/nolibc: define time_t in terms of __kernel_old_time_t") made nolibc use the kernel's time type so that time_t matches timespec::tv_sec on all ABIs (notably x32).
But since __kernel_old_time_t is fairly new, notably from 2020 in commit 94c467ddb273 ("y2038: add __kernel_old_timespec and __kernel_old_time_t"), nolibc builds that rely on host headers may fail.
Switch to __kernel_time_t, which is the same as __kernel_old_time_t and has existed for longer.
Tested in PPC VM of Open Source Lab of Oregon State University (./tools/testing/selftests/rcutorture/bin/mkinitrd.sh)
--- tools/include/nolibc/std.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/include/nolibc/std.h +1 -1
@@ -33,6 +33,6 @@ typedef unsigned long nlink_t;typedef signed long off_t ;typedef signed long blksize_t ;typedef signed long blkcnt_t ; -typedef __kernel_old_time_t time_t ; +typedef __kernel_time_t time_t ;#endif /* _NOLIBC_STD_H */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 79/262 spi: fix return code when spi device has too many chipselects
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit 188f63235bcdd207646773a8739387d85347ed76 ]
Don't return a positive value when there are too many chipselects.
--- drivers/spi/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi.c +1 -1
@@ -2462,7 +2462,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,if (rc > ctlr->num_chipselect) {dev_err (&ctlr->dev,"%pOF has number of CS > ctlr->num_chipselect (%d)\n" , nc, rc); -return rc; +return -EINVAL ; }if ((of_property_read_bool (nc,"parallel-memories" )) && (!(ctlr->flags &SPI_CONTROLLER_MULTI_CS ))) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 80/262 bpf: Mark kfuncs as __noclone
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Righi <[email protected]>
[ Upstream commit d4680a11e14c7baf683cb8453d91d71d2e0b9d3e ]
Some distributions (e.g., CachyOS) support building the kernel with -O3, but doing so may break kfuncs, resulting in their symbols not being properly exported.
In fact, with gcc -O3, some kfuncs may be optimized away despite being annotated as noinline. This happens because gcc can still clone the function during IPA optimizations, e.g., by duplicating or inlining it into callers, and then dropping the standalone symbol. This breaks BTF ID resolution since resolve_btfids relies on the presence of a global symbol for each kfunc.
Currently, this is not an issue for upstream, because we don't allow building the kernel with -O3, but it may be safer to address it anyway, to prevent potential issues in the future if compilers become more aggressive with optimizations.
Therefore, add __noclone to __bpf_kfunc to ensure kfuncs are never cloned and remain distinct, globally visible symbols, regardless of the optimization level.
--- include/linux/btf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/btf.h +1 -1
@@ -82,7 +82,7 @@* as to avoid issues such as the compiler inlining or eliding either a static * kfunc, or a global kfunc in an LTO build. */ -#define __bpf_kfunc __used __retain noinline +#define __bpf_kfunc __used __retain __noclone noinline#define __bpf_kfunc_start_defs () \ __diag_push(); \
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 81/262 once: fix race by moving DO_ONCE to separate section
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qi Xi <[email protected]>
[ Upstream commit edcc8a38b5ac1a3dbd05e113a38a25b937ebefe5 ]
The commit c2c60ea37e5b ("once: use __section(".data.once")") moved DO_ONCE's ___done variable to .data.once section, which conflicts with DO_ONCE_LITE() that also uses the same section.
This creates a race condition when clear_warn_once is used:
Thread 1 (DO_ONCE) Thread 2 (DO_ONCE)__do_once_start
read ___done (false)
acquire once_lock
execute func__do_once_done
write ___done (true) __do_once_start
release once_lock // Thread 3 clear_warn_once reset ___done
read ___done (false) acquire once_lock
execute func
schedule once_work __do_once_done once_deferred: OK write ___done (true) static_branch_disable release once_lock
schedule once_work once_deferred:
BUG_ON(!static_key_enabled)
DO_ONCE_LITE() in once_lite.h is used by WARN_ON_ONCE() and other warning macros. Keep its ___done flag in the .data..once section and allow resetting by clear_warn_once, as originally intended.
In contrast, DO_ONCE() is used for functions like get_random_once() and relies on its ___done flag for internal synchronization. We should not reset DO_ONCE() by clear_warn_once.
Fix it by isolating DO_ONCE's ___done into a separate .data..do_once section, shielding it from clear_warn_once.
--- include/asm-generic/vmlinux.lds.h | 1 + include/linux/once.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
include/asm-generic/vmlinux.lds.h +1 -0
@@ -354,6 +354,7 @@ __start_once = .; \ *(.data..once) \ __end_once = .; \ + *(.data..do_once) \STRUCT_ALIGN (); \ *(__tracepoints) \/* implement dynamic printk debug */ \
include/linux/once.h +2 -2
@@ -46,7 +46,7 @@ void __do_once_sleepable_done(bool *done, struct static_key_true *once_key,#define DO_ONCE (func, ...) \ ({ \ bool ___ret = false; \ - static bool __section(".data..once") ___done = false; \ + static bool __section(".data..do_once") ___done = false; \ static DEFINE_STATIC_KEY_TRUE(___once_key); \ if (static_branch_unlikely(&___once_key)) { \ unsigned long ___flags; \
@@ -64,7 +64,7 @@ void __do_once_sleepable_done(bool *done, struct static_key_true *once_key,#define DO_ONCE_SLEEPABLE (func, ...) \ ({ \ bool ___ret = false; \ - static bool __section(".data..once") ___done = false; \ + static bool __section(".data..do_once") ___done = false; \ static DEFINE_STATIC_KEY_TRUE(___once_key); \ if (static_branch_unlikely(&___once_key)) { \ ___ret = __do_once_sleepable_start(&___done); \
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 82/262 hwmon: (mlxreg-fan) Separate methods of fan setting coming from different subsystems
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vadim Pasternak <[email protected]>
[ Upstream commit c02e4644f8ac9c501077ef5ac53ae7fc51472d49 ]
Distinct between fan speed setting request coming for hwmon and thermal subsystems.
There are fields 'last_hwmon_state' and 'last_thermal_state' in the structure 'mlxreg_fan_pwm', which respectively store the cooling state set by the 'hwmon' and 'thermal' subsystem.
The purpose is to make arbitration of fan speed setting. For example, if fan speed required to be not lower than some limit, such setting is to be performed through 'hwmon' subsystem, thus 'thermal' subsystem will not set fan below this limit.
Currently, the 'last_thermal_state' is also be updated by 'hwmon' causing cooling state to never be set to a lower value.
Eliminate update of 'last_thermal_state', when request is coming from 'hwmon' subsystem.
--- drivers/hwmon/mlxreg-fan.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/hwmon/mlxreg-fan.c +16 -8
@@ -113,8 +113,8 @@ struct mlxreg_fan {int divider; }; -static int mlxreg_fan_set_cur_state (struct thermal_cooling_device *cdev, -unsigned long state); +static int _mlxreg_fan_set_cur_state (struct thermal_cooling_device *cdev, +unsigned long state,bool thermal); static int mlxreg_fan_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
@@ -224,8 +224,9 @@ mlxreg_fan_write(struct device *dev, enum hwmon_sensor_types type, u32 attr,* last thermal state. */ if (pwm->last_hwmon_state >= pwm->last_thermal_state) -return mlxreg_fan_set_cur_state (pwm->cdev, - pwm->last_hwmon_state); +return _mlxreg_fan_set_cur_state (pwm->cdev, + pwm->last_hwmon_state, + false);return 0 ; }return regmap_write (fan->regmap, pwm->reg, val);
@@ -357,9 +358,8 @@ static int mlxreg_fan_get_cur_state(struct thermal_cooling_device *cdev,return 0 ; } -static int mlxreg_fan_set_cur_state (struct thermal_cooling_device *cdev, -unsigned long state) - +static int _mlxreg_fan_set_cur_state (struct thermal_cooling_device *cdev, +unsigned long state,bool thermal) {struct mlxreg_fan_pwm *pwm = cdev->devdata;struct mlxreg_fan *fan = pwm->fan;
@@ -369,7 +369,8 @@ static int mlxreg_fan_set_cur_state(struct thermal_cooling_device *cdev,return -EINVAL ;/* Save thermal state. */ - pwm->last_thermal_state = state; +if (thermal) + pwm->last_thermal_state = state; state = max_t(unsigned long, state, pwm->last_hwmon_state); err = regmap_write(fan->regmap, pwm->reg,
@@ -381,6 +382,13 @@ static int mlxreg_fan_set_cur_state(struct thermal_cooling_device *cdev,return 0 ; } +static int mlxreg_fan_set_cur_state (struct thermal_cooling_device *cdev, +unsigned long state) + +{ +return _mlxreg_fan_set_cur_state (cdev, state, true); +} +static const struct thermal_cooling_device_ops mlxreg_fan_cooling_ops = { .get_max_state = mlxreg_fan_get_max_state, .get_cur_state = mlxreg_fan_get_cur_state,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 83/262 thermal/drivers/qcom: Make LMH select QCOM_SCM
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 57eda47bd14b0c2876f2db42e757c57b7a671965 ]
The QCOM_SCM symbol is not user-visible, so it makes little sense to depend on it. Make LMH driver select QCOM_SCM as all other drivers do and, as the dependecy is now correctly handled, enable || COMPILE_TEST in order to include the driver into broader set of build tests.
--- drivers/thermal/qcom/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/thermal/qcom/Kconfig +2 -1
@@ -34,7 +34,8 @@ config QCOM_SPMI_TEMP_ALARM config QCOM_LMH tristate "Qualcomm Limits Management Hardware" - depends on ARCH_QCOM && QCOM_SCM + depends on ARCH_QCOM || COMPILE_TEST + select QCOM_SCM help This enables initialization of Qualcomm limits management hardware(LMh). LMh allows for hardware-enforced mitigation for cpus based on
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 84/262 thermal/drivers/qcom/lmh: Add missing IRQ includes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit b50b2c53f98fcdb6957e184eb488c16502db9575 ]
As reported by LKP, the Qualcomm LMH driver needs to include several IRQ-related headers, which decrlare necessary IRQ functionality. Currently driver builds on ARM64 platforms, where the headers are pulled in implicitly by other headers, but fails to build on other platforms.
--- drivers/thermal/qcom/lmh.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/thermal/qcom/lmh.c +2 -0
@@ -5,6 +5,8 @@*/ #include <linux/module.h> #include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/irqdesc.h> #include <linux/irqdomain.h> #include <linux/err.h> #include <linux/platform_device.h>
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 85/262 i2c: mediatek: fix potential incorrect use of I2C_MASTER_WRRD
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leilk.Liu <[email protected]>
[ Upstream commit b492183652808e0f389272bf63dc836241b287ff ]
The old IC does not support the I2C_MASTER_WRRD (write-then-read) function, but the current code’s handling of i2c->auto_restart may potentially lead to entering the I2C_MASTER_WRRD software flow, resulting in unexpected bugs.
Instead of repurposing the auto_restart flag, add a separate flag to signal I2C_MASTER_WRRD operations.
Also fix handling of msgs. If the operation (i2c->op) is I2C_MASTER_WRRD, then the msgs pointer is incremented by 2. For all other operations, msgs is simply incremented by 1.
--- drivers/i2c/busses/i2c-mt65xx.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-mt65xx.c +10 -7
@@ -1243,6 +1243,7 @@ static int mtk_i2c_transfer(struct i2c_adapter *adap, {int ret;int left_num = num; +bool write_then_read_en = false;struct mtk_i2c *i2c =i2c_get_adapdata (adap); ret =clk_bulk_enable (I2C_MT65XX_CLK_MAX , i2c->clocks);
@@ -1256,6 +1257,7 @@ static int mtk_i2c_transfer(struct i2c_adapter *adap,if (!(msgs[0 ].flags &I2C_M_RD ) && (msgs[1 ].flags &I2C_M_RD ) && msgs[0 ].addr == msgs[1 ].addr) { i2c->auto_restart =0 ; + write_then_read_en = true; } }
@@ -1280,12 +1282,10 @@ static int mtk_i2c_transfer(struct i2c_adapter *adap,else i2c->op =I2C_MASTER_WR ; -if (!i2c->auto_restart) { -if (num >1 ) { -/* combined two messages into one transaction */ - i2c->op =I2C_MASTER_WRRD ; - left_num--; - } +if (write_then_read_en) { +/* combined two messages into one transaction */ + i2c->op =I2C_MASTER_WRRD ; + left_num--; }/* always use DMA mode. */
@@ -1293,7 +1293,10 @@ static int mtk_i2c_transfer(struct i2c_adapter *adap,if (ret <0 ) goto err_exit; - msgs++; +if (i2c->op ==I2C_MASTER_WRRD ) + msgs +=2 ; +else + msgs++; }/* the return value is number of executed messages */ ret = num;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 86/262 i2c: designware: Fix clock issue when PM is disabled
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunihiko Hayashi <[email protected]>
[ Upstream commit 70e633bedeeb4a7290d3b1dd9d49cc2bae25a46f ]
When the driver is removed, the clocks are first enabled by calling pm_runtime_get_sync(), and then disabled with pm_runtime_put_sync().
If CONFIG_PM=y, clocks for this controller are disabled when it's in the idle state. So the clocks are properly disabled when the driver exits.
Othewise, the clocks are always enabled and the PM functions have no effect. Therefore, the driver exits without disabling the clocks.
# cat /sys/kernel/debug/clk/clk-pclk/clk_enable_count
18
# echo 1214a000.i2c > /sys/bus/platform/drivers/i2c_designware/bind
# cat /sys/kernel/debug/clk/clk-pclk/clk_enable_count
20
# echo 1214a000.i2c > /sys/bus/platform/drivers/i2c_designware/unbind
# cat /sys/kernel/debug/clk/clk-pclk/clk_enable_count
20To ensure that the clocks can be disabled correctly even without CONFIG_PM=y, should add the following fixes:
- Replace with pm_runtime_put_noidle(), which only decrements the runtime PM usage count.
- Call i2c_dw_prepare_clk(false) to explicitly disable the clocks.
--- drivers/i2c/busses/i2c-designware-platdrv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-designware-platdrv.c +3 -1
@@ -328,9 +328,11 @@ static void dw_i2c_plat_remove(struct platform_device *pdev)i2c_dw_disable (dev);pm_runtime_dont_use_autosuspend (device); -pm_runtime_put_sync (device); +pm_runtime_put_noidle (device);dw_i2c_plat_pm_cleanup (dev); +i2c_dw_prepare_clk (dev, false); +i2c_dw_remove_lock_support (dev);reset_control_assert (dev->rst);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 87/262 i2c: designware: Add disabling clocks when probe fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunihiko Hayashi <[email protected]>
[ Upstream commit c149841b069ccc6e480b00e11f35a57b5d88c7bb ]
After an error occurs during probing state, dw_i2c_plat_pm_cleanup() is called. However, this function doesn't disable clocks and the clock-enable count keeps increasing. Should disable these clocks explicitly.
--- drivers/i2c/busses/i2c-designware-platdrv.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-designware-platdrv.c +1 -0
@@ -311,6 +311,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) exit_probe:dw_i2c_plat_pm_cleanup (dev); +i2c_dw_prepare_clk (dev, false); exit_reset:reset_control_assert (dev->rst);return ret;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 88/262 libbpf: Fix error when st-prefix_ops and ops from differ btf
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: D. Wythe <[email protected]>
[ Upstream commit 0cc114dc358cf8da2ca23a366e761e89a46ca277 ]
When a module registers a struct_ops, the struct_ops type and its corresponding map_value type ("bpf_struct_ops_") may reside in different btf objects, here are four possible case:
+--------+---------------+-------------+---------------------------------+ | |bpf_struct_ops_| xxx_ops | | +--------+---------------+-------------+---------------------------------+ | case 0 | btf_vmlinux | btf_vmlinux | be used and reg only in vmlinux | +--------+---------------+-------------+---------------------------------+ | case 1 | btf_vmlinux | mod_btf | INVALID | +--------+---------------+-------------+---------------------------------+ | case 2 | mod_btf | btf_vmlinux | reg in mod but be used both in | | | | | vmlinux and mod. | +--------+---------------+-------------+---------------------------------+ | case 3 | mod_btf | mod_btf | be used and reg only in mod | +--------+---------------+-------------+---------------------------------+
Currently we figure out the mod_btf by searching with the struct_ops type, which makes it impossible to figure out the mod_btf when the struct_ops type is in btf_vmlinux while it's corresponding map_value type is in mod_btf (case 2).
The fix is to use the corresponding map_value type ("bpf_struct_ops_") as the lookup anchor instead of the struct_ops type to figure out the btf and mod_btf via find_ksym_btf_id(), and then we can locate the kern_type_id via btf__find_by_name_kind() with the btf we just obtained from find_ksym_btf_id().
With this change the lookup obtains the correct btf and mod_btf for case 2, preserves correct behavior for other valid cases, and still fails as expected for the invalid scenario (case 1).
--- tools/lib/bpf/libbpf.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-)
tools/lib/bpf/libbpf.c +17 -19
@@ -990,35 +990,33 @@ find_struct_ops_kern_types(struct bpf_object *obj, const char *tname_raw,const struct btf_member *kern_data_member;struct btf *btf =NULL ;__s32 kern_vtype_id, kern_type_id; -char tname[256 ]; +char tname[192 ], stname[256 ];__u32 i;snprintf (tname,sizeof (tname),"%.*s" , (int )bpf_core_essential_name_len (tname_raw), tname_raw); - kern_type_id =find_ksym_btf_id (obj, tname,BTF_KIND_STRUCT , - &btf, mod_btf); -if (kern_type_id <0 ) { -pr_warn ("struct_ops init_kern: struct %s is not found in kernel BTF\n" , - tname); -return kern_type_id; - } - kern_type =btf__type_by_id (btf, kern_type_id); +snprintf (stname,sizeof (stname),"%s%s" ,STRUCT_OPS_VALUE_PREFIX , tname); -/* Find the corresponding "map_value" type that will be used -* in map_update(BPF_MAP_TYPE_STRUCT_OPS). For example, -* find "struct bpf_struct_ops_tcp_congestion_ops" from the -* btf_vmlinux. +/* Look for the corresponding "map_value" type that will be used +* in map_update(BPF_MAP_TYPE_STRUCT_OPS) first, figure out the btf +* and the mod_btf. +* For example, find "struct bpf_struct_ops_tcp_congestion_ops". */ - kern_vtype_id =find_btf_by_prefix_kind (btf,STRUCT_OPS_VALUE_PREFIX , - tname,BTF_KIND_STRUCT ); + kern_vtype_id =find_ksym_btf_id (obj, stname,BTF_KIND_STRUCT , &btf, mod_btf);if (kern_vtype_id <0 ) { -pr_warn ("struct_ops init_kern: struct %s%s is not found in kernel BTF\n" , -STRUCT_OPS_VALUE_PREFIX , tname); +pr_warn ("struct_ops init_kern: struct %s is not found in kernel BTF\n" , stname);return kern_vtype_id; } kern_vtype =btf__type_by_id (btf, kern_vtype_id); + kern_type_id =btf__find_by_name_kind (btf, tname,BTF_KIND_STRUCT ); +if (kern_type_id <0 ) { +pr_warn ("struct_ops init_kern: struct %s is not found in kernel BTF\n" , tname); +return kern_type_id; + } + kern_type =btf__type_by_id (btf, kern_type_id); +/* Find "struct tcp_congestion_ops" from * struct bpf_struct_ops_tcp_congestion_ops { * [ ... ]
@@ -1031,8 +1029,8 @@ find_struct_ops_kern_types(struct bpf_object *obj, const char *tname_raw,break ; }if (i ==btf_vlen (kern_vtype)) { -pr_warn ("struct_ops init_kern: struct %s data is not found in struct %s%s\n" , - tname,STRUCT_OPS_VALUE_PREFIX , tname); +pr_warn ("struct_ops init_kern: struct %s data is not found in struct %s\n" , + tname, stname);return -EINVAL ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 89/262 bpf: Enforce expected_attach_type for tailcall compatibility
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 4540aed51b12bc13364149bf95f6ecef013197c0 ]
Yinhao et al. recently reported:
Our fuzzer tool discovered an uninitialized pointer issue in the bpf_prog_test_run_xdp() function within the Linux kernel's BPF subsystem. This leads to a NULL pointer dereference when a BPF program attempts to deference the txq member of struct xdp_buff object.
The test initializes two programs of BPF_PROG_TYPE_XDP: progA acts as the entry point for bpf_prog_test_run_xdp() and its expected_attach_type can neither be of be BPF_XDP_DEVMAP nor BPF_XDP_CPUMAP. progA calls into a slot of a tailcall map it owns. progB's expected_attach_type must be BPF_XDP_DEVMAP to pass xdp_is_valid_access() validation. The program returns struct xdp_md's egress_ifindex, and the latter is only allowed to be accessed under mentioned expected_attach_type. progB is then inserted into the tailcall which progA calls.
The underlying issue goes beyond XDP though. Another example are programs of type BPF_PROG_TYPE_CGROUP_SOCK_ADDR. sock_addr_is_valid_access() as well as sock_addr_func_proto() have different logic depending on the programs' expected_attach_type. Similarly, a program attached to BPF_CGROUP_INET4_GETPEERNAME should not be allowed doing a tailcall into a program which calls bpf_bind() out of BPF which is only enabled for BPF_CGROUP_INET4_CONNECT.
In short, specifying expected_attach_type allows to open up additional functionality or restrictions beyond what the basic bpf_prog_type enables. The use of tailcalls must not violate these constraints. Fix it by enforcing expected_attach_type in __bpf_prog_map_compatible().
Note that we only enforce this for tailcall maps, but not for BPF devmaps or
cpumaps: There, the programs are invoked through dev_map_bpf_prog_run*() and cpu_map_bpf_prog_run*() which set up a new environment / context and therefore these situations are not prone to this issue.
--- include/linux/bpf.h | 1 + kernel/bpf/core.c | 5 +++++ 2 files changed, 6 insertions(+)
include/linux/bpf.h +1 -0
@@ -281,6 +281,7 @@ struct bpf_map_owner {bool xdp_has_frags;u64 storage_cookie[MAX_BPF_CGROUP_STORAGE_TYPE ];const struct btf_type *attach_func_proto; +enum bpf_attach_type expected_attach_type; };struct bpf_map {
kernel/bpf/core.c +5 -0
@@ -2326,6 +2326,7 @@ static bool __bpf_prog_map_compatible(struct bpf_map *map, map->owner->type = prog_type; map->owner->jited = fp->jited; map->owner->xdp_has_frags = aux->xdp_has_frags; + map->owner->expected_attach_type = fp->expected_attach_type; map->owner->attach_func_proto = aux->attach_func_proto;for_each_cgroup_storage_type (i) { map->owner->storage_cookie[i] =
@@ -2337,6 +2338,10 @@ static bool __bpf_prog_map_compatible(struct bpf_map *map, ret = map->owner->type == prog_type && map->owner->jited == fp->jited && map->owner->xdp_has_frags == aux->xdp_has_frags; +if (ret && + map->map_type ==BPF_MAP_TYPE_PROG_ARRAY && + map->owner->expected_attach_type != fp->expected_attach_type) + ret = false;for_each_cgroup_storage_type (i) {if (!ret)break ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 90/262 drm/panel: novatek-nt35560: Fix invalid return value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brigham Campbell <[email protected]>
[ Upstream commit 125459e19ec654924e472f3ff5aeea40358dbebf ]
Fix bug in nt35560_set_brightness() which causes the function to erroneously report an error. mipi_dsi_dcs_write() returns either a negative value when an error occurred or a positive number of bytes written when no error occurred. The buggy code reports an error under either condition.
--- drivers/gpu/drm/panel/panel-novatek-nt35560.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-novatek-nt35560.c +1 -1
@@ -161,7 +161,7 @@ static int nt35560_set_brightness(struct backlight_device *bl) par =0x00 ; ret =mipi_dsi_dcs_write (dsi,MIPI_DCS_WRITE_CONTROL_DISPLAY , &par,1 ); -if (ret) { +if (ret <0 ) {dev_err (nt->dev,"failed to disable display backlight (%d)\n" , ret);return ret; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 91/262 drm/radeon/r600_cs: clean up of dead code in r600_cs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brahmajit Das <[email protected]>
[ Upstream commit 260dcf5b06d519bcf27a5dfdb5c626821a55c170 ]
GCC 16 enables -Werror=unused-but-set-variable= which results in build error with the following message.
drivers/gpu/drm/radeon/r600_cs.c: In function ‘r600_texture_size’:drivers/gpu/drm/radeon/r600_cs.c:1411:29: error: variable ‘level’ set but not used [-Werror=unused-but-set-variable=]
1411 | unsigned offset, i, level;
| ^~~~~
cc1: all warnings being treated as errors
make[6]: *** [scripts/Makefile.build:287: drivers/gpu/drm/radeon/r600_cs.o] Error 1
level although is set, but in never used in the function r600_texture_size. Thus resulting in dead code and this error getting triggered.
--- drivers/gpu/drm/radeon/r600_cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/r600_cs.c +2 -2
@@ -1408,7 +1408,7 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel, unsigned block_align, unsigned height_align, unsigned base_align, unsigned *l0_size, unsigned *mipmap_size) { - unsigned offset, i, level; + unsigned offset, i;unsigned width, height, depth, size;unsigned blocksize;unsigned nbx, nby;
@@ -1420,7 +1420,7 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel, w0 =r600_mip_minify (w0,0 ); h0 =r600_mip_minify (h0,0 ); d0 =r600_mip_minify (d0,0 ); -for (i =0 , offset =0 , level = blevel; i < nlevels; i++, level++) { +for (i =0 , offset =0 ; i < nlevels; i++) { width =r600_mip_minify (w0, i); nbx =r600_fmt_get_nblocksx (format, width);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 92/262 f2fs: fix condition in __allow_reserved_blocks()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit e75ce117905d2830976a289e718470f3230fa30a ]
If reserve_root mount option is not assigned, __allow_reserved_blocks() will return false, it's not correct, fix it.
--- fs/f2fs/f2fs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/f2fs/f2fs.h +1 -3
@@ -2331,8 +2331,6 @@ static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi, {if (!inode)return true; -if (!test_opt (sbi,RESERVE_ROOT )) -return false;if (IS_NOQUOTA (inode))return true;if (uid_eq (F2FS_OPTION (sbi).s_resuid,current_fsuid ()))
@@ -2353,7 +2351,7 @@ static inline unsigned int get_available_block_count(struct f2fs_sb_info *sbi, avail_user_block_count = sbi->user_block_count - sbi->current_reserved_blocks; -if (!__allow_reserved_blocks (sbi, inode, cap)) +if (test_opt (sbi,RESERVE_ROOT ) && !__allow_reserved_blocks (sbi, inode, cap)) avail_user_block_count -=F2FS_OPTION (sbi).root_reserved_blocks;if (unlikely (is_sbi_flag_set (sbi,SBI_CP_DISABLED ))) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 93/262 drm/bridge: it6505: select REGMAP_I2C
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chia-I Wu <[email protected]>
[ Upstream commit 21b137f651cf9d981e22d2c60a2a8105f50a6361 ]
Fix
aarch64-linux-gnu-ld: drivers/gpu/drm/bridge/ite-it6505.o: in function `it6505_i2c_probe':
ite-it6505.c:(.text+0x754): undefined reference to `__devm_regmap_init_i2c'
--- drivers/gpu/drm/bridge/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/Kconfig +1 -0
@@ -101,6 +101,7 @@ config DRM_ITE_IT6505 select EXTCON select CRYPTO select CRYPTO_HASH + select REGMAP_I2C help ITE IT6505 DisplayPort bridge chip driver.
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 94/262 media: zoran: Remove zoran_fh structure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacopo Mondi <[email protected]>
[ Upstream commit dc322d13cf417552b59e313e809a6da40b8b36ef ]
The zoran_fh structure is a wrapper around v4l2_fh. Its usage has been mostly removed by commit 83f89a8bcbc3 ("media: zoran: convert to vb2"), but the structure stayed by mistake. It is now used in a single location, assigned from a void pointer and then recast to a void pointer, without being every accessed. Drop it.
--- drivers/media/pci/zoran/zoran.h | 6 ------ drivers/media/pci/zoran/zoran_driver.c | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-)
drivers/media/pci/zoran/zoran.h +0 -6
@@ -154,12 +154,6 @@ struct zoran_jpg_settings {struct zoran ; -/* zoran_fh contains per-open() settings */ -struct zoran_fh { -struct v4l2_fh fh; -struct zoran *zr; -}; -struct card_info {enum card_type type;char name[32 ];
drivers/media/pci/zoran/zoran_driver.c +1 -2
@@ -511,12 +511,11 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh, struct v4l2_format *fmt) {struct zoran *zr =video_drvdata (file); -struct zoran_fh *fh = __fh;int i;int res =0 ;if (fmt->fmt.pix.pixelformat ==V4L2_PIX_FMT_MJPEG ) -return zoran_s_fmt_vid_out (file, fh, fmt); +return zoran_s_fmt_vid_out (file, __fh, fmt);for (i =0 ; i <NUM_FORMATS ; i++)if (fmt->fmt.pix.pixelformat == zoran_formats[i].fourcc)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 95/262 phy: rockchip: naneng-combphy: Enable U3 OTG port for RK3568
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 7bb14b61b7d03db770b7e8871493f5b9b2be2b79 ]
The boot firmware may disable the U3 port early during boot and leave it up to the controller or PHY driver to re-enable U3 when needed.
The Rockchip USBDP PHY driver currently does this for RK3576 and RK3588, something the Rockchip Naneng Combo PHY driver never does for RK3568. This may result in USB 3.0 ports being limited to only using USB 2.0 or in special cases not working at all on RK3568.
Write to PIPE_GRF USB3OTGx_CON1 reg to ensure the U3 port is enabled when a PHY with PHY_TYPE_USB3 mode is used.
--- drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +12 -0
@@ -122,6 +122,8 @@ struct rockchip_combphy_grfcfg {struct combphy_reg pipe_xpcs_phy_ready;struct combphy_reg pipe_pcie1l0_sel;struct combphy_reg pipe_pcie1l1_sel; +struct combphy_reg u3otg0_port_en; +struct combphy_reg u3otg1_port_en; };struct rockchip_combphy_cfg {
@@ -431,6 +433,14 @@ static int rk3568_combphy_cfg(struct rockchip_combphy_priv *priv)rockchip_combphy_param_write (priv->phy_grf, &cfg->pipe_txcomp_sel, false);rockchip_combphy_param_write (priv->phy_grf, &cfg->pipe_txelec_sel, false);rockchip_combphy_param_write (priv->phy_grf, &cfg->usb_mode_set, true); +switch (priv->id) { +case 0 : +rockchip_combphy_param_write (priv->pipe_grf, &cfg->u3otg0_port_en, true); +break ; +case 1 : +rockchip_combphy_param_write (priv->pipe_grf, &cfg->u3otg1_port_en, true); +break ; + }break ;case PHY_TYPE_SATA :
@@ -574,6 +584,8 @@ static const struct rockchip_combphy_grfcfg rk3568_combphy_grfcfgs = {/* pipe-grf */ .pipe_con0_for_sata = { 0x0000, 15, 0, 0x00, 0x2220 }, .pipe_xpcs_phy_ready = { 0x0040, 2, 2, 0x00, 0x01 }, + .u3otg0_port_en = { 0x0104, 15, 0, 0x0181, 0x1100 }, + .u3otg1_port_en = { 0x0144, 15, 0, 0x0181, 0x1100 }, }; static const struct rockchip_combphy_cfg rk3568_combphy_cfgs = {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 96/262 usb: host: max3421-hcd: Fix error pointer dereference in probe cleanup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 186e8f2bdba551f3ae23396caccd452d985c23e3 ]
The kthread_run() function returns error pointers so the max3421_hcd->spi_thread pointer can be either error pointers or NULL. Check for both before dereferencing it.
--- drivers/usb/host/max3421-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/max3421-hcd.c +1 -1
@@ -1916,7 +1916,7 @@ max3421_probe(struct spi_device *spi)if (hcd) {kfree (max3421_hcd->tx);kfree (max3421_hcd->rx); -if (max3421_hcd->spi_thread) +if (!IS_ERR_OR_NULL (max3421_hcd->spi_thread))kthread_stop (max3421_hcd->spi_thread);usb_put_hcd (hcd); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 97/262 usb: misc: qcom_eud: Access EUD_MODE_MANAGER2 through secure calls
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Komal Bajaj <[email protected]>
[ Upstream commit c0485e864a2eaa1d5a84c71e573dd236d0e885ae ]
EUD_MODE_MANAGER2 register is mapped to a memory region that is marked as read-only for operating system running at EL1, enforcing access restrictions that prohibit direct memory-mapped writes via writel().
Attempts to write to this region from HLOS can result in silent failures or memory access violations, particularly when toggling EUD (Embedded USB Debugger) state. To ensure secure register access, modify the driver to use qcom_scm_io_writel(), which routes the write operation to Qualcomm Secure Channel Monitor (SCM). SCM has the necessary permissions to access protected memory regions, enabling reliable control over EUD state.
SC7280, the only user of EUD is also affected, indicating that this could never have worked on a properly fused device.
--- drivers/usb/misc/Kconfig | 1 + drivers/usb/misc/qcom_eud.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-)
drivers/usb/misc/Kconfig +1 -0
@@ -147,6 +147,7 @@ config USB_APPLEDISPLAY config USB_QCOM_EUD tristate "QCOM Embedded USB Debugger(EUD) Driver" depends on ARCH_QCOM || COMPILE_TEST + select QCOM_SCM select USB_ROLE_SWITCH help This module enables support for Qualcomm Technologies, Inc.
drivers/usb/misc/qcom_eud.c +24 -9
@@ -15,6 +15,7 @@#include <linux/slab.h> #include <linux/sysfs.h> #include <linux/usb/role.h> +#include <linux/firmware/qcom/qcom_scm.h> #define EUD_REG_INT1_EN_MASK 0x0024#define EUD_REG_INT_STATUS_1 0x0044
@@ -34,7 +35,7 @@ struct eud_chip {struct device *dev;struct usb_role_switch *role_sw;void __iomem *base; -void __iomem *mode_mgr; +phys_addr_t mode_mgr;unsigned int int_status;int irq;bool enabled;
@@ -43,18 +44,29 @@ struct eud_chip {static int enable_eud (struct eud_chip *priv) { +int ret; + + ret =qcom_scm_io_writel (priv->mode_mgr +EUD_REG_EUD_EN2 ,1 ); +if (ret) +return ret; +writel (EUD_ENABLE , priv->base +EUD_REG_CSR_EUD_EN );writel (EUD_INT_VBUS |EUD_INT_SAFE_MODE , priv->base +EUD_REG_INT1_EN_MASK ); -writel (1 , priv->mode_mgr +EUD_REG_EUD_EN2 );return usb_role_switch_set_role (priv->role_sw,USB_ROLE_DEVICE ); } -static void disable_eud (struct eud_chip *priv) +static int disable_eud (struct eud_chip *priv) { +int ret; + + ret =qcom_scm_io_writel (priv->mode_mgr +EUD_REG_EUD_EN2 ,0 ); +if (ret) +return ret; +writel (0 , priv->base +EUD_REG_CSR_EUD_EN ); -writel (0 , priv->mode_mgr +EUD_REG_EUD_EN2 ); +return 0 ; } static ssize_t enable_show(struct device *dev,
@@ -82,11 +94,12 @@ static ssize_t enable_store(struct device *dev, chip->enabled = enable; elsedisable_eud (chip ); + }else { -disable_eud (chip); + ret =disable_eud (chip); } -return count; +return ret <0 ? ret : count; }static DEVICE_ATTR_RW (enable);
@@ -178,6 +191,7 @@ static void eud_role_switch_release(void *data)static int eud_probe (struct platform_device *pdev) {struct eud_chip *chip; +struct resource *res;int ret; chip =devm_kzalloc (&pdev->dev,sizeof (*chip),GFP_KERNEL );
@@ -200,9 +214,10 @@ static int eud_probe(struct platform_device *pdev)if (IS_ERR (chip->base))return PTR_ERR (chip->base); - chip->mode_mgr =devm_platform_ioremap_resource (pdev,1 ); -if (IS_ERR (chip->mode_mgr)) -return PTR_ERR (chip->mode_mgr); + res =platform_get_resource (pdev,IORESOURCE_MEM ,1 ); +if (!res) +return -ENODEV ; + chip->mode_mgr = res->start; chip->irq =platform_get_irq (pdev,0 );if (chip->irq <0 )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 98/262 serial: max310x: Add error checking in probe()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 672a37ba8af1f2ebcedeb94aea2cdd047f805f30 ]
Check if devm_i2c_new_dummy_device() fails.
--- drivers/tty/serial/max310x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/max310x.c +2 -0
@@ -1641,6 +1641,8 @@ static int max310x_i2c_probe(struct i2c_client *client) port_client =devm_i2c_new_dummy_device (&client->dev, client->adapter, port_addr); +if (IS_ERR (port_client)) +return PTR_ERR (port_client); regcfg_i2c.name =max310x_regmap_name (i); regmaps[i] =devm_regmap_init_i2c (port_client, ®cfg_i2c);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 99/262 drm/amd/display: Remove redundant semicolons
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liao Yuanhong <[email protected]>
[ Upstream commit 90b810dd859c0df9db2290da1ac5842e5f031267 ]
Remove unnecessary semicolons.
--- .../gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c +0 -1
@@ -139,7 +139,6 @@ void dml32_rq_dlg_get_rq_reg(display_rq_regs_st *rq_regs,if (dual_plane) {unsigned int p1_pte_row_height_linear =get_dpte_row_height_linear_c (mode_lib, e2e_pipe_param, num_pipes, pipe_idx); - ;if (src->sw_mode == dm_sw_linear)ASSERT (p1_pte_row_height_linear >=8 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 100/262 crypto: keembay - Add missing check after sg_nents_for_len()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 4e53be21dd0315c00eaf40cc8f8c0facd4d9a6b2 ]
sg_nents_for_len() returns an int which is negative in case of error.
--- drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c +4 -1
@@ -232,7 +232,7 @@ static int kmb_ocs_dma_prepare(struct ahash_request *req)struct device *dev = rctx->hcu_dev->dev;unsigned int remainder =0 ;unsigned int total; -size_t nents; +int nents;size_t count;int rc;int i;
@@ -253,6 +253,9 @@ static int kmb_ocs_dma_prepare(struct ahash_request *req)/* Determine the number of scatter gather list entries to process. */ nents =sg_nents_for_len (req->src, rctx->sg_data_total - remainder); +if (nents <0 ) +return nents; +/* If there are entries to process, map them. */ if (nents) { rctx->sg_dma_nents = dma_map_sg(dev, req->src, nents,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 101/262 hwrng: nomadik - add ARM_AMBA dependency
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit efaa2d815a0e4d1c06750e587100f6f7f4ee5497 ]
Compile-testing this driver is only possible when the AMBA bus driver is available in the kernel:
x86_64-linux-ld: drivers/char/hw_random/nomadik-rng.o: in function `nmk_rng_remove':
nomadik-rng.c:(.text+0x67): undefined reference to `amba_release_regions'
x86_64-linux-ld: drivers/char/hw_random/nomadik-rng.o: in function `nmk_rng_probe':
nomadik-rng.c:(.text+0xee): undefined reference to `amba_request_regions'
x86_64-linux-ld: nomadik-rng.c:(.text+0x18d): undefined reference to `amba_release_regions'
The was previously implied by the 'depends on ARCH_NOMADIK', but needs to be specified for the COMPILE_TEST case.
--- drivers/char/hw_random/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/char/hw_random/Kconfig +1 -0
@@ -286,6 +286,7 @@ config HW_RANDOM_INGENIC_TRNG config HW_RANDOM_NOMADIK tristate "ST-Ericsson Nomadik Random Number Generator support" depends on ARCH_NOMADIK || COMPILE_TEST + depends on ARM_AMBA default HW_RANDOM help This driver provides kernel-side support for the Random Number
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 102/262 scsi: pm80xx: Fix array-index-out-of-of-bounds on rmmod
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit 251be2f6037fb7ab399f68cd7428ff274133d693 ]
Since commit f7b705c238d1 ("scsi: pm80xx: Set phy_attached to zero when device is gone") UBSAN reports:
UBSAN: array-index-out-of-bounds in drivers/scsi/pm8001/pm8001_sas.c:786:17 index 28 is out of range for type 'pm8001_phy [16]'
on rmmod when using an expander.
For a direct attached device, attached_phy contains the local phy id. For a device behind an expander, attached_phy contains the remote phy id, not the local phy id.
I.e. while pm8001_ha will have pm8001_ha->chip->n_phy local phys, for a device behind an expander, attached_phy can be much larger than pm8001_ha->chip->n_phy (depending on the amount of phys of the expander).
E.g. on my system pm8001_ha has 8 phys with phy ids 0-7. One of the ports has an expander connected. The expander has 31 phys with phy ids 0-30.
The pm8001_ha->phy array only contains the phys of the HBA. It does not contain the phys of the expander. Thus, it is wrong to use attached_phy to index the pm8001_ha->phy array for a device behind an expander.
Thus, we can only clear phy_attached for devices that are directly attached.
--- drivers/scsi/pm8001/pm8001_sas.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_sas.c +8 -1
@@ -703,6 +703,7 @@ static void pm8001_dev_gone_notify(struct domain_device *dev)unsigned long flags =0 ;struct pm8001_hba_info *pm8001_ha;struct pm8001_device *pm8001_dev = dev->lldd_dev; +struct domain_device *parent_dev = dev->parent; pm8001_ha =pm8001_find_ha_by_dev (dev);spin_lock_irqsave (&pm8001_ha->lock, flags);
@@ -719,7 +720,13 @@ static void pm8001_dev_gone_notify(struct domain_device *dev)spin_lock_irqsave (&pm8001_ha->lock, flags); }PM8001_CHIP_DISP ->dereg_dev_req (pm8001_ha, device_id); - pm8001_ha->phy[pm8001_dev->attached_phy].phy_attached =0 ; + +/* +* The phy array only contains local phys. Thus, we cannot clear +* phy_attached for a device behind an expander. +*/ +if (!(parent_dev &&dev_is_expander (parent_dev->dev_type))) + pm8001_ha->phy[pm8001_dev->attached_phy].phy_attached =0 ;pm8001_free_dev (pm8001_dev); }else {pm8001_dbg (pm8001_ha,DISC ,"Found dev has gone.\n" );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 103/262 scsi: myrs: Fix dma_alloc_coherent() error check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit edb35b1ffc686fd9b5a91902f034eb9f4d2c9f6b ]
Check for NULL return value with dma_alloc_coherent(), because DMA address is not always set by dma_alloc_coherent() on failure.
--- drivers/scsi/myrs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/myrs.c +4 -4
@@ -498,14 +498,14 @@ static bool myrs_enable_mmio_mbox(struct myrs_hba *cs,/* Temporary dma mapping, used only in the scope of this function */ mbox =dma_alloc_coherent (&pdev->dev,sizeof (union myrs_cmd_mbox ), &mbox_addr,GFP_KERNEL ); -if (dma_mapping_error (&pdev->dev, mbox_addr)) +if (!mbox)return false;/* These are the base addresses for the command memory mailbox array */ cs->cmd_mbox_size =MYRS_MAX_CMD_MBOX *sizeof (union myrs_cmd_mbox ); cmd_mbox =dma_alloc_coherent (&pdev->dev, cs->cmd_mbox_size, &cs->cmd_mbox_addr,GFP_KERNEL ); -if (dma_mapping_error (&pdev->dev, cs->cmd_mbox_addr)) { +if (!cmd_mbox) {dev_err (&pdev->dev,"Failed to map command mailbox\n" ); goto out_free; }
@@ -520,7 +520,7 @@ static bool myrs_enable_mmio_mbox(struct myrs_hba *cs, cs->stat_mbox_size =MYRS_MAX_STAT_MBOX *sizeof (struct myrs_stat_mbox ); stat_mbox =dma_alloc_coherent (&pdev->dev, cs->stat_mbox_size, &cs->stat_mbox_addr,GFP_KERNEL ); -if (dma_mapping_error (&pdev->dev, cs->stat_mbox_addr)) { +if (!stat_mbox) {dev_err (&pdev->dev,"Failed to map status mailbox\n" ); goto out_free; }
@@ -533,7 +533,7 @@ static bool myrs_enable_mmio_mbox(struct myrs_hba *cs, cs->fwstat_buf =dma_alloc_coherent (&pdev->dev,sizeof (struct myrs_fwstat ), &cs->fwstat_addr,GFP_KERNEL ); -if (dma_mapping_error (&pdev->dev, cs->fwstat_addr)) { +if (!cs->fwstat_buf) {dev_err (&pdev->dev,"Failed to map firmware health buffer\n" ); cs->fwstat_buf =NULL ; goto out_free;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 104/262 crypto: octeontx2 - Call strscpy() with correct size argument
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
[ Upstream commit 361fa7f813e7056cecdb24f3582ab0ad4a088e4e ]
In otx2_cpt_dl_custom_egrp_create(), strscpy() is called with the length of the source string rather than the size of the destination buffer.
This is fine as long as the destination buffer is larger than the source string, but we should still use the destination buffer size instead to call strscpy() as intended. And since 'tmp_buf' is a fixed-size buffer, we can safely omit the size argument and let strscpy() infer it using sizeof().
--- drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +1 -1
@@ -1614,7 +1614,7 @@ int otx2_cpt_dl_custom_egrp_create(struct otx2_cptpf_dev *cptpf,return -EINVAL ; } err_msg ="Invalid engine group format" ; -strscpy (tmp_buf, ctx->val.vstr,strlen (ctx->val.vstr) +1 ); +strscpy (tmp_buf, ctx->val.vstr); start = tmp_buf; has_se = has_ie = has_ae = false;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 105/262 media: rj54n1cb0c: Fix memleak in rj54n1_probe()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Shurong <[email protected]>
[ Upstream commit fda55673ecdabf25f5ecc61b5ab17239257ac252 ]
rj54n1_probe() won't clean all the allocated resources in fail path, which may causes the memleaks. Add v4l2_ctrl_handler_free() to prevent memleak.
--- drivers/media/i2c/rj54n1cb0c.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/i2c/rj54n1cb0c.c +6 -3
@@ -1329,10 +1329,13 @@ static int rj54n1_probe(struct i2c_client *client) V4L2_CID_GAIN, 0, 127, 1, 66);v4l2_ctrl_new_std (&rj54n1->hdl, &rj54n1_ctrl_ops,V4L2_CID_AUTO_WHITE_BALANCE ,0 ,1 ,1 ,1 ); - rj54n1->subdev.ctrl_handler = &rj54n1->hdl; -if (rj54n1->hdl.error) -return rj54n1->hdl.error; +if (rj54n1->hdl.error) { + ret = rj54n1->hdl.error; + goto err_free_ctrl; + } + + rj54n1->subdev.ctrl_handler = &rj54n1->hdl; rj54n1->clk_div = clk_div; rj54n1->rect.left =RJ54N1_COLUMN_SKIP ; rj54n1->rect.top =RJ54N1_ROW_SKIP ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 106/262 RDMA/mlx5: Better estimate max_qp_wr to reflect WQE count
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Or Har-Toov <[email protected]>
[ Upstream commit 1a7c18c485bf17ef408d5ebb7f83e1f8ef329585 ]
The mlx5 driver currently derives max_qp_wr directly from the log_max_qp_sz HCA capability:
props->max_qp_wr = 1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
However, this value represents the number of WQEs in units of Basic Blocks (see MLX5_SEND_WQE_BB), not actual number of WQEs. Since the size of a WQE can vary depending on transport type and features (e.g., atomic operations, UMR, LSO), the actual number of WQEs can be significantly smaller than the WQEBB count suggests.
This patch introduces a conservative estimation of the worst-case WQE size — considering largest segments possible with 1 SGE and no inline data or special features. It uses this to derive a more accurate max_qp_wr value.
--- drivers/infiniband/hw/mlx5/main.c | 48 ++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/main.c +47 -1
@@ -13,6 +13,7 @@#include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/bitmap.h> +#include <linux/log2.h> #include <linux/sched.h> #include <linux/sched/mm.h> #include <linux/sched/task.h>
@@ -865,6 +866,51 @@ static void fill_esw_mgr_reg_c0(struct mlx5_core_dev *mdev, resp->reg_c0.mask =mlx5_eswitch_get_vport_metadata_mask (); } +/* +* Calculate maximum SQ overhead across all QP types. +* Other QP types (REG_UMR, UC, RC, UD/SMI/GSI, XRC_TGT) +* have smaller overhead than the types calculated below, +* so they are implicitly included. +*/ +static u32 mlx5_ib_calc_max_sq_overhead (void ) +{ +u32 max_overhead_xrc, overhead_ud_lso, a, b; + +/* XRC_INI */ + max_overhead_xrc =sizeof (struct mlx5_wqe_xrc_seg ); + max_overhead_xrc +=sizeof (struct mlx5_wqe_ctrl_seg ); + a =sizeof (struct mlx5_wqe_atomic_seg ) + +sizeof (struct mlx5_wqe_raddr_seg ); + b =sizeof (struct mlx5_wqe_umr_ctrl_seg ) + +sizeof (struct mlx5_mkey_seg ) + +MLX5_IB_SQ_UMR_INLINE_THRESHOLD /MLX5_IB_UMR_OCTOWORD ; + max_overhead_xrc +=max (a, b); + +/* UD with LSO */ + overhead_ud_lso =sizeof (struct mlx5_wqe_ctrl_seg ); + overhead_ud_lso +=sizeof (struct mlx5_wqe_eth_pad ); + overhead_ud_lso +=sizeof (struct mlx5_wqe_eth_seg ); + overhead_ud_lso +=sizeof (struct mlx5_wqe_datagram_seg ); + +return max (max_overhead_xrc, overhead_ud_lso); +} + +static u32 mlx5_ib_calc_max_qp_wr (struct mlx5_ib_dev *dev) +{ +struct mlx5_core_dev *mdev = dev->mdev; +u32 max_wqe_bb_units =1 <<MLX5_CAP_GEN (mdev, log_max_qp_sz); +u32 max_wqe_size; +/* max QP overhead + 1 SGE, no inline, no special features */ + max_wqe_size =mlx5_ib_calc_max_sq_overhead () + +sizeof (struct mlx5_wqe_data_seg ); + + max_wqe_size =roundup_pow_of_two (max_wqe_size); + + max_wqe_size =ALIGN (max_wqe_size,MLX5_SEND_WQE_BB ); + +return (max_wqe_bb_units *MLX5_SEND_WQE_BB ) / max_wqe_size; +} +static int mlx5_ib_query_device (struct ib_device *ibdev,struct ib_device_attr *props,struct ib_udata *uhw)
@@ -1023,7 +1069,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, props->max_mr_size = ~0ull ; props->page_size_cap = ~(min_page_size -1 ); props->max_qp =1 <<MLX5_CAP_GEN (mdev, log_max_qp); - props->max_qp_wr =1 <<MLX5_CAP_GEN (mdev, log_max_qp_sz); + props->max_qp_wr =mlx5_ib_calc_max_qp_wr (dev); max_rq_sg =MLX5_CAP_GEN (mdev, max_wqe_sz_rq) /sizeof (struct mlx5_wqe_data_seg ); max_sq_desc =min_t (int,MLX5_CAP_GEN (mdev, max_wqe_sz_sq),512 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 107/262 RDMA/mlx5: Fix vport loopback forcing for MPV device
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 08aae7860450c89eebbc6fd4d38416e53c7a33d2 ]
Previously loopback for MPV was supposed to be permanently enabled, however other driver flows were able to over-ride that configuration and disable it.
Add force_lb parameter that indicates that loopback should always be enabled which prevents all other driver flows from disabling it.
--- drivers/infiniband/hw/mlx5/main.c | 19 +++++++++++++++---- drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-)
drivers/infiniband/hw/mlx5/main.c +15 -4
@@ -1813,7 +1813,8 @@ static void deallocate_uars(struct mlx5_ib_dev *dev, }static int mlx5_ib_enable_lb_mp (struct mlx5_core_dev *master, -struct mlx5_core_dev *slave) +struct mlx5_core_dev *slave, +struct mlx5_ib_lb_state *lb_state) {int err;
@@ -1825,6 +1826,7 @@ static int mlx5_ib_enable_lb_mp(struct mlx5_core_dev *master,if (err) goto out; + lb_state->force_enable = true;return 0 ; out:
@@ -1833,16 +1835,22 @@ static int mlx5_ib_enable_lb_mp(struct mlx5_core_dev *master, }static void mlx5_ib_disable_lb_mp (struct mlx5_core_dev *master, -struct mlx5_core_dev *slave) +struct mlx5_core_dev *slave, +struct mlx5_ib_lb_state *lb_state) {mlx5_nic_vport_update_local_lb (slave, false);mlx5_nic_vport_update_local_lb (master, false); + + lb_state->force_enable = false; }int mlx5_ib_enable_lb (struct mlx5_ib_dev *dev,bool td,bool qp) {int err =0 ; +if (dev->lb.force_enable) +return 0 ; +mutex_lock (&dev->lb.mutex);if (td) dev->lb.user_td++;
@@ -1864,6 +1872,9 @@ int mlx5_ib_enable_lb(struct mlx5_ib_dev *dev, bool td, bool qp)void mlx5_ib_disable_lb (struct mlx5_ib_dev *dev,bool td,bool qp) { +if (dev->lb.force_enable) +return ; +mutex_lock (&dev->lb.mutex);if (td) dev->lb.user_td--;
@@ -3521,7 +3532,7 @@ static void mlx5_ib_unbind_slave_port(struct mlx5_ib_dev *ibdev,lockdep_assert_held (&mlx5_ib_multiport_mutex); -mlx5_ib_disable_lb_mp (ibdev->mdev, mpi->mdev); +mlx5_ib_disable_lb_mp (ibdev->mdev, mpi->mdev, &ibdev->lb); mlx5_core_mp_event_replay(ibdev->mdev, MLX5_DRIVER_EVENT_AFFILIATION_REMOVED,
@@ -3618,7 +3629,7 @@ static bool mlx5_ib_bind_slave_port(struct mlx5_ib_dev *ibdev,MLX5_DRIVER_EVENT_AFFILIATION_DONE , &key); - err =mlx5_ib_enable_lb_mp (ibdev->mdev, mpi->mdev); + err =mlx5_ib_enable_lb_mp (ibdev->mdev, mpi->mdev, &ibdev->lb);if (err) goto unbind;
drivers/infiniband/hw/mlx5/mlx5_ib.h +1 -0
@@ -1083,6 +1083,7 @@ struct mlx5_ib_lb_state {u32 user_td;int qps;bool enabled; +bool force_enable; };struct mlx5_ib_pf_eq {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 108/262 PCI/ACPI: Fix pci_acpi_preserve_config() memory leak
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nirmoy Das <[email protected]>
[ Upstream commit fac679df7580979174c90303f004b09cdc6f086f ]
pci_acpi_preserve_config() leaks memory by returning early without freeing the ACPI object on success. Fix that by always freeing the obj, which is not needed by the caller.
--- drivers/pci/pci-acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pci/pci-acpi.c +4 -2
@@ -122,6 +122,8 @@ phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle)bool pci_acpi_preserve_config (struct pci_host_bridge *host_bridge) { +bool ret = false; +if (ACPI_HANDLE (&host_bridge->dev)) {union acpi_object *obj;
@@ -135,11 +137,11 @@ bool pci_acpi_preserve_config(struct pci_host_bridge *host_bridge)1 ,DSM_PCI_PRESERVE_BOOT_CONFIG , NULL, ACPI_TYPE_INTEGER);if (obj && obj->integer.value ==0 ) -return true; + ret = true;ACPI_FREE (obj); } -return false; +return ret; }/* _HPX PCI Setting Record (Type 0); same as _HPP */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 109/262 ALSA: lx_core: use int type to store negative error codes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 4ef353d546cda466fc39b7daca558d7bcec21c09 ]
Change the 'ret' variable from u16 to int to store negative error codes or zero returned by lx_message_send_atomic().
Storing the negative error codes in unsigned type, doesn't cause an issue at runtime but it's ugly as pants. Additionally, assigning negative error codes to unsigned type may trigger a GCC warning when the -Wsign-conversion flag is enabled.
No effect on runtime.
--- sound/pci/lx6464es/lx_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/lx6464es/lx_core.c +2 -2
@@ -316,7 +316,7 @@ static int lx_message_send_atomic(struct lx6464es *chip, struct lx_rmh *rmh)/* low-level dsp access */ int lx_dsp_get_version (struct lx6464es *chip,u32 *rdsp_version) { -u16 ret; +int ret;mutex_lock (&chip->msg_lock);
@@ -330,10 +330,10 @@ int lx_dsp_get_version(struct lx6464es *chip, u32 *rdsp_version)int lx_dsp_get_clock_frequency (struct lx6464es *chip,u32 *rfreq) { -u16 ret =0 ;u32 freq_raw =0 ;u32 freq =0 ;u32 frequency =0 ; +int ret;mutex_lock (&chip->msg_lock);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 110/262 media: st-delta: avoid excessive stack usage
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 5954ad7d1af92cb6244c5f31216e43af55febbb7 ]
Building with a reduced stack warning limit shows that delta_mjpeg_decode() copies a giant structure to the stack each time but only uses three of its members:
drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c: In function 'delta_mjpeg_decode':drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c:427:1: error: the frame size of 1296 bytes is larger than 1280 bytes [-Werror=frame-larger-than=]
Open-code the passing of the structure members that are actually used here.
--- .../platform/st/sti/delta/delta-mjpeg-dec.c | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c +11 -9
@@ -239,7 +239,7 @@ static int delta_mjpeg_ipc_open(struct delta_ctx *pctx)return 0 ; } -static int delta_mjpeg_ipc_decode (struct delta_ctx *pctx,struct delta_au *au) +static int delta_mjpeg_ipc_decode (struct delta_ctx *pctx,dma_addr_t pstart,dma_addr_t pend) {struct delta_dev *delta = pctx->dev;struct delta_mjpeg_ctx *ctx =to_ctx (pctx);
@@ -256,8 +256,8 @@ static int delta_mjpeg_ipc_decode(struct delta_ctx *pctx, struct delta_au *au)memset (params,0 ,sizeof (*params)); - params->picture_start_addr_p = (u32)(au->paddr); - params->picture_end_addr_p = (u32)(au->paddr + au->size -1 ); + params->picture_start_addr_p = pstart; + params->picture_end_addr_p = pend;/* * !WARNING!
@@ -374,12 +374,14 @@ static int delta_mjpeg_decode(struct delta_ctx *pctx, struct delta_au *pau)struct delta_dev *delta = pctx->dev;struct delta_mjpeg_ctx *ctx =to_ctx (pctx);int ret; -struct delta_au au = *pau; +void *au_vaddr = pau->vaddr; +dma_addr_t au_dma = pau->paddr; +size_t au_size = pau->size;unsigned int data_offset =0 ;struct mjpeg_header *header = &ctx->header_struct;if (!ctx->header) { - ret =delta_mjpeg_read_header (pctx, au.vaddr, au.size, + ret =delta_mjpeg_read_header (pctx, au_vaddr, au_size, header, &data_offset);if (ret) { pctx->stream_errors++;
@@ -405,17 +407,17 @@ static int delta_mjpeg_decode(struct delta_ctx *pctx, struct delta_au *pau) goto err; } - ret =delta_mjpeg_read_header (pctx, au.vaddr, au.size, + ret =delta_mjpeg_read_header (pctx, au_vaddr, au_size, ctx->header, &data_offset);if (ret) { pctx->stream_errors++; goto err; } - au.paddr += data_offset; - au.vaddr += data_offset; + au_dma += data_offset; + au_vaddr += data_offset; - ret =delta_mjpeg_ipc_decode (pctx, &au); + ret =delta_mjpeg_ipc_decode (pctx, au_dma, au_dma + au_size -1 );if (ret) goto err;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 111/262 crypto: hisilicon/zip - remove unnecessary validation for high-performance mode configurations
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenghai Huang <[email protected]>
[ Upstream commit d4e081510471e79171c4e0a11f6cb608e49bc082 ]
When configuring the high-performance mode register, there is no need to verify whether the register has been successfully enabled, as there is no possibility of a write failure for this register.
--- drivers/crypto/hisilicon/zip/zip_main.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/crypto/hisilicon/zip/zip_main.c +2 -12
@@ -449,10 +449,9 @@ bool hisi_zip_alg_support(struct hisi_qm *qm, u32 alg)return false; } -static int hisi_zip_set_high_perf (struct hisi_qm *qm) +static void hisi_zip_set_high_perf (struct hisi_qm *qm) {u32 val; -int ret; val =readl_relaxed (qm->io_base +HZIP_HIGH_PERF_OFFSET );if (perf_mode ==HZIP_HIGH_COMP_PERF )
@@ -462,13 +461,6 @@ static int hisi_zip_set_high_perf(struct hisi_qm *qm)/* Set perf mode */ writel (val, qm->io_base +HZIP_HIGH_PERF_OFFSET ); - ret =readl_relaxed_poll_timeout (qm->io_base +HZIP_HIGH_PERF_OFFSET , - val, val == perf_mode,HZIP_DELAY_1_US , -HZIP_POLL_TIMEOUT_US ); -if (ret) -pci_err (qm->pdev,"failed to set perf mode\n" ); - -return ret; }static void hisi_zip_open_sva_prefetch (struct hisi_qm *qm)
@@ -1171,9 +1163,7 @@ static int hisi_zip_pf_probe_init(struct hisi_zip *hisi_zip)if (ret)return ret; - ret =hisi_zip_set_high_perf (qm); -if (ret) -return ret; +hisi_zip_set_high_perf (qm);hisi_zip_open_sva_prefetch (qm);hisi_qm_dev_err_init (qm);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 112/262 crypto: hisilicon - re-enable address prefetch after device resuming
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenghai Huang <[email protected]>
[ Upstream commit 0dcd21443d9308ed88909d35aa0490c3fc680a47 ]
When the device resumes from a suspended state, it will revert to its initial state and requires re-enabling. Currently, the address prefetch function is not re-enabled after device resuming. Move the address prefetch enable to the initialization process. In this way, the address prefetch can be enabled when the device resumes by calling the initialization process.
--- drivers/crypto/hisilicon/hpre/hpre_main.c | 3 +- drivers/crypto/hisilicon/qm.c | 3 - drivers/crypto/hisilicon/sec2/sec_main.c | 80 +++++++++++------------ drivers/crypto/hisilicon/zip/zip_main.c | 5 +- 4 files changed, 43 insertions(+), 48 deletions(-)
drivers/crypto/hisilicon/hpre/hpre_main.c +1 -2
@@ -690,6 +690,7 @@ static int hpre_set_user_domain_and_cache(struct hisi_qm *qm)/* Config data buffer pasid needed by Kunpeng 920 */ hpre_config_pasid (qm); +hpre_open_sva_prefetch (qm);hpre_enable_clock_gate (qm);
@@ -1366,8 +1367,6 @@ static int hpre_pf_probe_init(struct hpre *hpre)if (ret)return ret; -hpre_open_sva_prefetch (qm); -hisi_qm_dev_err_init (qm); ret =hpre_show_last_regs_init (qm);if (ret)
drivers/crypto/hisilicon/qm.c +0 -3
@@ -4272,9 +4272,6 @@ static void qm_restart_prepare(struct hisi_qm *qm) {u32 value; -if (qm->err_ini->open_sva_prefetch) - qm->err_ini->open_sva_prefetch (qm); -if (qm->ver >=QM_HW_V3 )return ;
drivers/crypto/hisilicon/sec2/sec_main.c +40 -40
98 lines not on this page · raw message
drivers/crypto/hisilicon/zip/zip_main.c +2 -3
@@ -557,6 +557,7 @@ static int hisi_zip_set_user_domain_and_cache(struct hisi_qm *qm)writel (AXUSER_BASE , base +HZIP_DATA_WUSER_32_63 );writel (AXUSER_BASE , base +HZIP_SGL_RUSER_32_63 ); } +hisi_zip_open_sva_prefetch (qm);/* let's open all compression/decompression cores */ dcomp_bm = qm->cap_tables.dev_cap_table[ZIP_DECOMP_ENABLE_BITMAP_IDX ].cap_val;
@@ -568,6 +569,7 @@ static int hisi_zip_set_user_domain_and_cache(struct hisi_qm *qm)CQC_CACHE_WB_ENABLE |FIELD_PREP (SQC_CACHE_WB_THRD ,1 ) | FIELD_PREP(CQC_CACHE_WB_THRD, 1), base + QM_CACHE_CTL); +hisi_zip_set_high_perf (qm);hisi_zip_enable_clock_gate (qm);return 0 ;
@@ -1163,9 +1165,6 @@ static int hisi_zip_pf_probe_init(struct hisi_zip *hisi_zip)if (ret)return ret; -hisi_zip_set_high_perf (qm); - -hisi_zip_open_sva_prefetch (qm);hisi_qm_dev_err_init (qm);hisi_zip_debug_regs_clear (qm);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 113/262 crypto: hisilicon/qm - check whether the input function and PF are on the same device
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhushuai Yin <[email protected]>
[ Upstream commit 6a2c9164b52e6bc134127fd543461fdef95cc8ec ]
Function rate limiting is set through physical function driver. Users configure by providing function information and rate limit values. Before configuration, it is necessary to check whether the provided function and PF belong to the same device.
--- drivers/crypto/hisilicon/qm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/hisilicon/qm.c +4 -0
@@ -3657,6 +3657,10 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf, } pdev = container_of(dev, struct pci_dev, dev); +if (pci_physfn (pdev) != qm->pdev) { +pci_err (qm->pdev,"the pdev input does not match the pf!\n" ); +return -EINVAL ; + } *fun_index = pdev->devfn;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 114/262 inet: ping: check sock_net() in ping_get_port() and ping_lookup()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 59f26d86b2a16f1406f3b42025062b6d1fba5dd5 ]
We need to check socket netns before considering them in ping_get_port(). Otherwise, one malicious netns could 'consume' all ports.
Add corresponding check in ping_lookup().
--- net/ipv4/ping.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/ipv4/ping.c +10 -4
@@ -77,6 +77,7 @@ static inline struct hlist_head *ping_hashslot(struct ping_table *table,int ping_get_port (struct sock *sk,unsigned short ident) { +struct net *net =sock_net (sk);struct inet_sock *isk, *isk2;struct hlist_head *hlist;struct sock *sk2 =NULL ;
@@ -90,9 +91,10 @@ int ping_get_port(struct sock *sk, unsigned short ident)for (i =0 ; i < (1L <<16 ); i++, result++) {if (!result) result++;/* avoid zero */ - hlist =ping_hashslot (&ping_table,sock_net (sk), - result); + hlist =ping_hashslot (&ping_table, net, result);sk_for_each (sk2, hlist) { +if (!net_eq (sock_net (sk2), net)) +continue ; isk2 =inet_sk (sk2);if (isk2->inet_num == result)
@@ -108,8 +110,10 @@ int ping_get_port(struct sock *sk, unsigned short ident)if (i >= (1L <<16 )) goto fail; }else { - hlist =ping_hashslot (&ping_table,sock_net (sk), ident); + hlist =ping_hashslot (&ping_table, net, ident);sk_for_each (sk2, hlist) { +if (!net_eq (sock_net (sk2), net)) +continue ; isk2 =inet_sk (sk2);/* BUG? Why is this reuse and not reuseaddr? ping.c
@@ -129,7 +133,7 @@ int ping_get_port(struct sock *sk, unsigned short ident)pr_debug ("was not hashed\n" );sk_add_node_rcu (sk, hlist);sock_set_flag (sk,SOCK_RCU_FREE ); -sock_prot_inuse_add (sock_net (sk), sk->sk_prot,1 ); +sock_prot_inuse_add (net, sk->sk_prot,1 ); }spin_unlock (&ping_table.lock);return 0 ;
@@ -188,6 +192,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) }sk_for_each_rcu (sk, hslot) { +if (!net_eq (sock_net (sk), net)) +continue ; isk =inet_sk (sk);pr_debug ("iterate\n" );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 115/262 coresight: Only register perf symlink for sinks with alloc_buffer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuanfang Zhang <[email protected]>
[ Upstream commit 12d9a9dd9d8a4f1968073e7f34515896d1e22b78 ]
Ensure that etm_perf_add_symlink_sink() is only called for devices that implement the alloc_buffer operation. This prevents invalid symlink creation for dummy sinks that do not implement alloc_buffer.
Without this check, perf may attempt to use a dummy sink that lacks alloc_buffer operationsu to initialise perf's ring buffer, leading to runtime failures.
--- drivers/hwtracing/coresight/coresight-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-core.c +3 -2
@@ -1200,8 +1200,9 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) goto out_unlock; } -if (csdev->type ==CORESIGHT_DEV_TYPE_SINK || - csdev->type ==CORESIGHT_DEV_TYPE_LINKSINK ) { +if ((csdev->type ==CORESIGHT_DEV_TYPE_SINK || + csdev->type ==CORESIGHT_DEV_TYPE_LINKSINK ) && +sink_ops (csdev)->alloc_buffer) { ret =etm_perf_add_symlink_sink (csdev);if (ret) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 116/262 drm/amdgpu: Power up UVD 3 for FW validation (v2)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit c661219cd7be75bb5599b525f16a455a058eb516 ]
Unlike later versions, UVD 3 has firmware validation. For this to work, the UVD should be powered up correctly.
When DPM is enabled and the display clock is off, the SMU may choose a power state which doesn't power the UVD, which can result in failure to initialize UVD.
v2:
Add code comments to explain about the UVD power state and how UVD clock is turned on/off.
--- drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 29 +++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c +25 -4
@@ -623,7 +623,22 @@ static void uvd_v3_1_enable_mgcg(struct amdgpu_device *adev,* * @handle: handle used to pass amdgpu_device pointer * -* Initialize the hardware, boot up the VCPU and do some testing +* Initialize the hardware, boot up the VCPU and do some testing. +* +* On SI, the UVD is meant to be used in a specific power state, +* or alternatively the driver can manually enable its clock. +* In amdgpu we use the dedicated UVD power state when DPM is enabled. +* Calling amdgpu_dpm_enable_uvd makes DPM select the UVD power state +* for the SMU and afterwards enables the UVD clock. +* This is automatically done by amdgpu_uvd_ring_begin_use when work +* is submitted to the UVD ring. Here, we have to call it manually +* in order to power up UVD before firmware validation. +* +* Note that we must not disable the UVD clock here, as that would +* cause the ring test to fail. However, UVD is powered off +* automatically after the ring test: amdgpu_uvd_ring_end_use calls +* the UVD idle work handler which will disable the UVD clock when +* all fences are signalled. */ static int uvd_v3_1_hw_init (void *handle) {
@@ -633,6 +648,15 @@ static int uvd_v3_1_hw_init(void *handle)int r;uvd_v3_1_mc_resume (adev); +uvd_v3_1_enable_mgcg (adev, true); + +/* Make sure UVD is powered during FW validation. +* It's going to be automatically powered off after the ring test. +*/ +if (adev->pm.dpm_enabled) +amdgpu_dpm_enable_uvd (adev, true); +else +amdgpu_asic_set_uvd_clocks (adev,53300 ,40000 ); r =uvd_v3_1_fw_validate (adev);if (r) {
@@ -640,9 +664,6 @@ static int uvd_v3_1_hw_init(void *handle)return r; } -uvd_v3_1_enable_mgcg (adev, true); -amdgpu_asic_set_uvd_clocks (adev,53300 ,40000 ); -uvd_v3_1_start (adev); r =amdgpu_ring_test_helper (ring);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 117/262 drm/amd/pm: Disable ULV even if unsupported (v3)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit 3a0c3a4035f995e1f993dfaf4d63dc19e9b4bc1c ]
Always send PPSMC_MSG_DisableULV to the SMC, even if ULV mode is unsupported, to make sure it is properly turned off.
v3:
Simplify si_disable_ulv further.
Always check the return value of amdgpu_si_send_msg_to_smc.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +3 -7
@@ -5613,14 +5613,10 @@ static int si_populate_smc_t(struct amdgpu_device *adev,static int si_disable_ulv (struct amdgpu_device *adev) { -struct si_power_info *si_pi =si_get_pi (adev); -struct si_ulv_param *ulv = &si_pi->ulv; +PPSMC_Result r; -if (ulv->supported) -return (amdgpu_si_send_msg_to_smc (adev, PPSMC_MSG_DisableULV) == PPSMC_Result_OK) ? -0 : -EINVAL ; - -return 0 ; + r =amdgpu_si_send_msg_to_smc (adev, PPSMC_MSG_DisableULV); +return (r == PPSMC_Result_OK) ?0 : -EINVAL ; } static bool si_is_state_ulv_compatible(struct amdgpu_device *adev,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 118/262 drm/amd/pm: Fix si_upload_smc_data (v3)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit a43b2cec04b02743338aa78f837ee0bdf066a6d5 ]
The si_upload_smc_data function uses si_write_smc_soft_register to set some register values in the SMC, and expects the result to be PPSMC_Result_OK which is 1.
The PPSMC_Result_OK / PPSMC_Result_Failed values are used for checking the result of a command sent to the SMC. However, the si_write_smc_soft_register actually doesn't send any commands to the SMC and returns zero on success, so this check was incorrect.
Fix that by not checking the return value, just like other calls to si_write_smc_soft_register.
v3:
Additionally, when no display is plugged in, there is no need to restrict MCLK switching, so program the registers to zero.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 43 ++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +24 -19
@@ -5789,9 +5789,9 @@ static int si_upload_smc_data(struct amdgpu_device *adev) {struct amdgpu_crtc *amdgpu_crtc =NULL ;int i; - -if (adev->pm.dpm.new_active_crtc_count ==0 ) -return 0 ; +u32 crtc_index =0 ; +u32 mclk_change_block_cp_min =0 ; +u32 mclk_change_block_cp_max =0 ;for (i =0 ; i < adev->mode_info.num_crtc; i++) {if (adev->pm.dpm.new_active_crtcs & (1 << i)) {
@@ -5800,26 +5800,31 @@ static int si_upload_smc_data(struct amdgpu_device *adev) } } -if (amdgpu_crtc ==NULL ) -return 0 ; +/* When a display is plugged in, program these so that the SMC +* performs MCLK switching when it doesn't cause flickering. +* When no display is plugged in, there is no need to restrict +* MCLK switching, so program them to zero. +*/ +if (adev->pm.dpm.new_active_crtc_count && amdgpu_crtc) { + crtc_index = amdgpu_crtc->crtc_id; -if (amdgpu_crtc->line_time <=0 ) -return 0 ; +if (amdgpu_crtc->line_time) { + mclk_change_block_cp_min = amdgpu_crtc->wm_high / amdgpu_crtc->line_time; + mclk_change_block_cp_max = amdgpu_crtc->wm_low / amdgpu_crtc->line_time; + } + } -if (si_write_smc_soft_register (adev, - SI_SMC_SOFT_REGISTER_crtc_index, - amdgpu_crtc->crtc_id) != PPSMC_Result_OK) -return 0 ; +si_write_smc_soft_register (adev, + SI_SMC_SOFT_REGISTER_crtc_index, + crtc_index); -if (si_write_smc_soft_register (adev, - SI_SMC_SOFT_REGISTER_mclk_change_block_cp_min, - amdgpu_crtc->wm_high / amdgpu_crtc->line_time) != PPSMC_Result_OK) -return 0 ; +si_write_smc_soft_register (adev, + SI_SMC_SOFT_REGISTER_mclk_change_block_cp_min, + mclk_change_block_cp_min); -if (si_write_smc_soft_register (adev, - SI_SMC_SOFT_REGISTER_mclk_change_block_cp_max, - amdgpu_crtc->wm_low / amdgpu_crtc->line_time) != PPSMC_Result_OK) -return 0 ; +si_write_smc_soft_register (adev, + SI_SMC_SOFT_REGISTER_mclk_change_block_cp_max, + mclk_change_block_cp_max);return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 119/262 drm/amd/pm: Adjust si_upload_smc_data register programming (v3)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit ce025130127437dc884c84c254170e27b2ce9309 ]
Based on some comments in dm_pp_display_configuration above the crtc_index and line_time fields, these values are programmed to the SMC to work around an SMC hang when it switches MCLK.
According to Alex, the Windows driver programs them to:mclk_change_block_cp_min = 200 / line_time mclk_change_block_cp_max = 100 / line_time Let's use the same for the sake of consistency.
Previously we used the watermark values, but it seemed buggy as the code was mixing up low/high and A/B watermarks, and was not saving a low watermark value on DCE 6, so mclk_change_block_cp_max would be always zero previously.
Split this change off from the previous si_upload_smc_data to make it easier to bisect, in case it causes any issues.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +2 -2
@@ -5809,8 +5809,8 @@ static int si_upload_smc_data(struct amdgpu_device *adev) crtc_index = amdgpu_crtc->crtc_id;if (amdgpu_crtc->line_time) { - mclk_change_block_cp_min = amdgpu_crtc->wm_high / amdgpu_crtc->line_time; - mclk_change_block_cp_max = amdgpu_crtc->wm_low / amdgpu_crtc->line_time; + mclk_change_block_cp_min =200 / amdgpu_crtc->line_time; + mclk_change_block_cp_max =100 / amdgpu_crtc->line_time; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 120/262 drm/amd/pm: Treat zero vblank time as too short in si_dpm (v3)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit 9003a0746864f39a0ef72bd45f8e1ad85d930d67 ]
Some parts of the code base expect that MCLK switching is turned off when the vblank time is set to zero.
According to pp_pm_compute_clocks the non-DC code has issues with MCLK switching with refresh rates over 120 Hz.
v3:
Add code comment to explain this better.
Add an if statement instead of changing the switch_limit.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +7 -1
@@ -3066,7 +3066,13 @@ static bool si_dpm_vblank_too_short(void *handle)/* we never hit the non-gddr5 limit so disable it */ u32 switch_limit = adev->gmc.vram_type ==AMDGPU_VRAM_TYPE_GDDR5 ?450 :0 ; -if (vblank_time < switch_limit) +/* Consider zero vblank time too short and disable MCLK switching. +* Note that the vblank time is set to maximum when no displays are attached, +* so we'll still enable MCLK switching in that case. +*/ +if (vblank_time ==0 ) +return true; +else if (vblank_time < switch_limit)return true;else return false;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 121/262 drm/amd/pm: Disable MCLK switching with non-DC at 120 Hz+ (v2)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit ed3803533c7bf7df88bc3fc9f70bd317e1228ea8 ]
According to pp_pm_compute_clocks the non-DC display code has "issues with mclk switching with refresh rates over 120 hz". The workaround is to disable MCLK switching in this case.
Do the same for legacy DPM.
--- drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c +7 -0
@@ -66,6 +66,13 @@ u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev) (amdgpu_crtc->v_border * 2)); vblank_time_us = vblank_in_pixels *1000 / amdgpu_crtc->hw_mode.clock; + +/* we have issues with mclk switching with +* refresh rates over 120 hz on the non-DC code. +*/ +if (drm_mode_vrefresh (&amdgpu_crtc->hw_mode) >120 ) + vblank_time_us =0 ; +break ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 122/262 drm/amd/pm: Disable SCLK switching on Oland with high pixel clocks (v3)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit 7009e3af0474aca5f64262b3c72fb6e23b232f9b ]
Port of commit 227545b9a08c ("drm/radeon/dpm: Disable sclk switching on Oland when two 4K 60Hz monitors are connected")
This is an ad-hoc DPM fix, necessary because we don't have proper bandwidth calculation for DCE 6.
We define "high pixelclock" for SI as higher than necessary for 4K 30Hz. For example, 4K 60Hz and 1080p 144Hz fall into this category.
When two high pixel clock displays are connected to Oland, additionally disable shader clock switching, which results in a higher voltage, thereby addressing some visible flickering.
v2:
Add more comments.
v3:
Split into two commits for easier review.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +31 -0
@@ -3430,12 +3430,14 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, {struct si_ps *ps =si_get_ps (rps);struct amdgpu_clock_and_voltage_limits *max_limits; +struct amdgpu_connector *conn;bool disable_mclk_switching = false;bool disable_sclk_switching = false;u32 mclk, sclk;u16 vddc, vddci, min_vce_voltage =0 ;u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;u32 max_sclk =0 , max_mclk =0 ; +u32 high_pixelclock_count =0 ;int i;if (adev->asic_type ==CHIP_HAINAN ) {
@@ -3463,6 +3465,35 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, } } +/* We define "high pixelclock" for SI as higher than necessary for 4K 30Hz. +* For example, 4K 60Hz and 1080p 144Hz fall into this category. +* Find number of such displays connected. +*/ +for (i =0 ; i < adev->mode_info.num_crtc; i++) { +if (!(adev->pm.dpm.new_active_crtcs & (1 << i)) || + !adev->mode_info.crtcs[i]->enabled) +continue ; + + conn =to_amdgpu_connector (adev->mode_info.crtcs[i]->connector); + +if (conn->pixelclock_for_modeset >297000 ) + high_pixelclock_count++; + } + +/* These are some ad-hoc fixes to some issues observed with SI GPUs. +* They are necessary because we don't have something like dce_calcs +* for these GPUs to calculate bandwidth requirements. +*/ +if (high_pixelclock_count) { +/* On Oland, we observe some flickering when two 4K 60Hz +* displays are connected, possibly because voltage is too low. +* Raise the voltage by requiring a higher SCLK. +* (Voltage cannot be adjusted independently without also SCLK.) +*/ +if (high_pixelclock_count >1 && adev->asic_type ==CHIP_OLAND ) + disable_sclk_switching = true; + } +if (rps->vce_active) { rps->evclk = adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].evclk; rps->ecclk = adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].ecclk;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 123/262 wifi: mwifiex: send world regulatory domain to driver
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Kerkmann <[email protected]>
[ Upstream commit 56819d00bc2ebaa6308913c28680da5d896852b8 ]
The world regulatory domain is a restrictive subset of channel configurations which allows legal operation of the adapter all over the world. Changing to this domain should not be prevented.
--- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/marvell/mwifiex/cfg80211.c +3 -4
@@ -684,10 +684,9 @@ static void mwifiex_reg_notifier(struct wiphy *wiphy,return ; } -/* Don't send world or same regdom info to firmware */ -if (strncmp (request->alpha2,"00" ,2 ) && -strncmp (request->alpha2, adapter->country_code, -sizeof (request->alpha2))) { +/* Don't send same regdom info to firmware */ +if (strncmp (request->alpha2, adapter->country_code, +sizeof (request->alpha2)) !=0 ) {memcpy (adapter->country_code, request->alpha2,sizeof (request->alpha2));mwifiex_send_domain_info_cmd_fw (wiphy);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 124/262 PCI: tegra: Fix devm_kcalloc() argument order for port->phys allocation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit e1a8805e5d263453ad76a4f50ab3b1c18ea07560 ]
Fix incorrect argument order in devm_kcalloc() when allocating port->phys. The original call used sizeof(phy) as the number of elements and port->lanes as the element size, which is reversed. While this happens to produce the correct total allocation size with current pointer size and lane counts, the argument order is wrong.
--- drivers/pci/controller/pci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pci-tegra.c +1 -1
@@ -1343,7 +1343,7 @@ static int tegra_pcie_port_get_phys(struct tegra_pcie_port *port)unsigned int i;int err; - port->phys =devm_kcalloc (dev,sizeof (phy), port->lanes,GFP_KERNEL ); + port->phys =devm_kcalloc (dev, port->lanes,sizeof (phy),GFP_KERNEL );if (!port->phys)return -ENOMEM ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 125/262 tcp: fix __tcp_close() to only send RST when required
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 5f9238530970f2993b23dd67fdaffc552a2d2e98 ]
If the receive queue contains payload that was already received, __tcp_close() can send an unexpected RST.
Refine the code to take tp->copied_seq into account, as we already do in tcp recvmsg().
--- net/ipv4/tcp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/ipv4/tcp.c +5 -4
@@ -3058,8 +3058,8 @@ bool tcp_check_oom(const struct sock *sk, int shift)void __tcp_close (struct sock *sk,long timeout) { +bool data_was_unread = false;struct sk_buff *skb; -int data_was_unread =0 ;int state;WRITE_ONCE (sk->sk_shutdown,SHUTDOWN_MASK );
@@ -3078,11 +3078,12 @@ void __tcp_close(struct sock *sk, long timeout)* reader process may not have drained the data yet! */ while ((skb =__skb_dequeue (&sk->sk_receive_queue)) !=NULL ) { -u32 len =TCP_SKB_CB (skb)->end_seq -TCP_SKB_CB (skb)->seq; +u32 end_seq =TCP_SKB_CB (skb)->end_seq;if (TCP_SKB_CB (skb)->tcp_flags &TCPHDR_FIN ) - len--; - data_was_unread += len; + end_seq--; +if (after (end_seq,tcp_sk (sk)->copied_seq)) + data_was_unread = true;__kfree_skb (skb); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 126/262 drm/amdkfd: Fix error code sign for EINVAL in svm_ioctl()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit cbda64f3f58027f68211dda8ea94d52d7e493995 ]
Use negative error code -EINVAL instead of positive EINVAL in the default case of svm_ioctl() to conform to Linux kernel error code conventions.
--- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +1 -1
@@ -4231,7 +4231,7 @@ svm_ioctl(struct kfd_process *p, enum kfd_ioctl_svm_op op, uint64_t start, r =svm_range_get_attr (p, mm, start, size, nattrs, attrs);break ;default : - r =EINVAL ; + r = -EINVAL ;break ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 127/262 usb: phy: twl6030: Fix incorrect type for ret
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xichao Zhao <[email protected]>
[ Upstream commit b570b346ddd727c4b41743a6a2f49e7217c5317f ]
In the twl6030_usb_probe(), the variable ret is declared as a u32 type. However, since ret may receive -ENODEV when accepting the return value of omap_usb2_set_comparator().Therefore, its type should be changed to int.
--- drivers/usb/phy/phy-twl6030-usb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/phy/phy-twl6030-usb.c +1 -2
@@ -328,9 +328,8 @@ static int twl6030_set_vbus(struct phy_companion *comparator, bool enabled)static int twl6030_usb_probe (struct platform_device *pdev) { -u32 ret;struct twl6030_usb *twl; -int status, err; +int status, err, ret;struct device_node *np = pdev->dev.of_node;struct device *dev = &pdev->dev;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 128/262 usb: gadget: configfs: Correctly set use_os_string at bind
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Wu <[email protected]>
[ Upstream commit e271cc0d25015f4be6c88bd7731444644eb352c2 ]
Once the use_os_string flag is set to true for some functions (e.g. adb/mtp) which need to response the OS string, and then if we re-bind the ConfigFS gadget to use the other functions (e.g. hid) which should not to response the OS string, however, because the use_os_string flag is still true, so the usb gadget response the OS string descriptor incorrectly, this can cause the USB device to be unrecognizable on the Windows system.
An example of this as follows:
echo 1 > os_desc/use
ln -s functions/ffs.adb configs/b.1/function0
start adbd
echo "<udc device>" > UDC #succeed
stop adbd
rm configs/b.1/function0
echo 0 > os_desc/use
ln -s functions/hid.gs0 configs/b.1/function0 echo "<udc device>" > UDC #fail to connect on Windows
This patch sets the use_os_string flag to false at bind if the functions not support OS Descriptors.
--- drivers/usb/gadget/configfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/configfs.c +2 -0
@@ -1750,6 +1750,8 @@ static int configfs_composite_bind(struct usb_gadget *gadget, cdev->use_os_string = true; cdev->b_vendor_code = gi->b_vendor_code;memcpy (cdev->qw_sign, gi->qw_sign,OS_STRING_QW_SIGN_LEN ); + }else { + cdev->use_os_string = false; }if (gadget_is_otg (gadget) && !otg_desc[0 ]) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 129/262 tty: n_gsm: Dont block input queue by waiting MSC
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seppo Takalo <[email protected]>
[ Upstream commit 3cf0b3c243e56bc43be560617416c1d9f301f44c ]
Currently gsm_queue() processes incoming frames and when opening a DLC channel it calls gsm_dlci_open() which calls gsm_modem_update(). If basic mode is used it calls gsm_modem_upd_via_msc() and it cannot block the input queue by waiting the response to come into the same input queue.
Instead allow sending Modem Status Command without waiting for remote end to respond. Define a new function gsm_modem_send_initial_msc() for this purpose. As MSC is only valid for basic encoding, it does not do anything for advanced or when convergence layer type 2 is used.
--- drivers/tty/n_gsm.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/tty/n_gsm.c +24 -1
@@ -461,6 +461,7 @@ static int gsm_send_packet(struct gsm_mux *gsm, struct gsm_msg *msg);static struct gsm_dlci *gsm_dlci_alloc (struct gsm_mux *gsm,int addr);static void gsmld_write_trigger (struct gsm_mux *gsm);static void gsmld_write_task (struct work_struct *work); +static int gsm_modem_send_initial_msc (struct gsm_dlci *dlci);/** * gsm_fcs_add - update FCS
@@ -2174,7 +2175,7 @@ static void gsm_dlci_open(struct gsm_dlci *dlci)pr_debug ("DLCI %d goes open.\n" , dlci->addr);/* Send current modem state */ if (dlci->addr) { -gsm_modem_update (dlci,0 ); +gsm_modem_send_initial_msc (dlci); }else {/* Start keep-alive control */ gsm->ka_num =0 ;
@@ -4156,6 +4157,28 @@ static int gsm_modem_upd_via_msc(struct gsm_dlci *dlci, u8 brk)return gsm_control_wait (dlci->gsm, ctrl); } +/** +* gsm_modem_send_initial_msc - Send initial modem status message +* +* @dlci channel +* +* Send an initial MSC message after DLCI open to set the initial +* modem status lines. This is only done for basic mode. +* Does not wait for a response as we cannot block the input queue +* processing. +*/ +static int gsm_modem_send_initial_msc (struct gsm_dlci *dlci) +{ +u8 modembits[2 ]; + +if (dlci->adaption !=1 || dlci->gsm->encoding !=GSM_BASIC_OPT ) +return 0 ; + + modembits[0 ] = (dlci->addr <<2 ) |2 |EA ;/* DLCI, Valid, EA */ + modembits[1 ] = (gsm_encode_modem (dlci) <<1 ) |EA ; +return gsm_control_command (dlci->gsm,CMD_MSC , (const u8 *)&modembits,2 ); +} +/** * gsm_modem_update - send modem status line state * @dlci: channel
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 130/262 misc: genwqe: Fix incorrect cmd field being reported in error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
[ Upstream commit 6b26053819dccc664120e07c56f107fb6f72f3fa ]
There is a dev_err message that is reporting the value of cmd->asiv_length when it should be reporting cmd->asv_length instead. Fix this.
--- drivers/misc/genwqe/card_ddcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/genwqe/card_ddcb.c +1 -1
@@ -923,7 +923,7 @@ int __genwqe_execute_raw_ddcb(struct genwqe_dev *cd, }if (cmd->asv_length >DDCB_ASV_LENGTH ) {dev_err (&pci_dev->dev,"[%s] err: wrong asv_length of %d\n" , - __func__, cmd->asiv_length); + __func__, cmd->asv_length);return -EINVAL ; } rc =__genwqe_enqueue_ddcb (cd, req, f_flags);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 131/262 pps: fix warning in pps_register_cdev when register device fail
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Liang <[email protected]>
[ Upstream commit b0531cdba5029f897da5156815e3bdafe1e9b88d ]
Similar to previous commit 2a934fdb01db ("media: v4l2-dev: fix error handling in __video_register_device()"), the release hook should be set before device_register(). Otherwise, when device_register() return error and put_device() try to callback the release function, the below warning may happen.
------------[ cut here ]------------ WARNING: CPU: 1 PID: 4760 at drivers/base/core.c:2567 device_release+0x1bd/0x240 drivers/base/core.c:2567 Modules linked in: CPU: 1 UID: 0 PID: 4760 Comm: syz.4.914 Not tainted 6.17.0-rc3+ #1 NONE RIP: 0010:device_release+0x1bd/0x240 drivers/base/core.c:2567 Call Trace: <TASK> kobject_cleanup+0x136/0x410 lib/kobject.c:689 kobject_release lib/kobject.c:720 [inline] kref_put include/linux/kref.h:65 [inline] kobject_put+0xe9/0x130 lib/kobject.c:737 put_device+0x24/0x30 drivers/base/core.c:3797 pps_register_cdev+0x2da/0x370 drivers/pps/pps.c:402 pps_register_source+0x2f6/0x480 drivers/pps/kapi.c:108 pps_tty_open+0x190/0x310 drivers/pps/clients/pps-ldisc.c:57 tty_ldisc_open+0xa7/0x120 drivers/tty/tty_ldisc.c:432 tty_set_ldisc+0x333/0x780 drivers/tty/tty_ldisc.c:563 tiocsetd drivers/tty/tty_io.c:2429 [inline] tty_ioctl+0x5d1/0x1700 drivers/tty/tty_io.c:2728 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:598 [inline] __se_sys_ioctl fs/ioctl.c:584 [inline] __x64_sys_ioctl+0x194/0x210 fs/ioctl.c:584 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0x5f/0x2a0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x76/0x7e </TASK>
Before commit c79a39dc8d06 ("pps: Fix a use-after-free"), pps_register_cdev() call device_create() to create pps->dev, which will init dev->release to device_create_release(). Now the comment is outdated, just remove it.
Thanks for the reminder from Calvin Owens, 'kfree_pps' should be removed in pps_register_source() to avoid a double free in the failure case.
--- drivers/pps/kapi.c | 5 +---- drivers/pps/pps.c | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-)
drivers/pps/kapi.c +1 -4
@@ -109,16 +109,13 @@ struct pps_device *pps_register_source(struct pps_source_info *info,if (err <0 ) {pr_err ("%s: unable to create char device\n" , info->name); - goto kfree_pps; + goto pps_register_source_exit; }dev_dbg (&pps->dev,"new PPS source %s\n" , info->name);return pps; -kfree_pps: -kfree (pps); - pps_register_source_exit:pr_err ("%s: unable to register source\n" , info->name);
drivers/pps/pps.c +2 -3
@@ -374,6 +374,7 @@ int pps_register_cdev(struct pps_device *pps) pps->info.name); err = -EBUSY ; } +kfree (pps); goto out_unlock; } pps->id = err;
@@ -383,13 +384,11 @@ int pps_register_cdev(struct pps_device *pps) pps->dev.devt =MKDEV (pps_major, pps->id);dev_set_drvdata (&pps->dev, pps);dev_set_name (&pps->dev,"pps%d" , pps->id); + pps->dev.release = pps_device_destruct; err =device_register (&pps->dev);if (err) goto free_idr; -/* Override the release function with our own */ - pps->dev.release = pps_device_destruct; -pr_debug ("source %s got cdev (%d:%d)\n" , pps->info.name, pps_major, pps->id);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 132/262 wifi: iwlwifi: Remove redundant header files
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liao Yuanhong <[email protected]>
[ Upstream commit b4b34ba66443696cc5f3e95493f9d7597259b728 ]
The header file "fw/img.h" is already included on line 9. Remove the redundant include.
--- drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/fw/regulatory.h +0 -1
@@ -12,7 +12,6 @@#include "fw/api/phy.h" #include "fw/api/config.h" #include "fw/api/nvm-reg.h" -#include "fw/img.h" #include "iwl-trans.h" #define BIOS_SAR_MAX_PROFILE_NUM 4
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 133/262 idpf: fix Rx descriptor ready check barrier in splitq
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Lobakin <[email protected]>
[ Upstream commit c20edbacc0295fd36f5f634b3421647ce3e08fd7 ]
No idea what the current barrier position was meant for. At that point, nothing is read from the descriptor, only the pointer to the actual one is fetched.
The correct barrier usage here is after the generation check, so that only the first qword is read if the descriptor is not yet ready and we need to stop polling. Debatable on coherent DMA as the Rx descriptor size is <= cacheline size, but anyway, the current barrier position only makes the codegen worse.
--- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/idpf/idpf_txrx.c +2 -6
@@ -3216,18 +3216,14 @@ static int idpf_rx_splitq_clean(struct idpf_rx_queue *rxq, int budget)/* get the Rx desc from Rx queue based on 'next_to_clean' */ rx_desc = &rxq->rx[ntc].flex_adv_nic_3_wb; -/* This memory barrier is needed to keep us from reading -* any other fields out of the rx_desc -*/ -dma_rmb (); -/* if the descriptor isn't done, no work yet to do */ gen_id =le16_get_bits (rx_desc->pktlen_gen_bufq_id,VIRTCHNL2_RX_FLEX_DESC_ADV_GEN_M ); -if (idpf_queue_has (GEN_CHK , rxq) != gen_id)break ; +dma_rmb (); + rxdid =FIELD_GET (VIRTCHNL2_RX_FLEX_DESC_ADV_RXDID_M , rx_desc->rxdid_ucast);if (rxdid !=VIRTCHNL2_RXDID_2_FLEX_SPLITQ ) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 134/262 ASoC: Intel: bytcht_es8316: Fix invalid quirk input mapping
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit b20eb0e8de383116f1e1470d74da2a3c83c4e345 ]
When an invalid value is passed via quirk option, currently bytcht_es8316 driver just ignores and leaves as is, which may lead to unepxected results like OOB access.
This patch adds the sanity check and corrects the input mapping to the certain default value if an invalid value is passed.
Message-ID: <[email protected]>
--- sound/soc/intel/boards/bytcht_es8316.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
sound/soc/intel/boards/bytcht_es8316.c +17 -3
@@ -47,7 +47,8 @@ enum { BYT_CHT_ES8316_INTMIC_IN2_MAP, }; -#define BYT_CHT_ES8316_MAP (quirk) ((quirk) & GENMASK(3, 0)) +#define BYT_CHT_ES8316_MAP_MASK GENMASK(3, 0) +#define BYT_CHT_ES8316_MAP (quirk) ((quirk) & BYT_CHT_ES8316_MAP_MASK)#define BYT_CHT_ES8316_SSP0 BIT(16)#define BYT_CHT_ES8316_MONO_SPEAKER BIT(17)#define BYT_CHT_ES8316_JD_INVERTED BIT(18)
@@ -60,10 +61,23 @@ MODULE_PARM_DESC(quirk, "Board-specific quirk override");static void log_quirks (struct device *dev) { -if (BYT_CHT_ES8316_MAP (quirk) ==BYT_CHT_ES8316_INTMIC_IN1_MAP ) +int map; + + map =BYT_CHT_ES8316_MAP (quirk); +switch (map) { +case BYT_CHT_ES8316_INTMIC_IN1_MAP :dev_info (dev,"quirk IN1_MAP enabled" ); -if (BYT_CHT_ES8316_MAP (quirk) ==BYT_CHT_ES8316_INTMIC_IN2_MAP ) +break ; +case BYT_CHT_ES8316_INTMIC_IN2_MAP :dev_info (dev,"quirk IN2_MAP enabled" ); +break ; +default : +dev_warn_once (dev,"quirk sets invalid input map: 0x%x, default to INTMIC_IN1_MAP\n" , map); + quirk &= ~BYT_CHT_ES8316_MAP_MASK ; + quirk |=BYT_CHT_ES8316_INTMIC_IN1_MAP ; +break ; + } +if (quirk &BYT_CHT_ES8316_SSP0 )dev_info (dev,"quirk SSP0 enabled" );if (quirk &BYT_CHT_ES8316_MONO_SPEAKER )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 135/262 ASoC: Intel: bytcr_rt5640: Fix invalid quirk input mapping
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit fba404e4b4af4f4f747bb0e41e9fff7d03c7bcc0 ]
When an invalid value is passed via quirk option, currently bytcr_rt5640 driver only shows an error message but leaves as is. This may lead to unepxected results like OOB access.
This patch corrects the input mapping to the certain default value if an invalid value is passed.
Message-ID: <[email protected]>
--- sound/soc/intel/boards/bytcr_rt5640.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/intel/boards/bytcr_rt5640.c +5 -2
@@ -68,7 +68,8 @@ enum { BYT_RT5640_OVCD_SF_1P5 = (RT5640_OVCD_SF_1P5 << 13), }; -#define BYT_RT5640_MAP (quirk) ((quirk) & GENMASK(3, 0)) +#define BYT_RT5640_MAP_MASK GENMASK(3, 0) +#define BYT_RT5640_MAP (quirk) ((quirk) & BYT_RT5640_MAP_MASK)#define BYT_RT5640_JDSRC (quirk) (((quirk) & GENMASK(7, 4)) >> 4)#define BYT_RT5640_OVCD_TH (quirk) (((quirk) & GENMASK(12, 8)) >> 8)#define BYT_RT5640_OVCD_SF (quirk) (((quirk) & GENMASK(14, 13)) >> 13)
@@ -140,7 +141,9 @@ static void log_quirks(struct device *dev)dev_info (dev,"quirk NO_INTERNAL_MIC_MAP enabled\n" );break ;default : -dev_err (dev,"quirk map 0x%x is not supported, microphone input will not work\n" , map); +dev_warn_once (dev,"quirk sets invalid input map: 0x%x, default to DMIC1_MAP\n" , map); + byt_rt5640_quirk &= ~BYT_RT5640_MAP_MASK ; + byt_rt5640_quirk |=BYT_RT5640_DMIC1_MAP ;break ; }if (byt_rt5640_quirk &BYT_RT5640_HSMIC2_ON_IN1 )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 136/262 ASoC: Intel: bytcr_rt5651: Fix invalid quirk input mapping
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 4336efb59ef364e691ef829a73d9dbd4d5ed7c7b ]
When an invalid value is passed via quirk option, currently bytcr_rt5640 driver just ignores and leaves as is, which may lead to unepxected results like OOB access.
This patch adds the sanity check and corrects the input mapping to the certain default value if an invalid value is passed.
Message-ID: <[email protected]>
--- sound/soc/intel/boards/bytcr_rt5651.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
sound/soc/intel/boards/bytcr_rt5651.c +21 -5
@@ -58,7 +58,8 @@ enum { BYT_RT5651_OVCD_SF_1P5 = (RT5651_OVCD_SF_1P5 << 13), }; -#define BYT_RT5651_MAP (quirk) ((quirk) & GENMASK(3, 0)) +#define BYT_RT5651_MAP_MASK GENMASK(3, 0) +#define BYT_RT5651_MAP (quirk) ((quirk) & BYT_RT5651_MAP_MASK)#define BYT_RT5651_JDSRC (quirk) (((quirk) & GENMASK(7, 4)) >> 4)#define BYT_RT5651_OVCD_TH (quirk) (((quirk) & GENMASK(12, 8)) >> 8)#define BYT_RT5651_OVCD_SF (quirk) (((quirk) & GENMASK(14, 13)) >> 13)
@@ -100,14 +101,29 @@ MODULE_PARM_DESC(quirk, "Board-specific quirk override");static void log_quirks (struct device *dev) { -if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_DMIC_MAP ) +int map; + + map =BYT_RT5651_MAP (byt_rt5651_quirk); +switch (map) { +case BYT_RT5651_DMIC_MAP :dev_info (dev,"quirk DMIC_MAP enabled" ); -if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_IN1_MAP ) +break ; +case BYT_RT5651_IN1_MAP :dev_info (dev,"quirk IN1_MAP enabled" ); -if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_IN2_MAP ) +break ; +case BYT_RT5651_IN2_MAP :dev_info (dev,"quirk IN2_MAP enabled" ); -if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_IN1_IN2_MAP ) +break ; +case BYT_RT5651_IN1_IN2_MAP :dev_info (dev,"quirk IN1_IN2_MAP enabled" ); +break ; +default : +dev_warn_once (dev,"quirk sets invalid input map: 0x%x, default to DMIC_MAP\n" , map); + byt_rt5651_quirk &= ~BYT_RT5651_MAP_MASK ; + byt_rt5651_quirk |=BYT_RT5651_DMIC_MAP ; +break ; + } +if (BYT_RT5651_JDSRC (byt_rt5651_quirk)) {dev_info (dev,"quirk realtek,jack-detect-source %ld\n" ,BYT_RT5651_JDSRC (byt_rt5651_quirk));
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 137/262 drm/msm/dpu: fix incorrect type for ret
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 88ec0e01a880e3326794e149efae39e3aa4dbbec ]
Change 'ret' from unsigned long to int, as storing negative error codes in an unsigned long makes it never equal to -ETIMEDOUT, causing logical errors.
Patchwork: https://patchwork.freedesktop.org/patch/671100/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +1 -1
@@ -445,7 +445,7 @@ static void _dpu_encoder_phys_wb_handle_wbdone_timeout(static int dpu_encoder_phys_wb_wait_for_commit_done (struct dpu_encoder_phys *phys_enc) { -unsigned long ret; +int ret;struct dpu_encoder_wait_info wait_info;struct dpu_encoder_phys_wb *wb_enc =to_dpu_encoder_phys_wb (phys_enc);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 138/262 fs: ntfs3: Fix integer overflow in run_unpack()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Grigoryev <[email protected]>
[ Upstream commit 736fc7bf5f68f6b74a0925b7e072c571838657d2 ]
The MFT record relative to the file being opened contains its runlist, an array containing information about the file's location on the physical disk. Analysis of all Call Stack paths showed that the values of the runlist array, from which LCNs are calculated, are not validated before run_unpack function.
The run_unpack function decodes the compressed runlist data format from MFT attributes (for example, $DATA), converting them into a runs_tree structure, which describes the mapping of virtual clusters (VCN) to logical clusters (LCN). The NTFS3 subsystem also has a shortcut for deleting files from MFT records - in this case, the RUN_DEALLOCATE command is sent to the run_unpack input, and the function logic provides that all data transferred to the runlist about file or directory is deleted without creating a runs_tree structure.
Substituting the runlist in the $DATA attribute of the MFT record for an arbitrary file can lead either to access to arbitrary data on the disk bypassing access checks to them (since the inode access check occurs above) or to destruction of arbitrary data on the disk.
Add overflow check for addition operation.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/ntfs3/run.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/ntfs3/run.c +9 -3
@@ -9,6 +9,7 @@#include <linux/blkdev.h> #include <linux/fs.h> #include <linux/log2.h> +#include <linux/overflow.h> #include "debug.h" #include "ntfs.h"
@@ -982,14 +983,18 @@ int run_unpack(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,if (!dlcn)return -EINVAL ; - lcn = prev_lcn + dlcn; + +if (check_add_overflow (prev_lcn, dlcn, &lcn)) +return -EINVAL ; prev_lcn = lcn; }else {/* The size of 'dlcn' can't be > 8. */ return -EINVAL ; } - next_vcn = vcn64 + len; +if (check_add_overflow (vcn64, len, &next_vcn)) +return -EINVAL ; +/* Check boundary. */ if (next_vcn > evcn +1 )return -EINVAL ;
@@ -1153,7 +1158,8 @@ int run_get_highest_vcn(CLST vcn, const u8 *run_buf, u64 *highest_vcn)return -EINVAL ; run_buf += size_size + offset_size; - vcn64 += len; +if (check_add_overflow (vcn64, len, &vcn64)) +return -EINVAL ;#ifndef CONFIG_NTFS3_64BIT_CLUSTER if (vcn64 >0x100000000ull )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 139/262 fs/ntfs3: reject index allocation if $BITMAP is empty but blocks exist
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moon Hee Lee <[email protected]>
[ Upstream commit 0dc7117da8f92dd5fe077d712a756eccbe377d40 ]
Index allocation requires at least one bit in the $BITMAP attribute to track usage of index entries. If the bitmap is empty while index blocks are already present, this reflects on-disk corruption.
syzbot triggered this condition using a malformed NTFS image. During a rename() operation involving a long filename (which spans multiple index entries), the empty bitmap allowed the name to be added without valid tracking. Subsequent deletion of the original entry failed with -ENOENT, due to unexpected index state.
Reject such cases by verifying that the bitmap is not empty when index blocks exist.
--- fs/ntfs3/index.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/ntfs3/index.c +10 -0
@@ -1508,6 +1508,16 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni, bmp_size = bmp_size_v =le32_to_cpu (bmp->res.data_size); } +/* +* Index blocks exist, but $BITMAP has zero valid bits. +* This implies an on-disk corruption and must be rejected. +*/ +if (in->name ==I30_NAME && +unlikely (bmp_size_v ==0 && indx->alloc_run.count)) { + err = -EINVAL ; + goto out1; + } + bit = bmp_size <<3 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 140/262 iio: consumers: Fix handling of negative channel scale in iio_convert_raw_to_processed()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 0f85406bf830eb8747dd555ab53c9d97ee4af293 ]
There is an issue with the handling of negative channel scales in iio_convert_raw_to_processed_unlocked() when the channel-scale is of the IIO_VAL_INT_PLUS_[MICRO|NANO] type:
Things work for channel-scale values > -1.0 and < 0.0 because of the use of signed values in:
*processed += div_s64(raw64 * (s64)scale_val2 * scale, 1000000LL);
Things will break however for scale values < -1.0. Lets for example say that raw = 2, (caller-provided)scale = 10 and (channel)scale_val = -1.5.
The result should then be 2 * 10 * -1.5 = -30.
channel-scale = -1.5 means scale_val = -1 and scale_val2 = 500000, now lets see what gets stored in processed:
1. *processed = raw64 * scale_val * scale;
2. *processed += raw64 * scale_val2 * scale / 1000000LL;
1. Sets processed to 2 * -1 * 10 = -20
2. Adds 2 * 500000 * 10 / 1000000 = 10 to processed
And the end result is processed = -20 + 10 = -10, which is not correct.
Fix this by always using the abs value of both scale_val and scale_val2 and if either is negative multiply the end-result by -1.
Note there seems to be an unwritten rule about negative IIO_VAL_INT_PLUS_[MICRO|NANO] values that:
i. values > -1.0 and < 0.0 are written as val=0 val2=-xxx
ii. values <= -1.0 are written as val=-xxx val2=xxx
But iio_format_value() will also correctly display a third option:
iii. values <= -1.0 written as val=-xxx val2=-xxx
Since iio_format_value() uses abs(val) when val2 < 0.
This fix also makes iio_convert_raw_to_processed() properly handle channel-scales using this third option.
--- drivers/iio/inkern.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/iio/inkern.c +14 -14
@@ -10,6 +10,7 @@#include <linux/mutex.h> #include <linux/property.h> #include <linux/slab.h> +#include <linux/units.h> #include <linux/iio/iio.h> #include <linux/iio/iio-opaque.h>
@@ -602,7 +603,7 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan, {int scale_type, scale_val, scale_val2;int offset_type, offset_val, offset_val2; -s64 raw64 = raw; +s64 denominator, raw64 = raw; offset_type =iio_channel_read (chan, &offset_val, &offset_val2,IIO_CHAN_INFO_OFFSET );
@@ -646,20 +647,19 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan, *processed = raw64 * scale_val * scale;break ;case IIO_VAL_INT_PLUS_MICRO : -if (scale_val2 <0 ) - *processed = -raw64 * scale_val * scale; -else - *processed = raw64 * scale_val * scale; - *processed +=div_s64 (raw64 * (s64 )scale_val2 * scale, -1000000LL ); -break ;case IIO_VAL_INT_PLUS_NANO : -if (scale_val2 <0 ) - *processed = -raw64 * scale_val * scale; -else - *processed = raw64 * scale_val * scale; - *processed +=div_s64 (raw64 * (s64 )scale_val2 * scale, -1000000000LL ); +switch (scale_type) { +case IIO_VAL_INT_PLUS_MICRO : + denominator =MICRO ; +break ; +case IIO_VAL_INT_PLUS_NANO : + denominator =NANO ; +break ; + } + *processed = raw64 * scale *abs (scale_val); + *processed +=div_s64 (raw64 * scale *abs (scale_val2), denominator); +if (scale_val <0 || scale_val2 <0 ) + *processed *=-1 ;break ;case IIO_VAL_FRACTIONAL : *processed = div_s64(raw64 * (s64)scale_val * scale,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 141/262 iio: consumers: Fix offset handling in iio_convert_raw_to_processed()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 33f5c69c4daff39c010b3ea6da8ebab285f4277b ]
Fix iio_convert_raw_to_processed() offset handling for channels without a scale attribute.
The offset has been applied to the raw64 value not to the original raw value. Use the raw64 value so that the offset is taken into account.
--- drivers/iio/inkern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/inkern.c +1 -1
@@ -638,7 +638,7 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan,* If no channel scaling is available apply consumer scale to * raw value and return. */ - *processed = raw * scale; + *processed = raw64 * scale;return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 142/262 netfilter: ipset: Remove unused htable_bits in macro ahash_region
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhen Ni <[email protected]>
[ Upstream commit ba941796d7cd1e81f51eed145dad1b47240ff420 ]
Since the ahash_region() macro was redefined to calculate the region index solely from HTABLE_REGION_BITS, the htable_bits parameter became unused.
Remove the unused htable_bits argument and its call sites, simplifying the code without changing semantics.
--- net/netfilter/ipset/ip_set_hash_gen.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_hash_gen.h +4 -4
@@ -63,7 +63,7 @@ struct hbucket { : jhash_size((htable_bits) - HTABLE_REGION_BITS))#define ahash_sizeof_regions (htable_bits) \ (ahash_numof_locks(htable_bits) * sizeof(struct ip_set_region)) -#define ahash_region (n, htable_bits) \ +#define ahash_region (n) \ ((n) / jhash_size(HTABLE_REGION_BITS))#define ahash_bucket_start (h, htable_bits) \ ((htable_bits) < HTABLE_REGION_BITS ? 0 \
@@ -702,7 +702,7 @@ mtype_resize(struct ip_set *set, bool retried)#endif key =HKEY (data, h->initval, htable_bits); m =__ipset_dereference (hbucket (t, key)); - nr =ahash_region (key, htable_bits); + nr =ahash_region (key);if (!m) { m = kzalloc(sizeof(*m) + AHASH_INIT_SIZE * dsize,
@@ -852,7 +852,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,rcu_read_lock_bh (); t =rcu_dereference_bh (h->table); key =HKEY (value, h->initval, t->htable_bits); - r =ahash_region (key, t->htable_bits); + r =ahash_region (key);atomic_inc (&t->uref); elements = t->hregion[r].elements; maxelem = t->maxelem;
@@ -1050,7 +1050,7 @@ mtype_del(struct ip_set *set, void *value, const struct ip_set_ext *ext,rcu_read_lock_bh (); t =rcu_dereference_bh (h->table); key =HKEY (value, h->initval, t->htable_bits); - r =ahash_region (key, t->htable_bits); + r =ahash_region (key);atomic_inc (&t->uref);rcu_read_unlock_bh ();
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 143/262 ipvs: Use READ_ONCE/WRITE_ONCE for ipvs->enable
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Tengfei <[email protected]>
[ Upstream commit 944b6b216c0387ac3050cd8b773819ae360bfb1c ]
KCSAN reported a data-race on the ipvs->enable flag, which is written in the control path and read concurrently from many other contexts.
Following a suggestion by Julian, this patch fixes the race by converting all accesses to use WRITE_ONCE()/READ_ONCE(). This lightweight approach ensures atomic access and acts as a compiler barrier, preventing unsafe optimizations where the flag is checked in loops (e.g., in ip_vs_est.c).
Additionally, the enable checks in the fast-path hooks (ip_vs_in_hook, ip_vs_out_hook, ip_vs_forward_icmp) are removed. These are unnecessary since commit 857ca89711de ("ipvs: register hooks only with services"). The enable=0 condition they check for can only occur in two rare and non-fatal
scenarios: 1) after hooks are registered but before the flag is set, and 2) after hooks are unregistered on cleanup_net. In the worst case, a single packet might be mishandled (e.g., dropped), which does not lead to a system crash or data corruption. Adding a check in the performance-critical fast-path to handle this harmless condition is not a worthwhile trade-off.
--- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 11 ++++------- net/netfilter/ipvs/ip_vs_ctl.c | 6 +++--- net/netfilter/ipvs/ip_vs_est.c | 16 ++++++++-------- 4 files changed, 17 insertions(+), 20 deletions(-)
net/netfilter/ipvs/ip_vs_conn.c +2 -2
@@ -885,7 +885,7 @@ static void ip_vs_conn_expire(struct timer_list *t)* conntrack cleanup for the net. */ smp_rmb (); -if (ipvs->enable) +if (READ_ONCE (ipvs->enable))ip_vs_conn_drop_conntrack (cp); }
@@ -1433,7 +1433,7 @@ void ip_vs_expire_nodest_conn_flush(struct netns_ipvs *ipvs)cond_resched_rcu ();/* netns clean up started, abort delayed work */ -if (!ipvs->enable) +if (!READ_ONCE (ipvs->enable))break ; }rcu_read_unlock ();
net/netfilter/ipvs/ip_vs_core.c +4 -7
@@ -1353,9 +1353,6 @@ ip_vs_out_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *statif (unlikely (!skb_dst (skb)))return NF_ACCEPT ; -if (!ipvs->enable) -return NF_ACCEPT ; -ip_vs_fill_iph_skb (af, skb, false, &iph);#ifdef CONFIG_IP_VS_IPV6 if (af ==AF_INET6 ) {
@@ -1940,7 +1937,7 @@ ip_vs_in_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *statereturn NF_ACCEPT ; }/* ipvs enabled in this netns ? */ -if (unlikely (sysctl_backup_only (ipvs) || !ipvs->enable)) +if (unlikely (sysctl_backup_only (ipvs)))return NF_ACCEPT ;ip_vs_fill_iph_skb (af, skb, false, &iph);
@@ -2108,7 +2105,7 @@ ip_vs_forward_icmp(void *priv, struct sk_buff *skb,int r;/* ipvs enabled in this netns ? */ -if (unlikely (sysctl_backup_only (ipvs) || !ipvs->enable)) +if (unlikely (sysctl_backup_only (ipvs)))return NF_ACCEPT ;if (state->pf ==NFPROTO_IPV4 ) {
@@ -2295,7 +2292,7 @@ static int __net_init __ip_vs_init(struct net *net)return -ENOMEM ;/* Hold the beast until a service is registered */ - ipvs->enable =0 ; +WRITE_ONCE (ipvs->enable,0 ); ipvs->net = net;/* Counters used for creating unique names */ ipvs->gen =atomic_read (&ipvs_netns_cnt);
@@ -2367,7 +2364,7 @@ static void __net_exit __ip_vs_dev_cleanup_batch(struct list_head *net_list) ipvs =net_ipvs (net);ip_vs_unregister_hooks (ipvs,AF_INET );ip_vs_unregister_hooks (ipvs,AF_INET6 ); - ipvs->enable =0 ;/* Disable packet reception */ +WRITE_ONCE (ipvs->enable,0 );/* Disable packet reception */ smp_wmb ();ip_vs_sync_net_cleanup (ipvs); }
net/netfilter/ipvs/ip_vs_ctl.c +3 -3
@@ -256,7 +256,7 @@ static void est_reload_work_handler(struct work_struct *work)struct ip_vs_est_kt_data *kd = ipvs->est_kt_arr[id];/* netns clean up started, abort delayed work */ -if (!ipvs->enable) +if (!READ_ONCE (ipvs->enable)) goto unlock;if (!kd)continue ;
@@ -1482,9 +1482,9 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u, *svc_p = svc; -if (!ipvs->enable) { +if (!READ_ONCE (ipvs->enable)) {/* Now there is a service - full throttle */ - ipvs->enable =1 ; +WRITE_ONCE (ipvs->enable,1 );/* Start estimation for first time */ ip_vs_est_reload_start (ipvs);
net/netfilter/ipvs/ip_vs_est.c +8 -8
@@ -231,7 +231,7 @@ static int ip_vs_estimation_kthread(void *data)void ip_vs_est_reload_start (struct netns_ipvs *ipvs) {/* Ignore reloads before first service is added */ -if (!ipvs->enable) +if (!READ_ONCE (ipvs->enable))return ;ip_vs_est_stopped_recalc (ipvs);/* Bump the kthread configuration genid */
@@ -305,7 +305,7 @@ static int ip_vs_est_add_kthread(struct netns_ipvs *ipvs)int i;if ((unsigned long )ipvs->est_kt_count >= ipvs->est_max_threads && - ipvs->enable && ipvs->est_max_threads) +READ_ONCE (ipvs->enable) && ipvs->est_max_threads)return -EINVAL ;mutex_lock (&ipvs->est_mutex);
@@ -342,7 +342,7 @@ static int ip_vs_est_add_kthread(struct netns_ipvs *ipvs) }/* Start kthread tasks only when services are present */ -if (ipvs->enable && !ip_vs_est_stopped (ipvs)) { +if (READ_ONCE (ipvs->enable) && !ip_vs_est_stopped (ipvs)) { ret =ip_vs_est_kthread_start (ipvs, kd);if (ret <0 ) goto out;
@@ -485,7 +485,7 @@ int ip_vs_start_estimator(struct netns_ipvs *ipvs, struct ip_vs_stats *stats)struct ip_vs_estimator *est = &stats->est;int ret; -if (!ipvs->est_max_threads && ipvs->enable) +if (!ipvs->est_max_threads &&READ_ONCE (ipvs->enable)) ipvs->est_max_threads =ip_vs_est_max_threads (ipvs); est->ktid =-1 ;
@@ -662,7 +662,7 @@ static int ip_vs_est_calc_limits(struct netns_ipvs *ipvs, int *chain_max)/* Wait for cpufreq frequency transition */ wait_event_idle_timeout (wq,kthread_should_stop (),HZ /50 ); -if (!ipvs->enable ||kthread_should_stop ()) +if (!READ_ONCE (ipvs->enable) ||kthread_should_stop ()) goto stop; }
@@ -680,7 +680,7 @@ static int ip_vs_est_calc_limits(struct netns_ipvs *ipvs, int *chain_max)rcu_read_unlock ();local_bh_enable (); -if (!ipvs->enable ||kthread_should_stop ()) +if (!READ_ONCE (ipvs->enable) ||kthread_should_stop ()) goto stop;cond_resched ();
@@ -756,7 +756,7 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs)mutex_lock (&ipvs->est_mutex);for (id =1 ; id < ipvs->est_kt_count; id++) {/* netns clean up started, abort */ -if (!ipvs->enable) +if (!READ_ONCE (ipvs->enable)) goto unlock2; kd = ipvs->est_kt_arr[id];if (!kd)
@@ -786,7 +786,7 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs) id = ipvs->est_kt_count; next_kt: -if (!ipvs->enable ||kthread_should_stop ()) +if (!READ_ONCE (ipvs->enable) ||kthread_should_stop ()) goto unlock; id--;if (id <0 )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 144/262 watchdog: mpc8xxx_wdt: Reload the watchdog timer when enabling the watchdog
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 7dfd80f70ef00d871df5af7c391133f7ba61ad9b ]
When the watchdog gets enabled with this driver, it leaves enough time for the core watchdog subsystem to start pinging it. But when the watchdog is already started by hardware or by the boot loader, little time remains before it fires and it happens that the core watchdog subsystem doesn't have time to start pinging it.
Until commit 19ce9490aa84 ("watchdog: mpc8xxx: use the core worker function") pinging was managed by the driver itself and the watchdog was immediately pinged by setting the timer expiry to 0.
So restore similar behaviour by pinging it when enabling it so that if it was already enabled the watchdog timer counter is reloaded.
--- drivers/watchdog/mpc8xxx_wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/mpc8xxx_wdt.c +2 -0
@@ -100,6 +100,8 @@ static int mpc8xxx_wdt_start(struct watchdog_device *w) ddata->swtc = tmp >>16 ;set_bit (WDOG_HW_RUNNING , &ddata->wdd.status); +mpc8xxx_wdt_keepalive (ddata); +return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 145/262 drivers/base/node: handle error properly in register_one_node()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Donet Tom <[email protected]>
[ Upstream commit 786eb990cfb78aab94eb74fb32a030e14723a620 ]
If register_node() returns an error, it is not handled correctly. The function will proceed further and try to register CPUs under the node, which is not correct.
So, in this patch, if register_node() returns an error, we return immediately from the function.
--- drivers/base/node.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/base/node.c +5 -0
@@ -879,6 +879,11 @@ int __register_one_node(int nid) node_devices[nid] = node; error =register_node (node_devices[nid], nid); +if (error) { + node_devices[nid] =NULL ; +kfree (node); +return error; + }/* link cpu under this node */ for_each_present_cpu (cpu) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 146/262 RDMA/cm: Rate limit destroy CM ID timeout error message
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Håkon Bugge <[email protected]>
[ Upstream commit 2bbe1255fcf19c5eb300efb6cb5ad98d66fdae2e ]
When the destroy CM ID timeout kicks in, you typically get a storm of them which creates a log flooding. Hence, change pr_err() to pr_err_ratelimited() in cm_destroy_id_wait_timeout().
--- drivers/infiniband/core/cm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/core/cm.c +2 -2
@@ -1032,8 +1032,8 @@ static noinline void cm_destroy_id_wait_timeout(struct ib_cm_id *cm_id,struct cm_id_private *cm_id_priv; cm_id_priv = container_of(cm_id, struct cm_id_private, id); -pr_err ("%s: cm_id=%p timed out. state %d -> %d, refcnt=%d\n" , __func__, - cm_id, old_state, cm_id->state,refcount_read (&cm_id_priv->refcount)); +pr_err_ratelimited ("%s: cm_id=%p timed out. state %d -> %d, refcnt=%d\n" , __func__, + cm_id, old_state, cm_id->state,refcount_read (&cm_id_priv->refcount)); }static void cm_destroy_id (struct ib_cm_id *cm_id,int err)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 147/262 wifi: mt76: fix potential memory leak in mt76_wmac_probe()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abdun Nihaal <[email protected]>
[ Upstream commit 42754b7de2b1a2cf116c5e3f1e8e78392f4ed700 ]
In mt76_wmac_probe(), when the mt76_alloc_device() call succeeds, memory is allocated for both struct ieee80211_hw and a workqueue. However, on the error path, the workqueue is not freed. Fix that by calling mt76_free_device() on the error path.
--- drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7603/soc.c +1 -1
@@ -48,7 +48,7 @@ mt76_wmac_probe(struct platform_device *pdev)return 0 ; error: -ieee80211_free_hw (mt76_hw (dev)); +mt76_free_device (mdev);return ret; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 148/262 wifi: mt76: mt7996: Fix RX packets configuration for primary WED device
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit cffed52dbf0ddd0db11f9df63f9976fe58ac9628 ]
In order to properly set the number of rx packets for primary WED device if hif device is available, move hif pointer initialization before running mt7996_mmio_wed_init routine.
--- drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/pci.c +1 -1
@@ -132,6 +132,7 @@ static int mt7996_pci_probe(struct pci_dev *pdev, mdev = &dev->mt76;mt7996_wfsys_reset (dev); hif2 =mt7996_pci_init_hif2 (pdev); + dev->hif2 = hif2; ret =mt7996_mmio_wed_init (dev, pdev, false, &irq);if (ret <0 )
@@ -156,7 +157,6 @@ static int mt7996_pci_probe(struct pci_dev *pdev,if (hif2) { hif2_dev = container_of(hif2->dev, struct pci_dev, dev); - dev->hif2 = hif2; ret =mt7996_mmio_wed_init (dev, hif2_dev, true, &hif2_irq);if (ret <0 )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 149/262 wifi: mt76: mt7996: Convert mt7996_wed_rro_addr to LE
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 809054a60d613ccca6e7f243bc68966b58044163 ]
Do not use bitmask in mt7996_wed_rro_addr DMA descriptor in order to not break endianness
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 8 +++++--- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 11 +++++------ 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +5 -3
@@ -679,6 +679,7 @@ void mt7996_wfsys_reset(struct mt7996_dev *dev)static int mt7996_wed_rro_init (struct mt7996_dev *dev) {#ifdef CONFIG_NET_MEDIATEK_SOC_WED +u32 val =FIELD_PREP (WED_RRO_ADDR_SIGNATURE_MASK ,0xff );struct mtk_wed_device *wed = &dev->mt76.mmio.wed;u32 reg =MT_RRO_ADDR_ELEM_SEG_ADDR0 ;struct mt7996_wed_rro_addr *addr;
@@ -718,7 +719,7 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev) addr = dev->wed_rro.addr_elem[i].ptr;for (j =0 ; j <MT7996_RRO_WINDOW_MAX_SIZE ; j++) { - addr->signature =0xff ; + addr->data =cpu_to_le32 (val); addr++; }
@@ -736,7 +737,7 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev) dev->wed_rro.session.ptr = ptr; addr = dev->wed_rro.session.ptr;for (i =0 ; i <MT7996_RRO_WINDOW_MAX_LEN ; i++) { - addr->signature =0xff ; + addr->data =cpu_to_le32 (val); addr++; }
@@ -836,6 +837,7 @@ static void mt7996_wed_rro_free(struct mt7996_dev *dev)static void mt7996_wed_rro_work (struct work_struct *work) {#ifdef CONFIG_NET_MEDIATEK_SOC_WED +u32 val =FIELD_PREP (WED_RRO_ADDR_SIGNATURE_MASK ,0xff );struct mt7996_dev *dev;LIST_HEAD (list);
@@ -872,7 +874,7 @@ static void mt7996_wed_rro_work(struct work_struct *work)MT7996_RRO_WINDOW_MAX_LEN ; reset: elem = ptr + elem_id *sizeof (*elem); - elem->signature =0xff ; + elem->data |=cpu_to_le32 (val); }mt7996_mcu_wed_rro_reset_sessions (dev, e->id); out:
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +5 -6
@@ -194,13 +194,12 @@ struct mt7996_hif {int irq; }; +#define WED_RRO_ADDR_SIGNATURE_MASK GENMASK(31, 24) +#define WED_RRO_ADDR_COUNT_MASK GENMASK(14, 4) +#define WED_RRO_ADDR_HEAD_HIGH_MASK GENMASK(3, 0)struct mt7996_wed_rro_addr { -u32 head_low; -u32 head_high :4 ; -u32 count:11 ; -u32 oor:1 ; -u32 rsv :8 ; -u32 signature :8 ; +__le32 head_low; +__le32 data; };struct mt7996_wed_rro_session_id {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 150/262 wifi: mt76: mt7915: fix mt7981 pre-calibration
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhi-Jun You <[email protected]>
[ Upstream commit 2b660ee10a0c25b209d7fda3c41b821b75dd85d9 ]
In vendor driver, size of group cal and dpd cal for mt7981 includes 6G although the chip doesn't support it.
mt76 doesn't take this into account which results in reading from the incorrect offset.
For devices with precal, this would lead to lower bitrate.
Fix this by aligning groupcal size with vendor driver and switch to freq_list_v2 in mt7915_dpd_freq_idx in order to get the correct offset.
Below are iwinfo of the test device with two clients connected (iPhone 16, Intel AX210).
Before :
Mode: Master Channel: 36 (5.180 GHz) HT Mode: HE80 Center Channel 1: 42 2: unknown Tx-Power: 23 dBm Link Quality: 43/70 Signal: -67 dBm Noise: -92 dBm Bit Rate: 612.4 MBit/s Encryption: WPA3 SAE (CCMP) Type: nl80211 HW Mode(s): 802.11ac/ax/n Hardware: embedded [MediaTek MT7981]
After:
Mode: Master Channel: 36 (5.180 GHz) HT Mode: HE80 Center Channel 1: 42 2: unknown Tx-Power: 23 dBm Link Quality: 43/70 Signal: -67 dBm Noise: -92 dBm Bit Rate: 900.6 MBit/s Encryption: WPA3 SAE (CCMP) Type: nl80211 HW Mode(s): 802.11ac/ax/n Hardware: embedded [MediaTek MT7981]
Tested-on: mt7981 20240823
--- .../wireless/mediatek/mt76/mt7915/eeprom.h | 6 ++-- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 29 +++++-------------- 2 files changed, 10 insertions(+), 25 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +3 -3
@@ -50,9 +50,9 @@ enum mt7915_eeprom_field {#define MT_EE_CAL_GROUP_SIZE_7975 (54 * MT_EE_CAL_UNIT + 16)#define MT_EE_CAL_GROUP_SIZE_7976 (94 * MT_EE_CAL_UNIT + 16)#define MT_EE_CAL_GROUP_SIZE_7916_6G (94 * MT_EE_CAL_UNIT + 16) +#define MT_EE_CAL_GROUP_SIZE_7981 (144 * MT_EE_CAL_UNIT + 16)#define MT_EE_CAL_DPD_SIZE_V1 (54 * MT_EE_CAL_UNIT)#define MT_EE_CAL_DPD_SIZE_V2 (300 * MT_EE_CAL_UNIT) -#define MT_EE_CAL_DPD_SIZE_V2_7981 (102 * MT_EE_CAL_UNIT)/* no 6g dpd data */ #define MT_EE_WIFI_CONF0_TX_PATH GENMASK(2, 0)#define MT_EE_WIFI_CONF0_BAND_SEL GENMASK(7, 6)
@@ -179,6 +179,8 @@ mt7915_get_cal_group_size(struct mt7915_dev *dev) val =FIELD_GET (MT_EE_WIFI_CONF0_BAND_SEL , val);return (val ==MT_EE_V2_BAND_SEL_6GHZ ) ?MT_EE_CAL_GROUP_SIZE_7916_6G :MT_EE_CAL_GROUP_SIZE_7916 ; + }else if (is_mt7981 (&dev->mt76)) { +return MT_EE_CAL_GROUP_SIZE_7981 ; }else if (mt7915_check_adie (dev, false)) {return MT_EE_CAL_GROUP_SIZE_7976 ; }else {
@@ -191,8 +193,6 @@ mt7915_get_cal_dpd_size(struct mt7915_dev *dev) {if (is_mt7915 (&dev->mt76))return MT_EE_CAL_DPD_SIZE_V1 ; -else if (is_mt7981 (&dev->mt76)) -return MT_EE_CAL_DPD_SIZE_V2_7981 ;else return MT_EE_CAL_DPD_SIZE_V2 ; }
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +7 -22
@@ -3004,30 +3004,15 @@ static int mt7915_dpd_freq_idx(struct mt7915_dev *dev, u16 freq, u8 bw)/* 5G BW160 */ 5250, 5570, 5815 }; -static const u16 freq_list_v2_7981[] = { -/* 5G BW20 */ -5180 ,5200 ,5220 ,5240 , -5260 ,5280 ,5300 ,5320 , -5500 ,5520 ,5540 ,5560 , -5580 ,5600 ,5620 ,5640 , -5660 ,5680 ,5700 ,5720 , -5745 ,5765 ,5785 ,5805 , -5825 ,5845 ,5865 ,5885 , -/* 5G BW160 */ -5250 ,5570 ,5815 - }; -const u16 *freq_list = freq_list_v1; -int n_freqs =ARRAY_SIZE (freq_list_v1); -int idx; +const u16 *freq_list; +int idx, n_freqs;if (!is_mt7915 (&dev->mt76)) { -if (is_mt7981 (&dev->mt76)) { - freq_list = freq_list_v2_7981; - n_freqs =ARRAY_SIZE (freq_list_v2_7981); - }else { - freq_list = freq_list_v2; - n_freqs =ARRAY_SIZE (freq_list_v2); - } + freq_list = freq_list_v2; + n_freqs =ARRAY_SIZE (freq_list_v2); + }else { + freq_list = freq_list_v1; + n_freqs =ARRAY_SIZE (freq_list_v1); }if (freq <4000 ) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 151/262 f2fs: fix to update map->m_next_extent correctly in f2fs_map_blocks()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 869833f54e8306326b85ca3ed08979b7ad412a4a ]
Script to reproduce:
mkfs.f2fs -O extra_attr,compression /dev/vdb -f mount /dev/vdb /mnt/f2fs -o mode=lfs,noextent_cache cd /mnt/f2fsf2fs_io write 1 0 1024 rand dsync testfile xfs_io testfile -c "fsync"f2fs_io write 1 0 512 rand dsync testfile xfs_io testfile -c "fsync"
cd /
umount /mnt/f2fs
mount /dev/vdb /mnt/f2fsf2fs_io precache_extents /mnt/f2fs/testfile umount /mnt/f2fs
Tracepoint output:f2fs_update_read_extent_tree_range: dev = (253,16), ino = 4, pgofs = 0, len = 512, blkaddr = 1055744, c_len = 0 f2fs_update_read_extent_tree_range: dev = (253,16), ino = 4, pgofs = 513, len = 351, blkaddr = 17921, c_len = 0 f2fs_update_read_extent_tree_range: dev = (253,16), ino = 4, pgofs = 864, len = 160, blkaddr = 18272, c_len = 0
During precache_extents, there is off-by-one issue, we should update map->m_next_extent to pgofs rather than pgofs + 1, if last blkaddr is valid and not contiguous to previous extent.
--- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/data.c +1 -1
@@ -1786,7 +1786,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag) map->m_len - ofs); }if (map->m_next_extent) - *map->m_next_extent = pgofs +1 ; + *map->m_next_extent = is_hole ? pgofs +1 : pgofs; }f2fs_put_dnode (&dn); unlock_out:
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 152/262 f2fs: fix to truncate first page in error path of f2fs_truncate()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 9251a9e6e871cb03c4714a18efa8f5d4a8818450 ]
syzbot reports a bug as below:
loop0: detected capacity change from 0 to 40427
F2FS-fs (loop0): Wrong SSA boundary, start(3584) end(4096) blocks(3072)
F2FS-fs (loop0): Can't find valid F2FS filesystem in 1th superblock
F2FS-fs (loop0): invalid crc value
F2FS-fs (loop0): f2fs_convert_inline_folio: corrupted inline inode ino=3, i_addr[0]:0x1601, run fsck to fix.
------------[ cut here ]------------ kernel BUG at fs/inode.c:753! RIP: 0010:clear_inode+0x169/0x190 fs/inode.c:753 Call Trace: <TASK> evict+0x504/0x9c0 fs/inode.c:810 f2fs_fill_super+0x5612/0x6fa0 fs/f2fs/super.c:5047 get_tree_bdev_flags+0x40e/0x4d0 fs/super.c:1692 vfs_get_tree+0x8f/0x2b0 fs/super.c:1815 do_new_mount+0x2a2/0x9e0 fs/namespace.c:3808 do_mount fs/namespace.c:4136 [inline] __do_sys_mount fs/namespace.c:4347 [inline] __se_sys_mount+0x317/0x410 fs/namespace.c:4324 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0x3b0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
During f2fs_evict_inode(), clear_inode() detects that we missed to truncate all page cache before destorying inode, that is because in below path, we will create page #0 in cache, but missed to drop it in error path, let's fix it.
- evict
- f2fs_evict_inode
- f2fs_truncate
- f2fs_convert_inline_inode
- f2fs_grab_cache_folio
: create page #0 in cache
- f2fs_convert_inline_folio
: sanity check failed, return -EFSCORRUPTED
- clear_inode detects that inode->i_data.nrpages is not zero
--- fs/f2fs/file.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/f2fs/file.c +9 -1
@@ -856,8 +856,16 @@ int f2fs_truncate(struct inode *inode)/* we should check inline_data size */ if (!f2fs_may_inline_data (inode)) { err =f2fs_convert_inline_inode (inode); -if (err) +if (err) { +/* +* Always truncate page #0 to avoid page cache +* leak in evict() path. +*/ +truncate_inode_pages_range (inode->i_mapping, +F2FS_BLK_TO_BYTES (0 ), +F2FS_BLK_END_BYTES (0 ));return err; + } } err =f2fs_truncate_blocks (inode,i_size_read (inode), true);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 153/262 f2fs: fix to mitigate overhead of f2fs_zero_post_eof_page()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit c2f7c32b254006ad48f8e4efb2e7e7bf71739f17 ]
f2fs_zero_post_eof_page() may cuase more overhead due to invalidate_lock and page lookup, change as below to mitigate its overhead:
- check new_size before grabbing invalidate_lock
- lookup and invalidate pages only in range of [old_size, new_size]
--- fs/f2fs/file.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
fs/f2fs/file.c +19 -20
@@ -35,15 +35,23 @@#include <trace/events/f2fs.h> #include <uapi/linux/f2fs.h> -static void f2fs_zero_post_eof_page (struct inode *inode,loff_t new_size) +static void f2fs_zero_post_eof_page (struct inode *inode, +loff_t new_size,bool lock) {loff_t old_size =i_size_read (inode);if (old_size >= new_size)return ; +if (mapping_empty (inode->i_mapping)) +return ; + +if (lock) +filemap_invalidate_lock (inode->i_mapping);/* zero or drop pages only in range of [old_size, new_size] */ -truncate_pagecache (inode, old_size); +truncate_inode_pages_range (inode->i_mapping, old_size, new_size); +if (lock) +filemap_invalidate_unlock (inode->i_mapping); }static vm_fault_t f2fs_filemap_fault (struct vm_fault *vmf)
@@ -114,9 +122,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)f2fs_bug_on (sbi,f2fs_has_inline_data (inode)); -filemap_invalidate_lock (inode->i_mapping); -f2fs_zero_post_eof_page (inode, (folio->index +1 ) <<PAGE_SHIFT ); -filemap_invalidate_unlock (inode->i_mapping); +f2fs_zero_post_eof_page (inode, (folio->index +1 ) <<PAGE_SHIFT , true);file_update_time (vmf->vma->vm_file);filemap_invalidate_lock_shared (inode->i_mapping);
@@ -1089,7 +1095,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,filemap_invalidate_lock (inode->i_mapping);if (attr->ia_size > old_size) -f2fs_zero_post_eof_page (inode, attr->ia_size); +f2fs_zero_post_eof_page (inode, attr->ia_size, false);truncate_setsize (inode, attr->ia_size);if (attr->ia_size <= old_size)
@@ -1208,9 +1214,7 @@ static int f2fs_punch_hole(struct inode *inode, loff_t offset, loff_t len)if (ret)return ret; -filemap_invalidate_lock (inode->i_mapping); -f2fs_zero_post_eof_page (inode, offset + len); -filemap_invalidate_unlock (inode->i_mapping); +f2fs_zero_post_eof_page (inode, offset + len, true); pg_start = ((unsigned long long ) offset) >>PAGE_SHIFT ; pg_end = ((unsigned long long ) offset + len) >>PAGE_SHIFT ;
@@ -1495,7 +1499,7 @@ static int f2fs_do_collapse(struct inode *inode, loff_t offset, loff_t len)f2fs_down_write (&F2FS_I (inode)->i_gc_rwsem[WRITE ]);filemap_invalidate_lock (inode->i_mapping); -f2fs_zero_post_eof_page (inode, offset + len); +f2fs_zero_post_eof_page (inode, offset + len, false);f2fs_lock_op (sbi);f2fs_drop_extent_tree (inode);
@@ -1618,9 +1622,7 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,if (ret)return ret; -filemap_invalidate_lock (mapping); -f2fs_zero_post_eof_page (inode, offset + len); -filemap_invalidate_unlock (mapping); +f2fs_zero_post_eof_page (inode, offset + len, true); pg_start = ((unsigned long long ) offset) >>PAGE_SHIFT ; pg_end = ((unsigned long long ) offset + len) >>PAGE_SHIFT ;
@@ -1754,7 +1756,7 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)f2fs_down_write (&F2FS_I (inode)->i_gc_rwsem[WRITE ]);filemap_invalidate_lock (mapping); -f2fs_zero_post_eof_page (inode, offset + len); +f2fs_zero_post_eof_page (inode, offset + len, false);truncate_pagecache (inode, offset);while (!ret && idx > pg_start) {
@@ -1812,9 +1814,7 @@ static int f2fs_expand_inode_data(struct inode *inode, loff_t offset,if (err)return err; -filemap_invalidate_lock (inode->i_mapping); -f2fs_zero_post_eof_page (inode, offset + len); -filemap_invalidate_unlock (inode->i_mapping); +f2fs_zero_post_eof_page (inode, offset + len, true);f2fs_balance_fs (sbi, true);
@@ -4759,9 +4759,8 @@ static ssize_t f2fs_write_checks(struct kiocb *iocb, struct iov_iter *from)if (err)return err; -filemap_invalidate_lock (inode->i_mapping); -f2fs_zero_post_eof_page (inode, iocb->ki_pos +iov_iter_count (from)); -filemap_invalidate_unlock (inode->i_mapping); +f2fs_zero_post_eof_page (inode, + iocb->ki_pos +iov_iter_count (from), true);return count; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 154/262 ALSA: pcm: Disable bottom softirqs as part of spin_lock_irq() on PREEMPT_RT
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 9fc4a3da9a0259a0500848b5d8657918efde176b ]
snd_pcm_group_lock_irq() acquires a spinlock_t and disables interrupts via spin_lock_irq(). This also implicitly disables the handling of softirqs such as TIMER_SOFTIRQ.
On PREEMPT_RT softirqs are preemptible and spin_lock_irq() does not disable them. That means a timer can be invoked during spin_lock_irq() on the same CPU. Due to synchronisations reasons local_bh_disable() has a per-CPU lock named softirq_ctrl.lock which synchronizes individual softirq against each other.
syz-bot managed to trigger a lockdep report where softirq_ctrl.lock is acquired in hrtimer_cancel() in addition to hrtimer_run_softirq(). This is a possible deadlock.
The softirq_ctrl.lock can not be made part of spin_lock_irq() as this would lead to too much synchronisation against individual threads on the system. To avoid the possible deadlock, softirqs must be manually disabled before the lock is acquired.
Disable softirqs before the lock is acquired on PREEMPT_RT.
--- sound/core/pcm_native.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
sound/core/pcm_native.c +15 -10
@@ -84,19 +84,24 @@ void snd_pcm_group_init(struct snd_pcm_group *group) }/* define group lock helpers */ -#define DEFINE_PCM_GROUP_LOCK (action, mutex_action) \ +#define DEFINE_PCM_GROUP_LOCK (action, bh_lock, bh_unlock, mutex_action) \ static void snd_pcm_group_ ## action(struct snd_pcm_group *group, bool nonatomic) \ { \ - if (nonatomic) \ + if (nonatomic) { \ mutex_ ## mutex_action(&group->mutex); \ - else \ - spin_ ## action(&group->lock); \ -} - -DEFINE_PCM_GROUP_LOCK (lock, lock); -DEFINE_PCM_GROUP_LOCK (unlock, unlock); -DEFINE_PCM_GROUP_LOCK (lock_irq, lock); -DEFINE_PCM_GROUP_LOCK (unlock_irq, unlock); + } else { \ + if (IS_ENABLED(CONFIG_PREEMPT_RT) && bh_lock) \ + local_bh_disable(); \ + spin_ ## action(&group->lock); \ + if (IS_ENABLED(CONFIG_PREEMPT_RT) && bh_unlock) \ + local_bh_enable(); \ + } \ +} + +DEFINE_PCM_GROUP_LOCK (lock, false, false, lock); +DEFINE_PCM_GROUP_LOCK (unlock, false, false, unlock); +DEFINE_PCM_GROUP_LOCK (lock_irq, true, false, lock); +DEFINE_PCM_GROUP_LOCK (unlock_irq, false, true, unlock);/** * snd_pcm_stream_lock - Lock the PCM stream
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 155/262 ACPI: NFIT: Fix incorrect ndr_desc being reportedin dev_err message
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
[ Upstream commit d1a599a8136b16522b5afebd122395524496d549 ]
There appears to be a cut-n-paste error with the incorrect field ndr_desc->numa_node being reported for the target node. Fix this by using ndr_desc->target_node instead.
--- drivers/acpi/nfit/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/nfit/core.c +1 -1
@@ -2637,7 +2637,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,if (ndr_desc->target_node ==NUMA_NO_NODE ) { ndr_desc->target_node =phys_to_target_node (spa->address);dev_info (acpi_desc->dev,"changing target node from %d to %d for nfit region [%pa-%pa]" , -NUMA_NO_NODE , ndr_desc->numa_node, &res.start, &res.end); +NUMA_NO_NODE , ndr_desc->target_node, &res.start, &res.end); }/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 156/262 scsi: qla2xxx: edif: Fix incorrect sign of error code
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 066b8f3fa85c1be7fb7dbae202231e131d38f7bc ]
Change the error code EAGAIN to -EAGAIN in qla24xx_sadb_update() and qla_edif_process_els() to align with qla2x00_start_sp() returning negative error codes or QLA_SUCCESS, preventing logical errors.
Message-ID: <[email protected]>
--- drivers/scsi/qla2xxx/qla_edif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_edif.c +2 -2
@@ -1797,7 +1797,7 @@ qla24xx_sadb_update(struct bsg_job *bsg_job)switch (rval) {case QLA_SUCCESS :break ; -case EAGAIN : +case -EAGAIN :msleep (EDIF_MSLEEP_INTERVAL ); cnt++;if (cnt <EDIF_RETRY_COUNT )
@@ -3648,7 +3648,7 @@ int qla_edif_process_els(scsi_qla_host_t *vha, struct bsg_job *bsg_job) p->e.extra_rx_xchg_address, p->e.extra_control_flags, sp->handle, sp->remap.req.len, bsg_job);break ; -case EAGAIN : +case -EAGAIN :msleep (EDIF_MSLEEP_INTERVAL ); cnt++;if (cnt <EDIF_RETRY_COUNT )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 157/262 scsi: qla2xxx: Fix incorrect sign of error code in START_SP_W_RETRIES()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 1f037e3acda79639a78f096355f2c308a3d45492 ]
Change the error code EAGAIN to -EAGAIN in START_SP_W_RETRIES() to align with qla2x00_start_sp() returning negative error codes or QLA_SUCCESS, preventing logical errors. Additionally, the '_rval' variable should store negative error codes to conform to Linux kernel error code conventions.
Message-ID: <[email protected]>
--- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -2
@@ -2059,11 +2059,11 @@ static void qla_marker_sp_done(srb_t *sp, int res)int cnt =5 ; \ do { \ if (_chip_gen != sp->vha->hw->chip_reset || _login_gen != sp->fcport->login_gen) {\ - _rval = EINVAL; \ + _rval = -EINVAL; \ break; \ } \ _rval = qla2x00_start_sp(_sp); \ - if (_rval == EAGAIN) \ + if (_rval == -EAGAIN) \ msleep(1); \ else \ break; \
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 158/262 scsi: qla2xxx: Fix incorrect sign of error code in qla_nvme_xmt_ls_rsp()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qianfeng Rong <[email protected]>
[ Upstream commit 9877c004e9f4d10e7786ac80a50321705d76e036 ]
Change the error code EAGAIN to -EAGAIN in qla_nvme_xmt_ls_rsp() to align with qla2x00_start_sp() returning negative error codes or QLA_SUCCESS, preventing logical errors.
Message-ID: <[email protected]>
--- drivers/scsi/qla2xxx/qla_nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_nvme.c +1 -1
@@ -419,7 +419,7 @@ static int qla_nvme_xmt_ls_rsp(struct nvme_fc_local_port *lport,switch (rval) {case QLA_SUCCESS :break ; -case EAGAIN : +case -EAGAIN :msleep (PURLS_MSLEEP_INTERVAL ); cnt++;if (cnt <PURLS_RETRY_COUNT )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 159/262 HID: hidraw: tighten ioctl command parsing
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Tissoires <[email protected]>
[ Upstream commit 75d5546f60b36900051d75ee623fceccbeb6750c ]
The handling for variable-length ioctl commands in hidraw_ioctl() is rather complex and the check for the data direction is incomplete.
Simplify this code by factoring out the various ioctls grouped by dir and size, and using a switch() statement with the size masked out, to ensure the rest of the command is correctly matched.
--- drivers/hid/hidraw.c | 224 ++++++++++++++++++++---------------- include/uapi/linux/hidraw.h | 2 + 2 files changed, 124 insertions(+), 102 deletions(-)
drivers/hid/hidraw.c +122 -102
@@ -394,27 +394,15 @@ static int hidraw_revoke(struct hidraw_list *list)return 0 ; } -static long hidraw_ioctl (struct file *file,unsigned int cmd, -unsigned long arg) +static long hidraw_fixed_size_ioctl (struct file *file,struct hidraw *dev,unsigned int cmd, +void __user *arg) { -struct inode *inode =file_inode (file); -unsigned int minor =iminor (inode); -long ret =0 ; -struct hidraw *dev; -struct hidraw_list *list = file->private_data; -void __user *user_arg = (void __user *) arg; - -down_read (&minors_rwsem); - dev = hidraw_table[minor]; -if (!dev || !dev->exist ||hidraw_is_revoked (list)) { - ret = -ENODEV ; - goto out; - } +struct hid_device *hid = dev->hid;switch (cmd) {case HIDIOCGRDESCSIZE : -if (put_user (dev->hid->rsize, (int __user *)arg)) - ret = -EFAULT ; +if (put_user (hid->rsize, (int __user *)arg)) +return -EFAULT ;break ;case HIDIOCGRDESC :
@@ -422,113 +410,145 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,__u32 len;if (get_user (len, (int __user *)arg)) - ret = -EFAULT ; -else if (len >HID_MAX_DESCRIPTOR_SIZE -1 ) - ret = -EINVAL ; -else if (copy_to_user (user_arg + offsetof( -struct hidraw_report_descriptor , - value[0]), - dev->hid->rdesc, - min(dev->hid->rsize, len))) - ret = -EFAULT ; +return -EFAULT ; + +if (len >HID_MAX_DESCRIPTOR_SIZE -1 ) +return -EINVAL ; + +if (copy_to_user (arg + offsetof( +struct hidraw_report_descriptor , + value[0]), + hid->rdesc, + min(hid->rsize, len))) +return -EFAULT ; +break ; }case HIDIOCGRAWINFO : {struct hidraw_devinfo dinfo; - dinfo.bustype = dev->hid->bus; - dinfo.vendor = dev->hid->vendor; - dinfo.product = dev->hid->product; -if (copy_to_user (user_arg, &dinfo,sizeof (dinfo))) - ret = -EFAULT ; + dinfo.bustype = hid->bus; + dinfo.vendor = hid->vendor; + dinfo.product = hid->product; +if (copy_to_user (arg, &dinfo,sizeof (dinfo))) +return -EFAULT ;break ; }case HIDIOCREVOKE : { -if (user_arg) - ret = -EINVAL ; -else - ret =hidraw_revoke (list); -break ; +struct hidraw_list *list = file->private_data; + +if (arg) +return -EINVAL ; + +return hidraw_revoke (list); }default : - { -struct hid_device *hid = dev->hid; -if (_IOC_TYPE (cmd) !='H' ) { - ret = -EINVAL ; -break ; - } +/* +* None of the above ioctls can return -EAGAIN, so +* use it as a marker that we need to check variable +* length ioctls. +*/ +return -EAGAIN ; + } -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCSFEATURE (0 ))) { -int len =_IOC_SIZE (cmd); - ret =hidraw_send_report (file, user_arg, len,HID_FEATURE_REPORT ); -break ; - } -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCGFEATURE (0 ))) { -int len =_IOC_SIZE (cmd); - ret =hidraw_get_report (file, user_arg, len,HID_FEATURE_REPORT ); -break ; - } +return 0 ; +} -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCSINPUT (0 ))) { -int len =_IOC_SIZE (cmd); - ret =hidraw_send_report (file, user_arg, len,HID_INPUT_REPORT ); -break ; - } -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCGINPUT (0 ))) { -int len =_IOC_SIZE (cmd); - ret =hidraw_get_report (file, user_arg, len,HID_INPUT_REPORT ); -break ; - } +static long hidraw_rw_variable_size_ioctl (struct file *file,struct hidraw *dev,unsigned int cmd, +void __user *user_arg) +{ +int len =_IOC_SIZE (cmd); + +switch (cmd & ~IOCSIZE_MASK ) { +case HIDIOCSFEATURE (0 ): +return hidraw_send_report (file, user_arg, len,HID_FEATURE_REPORT ); +case HIDIOCGFEATURE (0 ): +return hidraw_get_report (file, user_arg, len,HID_FEATURE_REPORT ); +case HIDIOCSINPUT (0 ): +return hidraw_send_report (file, user_arg, len,HID_INPUT_REPORT ); +case HIDIOCGINPUT (0 ): +return hidraw_get_report (file, user_arg, len,HID_INPUT_REPORT ); +case HIDIOCSOUTPUT (0 ): +return hidraw_send_report (file, user_arg, len,HID_OUTPUT_REPORT ); +case HIDIOCGOUTPUT (0 ): +return hidraw_get_report (file, user_arg, len,HID_OUTPUT_REPORT ); + } -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCSOUTPUT (0 ))) { -int len =_IOC_SIZE (cmd); - ret =hidraw_send_report (file, user_arg, len,HID_OUTPUT_REPORT ); -break ; - } -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCGOUTPUT (0 ))) { -int len =_IOC_SIZE (cmd); - ret =hidraw_get_report (file, user_arg, len,HID_OUTPUT_REPORT ); -break ; - } +return -EINVAL ; +} -/* Begin Read-only ioctls. */ -if (_IOC_DIR (cmd) != _IOC_READ) { - ret = -EINVAL ; -break ; - } +static long hidraw_ro_variable_size_ioctl (struct file *file,struct hidraw *dev,unsigned int cmd, +void __user *user_arg) +{ +struct hid_device *hid = dev->hid; +int len =_IOC_SIZE (cmd); +int field_len; + +switch (cmd & ~IOCSIZE_MASK ) { +case HIDIOCGRAWNAME (0 ): + field_len =strlen (hid->name) +1 ; +if (len > field_len) + len = field_len; +return copy_to_user (user_arg, hid->name, len) ? -EFAULT : len; +case HIDIOCGRAWPHYS (0 ): + field_len =strlen (hid->phys) +1 ; +if (len > field_len) + len = field_len; +return copy_to_user (user_arg, hid->phys, len) ? -EFAULT : len; +case HIDIOCGRAWUNIQ (0 ): + field_len =strlen (hid->uniq) +1 ; +if (len > field_len) + len = field_len; +return copy_to_user (user_arg, hid->uniq, len) ? -EFAULT : len; + } -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCGRAWNAME (0 ))) { -int len =strlen (hid->name) +1 ; -if (len >_IOC_SIZE (cmd)) - len =_IOC_SIZE (cmd); - ret =copy_to_user (user_arg, hid->name, len) ? - -EFAULT : len; -break ; - } +return -EINVAL ; +} -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCGRAWPHYS (0 ))) { -int len =strlen (hid->phys) +1 ; -if (len >_IOC_SIZE (cmd)) - len =_IOC_SIZE (cmd); - ret =copy_to_user (user_arg, hid->phys, len) ? - -EFAULT : len; -break ; - } +static long hidraw_ioctl (struct file *file,unsigned int cmd,unsigned long arg) +{ +struct inode *inode =file_inode (file); +unsigned int minor =iminor (inode); +struct hidraw *dev; +struct hidraw_list *list = file->private_data; +void __user *user_arg = (void __user *)arg; +int ret; -if (_IOC_NR (cmd) ==_IOC_NR (HIDIOCGRAWUNIQ (0 ))) { -int len =strlen (hid->uniq) +1 ; -if (len >_IOC_SIZE (cmd)) - len =_IOC_SIZE (cmd); - ret =copy_to_user (user_arg, hid->uniq, len) ? - -EFAULT : len; -break ; - } - } +down_read (&minors_rwsem); + dev = hidraw_table[minor]; +if (!dev || !dev->exist ||hidraw_is_revoked (list)) { + ret = -ENODEV ; + goto out; + } + +if (_IOC_TYPE (cmd) !='H' ) { + ret = -EINVAL ; + goto out; + } +if (_IOC_NR (cmd) >HIDIOCTL_LAST ||_IOC_NR (cmd) ==0 ) { ret = -ENOTTY ; + goto out; } + + ret =hidraw_fixed_size_ioctl (file, dev, cmd, user_arg); +if (ret != -EAGAIN ) + goto out; + +switch (_IOC_DIR (cmd)) { +case (_IOC_READ | _IOC_WRITE): + ret =hidraw_rw_variable_size_ioctl (file, dev, cmd, user_arg); +break ; +case _IOC_READ: + ret =hidraw_ro_variable_size_ioctl (file, dev, cmd, user_arg); +break ; +default : +/* Any other IOC_DIR is wrong */ + ret = -EINVAL ; + } + out:up_read (&minors_rwsem);return ret;
include/uapi/linux/hidraw.h +2 -0
@@ -48,6 +48,8 @@ struct hidraw_devinfo {#define HIDIOCGOUTPUT (len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0C, len)#define HIDIOCREVOKE _IOW('H', 0x0D, int)/* Revoke device access */ +#define HIDIOCTL_LAST _IOC_NR(HIDIOCREVOKE) +#define HIDRAW_FIRST_MINOR 0#define HIDRAW_MAX_DEVICES 64/* number of reports to buffer */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 160/262 f2fs: fix zero-sized extent for precache extents
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: wangzijie <[email protected]>
[ Upstream commit 8175c864391753b210f3dcfae1aeed686a226ebb ]
Script to reproduce:f2fs_io write 1 0 1881 rand dsync testfile f2fs_io fallocate 0 7708672 4096 testfile f2fs_io write 1 1881 1 rand buffered testfile fsync testfile
umount
mountf2fs_io precache_extents testfile
When the data layout is something like this:
dnode1: dnode2: [0] A [0] NEW_ADDR [1] A+1 [1] 0x0
...
[1016] A+1016
[1017] B (B!=A+1017) [1017] 0x0
During precache_extents, we map the last block(valid blkaddr) in dnode1:map->m_flags |= F2FS_MAP_MAPPED;map->m_pblk = blkaddr(valid blkaddr);map->m_len = 1;
then we goto next_dnode, meet the first block in dnode2(hole), goto sync_out:map->m_flags & F2FS_MAP_MAPPED == true, and we make zero-sized extent:
map->m_len = 1
ofs = start_pgofs - map->m_lblk = 1882 - 1881 = 1 ei.fofs = start_pgofs = 1882
ei.len = map->m_len - ofs = 1 - 1 = 0
Rebased on patch[1], this patch can cover these cases to avoid zero-sized extent:
A,B,C is valid blkaddr
case1:
dnode1: dnode2: [0] A [0] NEW_ADDR [1] A+1 [1] 0x0 ... ....
[1016] A+1016
[1017] B (B!=A+1017) [1017] 0x0
case2:
dnode1: dnode2: [0] A [0] C (C!=B+1) [1] A+1 [1] C+1 ... ....
[1016] A+1016
[1017] B (B!=A+1017) [1017] 0x0
case3:
dnode1: dnode2: [0] A [0] C (C!=B+2) [1] A+1 [1] C+1 ... .... [1015] A+1015 [1016] B (B!=A+1016) [1017] B+1 [1017] 0x0
[1] https://lore.kernel.org/linux-f2fs-devel/[email protected]/
--- fs/f2fs/data.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/data.c +4 -3
@@ -1781,9 +1781,10 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag)if (map->m_flags &F2FS_MAP_MAPPED ) {unsigned int ofs = start_pgofs - map->m_lblk; -f2fs_update_read_extent_cache_range (&dn, - start_pgofs, map->m_pblk + ofs, - map->m_len - ofs); +if (map->m_len > ofs) +f2fs_update_read_extent_cache_range (&dn, + start_pgofs, map->m_pblk + ofs, + map->m_len - ofs); }if (map->m_next_extent) *map->m_next_extent = is_hole ? pgofs +1 : pgofs;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 161/262 Revert "usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running"
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
[ Upstream commit 08fa726e66039dfa80226dfa112931f60ad4c898 ]
This reverts commit 28a76fcc4c85dd39633fb96edb643c91820133e3.
No actual HW bugs are known where Endpoint Context shows Running state but Stop Endpoint fails repeatedly with Context State Error and leaves the endpoint state unchanged. Stop Endpoint retries on Running EPs have been performed since early 2021 with no such issues reported so far.
Trying to handle this hypothetical case brings a more realistic danger:
if Stop Endpoint fails on an endpoint which hasn't yet started after a doorbell ring and enough latency occurs before this completion event is handled, the driver may time out and begin removing cancelled TDs from a running endpoint, even though one more retry would stop it reliably.
Such high latency is rare but not impossible, and removing TDs from a running endpoint can cause more damage than not giving back a cancelled URB (which wasn't happening anyway). So err on the side of caution and revert to the old policy of always retrying if the EP appears running.
[Remove stable tag as we are dealing with theoretical cases -Mathias]
--- drivers/usb/host/xhci-ring.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/usb/host/xhci-ring.c +4 -7
@@ -1199,19 +1199,16 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id,* Stopped state, but it will soon change to Running. * * Assume this bug on unexpected Stop Endpoint failures. -* Keep retrying until the EP starts and stops again. +* Keep retrying until the EP starts and stops again, on +* chips where this is known to help. Wait for 100ms. */ +if (time_is_before_jiffies (ep->stop_time +msecs_to_jiffies (100 ))) +break ; fallthrough;case EP_STATE_RUNNING :/* Race, HW handled stop ep cmd before ep was running */ xhci_dbg (xhci,"Stop ep completion ctx error, ctx_state %d\n" ,GET_EP_CTX_STATE (ep_ctx)); -/* -* Don't retry forever if we guessed wrong or a defective HC never starts -* the EP or says 'Running' but fails the command. We must give back TDs. -*/ -if (time_is_before_jiffies (ep->stop_time +msecs_to_jiffies (100 ))) -break ; command =xhci_alloc_command (xhci, false,GFP_ATOMIC );if (!command) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 162/262 RDMA/core: Resolve MAC of next-hop device without ARP support
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Parav Pandit <[email protected]>
[ Upstream commit 200651b9b8aadfbbec852f0e5d042d9abe75e2ab ]
Currently, if the next-hop netdevice does not support ARP resolution, the destination MAC address is silently set to zero without reporting an error. This leads to incorrect behavior and may result in packet transmission failures.
Fix this by deferring MAC resolution to the IP stack via neighbour lookup, allowing proper resolution or error reporting as appropriate.
--- drivers/infiniband/core/addr.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/infiniband/core/addr.c +3 -7
@@ -454,14 +454,10 @@ static int addr_resolve_neigh(const struct dst_entry *dst, {int ret =0 ; -if (ndev_flags &IFF_LOOPBACK ) { +if (ndev_flags &IFF_LOOPBACK )memcpy (addr->dst_dev_addr, addr->src_dev_addr,MAX_ADDR_LEN ); - }else { -if (!(ndev_flags &IFF_NOARP )) { -/* If the device doesn't do ARP internally */ - ret =fetch_ha (dst, addr, dst_in, seq); - } - } +else + ret =fetch_ha (dst, addr, dst_in, seq);return ret; }
Signature · 1 line
2.51.0