Skip to content

Commit 1f6dbb0

Browse files
westerirafaeljw
authored andcommitted
i2c: i801: 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 ACPI WDAT table. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 3413f70 commit 1f6dbb0

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/i2c/busses/i2c-i801.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,9 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
14861486
priv->features |= FEATURE_IRQ;
14871487
priv->features |= FEATURE_SMBUS_PEC;
14881488
priv->features |= FEATURE_BLOCK_BUFFER;
1489-
priv->features |= FEATURE_TCO;
1489+
/* If we have ACPI based watchdog use that instead */
1490+
if (!acpi_has_watchdog())
1491+
priv->features |= FEATURE_TCO;
14901492
priv->features |= FEATURE_HOST_NOTIFY;
14911493
break;
14921494

0 commit comments

Comments
 (0)