From db16339ccde265791ebf9cd9b69270500269bf19 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Mon, 31 May 2021 13:23:50 +0200
Subject: [PATCH] Remove voluntary_preempt, OFenable and disable_acpi_cpufreq
 options

The last one is kinda broken, and the two others don't really have their place in here.
Also enable zfsfix by default and make it a legacy option we can move out of the main options.
---
 customization.cfg        | 19 +++++--------------
 linux-tkg-config/prepare | 22 ----------------------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/customization.cfg b/customization.cfg
index dc86d9d..ad43c72 100644
--- a/customization.cfg
+++ b/customization.cfg
@@ -116,21 +116,12 @@ _misc_adds="true"
 # Full tickless can give higher performances in various cases but, depending on hardware, lower consistency. Just tickless idle can perform better on some platforms (mostly AMD based).
 _tickless=""
 
-# Setting this to to "true" can improve latency on PDS (at the cost of throughput) and improve throughput on other schedulers (at the cost of latency) - Can improve VMs performance - Kernel default is "false"
-_voluntary_preempt=""
-
-# Set to "true" to enable Device Tree and Open Firmware support. If you don't know about it, you don't need it - Default is "false"
-_OFenable="false"
-
 # Set to "true" to use ACS override patch - https://wiki.archlinux.org/index.php/PCI_passthrough_via_OVMF#Bypassing_the_IOMMU_groups_.28ACS_override_patch.29 - Kernel default is "false"
 _acs_override=""
 
 # Set to "true" to add Bcache filesystem support. You'll have to install bcachefs-tools-git from AUR for utilities - https://bcachefs.org/ - If in doubt, set to "false"
 _bcachefs=""
 
-# Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch - Kernel default is "false"
-_zfsfix=""
-
 # Set to "true" to enable support for fsync, an experimental replacement for esync found in Valve Proton 4.11+ - https://steamcommunity.com/games/221410/announcements/detail/2957094910196249305
 _fsync="true"
 
@@ -184,13 +175,9 @@ _timer_freq=""
 _default_cpu_gov="ondemand"
 
 # Use an aggressive ondemand governor instead of default ondemand to improve performance on low loads/high core count CPUs while keeping some power efficiency from frequency scaling.
-# It still requires you to either set ondemand as default governor or to select it some way.
+# It still requires you to either set ondemand as default governor or to select it in some way at runtime.
 _aggressive_ondemand="true"
 
-# On some platforms, an acpi_cpufreq bug affects performance negatively. Set to "true" to disable it as a workaround, but it will use more power.
-# https://github.com/Tk-Glitch/PKGBUILDS/issues/263
-_disable_acpi_cpufreq=""
-
 # [Advanced] Default TCP IPv4 algorithm to use. Options are: "yeah", "bbr", "cubic", "reno", "vegas" and "westwood". Leave empty if unsure.
 # This config option will not be prompted
 # Can be changed at runtime with the command line `# echo "$name" > /proc/sys/net/ipv4/tcp_congestion_control` where $name is one of the options above.
@@ -211,6 +198,10 @@ _custom_pkgbase=""
 # If left empty, it will use "-tkg-${_cpusched}${_compiler}" where "${_cpusched}" will be replaced by the user chosen scheduler, ${_compiler} will be replaced by "-llvm" if clang is used (nothing for GCC).
 _kernel_localversion=""
 
+# Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - This is a legacy option that can be ignored on 5.10+ kernels - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch
+_zfsfix="true"
+
+
 #### USER PATCHES ####
 
 # community patches - add patches (separated by a space) of your choice by name from the community-patches dir
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 2a34b9e..dc59d22 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -1118,11 +1118,6 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
     sed -i -e 's/CONFIG_CPU_FREQ_GOV_ONDEMAND=m/CONFIG_CPU_FREQ_GOV_ONDEMAND=y/' ./.config
   fi
 
-  # ACPI_CPUFREQ disablement
-  if [ "$_disable_acpi_cpufreq" = "true" ]; then
-    sed -i -e 's/CONFIG_X86_ACPI_CPUFREQ=m/# CONFIG_X86_ACPI_CPUFREQ is not set/' ./.config
-  fi
-
   # ftrace
   if [ -z "$_ftracedisable" ]; then
     plain ""
@@ -1188,23 +1183,6 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
     sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
   fi
 
-  # voluntary preempt
-  if [ "$_voluntary_preempt" = "true" ]; then
-    sed -i -e 's/CONFIG_PREEMPT=y/# CONFIG_PREEMPT is not set/' ./.config
-    sed -i -e 's/CONFIG_PREEMPT_LL=y/# CONFIG_PREEMPT_LL is not set/' ./.config
-    sed -i -e 's/# CONFIG_PREEMPT_VOLUNTARY is not set/CONFIG_PREEMPT_VOLUNTARY=y/' ./.config
-  fi
-
-  # Open Firmware support
-  if [ -z "$_OFenable" ]; then
-    plain ""
-    plain "Enable Device Tree and Open Firmware support?"
-    read -rp "`echo $'    > N/y : '`" CONDITION6;
-  fi
-  if [[ "$CONDITION6" =~ [yY] ]] || [ "$_OFenable" = "true" ]; then
-    sed -i -e 's/# CONFIG_OF is not set/CONFIG_OF=y/' ./.config
-  fi
-
   # acs override
   tkgpatch="$srcdir/0006-add-acs-overrides_iommu.patch"
   if [ -e "$tkgpatch" ]; then