This is the start of the stable review cycle for the 6.6.32 release.
There are 102 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 Sat, 25 May 2024 13:03:15 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.32-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.6.32-rc1
Christoph Hellwig <hch(a)lst.de>
block: add a partscan sysfs attribute for disks
Christoph Hellwig <hch(a)lst.de>
block: add a disk_has_partscan helper
SeongJae Park <sj(a)kernel.org>
Docs/admin-guide/mm/damon/usage: fix wrong example of DAMOS filter matching sysfs file
Akira Yokosawa <akiyks(a)gmail.com>
docs: kernel_include.py: Cope with docutils 0.21
Thomas Weißschuh <linux(a)weissschuh.net>
admin-guide/hw-vuln/core-scheduling: fix return type of PR_SCHED_CORE_GET
Jarkko Sakkinen <jarkko(a)kernel.org>
KEYS: trusted: Do not use WARN when encode fails
AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>
remoteproc: mediatek: Make sure IPI buffer fits in L2TCM
Daniel Thompson <daniel.thompson(a)linaro.org>
serial: kgdboc: Fix NMI-safety problems from keyboard reset code
Javier Carrasco <javier.carrasco(a)wolfvision.net>
usb: typec: tipd: fix event checking for tps6598x
Heikki Krogerus <heikki.krogerus(a)linux.intel.com>
usb: typec: ucsi: displayport: Fix potential deadlock
Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com>
net: usb: ax88179_178a: fix link status when link is set to down/up
Prashanth K <quic_prashk(a)quicinc.com>
usb: dwc3: Wait unconditionally after issuing EndXfer command
Carlos Llamas <cmllamas(a)google.com>
binder: fix max_thread type inconsistency
Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com>
drm/amdgpu: Fix possible NULL dereference in amdgpu_ras_query_error_status_helper()
Christian Brauner <brauner(a)kernel.org>
erofs: reliably distinguish block based and fscache mode
Baokun Li <libaokun1(a)huawei.com>
erofs: get rid of erofs_fs_context
Jiri Olsa <jolsa(a)kernel.org>
bpf: Add missing BPF_LINK_TYPE invocations
Mark Brown <broonie(a)kernel.org>
kselftest: Add a ksft_perror() helper
Mengqi Zhang <mengqi.zhang(a)mediatek.com>
mmc: core: Add HS400 tuning in HS400es initialization
Jarkko Sakkinen <jarkko(a)kernel.org>
KEYS: trusted: Fix memory leak in tpm2_key_encode()
Sungwoo Kim <iam(a)sung-woo.kim>
Bluetooth: L2CAP: Fix div-by-zero in l2cap_le_flowctl_init()
Sungwoo Kim <iam(a)sung-woo.kim>
Bluetooth: L2CAP: Fix slab-use-after-free in l2cap_connect()
Jacob Keller <jacob.e.keller(a)intel.com>
ice: remove unnecessary duplicate checks for VF VSI ID
Jacob Keller <jacob.e.keller(a)intel.com>
ice: pass VSI pointer into ice_vc_isvalid_q_id
Ronald Wahl <ronald.wahl(a)raritan.com>
net: ks8851: Fix another TX stall caused by wrong ISR flag handling
Jose Fernandez <josef(a)netflix.com>
drm/amd/display: Fix division by zero in setup_dsc_config
Gustavo A. R. Silva <gustavoars(a)kernel.org>
smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings
Namjae Jeon <linkinjeon(a)kernel.org>
ksmbd: add continuous availability share parameter
David Howells <dhowells(a)redhat.com>
cifs: Add tracing for the cifs_tcon struct refcounting
Paulo Alcantara <pc(a)manguebit.com>
smb: client: instantiate when creating SFU files
Paulo Alcantara <pc(a)manguebit.com>
smb: client: fix NULL ptr deref in cifs_mark_open_handles_for_deleted_file()
Steve French <stfrench(a)microsoft.com>
smb3: add trace event for mknod
Steve French <stfrench(a)microsoft.com>
smb311: additional compression flag defined in updated protocol spec
Steve French <stfrench(a)microsoft.com>
smb311: correct incorrect offset field in compression header
Steve French <stfrench(a)microsoft.com>
cifs: Move some extern decls from .c files to .h
Namjae Jeon <linkinjeon(a)kernel.org>
ksmbd: fix potencial out-of-bounds when buffer offset is invalid
Namjae Jeon <linkinjeon(a)kernel.org>
ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
Colin Ian King <colin.i.king(a)gmail.com>
ksmbd: Fix spelling mistake "connction" -> "connection"
Marios Makassikis <mmakassikis(a)freebox.fr>
ksmbd: fix possible null-deref in smb_lazy_parent_lease_break_close
Bharath SM <bharathsm(a)microsoft.com>
cifs: remove redundant variable assignment
Meetakshi Setiya <msetiya(a)microsoft.com>
cifs: fixes for get_inode_info
Bharath SM <bharathsm(a)microsoft.com>
cifs: defer close file handles having RH lease
Namjae Jeon <linkinjeon(a)kernel.org>
ksmbd: add support for durable handles v1/v2
Namjae Jeon <linkinjeon(a)kernel.org>
ksmbd: mark SMB2_SESSION_EXPIRED to session when destroying previous session
Enzo Matsumiya <ematsumiya(a)suse.de>
smb: common: simplify compression headers
Enzo Matsumiya <ematsumiya(a)suse.de>
smb: common: fix fields sizes in compression_pattern_payload_v1
Enzo Matsumiya <ematsumiya(a)suse.de>
smb: client: negotiate compression algorithms
Steve French <stfrench(a)microsoft.com>
smb3: add dynamic trace point for ioctls
Paulo Alcantara <pc(a)manguebit.com>
smb: client: return reparse type in /proc/mounts
Paulo Alcantara <pc(a)manguebit.com>
smb: client: set correct d_type for reparse DFS/DFSR and mount point
Paulo Alcantara <pc(a)manguebit.com>
smb: client: parse uid, gid, mode and dev from WSL reparse points
Steve French <stfrench(a)microsoft.com>
smb: client: introduce SMB2_OP_QUERY_WSL_EA
Dan Carpenter <dan.carpenter(a)linaro.org>
smb: client: Fix a NULL vs IS_ERR() check in wsl_set_xattrs()
Paulo Alcantara <pc(a)manguebit.com>
smb: client: add support for WSL reparse points
Paulo Alcantara <pc(a)manguebit.com>
smb: client: reduce number of parameters in smb2_compound_op()
Paulo Alcantara <pc(a)manguebit.com>
smb: client: fix potential broken compound request
Paulo Alcantara <pc(a)manguebit.com>
smb: client: move most of reparse point handling code to common file
Paulo Alcantara <pc(a)manguebit.com>
smb: client: introduce reparse mount option
Meetakshi Setiya <msetiya(a)microsoft.com>
smb: client: retry compound request without reusing lease
Steve French <stfrench(a)microsoft.com>
smb: client: do not defer close open handles to deleted files
Meetakshi Setiya <msetiya(a)microsoft.com>
smb: client: reuse file lease key in compound operations
Paulo Alcantara <pc(a)manguebit.com>
smb: client: get rid of smb311_posix_query_path_info()
Steve French <stfrench(a)microsoft.com>
smb: client: parse owner/group when creating reparse points
Steve French <stfrench(a)microsoft.com>
smb3: update allocation size more accurately on write completion
Paulo Alcantara <pc(a)manguebit.com>
smb: client: handle path separator of created SMB symlinks
Steve French <stfrench(a)microsoft.com>
cifs: update the same create_guid on replay
Yang Li <yang.lee(a)linux.alibaba.com>
ksmbd: Add kernel-doc for ksmbd_extract_sharename() function
Shyam Prasad N <sprasad(a)microsoft.com>
cifs: set replay flag for retries of write command
Shyam Prasad N <sprasad(a)microsoft.com>
cifs: commands that are retried should have replay flag set
Alexey Dobriyan <adobriyan(a)gmail.com>
smb: client: delete "true", "false" defines
Yang Li <yang.lee(a)linux.alibaba.com>
smb: Fix some kernel-doc comments
Shyam Prasad N <sprasad(a)microsoft.com>
cifs: new mount option called retrans
Paulo Alcantara <pc(a)manguebit.com>
smb: client: don't clobber ->i_rdev from cached reparse points
Shyam Prasad N <sprasad(a)microsoft.com>
cifs: new nt status codes from MS-SMB2
Shyam Prasad N <sprasad(a)microsoft.com>
cifs: pick channel for tcon and tdis
Steve French <stfrench(a)microsoft.com>
cifs: minor comment cleanup
Colin Ian King <colin.i.king(a)gmail.com>
cifs: remove redundant variable tcon_exist
Randy Dunlap <rdunlap(a)infradead.org>
ksmbd: vfs: fix all kernel-doc warnings
Randy Dunlap <rdunlap(a)infradead.org>
ksmbd: auth: fix most kernel-doc warnings
Steve French <stfrench(a)microsoft.com>
cifs: remove unneeded return statement
Paulo Alcantara <pc(a)manguebit.com>
cifs: get rid of dup length check in parse_reparse_point()
David Howells <dhowells(a)redhat.com>
cifs: Pass unbyteswapped eof value into SMB2_set_eof()
Markus Elfring <elfring(a)users.sourceforge.net>
smb3: Improve exception handling in allocate_mr_list()
Steve French <stfrench(a)microsoft.com>
cifs: fix in logging in cifs_chan_update_iface
Paulo Alcantara <pc(a)manguebit.com>
smb: client: handle special files and symlinks in SMB3 POSIX
Paulo Alcantara <pc(a)manguebit.com>
smb: client: cleanup smb2_query_reparse_point()
Paulo Alcantara <pc(a)manguebit.com>
smb: client: allow creating symlinks via reparse points
Steve French <stfrench(a)microsoft.com>
smb: client: optimise reparse point querying
Steve French <stfrench(a)microsoft.com>
smb: client: allow creating special files via reparse points
Steve French <stfrench(a)microsoft.com>
smb: client: extend smb2_compound_op() to accept more commands
Pierre Mariani <pierre.mariani(a)gmail.com>
smb: client: Fix minor whitespace errors and warnings
Steve French <stfrench(a)microsoft.com>
smb: client: introduce cifs_sfu_make_node()
Ritvik Budhiraja <rbudhiraja(a)microsoft.com>
cifs: fix use after free for iface while disabling secondary channels
Steve French <stfrench(a)microsoft.com>
Missing field not being returned in ioctl CIFS_IOC_GET_MNT_INFO
Steve French <stfrench(a)microsoft.com>
smb3: minor cleanup of session handling code
Steve French <stfrench(a)microsoft.com>
smb3: more minor cleanups for session handling routines
Steve French <stfrench(a)microsoft.com>
smb3: minor RDMA cleanup
Shyam Prasad N <sprasad(a)microsoft.com>
cifs: print server capabilities in DebugData
Eric Biggers <ebiggers(a)google.com>
smb: use crypto_shash_digest() in symlink_hash()
Steve French <stfrench(a)microsoft.com>
Add definition for new smb3.1.1 command type
Steve French <stfrench(a)microsoft.com>
SMB3: clarify some of the unused CreateOption flags
Meetakshi Setiya <msetiya(a)microsoft.com>
cifs: Add client version details to NTLM authenticate message
-------------
Diffstat:
Documentation/ABI/stable/sysfs-block | 10 +
.../admin-guide/hw-vuln/core-scheduling.rst | 4 +-
Documentation/admin-guide/mm/damon/usage.rst | 2 +-
Documentation/sphinx/kernel_include.py | 1 -
Makefile | 4 +-
block/genhd.c | 15 +-
block/partitions/core.c | 5 +-
drivers/android/binder.c | 2 +-
drivers/android/binder_internal.h | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 7 +-
drivers/mmc/core/mmc.c | 9 +-
drivers/net/ethernet/intel/ice/ice_virtchnl.c | 22 +-
drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 3 -
drivers/net/ethernet/micrel/ks8851_common.c | 18 +-
drivers/net/usb/ax88179_178a.c | 37 +-
drivers/remoteproc/mtk_scp.c | 10 +-
drivers/tty/serial/kgdboc.c | 30 +-
drivers/usb/dwc3/gadget.c | 4 +-
drivers/usb/typec/tipd/core.c | 45 +-
drivers/usb/typec/tipd/tps6598x.h | 11 +
drivers/usb/typec/ucsi/displayport.c | 4 -
fs/erofs/internal.h | 7 -
fs/erofs/super.c | 124 +-
fs/smb/client/Makefile | 2 +-
fs/smb/client/cached_dir.c | 24 +-
fs/smb/client/cifs_debug.c | 38 +-
fs/smb/client/cifsfs.c | 10 +-
fs/smb/client/cifsglob.h | 93 +-
fs/smb/client/cifsproto.h | 39 +-
fs/smb/client/cifssmb.c | 18 +-
fs/smb/client/connect.c | 57 +-
fs/smb/client/dir.c | 14 +-
fs/smb/client/file.c | 39 +-
fs/smb/client/fs_context.c | 43 +-
fs/smb/client/fs_context.h | 13 +-
fs/smb/client/fscache.c | 7 +
fs/smb/client/inode.c | 235 ++--
fs/smb/client/ioctl.c | 6 +
fs/smb/client/link.c | 41 +-
fs/smb/client/misc.c | 47 +-
fs/smb/client/ntlmssp.h | 4 +-
fs/smb/client/readdir.c | 32 +-
fs/smb/client/reparse.c | 532 ++++++++
fs/smb/client/reparse.h | 113 ++
fs/smb/client/sess.c | 73 +-
fs/smb/client/smb1ops.c | 80 +-
fs/smb/client/smb2glob.h | 27 +-
fs/smb/client/smb2inode.c | 1402 +++++++++++++-------
fs/smb/client/smb2maperror.c | 2 +
fs/smb/client/smb2misc.c | 10 +-
fs/smb/client/smb2ops.c | 603 ++++-----
fs/smb/client/smb2pdu.c | 340 ++++-
fs/smb/client/smb2pdu.h | 46 +-
fs/smb/client/smb2proto.h | 37 +-
fs/smb/client/smb2status.h | 2 +
fs/smb/client/smb2transport.c | 2 +
fs/smb/client/smbdirect.c | 4 +-
fs/smb/client/smbencrypt.c | 7 -
fs/smb/client/trace.h | 137 +-
fs/smb/common/smb2pdu.h | 122 +-
fs/smb/common/smbfsctl.h | 6 -
fs/smb/server/auth.c | 14 +-
fs/smb/server/ksmbd_netlink.h | 36 +-
fs/smb/server/mgmt/user_session.c | 28 +-
fs/smb/server/mgmt/user_session.h | 3 +
fs/smb/server/misc.c | 1 +
fs/smb/server/oplock.c | 96 +-
fs/smb/server/oplock.h | 7 +-
fs/smb/server/smb2misc.c | 26 +-
fs/smb/server/smb2ops.c | 6 +
fs/smb/server/smb2pdu.c | 338 ++++-
fs/smb/server/smb2pdu.h | 31 +-
fs/smb/server/transport_tcp.c | 2 +
fs/smb/server/vfs.c | 28 +-
fs/smb/server/vfs_cache.c | 137 +-
fs/smb/server/vfs_cache.h | 9 +
include/linux/blkdev.h | 13 +
include/linux/bpf_types.h | 3 +
include/net/bluetooth/hci.h | 9 +
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_conn.c | 71 +-
net/bluetooth/hci_event.c | 31 +-
net/bluetooth/iso.c | 2 +-
net/bluetooth/l2cap_core.c | 38 +-
net/bluetooth/sco.c | 6 +-
security/keys/trusted-keys/trusted_tpm2.c | 25 +-
tools/testing/selftests/kselftest.h | 14 +
88 files changed, 3923 insertions(+), 1738 deletions(-)
This is the start of the stable review cycle for the 6.1.92 release.
There are 45 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 Sat, 25 May 2024 13:03:15 +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.1.92-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.1.92-rc1
Akira Yokosawa <akiyks(a)gmail.com>
docs: kernel_include.py: Cope with docutils 0.21
Thomas Weißschuh <linux(a)weissschuh.net>
admin-guide/hw-vuln/core-scheduling: fix return type of PR_SCHED_CORE_GET
Jarkko Sakkinen <jarkko(a)kernel.org>
KEYS: trusted: Do not use WARN when encode fails
AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>
remoteproc: mediatek: Make sure IPI buffer fits in L2TCM
Daniel Thompson <daniel.thompson(a)linaro.org>
serial: kgdboc: Fix NMI-safety problems from keyboard reset code
Javier Carrasco <javier.carrasco(a)wolfvision.net>
usb: typec: tipd: fix event checking for tps6598x
Heikki Krogerus <heikki.krogerus(a)linux.intel.com>
usb: typec: ucsi: displayport: Fix potential deadlock
Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com>
net: usb: ax88179_178a: fix link status when link is set to down/up
Prashanth K <quic_prashk(a)quicinc.com>
usb: dwc3: Wait unconditionally after issuing EndXfer command
Carlos Llamas <cmllamas(a)google.com>
binder: fix max_thread type inconsistency
Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com>
drm/amdgpu: Fix possible NULL dereference in amdgpu_ras_query_error_status_helper()
Mark Rutland <mark.rutland(a)arm.com>
arm64: atomics: lse: remove stale dependency on JUMP_LABEL
Eric Sandeen <sandeen(a)redhat.com>
xfs: short circuit xfs_growfs_data_private() if delta is zero
Hironori Shiina <shiina.hironori(a)gmail.com>
xfs: get root inode correctly at bulkstat
Darrick J. Wong <djwong(a)kernel.org>
xfs: fix log recovery when unknown rocompat bits are set
Darrick J. Wong <djwong(a)kernel.org>
xfs: allow inode inactivation during a ro mount log recovery
Darrick J. Wong <djwong(a)kernel.org>
xfs: invalidate xfs_bufs when allocating cow extents
Darrick J. Wong <djwong(a)kernel.org>
xfs: estimate post-merge refcounts correctly
Darrick J. Wong <djwong(a)kernel.org>
xfs: hoist refcount record merge predicates
Guo Xuenan <guoxuenan(a)huawei.com>
xfs: fix super block buf log item UAF during force shutdown
Guo Xuenan <guoxuenan(a)huawei.com>
xfs: wait iclog complete before tearing down AIL
Darrick J. Wong <djwong(a)kernel.org>
xfs: attach dquots to inode before reading data/cow fork mappings
Darrick J. Wong <djwong(a)kernel.org>
xfs: invalidate block device page cache during unmount
Long Li <leo.lilong(a)huawei.com>
xfs: fix incorrect i_nlink caused by inode racing
Long Li <leo.lilong(a)huawei.com>
xfs: fix sb write verify for lazysbcount
Darrick J. Wong <djwong(a)kernel.org>
xfs: fix incorrect error-out in xfs_remove
Dave Chinner <dchinner(a)redhat.com>
xfs: fix off-by-one-block in xfs_discard_folio()
Dave Chinner <dchinner(a)redhat.com>
xfs: drop write error injection is unfixable, remove it
Dave Chinner <dchinner(a)redhat.com>
xfs: use iomap_valid method to detect stale cached iomaps
Dave Chinner <dchinner(a)redhat.com>
iomap: write iomap validity checks
Dave Chinner <dchinner(a)redhat.com>
xfs: xfs_bmap_punch_delalloc_range() should take a byte range
Dave Chinner <dchinner(a)redhat.com>
iomap: buffered write failure should not truncate the page cache
Dave Chinner <dchinner(a)redhat.com>
xfs,iomap: move delalloc punching to iomap
Dave Chinner <dchinner(a)redhat.com>
xfs: use byte ranges for write cleanup ranges
Dave Chinner <dchinner(a)redhat.com>
xfs: punching delalloc extents on write failure is racy
Dave Chinner <dchinner(a)redhat.com>
xfs: write page faults in iomap are not buffered writes
Mengqi Zhang <mengqi.zhang(a)mediatek.com>
mmc: core: Add HS400 tuning in HS400es initialization
Jarkko Sakkinen <jarkko(a)kernel.org>
KEYS: trusted: Fix memory leak in tpm2_key_encode()
NeilBrown <neilb(a)suse.de>
nfsd: don't allow nfsd threads to be signalled.
Aidan MacDonald <aidanmacdonald.0x0(a)gmail.com>
mfd: stpmic1: Fix swapped mask/unmask in irq chip
Sergey Shtylyov <s.shtylyov(a)omp.ru>
pinctrl: core: handle radix_tree_insert() errors in pinctrl_register_one_pin()
Jacob Keller <jacob.e.keller(a)intel.com>
ice: remove unnecessary duplicate checks for VF VSI ID
Jacob Keller <jacob.e.keller(a)intel.com>
ice: pass VSI pointer into ice_vc_isvalid_q_id
Ronald Wahl <ronald.wahl(a)raritan.com>
net: ks8851: Fix another TX stall caused by wrong ISR flag handling
Jose Fernandez <josef(a)netflix.com>
drm/amd/display: Fix division by zero in setup_dsc_config
-------------
Diffstat:
.../admin-guide/hw-vuln/core-scheduling.rst | 4 +-
Documentation/sphinx/kernel_include.py | 1 -
Makefile | 4 +-
arch/arm64/Kconfig | 1 -
arch/arm64/include/asm/lse.h | 1 -
drivers/android/binder.c | 2 +-
drivers/android/binder_internal.h | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 7 +-
drivers/mfd/stpmic1.c | 5 +-
drivers/mmc/core/mmc.c | 9 +-
drivers/net/ethernet/intel/ice/ice_virtchnl.c | 22 +-
drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 3 -
drivers/net/ethernet/micrel/ks8851_common.c | 18 +-
drivers/net/usb/ax88179_178a.c | 37 ++-
drivers/pinctrl/core.c | 14 +-
drivers/remoteproc/mtk_scp.c | 10 +-
drivers/tty/serial/kgdboc.c | 30 ++-
drivers/usb/dwc3/gadget.c | 4 +-
drivers/usb/typec/tipd/core.c | 45 ++--
drivers/usb/typec/tipd/tps6598x.h | 11 +
drivers/usb/typec/ucsi/displayport.c | 4 -
fs/iomap/buffered-io.c | 254 ++++++++++++++++++++-
fs/iomap/iter.c | 19 +-
fs/nfs/callback.c | 9 +-
fs/nfsd/nfs4proc.c | 5 +-
fs/nfsd/nfssvc.c | 12 -
fs/xfs/libxfs/xfs_bmap.c | 8 +-
fs/xfs/libxfs/xfs_errortag.h | 12 +-
fs/xfs/libxfs/xfs_refcount.c | 146 ++++++++++--
fs/xfs/libxfs/xfs_sb.c | 7 +-
fs/xfs/xfs_aops.c | 37 +--
fs/xfs/xfs_bmap_util.c | 10 +-
fs/xfs/xfs_bmap_util.h | 2 +-
fs/xfs/xfs_buf.c | 1 +
fs/xfs/xfs_buf_item.c | 2 +
fs/xfs/xfs_error.c | 27 ++-
fs/xfs/xfs_file.c | 2 +-
fs/xfs/xfs_fsops.c | 4 +
fs/xfs/xfs_icache.c | 6 +
fs/xfs/xfs_inode.c | 16 +-
fs/xfs/xfs_ioctl.c | 4 +-
fs/xfs/xfs_iomap.c | 177 ++++++++------
fs/xfs/xfs_iomap.h | 6 +-
fs/xfs/xfs_log.c | 53 ++---
fs/xfs/xfs_mount.c | 15 ++
fs/xfs/xfs_pnfs.c | 6 +-
include/linux/iomap.h | 47 +++-
net/sunrpc/svc_xprt.c | 16 +-
security/keys/trusted-keys/trusted_tpm2.c | 25 +-
50 files changed, 866 insertions(+), 299 deletions(-)
This is the start of the stable review cycle for the 6.8.11 release.
There are 23 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 Sat, 25 May 2024 13:03:15 +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.8.11-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.8.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.8.11-rc1
Christoph Hellwig <hch(a)lst.de>
block: add a partscan sysfs attribute for disks
Christoph Hellwig <hch(a)lst.de>
block: add a disk_has_partscan helper
SeongJae Park <sj(a)kernel.org>
Docs/admin-guide/mm/damon/usage: fix wrong example of DAMOS filter matching sysfs file
Akira Yokosawa <akiyks(a)gmail.com>
docs: kernel_include.py: Cope with docutils 0.21
Thomas Weißschuh <linux(a)weissschuh.net>
admin-guide/hw-vuln/core-scheduling: fix return type of PR_SCHED_CORE_GET
Jarkko Sakkinen <jarkko(a)kernel.org>
KEYS: trusted: Do not use WARN when encode fails
AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>
remoteproc: mediatek: Make sure IPI buffer fits in L2TCM
Daniel Thompson <daniel.thompson(a)linaro.org>
serial: kgdboc: Fix NMI-safety problems from keyboard reset code
Javier Carrasco <javier.carrasco(a)wolfvision.net>
usb: typec: tipd: fix event checking for tps6598x
Javier Carrasco <javier.carrasco(a)wolfvision.net>
usb: typec: tipd: fix event checking for tps25750
Heikki Krogerus <heikki.krogerus(a)linux.intel.com>
usb: typec: ucsi: displayport: Fix potential deadlock
Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com>
net: usb: ax88179_178a: fix link status when link is set to down/up
Prashanth K <quic_prashk(a)quicinc.com>
usb: dwc3: Wait unconditionally after issuing EndXfer command
Carlos Llamas <cmllamas(a)google.com>
binder: fix max_thread type inconsistency
Christian Brauner <brauner(a)kernel.org>
erofs: reliably distinguish block based and fscache mode
Baokun Li <libaokun1(a)huawei.com>
erofs: get rid of erofs_fs_context
Jarkko Sakkinen <jarkko(a)kernel.org>
KEYS: trusted: Fix memory leak in tpm2_key_encode()
Sungwoo Kim <iam(a)sung-woo.kim>
Bluetooth: L2CAP: Fix div-by-zero in l2cap_le_flowctl_init()
Sungwoo Kim <iam(a)sung-woo.kim>
Bluetooth: L2CAP: Fix slab-use-after-free in l2cap_connect()
Jacob Keller <jacob.e.keller(a)intel.com>
ice: remove unnecessary duplicate checks for VF VSI ID
Jacob Keller <jacob.e.keller(a)intel.com>
ice: pass VSI pointer into ice_vc_isvalid_q_id
Ronald Wahl <ronald.wahl(a)raritan.com>
net: ks8851: Fix another TX stall caused by wrong ISR flag handling
Jose Fernandez <josef(a)netflix.com>
drm/amd/display: Fix division by zero in setup_dsc_config
-------------
Diffstat:
Documentation/ABI/stable/sysfs-block | 10 ++
.../admin-guide/hw-vuln/core-scheduling.rst | 4 +-
Documentation/admin-guide/mm/damon/usage.rst | 2 +-
Documentation/sphinx/kernel_include.py | 1 -
Makefile | 4 +-
block/genhd.c | 15 ++-
block/partitions/core.c | 5 +-
drivers/android/binder.c | 2 +-
drivers/android/binder_internal.h | 2 +-
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 7 +-
drivers/net/ethernet/intel/ice/ice_virtchnl.c | 22 ++--
drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 3 -
drivers/net/ethernet/micrel/ks8851_common.c | 18 +--
drivers/net/usb/ax88179_178a.c | 37 ++++--
drivers/remoteproc/mtk_scp.c | 10 +-
drivers/tty/serial/kgdboc.c | 30 ++++-
drivers/usb/dwc3/gadget.c | 4 +-
drivers/usb/typec/tipd/core.c | 51 ++++++---
drivers/usb/typec/tipd/tps6598x.h | 11 ++
drivers/usb/typec/ucsi/displayport.c | 4 -
fs/erofs/internal.h | 7 --
fs/erofs/super.c | 124 +++++++++------------
include/linux/blkdev.h | 13 +++
include/net/bluetooth/hci.h | 9 ++
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_conn.c | 71 ++++++++----
net/bluetooth/hci_event.c | 31 ++++--
net/bluetooth/iso.c | 2 +-
net/bluetooth/l2cap_core.c | 38 +++----
net/bluetooth/sco.c | 6 +-
security/keys/trusted-keys/trusted_tpm2.c | 25 ++++-
31 files changed, 339 insertions(+), 230 deletions(-)
Commit 1b151e2435fc ("block: Remove special-casing of compound
pages") caused a change in behaviour when releasing the pages
if the buffer does not start at the beginning of the page. This
was because the calculation of the number of pages to release
was incorrect.
This was fixed by commit 38b43539d64b ("block: Fix page refcounts
for unaligned buffers in __bio_release_pages()").
We pin the user buffer during direct I/O writes. If this buffer is a
hugepage, bio_release_page() will unpin it and decrement all references
and pin counts at ->bi_end_io. However, if any references to the hugepage
remain post-I/O, the hugepage will not be freed upon unmap, leading
to a memory leak.
This patch verifies that a hugepage, used as a user buffer for DIO
operations, is correctly freed upon unmapping, regardless of whether
the offsets are aligned or unaligned w.r.t page boundary.
Test Result Fail Scenario (Without the fix)
--------------------------------------------------------
[]# ./hugetlb_dio
TAP version 13
1..4
No. Free pages before allocation : 7
No. Free pages after munmap : 7
ok 1 : Huge pages freed successfully !
No. Free pages before allocation : 7
No. Free pages after munmap : 7
ok 2 : Huge pages freed successfully !
No. Free pages before allocation : 7
No. Free pages after munmap : 7
ok 3 : Huge pages freed successfully !
No. Free pages before allocation : 7
No. Free pages after munmap : 6
not ok 4 : Huge pages not freed!
Totals: pass:3 fail:1 xfail:0 xpass:0 skip:0 error:0
Test Result PASS Scenario (With the fix)
---------------------------------------------------------
[]#./hugetlb_dio
TAP version 13
1..4
No. Free pages before allocation : 7
No. Free pages after munmap : 7
ok 1 : Huge pages freed successfully !
No. Free pages before allocation : 7
No. Free pages after munmap : 7
ok 2 : Huge pages freed successfully !
No. Free pages before allocation : 7
No. Free pages after munmap : 7
ok 3 : Huge pages freed successfully !
No. Free pages before allocation : 7
No. Free pages after munmap : 7
ok 4 : Huge pages freed successfully !
Totals: pass:4 fail:0 xfail:0 xpass:0 skip:0 error:0
Signed-off-by: Donet Tom <donettom(a)linux.ibm.com>
Signed-off-by: Ritesh Harjani (IBM) <ritesh.list(a)gmail.com>
---
tools/testing/selftests/mm/Makefile | 1 +
tools/testing/selftests/mm/hugetlb_dio.c | 118 +++++++++++++++++++++++
2 files changed, 119 insertions(+)
create mode 100644 tools/testing/selftests/mm/hugetlb_dio.c
diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile
index eb5f39a2668b..87d8130b3376 100644
--- a/tools/testing/selftests/mm/Makefile
+++ b/tools/testing/selftests/mm/Makefile
@@ -71,6 +71,7 @@ TEST_GEN_FILES += ksm_functional_tests
TEST_GEN_FILES += mdwe_test
TEST_GEN_FILES += hugetlb_fault_after_madv
TEST_GEN_FILES += hugetlb_madv_vs_map
+TEST_GEN_FILES += hugetlb_dio
ifneq ($(ARCH),arm64)
TEST_GEN_FILES += soft-dirty
diff --git a/tools/testing/selftests/mm/hugetlb_dio.c b/tools/testing/selftests/mm/hugetlb_dio.c
new file mode 100644
index 000000000000..6f6587c7913c
--- /dev/null
+++ b/tools/testing/selftests/mm/hugetlb_dio.c
@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This program tests for hugepage leaks after DIO writes to a file using a
+ * hugepage as the user buffer. During DIO, the user buffer is pinned and
+ * should be properly unpinned upon completion. This patch verifies that the
+ * kernel correctly unpins the buffer at DIO completion for both aligned and
+ * unaligned user buffer offsets (w.r.t page boundary), ensuring the hugepage
+ * is freed upon unmapping.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/mman.h>
+#include "vm_util.h"
+#include "../kselftest.h"
+
+void run_dio_using_hugetlb(unsigned int start_off, unsigned int end_off)
+{
+ int fd;
+ char *buffer = NULL;
+ char *orig_buffer = NULL;
+ size_t h_pagesize = 0;
+ size_t writesize;
+ int free_hpage_b = 0;
+ int free_hpage_a = 0;
+
+ writesize = end_off - start_off;
+
+ /* Get the default huge page size */
+ h_pagesize = default_huge_page_size();
+ if (!h_pagesize)
+ ksft_exit_fail_msg("Unable to determine huge page size\n");
+
+ /* Open the file to DIO */
+ fd = open("/tmp", O_TMPFILE | O_RDWR | O_DIRECT);
+ if (fd < 0)
+ ksft_exit_fail_msg("Error opening file");
+
+ /* Get the free huge pages before allocation */
+ free_hpage_b = get_free_hugepages();
+ if (free_hpage_b == 0) {
+ close(fd);
+ ksft_exit_skip("No free hugepage, exiting!\n");
+ }
+
+ /* Allocate a hugetlb page */
+ orig_buffer = mmap(NULL, h_pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE
+ | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0);
+ if (orig_buffer == MAP_FAILED) {
+ close(fd);
+ ksft_exit_fail_msg("Error mapping memory");
+ }
+ buffer = orig_buffer;
+ buffer += start_off;
+
+ memset(buffer, 'A', writesize);
+
+ /* Write the buffer to the file */
+ if (write(fd, buffer, writesize) != (writesize)) {
+ munmap(orig_buffer, h_pagesize);
+ close(fd);
+ ksft_exit_fail_msg("Error writing to file");
+ }
+
+ /* unmap the huge page */
+ munmap(orig_buffer, h_pagesize);
+ close(fd);
+
+ /* Get the free huge pages after unmap*/
+ free_hpage_a = get_free_hugepages();
+
+ /*
+ * If the no. of free hugepages before allocation and after unmap does
+ * not match - that means there could still be a page which is pinned.
+ */
+ if (free_hpage_a != free_hpage_b) {
+ printf("No. Free pages before allocation : %d\n", free_hpage_b);
+ printf("No. Free pages after munmap : %d\n", free_hpage_a);
+ ksft_test_result_fail(": Huge pages not freed!\n");
+ } else {
+ printf("No. Free pages before allocation : %d\n", free_hpage_b);
+ printf("No. Free pages after munmap : %d\n", free_hpage_a);
+ ksft_test_result_pass(": Huge pages freed successfully !\n");
+ }
+}
+
+int main(void)
+{
+ size_t pagesize = 0;
+
+ ksft_print_header();
+ ksft_set_plan(4);
+
+ /* Get base page size */
+ pagesize = psize();
+
+ /* start and end is aligned to pagesize */
+ run_dio_using_hugetlb(0, (pagesize * 3));
+
+ /* start is aligned but end is not aligned */
+ run_dio_using_hugetlb(0, (pagesize * 3) - (pagesize / 2));
+
+ /* start is unaligned and end is aligned */
+ run_dio_using_hugetlb(pagesize / 2, (pagesize * 3));
+
+ /* both start and end are unaligned */
+ run_dio_using_hugetlb(pagesize / 2, (pagesize * 3) + (pagesize / 2));
+
+ ksft_finished();
+ return 0;
+}
+
--
2.39.3
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 3d8f874bd620ce03f75a5512847586828ab86544
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024052548-prance-gliding-4f31@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3d8f874bd620ce03f75a5512847586828ab86544 Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei(a)redhat.com>
Date: Fri, 10 May 2024 11:50:27 +0800
Subject: [PATCH] io_uring: fail NOP if non-zero op flags is passed in
The NOP op flags should have been checked from beginning like any other
opcode, otherwise NOP may not be extended with the op flags.
Given both liburing and Rust io-uring crate always zeros SQE op flags, just
ignore users which play raw NOP uring interface without zeroing SQE, because
NOP is just for test purpose. Then we can save one NOP2 opcode.
Suggested-by: Jens Axboe <axboe(a)kernel.dk>
Fixes: 2b188cc1bb85 ("Add io_uring IO interface")
Cc: stable(a)vger.kernel.org
Signed-off-by: Ming Lei <ming.lei(a)redhat.com>
Link: https://lore.kernel.org/r/20240510035031.78874-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe(a)kernel.dk>
diff --git a/io_uring/nop.c b/io_uring/nop.c
index d956599a3c1b..1a4e312dfe51 100644
--- a/io_uring/nop.c
+++ b/io_uring/nop.c
@@ -12,6 +12,8 @@
int io_nop_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
+ if (READ_ONCE(sqe->rw_flags))
+ return -EINVAL;
return 0;
}
tpm2_load_cmd incorrectly checks options->keyhandle also for the legacy
format, as also implied by the inline comment. Check options->keyhandle
when ASN.1 is loaded.
Cc: James Bottomey <James.Bottomley(a)HansenPartnership.com>
Cc: stable(a)vger.kernel.org # v5.13+
Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs")
Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org>
---
security/keys/trusted-keys/trusted_tpm2.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c
index 8b7dd73d94c1..4f8207bf52a7 100644
--- a/security/keys/trusted-keys/trusted_tpm2.c
+++ b/security/keys/trusted-keys/trusted_tpm2.c
@@ -400,12 +400,11 @@ static int tpm2_load_cmd(struct tpm_chip *chip,
/* old form */
blob = payload->blob;
payload->old_format = 1;
+ } else {
+ if (!options->keyhandle)
+ return -EINVAL;
}
- /* new format carries keyhandle but old format doesn't */
- if (!options->keyhandle)
- return -EINVAL;
-
/* must be big enough for at least the two be16 size counts */
if (payload->blob_len < 4)
return -EINVAL;
--
2.45.1
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 19fb11d7220b8abc016aa254dc7e6d9f2d49b178
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024052522-mud-contempt-f78d@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 19fb11d7220b8abc016aa254dc7e6d9f2d49b178 Mon Sep 17 00:00:00 2001
From: Nuno Sa <nuno.sa(a)analog.com>
Date: Fri, 26 Apr 2024 17:42:12 +0200
Subject: [PATCH] dt-bindings: adc: axi-adc: add clocks property
Add a required clock property as we can't access the device registers if
the AXI bus clock is not properly enabled.
Note this clock is a very fundamental one that is typically enabled
pretty early during boot. Independently of that, we should really rely on
it to be enabled.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
Fixes: 96553a44e96d ("dt-bindings: iio: adc: add bindings doc for AXI ADC driver")
Signed-off-by: Nuno Sa <nuno.sa(a)analog.com>
Link: https://lore.kernel.org/r/20240426-ad9467-new-features-v2-3-6361fc3ba1cc@an…
Cc: <Stable(a)ver.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com>
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
index 3d49d21ad33d..e1f450b80db2 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
@@ -28,6 +28,9 @@ properties:
reg:
maxItems: 1
+ clocks:
+ maxItems: 1
+
dmas:
maxItems: 1
@@ -48,6 +51,7 @@ required:
- compatible
- dmas
- reg
+ - clocks
additionalProperties: false
@@ -58,6 +62,7 @@ examples:
reg = <0x44a00000 0x10000>;
dmas = <&rx_dma 0>;
dma-names = "rx";
+ clocks = <&axi_clk>;
#io-backend-cells = <0>;
};
...
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 19fb11d7220b8abc016aa254dc7e6d9f2d49b178
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024052521-audacious-renewably-220c@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 19fb11d7220b8abc016aa254dc7e6d9f2d49b178 Mon Sep 17 00:00:00 2001
From: Nuno Sa <nuno.sa(a)analog.com>
Date: Fri, 26 Apr 2024 17:42:12 +0200
Subject: [PATCH] dt-bindings: adc: axi-adc: add clocks property
Add a required clock property as we can't access the device registers if
the AXI bus clock is not properly enabled.
Note this clock is a very fundamental one that is typically enabled
pretty early during boot. Independently of that, we should really rely on
it to be enabled.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
Fixes: 96553a44e96d ("dt-bindings: iio: adc: add bindings doc for AXI ADC driver")
Signed-off-by: Nuno Sa <nuno.sa(a)analog.com>
Link: https://lore.kernel.org/r/20240426-ad9467-new-features-v2-3-6361fc3ba1cc@an…
Cc: <Stable(a)ver.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com>
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
index 3d49d21ad33d..e1f450b80db2 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
@@ -28,6 +28,9 @@ properties:
reg:
maxItems: 1
+ clocks:
+ maxItems: 1
+
dmas:
maxItems: 1
@@ -48,6 +51,7 @@ required:
- compatible
- dmas
- reg
+ - clocks
additionalProperties: false
@@ -58,6 +62,7 @@ examples:
reg = <0x44a00000 0x10000>;
dmas = <&rx_dma 0>;
dma-names = "rx";
+ clocks = <&axi_clk>;
#io-backend-cells = <0>;
};
...
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 19fb11d7220b8abc016aa254dc7e6d9f2d49b178
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024052520-enroll-deftly-8f54@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 19fb11d7220b8abc016aa254dc7e6d9f2d49b178 Mon Sep 17 00:00:00 2001
From: Nuno Sa <nuno.sa(a)analog.com>
Date: Fri, 26 Apr 2024 17:42:12 +0200
Subject: [PATCH] dt-bindings: adc: axi-adc: add clocks property
Add a required clock property as we can't access the device registers if
the AXI bus clock is not properly enabled.
Note this clock is a very fundamental one that is typically enabled
pretty early during boot. Independently of that, we should really rely on
it to be enabled.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
Fixes: 96553a44e96d ("dt-bindings: iio: adc: add bindings doc for AXI ADC driver")
Signed-off-by: Nuno Sa <nuno.sa(a)analog.com>
Link: https://lore.kernel.org/r/20240426-ad9467-new-features-v2-3-6361fc3ba1cc@an…
Cc: <Stable(a)ver.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com>
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
index 3d49d21ad33d..e1f450b80db2 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
@@ -28,6 +28,9 @@ properties:
reg:
maxItems: 1
+ clocks:
+ maxItems: 1
+
dmas:
maxItems: 1
@@ -48,6 +51,7 @@ required:
- compatible
- dmas
- reg
+ - clocks
additionalProperties: false
@@ -58,6 +62,7 @@ examples:
reg = <0x44a00000 0x10000>;
dmas = <&rx_dma 0>;
dma-names = "rx";
+ clocks = <&axi_clk>;
#io-backend-cells = <0>;
};
...
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 19fb11d7220b8abc016aa254dc7e6d9f2d49b178
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024052520-dainty-reflected-ff22@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 19fb11d7220b8abc016aa254dc7e6d9f2d49b178 Mon Sep 17 00:00:00 2001
From: Nuno Sa <nuno.sa(a)analog.com>
Date: Fri, 26 Apr 2024 17:42:12 +0200
Subject: [PATCH] dt-bindings: adc: axi-adc: add clocks property
Add a required clock property as we can't access the device registers if
the AXI bus clock is not properly enabled.
Note this clock is a very fundamental one that is typically enabled
pretty early during boot. Independently of that, we should really rely on
it to be enabled.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
Fixes: 96553a44e96d ("dt-bindings: iio: adc: add bindings doc for AXI ADC driver")
Signed-off-by: Nuno Sa <nuno.sa(a)analog.com>
Link: https://lore.kernel.org/r/20240426-ad9467-new-features-v2-3-6361fc3ba1cc@an…
Cc: <Stable(a)ver.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com>
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
index 3d49d21ad33d..e1f450b80db2 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
@@ -28,6 +28,9 @@ properties:
reg:
maxItems: 1
+ clocks:
+ maxItems: 1
+
dmas:
maxItems: 1
@@ -48,6 +51,7 @@ required:
- compatible
- dmas
- reg
+ - clocks
additionalProperties: false
@@ -58,6 +62,7 @@ examples:
reg = <0x44a00000 0x10000>;
dmas = <&rx_dma 0>;
dma-names = "rx";
+ clocks = <&axi_clk>;
#io-backend-cells = <0>;
};
...