From: Guenter Roeck <linux@roeck-us.net>
To: Jan Kiszka <jan.kiszka@siemens.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] watchdog: sp5100_tco: Enable watchdog on Family 17h devices if disabled
Date: Thu, 10 Sep 2020 09:53:17 -0700 [thread overview]
Message-ID: <6ff3df92-3465-f619-7c21-eed421ff719d@roeck-us.net> (raw)
In-Reply-To: <30f69c2c-d4c8-a143-6bfa-34394b6361cf@siemens.com>
Hi Jan,
On 9/10/20 9:34 AM, Jan Kiszka wrote:
> On 10.09.20 18:31, Guenter Roeck wrote:
>> On Family 17h (Ryzen) devices, the WatchdogTmrEn bit of PmDecodeEn not only
>> enables watchdog memory decoding at 0xfeb00000, it also enables the
>> watchdog hardware itself. Use this information to enable the watchdog if
>> it is not already enabled.
>>
>> Cc: Jan Kiszka <jan.kiszka@siemens.com>
>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>> ---
>> drivers/watchdog/sp5100_tco.c | 18 ++++++++++++++++++
>> 1 file changed, 18 insertions(+)
>>
>> diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
>> index 85e9664318c9..a730ecbf78cd 100644
>> --- a/drivers/watchdog/sp5100_tco.c
>> +++ b/drivers/watchdog/sp5100_tco.c
>> @@ -17,6 +17,12 @@
>> * AMD Publication 51192 "AMD Bolton FCH Register Reference Guide"
>> * AMD Publication 52740 "BIOS and Kernel Developer’s Guide (BKDG)
>> * for AMD Family 16h Models 30h-3Fh Processors"
>> + * AMD Publication 55570-B1-PUB "Processor Programming Reference (PPR)
>> + * for AMD Family 17h Model 18h, Revision B1
>> + * Processors (PUB)
>> + * AMD Publication 55772-A1-PUB "Processor Programming Reference (PPR)
>> + * for AMD Family 17h Model 20h, Revision A1
>> + * Processors (PUB)
>> */
>>
>> /*
>> @@ -241,6 +247,18 @@ static int sp5100_tco_setupdevice(struct device *dev,
>> break;
>> case efch:
>> dev_name = SB800_DEVNAME;
>> + /*
>> + * On Family 17h devices, the EFCH_PM_DECODEEN_WDT_TMREN bit of
>> + * EFCH_PM_DECODEEN not only enables the EFCH_PM_WDT_ADDR memory
>> + * region, it also enables the watchdog itself.
>> + */
>> + if (boot_cpu_data.x86 == 0x17) {
>> + val = sp5100_tco_read_pm_reg8(EFCH_PM_DECODEEN);
>> + if (!(val & EFCH_PM_DECODEEN_WDT_TMREN)) {
>> + sp5100_tco_update_pm_reg8(EFCH_PM_DECODEEN, 0xff,
>> + EFCH_PM_DECODEEN_WDT_TMREN);
>> + }
>> + }
>> val = sp5100_tco_read_pm_reg8(EFCH_PM_DECODEEN);
>> if (val & EFCH_PM_DECODEEN_WDT_TMREN)
>> mmio_addr = EFCH_PM_WDT_ADDR;
>>
>
> Won't that bring us EFCH_PM_WDT_ADDR as address, rather than
> EFCH_PM_ACPI_MMIO_ADDR which worked in my case? Or is one an alias of
> the other.
>
Yes, it does use EFCH_PM_WDT_ADDR. EFCH_PM_ACPI_MMIO_ADDR works as well,
but is meant to be a fallback. Both point to the watchdog memory space.
Thanks,
Guenter
next prev parent reply other threads:[~2020-09-10 17:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 16:31 [PATCH 1/2] watchdog: sp5100: Fix definition of EFCH_PM_DECODEEN3 Guenter Roeck
2020-09-10 16:31 ` [PATCH 2/2] watchdog: sp5100_tco: Enable watchdog on Family 17h devices if disabled Guenter Roeck
2020-09-10 16:34 ` Jan Kiszka
2020-09-10 16:53 ` Guenter Roeck [this message]
2020-09-10 16:55 ` Jan Kiszka
2020-09-11 5:32 ` Jan Kiszka
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=6ff3df92-3465-f619-7c21-eed421ff719d@roeck-us.net \
--to=linux@roeck-us.net \
--cc=jan.kiszka@siemens.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@linux-watchdog.org \
/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).