From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>, Jean Delvare <jdelvare@suse.com>,
Wolfram Sang <wsa@the-dreams.de>,
Peter Tyser <ptyser@xes-inc.com>,
Lee Jones <lee.jones@linaro.org>,
Zha Qipeng <qipeng.zha@intel.com>,
Darren Hart <dvhart@infradead.org>,
Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] i2c: i801: Do not create iTCO watchdog when WDAT table exists
Date: Tue, 13 Sep 2016 18:23:35 +0300 [thread overview]
Message-ID: <20160913152336.75405-4-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20160913152336.75405-1-mika.westerberg@linux.intel.com>
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
next prev parent reply other threads:[~2016-09-13 15:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 15:23 [PATCH 0/4] ACPI: Add support for WDAT (Watchdog Action Table) Mika Westerberg
2016-09-13 15:23 ` [PATCH 1/4] ACPI / watchdog: Add support for WDAT hardware watchdog Mika Westerberg
2016-09-13 21:00 ` Guenter Roeck
2016-09-14 8:06 ` Mika Westerberg
2016-09-14 14:54 ` Guenter Roeck
2016-09-14 15:29 ` Mika Westerberg
2016-09-13 15:23 ` [PATCH 2/4] mfd: lpc_ich: Do not create iTCO watchdog when WDAT table exists Mika Westerberg
2016-09-14 20:03 ` Guenter Roeck
2016-09-13 15:23 ` Mika Westerberg [this message]
2016-09-14 20:04 ` [PATCH 3/4] i2c: i801: " Guenter Roeck
2016-09-13 15:23 ` [PATCH 4/4] platform/x86: intel_pmc_ipc: " Mika Westerberg
2016-09-14 20:04 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160913152336.75405-4-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=jdelvare@suse.com \
--cc=lee.jones@linaro.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=ptyser@xes-inc.com \
--cc=qipeng.zha@intel.com \
--cc=rjw@rjwysocki.net \
--cc=wim@iguana.be \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).