Skip to contentSkip to conversation

6.15.4-rc1 review

PATCH In review Greg Kroah-Hartman 15 participants 610 messages Jun 23, 2025 – Jun 24, 2025 Page 5 of 5

Subsystems (5)
lore
Share & tools
lore
author maintainer
#567 lore raw

PATCH 555/592 tools: ynl: fix mixing ops and notifications on one socket

In reply to Greg Kroah-Hartman

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

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

From: Jakub Kicinski <[email protected]>

[ Upstream commit 9738280aae592b579a25b5b1b6584c894827d3c7 ]

The multi message support loosened the connection between the request and response handling, as we can now submit multiple requests before we start processing responses. Passing the attr set to NlMsgs decoding no longer makes sense (if it ever did), attr set may differ message by messsage. Isolate the part of decoding responsible for attr-set specific interpretation and call it once we identified the correct op.

Without this fix performing SET operation on an ethtool socket, while being subscribed to notifications causes:

# File "tools/net/ynl/pyynl/lib/ynl.py", line 1096, in _op
# Exception| return self._ops(ops)[0]
# Exception| ~~~~~~~~~^^^^^
# File "tools/net/ynl/pyynl/lib/ynl.py", line 1040, in _ops
# Exception| nms = NlMsgs(reply, attr_space=op.attr_set)
# Exception| ^^^^^^^^^^^

The value of op we use on line 1040 is stale, it comes form the previous loop. If a notification comes before a response we will update op to None and the next iteration thru the loop will break with the trace above.

Fixes 6fda63c45fe8 ("tools/net/ynl: fix cli.py --subscribe feature")
Fixes ba8be00f68f5 ("tools/net/ynl: Add multi message support to ynl")
---
 tools/net/ynl/pyynl/lib/ynl.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)
tools/net/ynl/pyynl/lib/ynl.py +17 -11
index 55b59f6c79b89..61deb59230671 100644
@@ -231,14 +231,7 @@ class NlMsg:
                     self.extack['unknown'].append(extack)
 
             if attr_space:
-                # We don't have the ability to parse nests yet, so only do global
-                if 'miss-type' in self.extack and 'miss-nest' not in self.extack:
-                    miss_type = self.extack['miss-type']
-                    if miss_type in attr_space.attrs_by_val:
-                        spec = attr_space.attrs_by_val[miss_type]
-                        self.extack['miss-type'] = spec['name']
-                        if 'doc' in spec:
-                            self.extack['miss-type-doc'] = spec['doc']
+                self.annotate_extack(attr_space)
 
     def _decode_policy(self, raw):
         policy = {}
@@ -264,6 +257,18 @@ class NlMsg:
                 policy['mask'] = attr.as_scalar('u64')
         return policy
 
+    def annotate_extack(self, attr_space):
+        """ Make extack more human friendly with attribute information """
+
+        # We don't have the ability to parse nests yet, so only do global
+        if 'miss-type' in self.extack and 'miss-nest' not in self.extack:
+            miss_type = self.extack['miss-type']
+            if miss_type in attr_space.attrs_by_val:
+                spec = attr_space.attrs_by_val[miss_type]
+                self.extack['miss-type'] = spec['name']
+                if 'doc' in spec:
+                    self.extack['miss-type-doc'] = spec['doc']
+
     def cmd(self):
         return self.nl_type
 
@@ -277,12 +282,12 @@ class NlMsg:
 
 
 class NlMsgs:
-    def __init__(self, data, attr_space=None):
+    def __init__(self, data):
         self.msgs = []
 
         offset = 0
         while offset < len(data):
-            msg = NlMsg(data, offset, attr_space=attr_space)
+            msg = NlMsg(data, offset)
             offset += msg.nl_len
             self.msgs.append(msg)
 
@@ -1034,12 +1039,13 @@ class YnlFamily(SpecFamily):
         op_rsp = []
         while not done:
             reply = self.sock.recv(self._recv_size)
-            nms = NlMsgs(reply, attr_space=op.attr_set)
+            nms = NlMsgs(reply)
             self._recv_dbg_print(reply, nms)
             for nl_msg in nms:
                 if nl_msg.nl_seq in reqs_by_seq:
                     (op, vals, req_msg, req_flags) = reqs_by_seq[nl_msg.nl_seq]
                     if nl_msg.extack:
+                        nl_msg.annotate_extack(op.attr_set)
                         self._decode_extack(req_msg, op, nl_msg.extack, vals)
                 else:
                     op = None
Signature · 1 line
2.39.5
author maintainer
#568 lore raw

PATCH 556/592 KVM: arm64: VHE: Synchronize restore of host debug registers

In reply to Greg Kroah-Hartman

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

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

From: Mark Rutland <[email protected]>

commit cade3d57e456e69f67aa9894bf89dc8678796bb7 upstream.

When KVM runs in non-protected VHE mode, there's no context synchronization event between __debug_switch_to_host() restoring the host debug registers and __kvm_vcpu_run() unmasking debug exceptions. Due to this, it's theoretically possible for the host to take an unexpected debug exception due to the stale guest configuration.

This cannot happen in NVHE/HVHE mode as debug exceptions are masked in the hyp code, and the exception return to the host will provide the necessary context synchronization before debug exceptions can be taken.

For now, avoid the problem by adding an ISB after VHE hyp code restores the host debug registers.

---
 arch/arm64/kvm/hyp/include/hyp/debug-sr.h |    3 +++
 1 file changed, 3 insertions(+)
arch/arm64/kvm/hyp/include/hyp/debug-sr.h +3 -0
@@ -167,6 +167,9 @@ static inline void __debug_switch_to_hos
 
 	__debug_save_state(guest_dbg, guest_ctxt);
 	__debug_restore_state(host_dbg, host_ctxt);
+
+	if (has_vhe())
+		isb();
 }
 
 #endif /* __ARM64_KVM_HYP_DEBUG_SR_H__ */
author maintainer
#569 lore raw

PATCH 557/592 x86/mm: Disable INVLPGB when PTI is enabled

In reply to Greg Kroah-Hartman

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

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

From: Dave Hansen <[email protected]>

commit 94a17f2dc90bc7eae36c0f478515d4bd1c23e877 upstream.

PTI uses separate ASIDs (aka. PCIDs) for kernel and user address spaces. When the kernel needs to flush the user address space, it just sets a bit in a bitmap and then flushes the entire PCID on the next switch to userspace.

This bitmap is a single 'unsigned long' which is plenty for all 6 dynamic ASIDs. But, unfortunately, the INVLPGB support brings along a bunch more user ASIDs, as many as ~2k more. The bitmap can't address that many.

Fortunately, the bitmap is only needed for PTI and all the CPUs with INVLPGB are AMD CPUs that aren't vulnerable to Meltdown and don't need PTI. The only way someone can run into an issue in practice is by booting with pti=on on a newer AMD CPU.

Disable INVLPGB if PTI is enabled. Avoid overrunning the small bitmap.

Note: this will be fixed up properly by making the bitmap bigger. For now, just avoid the mostly theoretical bug.

---
 arch/x86/mm/pti.c |    5 +++++
 1 file changed, 5 insertions(+)
arch/x86/mm/pti.c +5 -0
@@ -98,6 +98,11 @@ void __init pti_check_boottime_disable(v
 		return;
 
 	setup_force_cpu_cap(X86_FEATURE_PTI);
+
+	if (cpu_feature_enabled(X86_FEATURE_INVLPGB)) {
+		pr_debug("PTI enabled, disabling INVLPGB\n");
+		setup_clear_cpu_cap(X86_FEATURE_INVLPGB);
+	}
 }
 
 static int __init pti_parse_cmdline(char *arg)
author maintainer
#570 lore raw

PATCH 558/592 EDAC/amd64: Correct number of UMCs for family 19h models 70h-7fh

In reply to Greg Kroah-Hartman

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

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

From: Avadhut Naik <[email protected]>

commit b2e673ae53ef4b943f68585207a5f21cfc9a0714 upstream.

AMD's Family 19h-based Models 70h-7fh support 4 unified memory controllers (UMC) per processor die.

The amd64_edac driver, however, assumes only 2 UMCs are supported since max_mcs variable for the models has not been explicitly set to 4. The same results in incomplete or incorrect memory information being logged to dmesg by the module during initialization in some instances.

---
 drivers/edac/amd64_edac.c |    1 +
 1 file changed, 1 insertion(+)
drivers/edac/amd64_edac.c +1 -0
@@ -3879,6 +3879,7 @@ static int per_family_init(struct amd64_
 			break;
 		case 0x70 ... 0x7f:
 			pvt->ctl_name			= "F19h_M70h";
+			pvt->max_mcs			= 4;
 			pvt->flags.zn_regs_v2		= 1;
 			break;
 		case 0x90 ... 0x9f:
author maintainer
#571 lore raw

PATCH 559/592 dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties

In reply to Greg Kroah-Hartman

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

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

From: Akhil R <[email protected]>

commit 903cc7096db22f889d48e2cee8840709ce04fdac upstream.

Specify the properties which are essential and which are not for the Tegra I2C driver to function correctly. This was not added correctly when the TXT binding was converted to yaml. All the existing DT nodes have these properties already and hence this does not break the ABI.

dmas and dma-names which were specified as a must in the TXT binding is now made optional since the driver can work in PIO mode if dmas are missing.

Fixes f10a9b722f80 ("dt-bindings: i2c: tegra: Convert to json-schema”)
Cc <[email protected]> # v5.17+
---
 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml |   24 +++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml +23 -1
@@ -97,7 +97,10 @@ properties:
 
   resets:
     items:
-      - description: module reset
+      - description:
+          Module reset. This property is optional for controllers in Tegra194,
+          Tegra234 etc where an internal software reset is available as an
+          alternative.
 
   reset-names:
     items:
@@ -116,6 +119,13 @@ properties:
       - const: rx
       - const: tx
 
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+  - clock-names
+
 allOf:
   - $ref: /schemas/i2c/i2c-controller.yaml
   - if:
@@ -169,6 +179,18 @@ allOf:
       properties:
         power-domains: false
 
+  - if:
+      not:
+        properties:
+          compatible:
+            contains:
+              enum:
+                - nvidia,tegra194-i2c
+    then:
+      required:
+        - resets
+        - reset-names
+
 unevaluatedProperties: false
 
 examples:
author maintainer
#572 lore raw

PATCH 560/592 perf/x86/intel: Fix crash in icl_update_topdown_event()

In reply to Greg Kroah-Hartman

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

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

From: Kan Liang <[email protected]>

commit b0823d5fbacb1c551d793cbfe7af24e0d1fa45ed upstream.

The perf_fuzzer found a hard-lockup crash on a RaptorLake machine:

  Oops: general protection fault, maybe for address 0xffff89aeceab400: 0000
  CPU: 23 UID: 0 PID: 0 Comm: swapper/23
  Tainted: [W]=WARN
  Hardware name: Dell Inc. Precision 9660/0VJ762
  RIP: 0010:native_read_pmc+0x7/0x40
  Code: cc e8 8d a9 01 00 48 89 03 5b cd cc cc cc cc 0f 1f ...
  RSP: 000:fffb03100273de8 EFLAGS: 00010046
  ....
  Call Trace:
    <TASK>
    icl_update_topdown_event+0x165/0x190
    ? ktime_get+0x38/0xd0
    intel_pmu_read_event+0xf9/0x210
    __perf_event_read+0xf9/0x210

CPUs 16-23 are E-core CPUs that don't support the perf metrics feature. The icl_update_topdown_event() should not be invoked on these CPUs.

It's a regression of commit:

f9bdf1f95339 ("perf/x86/intel: Avoid disable PMU if !cpuc->enabled in sample read")

The bug introduced by that commit is that the is_topdown_event() function is mistakenly used to replace the is_topdown_count() call to check if the topdown functions for the perf metrics feature should be invoked.

Fix it.

---
 arch/x86/events/intel/core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -2810,7 +2810,7 @@ static void intel_pmu_read_event(struct
 		 * If the PEBS counters snapshotting is enabled,
 		 * the topdown event is available in PEBS records.
 		 */
-		if (is_topdown_event(event) && !is_pebs_counter_event_group(event))
+		if (is_topdown_count(event) && !is_pebs_counter_event_group(event))
 			static_call(intel_pmu_update_topdown_event)(event, NULL);
 		else
 			intel_pmu_drain_pebs_buffer();
author maintainer
#573 lore raw

PATCH 561/592 smb: Log an error when close_all_cached_dirs fails

In reply to Greg Kroah-Hartman

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

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

From: Paul Aurich <[email protected]>

commit a2182743a8b4969481f64aec4908ff162e8a206c upstream.

Under low-memory conditions, close_all_cached_dirs() can't move the dentries to a separate list to dput() them once the locks are dropped. This will result in a "Dentry still in use" error, so add an error message that makes it clear this is what happened:

[  495.281119] CIFS: VFS: \\otters.example.com\share Out of memory while dropping dentries
[  495.281595] ------------[ cut here ]------------
[  495.281887] BUG: Dentry ffff888115531138{i=78,n=/}  still in use (2) [unmount of cifs cifs]
[  495.282391] WARNING: CPU: 1 PID: 2329 at fs/dcache.c:1536 umount_check+0xc8/0xf0

Also, bail out of looping through all tcons as soon as a single allocation fails, since we're already in trouble, and kmalloc() attempts for subseqeuent tcons are likely to fail just like the first one did.

---
 fs/smb/client/cached_dir.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
fs/smb/client/cached_dir.c +12 -2
@@ -486,8 +486,17 @@ void close_all_cached_dirs(struct cifs_s
 		spin_lock(&cfids->cfid_list_lock);
 		list_for_each_entry(cfid, &cfids->entries, entry) {
 			tmp_list = kmalloc(sizeof(*tmp_list), GFP_ATOMIC);
-			if (tmp_list == NULL)
-				break;
+			if (tmp_list == NULL) {
+				/*
+				 * If the malloc() fails, we won't drop all
+				 * dentries, and unmounting is likely to trigger
+				 * a 'Dentry still in use' error.
+				 */
+				cifs_tcon_dbg(VFS, "Out of memory while dropping dentries\n");
+				spin_unlock(&cfids->cfid_list_lock);
+				spin_unlock(&cifs_sb->tlink_tree_lock);
+				goto done;
+			}
 			spin_lock(&cfid->fid_lock);
 			tmp_list->dentry = cfid->dentry;
 			cfid->dentry = NULL;
@@ -499,6 +508,7 @@ void close_all_cached_dirs(struct cifs_s
 	}
 	spin_unlock(&cifs_sb->tlink_tree_lock);
 
+done:
 	list_for_each_entry_safe(tmp_list, q, &entry, entry) {
 		list_del(&tmp_list->entry);
 		dput(tmp_list->dentry);
author maintainer
#574 lore raw

PATCH 562/592 i2c: k1: check for transfer error

In reply to Greg Kroah-Hartman

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

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

From: Alex Elder <[email protected]>

commit a6c23dac756b9541b33aa3bcd30f464df2879209 upstream.

If spacemit_i2c_xfer_msg() times out waiting for a message transfer to complete, or if the hardware reports an error, it returns a negative error code (-ETIMEDOUT, -EAGAIN, -ENXIO. or -EIO).

The sole caller of spacemit_i2c_xfer_msg() is spacemit_i2c_xfer(), which is the i2c_algorithm->xfer callback function. It currently does not save the value returned by spacemit_i2c_xfer_msg().

The result is that transfer errors go unreported, and a caller has no indication anything is wrong.

When this code was out for review, the return value *was* checked in early versions. But for some reason, that assignment got dropped between versions 5 and 6 of the series, perhaps related to reworking the code to merge spacemit_i2c_xfer_core() into spacemit_i2c_xfer().

Simply assigning the value returned to "ret" fixes the problem.

---
 drivers/i2c/busses/i2c-k1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-k1.c +1 -1
@@ -477,7 +477,7 @@ static int spacemit_i2c_xfer(struct i2c_
 
 	ret = spacemit_i2c_wait_bus_idle(i2c);
 	if (!ret)
-		spacemit_i2c_xfer_msg(i2c);
+		ret = spacemit_i2c_xfer_msg(i2c);
 	else if (ret < 0)
 		dev_dbg(i2c->dev, "i2c transfer error: %d\n", ret);
 	else
author maintainer
#575 lore raw

PATCH 563/592 smb: client: fix first command failure during re-negotiation

In reply to Greg Kroah-Hartman

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

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

From: zhangjian <[email protected]>

commit 34331d7beed7576acfc98e991c39738b96162499 upstream.

after fabc4ed200f9, server_unresponsive add a condition to check whether client need to reconnect depending on server->lstrp. When client failed to reconnect for some time and abort connection, server->lstrp is updated for the last time. In the following scene, server->lstrp is too old. This cause next command failure in re-negotiation rather than waiting for re-negotiation done.

1. mount -t cifs -o username=Everyone,echo_internal=10 //$server_ip/export /mnt
2. ssh $server_ip "echo b > /proc/sysrq-trigger &"
3. ls /mnt
4. sleep 21s
5. ssh $server_ip "service firewalld stop"
6. ls # return EHOSTDOWN

If the interval between 5 and 6 is too small, 6 may trigger sending negotiation request. Before backgrounding cifsd thread try to receive negotiation response from server in cifs_readv_from_socket, server_unresponsive may trigger cifs_reconnect which cause 6 to be failed:

ls thread
----------------
smb2_negotiate

    server->tcpStatus = CifsInNegotiate
    compound_send_recv
      wait_for_compound_request

cifsd thread
----------------
cifs_readv_from_socket
server_unresponsive
server->tcpStatus == CifsInNegotiate && jiffies > server->lstrp + 20s
cifs_reconnect
cifs_abort_connection: mid_state = MID_RETRY_NEEDED

ls thread
----------------
cifs_sync_mid_result return EAGAIN
smb2_negotiate return EHOSTDOWN

Though server->lstrp means last server response time, it is updated in cifs_abort_connection and cifs_get_tcp_session. We can also update server->lstrp before switching into CifsInNegotiate state to avoid failure in 6.

Fixes 7ccc1465465d ("smb: client: fix hang in wait_for_response() for negproto")
---
 fs/smb/client/connect.c |    1 +
 1 file changed, 1 insertion(+)
fs/smb/client/connect.c +1 -0
@@ -4193,6 +4193,7 @@ retry:
 		return 0;
 	}
 
+	server->lstrp = jiffies;
 	server->tcpStatus = CifsInNegotiate;
 	spin_unlock(&server->srv_lock);
 
author maintainer
#576 lore raw

PATCH 564/592 smb: client: fix max_sge overflow in smb_extract_folioq_to_rdma()

In reply to Greg Kroah-Hartman

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

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

From: Stefan Metzmacher <[email protected]>

commit a379a8a2a0032e12e7ef397197c9c2ad011588d6 upstream.

This fixes the following problem:

[  749.901015] [   T8673] run fstests cifs/001 at 2025-06-17 09:40:30
[  750.346409] [   T9870] ==================================================================
[  750.346814] [   T9870] BUG: KASAN: slab-out-of-bounds in smb_set_sge+0x2cc/0x3b0 [cifs]
[  750.347330] [   T9870] Write of size 8 at addr ffff888011082890 by task xfs_io/9870
[  750.347705] [   T9870]
[  750.348077] [   T9870] CPU: 0 UID: 0 PID: 9870 Comm: xfs_io Kdump: loaded Not tainted 6.16.0-rc2-metze.02+ #1 PREEMPT(voluntary)
[  750.348082] [   T9870] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006
[  750.348085] [   T9870] Call Trace:
[  750.348086] [   T9870]  <TASK>
[  750.348088] [   T9870]  dump_stack_lvl+0x76/0xa0
[  750.348106] [   T9870]  print_report+0xd1/0x640
[  750.348116] [   T9870]  ? __pfx__raw_spin_lock_irqsave+0x10/0x10
[  750.348120] [   T9870]  ? kasan_complete_mode_report_info+0x26/0x210
[  750.348124] [   T9870]  kasan_report+0xe7/0x130
[  750.348128] [   T9870]  ? smb_set_sge+0x2cc/0x3b0 [cifs]
[  750.348262] [   T9870]  ? smb_set_sge+0x2cc/0x3b0 [cifs]
[  750.348377] [   T9870]  __asan_report_store8_noabort+0x17/0x30
[  750.348381] [   T9870]  smb_set_sge+0x2cc/0x3b0 [cifs]
[  750.348496] [   T9870]  smbd_post_send_iter+0x1990/0x3070 [cifs]
[  750.348625] [   T9870]  ? __pfx_smbd_post_send_iter+0x10/0x10 [cifs]
[  750.348741] [   T9870]  ? update_stack_state+0x2a0/0x670
[  750.348749] [   T9870]  ? cifs_flush+0x153/0x320 [cifs]
[  750.348870] [   T9870]  ? cifs_flush+0x153/0x320 [cifs]
[  750.348990] [   T9870]  ? update_stack_state+0x2a0/0x670
[  750.348995] [   T9870]  smbd_send+0x58c/0x9c0 [cifs]
[  750.349117] [   T9870]  ? __pfx_smbd_send+0x10/0x10 [cifs]
[  750.349231] [   T9870]  ? unwind_get_return_address+0x65/0xb0
[  750.349235] [   T9870]  ? __pfx_stack_trace_consume_entry+0x10/0x10
[  750.349242] [   T9870]  ? arch_stack_walk+0xa7/0x100
[  750.349250] [   T9870]  ? stack_trace_save+0x92/0xd0
[  750.349254] [   T9870]  __smb_send_rqst+0x931/0xec0 [cifs]
[  750.349374] [   T9870]  ? kernel_text_address+0x173/0x190
[  750.349379] [   T9870]  ? kasan_save_stack+0x39/0x70
[  750.349382] [   T9870]  ? kasan_save_track+0x18/0x70
[  750.349385] [   T9870]  ? __kasan_slab_alloc+0x9d/0xa0
[  750.349389] [   T9870]  ? __pfx___smb_send_rqst+0x10/0x10 [cifs]
[  750.349508] [   T9870]  ? smb2_mid_entry_alloc+0xb4/0x7e0 [cifs]
[  750.349626] [   T9870]  ? cifs_call_async+0x277/0xb00 [cifs]
[  750.349746] [   T9870]  ? cifs_issue_write+0x256/0x610 [cifs]
[  750.349867] [   T9870]  ? netfs_do_issue_write+0xc2/0x340 [netfs]
[  750.349900] [   T9870]  ? netfs_advance_write+0x45b/0x1270 [netfs]
[  750.349929] [   T9870]  ? netfs_write_folio+0xd6c/0x1be0 [netfs]
[  750.349958] [   T9870]  ? netfs_writepages+0x2e9/0xa80 [netfs]
[  750.349987] [   T9870]  ? do_writepages+0x21f/0x590
[  750.349993] [   T9870]  ? filemap_fdatawrite_wbc+0xe1/0x140
[  750.349997] [   T9870]  ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[  750.350002] [   T9870]  smb_send_rqst+0x22e/0x2f0 [cifs]
[  750.350131] [   T9870]  ? __pfx_smb_send_rqst+0x10/0x10 [cifs]
[  750.350255] [   T9870]  ? local_clock_noinstr+0xe/0xd0
[  750.350261] [   T9870]  ? kasan_save_alloc_info+0x37/0x60
[  750.350268] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.350271] [   T9870]  ? _raw_spin_lock+0x81/0xf0
[  750.350275] [   T9870]  ? __pfx__raw_spin_lock+0x10/0x10
[  750.350278] [   T9870]  ? smb2_setup_async_request+0x293/0x580 [cifs]
[  750.350398] [   T9870]  cifs_call_async+0x477/0xb00 [cifs]
[  750.350518] [   T9870]  ? __pfx_smb2_writev_callback+0x10/0x10 [cifs]
[  750.350636] [   T9870]  ? __pfx_cifs_call_async+0x10/0x10 [cifs]
[  750.350756] [   T9870]  ? __pfx__raw_spin_lock+0x10/0x10
[  750.350760] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.350763] [   T9870]  ? __smb2_plain_req_init+0x933/0x1090 [cifs]
[  750.350891] [   T9870]  smb2_async_writev+0x15ff/0x2460 [cifs]
[  750.351008] [   T9870]  ? sched_clock_noinstr+0x9/0x10
[  750.351012] [   T9870]  ? local_clock_noinstr+0xe/0xd0
[  750.351018] [   T9870]  ? __pfx_smb2_async_writev+0x10/0x10 [cifs]
[  750.351144] [   T9870]  ? __pfx__raw_spin_lock_irqsave+0x10/0x10
[  750.351150] [   T9870]  ? _raw_spin_unlock+0xe/0x40
[  750.351154] [   T9870]  ? cifs_pick_channel+0x242/0x370 [cifs]
[  750.351275] [   T9870]  cifs_issue_write+0x256/0x610 [cifs]
[  750.351554] [   T9870]  ? cifs_issue_write+0x256/0x610 [cifs]
[  750.351677] [   T9870]  netfs_do_issue_write+0xc2/0x340 [netfs]
[  750.351710] [   T9870]  netfs_advance_write+0x45b/0x1270 [netfs]
[  750.351740] [   T9870]  ? rolling_buffer_append+0x12d/0x440 [netfs]
[  750.351769] [   T9870]  netfs_write_folio+0xd6c/0x1be0 [netfs]
[  750.351798] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.351804] [   T9870]  netfs_writepages+0x2e9/0xa80 [netfs]
[  750.351835] [   T9870]  ? __pfx_netfs_writepages+0x10/0x10 [netfs]
[  750.351864] [   T9870]  ? exit_files+0xab/0xe0
[  750.351867] [   T9870]  ? do_exit+0x148f/0x2980
[  750.351871] [   T9870]  ? do_group_exit+0xb5/0x250
[  750.351874] [   T9870]  ? arch_do_signal_or_restart+0x92/0x630
[  750.351879] [   T9870]  ? exit_to_user_mode_loop+0x98/0x170
[  750.351882] [   T9870]  ? do_syscall_64+0x2cf/0xd80
[  750.351886] [   T9870]  ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[  750.351890] [   T9870]  do_writepages+0x21f/0x590
[  750.351894] [   T9870]  ? __pfx_do_writepages+0x10/0x10
[  750.351897] [   T9870]  filemap_fdatawrite_wbc+0xe1/0x140
[  750.351901] [   T9870]  __filemap_fdatawrite_range+0xba/0x100
[  750.351904] [   T9870]  ? __pfx___filemap_fdatawrite_range+0x10/0x10
[  750.351912] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.351916] [   T9870]  filemap_write_and_wait_range+0x7d/0xf0
[  750.351920] [   T9870]  cifs_flush+0x153/0x320 [cifs]
[  750.352042] [   T9870]  filp_flush+0x107/0x1a0
[  750.352046] [   T9870]  filp_close+0x14/0x30
[  750.352049] [   T9870]  put_files_struct.part.0+0x126/0x2a0
[  750.352053] [   T9870]  ? __pfx__raw_spin_lock+0x10/0x10
[  750.352058] [   T9870]  exit_files+0xab/0xe0
[  750.352061] [   T9870]  do_exit+0x148f/0x2980
[  750.352065] [   T9870]  ? __pfx_do_exit+0x10/0x10
[  750.352069] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.352072] [   T9870]  ? _raw_spin_lock_irq+0x8a/0xf0
[  750.352076] [   T9870]  do_group_exit+0xb5/0x250
[  750.352080] [   T9870]  get_signal+0x22d3/0x22e0
[  750.352086] [   T9870]  ? __pfx_get_signal+0x10/0x10
[  750.352089] [   T9870]  ? fpregs_assert_state_consistent+0x68/0x100
[  750.352101] [   T9870]  ? folio_add_lru+0xda/0x120
[  750.352105] [   T9870]  arch_do_signal_or_restart+0x92/0x630
[  750.352109] [   T9870]  ? __pfx_arch_do_signal_or_restart+0x10/0x10
[  750.352115] [   T9870]  exit_to_user_mode_loop+0x98/0x170
[  750.352118] [   T9870]  do_syscall_64+0x2cf/0xd80
[  750.352123] [   T9870]  ? __kasan_check_read+0x11/0x20
[  750.352126] [   T9870]  ? count_memcg_events+0x1b4/0x420
[  750.352132] [   T9870]  ? handle_mm_fault+0x148/0x690
[  750.352136] [   T9870]  ? _raw_spin_lock_irq+0x8a/0xf0
[  750.352140] [   T9870]  ? __kasan_check_read+0x11/0x20
[  750.352143] [   T9870]  ? fpregs_assert_state_consistent+0x68/0x100
[  750.352146] [   T9870]  ? irqentry_exit_to_user_mode+0x2e/0x250
[  750.352151] [   T9870]  ? irqentry_exit+0x43/0x50
[  750.352154] [   T9870]  ? exc_page_fault+0x75/0xe0
[  750.352160] [   T9870]  entry_SYSCALL_64_after_hwframe+0x76/0x7e
[  750.352163] [   T9870] RIP: 0033:0x7858c94ab6e2
[  750.352167] [   T9870] Code: Unable to access opcode bytes at 0x7858c94ab6b8.
[  750.352175] [   T9870] RSP: 002b:00007858c9248ce8 EFLAGS: 00000246 ORIG_RAX: 0000000000000022
[  750.352179] [   T9870] RAX: fffffffffffffdfe RBX: 00007858c92496c0 RCX: 00007858c94ab6e2
[  750.352182] [   T9870] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
[  750.352184] [   T9870] RBP: 00007858c9248d10 R08: 0000000000000000 R09: 0000000000000000
[  750.352185] [   T9870] R10: 0000000000000000 R11: 0000000000000246 R12: fffffffffffffde0
[  750.352187] [   T9870] R13: 0000000000000020 R14: 0000000000000002 R15: 00007ffc072d2230
[  750.352191] [   T9870]  </TASK>
[  750.352195] [   T9870]
[  750.395206] [   T9870] Allocated by task 9870 on cpu 0 at 750.346406s:
[  750.395523] [   T9870]  kasan_save_stack+0x39/0x70
[  750.395532] [   T9870]  kasan_save_track+0x18/0x70
[  750.395536] [   T9870]  kasan_save_alloc_info+0x37/0x60
[  750.395539] [   T9870]  __kasan_slab_alloc+0x9d/0xa0
[  750.395543] [   T9870]  kmem_cache_alloc_noprof+0x13c/0x3f0
[  750.395548] [   T9870]  mempool_alloc_slab+0x15/0x20
[  750.395553] [   T9870]  mempool_alloc_noprof+0x135/0x340
[  750.395557] [   T9870]  smbd_post_send_iter+0x63e/0x3070 [cifs]
[  750.395694] [   T9870]  smbd_send+0x58c/0x9c0 [cifs]
[  750.395819] [   T9870]  __smb_send_rqst+0x931/0xec0 [cifs]
[  750.395950] [   T9870]  smb_send_rqst+0x22e/0x2f0 [cifs]
[  750.396081] [   T9870]  cifs_call_async+0x477/0xb00 [cifs]
[  750.396232] [   T9870]  smb2_async_writev+0x15ff/0x2460 [cifs]
[  750.396359] [   T9870]  cifs_issue_write+0x256/0x610 [cifs]
[  750.396492] [   T9870]  netfs_do_issue_write+0xc2/0x340 [netfs]
[  750.396544] [   T9870]  netfs_advance_write+0x45b/0x1270 [netfs]
[  750.396576] [   T9870]  netfs_write_folio+0xd6c/0x1be0 [netfs]
[  750.396608] [   T9870]  netfs_writepages+0x2e9/0xa80 [netfs]
[  750.396639] [   T9870]  do_writepages+0x21f/0x590
[  750.396643] [   T9870]  filemap_fdatawrite_wbc+0xe1/0x140
[  750.396647] [   T9870]  __filemap_fdatawrite_range+0xba/0x100
[  750.396651] [   T9870]  filemap_write_and_wait_range+0x7d/0xf0
[  750.396656] [   T9870]  cifs_flush+0x153/0x320 [cifs]
[  750.396787] [   T9870]  filp_flush+0x107/0x1a0
[  750.396791] [   T9870]  filp_close+0x14/0x30
[  750.396795] [   T9870]  put_files_struct.part.0+0x126/0x2a0
[  750.396800] [   T9870]  exit_files+0xab/0xe0
[  750.396803] [   T9870]  do_exit+0x148f/0x2980
[  750.396808] [   T9870]  do_group_exit+0xb5/0x250
[  750.396813] [   T9870]  get_signal+0x22d3/0x22e0
[  750.396817] [   T9870]  arch_do_signal_or_restart+0x92/0x630
[  750.396822] [   T9870]  exit_to_user_mode_loop+0x98/0x170
[  750.396827] [   T9870]  do_syscall_64+0x2cf/0xd80
[  750.396832] [   T9870]  entry_SYSCALL_64_after_hwframe+0x76/0x7e
[  750.396836] [   T9870]
[  750.397150] [   T9870] The buggy address belongs to the object at ffff888011082800
                           which belongs to the cache smbd_request_0000000008f3bd7b of size 144
[  750.397798] [   T9870] The buggy address is located 0 bytes to the right of
                           allocated 144-byte region [ffff888011082800, ffff888011082890)
[  750.398469] [   T9870]
[  750.398800] [   T9870] The buggy address belongs to the physical page:
[  750.399141] [   T9870] page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x11082
[  750.399148] [   T9870] flags: 0xfffffc0000000(node=0|zone=1|lastcpupid=0x1fffff)
[  750.399155] [   T9870] page_type: f5(slab)
[  750.399161] [   T9870] raw: 000fffffc0000000 ffff888022d65640 dead000000000122 0000000000000000
[  750.399165] [   T9870] raw: 0000000000000000 0000000080100010 00000000f5000000 0000000000000000
[  750.399169] [   T9870] page dumped because: kasan: bad access detected
[  750.399172] [   T9870]
[  750.399505] [   T9870] Memory state around the buggy address:
[  750.399863] [   T9870]  ffff888011082780: fb fb fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[  750.400247] [   T9870]  ffff888011082800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[  750.400618] [   T9870] >ffff888011082880: 00 00 fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[  750.400982] [   T9870]                          ^
[  750.401370] [   T9870]  ffff888011082900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[  750.401774] [   T9870]  ffff888011082980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[  750.402171] [   T9870] ==================================================================
[  750.402696] [   T9870] Disabling lock debugging due to kernel taint
[  750.403202] [   T9870] BUG: unable to handle page fault for address: ffff8880110a2000
[  750.403797] [   T9870] #PF: supervisor write access in kernel mode
[  750.404204] [   T9870] #PF: error_code(0x0003) - permissions violation
[  750.404581] [   T9870] PGD 5ce01067 P4D 5ce01067 PUD 5ce02067 PMD 78aa063 PTE 80000000110a2021
[  750.404969] [   T9870] Oops: Oops: 0003 [#1] SMP KASAN PTI
[  750.405394] [   T9870] CPU: 0 UID: 0 PID: 9870 Comm: xfs_io Kdump: loaded Tainted: G    B               6.16.0-rc2-metze.02+ #1 PREEMPT(voluntary)
[  750.406510] [   T9870] Tainted: [B]=BAD_PAGE
[  750.406967] [   T9870] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006
[  750.407440] [   T9870] RIP: 0010:smb_set_sge+0x15c/0x3b0 [cifs]
[  750.408065] [   T9870] Code: 48 83 f8 ff 0f 84 b0 00 00 00 48 ba 00 00 00 00 00 fc ff df 4c 89 e1 48 c1 e9 03 80 3c 11 00 0f 85 69 01 00 00 49 8d 7c 24 08 <49> 89 04 24 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 0f
[  750.409283] [   T9870] RSP: 0018:ffffc90005e2e758 EFLAGS: 00010246
[  750.409803] [   T9870] RAX: ffff888036c53400 RBX: ffffc90005e2e878 RCX: 1ffff11002214400
[  750.410323] [   T9870] RDX: dffffc0000000000 RSI: dffffc0000000000 RDI: ffff8880110a2008
[  750.411217] [   T9870] RBP: ffffc90005e2e798 R08: 0000000000000001 R09: 0000000000000400
[  750.411770] [   T9870] R10: ffff888011082800 R11: 0000000000000000 R12: ffff8880110a2000
[  750.412325] [   T9870] R13: 0000000000000000 R14: ffffc90005e2e888 R15: ffff88801a4b6000
[  750.412901] [   T9870] FS:  0000000000000000(0000) GS:ffff88812bc68000(0000) knlGS:0000000000000000
[  750.413477] [   T9870] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  750.414077] [   T9870] CR2: ffff8880110a2000 CR3: 000000005b0a6005 CR4: 00000000000726f0
[  750.414654] [   T9870] Call Trace:
[  750.415211] [   T9870]  <TASK>
[  750.415748] [   T9870]  smbd_post_send_iter+0x1990/0x3070 [cifs]
[  750.416449] [   T9870]  ? __pfx_smbd_post_send_iter+0x10/0x10 [cifs]
[  750.417128] [   T9870]  ? update_stack_state+0x2a0/0x670
[  750.417685] [   T9870]  ? cifs_flush+0x153/0x320 [cifs]
[  750.418380] [   T9870]  ? cifs_flush+0x153/0x320 [cifs]
[  750.419055] [   T9870]  ? update_stack_state+0x2a0/0x670
[  750.419624] [   T9870]  smbd_send+0x58c/0x9c0 [cifs]
[  750.420297] [   T9870]  ? __pfx_smbd_send+0x10/0x10 [cifs]
[  750.420936] [   T9870]  ? unwind_get_return_address+0x65/0xb0
[  750.421456] [   T9870]  ? __pfx_stack_trace_consume_entry+0x10/0x10
[  750.421954] [   T9870]  ? arch_stack_walk+0xa7/0x100
[  750.422460] [   T9870]  ? stack_trace_save+0x92/0xd0
[  750.422948] [   T9870]  __smb_send_rqst+0x931/0xec0 [cifs]
[  750.423579] [   T9870]  ? kernel_text_address+0x173/0x190
[  750.424056] [   T9870]  ? kasan_save_stack+0x39/0x70
[  750.424813] [   T9870]  ? kasan_save_track+0x18/0x70
[  750.425323] [   T9870]  ? __kasan_slab_alloc+0x9d/0xa0
[  750.425831] [   T9870]  ? __pfx___smb_send_rqst+0x10/0x10 [cifs]
[  750.426548] [   T9870]  ? smb2_mid_entry_alloc+0xb4/0x7e0 [cifs]
[  750.427231] [   T9870]  ? cifs_call_async+0x277/0xb00 [cifs]
[  750.427882] [   T9870]  ? cifs_issue_write+0x256/0x610 [cifs]
[  750.428909] [   T9870]  ? netfs_do_issue_write+0xc2/0x340 [netfs]
[  750.429425] [   T9870]  ? netfs_advance_write+0x45b/0x1270 [netfs]
[  750.429882] [   T9870]  ? netfs_write_folio+0xd6c/0x1be0 [netfs]
[  750.430345] [   T9870]  ? netfs_writepages+0x2e9/0xa80 [netfs]
[  750.430809] [   T9870]  ? do_writepages+0x21f/0x590
[  750.431239] [   T9870]  ? filemap_fdatawrite_wbc+0xe1/0x140
[  750.431652] [   T9870]  ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[  750.432041] [   T9870]  smb_send_rqst+0x22e/0x2f0 [cifs]
[  750.432586] [   T9870]  ? __pfx_smb_send_rqst+0x10/0x10 [cifs]
[  750.433108] [   T9870]  ? local_clock_noinstr+0xe/0xd0
[  750.433482] [   T9870]  ? kasan_save_alloc_info+0x37/0x60
[  750.433855] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.434214] [   T9870]  ? _raw_spin_lock+0x81/0xf0
[  750.434561] [   T9870]  ? __pfx__raw_spin_lock+0x10/0x10
[  750.434903] [   T9870]  ? smb2_setup_async_request+0x293/0x580 [cifs]
[  750.435394] [   T9870]  cifs_call_async+0x477/0xb00 [cifs]
[  750.435892] [   T9870]  ? __pfx_smb2_writev_callback+0x10/0x10 [cifs]
[  750.436388] [   T9870]  ? __pfx_cifs_call_async+0x10/0x10 [cifs]
[  750.436881] [   T9870]  ? __pfx__raw_spin_lock+0x10/0x10
[  750.437237] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.437579] [   T9870]  ? __smb2_plain_req_init+0x933/0x1090 [cifs]
[  750.438062] [   T9870]  smb2_async_writev+0x15ff/0x2460 [cifs]
[  750.438557] [   T9870]  ? sched_clock_noinstr+0x9/0x10
[  750.438906] [   T9870]  ? local_clock_noinstr+0xe/0xd0
[  750.439293] [   T9870]  ? __pfx_smb2_async_writev+0x10/0x10 [cifs]
[  750.439786] [   T9870]  ? __pfx__raw_spin_lock_irqsave+0x10/0x10
[  750.440143] [   T9870]  ? _raw_spin_unlock+0xe/0x40
[  750.440495] [   T9870]  ? cifs_pick_channel+0x242/0x370 [cifs]
[  750.440989] [   T9870]  cifs_issue_write+0x256/0x610 [cifs]
[  750.441492] [   T9870]  ? cifs_issue_write+0x256/0x610 [cifs]
[  750.441987] [   T9870]  netfs_do_issue_write+0xc2/0x340 [netfs]
[  750.442387] [   T9870]  netfs_advance_write+0x45b/0x1270 [netfs]
[  750.442969] [   T9870]  ? rolling_buffer_append+0x12d/0x440 [netfs]
[  750.443376] [   T9870]  netfs_write_folio+0xd6c/0x1be0 [netfs]
[  750.443768] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.444145] [   T9870]  netfs_writepages+0x2e9/0xa80 [netfs]
[  750.444541] [   T9870]  ? __pfx_netfs_writepages+0x10/0x10 [netfs]
[  750.444936] [   T9870]  ? exit_files+0xab/0xe0
[  750.445312] [   T9870]  ? do_exit+0x148f/0x2980
[  750.445672] [   T9870]  ? do_group_exit+0xb5/0x250
[  750.446028] [   T9870]  ? arch_do_signal_or_restart+0x92/0x630
[  750.446402] [   T9870]  ? exit_to_user_mode_loop+0x98/0x170
[  750.446762] [   T9870]  ? do_syscall_64+0x2cf/0xd80
[  750.447132] [   T9870]  ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[  750.447499] [   T9870]  do_writepages+0x21f/0x590
[  750.447859] [   T9870]  ? __pfx_do_writepages+0x10/0x10
[  750.448236] [   T9870]  filemap_fdatawrite_wbc+0xe1/0x140
[  750.448595] [   T9870]  __filemap_fdatawrite_range+0xba/0x100
[  750.448953] [   T9870]  ? __pfx___filemap_fdatawrite_range+0x10/0x10
[  750.449336] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.449697] [   T9870]  filemap_write_and_wait_range+0x7d/0xf0
[  750.450062] [   T9870]  cifs_flush+0x153/0x320 [cifs]
[  750.450592] [   T9870]  filp_flush+0x107/0x1a0
[  750.450952] [   T9870]  filp_close+0x14/0x30
[  750.451322] [   T9870]  put_files_struct.part.0+0x126/0x2a0
[  750.451678] [   T9870]  ? __pfx__raw_spin_lock+0x10/0x10
[  750.452033] [   T9870]  exit_files+0xab/0xe0
[  750.452401] [   T9870]  do_exit+0x148f/0x2980
[  750.452751] [   T9870]  ? __pfx_do_exit+0x10/0x10
[  750.453109] [   T9870]  ? __kasan_check_write+0x14/0x30
[  750.453459] [   T9870]  ? _raw_spin_lock_irq+0x8a/0xf0
[  750.453787] [   T9870]  do_group_exit+0xb5/0x250
[  750.454082] [   T9870]  get_signal+0x22d3/0x22e0
[  750.454406] [   T9870]  ? __pfx_get_signal+0x10/0x10
[  750.454709] [   T9870]  ? fpregs_assert_state_consistent+0x68/0x100
[  750.455031] [   T9870]  ? folio_add_lru+0xda/0x120
[  750.455347] [   T9870]  arch_do_signal_or_restart+0x92/0x630
[  750.455656] [   T9870]  ? __pfx_arch_do_signal_or_restart+0x10/0x10
[  750.455967] [   T9870]  exit_to_user_mode_loop+0x98/0x170
[  750.456282] [   T9870]  do_syscall_64+0x2cf/0xd80
[  750.456591] [   T9870]  ? __kasan_check_read+0x11/0x20
[  750.456897] [   T9870]  ? count_memcg_events+0x1b4/0x420
[  750.457280] [   T9870]  ? handle_mm_fault+0x148/0x690
[  750.457616] [   T9870]  ? _raw_spin_lock_irq+0x8a/0xf0
[  750.457925] [   T9870]  ? __kasan_check_read+0x11/0x20
[  750.458297] [   T9870]  ? fpregs_assert_state_consistent+0x68/0x100
[  750.458672] [   T9870]  ? irqentry_exit_to_user_mode+0x2e/0x250
[  750.459191] [   T9870]  ? irqentry_exit+0x43/0x50
[  750.459600] [   T9870]  ? exc_page_fault+0x75/0xe0
[  750.460130] [   T9870]  entry_SYSCALL_64_after_hwframe+0x76/0x7e
[  750.460570] [   T9870] RIP: 0033:0x7858c94ab6e2
[  750.461206] [   T9870] Code: Unable to access opcode bytes at 0x7858c94ab6b8.
[  750.461780] [   T9870] RSP: 002b:00007858c9248ce8 EFLAGS: 00000246 ORIG_RAX: 0000000000000022
[  750.462327] [   T9870] RAX: fffffffffffffdfe RBX: 00007858c92496c0 RCX: 00007858c94ab6e2
[  750.462653] [   T9870] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
[  750.462969] [   T9870] RBP: 00007858c9248d10 R08: 0000000000000000 R09: 0000000000000000
[  750.463290] [   T9870] R10: 0000000000000000 R11: 0000000000000246 R12: fffffffffffffde0
[  750.463640] [   T9870] R13: 0000000000000020 R14: 0000000000000002 R15: 00007ffc072d2230
[  750.463965] [   T9870]  </TASK>
[  750.464285] [   T9870] Modules linked in: siw ib_uverbs ccm cmac nls_utf8 cifs cifs_arc4 nls_ucs2_utils rdma_cm iw_cm ib_cm ib_core cifs_md4 netfs softdog vboxsf vboxguest cpuid intel_rapl_msr intel_rapl_common intel_uncore_frequency_common intel_pmc_core pmt_telemetry pmt_class intel_pmc_ssram_telemetry intel_vsec polyval_clmulni ghash_clmulni_intel sha1_ssse3 aesni_intel rapl i2c_piix4 i2c_smbus joydev input_leds mac_hid sunrpc binfmt_misc kvm_intel kvm irqbypass sch_fq_codel efi_pstore nfnetlink vsock_loopback vmw_vsock_virtio_transport_common vmw_vsock_vmci_transport vsock vmw_vmci dmi_sysfs ip_tables x_tables autofs4 hid_generic vboxvideo usbhid drm_vram_helper psmouse vga16fb vgastate drm_ttm_helper serio_raw hid ahci libahci ttm pata_acpi video wmi [last unloaded: vboxguest]
[  750.467127] [   T9870] CR2: ffff8880110a2000
cc Tom Talpey <[email protected]>
Fixes c45ebd636c32 ("cifs: Provide the capability to extract from ITER_FOLIOQ to RDMA SGEs")
---
 fs/smb/client/smbdirect.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/smb/client/smbdirect.c +3 -2
@@ -2552,13 +2552,14 @@ static ssize_t smb_extract_folioq_to_rdm
 		size_t fsize = folioq_folio_size(folioq, slot);
 
 		if (offset < fsize) {
-			size_t part = umin(maxsize - ret, fsize - offset);
+			size_t part = umin(maxsize, fsize - offset);
 
 			if (!smb_set_sge(rdma, folio_page(folio, 0), offset, part))
 				return -EIO;
 
 			offset += part;
 			ret += part;
+			maxsize -= part;
 		}
 
 		if (offset >= fsize) {
@@ -2573,7 +2574,7 @@ static ssize_t smb_extract_folioq_to_rdm
 				slot = 0;
 			}
 		}
-	} while (rdma->nr_sge < rdma->max_sge || maxsize > 0);
+	} while (rdma->nr_sge < rdma->max_sge && maxsize > 0);
 
 	iter->folioq = folioq;
 	iter->folioq_slot = slot;
author maintainer
#577 lore raw

PATCH 565/592 EDAC/igen6: Fix NULL pointer dereference

In reply to Greg Kroah-Hartman

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

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

From: Qiuxu Zhuo <[email protected]>

commit 88efa0de3285be66969b71ec137d9dab1ee19e52 upstream.

A kernel panic was reported with the following kernel log:

EDAC igen6: Expected 2 mcs, but only 1 detected.

  BUG: unable to handle page fault for address: 000000000000d570
  ...
  Hardware name: Notebook V54x_6x_TU/V54x_6x_TU, BIOS Dasharo (coreboot+UEFI) v0.9.0 07/17/2024
  RIP: e030:ecclog_handler+0x7e/0xf0 [igen6_edac]
  ...
  igen6_probe+0x2a0/0x343 [igen6_edac]
  ...
  igen6_init+0xc5/0xff0 [igen6_edac]
  ...

This issue occurred because one memory controller was disabled by the BIOS but the igen6_edac driver still checked all the memory controllers, including this absent one, to identify the source of the error. Accessing the null MMIO for the absent memory controller resulted in the oops above.

Fix this issue by reverting the configuration structure to non-const and updating the field 'res_cfg->num_imc' to reflect the number of detected memory controllers.

---
 drivers/edac/igen6_edac.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/edac/igen6_edac.c +13 -11
@@ -125,7 +125,7 @@
 #define MEM_SLICE_HASH_MASK(v)		(GET_BITFIELD(v, 6, 19) << 6)
 #define MEM_SLICE_HASH_LSB_MASK_BIT(v)	GET_BITFIELD(v, 24, 26)
 
-static const struct res_config {
+static struct res_config {
 	bool machine_check;
 	/* The number of present memory controllers. */
 	int num_imc;
@@ -473,7 +473,7 @@ static u64 rpl_p_err_addr(u64 ecclog)
 	return ECC_ERROR_LOG_ADDR45(ecclog);
 }
 
-static const struct res_config ehl_cfg = {
+static struct res_config ehl_cfg = {
 	.num_imc		= 1,
 	.imc_base		= 0x5000,
 	.ibecc_base		= 0xdc00,
@@ -483,7 +483,7 @@ static const struct res_config ehl_cfg =
 	.err_addr_to_imc_addr	= ehl_err_addr_to_imc_addr,
 };
 
-static const struct res_config icl_cfg = {
+static struct res_config icl_cfg = {
 	.num_imc		= 1,
 	.imc_base		= 0x5000,
 	.ibecc_base		= 0xd800,
@@ -493,7 +493,7 @@ static const struct res_config icl_cfg =
 	.err_addr_to_imc_addr	= ehl_err_addr_to_imc_addr,
 };
 
-static const struct res_config tgl_cfg = {
+static struct res_config tgl_cfg = {
 	.machine_check		= true,
 	.num_imc		= 2,
 	.imc_base		= 0x5000,
@@ -507,7 +507,7 @@ static const struct res_config tgl_cfg =
 	.err_addr_to_imc_addr	= tgl_err_addr_to_imc_addr,
 };
 
-static const struct res_config adl_cfg = {
+static struct res_config adl_cfg = {
 	.machine_check		= true,
 	.num_imc		= 2,
 	.imc_base		= 0xd800,
@@ -518,7 +518,7 @@ static const struct res_config adl_cfg =
 	.err_addr_to_imc_addr	= adl_err_addr_to_imc_addr,
 };
 
-static const struct res_config adl_n_cfg = {
+static struct res_config adl_n_cfg = {
 	.machine_check		= true,
 	.num_imc		= 1,
 	.imc_base		= 0xd800,
@@ -529,7 +529,7 @@ static const struct res_config adl_n_cfg
 	.err_addr_to_imc_addr	= adl_err_addr_to_imc_addr,
 };
 
-static const struct res_config rpl_p_cfg = {
+static struct res_config rpl_p_cfg = {
 	.machine_check		= true,
 	.num_imc		= 2,
 	.imc_base		= 0xd800,
@@ -541,7 +541,7 @@ static const struct res_config rpl_p_cfg
 	.err_addr_to_imc_addr	= adl_err_addr_to_imc_addr,
 };
 
-static const struct res_config mtl_ps_cfg = {
+static struct res_config mtl_ps_cfg = {
 	.machine_check		= true,
 	.num_imc		= 2,
 	.imc_base		= 0xd800,
@@ -552,7 +552,7 @@ static const struct res_config mtl_ps_cf
 	.err_addr_to_imc_addr	= adl_err_addr_to_imc_addr,
 };
 
-static const struct res_config mtl_p_cfg = {
+static struct res_config mtl_p_cfg = {
 	.machine_check		= true,
 	.num_imc		= 2,
 	.imc_base		= 0xd800,
@@ -563,7 +563,7 @@ static const struct res_config mtl_p_cfg
 	.err_addr_to_imc_addr	= adl_err_addr_to_imc_addr,
 };
 
-static const struct pci_device_id igen6_pci_tbl[] = {
+static struct pci_device_id igen6_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, DID_EHL_SKU5), (kernel_ulong_t)&ehl_cfg },
 	{ PCI_VDEVICE(INTEL, DID_EHL_SKU6), (kernel_ulong_t)&ehl_cfg },
 	{ PCI_VDEVICE(INTEL, DID_EHL_SKU7), (kernel_ulong_t)&ehl_cfg },
@@ -1342,9 +1342,11 @@ static int igen6_register_mcis(struct pc
 		return -ENODEV;
 	}
 
-	if (lmc < res_cfg->num_imc)
+	if (lmc < res_cfg->num_imc) {
 		igen6_printk(KERN_WARNING, "Expected %d mcs, but only %d detected.",
 			     res_cfg->num_imc, lmc);
+		res_cfg->num_imc = lmc;
+	}
 
 	return 0;
 
author maintainer
#578 lore raw

PATCH 566/592 x86/its: Fix an ifdef typo in its_alloc()

In reply to Greg Kroah-Hartman

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

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

From: Lukas Bulwahn <[email protected]>

commit 3c902383f2da91cba3821b73aa6edd49f4db6023 upstream.

Commit a82b26451de1 ("x86/its: explicitly manage permissions for ITS pages") reworks its_alloc() and introduces a typo in an ifdef conditional, referring to CONFIG_MODULE instead of CONFIG_MODULES.

Fix this typo in its_alloc().

---
 arch/x86/kernel/alternative.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/alternative.c +1 -1
@@ -250,7 +250,7 @@ static void *its_alloc(void)
 	struct its_array *pages = &its_pages;
 	void *page;
 
-#ifdef CONFIG_MODULE
+#ifdef CONFIG_MODULES
 	if (its_mod)
 		pages = &its_mod->arch.its_pages;
 #endif
author maintainer
#579 lore raw

PATCH 567/592 rust: devres: fix doctest build under `!CONFIG_PCI`

In reply to Greg Kroah-Hartman

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

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

From: Miguel Ojeda <[email protected]>

commit 42055939a3a4cac8afbebff85a29571c2bd3238c upstream.

The doctest requires CONFIG_PCI:

    error[E0432]: unresolved import `kernel::pci`
        --> rust/doctests_kernel_generated.rs:2689:44
         |
    2689 | use kernel::{device::Core, devres::Devres, pci};
         |                                            ^^^ no `pci` in the root
         |
    note: found an item that was configured out
        --> rust/kernel/lib.rs:96:9
    note: the item is gated here
        --> rust/kernel/lib.rs:95:1

Thus conditionally compile it (which still checks the syntax).

Fixes f301cb978c06 ("rust: devres: implement Devres::access()")
---
 rust/kernel/devres.rs |    1 +
 1 file changed, 1 insertion(+)
rust/kernel/devres.rs +1 -0
@@ -208,6 +208,7 @@ impl<T> Devres<T> {
     /// # Example
     ///
     /// ```no_run
+    /// # #![cfg(CONFIG_PCI)]
     /// # use kernel::{device::Core, devres::Devres, pci};
     ///
     /// fn from_core(dev: &pci::Device<Core>, devres: Devres<pci::Bar<0x4>>) -> Result {
author maintainer
#580 lore raw

PATCH 568/592 dm-table: check BLK_FEAT_ATOMIC_WRITES inside limits_lock

In reply to Greg Kroah-Hartman

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

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

From: Benjamin Marzinski <[email protected]>

commit 85f6d5b729eaace1549f1dcc284d9865f2c3ec02 upstream.

dm_set_device_limits() should check q->limits.features for BLK_FEAT_ATOMIC_WRITES while holding q->limits_lock, like it does for the rest of the queue limits.

Fixes b7c18b17a173 ("dm-table: Set BLK_FEAT_ATOMIC_WRITES for target queue limits")
---
 drivers/md/dm-table.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-table.c +1 -1
@@ -431,13 +431,13 @@ static int dm_set_device_limits(struct d
 		return 0;
 	}
 
+	mutex_lock(&q->limits_lock);
 	/*
 	 * BLK_FEAT_ATOMIC_WRITES is not inherited from the bottom device in
 	 * blk_stack_limits(), so do it manually.
 	 */
 	limits->features |= (q->limits.features & BLK_FEAT_ATOMIC_WRITES);
 
-	mutex_lock(&q->limits_lock);
 	if (blk_stack_limits(limits, &q->limits,
 			get_start_sect(bdev) + start) < 0)
 		DMWARN("%s: adding target device %pg caused an alignment inconsistency: "
author maintainer
#581 lore raw

PATCH 569/592 tracing: Do not free "head" on error path of filter_free_subsystem_filters()

In reply to Greg Kroah-Hartman

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

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

From: Steven Rostedt <[email protected]>

commit 8a157d8a00e815cab4432653cb50c9cedbbb4931 upstream.

The variable "head" is allocated and initialized as a list before allocating the first "item" for the list. If the allocation of "item" fails, it frees "head" and then jumps to the label "free_now" which will process head and free it.

This will cause a UAF of "head", and it doesn't need to free it before jumping to the "free_now" label as that code will free it.

Cc Masami Hiramatsu <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Fixes a9d0aab5eb33 ("tracing: Fix regression of filter waiting a long time on RCU synchronization")
---
 kernel/trace/trace_events_filter.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/trace/trace_events_filter.c +1 -3
@@ -1435,10 +1435,8 @@ static void filter_free_subsystem_filter
 	INIT_LIST_HEAD(&head->list);
 
 	item = kmalloc(sizeof(*item), GFP_KERNEL);
-	if (!item) {
-		kfree(head);
+	if (!item)
 		goto free_now;
-	}
 
 	item->filter = filter;
 	list_add_tail(&item->list, &head->list);
author maintainer
#582 lore raw

PATCH 570/592 Documentation: nouveau: Update GSP message queue kernel-doc reference

In reply to Greg Kroah-Hartman

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

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

From: Bagas Sanjaya <[email protected]>

commit 553ab30a181043f01b99a493ba13f9c011eb75ae upstream.

GSP message queue docs has been moved following RPC handling split in commit 8a8b1ec5261f20 ("drm/nouveau/gsp: split rpc handling out on its own"), before GSP-RM implementation is versioned in commit c472d828348caf ("drm/nouveau/gsp: move subdev/engine impls to subdev/gsp/rm/r535/"). However, the kernel-doc reference in nouveau docs is left behind, which triggers htmldocs warnings:

ERROR: Cannot find file ./drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
WARNING: No kernel-doc for file ./drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c

Update the reference.

Fixes c472d828348c ("drm/nouveau/gsp: move subdev/engine impls to subdev/gsp/rm/r535/")
Fixes 8a8b1ec5261f ("drm/nouveau/gsp: split rpc handling out on its own")
---
 Documentation/gpu/nouveau.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/gpu/nouveau.rst +1 -1
@@ -25,7 +25,7 @@ providing a consistent API to upper laye
 GSP Support
 ------------------------
 
-.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
+.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
    :doc: GSP message queue element
 
 .. kernel-doc:: drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
author maintainer
#583 lore raw

PATCH 571/592 perf: Fix sample vs do_exit()

In reply to Greg Kroah-Hartman

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

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

From: Peter Zijlstra <[email protected]>

[ Upstream commit 4f6fc782128355931527cefe3eb45338abd8ab39 ]

Baisheng Gao reported an ARM64 crash, which Mark decoded as being a synchronous external abort -- most likely due to trying to access MMIO in bad ways.

The crash further shows perf trying to do a user stack sample while in exit_mmap()'s tlb_finish_mmu() -- i.e. while tearing down the address space it is trying to access.

It turns out that we stop perf after we tear down the userspace mm; a receipie for disaster, since perf likes to access userspace for various reasons.

Flip this order by moving up where we stop perf in do_exit().

Additionally, harden PERF_SAMPLE_CALLCHAIN and PERF_SAMPLE_STACK_USER to abort when the current task does not have an mm (exit_mm() makes sure to set current->mm = NULL; before commencing with the actual teardown). Such that CPU wide events don't trip on this same problem.

Fixes c5ebcedb566e ("perf: Add ability to attach user stack dump to sample")
---
 kernel/events/core.c |  7 +++++++
 kernel/exit.c        | 17 +++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)
kernel/events/core.c +7 -0
index e97bc9220fd1a..ec77f641089a2 100644
@@ -7363,6 +7363,10 @@ perf_sample_ustack_size(u16 stack_size, u16 header_size,
 	if (!regs)
 		return 0;
 
+	/* No mm, no stack, no dump. */
+	if (!current->mm)
+		return 0;
+
 	/*
 	 * Check if we fit in with the requested stack size into the:
 	 * - TASK_SIZE
@@ -8074,6 +8078,9 @@ perf_callchain(struct perf_event *event, struct pt_regs *regs)
 	const u32 max_stack = event->attr.sample_max_stack;
 	struct perf_callchain_entry *callchain;
 
+	if (!current->mm)
+		user = false;
+
 	if (!kernel && !user)
 		return &__empty_callchain;
 
kernel/exit.c +9 -8
index 1b51dc099f1e0..771dd7b226c18 100644
@@ -937,6 +937,15 @@ void __noreturn do_exit(long code)
 	tsk->exit_code = code;
 	taskstats_exit(tsk, group_dead);
 
+	/*
+	 * Since sampling can touch ->mm, make sure to stop everything before we
+	 * tear it down.
+	 *
+	 * Also flushes inherited counters to the parent - before the parent
+	 * gets woken up by child-exit notifications.
+	 */
+	perf_event_exit_task(tsk);
+
 	exit_mm();
 
 	if (group_dead)
@@ -953,14 +962,6 @@ void __noreturn do_exit(long code)
 	exit_task_work(tsk);
 	exit_thread(tsk);
 
-	/*
-	 * Flush inherited counters to the parent - before the parent
-	 * gets woken up by child-exit notifications.
-	 *
-	 * because of cgroup mode, must be called before cgroup_exit()
-	 */
-	perf_event_exit_task(tsk);
-
 	sched_autogroup_exit_task(tsk);
 	cgroup_exit(tsk);
 
Signature · 1 line
2.39.5
author maintainer
#584 lore raw

PATCH 572/592 perf: Fix cgroup state vs ERROR

In reply to Greg Kroah-Hartman

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

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

From: Peter Zijlstra <[email protected]>

[ Upstream commit 61988e36dc5457cdff7ae7927e8d9ad1419ee998 ]

While chasing down a missing perf_cgroup_event_disable() elsewhere, Leo Yan found that both perf_put_aux_event() and perf_remove_sibling_event() were also missing one.

Specifically, the rule is that events that switch to OFF,ERROR need to call perf_cgroup_event_disable().

Unify the disable paths to ensure this.

Fixes ab43762ef010 ("perf: Allow normal events to output AUX data")
Fixes 9f0c4fa111dc ("perf/core: Add a new PERF_EV_CAP_SIBLING event capability")
---
 kernel/events/core.c | 51 ++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 21 deletions(-)
kernel/events/core.c +30 -21
index ec77f641089a2..d2b548ef075f4 100644
@@ -2145,8 +2145,9 @@ perf_aux_output_match(struct perf_event *event, struct perf_event *aux_event)
 }
 
 static void put_event(struct perf_event *event);
-static void event_sched_out(struct perf_event *event,
-			    struct perf_event_context *ctx);
+static void __event_disable(struct perf_event *event,
+			    struct perf_event_context *ctx,
+			    enum perf_event_state state);
 
 static void perf_put_aux_event(struct perf_event *event)
 {
@@ -2179,8 +2180,7 @@ static void perf_put_aux_event(struct perf_event *event)
 		 * state so that we don't try to schedule it again. Note
 		 * that perf_event_enable() will clear the ERROR status.
 		 */
-		event_sched_out(iter, ctx);
-		perf_event_set_state(event, PERF_EVENT_STATE_ERROR);
+		__event_disable(iter, ctx, PERF_EVENT_STATE_ERROR);
 	}
 }
 
@@ -2238,18 +2238,6 @@ static inline struct list_head *get_event_list(struct perf_event *event)
 				    &event->pmu_ctx->flexible_active;
 }
 
-/*
- * Events that have PERF_EV_CAP_SIBLING require being part of a group and
- * cannot exist on their own, schedule them out and move them into the ERROR
- * state. Also see _perf_event_enable(), it will not be able to recover
- * this ERROR state.
- */
-static inline void perf_remove_sibling_event(struct perf_event *event)
-{
-	event_sched_out(event, event->ctx);
-	perf_event_set_state(event, PERF_EVENT_STATE_ERROR);
-}
-
 static void perf_group_detach(struct perf_event *event)
 {
 	struct perf_event *leader = event->group_leader;
@@ -2285,8 +2273,15 @@ static void perf_group_detach(struct perf_event *event)
 	 */
 	list_for_each_entry_safe(sibling, tmp, &event->sibling_list, sibling_list) {
 
+		/*
+		 * Events that have PERF_EV_CAP_SIBLING require being part of
+		 * a group and cannot exist on their own, schedule them out
+		 * and move them into the ERROR state. Also see
+		 * _perf_event_enable(), it will not be able to recover this
+		 * ERROR state.
+		 */
 		if (sibling->event_caps & PERF_EV_CAP_SIBLING)
-			perf_remove_sibling_event(sibling);
+			__event_disable(sibling, ctx, PERF_EVENT_STATE_ERROR);
 
 		sibling->group_leader = sibling;
 		list_del_init(&sibling->sibling_list);
@@ -2545,6 +2540,15 @@ static void perf_remove_from_context(struct perf_event *event, unsigned long fla
 	event_function_call(event, __perf_remove_from_context, (void *)flags);
 }
 
+static void __event_disable(struct perf_event *event,
+			    struct perf_event_context *ctx,
+			    enum perf_event_state state)
+{
+	event_sched_out(event, ctx);
+	perf_cgroup_event_disable(event, ctx);
+	perf_event_set_state(event, state);
+}
+
 /*
  * Cross CPU call to disable a performance event
  */
@@ -2559,13 +2563,18 @@ static void __perf_event_disable(struct perf_event *event,
 	perf_pmu_disable(event->pmu_ctx->pmu);
 	ctx_time_update_event(ctx, event);
 
+	/*
+	 * When disabling a group leader, the whole group becomes ineligible
+	 * to run, so schedule out the full group.
+	 */
 	if (event == event->group_leader)
 		group_sched_out(event, ctx);
-	else
-		event_sched_out(event, ctx);
 
-	perf_event_set_state(event, PERF_EVENT_STATE_OFF);
-	perf_cgroup_event_disable(event, ctx);
+	/*
+	 * But only mark the leader OFF; the siblings will remain
+	 * INACTIVE.
+	 */
+	__event_disable(event, ctx, PERF_EVENT_STATE_OFF);
 
 	perf_pmu_enable(event->pmu_ctx->pmu);
 }
Signature · 1 line
2.39.5
author maintainer
#585 lore raw

PATCH 573/592 perf/core: Fix WARN in perf_cgroup_switch()

In reply to Greg Kroah-Hartman

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

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

From: Luo Gengkun <[email protected]>

[ Upstream commit 3172fb986666dfb71bf483b6d3539e1e587fa197 ]

There may be concurrency between perf_cgroup_switch and perf_cgroup_event_disable. Consider the following scenario: after a new perf cgroup event is created on CPU0, the new event may not trigger a reprogramming, causing ctx->is_active to be 0. In this case, when CPU1 disables this perf event, it executes __perf_remove_from_context-> list _del_event->perf_cgroup_event_disable on CPU1, which causes a race with perf_cgroup_switch running on CPU0.

The following describes the details of this concurrency scenario:

CPU0 CPU1

perf_cgroup_switch:
...
# cpuctx->cgrp is not NULL here
if (READ_ONCE(cpuctx->cgrp) == NULL)
return;

						perf_remove_from_context:
						   ...
						   raw_spin_lock_irq(&ctx->lock);
						   ...
						   # ctx->is_active == 0 because reprogramm is not
						   # tigger, so CPU1 can do __perf_remove_from_context
						   # for CPU0
						   __perf_remove_from_context:
						         perf_cgroup_event_disable:
							    ...
							    if (--ctx->nr_cgroups)
							    ...
   # this warning will happened because CPU1 changed
   # ctx.nr_cgroups to 0.
   WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0);
[peterz: use guard instead of goto unlock]
Fixes db4a835601b7 ("perf/core: Set cgroup in CPU contexts for new cgroup events")
---
 kernel/events/core.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
kernel/events/core.c +20 -2
index d2b548ef075f4..2d1131e2cfc02 100644
@@ -207,6 +207,19 @@ static void perf_ctx_unlock(struct perf_cpu_context *cpuctx,
 	__perf_ctx_unlock(&cpuctx->ctx);
 }
 
+typedef struct {
+	struct perf_cpu_context *cpuctx;
+	struct perf_event_context *ctx;
+} class_perf_ctx_lock_t;
+
+static inline void class_perf_ctx_lock_destructor(class_perf_ctx_lock_t *_T)
+{ perf_ctx_unlock(_T->cpuctx, _T->ctx); }
+
+static inline class_perf_ctx_lock_t
+class_perf_ctx_lock_constructor(struct perf_cpu_context *cpuctx,
+				struct perf_event_context *ctx)
+{ perf_ctx_lock(cpuctx, ctx); return (class_perf_ctx_lock_t){ cpuctx, ctx }; }
+
 #define TASK_TOMBSTONE ((void *)-1L)
 
 static bool is_kernel_event(struct perf_event *event)
@@ -944,7 +957,13 @@ static void perf_cgroup_switch(struct task_struct *task)
 	if (READ_ONCE(cpuctx->cgrp) == cgrp)
 		return;
 
-	perf_ctx_lock(cpuctx, cpuctx->task_ctx);
+	guard(perf_ctx_lock)(cpuctx, cpuctx->task_ctx);
+	/*
+	 * Re-check, could've raced vs perf_remove_from_context().
+	 */
+	if (READ_ONCE(cpuctx->cgrp) == NULL)
+		return;
+
 	perf_ctx_disable(&cpuctx->ctx, true);
 
 	ctx_sched_out(&cpuctx->ctx, NULL, EVENT_ALL|EVENT_CGROUP);
@@ -962,7 +981,6 @@ static void perf_cgroup_switch(struct task_struct *task)
 	ctx_sched_in(&cpuctx->ctx, NULL, EVENT_ALL|EVENT_CGROUP);
 
 	perf_ctx_enable(&cpuctx->ctx, true);
-	perf_ctx_unlock(cpuctx, cpuctx->task_ctx);
 }
 
 static int perf_cgroup_ensure_storage(struct perf_event *event,
Signature · 1 line
2.39.5
author maintainer
#586 lore raw

PATCH 574/592 arm64/ptrace: Fix stack-out-of-bounds read in regs_get_kernel_stack_nth()

In reply to Greg Kroah-Hartman

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

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

From: Tengda Wu <[email protected]>

[ Upstream commit 39dfc971e42d886e7df01371cd1bef505076d84c ]

KASAN reports a stack-out-of-bounds read in regs_get_kernel_stack_nth().

Call Trace:
[   97.283505] BUG: KASAN: stack-out-of-bounds in regs_get_kernel_stack_nth+0xa8/0xc8
[   97.284677] Read of size 8 at addr ffff800089277c10 by task 1.sh/2550
[   97.285732]
[   97.286067] CPU: 7 PID: 2550 Comm: 1.sh Not tainted 6.6.0+ #11
[   97.287032] Hardware name: linux,dummy-virt (DT)
[   97.287815] Call trace:
[   97.288279]  dump_backtrace+0xa0/0x128
[   97.288946]  show_stack+0x20/0x38
[   97.289551]  dump_stack_lvl+0x78/0xc8
[   97.290203]  print_address_description.constprop.0+0x84/0x3c8
[   97.291159]  print_report+0xb0/0x280
[   97.291792]  kasan_report+0x84/0xd0
[   97.292421]  __asan_load8+0x9c/0xc0
[   97.293042]  regs_get_kernel_stack_nth+0xa8/0xc8
[   97.293835]  process_fetch_insn+0x770/0xa30
[   97.294562]  kprobe_trace_func+0x254/0x3b0
[   97.295271]  kprobe_dispatcher+0x98/0xe0
[   97.295955]  kprobe_breakpoint_handler+0x1b0/0x210
[   97.296774]  call_break_hook+0xc4/0x100
[   97.297451]  brk_handler+0x24/0x78
[   97.298073]  do_debug_exception+0xac/0x178
[   97.298785]  el1_dbg+0x70/0x90
[   97.299344]  el1h_64_sync_handler+0xcc/0xe8
[   97.300066]  el1h_64_sync+0x78/0x80
[   97.300699]  kernel_clone+0x0/0x500
[   97.301331]  __arm64_sys_clone+0x70/0x90
[   97.302084]  invoke_syscall+0x68/0x198
[   97.302746]  el0_svc_common.constprop.0+0x11c/0x150
[   97.303569]  do_el0_svc+0x38/0x50
[   97.304164]  el0_svc+0x44/0x1d8
[   97.304749]  el0t_64_sync_handler+0x100/0x130
[   97.305500]  el0t_64_sync+0x188/0x190
[   97.306151]
[   97.306475] The buggy address belongs to stack of task 1.sh/2550
[   97.307461]  and is located at offset 0 in frame:
[   97.308257]  __se_sys_clone+0x0/0x138
[   97.308910]
[   97.309241] This frame has 1 object:
[   97.309873]  [48, 184) 'args'
[   97.309876]
[   97.310749] The buggy address belongs to the virtual mapping at
[   97.310749]  [ffff800089270000, ffff800089279000) created by:
[   97.310749]  dup_task_struct+0xc0/0x2e8
[   97.313347]
[   97.313674] The buggy address belongs to the physical page:
[   97.314604] page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x14f69a
[   97.315885] flags: 0x15ffffe00000000(node=1|zone=2|lastcpupid=0xfffff)
[   97.316957] raw: 015ffffe00000000 0000000000000000 dead000000000122 0000000000000000
[   97.318207] raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000
[   97.319445] page dumped because: kasan: bad access detected
[   97.320371]
[   97.320694] Memory state around the buggy address:
[   97.321511]  ffff800089277b00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[   97.322681]  ffff800089277b80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[   97.323846] >ffff800089277c00: 00 00 f1 f1 f1 f1 f1 f1 00 00 00 00 00 00 00 00
[   97.325023]                          ^
[   97.325683]  ffff800089277c80: 00 00 00 00 00 00 00 00 00 f3 f3 f3 f3 f3 f3 f3
[   97.326856]  ffff800089277d00: f3 f3 00 00 00 00 00 00 00 00 00 00 00 00 00 00

This issue seems to be related to the behavior of some gcc compilers and was also fixed on the s390 architecture before:

commit d93a855c31b7 ("s390/ptrace: Avoid KASAN false positives in regs_get_kernel_stack_nth()")

As described in that commit, regs_get_kernel_stack_nth() has confirmed that addr is on the stack, so reading the value at *addr should be allowed. Use READ_ONCE_NOCHECK() helper to silence the KASAN check for this case.

Fixes 0a8ea52c3eb1 ("arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature")
[will: Use '*addr' as the argument to READ_ONCE_NOCHECK()]
---
 arch/arm64/kernel/ptrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/ptrace.c +1 -1
index f79b0d5f71ac9..f8345c39c7054 100644
@@ -141,7 +141,7 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n)
 
 	addr += n;
 	if (regs_within_kernel_stack(regs, (unsigned long)addr))
-		return *addr;
+		return READ_ONCE_NOCHECK(*addr);
 	else
 		return 0;
 }
Signature · 1 line
2.39.5
author maintainer
#587 lore raw

PATCH 575/592 scsi: elx: efct: Fix memory leak in efct_hw_parse_filter()

In reply to Greg Kroah-Hartman

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

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

From: Vitaliy Shevtsov <[email protected]>

[ Upstream commit 2a8a5a5dd06eef580f9818567773fd75057cb875 ]

strsep() modifies the address of the pointer passed to it so that it no longer points to the original address. This means kfree() gets the wrong pointer.

Fix this by passing unmodified pointer returned from kstrdup() to kfree().

Found by Linux Verification Center (linuxtesting.org) with Svace.

Fixes 4df84e846624 ("scsi: elx: efct: Driver initialization routines")
---
 drivers/scsi/elx/efct/efct_hw.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/elx/efct/efct_hw.c +3 -2
index 5a5525054d71c..5b079b8b7a082 100644
@@ -1120,7 +1120,7 @@ int
 efct_hw_parse_filter(struct efct_hw *hw, void *value)
 {
 	int rc = 0;
-	char *p = NULL;
+	char *p = NULL, *pp = NULL;
 	char *token;
 	u32 idx = 0;
 
@@ -1132,6 +1132,7 @@ efct_hw_parse_filter(struct efct_hw *hw, void *value)
 		efc_log_err(hw->os, "p is NULL\n");
 		return -ENOMEM;
 	}
+	pp = p;
 
 	idx = 0;
 	while ((token = strsep(&p, ",")) && *token) {
@@ -1144,7 +1145,7 @@ efct_hw_parse_filter(struct efct_hw *hw, void *value)
 		if (idx == ARRAY_SIZE(hw->config.filter_def))
 			break;
 	}
-	kfree(p);
+	kfree(pp);
 
 	return rc;
 }
Signature · 1 line
2.39.5
author maintainer
#588 lore raw

PATCH 576/592 RISC-V: KVM: Fix the size parameter check in SBI SFENCE calls

In reply to Greg Kroah-Hartman

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

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

From: Anup Patel <[email protected]>

[ Upstream commit 6aba0cb5bba6141158d5449f2cf53187b7f755f9 ]

As-per the SBI specification, an SBI remote fence operation applies to the entire address space if either:
1) start_addr and size are both 0
2) size is equal to 2^XLEN-1

Quoted 1 line

From the above, only #1 is checked by SBI SFENCE calls so fix the

size parameter check in SBI SFENCE calls to cover #2 as well.

Fixes 13acfec2dbcc ("RISC-V: KVM: Add remote HFENCE functions based on VCPU requests")
---
 arch/riscv/kvm/vcpu_sbi_replace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_sbi_replace.c +2 -2
index 5fbf3f94f1e85..9752d2ffff683 100644
@@ -103,7 +103,7 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *run
 		kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_FENCE_I_SENT);
 		break;
 	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA:
-		if (cp->a2 == 0 && cp->a3 == 0)
+		if ((cp->a2 == 0 && cp->a3 == 0) || cp->a3 == -1UL)
 			kvm_riscv_hfence_vvma_all(vcpu->kvm, hbase, hmask);
 		else
 			kvm_riscv_hfence_vvma_gva(vcpu->kvm, hbase, hmask,
@@ -111,7 +111,7 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *run
 		kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_HFENCE_VVMA_SENT);
 		break;
 	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID:
-		if (cp->a2 == 0 && cp->a3 == 0)
+		if ((cp->a2 == 0 && cp->a3 == 0) || cp->a3 == -1UL)
 			kvm_riscv_hfence_vvma_asid_all(vcpu->kvm,
 						       hbase, hmask, cp->a4);
 		else
Signature · 1 line
2.39.5
author maintainer
#589 lore raw

PATCH 577/592 RISC-V: KVM: Dont treat SBI HFENCE calls as NOPs

In reply to Greg Kroah-Hartman

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

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

From: Anup Patel <[email protected]>

[ Upstream commit 2e7be162996640bbe3b6da694cc064c511b8a5d9 ]

The SBI specification clearly states that SBI HFENCE calls should return SBI_ERR_NOT_SUPPORTED when one of the target hart doesn’t support hypervisor extension (aka nested virtualization in-case of KVM RISC-V).

Fixes c7fa3c48de86 ("RISC-V: KVM: Treat SBI HFENCE calls as NOPs")
---
 arch/riscv/kvm/vcpu_sbi_replace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_sbi_replace.c +2 -2
index 9752d2ffff683..b17fad091babd 100644
@@ -127,9 +127,9 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *run
 	case SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID:
 		/*
 		 * Until nested virtualization is implemented, the
-		 * SBI HFENCE calls should be treated as NOPs
+		 * SBI HFENCE calls should return not supported
+		 * hence fallthrough.
 		 */
-		break;
 	default:
 		retdata->err_val = SBI_ERR_NOT_SUPPORTED;
 	}
Signature · 1 line
2.39.5
author maintainer
#590 lore raw

PATCH 578/592 gpio: pca953x: fix wrong error probe return value

In reply to Greg Kroah-Hartman

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

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

From: Sascha Hauer <[email protected]>

[ Upstream commit 0a1db19f66c0960eb00e1f2ccd40708b6747f5b1 ]

The second argument to dev_err_probe() is the error value. Pass the return value of devm_request_threaded_irq() there instead of the irq number.

Fixes c47f7ff0fe61 ("gpio: pca953x: Utilise dev_err_probe() where it makes sense")
---
 drivers/gpio/gpio-pca953x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-pca953x.c +1 -1
index 13cc120cf11f1..02da81ff1c0f1 100644
@@ -952,7 +952,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base)
 					IRQF_ONESHOT | IRQF_SHARED, dev_name(dev),
 					chip);
 	if (ret)
-		return dev_err_probe(dev, client->irq, "failed to request irq\n");
+		return dev_err_probe(dev, ret, "failed to request irq\n");
 
 	return 0;
 }
Signature · 1 line
2.39.5
author maintainer
#591 lore raw

PATCH 579/592 perf evsel: Missed close() when probing hybrid core PMUs

In reply to Greg Kroah-Hartman

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

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

From: Ian Rogers <[email protected]>

[ Upstream commit ebec62bc7ec435b475722a5467d67c720a1ad79f ]

Add missing close() to avoid leaking perf events.

In past perfs this mattered little as the function was just used by 'perf list'.

As the function is now used to detect hybrid PMUs leaking the perf event is somewhat more painful.

Fixes b41f1cec91c37eee ("perf list: Skip unsupported events")
Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiapeng Chong <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Michael Petlan <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Tiezhu Yang <[email protected]>
---
 tools/perf/util/print-events.c | 1 +
 1 file changed, 1 insertion(+)
tools/perf/util/print-events.c +1 -0
index a786cbfb0ff56..83aaf7cda6359 100644
@@ -268,6 +268,7 @@ bool is_event_supported(u8 type, u64 config)
 			ret = evsel__open(evsel, NULL, tmap) >= 0;
 		}
 
+		evsel__close(evsel);
 		evsel__delete(evsel);
 	}
 
Signature · 1 line
2.39.5
author maintainer
#592 lore raw

PATCH 580/592 perf test: Directory file descriptor leak

In reply to Greg Kroah-Hartman

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

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

From: Ian Rogers <[email protected]>

[ Upstream commit 19f4422d485b2d0a935117a1a16015328f99be25 ]

Add missed close when iterating over the script directories.

Fixes f3295f5b067d3c26 ("perf tests: Use scandirat for shell script finding")
Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiapeng Chong <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Michael Petlan <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Tiezhu Yang <[email protected]>
---
 tools/perf/tests/tests-scripts.c | 1 +
 1 file changed, 1 insertion(+)
tools/perf/tests/tests-scripts.c +1 -0
index 1d5759d081417..3a2a8438f9af1 100644
@@ -260,6 +260,7 @@ static void append_scripts_in_dir(int dir_fd,
 			continue; /* Skip scripts that have a separate driver. */
 		fd = openat(dir_fd, ent->d_name, O_PATH);
 		append_scripts_in_dir(fd, result, result_sz);
+		close(fd);
 	}
 	for (i = 0; i < n_dirs; i++) /* Clean up */
 		zfree(&entlist[i]);
Signature · 1 line
2.39.5
author maintainer
#593 lore raw

PATCH 581/592 x86/mm: Fix early boot use of INVPLGB

In reply to Greg Kroah-Hartman

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

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

From: Rik van Riel <[email protected]>

[ Upstream commit cb6075bc62dc6a9cd7ab3572758685fdf78e3e20 ]

The INVLPGB instruction has limits on how many pages it can invalidate at once. That limit is enumerated in CPUID, read by the kernel, and stored in 'invpgb_count_max'. Ranged invalidation, like invlpgb_kernel_range_flush() break up their invalidations so that they do not exceed the limit.

However, early boot code currently attempts to do ranged invalidation before populating 'invlpgb_count_max'. There is a for loop which is basically:

	for (...; addr < end; addr += invlpgb_count_max*PAGE_SIZE)

If invlpgb_kernel_range_flush is called before the kernel has read the value of invlpgb_count_max from the hardware, the normally bounded loop can become an infinite loop if invlpgb_count_max is initialized to zero.

Fix that issue by initializing invlpgb_count_max to 1.

This way INVPLGB at early boot time will be a little bit slower than normal (with initialized invplgb_count_max), and not an instant hang at bootup time.

---
 arch/x86/kernel/cpu/amd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/amd.c +1 -1
index 4e06baab40bb3..a59d6d8fc71f9 100644
@@ -29,7 +29,7 @@
 
 #include "cpu.h"
 
-u16 invlpgb_count_max __ro_after_init;
+u16 invlpgb_count_max __ro_after_init = 1;
 
 static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)
 {
Signature · 1 line
2.39.5
author maintainer
#594 lore raw

PATCH 582/592 mtd: spinand: Use more specific naming for the (single) read from cache ops

In reply to Greg Kroah-Hartman

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

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

From: Miquel Raynal <[email protected]>

[ Upstream commit ea2087d4e66d0b927918cc9048576aca6a0446ad ]

SPI operations have been initially described through macros implicitly implying the use of a single SPI SDR bus. Macros for supporting dual and quad I/O transfers have been added on top, generally inspired by vendor naming, followed by DTR operations. Soon we might see octal and even octal DTR operations as well (including the opcode byte).

Let's clarify what the macro really mean by describing the expected bus topology in the (single) read from cache macro names.

Stable-dep-of: dba90f5a79c1 ("mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants")

---
 drivers/mtd/nand/spi/alliancememory.c |  4 ++--
 drivers/mtd/nand/spi/ato.c            |  4 ++--
 drivers/mtd/nand/spi/esmt.c           |  4 ++--
 drivers/mtd/nand/spi/foresee.c        |  4 ++--
 drivers/mtd/nand/spi/gigadevice.c     | 16 ++++++++--------
 drivers/mtd/nand/spi/macronix.c       |  4 ++--
 drivers/mtd/nand/spi/micron.c         |  8 ++++----
 drivers/mtd/nand/spi/paragon.c        |  4 ++--
 drivers/mtd/nand/spi/skyhigh.c        |  4 ++--
 drivers/mtd/nand/spi/toshiba.c        |  4 ++--
 drivers/mtd/nand/spi/winbond.c        | 10 +++++-----
 drivers/mtd/nand/spi/xtx.c            |  4 ++--
 include/linux/mtd/spinand.h           | 12 ++++++------
 13 files changed, 41 insertions(+), 41 deletions(-)
drivers/mtd/nand/spi/alliancememory.c +2 -2
index 6046c73f8424e..723c740308d26 100644
@@ -21,8 +21,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 			   SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/ato.c +2 -2
index bb5298911137f..9026a14aca07c 100644
@@ -15,8 +15,8 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/esmt.c +2 -2
index a164d821464d2..1cba83651afb7 100644
@@ -20,8 +20,8 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 			   SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-			   SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-			   SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+			   SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 			   SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/foresee.c +2 -2
index ecd5f6bffa334..8a9725ea29bac 100644
@@ -14,8 +14,8 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/gigadevice.c +8 -8
index d620bb02a20a0..cb03472682492 100644
@@ -28,32 +28,32 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(read_cache_variants_f,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP_3A(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP_3A(0, 0, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(0, 0, NULL, 0));
 
 static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/macronix.c +2 -2
index 1ef08ad850a2f..b885e62a57535 100644
@@ -30,8 +30,8 @@ struct macronix_priv {
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/micron.c +4 -4
index 691f8a2e0791d..daa396a7c39a2 100644
@@ -39,8 +39,8 @@ static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(x4_write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
@@ -54,8 +54,8 @@ static SPINAND_OP_VARIANTS(x4_update_cache_variants,
 static SPINAND_OP_VARIANTS(x4_read_cache_variants,
 			   SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-			   SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-			   SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+			   SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(x1_write_cache_variants,
 			   SPINAND_PROG_LOAD(true, 0, NULL, 0));
drivers/mtd/nand/spi/paragon.c +2 -2
index 6e7cc6995380c..ae3527d6d5fa3 100644
@@ -26,8 +26,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/skyhigh.c +2 -2
index 961df0d74984a..ffbedb8d92f65 100644
@@ -21,8 +21,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/toshiba.c +2 -2
index 2e2106b2705f0..398e391bf2d7d 100644
@@ -17,8 +17,8 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_x4_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/winbond.c +5 -5
index 8394a1b1fb0c1..1630c14f8ecd5 100644
@@ -32,17 +32,17 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X2_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0, 54 * HZ_PER_MHZ));
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0, 54 * HZ_PER_MHZ));
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
drivers/mtd/nand/spi/xtx.c +2 -2
index 3f539ca0de861..a0003f52ae8f5 100644
@@ -27,8 +27,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0));
+		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(write_cache_variants,
 		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
include/linux/mtd/spinand.h +6 -6
index 311f145eb4e84..dd30a7beb9c63 100644
@@ -62,32 +62,32 @@
 		   SPI_MEM_OP_NO_DUMMY,					\
 		   SPI_MEM_OP_NO_DATA)
 
-#define SPINAND_PAGE_READ_FROM_CACHE_OP(addr, ndummy, buf, len, ...) \
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(addr, ndummy, buf, len, ...) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x03, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 1),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 1),			\
 		   SPI_MEM_OP_MAX_FREQ(__VA_ARGS__ + 0))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(addr, ndummy, buf, len) \
-	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1),			\
+#define SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(addr, ndummy, buf, len) \
+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1),				\
 			 SPI_MEM_OP_ADDR(2, addr, 1),			\
 			 SPI_MEM_OP_DUMMY(ndummy, 1),			\
 			 SPI_MEM_OP_DATA_IN(len, buf, 1))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_OP_3A(addr, ndummy, buf, len) \
+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x03, 1),				\
 		   SPI_MEM_OP_ADDR(3, addr, 1),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 1))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_FAST_OP_3A(addr, ndummy, buf, len) \
+#define SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1),				\
 		   SPI_MEM_OP_ADDR(3, addr, 1),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 1))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_DTR_OP(addr, ndummy, buf, len, freq) \
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(addr, ndummy, buf, len, freq) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0d, 1),				\
 		   SPI_MEM_DTR_OP_ADDR(2, addr, 1),			\
 		   SPI_MEM_DTR_OP_DUMMY(ndummy, 1),			\
Signature · 1 line
2.39.5
author maintainer
#595 lore raw

PATCH 583/592 mtd: spinand: Use more specific naming for the (dual output) read from cache ops

In reply to Greg Kroah-Hartman

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

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

From: Miquel Raynal <[email protected]>

[ Upstream commit 684f7105e8534f6500de389c089ba204cb1c8058 ]

SPI operations have been initially described through macros implicitly implying the use of a single SPI SDR bus. Macros for supporting dual and quad I/O transfers have been added on top, generally inspired by vendor naming, followed by DTR operations. Soon we might see octal and even octal DTR operations as well (including the opcode byte).

Let's clarify what the macro really mean by describing the expected bus topology in the (dual output) read from cache macro names.

Stable-dep-of: dba90f5a79c1 ("mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants")

---
 drivers/mtd/nand/spi/alliancememory.c | 2 +-
 drivers/mtd/nand/spi/esmt.c           | 2 +-
 drivers/mtd/nand/spi/foresee.c        | 2 +-
 drivers/mtd/nand/spi/gigadevice.c     | 8 ++++----
 drivers/mtd/nand/spi/macronix.c       | 2 +-
 drivers/mtd/nand/spi/micron.c         | 4 ++--
 drivers/mtd/nand/spi/paragon.c        | 2 +-
 drivers/mtd/nand/spi/skyhigh.c        | 2 +-
 drivers/mtd/nand/spi/toshiba.c        | 2 +-
 drivers/mtd/nand/spi/winbond.c        | 6 +++---
 drivers/mtd/nand/spi/xtx.c            | 2 +-
 include/linux/mtd/spinand.h           | 6 +++---
 12 files changed, 20 insertions(+), 20 deletions(-)
drivers/mtd/nand/spi/alliancememory.c +1 -1
index 723c740308d26..9709774dcf30b 100644
@@ -20,7 +20,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/esmt.c +1 -1
index 1cba83651afb7..f8e8c23949cb0 100644
@@ -19,7 +19,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 			   SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-			   SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/foresee.c +1 -1
index 8a9725ea29bac..729dfde429210 100644
@@ -13,7 +13,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/gigadevice.c +4 -4
index cb03472682492..ad8502b84544c 100644
@@ -27,7 +27,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
@@ -35,7 +35,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_f,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(0, 0, NULL, 0));
 
@@ -43,7 +43,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
@@ -51,7 +51,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/macronix.c +1 -1
index b885e62a57535..c2ec42f2c53cf 100644
@@ -29,7 +29,7 @@ struct macronix_priv {
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/micron.c +2 -2
index daa396a7c39a2..d62344e1dbee6 100644
@@ -38,7 +38,7 @@ static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
@@ -53,7 +53,7 @@ static SPINAND_OP_VARIANTS(x4_update_cache_variants,
 /* Micron  MT29F2G01AAAED Device */
 static SPINAND_OP_VARIANTS(x4_read_cache_variants,
 			   SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-			   SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/paragon.c +1 -1
index ae3527d6d5fa3..b4daee6c9b2f4 100644
@@ -25,7 +25,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/skyhigh.c +1 -1
index ffbedb8d92f65..e03343f0c404a 100644
@@ -20,7 +20,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/toshiba.c +1 -1
index 398e391bf2d7d..e8a0452b573f8 100644
@@ -16,7 +16,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/winbond.c +3 -3
index 1630c14f8ecd5..2a8fd9427424b 100644
@@ -29,9 +29,9 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_DTR_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0, 54 * HZ_PER_MHZ));
@@ -40,7 +40,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/xtx.c +1 -1
index a0003f52ae8f5..08dc4a3efbb02 100644
@@ -26,7 +26,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
include/linux/mtd/spinand.h +3 -3
index dd30a7beb9c63..c4ac12b77a3b8 100644
@@ -94,19 +94,19 @@
 		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 1),			\
 		   SPI_MEM_OP_MAX_FREQ(freq))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_X2_OP(addr, ndummy, buf, len)	\
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3b, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 1),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 2))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(addr, ndummy, buf, len)	\
+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_2S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3b, 1),				\
 		   SPI_MEM_OP_ADDR(3, addr, 1),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 2))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_X2_DTR_OP(addr, ndummy, buf, len, freq) \
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(addr, ndummy, buf, len, freq) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3d, 1),				\
 		   SPI_MEM_DTR_OP_ADDR(2, addr, 1),			\
 		   SPI_MEM_DTR_OP_DUMMY(ndummy, 1),			\
Signature · 1 line
2.39.5
author maintainer
#596 lore raw

PATCH 584/592 mtd: spinand: Use more specific naming for the (dual IO) read from cache ops

In reply to Greg Kroah-Hartman

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

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

From: Miquel Raynal <[email protected]>

[ Upstream commit d9de177996d74c0cc44220003953ba2d2bece0ac ]

SPI operations have been initially described through macros implicitly implying the use of a single SPI SDR bus. Macros for supporting dual and quad I/O transfers have been added on top, generally inspired by vendor naming, followed by DTR operations. Soon we might see octal and even octal DTR operations as well (including the opcode byte).

Let's clarify what the macro really mean by describing the expected bus topology in the (dual IO) read from cache macro names. While at modifying them, better reordering the macros to group them all by bus topology which now feels more intuitive.

Stable-dep-of: dba90f5a79c1 ("mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants")

---
 drivers/mtd/nand/spi/alliancememory.c |  2 +-
 drivers/mtd/nand/spi/gigadevice.c     |  8 +++---
 drivers/mtd/nand/spi/micron.c         |  2 +-
 drivers/mtd/nand/spi/paragon.c        |  2 +-
 drivers/mtd/nand/spi/skyhigh.c        |  2 +-
 drivers/mtd/nand/spi/winbond.c        |  6 ++---
 drivers/mtd/nand/spi/xtx.c            |  2 +-
 include/linux/mtd/spinand.h           | 38 +++++++++++++--------------
 8 files changed, 31 insertions(+), 31 deletions(-)
drivers/mtd/nand/spi/alliancememory.c +1 -1
index 9709774dcf30b..c83e83d85d5b2 100644
@@ -19,7 +19,7 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/gigadevice.c +4 -4
index ad8502b84544c..e389a47e8812d 100644
@@ -26,7 +26,7 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
@@ -34,7 +34,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 static SPINAND_OP_VARIANTS(read_cache_variants_f,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(0, 0, NULL, 0));
@@ -42,7 +42,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_f,
 static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
@@ -50,7 +50,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
 static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/micron.c +1 -1
index d62344e1dbee6..988cab77f11ad 100644
@@ -37,7 +37,7 @@
 static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/paragon.c +1 -1
index b4daee6c9b2f4..f3545b28124b3 100644
@@ -24,7 +24,7 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/skyhigh.c +1 -1
index e03343f0c404a..2f414815a035e 100644
@@ -19,7 +19,7 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/winbond.c +3 -3
index 2a8fd9427424b..09fa63cf79985 100644
@@ -28,9 +28,9 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_X4_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_DTR_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
@@ -39,7 +39,7 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/xtx.c +1 -1
index 08dc4a3efbb02..d4c7cbd4c9851 100644
@@ -25,7 +25,7 @@
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
include/linux/mtd/spinand.h +19 -19
index c4ac12b77a3b8..78c966aeb3c11 100644
@@ -113,6 +113,25 @@
 		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 2),			\
 		   SPI_MEM_OP_MAX_FREQ(freq))
 
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(addr, ndummy, buf, len) \
+	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\
+		   SPI_MEM_OP_ADDR(2, addr, 2),				\
+		   SPI_MEM_OP_DUMMY(ndummy, 2),				\
+		   SPI_MEM_OP_DATA_IN(len, buf, 2))
+
+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_2S_2S_OP(addr, ndummy, buf, len) \
+	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\
+		   SPI_MEM_OP_ADDR(3, addr, 2),				\
+		   SPI_MEM_OP_DUMMY(ndummy, 2),				\
+		   SPI_MEM_OP_DATA_IN(len, buf, 2))
+
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(addr, ndummy, buf, len, freq) \
+	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbd, 1),				\
+		   SPI_MEM_DTR_OP_ADDR(2, addr, 2),			\
+		   SPI_MEM_DTR_OP_DUMMY(ndummy, 2),			\
+		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 2),			\
+		   SPI_MEM_OP_MAX_FREQ(freq))
+
 #define SPINAND_PAGE_READ_FROM_CACHE_X4_OP(addr, ndummy, buf, len)	\
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 1),				\
@@ -132,25 +151,6 @@
 		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 4),			\
 		   SPI_MEM_OP_MAX_FREQ(freq))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(addr, ndummy, buf, len)	\
-	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\
-		   SPI_MEM_OP_ADDR(2, addr, 2),				\
-		   SPI_MEM_OP_DUMMY(ndummy, 2),				\
-		   SPI_MEM_OP_DATA_IN(len, buf, 2))
-
-#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP_3A(addr, ndummy, buf, len) \
-	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\
-		   SPI_MEM_OP_ADDR(3, addr, 2),				\
-		   SPI_MEM_OP_DUMMY(ndummy, 2),				\
-		   SPI_MEM_OP_DATA_IN(len, buf, 2))
-
-#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_DTR_OP(addr, ndummy, buf, len, freq) \
-	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbd, 1),				\
-		   SPI_MEM_DTR_OP_ADDR(2, addr, 2),			\
-		   SPI_MEM_DTR_OP_DUMMY(ndummy, 2),			\
-		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 2),			\
-		   SPI_MEM_OP_MAX_FREQ(freq))
-
 #define SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(addr, ndummy, buf, len)	\
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 4),				\
Signature · 1 line
2.39.5
author maintainer
#597 lore raw

PATCH 585/592 mtd: spinand: Use more specific naming for the (quad output) read from cache ops

In reply to Greg Kroah-Hartman

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

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

From: Miquel Raynal <[email protected]>

[ Upstream commit 1deae734cc1c7e976d588e7d8f46af2bb9ef5656 ]

SPI operations have been initially described through macros implicitly implying the use of a single SPI SDR bus. Macros for supporting dual and quad I/O transfers have been added on top, generally inspired by vendor naming, followed by DTR operations. Soon we might see octal and even octal DTR operations as well (including the opcode byte).

Let's clarify what the macro really mean by describing the expected bus topology in the (quad output) read from cache macro names.

Stable-dep-of: dba90f5a79c1 ("mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants")

---
 drivers/mtd/nand/spi/alliancememory.c | 2 +-
 drivers/mtd/nand/spi/ato.c            | 2 +-
 drivers/mtd/nand/spi/esmt.c           | 2 +-
 drivers/mtd/nand/spi/foresee.c        | 2 +-
 drivers/mtd/nand/spi/gigadevice.c     | 8 ++++----
 drivers/mtd/nand/spi/macronix.c       | 2 +-
 drivers/mtd/nand/spi/micron.c         | 4 ++--
 drivers/mtd/nand/spi/paragon.c        | 2 +-
 drivers/mtd/nand/spi/skyhigh.c        | 2 +-
 drivers/mtd/nand/spi/toshiba.c        | 2 +-
 drivers/mtd/nand/spi/winbond.c        | 6 +++---
 drivers/mtd/nand/spi/xtx.c            | 2 +-
 include/linux/mtd/spinand.h           | 6 +++---
 13 files changed, 21 insertions(+), 21 deletions(-)
drivers/mtd/nand/spi/alliancememory.c +1 -1
index c83e83d85d5b2..66df707c8370b 100644
@@ -18,7 +18,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/ato.c +1 -1
index 9026a14aca07c..88dc51308e1b8 100644
@@ -14,7 +14,7 @@
 
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
drivers/mtd/nand/spi/esmt.c +1 -1
index f8e8c23949cb0..cda718e385a22 100644
@@ -18,7 +18,7 @@
 	(CFG_OTP_ENABLE | ESMT_F50L1G41LB_CFG_OTP_PROTECT)
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-			   SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/foresee.c +1 -1
index 729dfde429210..21ad44032286f 100644
@@ -12,7 +12,7 @@
 #define SPINAND_MFR_FORESEE		0xCD
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/gigadevice.c +4 -4
index e389a47e8812d..22c13a727f0f4 100644
@@ -25,7 +25,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
@@ -33,7 +33,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 
 static SPINAND_OP_VARIANTS(read_cache_variants_f,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(0, 1, NULL, 0),
@@ -41,7 +41,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_f,
 
 static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
@@ -49,7 +49,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
 
 static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/macronix.c +1 -1
index c2ec42f2c53cf..208db1a215104 100644
@@ -28,7 +28,7 @@ struct macronix_priv {
 };
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/micron.c +2 -2
index 988cab77f11ad..aec09df353eb4 100644
@@ -36,7 +36,7 @@
 
 static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
@@ -52,7 +52,7 @@ static SPINAND_OP_VARIANTS(x4_update_cache_variants,
 
 /* Micron  MT29F2G01AAAED Device */
 static SPINAND_OP_VARIANTS(x4_read_cache_variants,
-			   SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 			   SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/paragon.c +1 -1
index f3545b28124b3..dc84e70bb1323 100644
@@ -23,7 +23,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/skyhigh.c +1 -1
index 2f414815a035e..c179a067db809 100644
@@ -18,7 +18,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/toshiba.c +1 -1
index e8a0452b573f8..f3f2c0ed1d0ca 100644
@@ -15,7 +15,7 @@
 #define TOSH_STATUS_ECC_HAS_BITFLIPS_T	(3 << 4)
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
drivers/mtd/nand/spi/winbond.c +3 -3
index 09fa63cf79985..fbe819c972b68 100644
@@ -25,9 +25,9 @@
 
 static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_DTR_OP(0, 8, NULL, 0, 80 * HZ_PER_MHZ),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_4D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
@@ -38,7 +38,7 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/xtx.c +1 -1
index d4c7cbd4c9851..4e38b2e0ca732 100644
@@ -24,7 +24,7 @@
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
-		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
include/linux/mtd/spinand.h +3 -3
index 78c966aeb3c11..e02454f2f7c9e 100644
@@ -132,19 +132,19 @@
 		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 2),			\
 		   SPI_MEM_OP_MAX_FREQ(freq))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_X4_OP(addr, ndummy, buf, len)	\
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 1),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 4))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(addr, ndummy, buf, len)	\
+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_4S_OP(addr, ndummy, buf, len)	\
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1),				\
 		   SPI_MEM_OP_ADDR(3, addr, 1),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 4))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_X4_DTR_OP(addr, ndummy, buf, len, freq) \
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_4D_OP(addr, ndummy, buf, len, freq) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6d, 1),				\
 		   SPI_MEM_DTR_OP_ADDR(2, addr, 1),			\
 		   SPI_MEM_DTR_OP_DUMMY(ndummy, 1),			\
Signature · 1 line
2.39.5
author maintainer
#598 lore raw

PATCH 586/592 mtd: spinand: Use more specific naming for the (quad IO) read from cache ops

In reply to Greg Kroah-Hartman

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

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

From: Miquel Raynal <[email protected]>

[ Upstream commit 9c6911072c6e8b128ccdb7dd00efa13c47513074 ]

SPI operations have been initially described through macros implicitly implying the use of a single SPI SDR bus. Macros for supporting dual and quad I/O transfers have been added on top, generally inspired by vendor naming, followed by DTR operations. Soon we might see octal and even octal DTR operations as well (including the opcode byte).

Let's clarify what the macro really mean by describing the expected bus topology in the (quad IO) read from cache macro names.

Stable-dep-of: dba90f5a79c1 ("mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants")

---
 drivers/mtd/nand/spi/alliancememory.c | 2 +-
 drivers/mtd/nand/spi/gigadevice.c     | 8 ++++----
 drivers/mtd/nand/spi/micron.c         | 2 +-
 drivers/mtd/nand/spi/paragon.c        | 2 +-
 drivers/mtd/nand/spi/skyhigh.c        | 2 +-
 drivers/mtd/nand/spi/winbond.c        | 6 +++---
 drivers/mtd/nand/spi/xtx.c            | 2 +-
 include/linux/mtd/spinand.h           | 6 +++---
 8 files changed, 15 insertions(+), 15 deletions(-)
drivers/mtd/nand/spi/alliancememory.c +1 -1
index 66df707c8370b..0f9522009843b 100644
@@ -17,7 +17,7 @@
 #define AM_STATUS_ECC_MAX_CORRECTED	(3 << 4)
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/gigadevice.c +4 -4
index 22c13a727f0f4..3ce79ae1bac4e 100644
@@ -24,7 +24,7 @@
 #define GD5FXGQ4UXFXXG_STATUS_ECC_UNCOR_ERROR	(7 << 4)
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
@@ -32,7 +32,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(read_cache_variants_f,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_2S_OP(0, 1, NULL, 0),
@@ -40,7 +40,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_f,
 		SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(0, 0, NULL, 0));
 
 static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
@@ -48,7 +48,7 @@ static SPINAND_OP_VARIANTS(read_cache_variants_1gq5,
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0));
 
 static SPINAND_OP_VARIANTS(read_cache_variants_2gq5,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 4, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/micron.c +1 -1
index aec09df353eb4..f92c28b8d5571 100644
@@ -35,7 +35,7 @@
 	(CFG_OTP_ENABLE | MICRON_MT29F2G01ABAGD_CFG_OTP_STATE)
 
 static SPINAND_OP_VARIANTS(quadio_read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/paragon.c +1 -1
index dc84e70bb1323..b5ea248618036 100644
@@ -22,7 +22,7 @@
 
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/skyhigh.c +1 -1
index c179a067db809..ac73f43e9365c 100644
@@ -17,7 +17,7 @@
 #define SKYHIGH_CONFIG_PROTECT_EN		BIT(1)
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 4, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/winbond.c +3 -3
index fbe819c972b68..b2297699ff4fa 100644
@@ -24,9 +24,9 @@
  */
 
 static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_DTR_OP(0, 8, NULL, 0, 80 * HZ_PER_MHZ),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4D_4D_OP(0, 8, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_4D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
@@ -37,7 +37,7 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0, 54 * HZ_PER_MHZ));
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 2, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
drivers/mtd/nand/spi/xtx.c +1 -1
index 4e38b2e0ca732..abbbcd594c2c1 100644
@@ -23,7 +23,7 @@
 #define XT26XXXD_STATUS_ECC_UNCOR_ERROR     (2)
 
 static SPINAND_OP_VARIANTS(read_cache_variants,
-		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
include/linux/mtd/spinand.h +3 -3
index e02454f2f7c9e..392ea3ef73605 100644
@@ -151,19 +151,19 @@
 		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 4),			\
 		   SPI_MEM_OP_MAX_FREQ(freq))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(addr, ndummy, buf, len)	\
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 4),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 4),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 4))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP_3A(addr, ndummy, buf, len) \
+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_4S_4S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1),				\
 		   SPI_MEM_OP_ADDR(3, addr, 4),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 4),				\
 		   SPI_MEM_OP_DATA_IN(len, buf, 4))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_QUADIO_DTR_OP(addr, ndummy, buf, len, freq) \
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_4D_4D_OP(addr, ndummy, buf, len, freq) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xed, 1),				\
 		   SPI_MEM_DTR_OP_ADDR(2, addr, 4),			\
 		   SPI_MEM_DTR_OP_DUMMY(ndummy, 4),			\
Signature · 1 line
2.39.5
author maintainer
#599 lore raw

PATCH 587/592 mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants

In reply to Greg Kroah-Hartman

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

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

From: Miquel Raynal <[email protected]>

[ Upstream commit dba90f5a79c13936de4273a19e67908a0c296afe ]

Dual and quad capable chips natively support dual and quad I/O variants at up to 104MHz (1-2-2 and 1-4-4 operations). Reaching the maximum speed of 166MHz is theoretically possible (while still unsupported in the field) by adding a few more dummy cycles. Let's be accurate and clearly state this limit.

Setting a maximum frequency implies adding the frequency parameter to the macro, which is done using a variadic argument to avoid impacting all the other drivers which already make use of this macro.

Fixes 1ea808b4d15b ("mtd: spinand: winbond: Update the *JW chip definitions")
---
 drivers/mtd/nand/spi/winbond.c |  4 ++--
 include/linux/mtd/spinand.h    | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/mtd/nand/spi/winbond.c +2 -2
index b2297699ff4fa..397c90b745e3a 100644
@@ -26,11 +26,11 @@
 static SPINAND_OP_VARIANTS(read_cache_dtr_variants,
 		SPINAND_PAGE_READ_FROM_CACHE_1S_4D_4D_OP(0, 8, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_4D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
-		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 2, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 2, NULL, 0, 104 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(0, 4, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
-		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0),
+		SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0, 104 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0),
 		SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ),
 		SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0),
include/linux/mtd/spinand.h +6 -4
index 392ea3ef73605..aba653207c0f7 100644
@@ -113,11 +113,12 @@
 		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 2),			\
 		   SPI_MEM_OP_MAX_FREQ(freq))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(addr, ndummy, buf, len) \
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(addr, ndummy, buf, len, ...) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 2),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 2),				\
-		   SPI_MEM_OP_DATA_IN(len, buf, 2))
+		   SPI_MEM_OP_DATA_IN(len, buf, 2),			\
+		   SPI_MEM_OP_MAX_FREQ(__VA_ARGS__ + 0))
 
 #define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_2S_2S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\
@@ -151,11 +152,12 @@
 		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 4),			\
 		   SPI_MEM_OP_MAX_FREQ(freq))
 
-#define SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(addr, ndummy, buf, len) \
+#define SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(addr, ndummy, buf, len, ...) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1),				\
 		   SPI_MEM_OP_ADDR(2, addr, 4),				\
 		   SPI_MEM_OP_DUMMY(ndummy, 4),				\
-		   SPI_MEM_OP_DATA_IN(len, buf, 4))
+		   SPI_MEM_OP_DATA_IN(len, buf, 4),			\
+		   SPI_MEM_OP_MAX_FREQ(__VA_ARGS__ + 0))
 
 #define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_4S_4S_OP(addr, ndummy, buf, len) \
 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1),				\
Signature · 1 line
2.39.5
author maintainer
#600 lore raw

PATCH 588/592 gpio: mlxbf3: only get IRQ for device instance 0

In reply to Greg Kroah-Hartman

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

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

From: David Thompson <[email protected]>

[ Upstream commit 10af0273a35ab4513ca1546644b8c853044da134 ]

The gpio-mlxbf3 driver interfaces with two GPIO controllers, device instance 0 and 1. There is a single IRQ resource shared between the two controllers, and it is found in the ACPI table for device instance 0. The driver should not attempt to get an IRQ resource when probing device instance 1, otherwise the following error is logged:
mlxbf3_gpio MLNXBF33:01: error -ENXIO: IRQ index 0 not found

---
 drivers/gpio/gpio-mlxbf3.c | 54 ++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 19 deletions(-)
drivers/gpio/gpio-mlxbf3.c +35 -19
index 10ea71273c891..9875e34bde72a 100644
@@ -190,7 +190,9 @@ static int mlxbf3_gpio_probe(struct platform_device *pdev)
 	struct mlxbf3_gpio_context *gs;
 	struct gpio_irq_chip *girq;
 	struct gpio_chip *gc;
+	char *colon_ptr;
 	int ret, irq;
+	long num;
 
 	gs = devm_kzalloc(dev, sizeof(*gs), GFP_KERNEL);
 	if (!gs)
@@ -227,25 +229,39 @@ static int mlxbf3_gpio_probe(struct platform_device *pdev)
 	gc->owner = THIS_MODULE;
 	gc->add_pin_ranges = mlxbf3_gpio_add_pin_ranges;
 
-	irq = platform_get_irq(pdev, 0);
-	if (irq >= 0) {
-		girq = &gs->gc.irq;
-		gpio_irq_chip_set_chip(girq, &gpio_mlxbf3_irqchip);
-		girq->default_type = IRQ_TYPE_NONE;
-		/* This will let us handle the parent IRQ in the driver */
-		girq->num_parents = 0;
-		girq->parents = NULL;
-		girq->parent_handler = NULL;
-		girq->handler = handle_bad_irq;
-
-		/*
-		 * Directly request the irq here instead of passing
-		 * a flow-handler because the irq is shared.
-		 */
-		ret = devm_request_irq(dev, irq, mlxbf3_gpio_irq_handler,
-				       IRQF_SHARED, dev_name(dev), gs);
-		if (ret)
-			return dev_err_probe(dev, ret, "failed to request IRQ");
+	colon_ptr = strchr(dev_name(dev), ':');
+	if (!colon_ptr) {
+		dev_err(dev, "invalid device name format\n");
+		return -EINVAL;
+	}
+
+	ret = kstrtol(++colon_ptr, 16, &num);
+	if (ret) {
+		dev_err(dev, "invalid device instance\n");
+		return ret;
+	}
+
+	if (!num) {
+		irq = platform_get_irq(pdev, 0);
+		if (irq >= 0) {
+			girq = &gs->gc.irq;
+			gpio_irq_chip_set_chip(girq, &gpio_mlxbf3_irqchip);
+			girq->default_type = IRQ_TYPE_NONE;
+			/* This will let us handle the parent IRQ in the driver */
+			girq->num_parents = 0;
+			girq->parents = NULL;
+			girq->parent_handler = NULL;
+			girq->handler = handle_bad_irq;
+
+			/*
+			 * Directly request the irq here instead of passing
+			 * a flow-handler because the irq is shared.
+			 */
+			ret = devm_request_irq(dev, irq, mlxbf3_gpio_irq_handler,
+					       IRQF_SHARED, dev_name(dev), gs);
+			if (ret)
+				return dev_err_probe(dev, ret, "failed to request IRQ");
+		}
 	}
 
 	platform_set_drvdata(pdev, gs);
Signature · 1 line
2.39.5
author maintainer
#601 lore raw

PATCH 589/592 PCI: pciehp: Ignore belated Presence Detect Changed caused by DPC

In reply to Greg Kroah-Hartman

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

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

From: Lukas Wunner <[email protected]>

[ Upstream commit bbf10cd686835d5a4b8566dc73a3b00b4cd7932a ]

Commit c3be50f7547c ("PCI: pciehp: Ignore Presence Detect Changed caused by DPC") sought to ignore Presence Detect Changed events occurring as a side effect of Downstream Port Containment.

The commit awaits recovery from DPC and then clears events which occurred in the meantime. However if the first event seen after DPC is Data Link Layer State Changed, only that event is cleared and not Presence Detect Changed. The object of the commit is thus defeated.

That's because pciehp_ist() computes the events to clear based on the local "events" variable instead of "ctrl->pending_events". The former contains the events that had occurred when pciehp_ist() was entered, whereas the latter also contains events that have accumulated while awaiting DPC recovery.

In practice, the order of PDC and DLLSC events is arbitrary and the delay in-between can be several milliseconds.

So change the logic to always clear PDC events, even if they come after an initial DLLSC event.

---
 drivers/pci/hotplug/pciehp_hpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/hotplug/pciehp_hpc.c +1 -1
index ebd342bda235d..91d2d92717d98 100644
@@ -771,7 +771,7 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
 		u16 ignored_events = PCI_EXP_SLTSTA_DLLSC;
 
 		if (!ctrl->inband_presence_disabled)
-			ignored_events |= events & PCI_EXP_SLTSTA_PDC;
+			ignored_events |= PCI_EXP_SLTSTA_PDC;
 
 		events &= ~ignored_events;
 		pciehp_ignore_link_change(ctrl, pdev, irq, ignored_events);
Signature · 1 line
2.39.5
author maintainer
#602 lore raw

PATCH 590/592 cifs: Remove duplicate fattr->cf_dtype assignment from wsl_to_fattr() function

In reply to Greg Kroah-Hartman

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

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

From: Pali Rohár <[email protected]>

[ Upstream commit 840738eae94864993a735ab677b9795bb8f3b961 ]

Commit 8bd25b61c5a5 ("smb: client: set correct d_type for reparse DFS/DFSR and mount point") deduplicated assignment of fattr->cf_dtype member from all places to end of the function cifs_reparse_point_to_fattr(). The only one missing place which was not deduplicated is wsl_to_fattr(). Fix it.

Fixes 8bd25b61c5a5 ("smb: client: set correct d_type for reparse DFS/DFSR and mount point")
---
 fs/smb/client/reparse.c | 1 -
 1 file changed, 1 deletion(-)
fs/smb/client/reparse.c +0 -1
index bb25e77c5540c..511611206dab4 100644
@@ -1172,7 +1172,6 @@ static bool wsl_to_fattr(struct cifs_open_info_data *data,
 	if (!have_xattr_dev && (tag == IO_REPARSE_TAG_LX_CHR || tag == IO_REPARSE_TAG_LX_BLK))
 		return false;
 
-	fattr->cf_dtype = S_DT(fattr->cf_mode);
 	return true;
 }
 
Signature · 1 line
2.39.5
author maintainer
#603 lore raw

PATCH 591/592 erofs: refuse crafted out-of-file-range encoded extents

In reply to Greg Kroah-Hartman

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

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

From: Gao Xiang <[email protected]>

[ Upstream commit 7869738b6908eec7755818aaf6f3aa068b2f0e1b ]

Crafted encoded extents could record out-of-range lstart, which should not happen in normal cases.

It caused an iomap_iter_done() complaint [1] reported by syzbot.

[1] https://lore.kernel.org/r/[email protected]

---
 fs/erofs/zmap.c | 4 ++++
 1 file changed, 4 insertions(+)
fs/erofs/zmap.c +4 -0
index 14ea47f954f55..6afcb054780d4 100644
@@ -597,6 +597,10 @@ static int z_erofs_map_blocks_ext(struct inode *inode,
 
 			if (la > map->m_la) {
 				r = mid;
+				if (la > lend) {
+					DBG_BUGON(1);
+					return -EFSCORRUPTED;
+				}
 				lend = la;
 			} else {
 				l = mid + 1;
Signature · 1 line
2.39.5
author maintainer
#604 lore raw

PATCH 592/592 erofs: remove a superfluous check for encoded extents

In reply to Greg Kroah-Hartman

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

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

From: Gao Xiang <[email protected]>

[ Upstream commit 417b8af2e30d7f131682a893ad79c506fd39c624 ]

It is possible when an inode is split into segments for multi-threaded compression, and the tail extent of a segment could also be small.

Fixes 1d191b4ca51d ("erofs: implement encoded extent metadata")
---
 fs/erofs/zmap.c | 6 ------
 1 file changed, 6 deletions(-)
fs/erofs/zmap.c +0 -6
index 6afcb054780d4..0bebc6e3a4d7d 100644
@@ -639,12 +639,6 @@ static int z_erofs_map_blocks_ext(struct inode *inode,
 		}
 	}
 	map->m_llen = lend - map->m_la;
-	if (!last && map->m_llen < sb->s_blocksize) {
-		erofs_err(sb, "extent too small %llu @ offset %llu of nid %llu",
-			  map->m_llen, map->m_la, vi->nid);
-		DBG_BUGON(1);
-		return -EFSCORRUPTED;
-	}
 	return 0;
 }
 
Signature · 1 line
2.39.5
Tested-by on the v1 series
#605 lore raw
In reply to Greg Kroah-Hartman
Quoted 9 lines · Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.15.4 release. There are 592 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, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.

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

Quoted 8 lines
	https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gz

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

thanks,

greg k-h

On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:

Signature · 1 line
Florian
Tested-by on the v1 series
#606 lore raw
In reply to Greg Kroah-Hartman
Quoted 9 lines · Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.15.4 release. There are 592 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, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.

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

Quoted 8 lines
	https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gz

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

thanks,

greg k-h

Built and booted successfully on RISC-V RV64 (HiFive Unmatched).

Tested-by on the v1 series
#607 lore raw
In reply to Greg Kroah-Hartman

AMD Ryzen 5 5600 6-Core Processor:
https://www.inet.se/produkt/5304697/amd-ryzen-5-5600-3-5-ghz-35mb on a
https://www.gigabyte.com/Motherboard/B550-AORUS-ELITE-V2-rev-12
https://www.inet.se/produkt/1903406/gigabyte-b550-aorus-elite-v2
motherboard :)

running Arch Linux with the testing repos enabled:
https://archlinux.org/ https://archboot.com/
https://wiki.archlinux.org/title/Arch_Testing_Team

Den mån 23 juni 2025 kl 21:31 skrev Greg Kroah-Hartman <[email protected]>:

Quoted 2,471 lines

This is the start of the stable review cycle for the 6.15.4 release. There are 592 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, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.

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

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

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

thanks,

greg k-h

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

Greg Kroah-Hartman <[email protected]>

    Linux 6.15.4-rc1

Gao Xiang <[email protected]>
erofs: remove a superfluous check for encoded extents

Gao Xiang <[email protected]>
erofs: refuse crafted out-of-file-range encoded extents

Pali Rohár <[email protected]>

    cifs: Remove duplicate fattr->cf_dtype assignment from wsl_to_fattr() function

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

David Thompson <[email protected]>
gpio: mlxbf3: only get IRQ for device instance 0

Miquel Raynal <[email protected]>
mtd: spinand: winbond: Prevent unsupported frequencies on dual/quad I/O variants

Miquel Raynal <[email protected]>
mtd: spinand: Use more specific naming for the (quad IO) read from cache ops

Miquel Raynal <[email protected]>
mtd: spinand: Use more specific naming for the (quad output) read from cache ops

Miquel Raynal <[email protected]>
mtd: spinand: Use more specific naming for the (dual IO) read from cache ops

Miquel Raynal <[email protected]>
mtd: spinand: Use more specific naming for the (dual output) read from cache ops

Miquel Raynal <[email protected]>
mtd: spinand: Use more specific naming for the (single) read from cache ops

Rik van Riel <[email protected]>
x86/mm: Fix early boot use of INVPLGB

Ian Rogers <[email protected]>
perf test: Directory file descriptor leak

Ian Rogers <[email protected]>
perf evsel: Missed close() when probing hybrid core PMUs

Sascha Hauer <[email protected]>
gpio: pca953x: fix wrong error probe return value

Anup Patel <[email protected]>
RISC-V: KVM: Don't treat SBI HFENCE calls as NOPs

Anup Patel <[email protected]>
RISC-V: KVM: Fix the size parameter check in SBI SFENCE calls

Vitaliy Shevtsov <[email protected]>
scsi: elx: efct: Fix memory leak in efct_hw_parse_filter()

Tengda Wu <[email protected]>
arm64/ptrace: Fix stack-out-of-bounds read in regs_get_kernel_stack_nth()

Luo Gengkun <[email protected]>
perf/core: Fix WARN in perf_cgroup_switch()

Peter Zijlstra <[email protected]>
perf: Fix cgroup state vs ERROR

Peter Zijlstra <[email protected]>
perf: Fix sample vs do_exit()

Bagas Sanjaya <[email protected]>
Documentation: nouveau: Update GSP message queue kernel-doc reference

Steven Rostedt <[email protected]>
tracing: Do not free "head" on error path of filter_free_subsystem_filters()

Benjamin Marzinski <[email protected]>
dm-table: check BLK_FEAT_ATOMIC_WRITES inside limits_lock

Miguel Ojeda <[email protected]>
rust: devres: fix doctest build under !CONFIG_PCI

Lukas Bulwahn <[email protected]>
x86/its: Fix an ifdef typo in its_alloc()

Qiuxu Zhuo <[email protected]>
EDAC/igen6: Fix NULL pointer dereference

Stefan Metzmacher <[email protected]>
smb: client: fix max_sge overflow in smb_extract_folioq_to_rdma()

zhangjian <[email protected]>
smb: client: fix first command failure during re-negotiation

Alex Elder <[email protected]>
i2c: k1: check for transfer error

Paul Aurich <[email protected]>
smb: Log an error when close_all_cached_dirs fails

Kan Liang <[email protected]>
perf/x86/intel: Fix crash in icl_update_topdown_event()

Akhil R <[email protected]>
dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties

Avadhut Naik <[email protected]>
EDAC/amd64: Correct number of UMCs for family 19h models 70h-7fh

Dave Hansen <[email protected]>
x86/mm: Disable INVLPGB when PTI is enabled

Mark Rutland <[email protected]>
KVM: arm64: VHE: Synchronize restore of host debug registers

Jakub Kicinski <[email protected]>
tools: ynl: fix mixing ops and notifications on one socket

Donald Hunter <[email protected]>
tools: ynl: parse extack for sub-messages

Eric Dumazet <[email protected]>
net: atm: fix /proc/net/atm/lec handling

Eric Dumazet <[email protected]>
net: atm: add lec_mutex

David Thompson <[email protected]>
mlxbf_gige: return EPROBE_DEFER if PHY IRQ is not available

Kuniyuki Iwashima <[email protected]>
calipso: Fix null-ptr-deref in calipso_req_{set,del}attr().

Vinay Belgaumkar <[email protected]>

    drm/xe/bmg: Update Wa_16023588340

Ronnie Sahlberg <[email protected]>
ublk: santizize the arguments from userspace when adding a device

Alexey Kodanev <[email protected]>
net: lan743x: fix potential out-of-bounds write in lan743x_ptp_io_event_clock_get()

Jakub Kicinski <[email protected]>
eth: fbnic: avoid double free when failing to DMA-map FW msg

David Wei <[email protected]>
tcp: fix passive TFO socket having invalid NAPI ID

Haixia Qu <[email protected]>
tipc: fix null-ptr-deref when acquiring remote ip of ethernet bearer

Hariprasad Kelam <[email protected]>
Octeontx2-pf: Fix Backpresure configuration

Jesse.Zhang <[email protected]>
drm/amdkfd: move SDMA queue reset capability check to node_show

Penglei Jiang <[email protected]>
io_uring: fix potential page leak in io_sqe_buffer_register()

Neal Cardwell <[email protected]>
tcp: fix tcp_packet_delayed() for tcp_is_non_sack_preventing_reopen() behavior

Kuniyuki Iwashima <[email protected]>
atm: atmtcp: Free invalid length skb in atmtcp_c_send().

Kuniyuki Iwashima <[email protected]>
mpls: Use rcu_dereference_rtnl() in mpls_route_input_rcu().

Dmitry Antipov <[email protected]>
wifi: carl9170: do not ping device which has failed to load firmware

Vladimir Oltean <[email protected]>
ptp: allow reading of currently dialed frequency to succeed on free-running clocks

Vladimir Oltean <[email protected]>
ptp: fix breakage after ptp_vclock_in_use() rework

Pavan Chebbi <[email protected]>
bnxt_en: Update MRU and RSS table of RSS contexts on queue reset

Pavan Chebbi <[email protected]>
bnxt_en: Add a helper function to configure MRU and RSS

Kalesh AP <[email protected]>
bnxt_en: Fix double invocation of bnxt_ulp_stop()/bnxt_ulp_start()

Mina Almasry <[email protected]>
net: netmem: fix skb_ensure_writable with unreadable skbs

Meghana Malladi <[email protected]>
net: ti: icssg-prueth: Fix packet handling for XDP_TX

Namjae Jeon <[email protected]>
ksmbd: add free_transport ops in ksmbd connection

Chuyi Zhou <[email protected]>
workqueue: Initialize wq_isolated_cpumask in workqueue_init_early()

Vitaly Lifshits <[email protected]>
e1000e: set fixed clock frequency indication for Nahum 11 and Nahum 13

Grzegorz Nitka <[email protected]>
ice: fix eswitch code memory leak in reset scenario

Krishna Kumar <[email protected]>
net: ice: Perform accurate aRFS flow match

Jens Axboe <[email protected]>
io_uring/sqpoll: don't put task_struct on tctx setup failure

Justin Sanders <[email protected]>
aoe: clean device rq_list in aoedev_downdev()

Simon Horman <[email protected]>
pldmfw: Select CRC32 when PLDMFW is selected

Nuno Sá <[email protected]>
hwmon: (ltc4282) avoid repeated register write

Arnd Bergmann <[email protected]>
hwmon: (occ) fix unaligned accesses

Arnd Bergmann <[email protected]>
hwmon: (occ) Rework attribute registration for stack usage

Tzung-Bi Shih <[email protected]>
drm/i915/pmu: Fix build error with GCOV and AutoFDO enabled

Danilo Krummrich <[email protected]>
rust: devres: do not dereference to the internal Revocable

Danilo Krummrich <[email protected]>
rust: devres: implement Devres::access()

Danilo Krummrich <[email protected]>
rust: devres: fix race in Devres::drop()

Jacob Keller <[email protected]>
drm/nouveau/bl: increase buffer size to avoid truncate warning

Zhi Wang <[email protected]>
drm/nouveau: fix a use-after-free in r535_gsp_rpc_push()

Ben Skeggs <[email protected]>
drm/nouveau/gsp: split rpc handling out on its own

Brett Creeley <[email protected]>
ionic: Prevent driver/fw getting out of sync on devcmd(s)

John Keeping <[email protected]>

    drm/ssd130x: fix ssd132x_clear_screen() columns

Connor Abbott <[email protected]>
drm/msm/a7xx: Call CP_RESET_CONTEXT_STATE

Connor Abbott <[email protected]>
drm/msm: Fix CP_RESET_CONTEXT_STATE bitfield names

Krzysztof Kozlowski <[email protected]>
drm/msm/dsi/dsi_phy_10nm: Fix missing initial VCO rate

James A. MacInnes <[email protected]>
drm/msm/disp: Correct porch timing for SDM845

James A. MacInnes <[email protected]>
drm/msm/dp: Disable wide bus support for SDM845

Bharath SM <[email protected]>
smb: fix secondary channel creation issue with kerberos by populating hostname when adding channels

Maíra Canal <[email protected]>
drm/v3d: Avoid NULL pointer dereference in v3d_job_update_stats()

Maarten Lankhorst <[email protected]>
drm/xe/svm: Fix regression disallowing 64K SVM migration

Jens Axboe <[email protected]>
io_uring/net: always use current transfer count for buffer put

Jeff Layton <[email protected]>
sunrpc: handle SVC_GARBAGE during svc auth processing as auth error

Jeff Layton <[email protected]>
nfsd: use threads array as-is in netlink interface

Gao Xiang <[email protected]>
erofs: remove unused trace event erofs_destroy_inode

SeongJae Park <[email protected]>
mm/madvise: handle madvise_lock() failure during race unwinding

Aditya Garg <[email protected]>
drm/appletbdrm: Make appletbdrm depend on X86

Richard Fitzgerald <[email protected]>
ALSA: hda/realtek: Add quirk for Asus GU605C

Chris Chiu <[email protected]>
ALSA: hda/realtek: Fix built-in mic on ASUS VivoBook X513EA

Jonathan Lane <[email protected]>
ALSA: hda/realtek: enable headset mic on Latitude 5420 Rugged

Edip Hazuri <[email protected]>
ALSA: hda/realtek - Add mute LED support for HP Victus 16-s1xxx and HP Victus 15-fa1xxx

Takashi Iwai <[email protected]>
ALSA: hda/intel: Add Thinkpad E15 to PM deny list

wangdicheng <[email protected]>
ALSA: usb-audio: Rename ALSA kcontrol PCM and PCM1 for the KTMicro sound card

Dev Jain <[email protected]>
arm64: Restrict pagetable teardown to avoid false warning

Binbin Zhou <[email protected]>
gpio: loongson-64bit: Correct Loongson-7A2000 ACPI GPIO access mode

Zhi Wang <[email protected]>
drm/nouveau/nvkm: introduce new GSP reply policy NVKM_GSP_RPC_REPLY_POLL

Zhi Wang <[email protected]>
drm/nouveau/nvkm: factor out current GSP RPC command policies

Kuniyuki Iwashima <[email protected]>
atm: Revert atm_account_tx() if copy_from_iter_full() fails.

Tejun Heo <[email protected]>
sched_ext, sched/core: Don't call scx_group_set_weight() prematurely from sched_create_group()

Srinivas Pandruvada <[email protected]>
platform/x86/intel-uncore-freq: Fail module load when plat_info is NULL

Stephen Smalley <[email protected]>
selinux: fix selinux_xfrm_alloc_user() to set correct ctx_len

Kurt Borja <[email protected]>
Revert "platform/x86: alienware-wmi-wmax: Add G-Mode support to Alienware m16 R1"

Rong Zhang <[email protected]>
platform/x86: ideapad-laptop: use usleep_range() for EC polling

Steven Rostedt <[email protected]>
fgraph: Do not enable function_graph tracer when setting funcgraph-args

Namjae Jeon <[email protected]>
ksmbd: fix null pointer dereference in destroy_previous_session

Xin Li (Intel) <[email protected]>
selftests/x86: Add a test to detect infinite SIGTRAP handler loop

Kai Huang <[email protected]>
x86/virt/tdx: Avoid indirect calls to TDX assembly functions

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

Peter Zijlstra (Intel) <[email protected]>
x86/its: explicitly manage permissions for ITS pages

Mike Rapoport (Microsoft) <[email protected]>
x86/its: move its_pages array to struct mod_arch_specific

Mike Rapoport (Microsoft) <[email protected]>
x86/Kconfig: only enable ROX cache in execmem when STRICT_MODULE_RWX is set

Juergen Gross <[email protected]>
x86/mm/pat: don't collapse pages without PSE set

Lorenzo Stoakes <[email protected]>
mm/vma: reset VMA iterator on commit_merge() OOM failure

Marek Szyprowski <[email protected]>
udmabuf: use sgtable-based scatterlist wrappers

Ryan Roberts <[email protected]>
mm: close theoretical race where stale TLB entries could linger

Jakub Kicinski <[email protected]>
net: clear the dst when changing skb protocol

Eric Dumazet <[email protected]>
net_sched: sch_sfq: reject invalid perturb period

Jens Axboe <[email protected]>
nvme: always punt polled uring_cmd end_io work to task_work

Peter Oberparleiter <[email protected]>
scsi: s390: zfcp: Ensure synchronous unit_add

Dexuan Cui <[email protected]>
scsi: storvsc: Increase the timeouts to storvsc_timeout

Bharath SM <[email protected]>
smb: improve directory cache reuse for readdir operations

Steven Rostedt <[email protected]>
tracing: Fix regression of filter waiting a long time on RCU synchronization

Shyam Prasad N <[email protected]>
cifs: do not disable interface polling on failure

Shyam Prasad N <[email protected]>
cifs: serialize other channels when query server interfaces is pending

Shyam Prasad N <[email protected]>
cifs: deal with the channel loading lag while picking channels

Fedor Pchelkin <[email protected]>
jffs2: check jffs2_prealloc_raw_node_refs() result in few other places

Artem Sadovnikov <[email protected]>
jffs2: check that raw node were preallocated before writing summary

Jaroslav Kysela <[email protected]>
firmware: cs_dsp: Fix OOB memory read access in KUnit test (wmfw info)

Jaroslav Kysela <[email protected]>
firmware: cs_dsp: Fix OOB memory read access in KUnit test (ctl cache)

Tianyang Zhang <[email protected]>
LoongArch: Fix panic caused by NULL-PMD in huge_pte_offset()

Huacai Chen <[email protected]>
LoongArch: Avoid using $r0/$r1 as "mask" for csrxchg

Thomas Weißschuh <[email protected]>
LoongArch: vDSO: Correctly use asm parameters in syscall wrappers

Yao Zi <[email protected]>
platform/loongarch: laptop: Add backlight power control support

Yao Zi <[email protected]>
platform/loongarch: laptop: Unregister generic_sub_drivers on exit

Yao Zi <[email protected]>
platform/loongarch: laptop: Get brightness setting from EC on probe

Andrew Morton <[email protected]>
drivers/rapidio/rio_cm.c: prevent possible heap overwrite

Penglei Jiang <[email protected]>
io_uring: fix task leak issue in io_wq_create()

Jens Axboe <[email protected]>
io_uring/rsrc: validate buffer count with offset for cloning

Jens Axboe <[email protected]>
io_uring/kbuf: don't truncate end buffer for multiple buffer peeks

Luis Henriques <[email protected]>
fs: drop assert in file_seek_cur_needs_f_lock

Narayana Murty N <[email protected]>
powerpc/eeh: Fix missing PE bridge reconfiguration during VFIO EEH recovery

Christophe Leroy <[email protected]>
powerpc/vdso: Fix build of VDSO32 with pcrel

Amir Goldstein <[email protected]>
ovl: fix debug print in case of mkdir error

Stuart Hayes <[email protected]>
platform/x86: dell_rbu: Stop overwriting data buffer

Stuart Hayes <[email protected]>
platform/x86: dell_rbu: Fix list usage

Mario Limonciello <[email protected]>
platform/x86/amd: pmf: Prevent amd_pmf_tee_deinit() from running twice

Mario Limonciello <[email protected]>
platform/x86/amd: pmf: Use device managed allocations

Mario Limonciello <[email protected]>
platform/x86/amd: pmc: Clear metrics table at start of cycle

Stephen Smalley <[email protected]>
fs/xattr.c: fix simple_xattr_list()

Alexander Sverdlin <[email protected]>
Revert "bus: ti-sysc: Probe for l4_wkup and l4_cfg interconnect devices first"

Jann Horn <[email protected]>
tee: Prevent size calculation wraparound on 32-bit kernels

Sukrut Bellary <[email protected]>
ARM: OMAP2+: Fix l4ls clk domain handling in STANDBY

Laurentiu Tudor <[email protected]>
bus: fsl-mc: increase MC_CMD_COMPLETION_TIMEOUT_MS value

Jarkko Nikula <[email protected]>
i3c: mipi-i3c-hci: Fix handling status of i3c_hci_irq_handler()

Krzysztof Kozlowski <[email protected]>
watchdog: stm32: Fix wakeup source leaks on device unbind

Marcus Folkesson <[email protected]>
watchdog: da9052_wdt: respect TWDMIN

Kees Cook <[email protected]>
wifi: iwlwifi: mld: Work around Clang loop unrolling bug

Kees Cook <[email protected]>
fbcon: Make sure modelist not set on unregistered console

Vlad Dogaru <[email protected]>
net/mlx5: HWS, Harden IP version definer checks

Suraj P Kizhakkethil <[email protected]>
wifi: ath12k: Pass correct values of center freq1 and center freq2 for 160 MHz

Balamurugan S <[email protected]>
wifi: ath12k: fix incorrect CE addresses

Hari Chandrakanthan <[email protected]>
wifi: ath12k: fix link valid field initialization in the monitor Rx

Baochen Qiang <[email protected]>
wifi: ath11k: determine PM policy based on machine model

Sidhanta Sahu <[email protected]>
wifi: ath12k: Fix memory leak due to multiple rx_stats allocation

Sriram R <[email protected]>
wifi: ath12k: Fix the enabling of REO queue lookup table feature

Pradeep Kumar Chitrapu <[email protected]>
wifi: ath12k: Fix incorrect rates sent to firmware

Bitterblue Smith <[email protected]>
wifi: rtw88: Set AMPDU factor to hardware for RTL8814A

Wentao Liang <[email protected]>
octeontx2-pf: Add error log forcn10k_map_unmap_rq_policer()

Linus Walleij <[email protected]>
net: ethernet: cortina: Use TOE/TSO on all TCP

Jiayuan Chen <[email protected]>
bpf, sockmap: Fix data lost during EAGAIN retries

Chao Yu <[email protected]>
f2fs: fix to set atomic write status more clear

Krzysztof Hałasa <[email protected]>
usbnet: asix AX88772: leave the carrier control to phylink

Mateusz Pacuszka <[email protected]>
ice: fix check for existing switch rule

Chen Linxuan <[email protected]>
RDMA/hns: initialize db in update_srq_db()

Rand Deeb <[email protected]>
ixgbe: Fix unreachable retry logic in combined and byte I2C write functions

Kyungwook Boo <[email protected]>
i40e: fix MMIO write access to an invalid page in i40e_clear_hw

Zijun Hu <[email protected]>
sock: Correct error checking condition for (assign|release)_proto_idx()

Daniel Wagner <[email protected]>
scsi: lpfc: Use memcpy() for BIOS version

Aditya Kumar Singh <[email protected]>
wifi: ath12k: fix failed to set mhi state error during reboot with hardware grouping

Mike Looijmans <[email protected]>
pinctrl: mcp23s08: Reset all pins to input at probe

Jonas 'Sortie' Termansen <[email protected]>
isofs: fix Y2038 and Y2156 issues in Rock Ridge TF entry

Baochen Qiang <[email protected]>
wifi: ath12k: make assoc link associate first

Zijun Hu <[email protected]>
software node: Correct a OOB check in software_node_get_reference_args()

Michael Walle <[email protected]>
net: ethernet: ti: am65-cpsw: handle -EPROBE_DEFER

Sarika Sharma <[email protected]>
wifi: ath12k: using msdu end descriptor to check for rx multicast packets

Sarika Sharma <[email protected]>
wifi: ath12k: correctly handle mcast packets for clients

Ido Schimmel <[email protected]>
vxlan: Add RCU read-side critical sections in the Tx path

Kalesh AP <[email protected]>
bnxt_en: Remove unused field "ref_count" in struct bnxt_ulp

Ido Schimmel <[email protected]>
vxlan: Do not treat dst cache initialization errors as fatal

Yong Wang <[email protected]>
net: bridge: mcast: re-implement br_multicast_{enable, disable}_port functions

Yong Wang <[email protected]>
net: bridge: mcast: update multicast contex when vlan state is changed

Víctor Gonzalo <[email protected]>
wifi: iwlwifi: Add missing MODULE_FIRMWARE for Qu-c0-jf-b0

Toke Høiland-Jørgensen <[email protected]>
Revert "mac80211: Dynamically set CoDel parameters per station"

Muna Sinada <[email protected]>
wifi: mac80211: VLAN traffic in multicast path

Shung-Hsi Yu <[email protected]>
bpf: Use proper type to calculate bpf_raw_tp_null_args.mask index

Vlad Dogaru <[email protected]>
net/mlx5: HWS, Fix IP version decision

Joe Damato <[email protected]>
netdevsim: Mark NAPI ID on skb in nsim_rcv

Edward Adam Davis <[email protected]>
wifi: mac80211_hwsim: Prevent tsf from setting if beacon is disabled

Kuan-Chung Chen <[email protected]>
wifi: rtw89: 8922a: fix TX fail with wrong VCO setting

Miri Korenblit <[email protected]>

    wifi: iwlwifi: pcie: make sure to lock rxq->read

Sean Christopherson <[email protected]>
iommu/amd: Ensure GA log notifier callbacks finish running before module unload

David Strahan <[email protected]>
scsi: smartpqi: Add new PCI IDs

Justin Tee <[email protected]>
scsi: lpfc: Fix lpfc_check_sli_ndlp() handling for GEN_REQUEST64 commands

Alan Maguire <[email protected]>
libbpf: Add identical pointer detection to btf_dedup_is_equiv()

Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_pipapo: clamp maximum map bucket size to INT_MAX

Steven Rostedt <[email protected]>
tracing: Only return an adjusted address if it matches the kernel address

Chao Yu <[email protected]>
f2fs: fix to bail out in get_new_segment()

Miri Korenblit <[email protected]>
wifi: iwlwifi: mld: check for NULL before referencing a pointer

Johannes Berg <[email protected]>
wifi: iwlwifi: dvm: pair transport op-mode enter/leave

Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: fix beacon CCK flag

Tiezhu Yang <[email protected]>
rtla: Define __NR_sched_setattr for LoongArch

Corey Minyard <[email protected]>
ipmi:ssif: Fix a shutdown race

Luke D. Jones <[email protected]>
hid-asus: check ROG Ally MCU version and warn

Heiko Stuebner <[email protected]>
clk: rockchip: rk3036: mark ddrphy as critical

Martin KaFai Lau <[email protected]>
bpftool: Fix cgroup command to only show cgroup bpf programs

Benjamin Berg <[email protected]>
wifi: mac80211: do not offer a mesh path if forwarding is disabled

Salah Triki <[email protected]>
wireless: purelifi: plfxlc: fix memory leak in plfxlc_usb_wreq_asyn()

Benjamin Berg <[email protected]>
wifi: iwlwifi: mld: call thermal exit without wiphy lock held

Yuuki NAGAO <[email protected]>

    wifi: rtw88: rtw8822bu VID/PID for BUFFALO WI-U2-866DM

Stefan Wahren <[email protected]>
net: vertexcom: mse102x: Return code for mse102x_rx_pkt_spi

Jason Xing <[email protected]>
net: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info

Yevgeny Kliteynik <[email protected]>
net/mlx5: HWS, fix counting of rules in the matcher

Gabor Juhos <[email protected]>
pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get()

Mykyta Yatsenko <[email protected]>
libbpf: Check bpf_map_skeleton link for NULL

Gabor Juhos <[email protected]>
pinctrl: armada-37xx: propagate error from armada_37xx_pmx_gpio_set_direction()

Jason Xing <[email protected]>
net: stmmac: generate software timestamp just before the doorbell

Ilya Leoshkevich <[email protected]>
bpf: Pass the same orig_call value to trampoline functions

Gabor Juhos <[email protected]>
pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get_direction()

Gabor Juhos <[email protected]>
pinctrl: armada-37xx: propagate error from armada_37xx_pmx_set_by_name()

Jason Xing <[email protected]>
net: atlantic: generate software timestamp just before the doorbell

Dimitri Fedrau <[email protected]>
net: phy: marvell-88q2xxx: Enable temperature measurement in probe again

Leon Romanovsky <[email protected]>
xfrm: validate assignment of maximal possible SEQ number

Sebastian Andrzej Siewior <[email protected]>
net: page_pool: Don't recycle into cache on PREEMPT_RT

Sebastian Andrzej Siewior <[email protected]>
ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT

Andrew Zaborowski <[email protected]>
x86/sgx: Prevent attempts to reclaim poisoned pages

Eric Dumazet <[email protected]>
tcp: add receive queue awareness in tcp_rcv_space_adjust()

Eric Dumazet <[email protected]>

    tcp: fix initial tp->rcvq_space.space value for passive TS enabled flows

Eric Dumazet <[email protected]>
tcp: remove zero TCP TS samples for autotuning

Eric Dumazet <[email protected]>
tcp: always seek for minimal rtt in tcp_rcv_rtt_update()

Dian-Syuan Yang <[email protected]>
wifi: rtw89: leave idle mode when setting WEP encryption for AP mode

Mario Limonciello <[email protected]>
iommu/amd: Allow matching ACPI HID devices without matching UIDs

Muhammad Usama Anjum <[email protected]>
wifi: ath11k: Fix QMI memory reuse logic

Baochen Qiang <[email protected]>

    wifi: ath12k: fix a possible dead lock caused by ab->base_lock

Kang Yang <[email protected]>
wifi: ath12k: fix macro definition HAL_RX_MSDU_PKT_LENGTH_GET

Frank Wunderlich <[email protected]>
net: phy: mediatek: do not require syscon compatible for pio property

Moon Yeounsu <[email protected]>
net: dlink: add synchronization for stats update

Taniya Das <[email protected]>

    clk: qcom: gcc: Set FORCE_MEM_CORE_ON for gcc_ufs_axi_clk for 8650/8750

Taniya Das <[email protected]>
clk: qcom: gcc-x1e80100: Set FORCE MEM CORE for UFS clocks

Tali Perry <[email protected]>
i2c: npcm: Add clock toggle recovery

Hector Martin <[email protected]>
i2c: pasemi: Enable the unjam machine

Akhil R <[email protected]>
i2c: tegra: check msg length in SMBUS block read

Mike Tipton <[email protected]>
cpufreq: scmi: Skip SCMI devices that aren't used by the CPUs

Alan Maguire <[email protected]>
libbpf/btf: Fix string handling to support multi-split BTF

Petr Malat <[email protected]>
sctp: Do not wake readers in __sctp_write_space()

Aditya Kumar Singh <[email protected]>
wifi: mac80211: validate SCAN_FLAG_AP in scan request during MLO

Leon Yen <[email protected]>
wifi: mt76: mt7925: introduce thermal protection

Samuel Williams <[email protected]>

    wifi: mt76: mt7921: add 160 MHz AP for mt7922 device

Henk Vergonet <[email protected]>

    wifi: mt76: mt76x2: Add support for LiteOn WN4516R,WN4519R

sunliming <[email protected]>
wifi: mt76: mt7996: fix uninitialized symbol warning

Krzysztof Kozlowski <[email protected]>
Bluetooth: btmtksdio: Fix wakeup source leaks on device unbind

Krzysztof Kozlowski <[email protected]>
Bluetooth: btmrvl_sdio: Fix wakeup source leaks on device unbind

WangYuli <[email protected]>

    Bluetooth: btusb: Add RTL8851BE device 0x0bda:0xb850

Jiande Lu <[email protected]>

    Bluetooth: btusb: Add new VID/PID 13d3/3630 for MT7925

Alok Tiwari <[email protected]>
emulex/benet: correct command version selection in be_cmd_get_stats()

Benjamin Lin <[email protected]>
wifi: mt76: mt7996: drop fragments with multicast or broadcast RA

Tan En De <[email protected]>
i2c: designware: Invoke runtime suspend on quick slave re-registration

Liwei Sun <[email protected]>

    Bluetooth: btusb: Add new VID/PID 13d3/3584 for MT7922

Hou Tao <[email protected]>
bpf: Check rcu_read_lock_trace_held() in bpf_map_lookup_percpu_elem()

Chao Yu <[email protected]>
f2fs: use vmalloc instead of kvmalloc in .init_{,de}compress_ctx

Zilin Guan <[email protected]>
tipc: use kfree_sensitive() for aead cleanup

Rengarajan S <[email protected]>
net: lan743x: Modify the EEPROM and OTP size for PCI1xxxx devices

Sergio Perez Gonzalez <[email protected]>
net: macb: Check return value of dma_set_mask_and_coherent()

Antonin Godard <[email protected]>
drm/panel: simple: Add POWERTIP PH128800T004-ZZA01 panel entry

Nas Chung <[email protected]>
media: qcom: venus: Fix uninitialized variable warning

Lucas De Marchi <[email protected]>
drm/xe/uc: Remove static from loop variable

Victor Skvortsov <[email protected]>
drm/amdgpu: Add indirect L1_TLB_CNTL reg programming for VFs

Andy Yan <[email protected]>
drm/rockchip: vop2: Make overlay layer select register configuration take effect by vsync

Niklas Söderlund <[email protected]>
media: rcar-vin: Fix stride setting for RAW8 formats

Simon Schuster <[email protected]>
nios2: force update_mmu_cache on spurious tlb-permission--related pagefaults

Shravan Chippa <[email protected]>

    media: i2c: imx334: update mode_3840x2160_regs array

Wentao Liang <[email protected]>
media: platform: exynos4-is: Add hardware sync wait to fimc_is_hw_change_mode()

Hans Verkuil <[email protected]>
media: tc358743: ignore video while HPD is low

Amber Lin <[email protected]>
drm/amdkfd: Set SDMA_RLCx_IB_CNTL/SWITCH_INSIDE_IB

Dmitry Baryshkov <[email protected]>
drm/msm/dpu: don't select single flush for active CTL blocks

Laurent Pinchart <[email protected]>
media: renesas: vsp1: Fix media bus code setup on RWPF source pad

Mario Limonciello <[email protected]>
drm/amd/display: Restructure DMI quirks

TungYu Lu <[email protected]>
drm/amd/display: Correct prefetch calculation

Lijo Lazar <[email protected]>
drm/amd/pm: Reset SMU v13.0.x custom settings

Dylan Wolff <[email protected]>
jfs: Fix null-ptr-deref in jfs_ioc_trim

Dillon Varone <[email protected]>
drm/amd/display: Fix VUpdate offset calculations for dcn401

Alex Deucher <[email protected]>
drm/amdgpu/gfx9: fix CSIB handling

Samson Tam <[email protected]>
drm/amd/display: disable EASF narrow filter sharpening

Alex Deucher <[email protected]>
drm/amdgpu/gfx8: fix CSIB handling

Zhang Yi <[email protected]>
ext4: prevent stale extent cache entries caused by concurrent get es_cache

Long Li <[email protected]>
sunrpc: fix race in cache cleanup causing stale nextcheck time

Lijo Lazar <[email protected]>
drm/amdgpu: Disallow partition query during reset

Arvind Yadav <[email protected]>
drm/amdgpu: fix MES GFX mask

Nicolas Dufresne <[email protected]>
media: rkvdec: Initialize the m2m context before the controls

Hans Verkuil <[email protected]>
media: cec: extron-da-hd-4k-plus: Fix Wformat-truncation

Dillon Varone <[email protected]>
drm/amd/display: Fix Vertical Interrupt definitions for dcn32, dcn401

Kevin Gao <[email protected]>
drm/amd/display: Correct SSC enable detection for DCN351

Ovidiu Bunea <[email protected]>
drm/amd/display: Update IPS sequential_ono requirement checks

Daniele Ceraolo Spurio <[email protected]>
drm/xe/vf: Fix guc_info debugfs for VFs

Tomi Valkeinen <[email protected]>
media: ti: cal: Fix wrong goto on error path

Aditya Dutt <[email protected]>
jfs: fix array-index-out-of-bounds read in add_missing_indices

Zhang Yi <[email protected]>
ext4: ext4: unify EXT4_EX_NOCACHE|NOFAIL flags in ext4_ext_remove_space()

Harish Chegondi <[email protected]>
drm/xe: Use copy_from_user() instead of __copy_from_user()

Alex Deucher <[email protected]>
drm/amdgpu/gfx7: fix CSIB handling

Qasim Ijaz <[email protected]>
drm/ttm/tests: fix incorrect assert in ttm_bo_unreserve_bulk()

Charlene Liu <[email protected]>
drm/amd/display: fix zero value for APU watermark_c

Nas Chung <[email protected]>
media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition

Sakari Ailus <[email protected]>
media: ccs-pll: Better validate VT PLL branch

Vicki Pfau <[email protected]>
drm: panel-orientation-quirks: Add ZOTAC Gaming Zone

Alex Deucher <[email protected]>
drm/amdgpu/gfx10: fix CSIB handling

Tarang Raval <[email protected]>
media: i2c: imx334: Fix runtime PM handling in remove function

Fangzhi Zuo <[email protected]>
drm/amd/display: Do Not Consider DSC if Valid Config Not Found

Akhil P Oommen <[email protected]>
drm/msm/a6xx: Increase HFI response timeout

Alexander Aring <[email protected]>
dlm: use SHUT_RDWR for SCTP shutdown

Lijo Lazar <[email protected]>
drm/amdgpu: Add basic validation for RAS header

Paul Hsieh <[email protected]>
drm/amd/display: Skip to enable dsc if it has been off

Nicolas Dufresne <[email protected]>
media: verisilicon: Enable wide 4K in AV1 decoder

Srinivasan Shanmugam <[email protected]>
drm/amd/display: Add NULL pointer checks in dm_force_atomic_commit()

Nas Chung <[email protected]>
media: uapi: v4l: Fix V4L2_TYPE_IS_OUTPUT condition

Dmitry Baryshkov <[email protected]>
drm/msm/hdmi: add runtime PM calls to DDC transfer function

Ben Skeggs <[email protected]>
drm/nouveau/gsp: fix rm shutdown wait condition

Mario Limonciello <[email protected]>
drm/amd/display: Avoid divide by zero by initializing dummy pitch to 1

Tarang Raval <[email protected]>
media: i2c: imx334: Enable runtime PM before sub-device registration

Christoph Rudorff <[email protected]>
drm/nouveau: fix hibernate on disabled GPU

Michael Chang <[email protected]>
media: nuvoton: npcm-video: Fix stuck due to no video signal error

Alex Deucher <[email protected]>
drm/amdgpu/gfx11: fix CSIB handling

Apurv Mishra <[email protected]>
drm/amdkfd: Drop workaround for GC v9.4.3 revID 0

Yuezhang Mo <[email protected]>
exfat: do not clear volume dirty flag during sync

Ayushi Makhija <[email protected]>
drm/bridge: anx7625: change the gpiod_set_value API

Boris Brezillon <[email protected]>
drm/panthor: Don't update MMU_INT_MASK in panthor_mmu_irq_handler()

Ayushi Makhija <[email protected]>
drm/bridge: anx7625: enable HPD interrupts

Namjae Jeon <[email protected]>
exfat: fix double free in delayed_free

Anusha Srivatsa <[email protected]>
drm/panel/sharp-ls043t1le01: Use _multi variants

Jiayuan Chen <[email protected]>

    workqueue: Fix race condition in wq->stats incrementation

Damon Ding <[email protected]>
drm/bridge: analogix_dp: Add irq flag IRQF_NO_AUTOEN instead of calling disable_irq()

Jeevaka Prabu Badrappan <[email protected]>
drm/xe: Fix CFI violation when accessing sysfs files

Yihan Zhu <[email protected]>
drm/amd/display: DCN32 null data check

Jesse.Zhang <[email protected]>
drm/amdgpu: Fix API status offset for MES queue reset

Long Li <[email protected]>
sunrpc: update nextcheck time when adding new cache entries

Dave Airlie <[email protected]>
drm/dp: add option to disable zero sized address only transactions.

Andy Yan <[email protected]>
drm/rockchip: inno-hdmi: Fix video timing HSYNC/VSYNC polarity setting for rk3036

Ming Qian <[email protected]>
media: imx-jpeg: Check decoding is ongoing for motion-jpeg

Alex Deucher <[email protected]>
drm/amdgpu/gfx6: fix CSIB handling

Dmitry Baryshkov <[email protected]>
drm/bridge: select DRM_KMS_HELPER for AUX_BRIDGE

Charlene Liu <[email protected]>
drm/amd/display: disable DPP RCG before DPP CLK enable

Peter Marheine <[email protected]>
ACPI: battery: negate current when discharging

Svyatoslav Ryhel <[email protected]>
power: supply: max17040: adjust thermal channel scaling

Charan Teja Kalla <[email protected]>
PM: runtime: fix denying of auto suspend in pm_suspend_timer_fn()

Peng Fan <[email protected]>
gpiolib: of: Add polarity quirk for s5m8767

Linus Torvalds <[email protected]>
Make 'cc-option' work correctly for the -Wno-xyzzy pattern

Yuanjun Gong <[email protected]>
ASoC: tegra210_ahub: Add check to of_device_get_match_data()

Frank Li <[email protected]>
platform-msi: Add msi_remove_device_irq_domain() in platform_device_msi_free_irqs_all()

gldrk <[email protected]>
ACPICA: utilities: Fix overflow check in vsnprintf()

Ulf Hansson <[email protected]>

    pmdomain: core: Reset genpd->states to avoid freeing invalid data

Kuninori Morimoto <[email protected]>

    ASoC: simple-card-utils: fixup dlc->xxx handling for error case

Jerry Lv <[email protected]>
power: supply: bq27xxx: Retrieve again when busy

Stefan Binding <[email protected]>
ALSA: hda: cs35l41: Fix swapped l/r audio channels for Acer Helios laptops

Tamir Duberstein <[email protected]>
ACPICA: Apply pack(1) to union aml_resource

Seunghun Han <[email protected]>
ACPICA: fix acpi parse and parseext cache leaks

Mario Limonciello <[email protected]>
ACPI: Add missing prototype for non CONFIG_SUSPEND/CONFIG_X86 case

Stefan Binding <[email protected]>
ALSA: hda/realtek: Add support for Acer Helios Laptops using CS35L41 HDA

Armin Wolf <[email protected]>
ACPI: bus: Bail out if acpi_kobj registration fails

I Hsin Cheng <[email protected]>
ASoC: intel/sdw_utils: Assign initial value in asoc_sdw_rt_amp_spk_rtd_init()

Hector Martin <[email protected]>
ASoC: tas2770: Power cycle amp on ISENSE/VSENSE change

Qiuxu Zhuo <[email protected]>
EDAC/igen6: Skip absent memory controllers

Luke Wang <[email protected]>
mmc: sdhci-esdhc-imx: Save tuning value when card stays powered in suspend

Ahmed Salem <[email protected]>
ACPICA: Avoid sequence overread in call to strncmp()

Erick Shepherd <[email protected]>
mmc: Add quirk to disable DDR50 tuning

Krzysztof Kozlowski <[email protected]>
power: supply: collie: Fix wakeup source leaks on device unbind

Krzysztof Kozlowski <[email protected]>
power: supply: gpio-charger: Fix wakeup source leaks on device unbind

Guilherme G. Piccoli <[email protected]>
clocksource: Fix the CPUs' choice in the watchdog per CPU verification

Talhah Peerbhai <[email protected]>
ASoC: amd: yc: Add quirk for Lenovo Yoga Pro 7 14ASP9

Seunghun Han <[email protected]>
ACPICA: fix acpi operand cache leak in dswstate.c

David Lechner <[email protected]>
iio: adc: ad7606: fix raw read for 18-bit chips

David Lechner <[email protected]>
iio: adc: ad7173: fix compiling without gpiolib

David Lechner <[email protected]>
iio: adc: ad7606_spi: fix reg write value mask

Arthur-Prince <[email protected]>
iio: adc: ti-ads1298: Kconfig: add kfifo dependency to fix module build

David Lechner <[email protected]>
iio: adc: ad7944: mask high bits on direct read

Sean Nyekjaer <[email protected]>
iio: imu: inv_icm42600: Fix temperature calculation

Jann Horn <[email protected]>
mm/hugetlb: fix huge_pmd_unshare() vs GUP-fast race

Jann Horn <[email protected]>
mm/hugetlb: unshare page tables during VMA split, not before

Pu Lehui <[email protected]>
mm: fix uprobe pte be overwritten when expanding vma

Thomas Zimmermann <[email protected]>
dummycon: Trigger redraw when switching consoles with deferred takeover

Jens Axboe <[email protected]>
io_uring/net: only consider msg_inq if larger than 1

Jacek Lawrynowicz <[email protected]>
accel/ivpu: Fix warning in ivpu_gem_bo_free()

Jacek Lawrynowicz <[email protected]>
accel/ivpu: Use dma_resv_lock() instead of a custom mutex

Karol Wachowski <[email protected]>
accel/ivpu: Trigger device recovery on engine reset/resume failure

Jacek Lawrynowicz <[email protected]>
accel/ivpu: Use firmware names from upstream repo

Jacek Lawrynowicz <[email protected]>
accel/ivpu: Improve buffer object logging

Sean Nyekjaer <[email protected]>
iio: accel: fxls8962af: Fix temperature calculation

Sean Nyekjaer <[email protected]>
iio: accel: fxls8962af: Fix temperature scan element sign

Saurabh Sengar <[email protected]>
hv_netvsc: fix potential deadlock in netvsc_vf_setxdp()

Diederik de Haas <[email protected]>
PCI: dw-rockchip: Fix PHY function call sequence in rockchip_pcie_phy_deinit()

Janne Grunau <[email protected]>
PCI: apple: Set only available ports up

Shawn Lin <[email protected]>
PCI: dw-rockchip: Remove PCIE_L0S_ENTRY check from rockchip_pcie_link_up()

Ilpo Järvinen <[email protected]>
PCI: Fix lock symmetry in pci_slot_unlock()

Huacai Chen <[email protected]>
PCI: Add ACS quirk for Loongson PCIe

Niklas Cassel <[email protected]>
PCI: dwc: ep: Correct PBA offset in .set_msix() callback

Niklas Cassel <[email protected]>
PCI: cadence-ep: Correct PBA offset in .set_msix() callback

Long Li <[email protected]>
uio_hv_generic: Align ring size to system page

Long Li <[email protected]>
uio_hv_generic: Use correct size for interrupt and monitor pages

Long Li <[email protected]>
Drivers: hv: Allocate interrupt and monitor pages aligned to system page boundary

Ruben Devos <[email protected]>
smb: client: add NULL check in automount_fullpath

Shyam Prasad N <[email protected]>
cifs: dns resolution is needed only for primary channel

Shyam Prasad N <[email protected]>
cifs: update dstaddr whenever channel iface is updated

Shyam Prasad N <[email protected]>
cifs: reset connections for all channels when reconnect requested

Beleswar Padhi <[email protected]>
remoteproc: k3-m4: Don't assert reset in detach routine

Xiaolei Wang <[email protected]>

    remoteproc: core: Release rproc->clean_table after rproc_attach() fails

Xiaolei Wang <[email protected]>
remoteproc: core: Cleanup acquired resources when rproc_handle_resources() fails in rproc_attach()

Wentao Liang <[email protected]>

    regulator: max14577: Add error check for max14577_read_reg()

André Almeida <[email protected]>
ovl: Fix nested backing file paths

Khem Raj <[email protected]>
mips: Add -std= flag specified in KBUILD_CFLAGS to vdso CFLAGS

Gabriel Shahrouzi <[email protected]>
staging: iio: ad5933: Correct settling cycles encoding per datasheet

David Lechner <[email protected]>
pwm: axi-pwmgen: fix missing separate external clock

Shin'ichiro Kawasaki <[email protected]>
nvme-tcp: remove tag set when second admin queue config fails

Thomas Zimmermann <[email protected]>
video: screen_info: Relocate framebuffers behind PCI bridges

Thomas Zimmermann <[email protected]>
sysfb: Fix screen_info type check for VGA

Lorenzo Stoakes <[email protected]>
KVM: s390: rename PROT_NONE to PROT_TYPE_DUMMY

Qasim Ijaz <[email protected]>
net: ch9200: fix uninitialised access during mii_nway_restart

Xu Yang <[email protected]>
phy: fsl-imx8mq-usb: fix phy_tx_vboost_level_from_property()

John Garry <[email protected]>
dm-table: Set BLK_FEAT_ATOMIC_WRITES for target queue limits

Mikulas Patocka <[email protected]>
dm: lock limits when reading them

Ye Bin <[email protected]>
ftrace: Fix UAF when lookup kallsym after ftrace disabled

Md Sadre Alam <[email protected]>
mtd: rawnand: qcom: Fix read len for onfi param page

Md Sadre Alam <[email protected]>
mtd: rawnand: qcom: Fix last codeword read in qcom_param_page_type_exec()

Md Sadre Alam <[email protected]>
mtd: rawnand: qcom: Pass 18 bit offset from NANDc base to BAM base

Mikulas Patocka <[email protected]>
dm-verity: fix a memory leak if some arguments are specified multiple times

Mikulas Patocka <[email protected]>
dm-mirror: fix a tiny race condition

Chao Gao <[email protected]>
KVM: VMX: Flush shadow VMCS on emergency reboot

Yosry Ahmed <[email protected]>
KVM: SVM: Clear current_vmcb during vCPU free for all *possible* CPUs

Wentao Liang <[email protected]>
mtd: nand: sunxi: Add randomizer configuration before randomizer enable

Wentao Liang <[email protected]>
mtd: rawnand: sunxi: Add randomizer configuration in sunxi_nfc_hw_ecc_write_chunk

Lu Baolu <[email protected]>
iommu: Allow attaching static domains in iommu_attach_device_pasid()

Sibi Sankar <[email protected]>
firmware: arm_scmi: Ensure that the message-id supports fastchannel

Kendall Willis <[email protected]>
firmware: ti_sci: Convert CPU latency constraint from us to ms

Dan Williams <[email protected]>
configfs-tsm-report: Fix NULL dereference of tsm_ops

Johan Hovold <[email protected]>
soc: qcom: pmic_glink_altmode: fix spurious DP hotplug events

Jinliang Zheng <[email protected]>
mm: fix ratelimit_pages update error in dirty_ratio_handler()

Shin'ichiro Kawasaki <[email protected]>
RDMA/iwcm: Fix use-after-free of work objects after cm_id destruction

Luo Gengkun <[email protected]>
watchdog: fix watchdog may detect false positive of softlockup

Jeongjun Park <[email protected]>
ipc: fix to protect IPCS lookups using RCU

Da Xue <[email protected]>
clk: meson-g12a: add missing fclk_div2 to spicc

Arnd Bergmann <[email protected]>
parisc: fix building with gcc-15

GONG Ruiqi <[email protected]>
vgacon: Add check for vc_origin address range in vgacon_scroll()

Helge Deller <[email protected]>
parisc/unaligned: Fix hex output to show 8 hex chars

Murad Masimov <[email protected]>
fbdev: Fix fb_set_var to prevent null-ptr-deref in fb_videomode_to_var

Niravkumar L Rabara <[email protected]>
EDAC/altera: Use correct write width with the INTTEST register

Murad Masimov <[email protected]>
fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var

Lu Baolu <[email protected]>
iommu/vt-d: Restore context entry setup order for aliased devices

Heiner Kallweit <[email protected]>
net: ftgmac100: select FIXED_PHY

Hyunwoo Kim <[email protected]>
net/sched: fix use-after-free in taprio_dev_notifier

Krzysztof Kozlowski <[email protected]>

    NFC: nci: uart: Set tty->disc_data only in success path

Gui-Dong Han <[email protected]>
hwmon: (ftsteutates) Fix TOCTOU race in fts_read()

Chao Yu <[email protected]>
f2fs: fix to return correct error number in f2fs_sync_node_pages()

Chao Yu <[email protected]>
f2fs: fix to do sanity check on sit_bitmap_size

Jaegeuk Kim <[email protected]>
f2fs: prevent kernel warning due to negative i_nlink from corrupted image

Chao Yu <[email protected]>
f2fs: fix to do sanity check on ino and xnid

Gatien Chevallier <[email protected]>
Input: gpio-keys - fix possible concurrent access in gpio_keys_irq_timer()

Dan Carpenter <[email protected]>
Input: ims-pcu - check record size in ims_pcu_flash_firmware()

Fabrice Gasnier <[email protected]>
Input: gpio-keys - fix a sleep while atomic with PREEMPT_RT

Brian Foster <[email protected]>
ext4: only dirty folios when data journaling regular files

Zhang Yi <[email protected]>
ext4: ensure i_size is smaller than maxbytes

Zhang Yi <[email protected]>
ext4: factor out ext4_get_maxbytes()

Zhang Yi <[email protected]>
ext4: fix incorrect punch max_end

Zhang Yi <[email protected]>
ext4: fix out of bounds punch offset

Jan Kara <[email protected]>
ext4: fix calculation of credits for extent tree modification

Thadeu Lima de Souza Cascardo <[email protected]>
ext4: inline: fix len overflow in ext4_prepare_inline_data

Wan Junjie <[email protected]>
bus: fsl-mc: fix GET/SET_TAILDROP command ids

Ioana Ciornei <[email protected]>
bus: fsl-mc: do not add a device-link for the UAPI used DPMCP device

Mikko Korhonen <[email protected]>
ata: ahci: Disallow LPM for Asus B550-F motherboard

Niklas Cassel <[email protected]>
ata: ahci: Disallow LPM for ASUSPRO-D840SA motherboard

Tasos Sahanidis <[email protected]>
ata: pata_via: Force PIO for ATAPI devices on VT6415/VT6330

Krzysztof Kozlowski <[email protected]>
bus: firewall: Fix missing static inline annotations for stubs

Chen Ridong <[email protected]>
cgroup,freezer: fix incomplete freezing when attaching tasks

Dennis Marttinen <[email protected]>
ceph: set superblock s_magic for IMA fsmagic matching

Viacheslav Dubeyko <[email protected]>
ceph: avoid kernel BUG for encrypted inode with unaligned file size

Brett Werling <[email protected]>
can: tcan4x5x: fix power regulator retrieval during probe

Fedor Pchelkin <[email protected]>
can: kvaser_pciefd: refine error prone echo_skb_max handling logic

Jeff Hugo <[email protected]>
bus: mhi: host: Fix conflict between power_up and SYSERR

Sumit Kumar <[email protected]>
bus: mhi: ep: Update read pointer only after buffer is written

Damien Le Moal <[email protected]>
block: Clear BIO_EMULATES_ZONE_APPEND flag on BIO completion

Jens Axboe <[email protected]>
block: use plug request list tail for one-shot backmerge attempt

Krzysztof Kozlowski <[email protected]>
ASoC: codecs: wcd937x: Drop unused buck_supply

Krzysztof Kozlowski <[email protected]>
ASoC: codecs: wcd9375: Fix double free of regulator supplies

Andreas Kemnade <[email protected]>
ARM: omap: pmic-cpcap: do not mess around without CPCAP or OMAP4

Ross Stutterheim <[email protected]>

    ARM: 9447/1: arm/memremap: fix arch_memremap_can_ram_remap()

Ryan Roberts <[email protected]>
arm64/mm: Close theoretical race where stale TLB entry remains valid

Ricardo Ribalda <[email protected]>
media: uvcvideo: Fix deferred probing error

Ricardo Ribalda <[email protected]>
media: uvcvideo: Send control events for partial succeeds

Ricardo Ribalda <[email protected]>
media: uvcvideo: Return the number of processed controls

Ming Qian <[email protected]>
media: imx-jpeg: Cleanup after an allocation error

Ming Qian <[email protected]>
media: imx-jpeg: Reset slot data pointers when freed

Ming Qian <[email protected]>
media: imx-jpeg: Move mxc_jpeg_free_slot_data() ahead

Ming Qian <[email protected]>
media: imx-jpeg: Drop the first error frames

Denis Arefev <[email protected]>
media: vivid: Change the siize of the composing

Edward Adam Davis <[email protected]>
media: vidtv: Terminating the subsequent process of initialization failure

Marek Szyprowski <[email protected]>
media: videobuf2: use sgtable-based scatterlist wrappers

Loic Poulain <[email protected]>
media: venus: Fix probe error handling

Ma Ke <[email protected]>
media: v4l2-dev: fix error handling in __video_register_device()

Tomi Valkeinen <[email protected]>
media: rcar-vin: Fix RAW10

Johan Hovold <[email protected]>
media: qcom: camss: vfe: suppress VFE version log spam

Johan Hovold <[email protected]>
media: qcom: camss: csid: suppress CSID log spam

Hans de Goede <[email protected]>
media: ov08x40: Extend sleep after reset to 5 ms

Marek Szyprowski <[email protected]>
media: omap3isp: use sgtable-based scatterlist wrappers

Fei Shao <[email protected]>
media: mediatek: vcodec: Correct vsi_core framebuffer size

Dan Carpenter <[email protected]>
media: iris: fix error code in iris_load_fw_to_memory()

Hao Yao <[email protected]>
media: ipu6: Remove workaround for Meteor Lake ES2

Stanislaw Gruszka <[email protected]>
media: intel/ipu6: Fix dma mask for non-secure mode

Haoxiang Li <[email protected]>
media: imagination: fix a potential memory leak in e5010_probe()

Kieran Bingham <[email protected]>
media: i2c: imx335: Fix frame size enumeration

Wentao Liang <[email protected]>
media: gspca: Add error handling for stv06xx_read_sensor()

Dmitry Nikiforov <[email protected]>
media: davinci: vpif: Fix memory leak in probe error path

Edward Adam Davis <[email protected]>
media: cxusb: no longer judge rbuf when the write fails

Sakari Ailus <[email protected]>
media: ccs-pll: Check for too high VT PLL multiplier in dual PLL case

Sakari Ailus <[email protected]>
media: ccs-pll: Correct the upper limit of maximum op_pre_pll_clk_div

Sakari Ailus <[email protected]>
media: ccs-pll: Start OP pre-PLL multiplier search from correct value

Hans de Goede <[email protected]>
media: ov2740: Move pm-runtime cleanup on probe-errors to proper place

Sakari Ailus <[email protected]>
media: ccs-pll: Start VT pre-PLL multiplier search from correct value

Tomi Valkeinen <[email protected]>
media: i2c: ds90ub913: Fix returned fmt from .set_fmt()

Laurentiu Palcu <[email protected]>
media: nxp: imx8-isi: better handle the m2m usage_count

Umang Jain <[email protected]>
media: imx335: Use correct register width for HNUM

Dongcheng Yan <[email protected]>
media: i2c: change lt6911uxe irq_gpio name to "hpd"

Johan Hovold <[email protected]>
media: ov5675: suppress probe deferral errors

Johan Hovold <[email protected]>
media: ov8856: suppress probe deferral errors

Vasiliy Kovalev <[email protected]>
jfs: validate AG parameters in dbMount() to prevent crashes

Mingcong Bai <[email protected]>
wifi: rtlwifi: disable ASPM for RTL8723BE with subsystem ID 11ad:1723

Bitterblue Smith <[email protected]>
wifi: rtw88: usb: Reduce control message timeout to 500 ms

Chuck Lever <[email protected]>
svcrdma: Unregister the device if svc_rdma_accept() fails

Jeongjun Park <[email protected]>
jbd2: fix data-race and null-ptr-deref in jbd2_journal_dirty_metadata()

Johan Hovold <[email protected]>
wifi: ath12k: fix ring-buffer corruption

Max Kellermann <[email protected]>
fs/nfs/read: fix double-unlock bug in nfs_return_empty_folio()

Scott Mayhew <[email protected]>
NFSv4: Don't check for OPEN feature support in v4.1

Mike Snitzer <[email protected]>
NFS: always probe for LOCALIO support asynchronously

Chuck Lever <[email protected]>
SUNRPC: Prevent hang on NFS mount with xprtsec=[m]tls

Li Lingfeng <[email protected]>
nfsd: Initialize ssc before laundromat_work to prevent NULL dereference

NeilBrown <[email protected]>
nfsd: nfsd4_spo_must_allow() must check this is a v4 compound request

Olga Kornievskaia <[email protected]>
nfsd: fix access checking for NLM under XPRTSEC policies

Chuck Lever <[email protected]>
NFSD: Implement FATTR4_CLONE_BLKSIZE attribute

Maninder Singh <[email protected]>
NFSD: fix race between nfsd registration and exports_proc

Maninder Singh <[email protected]>
NFSD: unregister filesystem in case genl_register_family() fails

Johan Hovold <[email protected]>
wifi: ath11k: fix ring-buffer corruption

Bitterblue Smith <[email protected]>
wifi: rtw88: usb: Upload the firmware in bigger chunks

Johan Hovold <[email protected]>
wifi: ath11k: fix rx completion meta data corruption

Christian Brauner <[email protected]>
anon_inode: raise SB_I_NODEV and SB_I_NOEXEC

Christian Brauner <[email protected]>

    anon_inode: explicitly block ->setattr()

Christian Brauner <[email protected]>
anon_inode: use a proper mode internally

Michael Lo <[email protected]>
wifi: mt76: mt7925: fix host interrupt register initialization

Christian Lamparter <[email protected]>
wifi: p54: prevent buffer-overflow in p54_rx_eeprom_readback()

Wentao Liang <[email protected]>
net/mlx5: Add error handling in mlx5_query_nic_vport_node_guid()

Wentao Liang <[email protected]>
net/mlx5_core: Add error handling inmlx5_query_nic_vport_qkey_viol_cntr()

João Paulo Gonçalves <[email protected]>
regulator: max20086: Change enable gpio to optional

João Paulo Gonçalves <[email protected]>

    regulator: max20086: Fix MAX200086 chip id

Niklas Schnelle <[email protected]>
s390/pci: Serialize device addition and removal

Niklas Schnelle <[email protected]>
s390/pci: Allow re-add of a reserved but not yet removed device

Niklas Schnelle <[email protected]>
s390/pci: Prevent self deletion in disable_slot()

Niklas Schnelle <[email protected]>
s390/pci: Remove redundant bus removal and disable from zpci_release_device()

Heiko Carstens <[email protected]>
s390/pci: Fix __pcilg_mio_inuser() inline assembly

Hari Bathini <[email protected]>
powerpc/bpf: fix JIT code size calculation of bpf trampoline

Hari Bathini <[email protected]>
powerpc64/ftrace: fix clobbered r15 during livepatching

Gautam Menghani <[email protected]>
powerpc/pseries/msi: Avoid reading PCI device registers in reduced power states

Pavel Begunkov <[email protected]>
io_uring/kbuf: account ring io_buffer_list memory

Pavel Begunkov <[email protected]>
io_uring: account drain memory to cgroup

Vijendar Mukunda <[email protected]>
ASoC: amd: sof_amd_sdw: Fix unlikely uninitialized variable use in create_sdw_dailinks()

Vijendar Mukunda <[email protected]>
ASoC: amd: amd_sdw: Fix unlikely uninitialized variable use in create_sdw_dailinks()

Martin Blumenstingl <[email protected]>
ASoC: meson: meson-card-utils: use of_property_present() for DT parsing

Jaroslav Kysela <[email protected]>
firmware: cs_dsp: Fix OOB memory read access in KUnit test

Wentao Liang <[email protected]>
ASoC: qcom: sdm845: Add error handling in sdm845_slim_snd_hw_params()

Giovanni Cabiddu <[email protected]>
crypto: qat - add shutdown handler to qat_dh895xcc

Giovanni Cabiddu <[email protected]>
crypto: qat - add shutdown handler to qat_c62x

Giovanni Cabiddu <[email protected]>
crypto: qat - add shutdown handler to qat_4xxx

Giovanni Cabiddu <[email protected]>

    crypto: qat - add shutdown handler to qat_420xx

Giovanni Cabiddu <[email protected]>
crypto: qat - add shutdown handler to qat_c3xxx

Peter Zijlstra <[email protected]>
sched/fair: Adhere to place_entity() constraints

Harshit Agarwal <[email protected]>
sched/rt: Fix race in push_rt_task

Alexander Aring <[email protected]>
gfs2: move msleep to sleepable context

Herbert Xu <[email protected]>
crypto: marvell/cesa - Do not chain submitted requests

Zijun Hu <[email protected]>
configfs: Do not override creating attribute file failure in populate_attrs()

Suren Baghdasaryan <[email protected]>
alloc_tag: handle module codetag load errors as module load failures

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

Diffstat:

 .../bindings/i2c/nvidia,tegra20-i2c.yaml           |  24 +-
 Documentation/gpu/nouveau.rst                      |   5 +-
 Makefile                                           |   4 +-
 arch/arm/mach-omap2/clockdomain.h                  |   1 +
 arch/arm/mach-omap2/clockdomains33xx_data.c        |   2 +-
 arch/arm/mach-omap2/cm33xx.c                       |  14 +-
 arch/arm/mach-omap2/pmic-cpcap.c                   |   6 +-
 arch/arm/mm/ioremap.c                              |   4 +-
 arch/arm64/include/asm/tlbflush.h                  |   9 +-
 arch/arm64/kernel/ptrace.c                         |   2 +-
 arch/arm64/kvm/hyp/include/hyp/debug-sr.h          |   3 +
 arch/arm64/mm/mmu.c                                |   3 +-
 arch/loongarch/include/asm/irqflags.h              |  16 +-
 arch/loongarch/include/asm/vdso/getrandom.h        |   2 +-
 arch/loongarch/include/asm/vdso/gettimeofday.h     |   6 +-
 arch/loongarch/mm/hugetlbpage.c                    |   3 +-
 arch/mips/vdso/Makefile                            |   1 +
 arch/nios2/include/asm/pgtable.h                   |  16 +
 arch/parisc/boot/compressed/Makefile               |   1 +
 arch/parisc/kernel/unaligned.c                     |   2 +-
 arch/powerpc/include/asm/ppc_asm.h                 |   2 +-
 arch/powerpc/kernel/eeh.c                          |   2 +
 arch/powerpc/kernel/trace/ftrace_entry.S           |   2 +-
 arch/powerpc/kernel/vdso/Makefile                  |   2 +-
 arch/powerpc/net/bpf_jit.h                         |  20 +-
 arch/powerpc/net/bpf_jit_comp.c                    |  33 +-
 arch/powerpc/net/bpf_jit_comp32.c                  |   6 -
 arch/powerpc/net/bpf_jit_comp64.c                  |  15 +-
 arch/powerpc/platforms/pseries/msi.c               |   7 +-
 arch/riscv/kvm/vcpu_sbi_replace.c                  |   8 +-
 arch/s390/kvm/gaccess.c                            |   8 +-
 arch/s390/pci/pci.c                                |  45 +-
 arch/s390/pci/pci_bus.h                            |   7 +-
 arch/s390/pci/pci_event.c                          |  22 +-
 arch/s390/pci/pci_mmio.c                           |   2 +-
 arch/x86/Kconfig                                   |   2 +-
 arch/x86/events/intel/core.c                       |   2 +-
 arch/x86/include/asm/module.h                      |   8 +
 arch/x86/include/asm/tdx.h                         |   2 +-
 arch/x86/kernel/alternative.c                      |  79 ++-
 arch/x86/kernel/cpu/amd.c                          |   2 +-
 arch/x86/kernel/cpu/sgx/main.c                     |   2 +
 arch/x86/kvm/svm/svm.c                             |   2 +-
 arch/x86/kvm/vmx/vmx.c                             |   5 +-
 arch/x86/mm/init_32.c                              |   3 -
 arch/x86/mm/init_64.c                              |   3 -
 arch/x86/mm/pat/set_memory.c                       |   3 +
 arch/x86/mm/pti.c                                  |   5 +
 arch/x86/virt/vmx/tdx/tdx.c                        |   5 +-
 block/blk-merge.c                                  |  26 +-
 block/blk-zoned.c                                  |   1 +
 drivers/accel/ivpu/ivpu_fw.c                       |  12 +-
 drivers/accel/ivpu/ivpu_gem.c                      |  91 +--
 drivers/accel/ivpu/ivpu_gem.h                      |   2 +-
 drivers/accel/ivpu/ivpu_job.c                      |   6 +-
 drivers/accel/ivpu/ivpu_jsm_msg.c                  |   9 +-
 drivers/acpi/acpica/amlresrc.h                     |   8 +-
 drivers/acpi/acpica/dsutils.c                      |   9 +-
 drivers/acpi/acpica/psobject.c                     |  52 +-
 drivers/acpi/acpica/rsaddr.c                       |  13 +-
 drivers/acpi/acpica/rscalc.c                       |  22 +-
 drivers/acpi/acpica/rslist.c                       |  12 +-
 drivers/acpi/acpica/utprint.c                      |   7 +-
 drivers/acpi/acpica/utresrc.c                      |  14 +-
 drivers/acpi/battery.c                             |  19 +-
 drivers/acpi/bus.c                                 |   6 +-
 drivers/ata/ahci.c                                 |  35 +-
 drivers/ata/pata_via.c                             |   3 +-
 drivers/atm/atmtcp.c                               |   4 +-
 drivers/base/platform-msi.c                        |   1 +
 drivers/base/power/runtime.c                       |   2 +-
 drivers/base/swnode.c                              |   2 +-
 drivers/block/aoe/aoedev.c                         |   8 +
 drivers/block/ublk_drv.c                           |   3 +
 drivers/bluetooth/btmrvl_sdio.c                    |   4 +-
 drivers/bluetooth/btmtksdio.c                      |   2 +-
 drivers/bluetooth/btusb.c                          |   5 +
 drivers/bus/fsl-mc/fsl-mc-uapi.c                   |   4 +-
 drivers/bus/fsl-mc/mc-io.c                         |  19 +-
 drivers/bus/fsl-mc/mc-sys.c                        |   2 +-
 drivers/bus/mhi/ep/ring.c                          |  16 +-
 drivers/bus/mhi/host/pm.c                          |  18 +-
 drivers/bus/ti-sysc.c                              |  49 --
 drivers/char/ipmi/ipmi_ssif.c                      |   6 +-
 drivers/clk/meson/g12a.c                           |   1 +
 drivers/clk/qcom/gcc-sm8650.c                      |   2 +
 drivers/clk/qcom/gcc-sm8750.c                      |   3 +-
 drivers/clk/qcom/gcc-x1e80100.c                    |   4 +
 drivers/clk/rockchip/clk-rk3036.c                  |   1 +
 drivers/cpufreq/scmi-cpufreq.c                     |  36 +-
 drivers/crypto/intel/qat/qat_420xx/adf_drv.c       |   8 +
 drivers/crypto/intel/qat/qat_4xxx/adf_drv.c        |   8 +
 drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c       |   8 +
 drivers/crypto/intel/qat/qat_c62x/adf_drv.c        |   8 +
 drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c    |   8 +
 drivers/crypto/marvell/cesa/cesa.c                 |   2 +-
 drivers/crypto/marvell/cesa/cesa.h                 |   9 +-
 drivers/crypto/marvell/cesa/tdma.c                 |  53 +-
 drivers/dma-buf/udmabuf.c                          |   5 +-
 drivers/edac/altera_edac.c                         |   6 +-
 drivers/edac/amd64_edac.c                          |   1 +
 drivers/edac/igen6_edac.c                          | 100 ++-
 drivers/firmware/arm_scmi/driver.c                 |  76 ++-
 drivers/firmware/arm_scmi/protocols.h              |   2 +
 drivers/firmware/cirrus/test/cs_dsp_mock_bin.c     |   3 +-
 drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c    |   3 +-
 .../cirrus/test/cs_dsp_test_control_cache.c        |   1 -
 drivers/firmware/sysfb.c                           |  26 +-
 drivers/firmware/ti_sci.c                          |  14 +-
 drivers/gpio/gpio-loongson-64bit.c                 |   2 +-
 drivers/gpio/gpio-mlxbf3.c                         |  52 +-
 drivers/gpio/gpio-pca953x.c                        |   2 +-
 drivers/gpio/gpiolib-of.c                          |   9 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |  10 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |   4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |   3 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |  10 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c     |  22 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |  12 +-
 drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h        |   9 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |   2 -
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |   2 -
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c              |   2 -
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |   2 -
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |   2 -
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |   2 -
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |  14 +-
 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |  17 +-
 drivers/gpu/drm/amd/amdgpu/mes_v12_0.c             |  17 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c            |  63 +-
 drivers/gpu/drm/amd/amdgpu/psp_v13_0.c             |  20 +
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |   5 -
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c    |   4 +
 drivers/gpu/drm/amd/amdkfd/kfd_queue.c             |   4 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |   3 +-
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |   6 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/Makefile     |   1 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  | 170 +----
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |   9 +
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |  15 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_quirks.c   | 178 ++++++
 .../amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c  |   1 +
 .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c   |   8 +-
 .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c |  38 +-
 .../amd/display/dc/dml/dcn30/display_mode_vba_30.c |   1 +
 .../amd/display/dc/dml/dcn31/display_mode_vba_31.c |   1 +
 .../display/dc/dml/dcn314/display_mode_vba_314.c   |   1 +
 .../amd/display/dc/dml2/dml2_translation_helper.c  |   2 +-
 drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c |   5 +-
 .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c   |   2 +-
 .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c  |  14 +
 .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c    |  21 +-
 .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c  |  44 ++
 .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h  |   1 +
 .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c   |   2 +-
 .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h   |   3 +-
 .../amd/display/dc/irq/dcn32/irq_service_dcn32.c   |  61 +-
 .../amd/display/dc/irq/dcn401/irq_service_dcn401.c |  60 +-
 drivers/gpu/drm/amd/display/dc/irq_types.h         |   9 +
 .../gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.c   | 418 ++++++------
 .../amd/display/dc/resource/dcn35/dcn35_resource.c |   2 +-
 .../amd/display/dc/resource/dcn36/dcn36_resource.c |   2 +-
 drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c       |   4 +-
 drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h       |   1 +
 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c |  13 +-
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c     |  10 +
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   |   4 +-
 drivers/gpu/drm/bridge/Kconfig                     |   1 +
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |   5 +-
 drivers/gpu/drm/bridge/analogix/anx7625.c          |  26 +-
 drivers/gpu/drm/display/drm_dp_helper.c            |  39 +-
 drivers/gpu/drm/drm_panel_orientation_quirks.c     |   6 +
 drivers/gpu/drm/i915/i915_pmu.c                    |   4 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c              |  14 +
 drivers/gpu/drm/msm/adreno/a6xx_hfi.c              |   2 +-
 .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c   |  17 +-
 drivers/gpu/drm/msm/dp/dp_display.c                |   7 +-
 drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c         |   7 +
 drivers/gpu/drm/msm/hdmi/hdmi_i2c.c                |  14 +-
 .../gpu/drm/msm/registers/adreno/adreno_pm4.xml    |   3 +-
 drivers/gpu/drm/nouveau/Kbuild                     |   1 +
 drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h  |  45 +-
 drivers/gpu/drm/nouveau/nouveau_backlight.c        |   2 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   8 +
 drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c     |   2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/Kbuild     |   2 +
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c     | 673 +-------------------
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/Kbuild  |   5 +
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/Kbuild |   6 +
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rm.c   |  10 +
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c  | 699 +++++++++++++++++++++
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h    |  20 +
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rpc.h   |  18 +
 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c |   2 +-
 drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c    |  41 +-
 drivers/gpu/drm/panel/panel-simple.c               |  29 +
 drivers/gpu/drm/panthor/panthor_mmu.c              |   1 -
 drivers/gpu/drm/rockchip/inno_hdmi.c               |  36 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h       |   1 +
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c       |   5 +-
 drivers/gpu/drm/solomon/ssd130x.c                  |   2 +-
 drivers/gpu/drm/tiny/Kconfig                       |   1 +
 drivers/gpu/drm/ttm/tests/ttm_bo_test.c            |   2 +-
 drivers/gpu/drm/v3d/v3d_sched.c                    |   8 +-
 drivers/gpu/drm/xe/xe_bo.c                         |   4 +-
 drivers/gpu/drm/xe/xe_eu_stall.c                   |   4 +-
 drivers/gpu/drm/xe/xe_exec.c                       |   4 +-
 drivers/gpu/drm/xe/xe_exec_queue.c                 |   9 +-
 drivers/gpu/drm/xe/xe_gt.c                         |   2 +-
 drivers/gpu/drm/xe/xe_gt_freq.c                    |  82 +--
 drivers/gpu/drm/xe/xe_gt_idle.c                    |  28 +-
 drivers/gpu/drm/xe/xe_gt_throttle.c                |  90 +--
 drivers/gpu/drm/xe/xe_guc.c                        |  40 +-
 drivers/gpu/drm/xe/xe_oa.c                         |   6 +-
 drivers/gpu/drm/xe/xe_svm.c                        |   2 +-
 drivers/gpu/drm/xe/xe_uc_fw.c                      |   2 +-
 drivers/gpu/drm/xe/xe_vm.c                         |   6 +-
 drivers/hid/hid-asus.c                             | 107 +++-
 drivers/hv/connection.c                            |  23 +-
 drivers/hwmon/ftsteutates.c                        |   9 +-
 drivers/hwmon/ltc4282.c                            |   7 -
 drivers/hwmon/occ/common.c                         | 238 +++----
 drivers/i2c/busses/i2c-designware-slave.c          |   2 +-
 drivers/i2c/busses/i2c-k1.c                        |   2 +-
 drivers/i2c/busses/i2c-npcm7xx.c                   |  12 +-
 drivers/i2c/busses/i2c-pasemi-core.c               |   2 +-
 drivers/i2c/busses/i2c-tegra.c                     |   5 +
 drivers/i3c/master/mipi-i3c-hci/core.c             |   6 +-
 drivers/iio/accel/fxls8962af-core.c                |  15 +-
 drivers/iio/adc/Kconfig                            |   6 +-
 drivers/iio/adc/ad7173.c                           |  15 +-
 drivers/iio/adc/ad7606.c                           |  21 +-
 drivers/iio/adc/ad7606_spi.c                       |   2 +-
 drivers/iio/adc/ad7944.c                           |   2 +
 drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c   |   8 +-
 drivers/infiniband/core/iwcm.c                     |  29 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c         |   2 +-
 drivers/input/keyboard/gpio_keys.c                 |   6 +-
 drivers/input/misc/ims-pcu.c                       |   6 +
 drivers/iommu/amd/iommu.c                          |  41 +-
 drivers/iommu/intel/iommu.c                        |  11 +
 drivers/iommu/intel/iommu.h                        |   1 +
 drivers/iommu/intel/nested.c                       |   4 +-
 drivers/iommu/iommu.c                              |  21 +-
 drivers/md/dm-raid1.c                              |   5 +-
 drivers/md/dm-table.c                              |  14 +-
 drivers/md/dm-verity-fec.c                         |   4 +
 drivers/md/dm-verity-target.c                      |   8 +-
 drivers/md/dm-verity-verify-sig.c                  |  17 +-
 .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c    |   4 +-
 drivers/media/common/videobuf2/videobuf2-dma-sg.c  |   4 +-
 drivers/media/i2c/ccs-pll.c                        |  23 +-
 drivers/media/i2c/ds90ub913.c                      |   4 +-
 drivers/media/i2c/imx334.c                         |  18 +-
 drivers/media/i2c/imx335.c                         |   5 +-
 drivers/media/i2c/lt6911uxe.c                      |   4 +-
 drivers/media/i2c/ov08x40.c                        |   2 +-
 drivers/media/i2c/ov2740.c                         |   4 +-
 drivers/media/i2c/ov5675.c                         |   5 +-
 drivers/media/i2c/ov8856.c                         |   9 +-
 drivers/media/i2c/tc358743.c                       |   4 +
 drivers/media/pci/intel/ipu6/ipu6-dma.c            |   4 +-
 drivers/media/pci/intel/ipu6/ipu6.c                |   5 -
 .../media/platform/imagination/e5010-jpeg-enc.c    |   9 +-
 .../vcodec/decoder/vdec/vdec_hevc_req_multi_if.c   |   2 +-
 drivers/media/platform/nuvoton/npcm-video.c        |  15 +-
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h  |   1 +
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c     |  90 ++-
 drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c |  14 +-
 drivers/media/platform/qcom/camss/camss-csid.c     |   4 +-
 drivers/media/platform/qcom/camss/camss-vfe.c      |   4 +-
 drivers/media/platform/qcom/iris/iris_firmware.c   |   4 +-
 drivers/media/platform/qcom/venus/core.c           |  16 +-
 drivers/media/platform/qcom/venus/vdec.c           |   4 +-
 drivers/media/platform/renesas/rcar-vin/rcar-dma.c |  18 +-
 .../media/platform/renesas/rcar-vin/rcar-v4l2.c    |   8 +-
 drivers/media/platform/renesas/vsp1/vsp1_rwpf.c    |  13 +-
 .../platform/samsung/exynos4-is/fimc-is-regs.c     |   1 +
 drivers/media/platform/ti/cal/cal-video.c          |   4 +-
 drivers/media/platform/ti/davinci/vpif.c           |   4 +-
 drivers/media/platform/ti/omap3isp/ispccdc.c       |   8 +-
 drivers/media/platform/ti/omap3isp/ispstat.c       |   6 +-
 .../media/platform/verisilicon/rockchip_vpu_hw.c   |  20 +-
 drivers/media/test-drivers/vidtv/vidtv_channel.c   |   2 +-
 drivers/media/test-drivers/vivid/vivid-vid-cap.c   |   2 +-
 drivers/media/usb/dvb-usb/cxusb.c                  |   3 +-
 drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c     |   7 +-
 drivers/media/usb/uvc/uvc_ctrl.c                   |  23 +-
 drivers/media/usb/uvc/uvc_driver.c                 |  27 +-
 drivers/media/v4l2-core/v4l2-dev.c                 |  14 +-
 drivers/mmc/core/card.h                            |   6 +
 drivers/mmc/core/quirks.h                          |  10 +
 drivers/mmc/core/sd.c                              |  32 +-
 drivers/mmc/host/sdhci-esdhc-imx.c                 |  88 ++-
 drivers/mtd/nand/qpic_common.c                     |   8 +-
 drivers/mtd/nand/raw/qcom_nandc.c                  |  18 +-
 drivers/mtd/nand/raw/sunxi_nand.c                  |   2 +
 drivers/mtd/nand/spi/alliancememory.c              |  12 +-
 drivers/mtd/nand/spi/ato.c                         |   6 +-
 drivers/mtd/nand/spi/esmt.c                        |   8 +-
 drivers/mtd/nand/spi/foresee.c                     |   8 +-
 drivers/mtd/nand/spi/gigadevice.c                  |  48 +-
 drivers/mtd/nand/spi/macronix.c                    |   8 +-
 drivers/mtd/nand/spi/micron.c                      |  20 +-
 drivers/mtd/nand/spi/paragon.c                     |  12 +-
 drivers/mtd/nand/spi/skyhigh.c                     |  12 +-
 drivers/mtd/nand/spi/toshiba.c                     |   8 +-
 drivers/mtd/nand/spi/winbond.c                     |  34 +-
 drivers/mtd/nand/spi/xtx.c                         |  12 +-
 drivers/net/can/kvaser_pciefd.c                    |   3 +-
 drivers/net/can/m_can/tcan4x5x-core.c              |   9 +-
 drivers/net/ethernet/aquantia/atlantic/aq_main.c   |   1 -
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |   2 +
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  87 ++-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c      |  29 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h      |   1 -
 drivers/net/ethernet/cadence/macb_main.c           |   6 +-
 drivers/net/ethernet/cortina/gemini.c              |  37 +-
 drivers/net/ethernet/dlink/dl2k.c                  |  14 +-
 drivers/net/ethernet/dlink/dl2k.h                  |   2 +
 drivers/net/ethernet/emulex/benet/be_cmds.c        |   2 +-
 drivers/net/ethernet/faraday/Kconfig               |   1 +
 drivers/net/ethernet/intel/e1000e/netdev.c         |  14 +-
 drivers/net/ethernet/intel/e1000e/ptp.c            |   8 +-
 drivers/net/ethernet/intel/i40e/i40e_common.c      |   7 +-
 drivers/net/ethernet/intel/ice/ice_arfs.c          |  48 ++
 drivers/net/ethernet/intel/ice/ice_eswitch.c       |   6 +-
 drivers/net/ethernet/intel/ice/ice_switch.c        |   4 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c       |   4 +-
 drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c |   9 +-
 .../ethernet/marvell/octeontx2/nic/otx2_common.c   |   4 +-
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |   1 +
 .../ethernet/mellanox/mlx5/core/steering/hws/bwc.c |  10 +-
 .../mellanox/mlx5/core/steering/hws/definer.c      |  78 ++-
 drivers/net/ethernet/mellanox/mlx5/core/vport.c    |  18 +-
 .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c |   6 +-
 drivers/net/ethernet/meta/fbnic/fbnic_fw.c         |   5 +-
 drivers/net/ethernet/microchip/lan743x_ethtool.c   |  18 +-
 drivers/net/ethernet/microchip/lan743x_ptp.h       |   4 +-
 drivers/net/ethernet/pensando/ionic/ionic_main.c   |   3 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   7 +-
 drivers/net/ethernet/ti/am65-cpsw-nuss.c           |  24 +-
 drivers/net/ethernet/ti/icssg/icssg_common.c       |  19 +-
 drivers/net/ethernet/vertexcom/mse102x.c           |  15 +-
 drivers/net/hyperv/netvsc_bpf.c                    |   2 +-
 drivers/net/hyperv/netvsc_drv.c                    |   4 +-
 drivers/net/netdevsim/netdev.c                     |   2 +
 drivers/net/phy/marvell-88q2xxx.c                  | 103 +--
 drivers/net/phy/mediatek/mtk-ge-soc.c              |  10 +-
 drivers/net/usb/asix.h                             |   1 -
 drivers/net/usb/asix_common.c                      |  22 -
 drivers/net/usb/asix_devices.c                     |  17 +-
 drivers/net/usb/ch9200.c                           |   7 +-
 drivers/net/vxlan/vxlan_core.c                     |  22 +-
 drivers/net/wireless/ath/ath11k/ce.c               |  11 +-
 drivers/net/wireless/ath/ath11k/core.c             |  55 ++
 drivers/net/wireless/ath/ath11k/core.h             |   7 +
 drivers/net/wireless/ath/ath11k/dp_rx.c            |  25 +-
 drivers/net/wireless/ath/ath11k/hal.c              |   4 +-
 drivers/net/wireless/ath/ath11k/qmi.c              |   9 +
 drivers/net/wireless/ath/ath12k/ce.c               |  11 +-
 drivers/net/wireless/ath/ath12k/ce.h               |   6 +-
 drivers/net/wireless/ath/ath12k/dp.c               |  77 ++-
 drivers/net/wireless/ath/ath12k/dp.h               |   5 +-
 drivers/net/wireless/ath/ath12k/dp_mon.c           |   2 +
 drivers/net/wireless/ath/ath12k/dp_rx.c            |  15 +-
 drivers/net/wireless/ath/ath12k/hal.c              |  12 +-
 drivers/net/wireless/ath/ath12k/hal.h              |   6 +
 drivers/net/wireless/ath/ath12k/hal_desc.h         |   2 +-
 drivers/net/wireless/ath/ath12k/hw.c               |   2 +
 drivers/net/wireless/ath/ath12k/hw.h               |   3 +
 drivers/net/wireless/ath/ath12k/mac.c              |  55 +-
 drivers/net/wireless/ath/ath12k/pci.c              |   3 +
 drivers/net/wireless/ath/ath12k/peer.c             |   5 +-
 drivers/net/wireless/ath/ath12k/peer.h             |   3 +-
 drivers/net/wireless/ath/ath12k/wmi.c              |  28 +-
 drivers/net/wireless/ath/ath12k/wmi.h              |   1 +
 drivers/net/wireless/ath/carl9170/usb.c            |  19 +-
 drivers/net/wireless/intel/iwlwifi/cfg/22000.c     |   3 +
 drivers/net/wireless/intel/iwlwifi/dvm/main.c      |   6 +-
 drivers/net/wireless/intel/iwlwifi/mld/d3.c        |   2 +-
 drivers/net/wireless/intel/iwlwifi/mld/mac80211.c  |   2 +-
 drivers/net/wireless/intel/iwlwifi/mld/mld.c       |   3 +-
 drivers/net/wireless/intel/iwlwifi/mld/thermal.c   |   4 +
 drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  |   4 +-
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c    |   6 +
 drivers/net/wireless/intersil/p54/fwio.c           |   2 +
 drivers/net/wireless/intersil/p54/p54.h            |   1 +
 drivers/net/wireless/intersil/p54/txrx.c           |  13 +-
 drivers/net/wireless/mediatek/mt76/mt76x2/usb.c    |   2 +
 .../net/wireless/mediatek/mt76/mt76x2/usb_init.c   |  13 +-
 drivers/net/wireless/mediatek/mt76/mt7921/main.c   |   5 +
 drivers/net/wireless/mediatek/mt76/mt7925/init.c   |   6 +
 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c    |  20 +-
 drivers/net/wireless/mediatek/mt76/mt7925/mcu.h    |   1 +
 drivers/net/wireless/mediatek/mt76/mt7925/pci.c    |   3 -
 drivers/net/wireless/mediatek/mt76/mt7925/regs.h   |   2 +-
 drivers/net/wireless/mediatek/mt76/mt7996/mac.c    |   8 +
 drivers/net/wireless/mediatek/mt76/mt7996/main.c   |   4 +-
 drivers/net/wireless/purelifi/plfxlc/usb.c         |   4 +-
 drivers/net/wireless/realtek/rtlwifi/pci.c         |  10 +
 drivers/net/wireless/realtek/rtw88/hci.h           |   8 +
 drivers/net/wireless/realtek/rtw88/mac.c           |  11 +-
 drivers/net/wireless/realtek/rtw88/mac.h           |   2 +
 drivers/net/wireless/realtek/rtw88/mac80211.c      |   2 +
 drivers/net/wireless/realtek/rtw88/main.c          |  32 +
 drivers/net/wireless/realtek/rtw88/main.h          |   3 +
 drivers/net/wireless/realtek/rtw88/pci.c           |   2 +
 drivers/net/wireless/realtek/rtw88/rtw8703b.c      |   1 +
 drivers/net/wireless/realtek/rtw88/rtw8723d.c      |   1 +
 drivers/net/wireless/realtek/rtw88/rtw8812a.c      |   1 +
 drivers/net/wireless/realtek/rtw88/rtw8814a.c      |  11 +
 drivers/net/wireless/realtek/rtw88/rtw8821a.c      |   1 +
 drivers/net/wireless/realtek/rtw88/rtw8821c.c      |   1 +
 drivers/net/wireless/realtek/rtw88/rtw8822b.c      |   1 +
 drivers/net/wireless/realtek/rtw88/rtw8822bu.c     |   2 +
 drivers/net/wireless/realtek/rtw88/rtw8822c.c      |   1 +
 drivers/net/wireless/realtek/rtw88/sdio.c          |   2 +
 drivers/net/wireless/realtek/rtw88/usb.c           |  57 +-
 drivers/net/wireless/realtek/rtw89/cam.c           |   3 +
 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c  |   5 -
 drivers/net/wireless/virtual/mac80211_hwsim.c      |   5 +
 drivers/nvme/host/ioctl.c                          |  21 +-
 drivers/nvme/host/tcp.c                            |   2 +-
 drivers/pci/controller/cadence/pcie-cadence-ep.c   |   5 +-
 drivers/pci/controller/dwc/pcie-designware-ep.c    |   5 +-
 drivers/pci/controller/dwc/pcie-dw-rockchip.c      |   6 +-
 drivers/pci/controller/pcie-apple.c                |   2 +-
 drivers/pci/hotplug/pciehp_hpc.c                   |   2 +-
 drivers/pci/hotplug/s390_pci_hpc.c                 |   2 +-
 drivers/pci/pci.c                                  |   3 +-
 drivers/pci/quirks.c                               |  23 +
 drivers/phy/freescale/phy-fsl-imx8mq-usb.c         |  10 +-
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c        |  21 +-
 drivers/pinctrl/pinctrl-mcp23s08.c                 |   8 +
 drivers/platform/loongarch/loongson-laptop.c       |  87 +--
 drivers/platform/x86/amd/pmc/pmc.c                 |   2 +
 drivers/platform/x86/amd/pmf/core.c                |   3 +-
 drivers/platform/x86/amd/pmf/tee-if.c              |  67 +-
 drivers/platform/x86/dell/alienware-wmi-wmax.c     |   2 +-
 drivers/platform/x86/dell/dell_rbu.c               |   6 +-
 drivers/platform/x86/ideapad-laptop.c              |  19 +-
 .../intel/uncore-frequency/uncore-frequency-tpmi.c |   9 +-
 drivers/pmdomain/core.c                            |   4 +-
 drivers/power/supply/bq27xxx_battery.c             |   2 +-
 drivers/power/supply/bq27xxx_battery_i2c.c         |  13 +-
 drivers/power/supply/collie_battery.c              |   1 +
 drivers/power/supply/gpio-charger.c                |   4 +-
 drivers/power/supply/max17040_battery.c            |   5 +-
 drivers/ptp/ptp_clock.c                            |   3 +-
 drivers/ptp/ptp_private.h                          |  22 +-
 drivers/pwm/pwm-axi-pwmgen.c                       |  23 +-
 drivers/rapidio/rio_cm.c                           |   3 +
 drivers/regulator/max14577-regulator.c             |   5 +-
 drivers/regulator/max20086-regulator.c             |   4 +-
 drivers/remoteproc/remoteproc_core.c               |   6 +-
 drivers/remoteproc/ti_k3_m4_remoteproc.c           |   2 +-
 drivers/s390/scsi/zfcp_sysfs.c                     |   2 +
 drivers/scsi/elx/efct/efct_hw.c                    |   5 +-
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |   2 +-
 drivers/scsi/lpfc/lpfc_sli.c                       |   4 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |  84 +++
 drivers/scsi/storvsc_drv.c                         |  10 +-
 drivers/soc/qcom/pmic_glink_altmode.c              |  30 +-
 drivers/spi/spi-qpic-snand.c                       |   1 +
 drivers/staging/iio/impedance-analyzer/ad5933.c    |   2 +-
 drivers/staging/media/rkvdec/rkvdec.c              |  14 +-
 drivers/tee/tee_core.c                             |  11 +-
 drivers/uio/uio_hv_generic.c                       |   7 +-
 drivers/video/console/dummycon.c                   |  18 +-
 drivers/video/console/vgacon.c                     |   2 +-
 drivers/video/fbdev/core/fbcon.c                   |   7 +-
 drivers/video/fbdev/core/fbmem.c                   |  22 +-
 drivers/video/screen_info_pci.c                    |  75 ++-
 drivers/virt/coco/tsm.c                            |  31 +-
 drivers/watchdog/da9052_wdt.c                      |   1 +
 drivers/watchdog/stm32_iwdg.c                      |   2 +-
 fs/anon_inodes.c                                   |  45 ++
 fs/ceph/addr.c                                     |   9 +
 fs/ceph/super.c                                    |   1 +
 fs/configfs/dir.c                                  |   2 +-
 fs/dlm/lowcomms.c                                  |   5 +-
 fs/erofs/zmap.c                                    |  10 +-
 fs/exfat/nls.c                                     |   1 +
 fs/exfat/super.c                                   |  30 +-
 fs/ext4/ext4.h                                     |   7 +
 fs/ext4/extents.c                                  |  39 +-
 fs/ext4/file.c                                     |   7 +-
 fs/ext4/inline.c                                   |   2 +-
 fs/ext4/inode.c                                    |  24 +-
 fs/ext4/ioctl.c                                    |   8 +-
 fs/f2fs/compress.c                                 |  23 +-
 fs/f2fs/f2fs.h                                     |   5 +
 fs/f2fs/inode.c                                    |  10 +-
 fs/f2fs/namei.c                                    |   9 +
 fs/f2fs/node.c                                     |   8 +-
 fs/f2fs/segment.c                                  |  12 +-
 fs/f2fs/super.c                                    |  12 +-
 fs/file.c                                          |   8 +-
 fs/gfs2/lock_dlm.c                                 |   3 +-
 fs/internal.h                                      |   5 +
 fs/isofs/inode.c                                   |   7 +-
 fs/isofs/isofs.h                                   |   4 +-
 fs/isofs/rock.c                                    |  40 +-
 fs/isofs/rock.h                                    |   6 +-
 fs/isofs/util.c                                    |  51 +-
 fs/jbd2/transaction.c                              |   5 +-
 fs/jffs2/erase.c                                   |   4 +-
 fs/jffs2/scan.c                                    |   4 +-
 fs/jffs2/summary.c                                 |   7 +-
 fs/jfs/jfs_discard.c                               |   3 +-
 fs/jfs/jfs_dmap.c                                  |   6 +-
 fs/jfs/jfs_dtree.c                                 |  18 +-
 fs/libfs.c                                         |   8 +-
 fs/nfs/client.c                                    |   2 +-
 fs/nfs/flexfilelayout/flexfilelayoutdev.c          |   2 +-
 fs/nfs/internal.h                                  |   1 -
 fs/nfs/localio.c                                   |   6 +-
 fs/nfs/nfs4proc.c                                  |   5 +-
 fs/nfs/read.c                                      |   3 +-
 fs/nfsd/export.c                                   |   3 +-
 fs/nfsd/nfs4proc.c                                 |   3 +-
 fs/nfsd/nfs4xdr.c                                  |  19 +-
 fs/nfsd/nfsctl.c                                   |  26 +-
 fs/nfsd/nfssvc.c                                   |   6 +-
 fs/overlayfs/file.c                                |   4 +-
 fs/overlayfs/overlayfs.h                           |   8 +-
 fs/smb/client/cached_dir.c                         |  14 +-
 fs/smb/client/cached_dir.h                         |   8 +-
 fs/smb/client/cifsglob.h                           |   1 +
 fs/smb/client/connect.c                            |  17 +-
 fs/smb/client/namespace.c                          |   3 +
 fs/smb/client/readdir.c                            |  28 +-
 fs/smb/client/reparse.c                            |   1 -
 fs/smb/client/sess.c                               |   7 +-
 fs/smb/client/smb2pdu.c                            |  33 +-
 fs/smb/client/smbdirect.c                          |   5 +-
 fs/smb/client/transport.c                          |  14 +-
 fs/smb/server/connection.c                         |   2 +-
 fs/smb/server/connection.h                         |   1 +
 fs/smb/server/smb2pdu.c                            |  11 +-
 fs/smb/server/transport_rdma.c                     |  10 +-
 fs/smb/server/transport_tcp.c                      |   3 +-
 fs/xattr.c                                         |   1 +
 include/acpi/actypes.h                             |   2 +-
 include/drm/display/drm_dp_helper.h                |   5 +
 include/linux/acpi.h                               |   9 +-
 include/linux/atmdev.h                             |   6 +
 include/linux/bus/stm32_firewall_device.h          |  15 +-
 include/linux/codetag.h                            |   8 +-
 include/linux/execmem.h                            |   8 +-
 include/linux/f2fs_fs.h                            |   1 +
 include/linux/hugetlb.h                            |   3 +
 include/linux/mmc/card.h                           |   1 +
 include/linux/module.h                             |   5 -
 include/linux/mtd/nand-qpic-common.h               |   4 +-
 include/linux/mtd/spinand.h                        |  74 +--
 include/linux/tcp.h                                |   2 +-
 include/net/mac80211.h                             |  16 -
 include/trace/events/erofs.h                       |  18 -
 include/uapi/linux/videodev2.h                     |  12 +-
 io_uring/io-wq.c                                   |   4 +-
 io_uring/io_uring.c                                |   2 +-
 io_uring/kbuf.c                                    |   7 +-
 io_uring/net.c                                     |   6 +-
 io_uring/rsrc.c                                    |   8 +-
 io_uring/sqpoll.c                                  |   5 +-
 ipc/shm.c                                          |   5 +-
 kernel/bpf/bpf_struct_ops.c                        |   2 +-
 kernel/bpf/btf.c                                   |   4 +-
 kernel/bpf/helpers.c                               |   3 +-
 kernel/cgroup/legacy_freezer.c                     |   3 +-
 kernel/events/core.c                               |  80 ++-
 kernel/exit.c                                      |  17 +-
 kernel/module/main.c                               |   5 +-
 kernel/sched/core.c                                |   4 +-
 kernel/sched/ext.c                                 |   5 +
 kernel/sched/ext.h                                 |   2 +
 kernel/sched/fair.c                                |   4 +-
 kernel/sched/rt.c                                  |  54 +-
 kernel/time/clocksource.c                          |   2 +-
 kernel/trace/ftrace.c                              |  10 +-
 kernel/trace/trace.c                               |   5 +-
 kernel/trace/trace_events_filter.c                 | 184 ++++--
 kernel/trace/trace_functions_graph.c               |   6 +
 kernel/watchdog.c                                  |  41 +-
 kernel/workqueue.c                                 |   7 +-
 lib/Kconfig                                        |   1 +
 lib/alloc_tag.c                                    |  12 +-
 lib/codetag.c                                      |  34 +-
 mm/execmem.c                                       |  40 +-
 mm/hugetlb.c                                       |  67 +-
 mm/madvise.c                                       |   7 +-
 mm/page-writeback.c                                |   2 +-
 mm/vma.c                                           |  49 +-
 mm/vma.h                                           |   7 +
 net/atm/common.c                                   |   1 +
 net/atm/lec.c                                      |  12 +-
 net/atm/raw.c                                      |   2 +-
 net/bridge/br_mst.c                                |   4 +-
 net/bridge/br_multicast.c                          | 103 ++-
 net/bridge/br_private.h                            |  11 +-
 net/core/dev.c                                     |   1 +
 net/core/filter.c                                  |  19 +-
 net/core/page_pool.c                               |   4 +
 net/core/skbuff.c                                  |   3 -
 net/core/skmsg.c                                   |   3 +-
 net/core/sock.c                                    |   4 +-
 net/ipv4/route.c                                   |   4 +
 net/ipv4/tcp_fastopen.c                            |   3 +
 net/ipv4/tcp_input.c                               |  79 +--
 net/ipv6/calipso.c                                 |   8 +
 net/mac80211/cfg.c                                 |   2 +-
 net/mac80211/debugfs_sta.c                         |   6 -
 net/mac80211/mesh_hwmp.c                           |   6 +-
 net/mac80211/rate.c                                |   2 -
 net/mac80211/sta_info.c                            |  28 -
 net/mac80211/sta_info.h                            |  11 -
 net/mac80211/tx.c                                  |  15 +-
 net/mpls/af_mpls.c                                 |   4 +-
 net/netfilter/nft_set_pipapo.c                     |   6 +
 net/nfc/nci/uart.c                                 |   8 +-
 net/sched/sch_sfq.c                                |  10 +-
 net/sched/sch_taprio.c                             |   6 +-
 net/sctp/socket.c                                  |   3 +-
 net/sunrpc/cache.c                                 |  17 +-
 net/sunrpc/svc.c                                   |  11 +-
 net/sunrpc/xprtrdma/svc_rdma_transport.c           |   1 +
 net/sunrpc/xprtsock.c                              |   5 +
 net/tipc/crypto.c                                  |   2 +-
 net/tipc/udp_media.c                               |   4 +-
 net/xfrm/xfrm_user.c                               |  52 +-
 rust/kernel/devres.rs                              |  97 ++-
 scripts/Makefile.compiler                          |   4 +-
 security/selinux/xfrm.c                            |   2 +-
 sound/pci/hda/cs35l41_hda_property.c               |   6 +
 sound/pci/hda/hda_intel.c                          |   2 +
 sound/pci/hda/patch_realtek.c                      |  15 +
 sound/soc/amd/acp/acp-sdw-legacy-mach.c            |   2 +-
 sound/soc/amd/acp/acp-sdw-sof-mach.c               |   2 +-
 sound/soc/amd/yc/acp6x-mach.c                      |   9 +-
 sound/soc/codecs/tas2770.c                         |  30 +-
 sound/soc/codecs/wcd937x.c                         |   7 +-
 sound/soc/generic/simple-card-utils.c              |  23 +-
 sound/soc/meson/meson-card-utils.c                 |   2 +-
 sound/soc/qcom/sdm845.c                            |   4 +
 sound/soc/sdw_utils/soc_sdw_rt_amp.c               |   2 +-
 sound/soc/tegra/tegra210_ahub.c                    |   2 +
 sound/usb/mixer_maps.c                             |  12 +
 tools/bpf/bpftool/cgroup.c                         |  12 +-
 tools/lib/bpf/btf.c                                |  18 +-
 tools/lib/bpf/libbpf.c                             |   6 +
 tools/net/ynl/pyynl/lib/ynl.py                     |  67 +-
 tools/perf/tests/tests-scripts.c                   |   1 +
 tools/perf/util/print-events.c                     |   1 +
 tools/testing/selftests/x86/Makefile               |   2 +-
 tools/testing/selftests/x86/sigtrap_loop.c         | 101 +++
 tools/testing/vma/vma_internal.h                   |   2 +
 tools/tracing/rtla/src/utils.c                     |   2 +
 661 files changed, 6942 insertions(+), 3782 deletions(-)
Tested-by on the v1 series
#609 lore raw
In reply to Greg Kroah-Hartman

Hi Greg

Quoted 10 lines · Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.15.4 release. There are 592 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, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.

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

Quoted 8 lines
        https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gz

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

thanks,

greg k-h

6.15.4-rc1 tested.

Build successfully completed.
Boot successfully completed.
No dmesg regressions.
Video output normal.
Sound output normal.

Lenovo ThinkPad X1 Carbon Gen10(Intel i7-1260P(x86_64) arch linux)

[    0.000000] Linux version 6.15.4-rc1rv-gde19bfa00d6f

(takeshi@ThinkPadX1Gen10J0764) (gcc (GCC) 15.1.1 20250425, GNU ld (GNU Binutils) 2.44.0) #1 SMP PREEMPT_DYNAMIC Tue Jun 24 20:14:32 JST 2025

Thanks