From: Guenter Roeck <linux@roeck-us.net>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
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>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/4] platform/x86: intel_pmc_ipc: Do not create iTCO watchdog when WDAT table exists
Date: Wed, 14 Sep 2016 13:04:29 -0700 [thread overview]
Message-ID: <20160914200429.GC14003@roeck-us.net> (raw)
In-Reply-To: <20160913152336.75405-5-mika.westerberg@linux.intel.com>
On Tue, Sep 13, 2016 at 06:23:36PM +0300, Mika Westerberg wrote:
> 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>
> ---
> drivers/platform/x86/intel_pmc_ipc.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
> index b86e1bcaa055..a511d518206b 100644
> --- a/drivers/platform/x86/intel_pmc_ipc.c
> +++ b/drivers/platform/x86/intel_pmc_ipc.c
> @@ -651,11 +651,15 @@ static int ipc_create_pmc_devices(void)
> {
> int ret;
>
> - ret = ipc_create_tco_device();
> - if (ret) {
> - dev_err(ipcdev.dev, "Failed to add tco platform device\n");
> - return 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");
> --
> 2.9.3
>
prev parent reply other threads:[~2016-09-14 20:04 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 ` [PATCH 3/4] i2c: i801: " Mika Westerberg
2016-09-14 20:04 ` Guenter Roeck
2016-09-13 15:23 ` [PATCH 4/4] platform/x86: intel_pmc_ipc: " Mika Westerberg
2016-09-14 20:04 ` Guenter Roeck [this message]
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=20160914200429.GC14003@roeck-us.net \
--to=linux@roeck-us.net \
--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=mika.westerberg@linux.intel.com \
--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).