xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog/hpwdt: Have core ping watchdog.

Browse Source 
Instead of stopping the hw timer during probe, have the core update
the timer if the timer is already running.

Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Jerry Hoemann
2019-05-17 14:59:40 -06:00
committed by Wim Van Sebroeck
parent c22d8e38e4
commit bb721d6b9e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/watchdog/hpwdt.c
View File

@@ -55,6 +55,11 @@ static const struct pci_device_id hpwdt_blacklist[] = {
/* /*
* Watchdog operations * Watchdog operations
*/ */
static int hpwdt_hw_is_running(void)
{
return ioread8(hpwdt_timer_con) & 0x01;
}
static int hpwdt_start(struct watchdog_device *wdd) static int hpwdt_start(struct watchdog_device *wdd)
{ {
int control = 0x81 | (pretimeout ? 0x4 : 0); int control = 0x81 | (pretimeout ? 0x4 : 0);
@@ -298,8 +303,11 @@ static int hpwdt_init_one(struct pci_dev *dev,
hpwdt_timer_reg = pci_mem_addr + 0x70; hpwdt_timer_reg = pci_mem_addr + 0x70;
hpwdt_timer_con = pci_mem_addr + 0x72; hpwdt_timer_con = pci_mem_addr + 0x72;
/* Make sure that timer is disabled until /dev/watchdog is opened */ /* Have the core update running timer until user space is ready */
hpwdt_stop(); if (hpwdt_hw_is_running()) {
dev_info(&dev->dev, "timer is running\n");
set_bit(WDOG_HW_RUNNING, &hpwdt_dev.status);
}
/* Initialize NMI Decoding functionality */ /* Initialize NMI Decoding functionality */
retval = hpwdt_init_nmi_decoding(dev); retval = hpwdt_init_nmi_decoding(dev);