From a587b423a9a0b9173631d588947703501522d4d0 Mon Sep 17 00:00:00 2001 From: Dmitry Sharshakov Date: Thu, 7 Mar 2024 22:28:57 +0300 Subject: [PATCH] feat: enable most common amd64 watchdog drivers See https://github.com/siderolabs/talos/pull/8313 Signed-off-by: Dmitry Sharshakov Signed-off-by: Andrey Smirnov --- kernel/build/config-amd64 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index c8699fe7..98aaa029 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -16,7 +16,6 @@ CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y -CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=126 @@ -595,6 +594,7 @@ CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y # CONFIG_ACPI_APEI is not set # CONFIG_ACPI_DPTF is not set +CONFIG_ACPI_WATCHDOG=y # CONFIG_ACPI_EXTLOG is not set # CONFIG_ACPI_CONFIGFS is not set # CONFIG_ACPI_PFRUT is not set @@ -3189,7 +3189,7 @@ CONFIG_IPMI_PLAT_DATA=y CONFIG_IPMI_DEVICE_INTERFACE=y CONFIG_IPMI_SI=y # CONFIG_IPMI_SSIF is not set -# CONFIG_IPMI_WATCHDOG is not set +CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=y CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set @@ -3583,7 +3583,7 @@ CONFIG_X86_PKG_TEMP_THERMAL=y # end of Intel thermal drivers CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set +CONFIG_WATCHDOG_CORE=m # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y CONFIG_WATCHDOG_OPEN_TIMEOUT=0 @@ -3593,12 +3593,13 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # # Watchdog Pretimeout Governors # +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set # # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set -# CONFIG_WDAT_WDT is not set +CONFIG_WDAT_WDT=m # CONFIG_XILINX_WATCHDOG is not set # CONFIG_ZIIRAVE_WATCHDOG is not set # CONFIG_CADENCE_WATCHDOG is not set @@ -3612,15 +3613,16 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_EBC_C384_WDT is not set # CONFIG_EXAR_WDT is not set # CONFIG_F71808E_WDT is not set -# CONFIG_SP5100_TCO is not set +CONFIG_SP5100_TCO=m # CONFIG_SBC_FITPC2_WATCHDOG is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_IB700_WDT is not set # CONFIG_IBMASR is not set # CONFIG_WAFER_WDT is not set -# CONFIG_I6300ESB_WDT is not set +CONFIG_I6300ESB_WDT=m # CONFIG_IE6XX_WDT is not set -# CONFIG_ITCO_WDT is not set +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y # CONFIG_IT8712F_WDT is not set # CONFIG_IT87_WDT is not set # CONFIG_HP_WATCHDOG is not set @@ -3640,7 +3642,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_SBC_EPX_C3_WATCHDOG is not set # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set -# CONFIG_XEN_WDT is not set +CONFIG_XEN_WDT=m # # PCI-based Watchdog Cards @@ -3660,6 +3662,7 @@ CONFIG_BCMA_POSSIBLE=y # # Multifunction device drivers # +CONFIG_MFD_CORE=m # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_SMPRO is not set # CONFIG_PMIC_ADP5520 is not set @@ -3678,7 +3681,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_MC13XXX_I2C is not set # CONFIG_MFD_MP2629 is not set # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set -# CONFIG_LPC_ICH is not set +CONFIG_LPC_ICH=m # CONFIG_LPC_SCH is not set # CONFIG_MFD_INTEL_LPSS_ACPI is not set # CONFIG_MFD_INTEL_LPSS_PCI is not set