diff mbox series

[3/6] watchdog/hpwdt: Have core ping watchdog.

Message ID 1558126783-4877-4-git-send-email-jerry.hoemann@hpe.com (mailing list archive)
State Accepted
Headers show
Series watchdog/hpwdt: cleanups and kdump accommodations | expand

Commit Message

Jerry Hoemann May 17, 2019, 8:59 p.m. UTC 
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>
---
 drivers/watchdog/hpwdt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Guenter Roeck June 6, 2019, 9:18 p.m. UTC | #1 
On Fri, May 17, 2019 at 02:59:40PM -0600, Jerry Hoemann wrote:
> 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>

> ---
>  drivers/watchdog/hpwdt.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
> index 9f7a370..aa4101c 100644
> --- a/drivers/watchdog/hpwdt.c
> +++ b/drivers/watchdog/hpwdt.c
> @@ -59,6 +59,11 @@
>  /*
>   *	Watchdog operations
>   */
> +static int hpwdt_hw_is_running(void)
> +{
> +	return ioread8(hpwdt_timer_con) & 0x01;
> +}
> +
>  static int hpwdt_start(struct watchdog_device *wdd)
>  {
>  	int control = 0x81 | (pretimeout ? 0x4 : 0);
> @@ -302,8 +307,11 @@ static int hpwdt_init_one(struct pci_dev *dev,
>  	hpwdt_timer_reg = pci_mem_addr + 0x70;
>  	hpwdt_timer_con = pci_mem_addr + 0x72;
>  
> -	/* Make sure that timer is disabled until /dev/watchdog is opened */
> -	hpwdt_stop();
> +	/* Have the core update running timer until user space is ready */
> +	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 */
>  	retval = hpwdt_init_nmi_decoding(dev);
diff mbox series

Patch

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 9f7a370..aa4101c 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -59,6 +59,11 @@ 
 /*
  *	Watchdog operations
  */
+static int hpwdt_hw_is_running(void)
+{
+	return ioread8(hpwdt_timer_con) & 0x01;
+}
+
 static int hpwdt_start(struct watchdog_device *wdd)
 {
 	int control = 0x81 | (pretimeout ? 0x4 : 0);
@@ -302,8 +307,11 @@  static int hpwdt_init_one(struct pci_dev *dev,
 	hpwdt_timer_reg = pci_mem_addr + 0x70;
 	hpwdt_timer_con = pci_mem_addr + 0x72;
 
-	/* Make sure that timer is disabled until /dev/watchdog is opened */
-	hpwdt_stop();
+	/* Have the core update running timer until user space is ready */
+	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 */
 	retval = hpwdt_init_nmi_decoding(dev);