Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1482587

[PATCH 3/4] i2c: i801: Do not create iTCO watchdog when WDAT table exists

From Mika Westerberg <mika.westerberg@linux.intel.com>
Newsgroups linux.kernel
Subject [PATCH 3/4] i2c: i801: Do not create iTCO watchdog when WDAT table exists
Date 2016-09-13 17:30 +0200
Message-ID <sgXOO-3H6-17@gated-at.bofh.it> (permalink)
References <sgXOO-3H6-9@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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>
---
 drivers/i2c/busses/i2c-i801.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 5ef9b733d153..26298af73232 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1486,7 +1486,9 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 		priv->features |= FEATURE_IRQ;
 		priv->features |= FEATURE_SMBUS_PEC;
 		priv->features |= FEATURE_BLOCK_BUFFER;
-		priv->features |= FEATURE_TCO;
+		/* If we have ACPI based watchdog use that instead */
+		if (!acpi_has_watchdog())
+			priv->features |= FEATURE_TCO;
 		priv->features |= FEATURE_HOST_NOTIFY;
 		break;
 
-- 
2.9.3

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/4] ACPI: Add support for WDAT (Watchdog Action Table) Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-09-13 17:30 +0200
  [PATCH 3/4] i2c: i801: Do not create iTCO watchdog when WDAT table exists Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-09-13 17:30 +0200
    Re: [PATCH 3/4] i2c: i801: Do not create iTCO watchdog when WDAT  table exists Guenter Roeck <linux@roeck-us.net> - 2016-09-14 22:10 +0200
  [PATCH 1/4] ACPI / watchdog: Add support for WDAT hardware watchdog Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-09-13 17:30 +0200
    Re: [PATCH 1/4] ACPI / watchdog: Add support for WDAT hardware  watchdog Guenter Roeck <linux@roeck-us.net> - 2016-09-13 23:10 +0200
      Re: [PATCH 1/4] ACPI / watchdog: Add support for WDAT hardware  watchdog Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-09-14 10:20 +0200
        Re: [PATCH 1/4] ACPI / watchdog: Add support for WDAT hardware  watchdog Guenter Roeck <linux@roeck-us.net> - 2016-09-14 17:00 +0200
          Re: [PATCH 1/4] ACPI / watchdog: Add support for WDAT hardware  watchdog Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-09-14 17:40 +0200

csiph-web