kernel-packages/linux-pikaos-6.12.10
2
0
Fork 0
generated from kernel-packages/linux-pikaos-6.11.8
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update patches/0001-cachyos-base-all.patch

Browse Source
This commit is contained in:
ferreo 2025-01-12 15:25:41 +01:00
parent 4872ec5186
commit 62887649c9
1 changed files with 130 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
patches/0001-cachyos-base-all.patch
View File

@ -1,6 +1,6 @@
From 720d41e042e68b79484fdac3f913f58b6eac6a14 Mon Sep 17 00:00:00 2001 From 26a3b5401e1e07e2462dca715baf251161031432 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:32:56 +0100 Date: Thu, 9 Jan 2025 16:26:47 +0100
Subject: [PATCH 01/13] amd-cache-optimizer Subject: [PATCH 01/13] amd-cache-optimizer
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -272,9 +272,9 @@ index 000000000000..0f6d3c54d879
-- --
2.48.0.rc1 2.48.0.rc1
From 95a158ca8276de49ce922ff8558d11ab4d207d8c Mon Sep 17 00:00:00 2001 From 3cf853a692e28a4760849d5b392bbeaf4245ce0b Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:33:09 +0100 Date: Thu, 9 Jan 2025 16:34:55 +0100
Subject: [PATCH 02/13] amd-pstate Subject: [PATCH 02/13] amd-pstate
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -292,9 +292,9 @@ Signed-off-by: Peter Jung <admin@ptr1337.dev>
arch/x86/kernel/smpboot.c | 14 +- arch/x86/kernel/smpboot.c | 14 +-
arch/x86/mm/init.c | 23 +- arch/x86/mm/init.c | 23 +-
drivers/cpufreq/amd-pstate-ut.c | 6 +- drivers/cpufreq/amd-pstate-ut.c | 6 +-
drivers/cpufreq/amd-pstate.c | 235 +++++++++----------- drivers/cpufreq/amd-pstate.c | 237 +++++++++-----------
tools/arch/x86/include/asm/cpufeatures.h | 2 +- tools/arch/x86/include/asm/cpufeatures.h | 2 +-
15 files changed, 239 insertions(+), 145 deletions(-) 15 files changed, 240 insertions(+), 146 deletions(-)
diff --git a/Documentation/admin-guide/pm/amd-pstate.rst b/Documentation/admin-guide/pm/amd-pstate.rst diff --git a/Documentation/admin-guide/pm/amd-pstate.rst b/Documentation/admin-guide/pm/amd-pstate.rst
index 210a808b74ec..412423c54f25 100644 index 210a808b74ec..412423c54f25 100644
@ -649,7 +649,7 @@ index f66701514d90..a261d7300951 100644
} }
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 91d3c3b1c2d3..66e5dfc711c0 100644 index 91d3c3b1c2d3..f6d04eb40af9 100644
--- a/drivers/cpufreq/amd-pstate.c --- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c
@@ -233,7 +233,7 @@ static int amd_pstate_get_energy_pref_index(struct amd_cpudata *cpudata) @@ -233,7 +233,7 @@ static int amd_pstate_get_energy_pref_index(struct amd_cpudata *cpudata)
@ -828,6 +828,15 @@ index 91d3c3b1c2d3..66e5dfc711c0 100644
lowest_perf = READ_ONCE(cpudata->lowest_perf); lowest_perf = READ_ONCE(cpudata->lowest_perf);
if (min_limit_perf < lowest_perf) if (min_limit_perf < lowest_perf)
@@ -771,7 +802,7 @@ static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
* sched_set_itmt_support(true) has been called and it is valid to
* update them at any time after it has been called.
*/
- sched_set_itmt_core_prio((int)READ_ONCE(cpudata->highest_perf), cpudata->cpu);
+ sched_set_itmt_core_prio((int)READ_ONCE(cpudata->prefcore_ranking), cpudata->cpu);
schedule_work(&sched_prefcore_work);
}
@@ -825,7 +856,7 @@ static u32 amd_pstate_get_transition_delay_us(unsigned int cpu) @@ -825,7 +856,7 @@ static u32 amd_pstate_get_transition_delay_us(unsigned int cpu)
transition_delay_ns = cppc_get_transition_latency(cpu); transition_delay_ns = cppc_get_transition_latency(cpu);
@ -1174,9 +1183,9 @@ index dd4682857c12..23698d0f4bb4 100644
-- --
2.48.0.rc1 2.48.0.rc1
From a781a95178b415da9b016670497607c029f9f73b Mon Sep 17 00:00:00 2001 From ce805cd6b10a3c02064ce29d5368294478d5488b Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:46:56 +0100 Date: Thu, 9 Jan 2025 16:36:26 +0100
Subject: [PATCH 03/13] amd-tlb-broadcast Subject: [PATCH 03/13] amd-tlb-broadcast
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -2209,10 +2218,10 @@ index d322ddfe6791..d9ecd1ad789f 100644
address, end); address, end);
hugetlb_zap_begin(vma, &range.start, &range.end); hugetlb_zap_begin(vma, &range.start, &range.end);
diff --git a/mm/mmap.c b/mm/mmap.c diff --git a/mm/mmap.c b/mm/mmap.c
index 7fb4c1e97175..8dad3bfb7b9b 100644 index 6183805f6f9e..c72cbe087a27 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -1927,7 +1927,6 @@ void exit_mmap(struct mm_struct *mm) @@ -1931,7 +1931,6 @@ void exit_mmap(struct mm_struct *mm)
goto destroy; goto destroy;
} }
@ -2220,7 +2229,7 @@ index 7fb4c1e97175..8dad3bfb7b9b 100644
flush_cache_mm(mm); flush_cache_mm(mm);
tlb_gather_mmu_fullmm(&tlb, mm); tlb_gather_mmu_fullmm(&tlb, mm);
/* update_hiwater_rss(mm) here? but nobody should be looking */ /* update_hiwater_rss(mm) here? but nobody should be looking */
@@ -2370,7 +2369,6 @@ int relocate_vma_down(struct vm_area_struct *vma, unsigned long shift) @@ -2374,7 +2373,6 @@ int relocate_vma_down(struct vm_area_struct *vma, unsigned long shift)
vma, new_start, length, false, true)) vma, new_start, length, false, true))
return -ENOMEM; return -ENOMEM;
@ -2263,9 +2272,9 @@ index 7621384d64cf..c7461e21ef70 100644
-- --
2.48.0.rc1 2.48.0.rc1
From 56cd1a9140f7307c0e7122fbd3402af8623c9ef5 Mon Sep 17 00:00:00 2001 From dff70be32d2c190e19590381ce5ec62ab9100a15 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:33:42 +0100 Date: Thu, 9 Jan 2025 16:36:39 +0100
Subject: [PATCH 04/13] autofdo Subject: [PATCH 04/13] autofdo
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -2679,7 +2688,7 @@ index a578178468f1..a2d251917629 100644
M: Petr Mladek <pmladek@suse.com> M: Petr Mladek <pmladek@suse.com>
R: Steven Rostedt <rostedt@goodmis.org> R: Steven Rostedt <rostedt@goodmis.org>
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8a10105c2539..7eb3671440fc 100644 index 80151f53d8ee..61c3a727f369 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1019,6 +1019,8 @@ include-$(CONFIG_KMSAN) += scripts/Makefile.kmsan @@ -1019,6 +1019,8 @@ include-$(CONFIG_KMSAN) += scripts/Makefile.kmsan
@ -3009,9 +3018,9 @@ index 3d27983dc908..6f64d611faea 100644
-- --
2.48.0.rc1 2.48.0.rc1
From e72d469d61a4320a06e56466efad4158b13f5e69 Mon Sep 17 00:00:00 2001 From 665449fc260d8c493b4f983fecfe0028da4e1ddd Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:33:53 +0100 Date: Thu, 9 Jan 2025 16:36:50 +0100
Subject: [PATCH 05/13] bbr3 Subject: [PATCH 05/13] bbr3
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -6043,7 +6052,7 @@ index 0306d257fa64..28f581c0dab7 100644
icsk->icsk_ca_ops->init(sk); icsk->icsk_ca_ops->init(sk);
if (tcp_ca_needs_ecn(sk)) if (tcp_ca_needs_ecn(sk))
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 2d844e1f867f..efb92e47a632 100644 index 2d43b29da15e..c3252eb30ce1 100644
--- a/net/ipv4/tcp_input.c --- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c
@@ -370,7 +370,7 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb) @@ -370,7 +370,7 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)
@ -6395,9 +6404,9 @@ index 79064580c8c0..697270ce1ea6 100644
-- --
2.48.0.rc1 2.48.0.rc1
From bfc08381752914883a9b653d57e9abc41565e7bf Mon Sep 17 00:00:00 2001 From 3ff09f2d9488979acccefbda05e384ed0619cef5 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:34:03 +0100 Date: Thu, 9 Jan 2025 16:37:07 +0100
Subject: [PATCH 06/13] cachy Subject: [PATCH 06/13] cachy
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -6627,7 +6636,7 @@ index 6d942b5c58f0..1768a106aab1 100644
====== ======
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 7eb3671440fc..3f7d6b08f74d 100644 index 61c3a727f369..d7e04964ee7a 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -802,11 +802,19 @@ KBUILD_CFLAGS += -fno-delete-null-pointer-checks @@ -802,11 +802,19 @@ KBUILD_CFLAGS += -fno-delete-null-pointer-checks
@ -13813,7 +13822,7 @@ index 000000000000..7531223355e5
+module_exit(vhba_exit); +module_exit(vhba_exit);
+ +
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index 61fff5d34ed5..18dc2544700b 100644 index 8617adc6becd..f58cc697122c 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -205,6 +205,14 @@ static inline void __mm_zero_struct_page(struct page *page) @@ -205,6 +205,14 @@ static inline void __mm_zero_struct_page(struct page *page)
@ -14430,7 +14439,7 @@ index bd5183dfd879..3a410f53a07c 100644
/* /*
diff --git a/mm/vmscan.c b/mm/vmscan.c diff --git a/mm/vmscan.c b/mm/vmscan.c
index 28ba2b06fc7d..38602f8ad5aa 100644 index 67a680e4b484..9b9304c91dcc 100644
--- a/mm/vmscan.c --- a/mm/vmscan.c
+++ b/mm/vmscan.c +++ b/mm/vmscan.c
@@ -148,6 +148,15 @@ struct scan_control { @@ -148,6 +148,15 @@ struct scan_control {
@ -14473,7 +14482,7 @@ index 28ba2b06fc7d..38602f8ad5aa 100644
#ifdef CONFIG_MEMCG #ifdef CONFIG_MEMCG
@@ -1090,6 +1112,10 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, @@ -1097,6 +1119,10 @@ static unsigned int shrink_folio_list(struct list_head *folio_list,
folio_mapped(folio) && folio_test_referenced(folio)) folio_mapped(folio) && folio_test_referenced(folio))
goto keep_locked; goto keep_locked;
@ -14484,7 +14493,7 @@ index 28ba2b06fc7d..38602f8ad5aa 100644
/* /*
* The number of dirty pages determines if a node is marked * The number of dirty pages determines if a node is marked
* reclaim_congested. kswapd will stall and start writing * reclaim_congested. kswapd will stall and start writing
@@ -2415,6 +2441,15 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, @@ -2422,6 +2448,15 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
goto out; goto out;
} }
@ -14500,7 +14509,7 @@ index 28ba2b06fc7d..38602f8ad5aa 100644
/* /*
* If there is enough inactive page cache, we do not reclaim * If there is enough inactive page cache, we do not reclaim
* anything from the anonymous working right now. * anything from the anonymous working right now.
@@ -2559,6 +2594,14 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, @@ -2566,6 +2601,14 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
BUG(); BUG();
} }
@ -14515,7 +14524,7 @@ index 28ba2b06fc7d..38602f8ad5aa 100644
nr[lru] = scan; nr[lru] = scan;
} }
} }
@@ -2578,6 +2621,96 @@ static bool can_age_anon_pages(struct pglist_data *pgdat, @@ -2585,6 +2628,96 @@ static bool can_age_anon_pages(struct pglist_data *pgdat,
return can_demote(pgdat->node_id, sc); return can_demote(pgdat->node_id, sc);
} }
@ -14612,7 +14621,7 @@ index 28ba2b06fc7d..38602f8ad5aa 100644
#ifdef CONFIG_LRU_GEN #ifdef CONFIG_LRU_GEN
#ifdef CONFIG_LRU_GEN_ENABLED #ifdef CONFIG_LRU_GEN_ENABLED
@@ -4528,6 +4661,12 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw @@ -4535,6 +4668,12 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw
*/ */
if (!swappiness) if (!swappiness)
type = LRU_GEN_FILE; type = LRU_GEN_FILE;
@ -14625,7 +14634,7 @@ index 28ba2b06fc7d..38602f8ad5aa 100644
else if (min_seq[LRU_GEN_ANON] < min_seq[LRU_GEN_FILE]) else if (min_seq[LRU_GEN_ANON] < min_seq[LRU_GEN_FILE])
type = LRU_GEN_ANON; type = LRU_GEN_ANON;
else if (swappiness == 1) else if (swappiness == 1)
@@ -4807,6 +4946,8 @@ static int shrink_one(struct lruvec *lruvec, struct scan_control *sc) @@ -4814,6 +4953,8 @@ static int shrink_one(struct lruvec *lruvec, struct scan_control *sc)
struct mem_cgroup *memcg = lruvec_memcg(lruvec); struct mem_cgroup *memcg = lruvec_memcg(lruvec);
struct pglist_data *pgdat = lruvec_pgdat(lruvec); struct pglist_data *pgdat = lruvec_pgdat(lruvec);
@ -14634,7 +14643,7 @@ index 28ba2b06fc7d..38602f8ad5aa 100644
/* lru_gen_age_node() called mem_cgroup_calculate_protection() */ /* lru_gen_age_node() called mem_cgroup_calculate_protection() */
if (mem_cgroup_below_min(NULL, memcg)) if (mem_cgroup_below_min(NULL, memcg))
return MEMCG_LRU_YOUNG; return MEMCG_LRU_YOUNG;
@@ -5954,6 +6095,8 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) @@ -5961,6 +6102,8 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)
prepare_scan_control(pgdat, sc); prepare_scan_control(pgdat, sc);
@ -14659,9 +14668,9 @@ index fe7947f77406..99e138cfdd95 100644
-- --
2.48.0.rc1 2.48.0.rc1
From aba6b6426a05c3f2c08c1059bf13d7bd5b653dbe Mon Sep 17 00:00:00 2001 From 4229b688e49e9265bfe5b86bb8b5babd82b73acf Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:34:15 +0100 Date: Thu, 9 Jan 2025 16:37:17 +0100
Subject: [PATCH 07/13] crypto Subject: [PATCH 07/13] crypto
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -16265,9 +16274,9 @@ index bbcff1fb78cb..752812bc4991 100644
-- --
2.48.0.rc1 2.48.0.rc1
From 12373a066ea908fb7d9d9e335e328239bf32ea79 Mon Sep 17 00:00:00 2001 From 2682c67e0617fac2dc28bbe1bb2514b8206d9388 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:35:55 +0100 Date: Thu, 9 Jan 2025 16:37:27 +0100
Subject: [PATCH 08/13] fixes Subject: [PATCH 08/13] fixes
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -16277,8 +16286,9 @@ Signed-off-by: Peter Jung <admin@ptr1337.dev>
arch/x86/mm/tlb.c | 2 +- arch/x86/mm/tlb.c | 2 +-
drivers/bluetooth/btmtk.c | 4 +- drivers/bluetooth/btmtk.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 51 ++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 50 +++++++++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ++- 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/gpu/drm/drm_edid.c | 47 ++++++++++++++--
drivers/hid/hid-ids.h | 1 + drivers/hid/hid-ids.h | 1 +
fs/ntfs3/bitmap.c | 62 ++++++---------------- fs/ntfs3/bitmap.c | 62 ++++++----------------
@ -16290,10 +16300,11 @@ Signed-off-by: Peter Jung <admin@ptr1337.dev>
kernel/futex/core.c | 22 -------- kernel/futex/core.c | 22 --------
kernel/futex/futex.h | 59 +++++++++++++++++++- kernel/futex/futex.h | 59 +++++++++++++++++++-
kernel/kprobes.c | 23 ++++---- kernel/kprobes.c | 23 ++++----
kernel/sched/ext.c | 7 +--
kernel/workqueue.c | 22 ++++++-- kernel/workqueue.c | 22 ++++++--
scripts/package/PKGBUILD | 5 ++ scripts/package/PKGBUILD | 5 ++
sound/pci/hda/patch_realtek.c | 2 + sound/pci/hda/patch_realtek.c | 2 +
21 files changed, 257 insertions(+), 119 deletions(-) 23 files changed, 277 insertions(+), 122 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig diff --git a/arch/Kconfig b/arch/Kconfig
index 00551f340dbe..833b2344ce79 100644 index 00551f340dbe..833b2344ce79 100644
@ -16391,7 +16402,7 @@ index 7617963901fa..03933b2c5ebc 100644
struct debugfs_blob_wrapper debugfs_vbios_blob; struct debugfs_blob_wrapper debugfs_vbios_blob;
struct debugfs_blob_wrapper debugfs_discovery_blob; struct debugfs_blob_wrapper debugfs_discovery_blob;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 51904906545e..2ba12047a95f 100644 index 45e28726e148..d77772e2dabf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -145,6 +145,8 @@ const char *amdgpu_asic_name[] = { @@ -145,6 +145,8 @@ const char *amdgpu_asic_name[] = {
@ -16403,15 +16414,7 @@ index 51904906545e..2ba12047a95f 100644
/** /**
* DOC: pcie_replay_count * DOC: pcie_replay_count
@@ -3723,6 +3725,7 @@ static int amdgpu_device_ip_resume_phase3(struct amdgpu_device *adev) @@ -4511,6 +4513,11 @@ int amdgpu_device_init(struct amdgpu_device *adev,
r = adev->ip_blocks[i].version->funcs->resume(adev);
if (r)
return r;
+ adev->ip_blocks[i].status.hw = true;
}
}
@@ -4507,6 +4510,11 @@ int amdgpu_device_init(struct amdgpu_device *adev,
amdgpu_device_check_iommu_direct_map(adev); amdgpu_device_check_iommu_direct_map(adev);
@ -16423,7 +16426,7 @@ index 51904906545e..2ba12047a95f 100644
return 0; return 0;
release_ras_con: release_ras_con:
@@ -4571,6 +4579,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) @@ -4575,6 +4582,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)
drain_workqueue(adev->mman.bdev.wq); drain_workqueue(adev->mman.bdev.wq);
adev->shutdown = true; adev->shutdown = true;
@ -16432,7 +16435,7 @@ index 51904906545e..2ba12047a95f 100644
/* make sure IB test finished before entering exclusive mode /* make sure IB test finished before entering exclusive mode
* to avoid preemption on IB test * to avoid preemption on IB test
*/ */
@@ -4688,8 +4698,8 @@ static int amdgpu_device_evict_resources(struct amdgpu_device *adev) @@ -4692,8 +4701,8 @@ static int amdgpu_device_evict_resources(struct amdgpu_device *adev)
{ {
int ret; int ret;
@ -16443,7 +16446,7 @@ index 51904906545e..2ba12047a95f 100644
return 0; return 0;
ret = amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM); ret = amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM);
@@ -4701,6 +4711,41 @@ static int amdgpu_device_evict_resources(struct amdgpu_device *adev) @@ -4705,6 +4714,41 @@ static int amdgpu_device_evict_resources(struct amdgpu_device *adev)
/* /*
* Suspend & resume. * Suspend & resume.
*/ */
@ -16485,7 +16488,7 @@ index 51904906545e..2ba12047a95f 100644
/** /**
* amdgpu_device_prepare - prepare for device suspend * amdgpu_device_prepare - prepare for device suspend
* *
@@ -4740,7 +4785,7 @@ int amdgpu_device_prepare(struct drm_device *dev) @@ -4744,7 +4788,7 @@ int amdgpu_device_prepare(struct drm_device *dev)
return 0; return 0;
unprepare: unprepare:
@ -16518,6 +16521,38 @@ index 852e6f315576..94a9a9266f8e 100644
/* let modprobe override vga console setting */ /* let modprobe override vga console setting */
return pci_register_driver(&amdgpu_kms_pci_driver); 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 diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 855beafb76ff..ad78059ee954 100644 index 855beafb76ff..ad78059ee954 100644
--- a/drivers/gpu/drm/drm_edid.c --- a/drivers/gpu/drm/drm_edid.c
@ -17147,11 +17182,44 @@ index da59c68df841..55d0835ea0cf 100644
jump_label_unlock(); jump_label_unlock();
return ret; return ret;
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 40f915f893e2..8c47a77bd660 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,
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);
- dump_line(s, " sticky/holding_cpu=%d/%d dsq_id=%s dsq_vtime=%llu",
+ dump_line(s, " sticky/holding_cpu=%d/%d dsq_id=%s dsq_vtime=%llu slice=%llu",
p->scx.sticky_cpu, p->scx.holding_cpu, dsq_id_buf,
- p->scx.dsq_vtime);
+ p->scx.dsq_vtime, p->scx.slice);
dump_line(s, " cpus=%*pb", cpumask_pr_args(p->cpus_ptr));
if (SCX_HAS_OP(dump_task)) {
diff --git a/kernel/workqueue.c b/kernel/workqueue.c diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 9949ffad8df0..8b07576814a5 100644 index cee65cb43108..f7d8fc204579 100644
--- a/kernel/workqueue.c --- a/kernel/workqueue.c
+++ b/kernel/workqueue.c +++ b/kernel/workqueue.c
@@ -3833,16 +3833,28 @@ static bool flush_workqueue_prep_pwqs(struct workqueue_struct *wq, @@ -3837,16 +3837,28 @@ static bool flush_workqueue_prep_pwqs(struct workqueue_struct *wq,
{ {
bool wait = false; bool wait = false;
struct pool_workqueue *pwq; struct pool_workqueue *pwq;
@ -17183,7 +17251,7 @@ index 9949ffad8df0..8b07576814a5 100644
if (flush_color >= 0) { if (flush_color >= 0) {
WARN_ON_ONCE(pwq->flush_color != -1); WARN_ON_ONCE(pwq->flush_color != -1);
@@ -3859,9 +3871,11 @@ static bool flush_workqueue_prep_pwqs(struct workqueue_struct *wq, @@ -3863,9 +3875,11 @@ static bool flush_workqueue_prep_pwqs(struct workqueue_struct *wq,
pwq->work_color = work_color; pwq->work_color = work_color;
} }
@ -17197,7 +17265,7 @@ index 9949ffad8df0..8b07576814a5 100644
complete(&wq->first_flusher->done); complete(&wq->first_flusher->done);
diff --git a/scripts/package/PKGBUILD b/scripts/package/PKGBUILD diff --git a/scripts/package/PKGBUILD b/scripts/package/PKGBUILD
index f83493838cf9..4010899652b8 100644 index dca706617adc..89d3aef160b7 100644
--- a/scripts/package/PKGBUILD --- a/scripts/package/PKGBUILD
+++ b/scripts/package/PKGBUILD +++ b/scripts/package/PKGBUILD
@@ -91,6 +91,11 @@ _package-headers() { @@ -91,6 +91,11 @@ _package-headers() {
@ -17213,10 +17281,10 @@ index f83493838cf9..4010899652b8 100644
mkdir -p "${builddir}" mkdir -p "${builddir}"
cp System.map "${builddir}/System.map" cp System.map "${builddir}/System.map"
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 192fc75b51e6..d88fc0ca893d 100644 index 3ed82f98e2de..8cae9004fb6c 100644
--- a/sound/pci/hda/patch_realtek.c --- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c
@@ -10604,6 +10604,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { @@ -10625,6 +10625,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC),
SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS), SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
@ -17228,7 +17296,7 @@ index 192fc75b51e6..d88fc0ca893d 100644
-- --
2.48.0.rc1 2.48.0.rc1
From 012daedc3acd973c050ae9497e892f884759d0c1 Mon Sep 17 00:00:00 2001 From c50e67956d592d75217878c821e0d82cc2d34aef Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:36:13 +0100 Date: Thu, 2 Jan 2025 12:36:13 +0100
Subject: [PATCH 09/13] ntsync Subject: [PATCH 09/13] ntsync
@ -20258,7 +20326,7 @@ index 000000000000..3aad311574c4
-- --
2.48.0.rc1 2.48.0.rc1
From eedb315d53e038424a8d1a87683aede04a00a1c6 Mon Sep 17 00:00:00 2001 From a950dc524c02418e8190b8b658acfc636f16dc2b Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:36:25 +0100 Date: Thu, 2 Jan 2025 12:36:25 +0100
Subject: [PATCH 10/13] perf-per-core Subject: [PATCH 10/13] perf-per-core
@ -21255,7 +21323,7 @@ index 2361ed4d2b15..37a9afffb59e 100644
-- --
2.48.0.rc1 2.48.0.rc1
From 04af767f7fead4b41ab46b1a60abb813a78b4734 Mon Sep 17 00:00:00 2001 From 7f6250498af65dddd6a238984829d8b08e9016b8 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:36:37 +0100 Date: Thu, 2 Jan 2025 12:36:37 +0100
Subject: [PATCH 11/13] pksm Subject: [PATCH 11/13] pksm
@ -21688,7 +21756,7 @@ index 01071182763e..7394bad8178e 100644
-- --
2.48.0.rc1 2.48.0.rc1
From a95cb1707ef01550e8564667856d28f1bd1e23cb Mon Sep 17 00:00:00 2001 From 1002df1884e8c5d50d68de40c8589a4c5972ffb3 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:36:48 +0100 Date: Thu, 2 Jan 2025 12:36:48 +0100
Subject: [PATCH 12/13] t2 Subject: [PATCH 12/13] t2
@ -31937,7 +32005,7 @@ index b03d526e4c45..66d09cbec5a8 100755
-- --
2.48.0.rc1 2.48.0.rc1
From 0bfd166c7a3a5bda18934375b06d80c63fea950c Mon Sep 17 00:00:00 2001 From b5fd8ae7f5b5a06d48fed1a23aa1aa147fbdcb66 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 2 Jan 2025 12:36:58 +0100 Date: Thu, 2 Jan 2025 12:36:58 +0100
Subject: [PATCH 13/13] zstd Subject: [PATCH 13/13] zstd
@ -50588,3 +50656,4 @@ index 469fc3059be0..0ae819f0c927 100644
-- --
2.48.0.rc1 2.48.0.rc1