Commit bba6529e authored Sep 20, 2016 by Mika Westerberg Committed by Rafael J. Wysocki Sep 28, 2016

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>

parent 1f6dbb02

drivers/platform/x86/intel_pmc_ipc.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -651,11 +651,15 @@ static int ipc_create_pmc_devices(void)
		{
		int ret;

		/* If we have ACPI based watchdog use that instead */
		if (!acpi_has_watchdog()) {
		ret = ipc_create_tco_device();
		if (ret) {
		dev_err(ipcdev.dev, "Failed to add tco platform device\n");
		return ret;
		}
		}

		ret = ipc_create_punit_device();
		if (ret) {
		dev_err(ipcdev.dev, "Failed to add punit platform device\n");