diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2016-09-20 14:30:52 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-28 23:07:20 +0200 |
| commit | 3413f702fae096184ad8bd9be9d7ecbc7c182bd7 (patch) | |
| tree | 84ad807a3f3137bd0d0b0ba7157b225d6aa814e2 | |
| parent | ACPI / watchdog: Add support for WDAT hardware watchdog (diff) | |
| download | linux-3413f702fae096184ad8bd9be9d7ecbc7c182bd7.tar.xz linux-3413f702fae096184ad8bd9be9d7ecbc7c182bd7.zip | |
mfd: lpc_ich: 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: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/mfd/lpc_ich.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c index bd3aa4578346..c8dee47b45d9 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c @@ -984,6 +984,10 @@ static int lpc_ich_init_wdt(struct pci_dev *dev) int ret; struct resource *res; + /* If we have ACPI based watchdog use that instead */ + if (acpi_has_watchdog()) + return -ENODEV; + /* Setup power management base register */ pci_read_config_dword(dev, priv->abase, &base_addr_cfg); base_addr = base_addr_cfg & 0x0000ff80; |