Skip to content

Commit bba6529

Browse files
westerirafaeljw
authored andcommitted
platform/x86: intel_pmc_ipc: Do not create iTCO watchdog when WDAT table exists
ACPI WDAT table is the preferred way to use hardware watchdog over the native iTCO_wdt. Windows only uses this table for its hardware watchdog implementation so we should be relatively safe to trust it has been validated by OEMs. Prevent iTCO watchdog creation if we detect that there is an ACPI WDAT table. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 1f6dbb0 commit bba6529

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

drivers/platform/x86/intel_pmc_ipc.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -651,11 +651,15 @@ static int ipc_create_pmc_devices(void)
651651
{
652652
int ret;
653653

654-
ret = ipc_create_tco_device();
655-
if (ret) {
656-
dev_err(ipcdev.dev, "Failed to add tco platform device\n");
657-
return ret;
654+
/* If we have ACPI based watchdog use that instead */
655+
if (!acpi_has_watchdog()) {
656+
ret = ipc_create_tco_device();
657+
if (ret) {
658+
dev_err(ipcdev.dev, "Failed to add tco platform device\n");
659+
return ret;
660+
}
658661
}
662+
659663
ret = ipc_create_punit_device();
660664
if (ret) {
661665
dev_err(ipcdev.dev, "Failed to add punit platform device\n");

0 commit comments

Comments
 (0)