summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--0001-linux6.8.y-bore4.5.2.patch (renamed from 0001-linux6.8.y-bore4.5.0.patch)33
-rw-r--r--9999-fix-amdgpu-doorbell-regression.patch39
-rw-r--r--PKGBUILD16
-rw-r--r--config6
5 files changed, 82 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3757fa3091ec..916a3d90f850 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-g14
pkgdesc = Linux-g14
- pkgver = 6.8.8.arch1
+ pkgver = 6.8.9.arch1
pkgrel = 1
url = https://gitlab.com/dragonn/linux-g14.git
arch = x86_64
@@ -17,16 +17,16 @@ pkgbase = linux-g14
makedepends = xz
options = !strip
options = !debug
- source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.8.tar.xz
- source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.8.tar.sign
- source = https://github.com/archlinux/linux/releases/download/v6.8.8-arch1/linux-v6.8.8-arch1.patch.zst
- source = https://github.com/archlinux/linux/releases/download/v6.8.8-arch1/linux-v6.8.8-arch1.patch.zst.sig
+ source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.9.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.9.tar.sign
+ source = https://github.com/archlinux/linux/releases/download/v6.8.9-arch1/linux-v6.8.9-arch1.patch.zst
+ source = https://github.com/archlinux/linux/releases/download/v6.8.9-arch1/linux-v6.8.9-arch1.patch.zst.sig
source = config
source = choose-gcc-optimization.sh
source = sys-kernel_arch-sources-g14-6.8+--more-uarches-for-kernel.patch::https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/more-uarches-for-kernel-6.8-rc4%2B.patch
+ source = 9999-fix-amdgpu-doorbell-regression.patch
source = 0001-acpi-proc-idle-skip-dummy-wait.patch
source = 0027-mt76_-mt7921_-Disable-powersave-features-by-default.patch
- source = 0001-linux6.8.y-bore4.5.0.patch
source = 0032-Bluetooth-btusb-Add-a-new-PID-VID-0489-e0f6-for-MT7922.patch
source = 0035-Add_quirk_for_polling_the_KBD_port.patch
source = 0001-ACPI-resource-Skip-IRQ-override-on-ASUS-TUF-Gaming-A.patch
@@ -55,16 +55,16 @@ pkgbase = linux-g14
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
- sha256sums = 1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba
+ sha256sums = f905f1238ea7a8e85314bacf283302e8097006010d25fcea726d0de0ea5bc9b6
sha256sums = SKIP
- sha256sums = 3328bb421dc41135584adc6295ad64125c217dc57939d5397b29f53d16f02da4
+ sha256sums = 7a212eedb9fe3da99d6d5b63eb5f28c10ee4333e4d42ea1bb3842a15d3107bef
sha256sums = SKIP
- sha256sums = 0e78254fa2d2718e8912a41047266b9a63aa53fb74198da4389b97fa8bf8c40b
+ sha256sums = e35c97eb1ab405b12489032225dfb07be591be03d292d8f2131f0df8481d91d8
sha256sums = 278118011d7a2eeca9971ac97b31bf0c55ab55e99c662ab9ae4717b55819c9a2
- sha256sums = d69232afd0dd6982ae941cf2d1f577f4be2011e3bb847d1db37952acf416b5d3
+ sha256sums = f4e7fcd011f2691840d2c8c2361dca850a78ea33cc5c24d2e27c3e0294fd1dc5
+ sha256sums = f196d51a0536cf0fd6a17cead8be24920a75f392595abbb4654a6caa7e1cc17b
sha256sums = 0a7ea482fe20c403788d290826cec42fe395e5a6eab07b88845f8b9a9829998d
sha256sums = ed242f4be3f8eaade2a1d42157c5c6c86281917a08ae43221b088fafdc775ee7
- sha256sums = 09883311108d461da63a04012d7a2b7f6a4165ee0c4e9cb7a5dc3f9ade326fc7
sha256sums = a8e1e11a4ab1995cc4975c9b134a43ddfe7054ef0c965e52a7d8f9223e15c3e0
sha256sums = 315d1839630b37894a626bbc2aea012618b2e1ccb6f9d8aa27c0a3ce5e90e99c
sha256sums = a00b952d53df9d3617d93e8fba4146a4d6169ebe79f029b3a55cca68f738d8ea
diff --git a/0001-linux6.8.y-bore4.5.0.patch b/0001-linux6.8.y-bore4.5.2.patch
index 61db732d1be9..8685a1f63021 100644
--- a/0001-linux6.8.y-bore4.5.0.patch
+++ b/0001-linux6.8.y-bore4.5.2.patch
@@ -1,17 +1,17 @@
-From d8d9f2ff3cbf43b41269da34772b59bc9a11c5c2 Mon Sep 17 00:00:00 2001
+From a0fa22cd814b0b208fcb981db1b9482e6c6223d9 Mon Sep 17 00:00:00 2001
From: Masahito S <firelzrd@gmail.com>
-Date: Sun, 3 Mar 2024 05:14:31 +0900
-Subject: [PATCH] linux6.8.y-bore4.5.0
+Date: Fri, 8 Mar 2024 04:20:57 +0900
+Subject: [PATCH] linux6.8.y-bore4.5.2
---
include/linux/sched.h | 12 ++
init/Kconfig | 19 +++
- kernel/sched/core.c | 148 ++++++++++++++++++++
+ kernel/sched/core.c | 148 +++++++++++++++++++
kernel/sched/debug.c | 61 +++++++-
- kernel/sched/fair.c | 302 ++++++++++++++++++++++++++++++++++++++--
+ kernel/sched/fair.c | 306 ++++++++++++++++++++++++++++++++++++++--
kernel/sched/features.h | 4 +
kernel/sched/sched.h | 7 +
- 7 files changed, 538 insertions(+), 15 deletions(-)
+ 7 files changed, 542 insertions(+), 15 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ffe8f618ab..7ac6163f90 100644
@@ -67,7 +67,7 @@ index deda3d1413..9fa6b45c03 100644
bool "Automatic process group scheduling"
select CGROUPS
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 9116bcc903..b4bd85b3bf 100644
+index 9116bcc903..43e4311dba 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4507,6 +4507,143 @@ int wake_up_state(struct task_struct *p, unsigned int state)
@@ -240,7 +240,7 @@ index 9116bcc903..b4bd85b3bf 100644
+#ifdef CONFIG_SCHED_BORE
+ sched_init_bore();
-+ printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 4.5.0 by Masahito Suzuki");
++ printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 4.5.2 by Masahito Suzuki");
+#endif // CONFIG_SCHED_BORE
+
wait_bit_init();
@@ -355,7 +355,7 @@ index 8d5d98a583..a565363fdd 100644
P(se.avg.runnable_sum);
P(se.avg.util_sum);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 533547e3c9..429753c008 100644
+index 533547e3c9..3ee4e7e70e 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -19,6 +19,9 @@
@@ -409,7 +409,7 @@ index 533547e3c9..429753c008 100644
+u8 __read_mostly sched_burst_penalty_offset = 22;
+uint __read_mostly sched_burst_penalty_scale = 1280;
+uint __read_mostly sched_burst_cache_lifetime = 60000000;
-+u8 __read_mostly sched_vlag_deviation_limit = 8;
++u8 __read_mostly sched_vlag_deviation_limit = 11;
+static int __maybe_unused thirty_two = 32;
+static int __maybe_unused sixty_four = 64;
+static int __maybe_unused maxval_12_bits = 4095;
@@ -784,7 +784,7 @@ index 533547e3c9..429753c008 100644
if (sched_feat(PLACE_LAG) && cfs_rq->nr_running) {
struct sched_entity *curr = cfs_rq->curr;
unsigned long load;
-@@ -5231,12 +5479,18 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
+@@ -5231,12 +5479,22 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
load = cfs_rq->avg_load;
if (curr && curr->on_rq)
@@ -793,7 +793,11 @@ index 533547e3c9..429753c008 100644
- lag *= load + scale_load_down(se->load.weight);
+ lag *= load + entity_weight(se);
++#if !defined(CONFIG_SCHED_BORE)
if (WARN_ON_ONCE(!load))
++#else // CONFIG_SCHED_BORE
++ if (unlikely(!load))
++#endif // CONFIG_SCHED_BORE
load = 1;
- lag = div_s64(lag, load);
+ lag = div64_s64(lag, load);
@@ -806,7 +810,7 @@ index 533547e3c9..429753c008 100644
}
se->vruntime = vruntime - lag;
-@@ -6803,6 +7057,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
+@@ -6803,6 +7061,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
bool was_sched_idle = sched_idle_rq(rq);
util_est_dequeue(&rq->cfs, p);
@@ -821,7 +825,7 @@ index 533547e3c9..429753c008 100644
for_each_sched_entity(se) {
cfs_rq = cfs_rq_of(se);
-@@ -8552,16 +8814,25 @@ static void yield_task_fair(struct rq *rq)
+@@ -8552,16 +8818,25 @@ static void yield_task_fair(struct rq *rq)
/*
* Are we the only task in the tree?
*/
@@ -847,7 +851,7 @@ index 533547e3c9..429753c008 100644
/*
* Tell update_rq_clock() that we've just updated,
* so we don't do microscopic update in schedule()
-@@ -12651,6 +12922,9 @@ static void task_fork_fair(struct task_struct *p)
+@@ -12651,6 +12926,9 @@ static void task_fork_fair(struct task_struct *p)
curr = cfs_rq->curr;
if (curr)
update_curr(cfs_rq);
@@ -902,3 +906,4 @@ index 001fe047bd..da3ad1d4e1 100644
--
2.34.1
+
diff --git a/9999-fix-amdgpu-doorbell-regression.patch b/9999-fix-amdgpu-doorbell-regression.patch
new file mode 100644
index 000000000000..f4114e1c0c9f
--- /dev/null
+++ b/9999-fix-amdgpu-doorbell-regression.patch
@@ -0,0 +1,39 @@
+From 1709dfb37341b16cc1b7415c7cb2483952108396 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 29 Apr 2024 14:29:47 +0200
+Subject: drm/amdgpu: fix doorbell regression
+
+From: Shashank Sharma <shashank.sharma@amd.com>
+
+[ Upstream commit 705d0480e6ae5a73ca3a9c04316d0678e19a46ed ]
+
+This patch adds a missed handling of PL domain doorbell while
+handling VRAM faults.
+
+Cc: Christian Koenig <christian.koenig@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Fixes: a6ff969fe9cb ("drm/amdgpu: fix visible VRAM handling during faults")
+Reviewed-by: Christian Koenig <christian.koenig@amd.com>
+Signed-off-by: Shashank Sharma <shashank.sharma@amd.com>
+Signed-off-by: Arvind Yadav <arvind.yadav@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+index 851509c6e90eb..8d5413ffad301 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+@@ -424,7 +424,7 @@ bool amdgpu_res_cpu_visible(struct amdgpu_device *adev,
+ return false;
+
+ if (res->mem_type == TTM_PL_SYSTEM || res->mem_type == TTM_PL_TT ||
+- res->mem_type == AMDGPU_PL_PREEMPT)
++ res->mem_type == AMDGPU_PL_PREEMPT || res->mem_type == AMDGPU_PL_DOORBELL)
+ return true;
+
+ if (res->mem_type != TTM_PL_VRAM)
+--
+2.43.0
diff --git a/PKGBUILD b/PKGBUILD
index b8281fd256a6..2ab4b3b0ea93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-g14
-pkgver=6.8.8.arch1
+pkgver=6.8.9.arch1
pkgrel=1
pkgdesc='Linux-g14'
url="https://gitlab.com/dragonn/linux-g14.git"
@@ -34,12 +34,14 @@ source=(
"choose-gcc-optimization.sh"
"sys-kernel_arch-sources-g14-6.8+--more-uarches-for-kernel.patch"::"https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/more-uarches-for-kernel-6.8-rc4%2B.patch"
+
+ 9999-fix-amdgpu-doorbell-regression.patch
0001-acpi-proc-idle-skip-dummy-wait.patch
0027-mt76_-mt7921_-Disable-powersave-features-by-default.patch
- 0001-linux6.8.y-bore4.5.0.patch
+ #0001-linux6.8.y-bore4.5.2.patch
0032-Bluetooth-btusb-Add-a-new-PID-VID-0489-e0f6-for-MT7922.patch
0035-Add_quirk_for_polling_the_KBD_port.patch
@@ -82,16 +84,16 @@ validpgpkeys=(
83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig)
)
-sha256sums=('1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba'
+sha256sums=('f905f1238ea7a8e85314bacf283302e8097006010d25fcea726d0de0ea5bc9b6'
'SKIP'
- '3328bb421dc41135584adc6295ad64125c217dc57939d5397b29f53d16f02da4'
+ '7a212eedb9fe3da99d6d5b63eb5f28c10ee4333e4d42ea1bb3842a15d3107bef'
'SKIP'
- '0e78254fa2d2718e8912a41047266b9a63aa53fb74198da4389b97fa8bf8c40b'
+ 'e35c97eb1ab405b12489032225dfb07be591be03d292d8f2131f0df8481d91d8'
'278118011d7a2eeca9971ac97b31bf0c55ab55e99c662ab9ae4717b55819c9a2'
- 'd69232afd0dd6982ae941cf2d1f577f4be2011e3bb847d1db37952acf416b5d3'
+ 'f4e7fcd011f2691840d2c8c2361dca850a78ea33cc5c24d2e27c3e0294fd1dc5'
+ 'f196d51a0536cf0fd6a17cead8be24920a75f392595abbb4654a6caa7e1cc17b'
'0a7ea482fe20c403788d290826cec42fe395e5a6eab07b88845f8b9a9829998d'
'ed242f4be3f8eaade2a1d42157c5c6c86281917a08ae43221b088fafdc775ee7'
- '09883311108d461da63a04012d7a2b7f6a4165ee0c4e9cb7a5dc3f9ade326fc7'
'a8e1e11a4ab1995cc4975c9b134a43ddfe7054ef0c965e52a7d8f9223e15c3e0'
'315d1839630b37894a626bbc2aea012618b2e1ccb6f9d8aa27c0a3ce5e90e99c'
'a00b952d53df9d3617d93e8fba4146a4d6169ebe79f029b3a55cca68f738d8ea'
diff --git a/config b/config
index a040589d6f19..c64f3c904e4b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.8-arch1 Kernel Configuration
+# Linux/x86 6.8.9-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20240417"
CONFIG_CC_IS_GCC=y
@@ -553,7 +553,7 @@ CONFIG_CALL_PADDING=y
CONFIG_HAVE_CALL_THUNKS=y
CONFIG_CALL_THUNKS=y
CONFIG_PREFIX_SYMBOLS=y
-CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_CPU_MITIGATIONS=y
CONFIG_PAGE_TABLE_ISOLATION=y
CONFIG_RETPOLINE=y
CONFIG_RETHUNK=y
@@ -785,6 +785,8 @@ CONFIG_AS_SHA256_NI=y
CONFIG_AS_TPAUSE=y
CONFIG_AS_GFNI=y
CONFIG_AS_WRUSS=y
+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
+
#
# General architecture-dependent options