Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

cachyos: add new cpu flags (#301)

Piotr Górski593a4ec8685b
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index 0c56fc41..b2c1e75e 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -285,16 +285,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-bmq/config b/linux-cachyos-bmq/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos-bmq/config
+++ b/linux-cachyos-bmq/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 5fc4166f..8fb600ed 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -286,16 +286,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-bore/config b/linux-cachyos-bore/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos-bore/config
+++ b/linux-cachyos-bore/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index cd62ea99..d1c2e520 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -290,16 +290,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-deckify/config b/linux-cachyos-deckify/config
index b196abdc..e8487709 100644
--- a/linux-cachyos-deckify/config
+++ b/linux-cachyos-deckify/config
@@ -429,8 +429,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -454,11 +454,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index 16f92e04..b5c46930 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -286,16 +286,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-eevdf/config b/linux-cachyos-eevdf/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos-eevdf/config
+++ b/linux-cachyos-eevdf/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 23045589..4b9b2248 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -284,16 +284,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-hardened/config b/linux-cachyos-hardened/config
index ee458b0e..0807067a 100644
--- a/linux-cachyos-hardened/config
+++ b/linux-cachyos-hardened/config
@@ -415,8 +415,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -440,11 +440,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_TSC=y
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index d704d37e..b3df98fe 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -311,16 +311,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-lts/config b/linux-cachyos-lts/config
index 141f9ce4..04fce77d 100644
--- a/linux-cachyos-lts/config
+++ b/linux-cachyos-lts/config
@@ -426,8 +426,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -451,11 +451,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index abd371b1..68ada06a 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -286,16 +286,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-rc/config b/linux-cachyos-rc/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos-rc/config
+++ b/linux-cachyos-rc/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 6d84f36b..f8f170a8 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -286,16 +286,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-rt-bore/config b/linux-cachyos-rt-bore/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos-rt-bore/config
+++ b/linux-cachyos-rt-bore/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
index 257d579f..6d2ce384 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -286,16 +286,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-sched-ext/config b/linux-cachyos-sched-ext/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos-sched-ext/config
+++ b/linux-cachyos-sched-ext/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index f5d901ea..e24e4cd6 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -286,16 +286,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos-server/config b/linux-cachyos-server/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos-server/config
+++ b/linux-cachyos-server/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 457e4dee..37691216 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -286,16 +286,16 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=${MARCH}
- if [[ ! "$MARCH" =~ GENERIC* ]]; then
- MARCH2="M${MARCH}"
- else
- MARCH2="${MARCH/V/CPU}"
+ if [ "$MARCH" != "GENERIC" ]; then
+ if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then
+ X86_64_LEVEL="${MARCH//GENERIC_V}"
+ scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}"
+ else
+ scripts/config -k -d CONFIG_GENERIC_CPU
+ scripts/config -k -e "CONFIG_M${MARCH}"
+ fi
fi
-
- scripts/config -k -d CONFIG_GENERIC_CPU
- scripts/config -k -e "CONFIG_${MARCH2}"
fi
### Use autooptimization
diff --git a/linux-cachyos/config b/linux-cachyos/config
index dd0d017d..35e91c70 100644
--- a/linux-cachyos/config
+++ b/linux-cachyos/config
@@ -432,8 +432,8 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN4 is not set
# CONFIG_MZEN5 is not set
# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
# CONFIG_MNEHALEM is not set
# CONFIG_MWESTMERE is not set
# CONFIG_MSILVERMONT is not set
@@ -457,11 +457,10 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MMETEORLAKE is not set
# CONFIG_MEMERALDRAPIDS is not set
CONFIG_GENERIC_CPU=y
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
# CONFIG_MNATIVE_INTEL is not set
# CONFIG_MNATIVE_AMD is not set
+CONFIG_SUPPORT_MARCH_CODEVERS=y
+CONFIG_X86_64_VERSION=1
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/script-v3-v4.sh b/script-v3-v4.sh
index fc99eba4..90cb9ebd 100755
--- a/script-v3-v4.sh
+++ b/script-v3-v4.sh
@@ -3,7 +3,7 @@ find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_auto_optimization-y/_use_au
## Enable ZFS
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_build_zfs-/_build_zfs-y/" {}
## Enable Generic v3
-find . -name "PKGBUILD" | xargs -I {} sed -i "s/_processor_opt-/_processor_opt-GENERIC_CPU3/" {}
+find . -name "PKGBUILD" | xargs -I {} sed -i "s/_processor_opt-/_processor_opt-GENERIC_V3/" {}
## Enable NVIDIA module
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_build_nvidia-/_build_nvidia-y/" {}
## Enable Open NVIDIA module
@@ -44,7 +44,7 @@ repoctl update -P cachyos-v3
## GCC v4 Kernel
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_llvm_lto-thin/_use_llvm_lto-none/" {}
-find . -name "PKGBUILD" | xargs -I {} sed -i "s/_processor_opt-GENERIC_CPU3/_processor_opt-GENERIC_CPU4/" {}
+find . -name "PKGBUILD" | xargs -I {} sed -i "s/_processor_opt-GENERIC_V3/_processor_opt-GENERIC_V4/" {}
files=$(find . -name "PKGBUILD")