Misc fixes

- Enforce sane defaults for ticks selector
 - Make sure we have a default governor set early on (schedutil)
 - Build BLK_DEV_LOOP as module instead of builtin

Reportedly fixes https://github.com/Frogging-Family/linux-tkg/issues/665 for at least one user affected.
This commit is contained in:
Tk-Glitch
2022-12-22 00:16:17 +01:00
parent 73e9a2eb3c
commit 1fc60cc388

View File

@@ -895,13 +895,14 @@ _tkg_srcprep() {
if [ "$_kver" = "504" ] || [ "$_kver" = "509" ]; then if [ "$_kver" = "504" ] || [ "$_kver" = "509" ]; then
scripts/config --set-val "RCU_BOOST_DELAY" "0" scripts/config --set-val "RCU_BOOST_DELAY" "0"
fi fi
_disable "NTP_PPS" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF" "ZSWAP_COMPRESSOR_DEFAULT_LZO" "PROFILE_ALL_BRANCHES" _disable "NTP_PPS" "ZSWAP_COMPRESSOR_DEFAULT_LZO" "PROFILE_ALL_BRANCHES"
_enable "CRYPTO_LZ4" "CRYPTO_LZ4HC" "LZ4_COMPRESS" "LZ4HC_COMPRESS" "ZSWAP_COMPRESSOR_DEFAULT_LZ4" "CMDLINE_BOOL" "BLK_DEV_LOOP" "X86_AMD_PSTATE" "AMD_PINCTRL" "CONTEXT_TRACKING_FORCE" _enable "CRYPTO_LZ4" "CRYPTO_LZ4HC" "LZ4_COMPRESS" "LZ4HC_COMPRESS" "ZSWAP_COMPRESSOR_DEFAULT_LZ4" "X86_AMD_PSTATE" "AMD_PINCTRL" "CMDLINE_BOOL"
_disable "DEBUG_FORCE_FUNCTION_ALIGN_64B" _disable "DEBUG_FORCE_FUNCTION_ALIGN_64B" "X86_P6_NOP" "CMDLINE_OVERRIDE"
scripts/config --set-str "ZSWAP_COMPRESSOR_DEFAULT" "lz4" scripts/config --set-str "ZSWAP_COMPRESSOR_DEFAULT" "lz4"
scripts/config --set-str "CMDLINE" "${_custom_commandline}" scripts/config --set-str "CMDLINE" "${_custom_commandline}"
_disable "CMDLINE_OVERRIDE" "X86_P6_NOP" "CPU_FREQ_DEFAULT_GOV_ONDEMAND" "CPU_FREQ_DEFAULT_GOV_CONSERVATIVE" _enable "CPU_FREQ_DEFAULT_GOV_SCHEDUTIL"
#echo "# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set" >> ./.config _disable "CPU_FREQ_DEFAULT_GOV_ONDEMAND" "CPU_FREQ_DEFAULT_GOV_CONSERVATIVE" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF"
_module "BLK_DEV_LOOP"
# openrgb # openrgb
_module "I2C_NCT6775" _module "I2C_NCT6775"
@@ -1354,14 +1355,14 @@ _tkg_srcprep() {
_tickless="${_selected_index}" _tickless="${_selected_index}"
fi fi
if [ "$_tickless" = "0" ]; then if [ "$_tickless" = "0" ]; then
_disable "NO_HZ_FULL_NODEF" "NO_HZ_IDLE" "NO_HZ_FULL" "NO_HZ" "NO_HZ_COMMON" "VIRT_CPU_ACCOUNTING_GEN" _disable "NO_HZ_FULL_NODEF" "NO_HZ_IDLE" "NO_HZ_FULL" "NO_HZ" "NO_HZ_COMMON" "VIRT_CPU_ACCOUNTING" "VIRT_CPU_ACCOUNTING_GEN"
_enable "HZ_PERIODIC" "TICK_CPU_ACCOUNTING" _enable "HZ_PERIODIC" "TICK_CPU_ACCOUNTING"
elif [ "$_tickless" = "1" ]; then elif [ "$_tickless" = "1" ]; then
_disable "HZ_PERIODIC" "NO_HZ_IDLE" "TICK_CPU_ACCOUNTING" _disable "HZ_PERIODIC" "NO_HZ_IDLE" "TICK_CPU_ACCOUNTING" "CONTEXT_TRACKING_FORCE"
_enable "NO_HZ_FULL_NODEF" "NO_HZ_FULL" "NO_HZ" "NO_HZ_COMMON" "CONTEXT_TRACKING" "VIRT_CPU_ACCOUNTING_GEN" _enable "NO_HZ_FULL_NODEF" "NO_HZ_FULL" "NO_HZ" "NO_HZ_COMMON" "CONTEXT_TRACKING" "VIRT_CPU_ACCOUNTING" "VIRT_CPU_ACCOUNTING_GEN"
else else
_disable "NO_HZ_FULL_NODEF" "HZ_PERIODIC" "NO_HZ_FULL" "TICK_CPU_ACCOUNTING" _disable "NO_HZ_FULL_NODEF" "HZ_PERIODIC" "NO_HZ_FULL" "TICK_CPU_ACCOUNTING" "CONTEXT_TRACKING_FORCE"
_enable "NO_HZ_IDLE" "NO_HZ" "NO_HZ_COMMON" "VIRT_CPU_ACCOUNTING_GEN" _enable "NO_HZ_IDLE" "NO_HZ" "NO_HZ_COMMON" "CONTEXT_TRACKING" "VIRT_CPU_ACCOUNTING" "VIRT_CPU_ACCOUNTING_GEN"
fi fi
# acs override # acs override