Disable CONFIG_CPU_SRSO for thin and full LTO

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 14 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 496ccb8aeed5..6a1bded04fec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,7 +29,7 @@ pkgbase = linux-cachyos-rc
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/sched/0001-EEVDF-cachy.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.5/sched/0001-bore-eevdf.patch
 	b2sums = 21530d34bc89c9450ebd348755a357a1455809fd75cdd1db4063d991fc4802293648055ad862a99ea3e65931778cb0811be0981299f0f6d8c1bcf6cec62b7365
-	b2sums = 9b5e22d01524f15c889607b9976708f4b8ad6574255f0611f949f2aafe0a0c196ad1cbb2f32cd2bba5da487ca49004573b96fbe10d46de6a7ad6c0c4017a89cb
+	b2sums = d01cf326f583f294dfb78ce0591c3758573c67b07363d41f52a11acf76e06b9c314b2c6e4ddf3aeb199f987173817c90908433bb65f3641e7483f97c99d227bf
 	b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
 	b2sums = a71aade3f9d2aa4e4644c0c17d274b75fa1e5b8c62f00b595648c588d2ddf1adaef7c85d9253d7925b3daf847c2e22d7b9aaaf91ba4a05e103b7937ed404e865
 	b2sums = 7fe73d10da6a76bf9d65c4134f1da67478accc0e83ff08c54a308e511679ce63ca34ccbb01282bd9fcab50610a0e9d03575edf1f7c5cc34f23151f15e5b5c00c
diff --git a/PKGBUILD b/PKGBUILD
index e76b197da817..dcb4aca38c79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -286,6 +286,13 @@ prepare() {
         "${srcdir}"/auto-cpu-optimization.sh
     fi
 
+    ### Disabling CONFIG_CPU_SRSO
+    # More infos here: https://github.com/CachyOS/linux-cachyos/issues/150
+    if [ "$_use_llvm_lto" != "none" ]; then
+        echo "Disabling CONFIG_CPU_SRSO..."
+        scripts/config -d CPU_SRSO
+    fi
+
     ### Selecting CachyOS config
     if [ -n "$_cachy_config" ]; then
         echo "Enabling CachyOS config..."
@@ -792,7 +799,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('21530d34bc89c9450ebd348755a357a1455809fd75cdd1db4063d991fc4802293648055ad862a99ea3e65931778cb0811be0981299f0f6d8c1bcf6cec62b7365'
-        '9b5e22d01524f15c889607b9976708f4b8ad6574255f0611f949f2aafe0a0c196ad1cbb2f32cd2bba5da487ca49004573b96fbe10d46de6a7ad6c0c4017a89cb'
+        'd01cf326f583f294dfb78ce0591c3758573c67b07363d41f52a11acf76e06b9c314b2c6e4ddf3aeb199f987173817c90908433bb65f3641e7483f97c99d227bf'
         '11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
         'a71aade3f9d2aa4e4644c0c17d274b75fa1e5b8c62f00b595648c588d2ddf1adaef7c85d9253d7925b3daf847c2e22d7b9aaaf91ba4a05e103b7937ed404e865'
         '7fe73d10da6a76bf9d65c4134f1da67478accc0e83ff08c54a308e511679ce63ca34ccbb01282bd9fcab50610a0e9d03575edf1f7c5cc34f23151f15e5b5c00c'
diff --git a/config b/config
index 9178d25743cb..6b9077942a73 100644
--- a/config
+++ b/config
@@ -594,7 +594,9 @@ CONFIG_CALL_DEPTH_TRACKING=y
 # CONFIG_CALL_THUNKS_DEBUG is not set
 CONFIG_CPU_IBPB_ENTRY=y
 CONFIG_CPU_IBRS_ENTRY=y
+CONFIG_CPU_SRSO=y
 CONFIG_SLS=y
+# CONFIG_GDS_FORCE_MITIGATION is not set
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 
@@ -1333,11 +1335,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_TCP_CONG_BBR2=y
-CONFIG_DEFAULT_BBR2=y
+CONFIG_TCP_CONG_BBR=y
+CONFIG_DEFAULT_BBR=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr2"
+CONFIG_DEFAULT_TCP_CONG="bbr"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y