6.12: Sync

Signed-off-by: Peter Jung <[email protected]>

6.12/0001-amd-cache-optimizer.patch

@@ -1,4 +1,4 @@
-From 26a3b5401e1e07e2462dca715baf251161031432 Mon Sep 17 00:00:00 2001
+From bb0b2f41ec05d927b85a13f658612d5d405873e4 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:26:47 +0100
 Subject: [PATCH 01/13] amd-cache-optimizer

6.12/0002-amd-pstate.patch

@@ -1,4 +1,4 @@
-From 3cf853a692e28a4760849d5b392bbeaf4245ce0b Mon Sep 17 00:00:00 2001
+From 2cf82c45902698fc89ffa771c7136462ddd421b0 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:34:55 +0100
 Subject: [PATCH 02/13] amd-pstate

6.12/0003-amd-tlb-broadcast.patch

@@ -1,4 +1,4 @@
-From ce805cd6b10a3c02064ce29d5368294478d5488b Mon Sep 17 00:00:00 2001
+From 914b3201c38006fa1463c3b48ad232c4eca8abf8 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:36:26 +0100
 Subject: [PATCH 03/13] amd-tlb-broadcast

6.12/0004-autofdo.patch

@@ -1,4 +1,4 @@
-From dff70be32d2c190e19590381ce5ec62ab9100a15 Mon Sep 17 00:00:00 2001
+From eb97461166b9e57b9ae972e9aa7479eb0fae9f33 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:36:39 +0100
 Subject: [PATCH 04/13] autofdo
@@ -414,7 +414,7 @@ index a578178468f1..a2d251917629 100644
  M:	Petr Mladek <[email protected]>
  R:	Steven Rostedt <[email protected]>
 diff --git a/Makefile b/Makefile
-index 80151f53d8ee..61c3a727f369 100644
+index 233e9e88e402..bfe878ac442d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1019,6 +1019,8 @@ include-$(CONFIG_KMSAN)		+= scripts/Makefile.kmsan

6.12/0005-bbr3.patch

@@ -1,4 +1,4 @@
-From 665449fc260d8c493b4f983fecfe0028da4e1ddd Mon Sep 17 00:00:00 2001
+From 4b3f5047de6dc2c44b930e92c1daa808d19ec142 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:36:50 +0100
 Subject: [PATCH 05/13] bbr3
@@ -39,7 +39,7 @@ index 6a5e08b937b3..27aab715490e 100644
  		fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */
  		fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */
 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
-index c0deaafebfdc..d53f042d936e 100644
+index 4bd93571e6c1..43df8fc79a8a 100644
 --- a/include/net/inet_connection_sock.h
 +++ b/include/net/inet_connection_sock.h
 @@ -137,8 +137,8 @@ struct inet_connection_sock {

6.12/0006-cachy.patch

@@ -1,4 +1,4 @@
-From 3ff09f2d9488979acccefbda05e384ed0619cef5 Mon Sep 17 00:00:00 2001
+From 31c6933c17c509ce3882e6c63fcc6e9f0faee666 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:37:07 +0100
 Subject: [PATCH 06/13] cachy
@@ -230,7 +230,7 @@ index 6d942b5c58f0..1768a106aab1 100644
  ======
 
 diff --git a/Makefile b/Makefile
-index 61c3a727f369..d7e04964ee7a 100644
+index bfe878ac442d..88157a5ac011 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -802,11 +802,19 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointer-checks
@@ -1119,7 +1119,7 @@ index df17e79c45c7..e454488c1a31 100644
 +
  endmenu
 diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index ad3a3aa72b51..a80f8c9fc324 100644
+index ea403fece839..26bdd36cb086 100644
 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
 +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
 @@ -4501,7 +4501,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
@@ -1455,7 +1455,7 @@ index e71a721c12b9..a299dc4a8071 100644
  };
 
 diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
-index a93739688071..5fa58ef65371 100644
+index cd2cf0ffc0f5..89be57963440 100644
 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
 +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
 @@ -107,6 +107,8 @@
@@ -1616,7 +1616,7 @@ index a93739688071..5fa58ef65371 100644
 
  	smu_v13_0_0_set_supported_od_feature_mask(smu);
 diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
-index 1aedfafa507f..d19c63a8459a 100644
+index 7c753d795287..52ceab73c426 100644
 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
 +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
 @@ -83,6 +83,8 @@

6.12/0007-crypto.patch

@@ -1,4 +1,4 @@
-From 4229b688e49e9265bfe5b86bb8b5babd82b73acf Mon Sep 17 00:00:00 2001
+From 223b19d5089c93b7d3494fcd26ca11d2174683dc Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:37:17 +0100
 Subject: [PATCH 07/13] crypto

6.12/0008-fixes.patch

@@ -1,4 +1,4 @@
-From 2682c67e0617fac2dc28bbe1bb2514b8206d9388 Mon Sep 17 00:00:00 2001
+From 5593428ecd17d3d74757d098050079605c6500e1 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 9 Jan 2025 16:37:27 +0100
 Subject: [PATCH 08/13] fixes
@@ -12,7 +12,6 @@ Signed-off-by: Peter Jung <[email protected]>
  drivers/gpu/drm/amd/amdgpu/amdgpu.h        |  1 +
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 50 +++++++++++++++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    |  6 ++-
- drivers/gpu/drm/amd/amdkfd/kfd_debug.c     | 17 ++++++
  drivers/gpu/drm/drm_edid.c                 | 47 ++++++++++++++--
  drivers/hid/hid-ids.h                      |  1 +
  fs/ntfs3/bitmap.c                          | 62 ++++++----------------
@@ -24,11 +23,11 @@ Signed-off-by: Peter Jung <[email protected]>
  kernel/futex/core.c                        | 22 --------
  kernel/futex/futex.h                       | 59 +++++++++++++++++++-
  kernel/kprobes.c                           | 23 ++++----
- kernel/sched/ext.c                         |  7 +--
+ kernel/sched/ext.c                         |  4 +-
  kernel/workqueue.c                         | 22 ++++++--
  scripts/package/PKGBUILD                   |  5 ++
  sound/pci/hda/patch_realtek.c              |  2 +
- 23 files changed, 277 insertions(+), 122 deletions(-)
+ 22 files changed, 258 insertions(+), 121 deletions(-)
 
 diff --git a/arch/Kconfig b/arch/Kconfig
 index 00551f340dbe..833b2344ce79 100644
@@ -92,7 +91,7 @@ index 0ea9d1c077f6..0080175153ef 100644
  			cpumask_set_cpu(cpu, mm_cpumask(next));
 
 diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
-index 85e99641eaae..c1b6bcc6f7dd 100644
+index af487abe9932..454bfe096f95 100644
 --- a/drivers/bluetooth/btmtk.c
 +++ b/drivers/bluetooth/btmtk.c
 @@ -1329,7 +1329,6 @@ int btmtk_usb_setup(struct hci_dev *hdev)
@@ -245,38 +244,6 @@ index 852e6f315576..94a9a9266f8e 100644
  	/* let modprobe override vga console setting */
  	return pci_register_driver(&amdgpu_kms_pci_driver);
 
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_debug.c b/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
-index 312dfa84f29f..a8abc3091801 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
-@@ -350,10 +350,27 @@ int kfd_dbg_set_mes_debug_mode(struct kfd_process_device *pdd, bool sq_trap_en)
- {
- 	uint32_t spi_dbg_cntl = pdd->spi_dbg_override | pdd->spi_dbg_launch_mode;
- 	uint32_t flags = pdd->process->dbg_flags;
-+	struct amdgpu_device *adev = pdd->dev->adev;
-+	int r;
-
- 	if (!kfd_dbg_is_per_vmid_supported(pdd->dev))
- 		return 0;
-
-+	if (!pdd->proc_ctx_cpu_ptr) {
-+			r = amdgpu_amdkfd_alloc_gtt_mem(adev,
-+				AMDGPU_MES_PROC_CTX_SIZE,
-+				&pdd->proc_ctx_bo,
-+				&pdd->proc_ctx_gpu_addr,
-+				&pdd->proc_ctx_cpu_ptr,
-+				false);
-+		if (r) {
-+			dev_err(adev->dev,
-+			"failed to allocate process context bo\n");
-+			return r;
-+		}
-+		memset(pdd->proc_ctx_cpu_ptr, 0, AMDGPU_MES_PROC_CTX_SIZE);
-+	}
-+
- 	return amdgpu_mes_set_shader_debugger(pdd->dev->adev, pdd->proc_ctx_gpu_addr, spi_dbg_cntl,
- 						pdd->watch_points, flags, sq_trap_en);
- }
 diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
 index 855beafb76ff..ad78059ee954 100644
 --- a/drivers/gpu/drm/drm_edid.c
@@ -907,27 +874,10 @@ index da59c68df841..55d0835ea0cf 100644
 
  	return ret;
 diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
-index 40f915f893e2..8c47a77bd660 100644
+index f928a67a07d2..466db77a81ae 100644
 --- a/kernel/sched/ext.c
 +++ b/kernel/sched/ext.c
-@@ -2917,7 +2917,7 @@ static void put_prev_task_scx(struct rq *rq, struct task_struct *p,
- 		 */
- 		if (p->scx.slice && !scx_rq_bypassing(rq)) {
- 			dispatch_enqueue(&rq->scx.local_dsq, p, SCX_ENQ_HEAD);
--			return;
-+			goto switch_class;
- 		}
-
- 		/*
-@@ -2934,6 +2934,7 @@ static void put_prev_task_scx(struct rq *rq, struct task_struct *p,
- 		}
- 	}
-
-+switch_class:
- 	if (next && next->sched_class != &ext_sched_class)
- 		switch_class(rq, next);
- }
-@@ -4760,9 +4761,9 @@ static void scx_dump_task(struct seq_buf *s, struct scx_dump_ctx *dctx,
+@@ -4804,9 +4804,9 @@ static void scx_dump_task(struct seq_buf *s, struct scx_dump_ctx *dctx,
  		  scx_get_task_state(p), p->scx.flags & ~SCX_TASK_STATE_MASK,
  		  p->scx.dsq_flags, ops_state & SCX_OPSS_STATE_MASK,
  		  ops_state >> SCX_OPSS_QSEQ_SHIFT);

6.12/0009-ntsync.patch

@@ -1,4 +1,4 @@
-From c50e67956d592d75217878c821e0d82cc2d34aef Mon Sep 17 00:00:00 2001
+From 3b109cb5025e185cbc37f2b06c388a4b5ae8a3c2 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 2 Jan 2025 12:36:13 +0100
 Subject: [PATCH 09/13] ntsync

6.12/0010-perf-per-core.patch

@@ -1,4 +1,4 @@
-From a950dc524c02418e8190b8b658acfc636f16dc2b Mon Sep 17 00:00:00 2001
+From ee69f1684d4527c551d95b6a2c0ae0d90f03e6cd Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 2 Jan 2025 12:36:25 +0100
 Subject: [PATCH 10/13] perf-per-core

6.12/0011-pksm.patch

@@ -1,4 +1,4 @@
-From 7f6250498af65dddd6a238984829d8b08e9016b8 Mon Sep 17 00:00:00 2001
+From 45740e3d202c38e0c8d60e91049384eb68a45c4e Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 2 Jan 2025 12:36:37 +0100
 Subject: [PATCH 11/13] pksm

6.12/0012-t2.patch

@@ -1,4 +1,4 @@
-From 1002df1884e8c5d50d68de40c8589a4c5972ffb3 Mon Sep 17 00:00:00 2001
+From ab8bd3182f08994f4c43af2728b5851d14638ceb Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 2 Jan 2025 12:36:48 +0100
 Subject: [PATCH 12/13] t2

6.12/0013-zstd.patch

@@ -1,4 +1,4 @@
-From b5fd8ae7f5b5a06d48fed1a23aa1aa147fbdcb66 Mon Sep 17 00:00:00 2001
+From 5d270985af7d8aee35942d99ebec2dbde905d04e Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 2 Jan 2025 12:36:58 +0100
 Subject: [PATCH 13/13] zstd