From a95eff69b2c36f54063ca58a97925b3450edf74e Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Thu, 26 Sep 2024 20:25:40 +0200 Subject: [PATCH] cachyos: add new cpu flags Signed-off-by: Piotr Gorski --- linux-cachyos-bmq/PKGBUILD | 16 ++++++++-------- linux-cachyos-bmq/config | 7 +++---- linux-cachyos-bore/PKGBUILD | 16 ++++++++-------- linux-cachyos-bore/config | 7 +++---- linux-cachyos-deckify/PKGBUILD | 16 ++++++++-------- linux-cachyos-deckify/config | 7 +++---- linux-cachyos-eevdf/PKGBUILD | 16 ++++++++-------- linux-cachyos-eevdf/config | 7 +++---- linux-cachyos-hardened/PKGBUILD | 16 ++++++++-------- linux-cachyos-hardened/config | 7 +++---- linux-cachyos-lts/PKGBUILD | 16 ++++++++-------- linux-cachyos-lts/config | 7 +++---- linux-cachyos-rc/PKGBUILD | 16 ++++++++-------- linux-cachyos-rc/config | 7 +++---- linux-cachyos-rt-bore/PKGBUILD | 16 ++++++++-------- linux-cachyos-rt-bore/config | 7 +++---- linux-cachyos-sched-ext/PKGBUILD | 16 ++++++++-------- linux-cachyos-sched-ext/config | 7 +++---- linux-cachyos-server/PKGBUILD | 16 ++++++++-------- linux-cachyos-server/config | 7 +++---- linux-cachyos/PKGBUILD | 16 ++++++++-------- linux-cachyos/config | 7 +++---- 22 files changed, 121 insertions(+), 132 deletions(-) diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index 8ea07550..101007ac 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/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 --setval 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 c40ad3e6..c6e19e6f 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 --setval 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 1a5a63ae..907e453a 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -289,16 +289,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 --setval 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 976cefb1..d31c9d9b 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 --setval 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 fbcf1d82..ecc58398 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -281,16 +281,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 --setval 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 d6a6c27f..ff479874 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -308,16 +308,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 --setval 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 7df85920..87458da1 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 --setval 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 2fdb5ff5..6ff4f675 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 --setval 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 43262539..f1b70134 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 --setval 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 5d13cee1..d2206616 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 --setval 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 5eca7558..0d533765 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 --setval 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