From: Guenter Roeck <linux@roeck-us.net>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Jean Delvare <jdelvare@suse.com>,
Wolfram Sang <wsa@the-dreams.de>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
linux-i2c@vger.kernel.org, linux-watchdog@vger.kernel.org
Subject: Re: [PATCH 1/2] watchdog: iTCO: Add support for Cannon Lake PCH iTCO
Date: Fri, 9 Aug 2019 13:49:52 -0700 [thread overview]
Message-ID: <20190809204952.GA21059@roeck-us.net> (raw)
In-Reply-To: <20190809124553.67012-2-mika.westerberg@linux.intel.com>
On Fri, Aug 09, 2019 at 03:45:52PM +0300, Mika Westerberg wrote:
> In Intel Cannon Lake PCH the NO_REBOOT bit was moved from the private
> register space to be part of the TCO1_CNT register. For this reason
> introduce another version (6) that uses this register to set and clear
> NO_REBOOT bit.
>
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
I assume this will be applied through i2c together with the other patch
of the series.
Guenter
> ---
> drivers/watchdog/iTCO_wdt.c | 25 +++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
> index c559f706ae7e..505f2c837347 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> @@ -215,6 +215,23 @@ static int update_no_reboot_bit_mem(void *priv, bool set)
> return 0;
> }
>
> +static int update_no_reboot_bit_cnt(void *priv, bool set)
> +{
> + struct iTCO_wdt_private *p = priv;
> + u16 val, newval;
> +
> + val = inw(TCO1_CNT(p));
> + if (set)
> + val |= BIT(0);
> + else
> + val &= ~BIT(0);
> + outw(val, TCO1_CNT(p));
> + newval = inw(TCO1_CNT(p));
> +
> + /* make sure the update is successful */
> + return val != newval ? -EIO : 0;
> +}
> +
> static void iTCO_wdt_no_reboot_bit_setup(struct iTCO_wdt_private *p,
> struct itco_wdt_platform_data *pdata)
> {
> @@ -224,7 +241,9 @@ static void iTCO_wdt_no_reboot_bit_setup(struct iTCO_wdt_private *p,
> return;
> }
>
> - if (p->iTCO_version >= 2)
> + if (p->iTCO_version >= 6)
> + p->update_no_reboot_bit = update_no_reboot_bit_cnt;
> + else if (p->iTCO_version >= 2)
> p->update_no_reboot_bit = update_no_reboot_bit_mem;
> else if (p->iTCO_version == 1)
> p->update_no_reboot_bit = update_no_reboot_bit_pci;
> @@ -452,7 +471,8 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
> * Get the Memory-Mapped GCS or PMC register, we need it for the
> * NO_REBOOT flag (TCO v2 and v3).
> */
> - if (p->iTCO_version >= 2 && !pdata->update_no_reboot_bit) {
> + if (p->iTCO_version >= 2 && p->iTCO_version < 6 &&
> + !pdata->update_no_reboot_bit) {
> p->gcs_pmc_res = platform_get_resource(pdev,
> IORESOURCE_MEM,
> ICH_RES_MEM_GCS_PMC);
> @@ -502,6 +522,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
>
> /* Clear out the (probably old) status */
> switch (p->iTCO_version) {
> + case 6:
> case 5:
> case 4:
> outw(0x0008, TCO1_STS(p)); /* Clear the Time Out Status bit */
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-08-09 20:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 12:45 [PATCH 0/2] watchdog: Correct iTCO for Cannon Lake and beyond Mika Westerberg
2019-08-09 12:45 ` [PATCH 1/2] watchdog: iTCO: Add support for Cannon Lake PCH iTCO Mika Westerberg
2019-08-09 20:49 ` Guenter Roeck [this message]
2019-08-28 12:50 ` Jean Delvare
2019-08-28 13:04 ` Mika Westerberg
2019-08-09 12:45 ` [PATCH 2/2] i2c: i801: Use iTCO version 6 in Cannon Lake PCH and beyond Mika Westerberg
2019-08-28 13:24 ` Jean Delvare
2019-08-28 13:34 ` Mika Westerberg
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=20190809204952.GA21059@roeck-us.net \
--to=linux@roeck-us.net \
--cc=jdelvare@suse.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=wim@linux-watchdog.org \
--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).