config: Enable RFDS Intel Mitigation

Signed-off-by: Peter Jung <[email protected]>
CachyOS · Mar 15, 2024 · 957e438 · 957e438
1 parent 98499bc
commit 957e438
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO
@@ -28,7 +28,7 @@ pkgbase = linux-cachyos-lts
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch
 	sha256sums = 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4
-	sha256sums = 01e0933bd6fd3e5fcd667ecb3c692b94d2d57dff79d64512dc2e0badac00446c
+	sha256sums = a53b90c53cad62cad4f29456a845fc452c16c4edd77ceadeddbee278966c08f7
 	sha256sums = 3f3233256725683aa95c29ee423932a5bcc74c0653e09d502240601387c3edec
 	sha256sums = 314d5b436420ff1611e9fbcfe5389446f50846ad556bdf12c37498b14cd04cfc
 	sha256sums = d43061bf76f06835a7b400b06b3db876d336e871d654854a515899b84e6c9c01

diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
@@ -746,7 +746,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 sha256sums=('23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4'
-            '01e0933bd6fd3e5fcd667ecb3c692b94d2d57dff79d64512dc2e0badac00446c'
+            'a53b90c53cad62cad4f29456a845fc452c16c4edd77ceadeddbee278966c08f7'
             '3f3233256725683aa95c29ee423932a5bcc74c0653e09d502240601387c3edec'
             '314d5b436420ff1611e9fbcfe5389446f50846ad556bdf12c37498b14cd04cfc'
             'd43061bf76f06835a7b400b06b3db876d336e871d654854a515899b84e6c9c01')
diff --git a/linux-cachyos-lts/config b/linux-cachyos-lts/config
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.8 Kernel Configuration
+# Linux/x86 6.6.22 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24100
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24100
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_CC_CAN_LINK=y
@@ -19,7 +19,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=125
+CONFIG_PAHOLE_VERSION=126
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -612,6 +612,7 @@ CONFIG_CPU_IBRS_ENTRY=y
 CONFIG_CPU_SRSO=y
 CONFIG_SLS=y
 # CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_MITIGATION_RFDS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
@@ -939,9 +940,9 @@ CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_ARCH_MMAP_RND_BITS=32
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16
 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y

diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO
@@ -29,7 +29,7 @@ pkgbase = linux-cachyos
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.8/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.8/sched/0001-sched-ext.patch
 	b2sums = 2b518f8f39b4dcea1c580cb0664d59c165db989422fd6fd6b65d3dd1e4548bc6e0cedfc95c2584ae56f69ac1a1d3de6552ee61e77b08799a5275934a453ab929
-	b2sums = dfaab80f3a80c770b0920140c73cb45895b5cfd87596be231306aa360220885474ca4fb0b99b9ecb1f865deffb030a91a8d932c6805e7c9e803c1d4d2be51dfe
+	b2sums = 8178cdd3224ca5b7ef9e971fdb403b57d4f4e44d3b9de31cf118bc1b195cf5d376b424cd5a5013c10182116b9ed18d09b893633ccf2486454d60bcced32149a0
 	b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
 	b2sums = 1b898b83320e71f13c6fc0568fbee36589d14eed777d41455cfe87b9b929345f2e1f2a35fa2a7483b9145deaa097b345fa341a20866cd8d105b13fcbcb2df4e0
 	b2sums = 2fff57e7883817a2890e2775b7bf829c473ceeb81c96eea408b2d7622ae92cb8c83c4df8e969197a4d50da3412fa60661fd07811342d9c55f2fda25926f20ddb

diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
@@ -712,7 +712,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('2b518f8f39b4dcea1c580cb0664d59c165db989422fd6fd6b65d3dd1e4548bc6e0cedfc95c2584ae56f69ac1a1d3de6552ee61e77b08799a5275934a453ab929'
-        'dfaab80f3a80c770b0920140c73cb45895b5cfd87596be231306aa360220885474ca4fb0b99b9ecb1f865deffb030a91a8d932c6805e7c9e803c1d4d2be51dfe'
+        '8178cdd3224ca5b7ef9e971fdb403b57d4f4e44d3b9de31cf118bc1b195cf5d376b424cd5a5013c10182116b9ed18d09b893633ccf2486454d60bcced32149a0'
         '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
         '1b898b83320e71f13c6fc0568fbee36589d14eed777d41455cfe87b9b929345f2e1f2a35fa2a7483b9145deaa097b345fa341a20866cd8d105b13fcbcb2df4e0'
         '2fff57e7883817a2890e2775b7bf829c473ceeb81c96eea408b2d7622ae92cb8c83c4df8e969197a4d50da3412fa60661fd07811342d9c55f2fda25926f20ddb')
diff --git a/linux-cachyos/config b/linux-cachyos/config
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.0 Kernel Configuration
+# Linux/x86 6.8.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20231110"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
@@ -138,6 +138,7 @@ CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
 CONFIG_PREEMPT_DYNAMIC=y
 CONFIG_SCHED_CORE=y
+# CONFIG_SCHED_CLASS_EXT is not set
 
 #
 # CPU/Task time and stats accounting
@@ -224,6 +225,7 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_EXT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -614,6 +616,7 @@ CONFIG_CPU_IBRS_ENTRY=y
 CONFIG_CPU_SRSO=y
 CONFIG_SLS=y
 # CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_MITIGATION_RFDS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
@@ -6864,7 +6867,6 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_FP=y
 CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_AMD_SECURE_DISPLAY=y
-CONFIG_DRM_AMD_COLOR_STEAMDECK=y
 # end of Display Engine Configuration
 
 CONFIG_HSA_AMD=y