Bump to 6.6.54

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
2026-02-08 21:43:04 +01:00 · 2024-12-09 16:30:04 +01:00 · 2024-12-09 16:30:04 +01:00 · ef6cbe3f01
commit ef6cbe3f01
parent 8058f0935b
4 changed files with 70 additions and 47 deletions
--- a/.SRCINFO
+++ b/.SRCINFO
@ -1,7 +1,7 @@
 pkgbase = linux-cachyos-lts
 	pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
-	pkgver = 6.6.63
-	pkgrel = 1
+	pkgver = 6.6.64
+	pkgrel = 2
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	license = GPL-2.0-only
@ -18,14 +18,14 @@ pkgbase = linux-cachyos-lts
 	options = !strip
 	options = !debug
 	options = !lto
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.63.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.64.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	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 = d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835
-	sha256sums = cb63f74e96e631012b61f26ba3e1212099a06455108160971a03ef60e8bea796
-	sha256sums = a91249420d61edb17b8659ab3feca86d24cf3b1c941b14f232c47064fa4f4ce7
+	sha256sums = 065fd93fa6cb422f650fb563f15d3e0107c85009f766405993d795fd39796ab1
+	sha256sums = f4ddfbc0c375af5d8d9ca07f87513b874e019e4b84d9e05460fec05a667e6430
+	sha256sums = 1a7747d5b4ccd427d643e3f548cd99c09d0f05b108fc530a581e28a41c5533c9
 	sha256sums = 2706d935575e114210892b441671037ab96d5f70f084c391a23b43cd96afaa3e
 	sha256sums = 8b6a5ed6abb44346ef5f435d1e67a1f6c679eb15c4283015f81578622c4a1514

--- a/26
+++ b/26
@ -70,7 +70,7 @@ _nr_cpus=${_nr_cpus-}
 _per_gov=${_per_gov-}

 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}

 ### Running with a 1000HZ, 750Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@ -158,14 +158,14 @@ _build_zfs=${_build_zfs-}
 # This does replace the requirement of nvidia-dkms
 _build_nvidia=${_build_nvidia-}

-# Enable bcachefs
-_bcachefs=${_bcachefs-}
-
 # Builds the open nvidia module and package it into a own base
 # This does replace the requirement of nvidia-open-dkms
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}

+# Enable bcachefs
+_bcachefs=${_bcachefs-}
+
 # Build a debug package with non-stripped vmlinux
 _build_debug=${_build_debug-}

@ -179,7 +179,7 @@ fi

 pkgbase="linux-$_pkgsuffix"
 _major=6.6
-_minor=63
+_minor=64
 #_minorc=$((_minor+1))
 #_rcver=rc8
 pkgver=${_major}.${_minor}
@ -189,7 +189,7 @@ _stable=${_major}.${_minor}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 pkgdesc='Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
 _kernver=$pkgver-$pkgrel
 _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
@ -210,7 +210,7 @@ makedepends=(
 )

 _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=565.57.01
+_nv_ver=565.77
 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
 _nv_open_pkg="open-gpu-kernel-modules-${_nv_ver}"
 source=(
@ -477,7 +477,11 @@ prepare() {
            -d DEFAULT_CUBIC \
            -e TCP_CONG_BBR \
            -e DEFAULT_BBR \
-            --set-str DEFAULT_TCP_CONG bbr
+            --set-str DEFAULT_TCP_CONG bbr \
+            -m NET_SCH_FQ_CODEL \
+            -e NET_SCH_FQ \
+            -d CONFIG_DEFAULT_FQ_CODEL \
+            -e CONFIG_DEFAULT_FQ
    fi

    ### Select LRU config
@ -854,8 +858,8 @@ for _p in "${pkgname[@]}"; do
    }"
 done

-sha256sums=('d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835'
-            'cb63f74e96e631012b61f26ba3e1212099a06455108160971a03ef60e8bea796'
-            'a91249420d61edb17b8659ab3feca86d24cf3b1c941b14f232c47064fa4f4ce7'
+sha256sums=('065fd93fa6cb422f650fb563f15d3e0107c85009f766405993d795fd39796ab1'
+            'f4ddfbc0c375af5d8d9ca07f87513b874e019e4b84d9e05460fec05a667e6430'
+            '1a7747d5b4ccd427d643e3f548cd99c09d0f05b108fc530a581e28a41c5533c9'
            '2706d935575e114210892b441671037ab96d5f70f084c391a23b43cd96afaa3e'
            '8b6a5ed6abb44346ef5f435d1e67a1f6c679eb15c4283015f81578622c4a1514')
--- a/auto-cpu-optimization.sh
+++ b/auto-cpu-optimization.sh
@ -13,40 +13,59 @@ check_gcc() {
 check_gcc

 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch

 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac

-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 

 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
--- a/8
+++ b/8
@ -1352,7 +1352,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@ -1366,10 +1366,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=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y