* [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
@ 2022-06-02 17:53 ` Scott Cheloha
0 siblings, 0 replies; 39+ messages in thread
From: Scott Cheloha @ 2022-06-02 17:53 UTC (permalink / raw)
To: linux-watchdog
Cc: nathanl, wvoigt, aik, Scott Cheloha, vaishnavi, npiggin, tzungbi,
brking, linuxppc-dev, linux
PAPR v2.12 defines a new hypercall, H_WATCHDOG. The hypercall permits
guest control of one or more virtual watchdog timers. The timers have
millisecond granularity. The guest is terminated when a timer
expires.
This patch adds a watchdog driver for these timers, "pseries-wdt".
pseries_wdt_probe() currently assumes the existence of only one
platform device and always assigns it watchdogNumber 1. If we ever
expose more than one timer to userspace we will need to devise a way
to assign a distinct watchdogNumber to each platform device at device
registration time.
Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
---
.../watchdog/watchdog-parameters.rst | 12 +
drivers/watchdog/Kconfig | 8 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/pseries-wdt.c | 264 ++++++++++++++++++
4 files changed, 285 insertions(+)
create mode 100644 drivers/watchdog/pseries-wdt.c
diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/watchdog/watchdog-parameters.rst
index 223c99361a30..29153eed6689 100644
--- a/Documentation/watchdog/watchdog-parameters.rst
+++ b/Documentation/watchdog/watchdog-parameters.rst
@@ -425,6 +425,18 @@ pnx833x_wdt:
-------------------------------------------------
+pseries-wdt:
+ action:
+ Action taken when watchdog expires: 0 (power off), 1 (restart),
+ 2 (dump and restart). (default=1)
+ timeout:
+ Initial watchdog timeout in seconds. (default=60)
+ nowayout:
+ Watchdog cannot be stopped once started.
+ (default=kernel config parameter)
+
+-------------------------------------------------
+
rc32434_wdt:
timeout:
Watchdog timeout value, in seconds (default=20)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index c4e82a8d863f..06b412603f3e 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1932,6 +1932,14 @@ config MEN_A21_WDT
# PPC64 Architecture
+config PSERIES_WDT
+ tristate "POWER Architecture Platform Watchdog Timer"
+ depends on PPC_PSERIES
+ select WATCHDOG_CORE
+ help
+ Driver for virtual watchdog timers provided by PAPR
+ hypervisors (e.g. PowerVM, KVM).
+
config WATCHDOG_RTAS
tristate "RTAS watchdog"
depends on PPC_RTAS
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index f7da867e8782..f35660409f17 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -184,6 +184,7 @@ obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
# PPC64 Architecture
+obj-$(CONFIG_PSERIES_WDT) += pseries-wdt.o
obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
# S390 Architecture
diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
new file mode 100644
index 000000000000..cfe53587457d
--- /dev/null
+++ b/drivers/watchdog/pseries-wdt.c
@@ -0,0 +1,264 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2022 International Business Machines, Inc.
+ */
+
+#include <linux/bitops.h>
+#include <linux/kernel.h>
+#include <linux/limits.h>
+#include <linux/math.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+#include <linux/watchdog.h>
+
+#define DRV_NAME "pseries-wdt"
+
+/*
+ * The PAPR's MSB->LSB bit ordering is 0->63. These macros simplify
+ * defining bitfields as described in the PAPR without needing to
+ * transpose values to the more C-like 63->0 ordering.
+ */
+#define SETFIELD(_v, _b, _e) \
+ (((unsigned long)(_v) << PPC_BITLSHIFT(_e)) & PPC_BITMASK((_b), (_e)))
+#define GETFIELD(_v, _b, _e) \
+ (((unsigned long)(_v) & PPC_BITMASK((_b), (_e))) >> PPC_BITLSHIFT(_e))
+
+/*
+ * The H_WATCHDOG hypercall first appears in PAPR v2.12 and is
+ * described fully in sections 14.5 and 14.15.6.
+ *
+ *
+ * H_WATCHDOG Input
+ *
+ * R4: "flags":
+ *
+ * Bits 48-55: "operation"
+ *
+ * 0x01 Start Watchdog
+ * 0x02 Stop Watchdog
+ * 0x03 Query Watchdog Capabilities
+ */
+#define PSERIES_WDTF_OP(op) SETFIELD((op), 48, 55)
+#define PSERIES_WDTF_OP_START PSERIES_WDTF_OP(0x1)
+#define PSERIES_WDTF_OP_STOP PSERIES_WDTF_OP(0x2)
+#define PSERIES_WDTF_OP_QUERY PSERIES_WDTF_OP(0x3)
+
+/*
+ * Bits 56-63: "timeoutAction" (for "Start Watchdog" only)
+ *
+ * 0x01 Hard poweroff
+ * 0x02 Hard restart
+ * 0x03 Dump restart
+ */
+#define PSERIES_WDTF_ACTION(ac) SETFIELD(ac, 56, 63)
+#define PSERIES_WDTF_ACTION_HARD_POWEROFF PSERIES_WDTF_ACTION(0x1)
+#define PSERIES_WDTF_ACTION_HARD_RESTART PSERIES_WDTF_ACTION(0x2)
+#define PSERIES_WDTF_ACTION_DUMP_RESTART PSERIES_WDTF_ACTION(0x3)
+
+/*
+ * H_WATCHDOG Output
+ *
+ * R3: Return code
+ *
+ * H_SUCCESS The operation completed.
+ *
+ * H_BUSY The hypervisor is too busy; retry the operation.
+ *
+ * H_PARAMETER The given "flags" are somehow invalid. Either the
+ * "operation" or "timeoutAction" is invalid, or a
+ * reserved bit is set.
+ *
+ * H_P2 The given "watchdogNumber" is zero or exceeds the
+ * supported maximum value.
+ *
+ * H_P3 The given "timeoutInMs" is below the supported
+ * minimum value.
+ *
+ * H_NOOP The given "watchdogNumber" is already stopped.
+ *
+ * H_HARDWARE The operation failed for ineffable reasons.
+ *
+ * H_FUNCTION The H_WATCHDOG hypercall is not supported by this
+ * hypervisor.
+ *
+ * R4:
+ *
+ * - For the "Query Watchdog Capabilities" operation, a 64-bit
+ * value structured as follows:
+ *
+ * Bits 0-15: The minimum supported timeout in milliseconds.
+ * Bits 16-31: The number of watchdogs supported.
+ * Bits 32-63: Reserved.
+ */
+#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
+#define PSERIES_WDTQ_MAX_NUMBER(cap) GETFIELD((cap), 16, 31)
+
+static const unsigned long pseries_wdt_action[] = {
+ [0] = PSERIES_WDTF_ACTION_HARD_POWEROFF,
+ [1] = PSERIES_WDTF_ACTION_HARD_RESTART,
+ [2] = PSERIES_WDTF_ACTION_DUMP_RESTART,
+};
+
+#define WATCHDOG_ACTION 1
+static unsigned int action = WATCHDOG_ACTION;
+module_param(action, uint, 0444);
+MODULE_PARM_DESC(action, "Action taken when watchdog expires (default="
+ __MODULE_STRING(WATCHDOG_ACTION) ")");
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0444);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+ __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+#define WATCHDOG_TIMEOUT 60
+static unsigned int timeout = WATCHDOG_TIMEOUT;
+module_param(timeout, uint, 0444);
+MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default="
+ __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+
+struct pseries_wdt {
+ struct watchdog_device wd;
+ unsigned long action;
+ unsigned long num; /* Watchdog numbers are 1-based */
+};
+
+static int pseries_wdt_start(struct watchdog_device *wdd)
+{
+ struct device *dev = wdd->parent;
+ struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
+ unsigned long flags, msecs;
+ long rc;
+
+ flags = pw->action | PSERIES_WDTF_OP_START;
+ msecs = wdd->timeout * 1000UL;
+ rc = plpar_hcall_norets(H_WATCHDOG, flags, pw->num, msecs);
+ if (rc != H_SUCCESS) {
+ dev_crit(dev, "H_WATCHDOG: %ld: failed to start timer %lu",
+ rc, pw->num);
+ return -EIO;
+ }
+ return 0;
+}
+
+static int pseries_wdt_stop(struct watchdog_device *wdd)
+{
+ struct device *dev = wdd->parent;
+ struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
+ long rc;
+
+ rc = plpar_hcall_norets(H_WATCHDOG, PSERIES_WDTF_OP_STOP, pw->num);
+ if (rc != H_SUCCESS && rc != H_NOOP) {
+ dev_crit(dev, "H_WATCHDOG: %ld: failed to stop timer %lu",
+ rc, pw->num);
+ return -EIO;
+ }
+ return 0;
+}
+
+static struct watchdog_info pseries_wdt_info = {
+ .identity = DRV_NAME,
+ .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT
+ | WDIOF_PRETIMEOUT,
+};
+
+static const struct watchdog_ops pseries_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = pseries_wdt_start,
+ .stop = pseries_wdt_stop,
+};
+
+static int pseries_wdt_probe(struct platform_device *pdev)
+{
+ unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
+ unsigned long cap;
+ long rc;
+ struct pseries_wdt *pw;
+ int err;
+
+ rc = plpar_hcall(H_WATCHDOG, ret, PSERIES_WDTF_OP_QUERY);
+ if (rc == H_FUNCTION)
+ return -ENODEV;
+ if (rc != H_SUCCESS)
+ return -EIO;
+ cap = ret[0];
+
+ pw = devm_kzalloc(&pdev->dev, sizeof(*pw), GFP_KERNEL);
+ if (!pw)
+ return -ENOMEM;
+
+ /*
+ * Assume watchdogNumber 1 for now. If we ever support
+ * multiple timers we will need to devise a way to choose a
+ * distinct watchdogNumber for each platform device at device
+ * registration time.
+ */
+ pw->num = 1;
+
+ if (action >= ARRAY_SIZE(pseries_wdt_action))
+ return -EINVAL;
+ pw->action = pseries_wdt_action[action];
+
+ pw->wd.parent = &pdev->dev;
+ pw->wd.info = &pseries_wdt_info;
+ pw->wd.ops = &pseries_wdt_ops;
+ pw->wd.min_timeout = DIV_ROUND_UP(PSERIES_WDTQ_MIN_TIMEOUT(cap), 1000);
+ pw->wd.max_timeout = UINT_MAX / 1000;
+ pw->wd.timeout = timeout;
+ if (watchdog_init_timeout(&pw->wd, 0, NULL))
+ return -EINVAL;
+ watchdog_set_nowayout(&pw->wd, nowayout);
+ watchdog_stop_on_reboot(&pw->wd);
+ watchdog_stop_on_unregister(&pw->wd);
+ watchdog_set_drvdata(&pw->wd, pw);
+
+ err = devm_watchdog_register_device(&pdev->dev, &pw->wd);
+ if (err)
+ return err;
+
+ platform_set_drvdata(pdev, &pw->wd);
+
+ return 0;
+}
+
+static int pseries_wdt_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct watchdog_device *wd = platform_get_drvdata(pdev);
+
+ if (watchdog_active(wd))
+ return pseries_wdt_stop(wd);
+ return 0;
+}
+
+static int pseries_wdt_resume(struct platform_device *pdev)
+{
+ struct watchdog_device *wd = platform_get_drvdata(pdev);
+
+ if (watchdog_active(wd))
+ return pseries_wdt_start(wd);
+ return 0;
+}
+
+static const struct platform_device_id pseries_wdt_id[] = {
+ { .name = "pseries-wdt" },
+ {}
+};
+MODULE_DEVICE_TABLE(platform, pseries_wdt_id);
+
+static struct platform_driver pseries_wdt_driver = {
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ },
+ .id_table = pseries_wdt_id,
+ .probe = pseries_wdt_probe,
+ .resume = pseries_wdt_resume,
+ .suspend = pseries_wdt_suspend,
+};
+module_platform_driver(pseries_wdt_driver);
+
+MODULE_AUTHOR("Alexey Kardashevskiy <aik@ozlabs.ru>");
+MODULE_AUTHOR("Scott Cheloha <cheloha@linux.ibm.com>");
+MODULE_DESCRIPTION("POWER Architecture Platform Watchdog Driver");
+MODULE_LICENSE("GPL");
--
2.27.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
2022-06-02 17:53 ` Scott Cheloha
@ 2022-06-20 6:09 ` Alexey Kardashevskiy
-1 siblings, 0 replies; 39+ messages in thread
From: Alexey Kardashevskiy @ 2022-06-20 6:09 UTC (permalink / raw)
To: Scott Cheloha, linux-watchdog
Cc: linux, tzungbi, brking, nathanl, npiggin, vaishnavi, wvoigt,
linuxppc-dev
On 6/3/22 03:53, Scott Cheloha wrote:
> PAPR v2.12 defines a new hypercall, H_WATCHDOG. The hypercall permits
> guest control of one or more virtual watchdog timers. The timers have
> millisecond granularity. The guest is terminated when a timer
> expires.
>
> This patch adds a watchdog driver for these timers, "pseries-wdt".
>
> pseries_wdt_probe() currently assumes the existence of only one
> platform device and always assigns it watchdogNumber 1. If we ever
> expose more than one timer to userspace we will need to devise a way
> to assign a distinct watchdogNumber to each platform device at device
> registration time.
>
> Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
Besides the patch ordering and 0444 vs. 0644 (which is up to the PPC
maintainer to decide anyway :) ), looks good to me.
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> .../watchdog/watchdog-parameters.rst | 12 +
> drivers/watchdog/Kconfig | 8 +
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/pseries-wdt.c | 264 ++++++++++++++++++
> 4 files changed, 285 insertions(+)
> create mode 100644 drivers/watchdog/pseries-wdt.c
>
> diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/watchdog/watchdog-parameters.rst
> index 223c99361a30..29153eed6689 100644
> --- a/Documentation/watchdog/watchdog-parameters.rst
> +++ b/Documentation/watchdog/watchdog-parameters.rst
> @@ -425,6 +425,18 @@ pnx833x_wdt:
>
> -------------------------------------------------
>
> +pseries-wdt:
> + action:
> + Action taken when watchdog expires: 0 (power off), 1 (restart),
> + 2 (dump and restart). (default=1)
> + timeout:
> + Initial watchdog timeout in seconds. (default=60)
> + nowayout:
> + Watchdog cannot be stopped once started.
> + (default=kernel config parameter)
> +
> +-------------------------------------------------
> +
> rc32434_wdt:
> timeout:
> Watchdog timeout value, in seconds (default=20)
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index c4e82a8d863f..06b412603f3e 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1932,6 +1932,14 @@ config MEN_A21_WDT
>
> # PPC64 Architecture
>
> +config PSERIES_WDT
> + tristate "POWER Architecture Platform Watchdog Timer"
> + depends on PPC_PSERIES
> + select WATCHDOG_CORE
> + help
> + Driver for virtual watchdog timers provided by PAPR
> + hypervisors (e.g. PowerVM, KVM).
> +
> config WATCHDOG_RTAS
> tristate "RTAS watchdog"
> depends on PPC_RTAS
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index f7da867e8782..f35660409f17 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -184,6 +184,7 @@ obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
> obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
>
> # PPC64 Architecture
> +obj-$(CONFIG_PSERIES_WDT) += pseries-wdt.o
> obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
>
> # S390 Architecture
> diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
> new file mode 100644
> index 000000000000..cfe53587457d
> --- /dev/null
> +++ b/drivers/watchdog/pseries-wdt.c
> @@ -0,0 +1,264 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2022 International Business Machines, Inc.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/kernel.h>
> +#include <linux/limits.h>
> +#include <linux/math.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/platform_device.h>
> +#include <linux/watchdog.h>
> +
> +#define DRV_NAME "pseries-wdt"
> +
> +/*
> + * The PAPR's MSB->LSB bit ordering is 0->63. These macros simplify
> + * defining bitfields as described in the PAPR without needing to
> + * transpose values to the more C-like 63->0 ordering.
> + */
> +#define SETFIELD(_v, _b, _e) \
> + (((unsigned long)(_v) << PPC_BITLSHIFT(_e)) & PPC_BITMASK((_b), (_e)))
> +#define GETFIELD(_v, _b, _e) \
> + (((unsigned long)(_v) & PPC_BITMASK((_b), (_e))) >> PPC_BITLSHIFT(_e))
> +
> +/*
> + * The H_WATCHDOG hypercall first appears in PAPR v2.12 and is
> + * described fully in sections 14.5 and 14.15.6.
> + *
> + *
> + * H_WATCHDOG Input
> + *
> + * R4: "flags":
> + *
> + * Bits 48-55: "operation"
> + *
> + * 0x01 Start Watchdog
> + * 0x02 Stop Watchdog
> + * 0x03 Query Watchdog Capabilities
> + */
> +#define PSERIES_WDTF_OP(op) SETFIELD((op), 48, 55)
> +#define PSERIES_WDTF_OP_START PSERIES_WDTF_OP(0x1)
> +#define PSERIES_WDTF_OP_STOP PSERIES_WDTF_OP(0x2)
> +#define PSERIES_WDTF_OP_QUERY PSERIES_WDTF_OP(0x3)
> +
> +/*
> + * Bits 56-63: "timeoutAction" (for "Start Watchdog" only)
> + *
> + * 0x01 Hard poweroff
> + * 0x02 Hard restart
> + * 0x03 Dump restart
> + */
> +#define PSERIES_WDTF_ACTION(ac) SETFIELD(ac, 56, 63)
> +#define PSERIES_WDTF_ACTION_HARD_POWEROFF PSERIES_WDTF_ACTION(0x1)
> +#define PSERIES_WDTF_ACTION_HARD_RESTART PSERIES_WDTF_ACTION(0x2)
> +#define PSERIES_WDTF_ACTION_DUMP_RESTART PSERIES_WDTF_ACTION(0x3)
> +
> +/*
> + * H_WATCHDOG Output
> + *
> + * R3: Return code
> + *
> + * H_SUCCESS The operation completed.
> + *
> + * H_BUSY The hypervisor is too busy; retry the operation.
> + *
> + * H_PARAMETER The given "flags" are somehow invalid. Either the
> + * "operation" or "timeoutAction" is invalid, or a
> + * reserved bit is set.
> + *
> + * H_P2 The given "watchdogNumber" is zero or exceeds the
> + * supported maximum value.
> + *
> + * H_P3 The given "timeoutInMs" is below the supported
> + * minimum value.
> + *
> + * H_NOOP The given "watchdogNumber" is already stopped.
> + *
> + * H_HARDWARE The operation failed for ineffable reasons.
> + *
> + * H_FUNCTION The H_WATCHDOG hypercall is not supported by this
> + * hypervisor.
> + *
> + * R4:
> + *
> + * - For the "Query Watchdog Capabilities" operation, a 64-bit
> + * value structured as follows:
> + *
> + * Bits 0-15: The minimum supported timeout in milliseconds.
> + * Bits 16-31: The number of watchdogs supported.
> + * Bits 32-63: Reserved.
> + */
> +#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
> +#define PSERIES_WDTQ_MAX_NUMBER(cap) GETFIELD((cap), 16, 31)
> +
> +static const unsigned long pseries_wdt_action[] = {
> + [0] = PSERIES_WDTF_ACTION_HARD_POWEROFF,
> + [1] = PSERIES_WDTF_ACTION_HARD_RESTART,
> + [2] = PSERIES_WDTF_ACTION_DUMP_RESTART,
> +};
> +
> +#define WATCHDOG_ACTION 1
> +static unsigned int action = WATCHDOG_ACTION;
> +module_param(action, uint, 0444);
> +MODULE_PARM_DESC(action, "Action taken when watchdog expires (default="
> + __MODULE_STRING(WATCHDOG_ACTION) ")");
> +
> +static bool nowayout = WATCHDOG_NOWAYOUT;
> +module_param(nowayout, bool, 0444);
> +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
> + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> +
> +#define WATCHDOG_TIMEOUT 60
> +static unsigned int timeout = WATCHDOG_TIMEOUT;
> +module_param(timeout, uint, 0444);
> +MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default="
> + __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
> +
> +struct pseries_wdt {
> + struct watchdog_device wd;
> + unsigned long action;
> + unsigned long num; /* Watchdog numbers are 1-based */
> +};
> +
> +static int pseries_wdt_start(struct watchdog_device *wdd)
> +{
> + struct device *dev = wdd->parent;
> + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> + unsigned long flags, msecs;
> + long rc;
> +
> + flags = pw->action | PSERIES_WDTF_OP_START;
> + msecs = wdd->timeout * 1000UL;
> + rc = plpar_hcall_norets(H_WATCHDOG, flags, pw->num, msecs);
> + if (rc != H_SUCCESS) {
> + dev_crit(dev, "H_WATCHDOG: %ld: failed to start timer %lu",
> + rc, pw->num);
> + return -EIO;
> + }
> + return 0;
> +}
> +
> +static int pseries_wdt_stop(struct watchdog_device *wdd)
> +{
> + struct device *dev = wdd->parent;
> + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> + long rc;
> +
> + rc = plpar_hcall_norets(H_WATCHDOG, PSERIES_WDTF_OP_STOP, pw->num);
> + if (rc != H_SUCCESS && rc != H_NOOP) {
> + dev_crit(dev, "H_WATCHDOG: %ld: failed to stop timer %lu",
> + rc, pw->num);
> + return -EIO;
> + }
> + return 0;
> +}
> +
> +static struct watchdog_info pseries_wdt_info = {
> + .identity = DRV_NAME,
> + .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT
> + | WDIOF_PRETIMEOUT,
> +};
> +
> +static const struct watchdog_ops pseries_wdt_ops = {
> + .owner = THIS_MODULE,
> + .start = pseries_wdt_start,
> + .stop = pseries_wdt_stop,
> +};
> +
> +static int pseries_wdt_probe(struct platform_device *pdev)
> +{
> + unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
> + unsigned long cap;
> + long rc;
> + struct pseries_wdt *pw;
> + int err;
> +
> + rc = plpar_hcall(H_WATCHDOG, ret, PSERIES_WDTF_OP_QUERY);
> + if (rc == H_FUNCTION)
> + return -ENODEV;
> + if (rc != H_SUCCESS)
> + return -EIO;
> + cap = ret[0];
> +
> + pw = devm_kzalloc(&pdev->dev, sizeof(*pw), GFP_KERNEL);
> + if (!pw)
> + return -ENOMEM;
> +
> + /*
> + * Assume watchdogNumber 1 for now. If we ever support
> + * multiple timers we will need to devise a way to choose a
> + * distinct watchdogNumber for each platform device at device
> + * registration time.
> + */
> + pw->num = 1;
> +
> + if (action >= ARRAY_SIZE(pseries_wdt_action))
> + return -EINVAL;
> + pw->action = pseries_wdt_action[action];
> +
> + pw->wd.parent = &pdev->dev;
> + pw->wd.info = &pseries_wdt_info;
> + pw->wd.ops = &pseries_wdt_ops;
> + pw->wd.min_timeout = DIV_ROUND_UP(PSERIES_WDTQ_MIN_TIMEOUT(cap), 1000);
> + pw->wd.max_timeout = UINT_MAX / 1000;
> + pw->wd.timeout = timeout;
> + if (watchdog_init_timeout(&pw->wd, 0, NULL))
> + return -EINVAL;
> + watchdog_set_nowayout(&pw->wd, nowayout);
> + watchdog_stop_on_reboot(&pw->wd);
> + watchdog_stop_on_unregister(&pw->wd);
> + watchdog_set_drvdata(&pw->wd, pw);
> +
> + err = devm_watchdog_register_device(&pdev->dev, &pw->wd);
> + if (err)
> + return err;
> +
> + platform_set_drvdata(pdev, &pw->wd);
> +
> + return 0;
> +}
> +
> +static int pseries_wdt_suspend(struct platform_device *pdev, pm_message_t state)
> +{
> + struct watchdog_device *wd = platform_get_drvdata(pdev);
> +
> + if (watchdog_active(wd))
> + return pseries_wdt_stop(wd);
> + return 0;
> +}
> +
> +static int pseries_wdt_resume(struct platform_device *pdev)
> +{
> + struct watchdog_device *wd = platform_get_drvdata(pdev);
> +
> + if (watchdog_active(wd))
> + return pseries_wdt_start(wd);
> + return 0;
> +}
> +
> +static const struct platform_device_id pseries_wdt_id[] = {
> + { .name = "pseries-wdt" },
> + {}
> +};
> +MODULE_DEVICE_TABLE(platform, pseries_wdt_id);
> +
> +static struct platform_driver pseries_wdt_driver = {
> + .driver = {
> + .name = DRV_NAME,
> + .owner = THIS_MODULE,
> + },
> + .id_table = pseries_wdt_id,
> + .probe = pseries_wdt_probe,
> + .resume = pseries_wdt_resume,
> + .suspend = pseries_wdt_suspend,
> +};
> +module_platform_driver(pseries_wdt_driver);
> +
> +MODULE_AUTHOR("Alexey Kardashevskiy <aik@ozlabs.ru>");
> +MODULE_AUTHOR("Scott Cheloha <cheloha@linux.ibm.com>");
> +MODULE_DESCRIPTION("POWER Architecture Platform Watchdog Driver");
> +MODULE_LICENSE("GPL");
--
Alexey
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
@ 2022-06-20 6:09 ` Alexey Kardashevskiy
0 siblings, 0 replies; 39+ messages in thread
From: Alexey Kardashevskiy @ 2022-06-20 6:09 UTC (permalink / raw)
To: Scott Cheloha, linux-watchdog
Cc: nathanl, wvoigt, vaishnavi, npiggin, tzungbi, brking,
linuxppc-dev, linux
On 6/3/22 03:53, Scott Cheloha wrote:
> PAPR v2.12 defines a new hypercall, H_WATCHDOG. The hypercall permits
> guest control of one or more virtual watchdog timers. The timers have
> millisecond granularity. The guest is terminated when a timer
> expires.
>
> This patch adds a watchdog driver for these timers, "pseries-wdt".
>
> pseries_wdt_probe() currently assumes the existence of only one
> platform device and always assigns it watchdogNumber 1. If we ever
> expose more than one timer to userspace we will need to devise a way
> to assign a distinct watchdogNumber to each platform device at device
> registration time.
>
> Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
Besides the patch ordering and 0444 vs. 0644 (which is up to the PPC
maintainer to decide anyway :) ), looks good to me.
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> .../watchdog/watchdog-parameters.rst | 12 +
> drivers/watchdog/Kconfig | 8 +
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/pseries-wdt.c | 264 ++++++++++++++++++
> 4 files changed, 285 insertions(+)
> create mode 100644 drivers/watchdog/pseries-wdt.c
>
> diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/watchdog/watchdog-parameters.rst
> index 223c99361a30..29153eed6689 100644
> --- a/Documentation/watchdog/watchdog-parameters.rst
> +++ b/Documentation/watchdog/watchdog-parameters.rst
> @@ -425,6 +425,18 @@ pnx833x_wdt:
>
> -------------------------------------------------
>
> +pseries-wdt:
> + action:
> + Action taken when watchdog expires: 0 (power off), 1 (restart),
> + 2 (dump and restart). (default=1)
> + timeout:
> + Initial watchdog timeout in seconds. (default=60)
> + nowayout:
> + Watchdog cannot be stopped once started.
> + (default=kernel config parameter)
> +
> +-------------------------------------------------
> +
> rc32434_wdt:
> timeout:
> Watchdog timeout value, in seconds (default=20)
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index c4e82a8d863f..06b412603f3e 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1932,6 +1932,14 @@ config MEN_A21_WDT
>
> # PPC64 Architecture
>
> +config PSERIES_WDT
> + tristate "POWER Architecture Platform Watchdog Timer"
> + depends on PPC_PSERIES
> + select WATCHDOG_CORE
> + help
> + Driver for virtual watchdog timers provided by PAPR
> + hypervisors (e.g. PowerVM, KVM).
> +
> config WATCHDOG_RTAS
> tristate "RTAS watchdog"
> depends on PPC_RTAS
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index f7da867e8782..f35660409f17 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -184,6 +184,7 @@ obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
> obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
>
> # PPC64 Architecture
> +obj-$(CONFIG_PSERIES_WDT) += pseries-wdt.o
> obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
>
> # S390 Architecture
> diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
> new file mode 100644
> index 000000000000..cfe53587457d
> --- /dev/null
> +++ b/drivers/watchdog/pseries-wdt.c
> @@ -0,0 +1,264 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2022 International Business Machines, Inc.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/kernel.h>
> +#include <linux/limits.h>
> +#include <linux/math.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/platform_device.h>
> +#include <linux/watchdog.h>
> +
> +#define DRV_NAME "pseries-wdt"
> +
> +/*
> + * The PAPR's MSB->LSB bit ordering is 0->63. These macros simplify
> + * defining bitfields as described in the PAPR without needing to
> + * transpose values to the more C-like 63->0 ordering.
> + */
> +#define SETFIELD(_v, _b, _e) \
> + (((unsigned long)(_v) << PPC_BITLSHIFT(_e)) & PPC_BITMASK((_b), (_e)))
> +#define GETFIELD(_v, _b, _e) \
> + (((unsigned long)(_v) & PPC_BITMASK((_b), (_e))) >> PPC_BITLSHIFT(_e))
> +
> +/*
> + * The H_WATCHDOG hypercall first appears in PAPR v2.12 and is
> + * described fully in sections 14.5 and 14.15.6.
> + *
> + *
> + * H_WATCHDOG Input
> + *
> + * R4: "flags":
> + *
> + * Bits 48-55: "operation"
> + *
> + * 0x01 Start Watchdog
> + * 0x02 Stop Watchdog
> + * 0x03 Query Watchdog Capabilities
> + */
> +#define PSERIES_WDTF_OP(op) SETFIELD((op), 48, 55)
> +#define PSERIES_WDTF_OP_START PSERIES_WDTF_OP(0x1)
> +#define PSERIES_WDTF_OP_STOP PSERIES_WDTF_OP(0x2)
> +#define PSERIES_WDTF_OP_QUERY PSERIES_WDTF_OP(0x3)
> +
> +/*
> + * Bits 56-63: "timeoutAction" (for "Start Watchdog" only)
> + *
> + * 0x01 Hard poweroff
> + * 0x02 Hard restart
> + * 0x03 Dump restart
> + */
> +#define PSERIES_WDTF_ACTION(ac) SETFIELD(ac, 56, 63)
> +#define PSERIES_WDTF_ACTION_HARD_POWEROFF PSERIES_WDTF_ACTION(0x1)
> +#define PSERIES_WDTF_ACTION_HARD_RESTART PSERIES_WDTF_ACTION(0x2)
> +#define PSERIES_WDTF_ACTION_DUMP_RESTART PSERIES_WDTF_ACTION(0x3)
> +
> +/*
> + * H_WATCHDOG Output
> + *
> + * R3: Return code
> + *
> + * H_SUCCESS The operation completed.
> + *
> + * H_BUSY The hypervisor is too busy; retry the operation.
> + *
> + * H_PARAMETER The given "flags" are somehow invalid. Either the
> + * "operation" or "timeoutAction" is invalid, or a
> + * reserved bit is set.
> + *
> + * H_P2 The given "watchdogNumber" is zero or exceeds the
> + * supported maximum value.
> + *
> + * H_P3 The given "timeoutInMs" is below the supported
> + * minimum value.
> + *
> + * H_NOOP The given "watchdogNumber" is already stopped.
> + *
> + * H_HARDWARE The operation failed for ineffable reasons.
> + *
> + * H_FUNCTION The H_WATCHDOG hypercall is not supported by this
> + * hypervisor.
> + *
> + * R4:
> + *
> + * - For the "Query Watchdog Capabilities" operation, a 64-bit
> + * value structured as follows:
> + *
> + * Bits 0-15: The minimum supported timeout in milliseconds.
> + * Bits 16-31: The number of watchdogs supported.
> + * Bits 32-63: Reserved.
> + */
> +#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
> +#define PSERIES_WDTQ_MAX_NUMBER(cap) GETFIELD((cap), 16, 31)
> +
> +static const unsigned long pseries_wdt_action[] = {
> + [0] = PSERIES_WDTF_ACTION_HARD_POWEROFF,
> + [1] = PSERIES_WDTF_ACTION_HARD_RESTART,
> + [2] = PSERIES_WDTF_ACTION_DUMP_RESTART,
> +};
> +
> +#define WATCHDOG_ACTION 1
> +static unsigned int action = WATCHDOG_ACTION;
> +module_param(action, uint, 0444);
> +MODULE_PARM_DESC(action, "Action taken when watchdog expires (default="
> + __MODULE_STRING(WATCHDOG_ACTION) ")");
> +
> +static bool nowayout = WATCHDOG_NOWAYOUT;
> +module_param(nowayout, bool, 0444);
> +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
> + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> +
> +#define WATCHDOG_TIMEOUT 60
> +static unsigned int timeout = WATCHDOG_TIMEOUT;
> +module_param(timeout, uint, 0444);
> +MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default="
> + __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
> +
> +struct pseries_wdt {
> + struct watchdog_device wd;
> + unsigned long action;
> + unsigned long num; /* Watchdog numbers are 1-based */
> +};
> +
> +static int pseries_wdt_start(struct watchdog_device *wdd)
> +{
> + struct device *dev = wdd->parent;
> + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> + unsigned long flags, msecs;
> + long rc;
> +
> + flags = pw->action | PSERIES_WDTF_OP_START;
> + msecs = wdd->timeout * 1000UL;
> + rc = plpar_hcall_norets(H_WATCHDOG, flags, pw->num, msecs);
> + if (rc != H_SUCCESS) {
> + dev_crit(dev, "H_WATCHDOG: %ld: failed to start timer %lu",
> + rc, pw->num);
> + return -EIO;
> + }
> + return 0;
> +}
> +
> +static int pseries_wdt_stop(struct watchdog_device *wdd)
> +{
> + struct device *dev = wdd->parent;
> + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> + long rc;
> +
> + rc = plpar_hcall_norets(H_WATCHDOG, PSERIES_WDTF_OP_STOP, pw->num);
> + if (rc != H_SUCCESS && rc != H_NOOP) {
> + dev_crit(dev, "H_WATCHDOG: %ld: failed to stop timer %lu",
> + rc, pw->num);
> + return -EIO;
> + }
> + return 0;
> +}
> +
> +static struct watchdog_info pseries_wdt_info = {
> + .identity = DRV_NAME,
> + .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT
> + | WDIOF_PRETIMEOUT,
> +};
> +
> +static const struct watchdog_ops pseries_wdt_ops = {
> + .owner = THIS_MODULE,
> + .start = pseries_wdt_start,
> + .stop = pseries_wdt_stop,
> +};
> +
> +static int pseries_wdt_probe(struct platform_device *pdev)
> +{
> + unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
> + unsigned long cap;
> + long rc;
> + struct pseries_wdt *pw;
> + int err;
> +
> + rc = plpar_hcall(H_WATCHDOG, ret, PSERIES_WDTF_OP_QUERY);
> + if (rc == H_FUNCTION)
> + return -ENODEV;
> + if (rc != H_SUCCESS)
> + return -EIO;
> + cap = ret[0];
> +
> + pw = devm_kzalloc(&pdev->dev, sizeof(*pw), GFP_KERNEL);
> + if (!pw)
> + return -ENOMEM;
> +
> + /*
> + * Assume watchdogNumber 1 for now. If we ever support
> + * multiple timers we will need to devise a way to choose a
> + * distinct watchdogNumber for each platform device at device
> + * registration time.
> + */
> + pw->num = 1;
> +
> + if (action >= ARRAY_SIZE(pseries_wdt_action))
> + return -EINVAL;
> + pw->action = pseries_wdt_action[action];
> +
> + pw->wd.parent = &pdev->dev;
> + pw->wd.info = &pseries_wdt_info;
> + pw->wd.ops = &pseries_wdt_ops;
> + pw->wd.min_timeout = DIV_ROUND_UP(PSERIES_WDTQ_MIN_TIMEOUT(cap), 1000);
> + pw->wd.max_timeout = UINT_MAX / 1000;
> + pw->wd.timeout = timeout;
> + if (watchdog_init_timeout(&pw->wd, 0, NULL))
> + return -EINVAL;
> + watchdog_set_nowayout(&pw->wd, nowayout);
> + watchdog_stop_on_reboot(&pw->wd);
> + watchdog_stop_on_unregister(&pw->wd);
> + watchdog_set_drvdata(&pw->wd, pw);
> +
> + err = devm_watchdog_register_device(&pdev->dev, &pw->wd);
> + if (err)
> + return err;
> +
> + platform_set_drvdata(pdev, &pw->wd);
> +
> + return 0;
> +}
> +
> +static int pseries_wdt_suspend(struct platform_device *pdev, pm_message_t state)
> +{
> + struct watchdog_device *wd = platform_get_drvdata(pdev);
> +
> + if (watchdog_active(wd))
> + return pseries_wdt_stop(wd);
> + return 0;
> +}
> +
> +static int pseries_wdt_resume(struct platform_device *pdev)
> +{
> + struct watchdog_device *wd = platform_get_drvdata(pdev);
> +
> + if (watchdog_active(wd))
> + return pseries_wdt_start(wd);
> + return 0;
> +}
> +
> +static const struct platform_device_id pseries_wdt_id[] = {
> + { .name = "pseries-wdt" },
> + {}
> +};
> +MODULE_DEVICE_TABLE(platform, pseries_wdt_id);
> +
> +static struct platform_driver pseries_wdt_driver = {
> + .driver = {
> + .name = DRV_NAME,
> + .owner = THIS_MODULE,
> + },
> + .id_table = pseries_wdt_id,
> + .probe = pseries_wdt_probe,
> + .resume = pseries_wdt_resume,
> + .suspend = pseries_wdt_suspend,
> +};
> +module_platform_driver(pseries_wdt_driver);
> +
> +MODULE_AUTHOR("Alexey Kardashevskiy <aik@ozlabs.ru>");
> +MODULE_AUTHOR("Scott Cheloha <cheloha@linux.ibm.com>");
> +MODULE_DESCRIPTION("POWER Architecture Platform Watchdog Driver");
> +MODULE_LICENSE("GPL");
--
Alexey
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
2022-06-02 17:53 ` Scott Cheloha
@ 2022-06-21 15:45 ` Nathan Lynch
-1 siblings, 0 replies; 39+ messages in thread
From: Nathan Lynch @ 2022-06-21 15:45 UTC (permalink / raw)
To: Scott Cheloha, linux-watchdog
Cc: linux, tzungbi, brking, aik, npiggin, vaishnavi, wvoigt,
linuxppc-dev, Scott Cheloha
Scott Cheloha <cheloha@linux.ibm.com> writes:
> PAPR v2.12 defines a new hypercall, H_WATCHDOG. The hypercall permits
> guest control of one or more virtual watchdog timers. The timers have
> millisecond granularity. The guest is terminated when a timer
> expires.
>
> This patch adds a watchdog driver for these timers, "pseries-wdt".
>
> pseries_wdt_probe() currently assumes the existence of only one
> platform device and always assigns it watchdogNumber 1. If we ever
> expose more than one timer to userspace we will need to devise a way
> to assign a distinct watchdogNumber to each platform device at device
> registration time.
>
> Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
@ 2022-06-21 15:45 ` Nathan Lynch
0 siblings, 0 replies; 39+ messages in thread
From: Nathan Lynch @ 2022-06-21 15:45 UTC (permalink / raw)
To: Scott Cheloha, linux-watchdog
Cc: wvoigt, aik, Scott Cheloha, vaishnavi, npiggin, tzungbi, brking,
linuxppc-dev, linux
Scott Cheloha <cheloha@linux.ibm.com> writes:
> PAPR v2.12 defines a new hypercall, H_WATCHDOG. The hypercall permits
> guest control of one or more virtual watchdog timers. The timers have
> millisecond granularity. The guest is terminated when a timer
> expires.
>
> This patch adds a watchdog driver for these timers, "pseries-wdt".
>
> pseries_wdt_probe() currently assumes the existence of only one
> platform device and always assigns it watchdogNumber 1. If we ever
> expose more than one timer to userspace we will need to devise a way
> to assign a distinct watchdogNumber to each platform device at device
> registration time.
>
> Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
2022-06-02 17:53 ` Scott Cheloha
` (2 preceding siblings ...)
(?)
@ 2022-06-24 13:27 ` Michael Ellerman
2022-06-24 15:31 ` Segher Boessenkool
2022-07-08 5:51 ` Scott Cheloha
-1 siblings, 2 replies; 39+ messages in thread
From: Michael Ellerman @ 2022-06-24 13:27 UTC (permalink / raw)
To: Scott Cheloha, linux-watchdog
Cc: nathanl, wvoigt, aik, Scott Cheloha, vaishnavi, npiggin, tzungbi,
brking, linuxppc-dev, linux
Hi Scott,
A few comments below ...
Scott Cheloha <cheloha@linux.ibm.com> writes:
> PAPR v2.12 defines a new hypercall, H_WATCHDOG. The hypercall permits
> guest control of one or more virtual watchdog timers. The timers have
> millisecond granularity. The guest is terminated when a timer
> expires.
>
> This patch adds a watchdog driver for these timers, "pseries-wdt".
>
> pseries_wdt_probe() currently assumes the existence of only one
> platform device and always assigns it watchdogNumber 1. If we ever
> expose more than one timer to userspace we will need to devise a way
> to assign a distinct watchdogNumber to each platform device at device
> registration time.
>
> Signed-off-by: Scott Cheloha <cheloha@linux.ibm.com>
> ---
> .../watchdog/watchdog-parameters.rst | 12 +
> drivers/watchdog/Kconfig | 8 +
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/pseries-wdt.c | 264 ++++++++++++++++++
> 4 files changed, 285 insertions(+)
> create mode 100644 drivers/watchdog/pseries-wdt.c
>
> diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/watchdog/watchdog-parameters.rst
> index 223c99361a30..29153eed6689 100644
> --- a/Documentation/watchdog/watchdog-parameters.rst
> +++ b/Documentation/watchdog/watchdog-parameters.rst
> @@ -425,6 +425,18 @@ pnx833x_wdt:
>
> -------------------------------------------------
>
> +pseries-wdt:
> + action:
> + Action taken when watchdog expires: 0 (power off), 1 (restart),
> + 2 (dump and restart). (default=1)
I doesn't look like these values match what other drivers use to any
great extent.
So why not use the values from PAPR directly?
ie. 1 = power off, 2 = hard reset, 3 = dump & restart.
It seems like it would be easier to follow if the values map directly.
It's possible in future PAPR adds 247 to mean something, in which case
maybe we'd want to map that to a less silly value, but at least for now
the PAPR values are sensible enough.
> + timeout:
> + Initial watchdog timeout in seconds. (default=60)
That seems like a pretty common value, I don't see any guidance in PAPR.
Do we have any input from PowerVM on whether that's a good value?
> diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
> new file mode 100644
> index 000000000000..cfe53587457d
> --- /dev/null
> +++ b/drivers/watchdog/pseries-wdt.c
> @@ -0,0 +1,264 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2022 International Business Machines, Inc.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/kernel.h>
> +#include <linux/limits.h>
> +#include <linux/math.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/platform_device.h>
> +#include <linux/watchdog.h>
> +
> +#define DRV_NAME "pseries-wdt"
> +
> +/*
> + * The PAPR's MSB->LSB bit ordering is 0->63. These macros simplify
> + * defining bitfields as described in the PAPR without needing to
> + * transpose values to the more C-like 63->0 ordering.
> + */
> +#define SETFIELD(_v, _b, _e) \
> + (((unsigned long)(_v) << PPC_BITLSHIFT(_e)) & PPC_BITMASK((_b), (_e)))
> +#define GETFIELD(_v, _b, _e) \
> + (((unsigned long)(_v) & PPC_BITMASK((_b), (_e))) >> PPC_BITLSHIFT(_e))
This will probably sound like a cranky maintainer rant, but ...,
I really dislike these GETFIELD/SETFIELD macros.
I know you didn't invent them, but I would be much happier if you didn't
use them.
I know they (slightly) simplify things when you're transcribing values
from PAPR into the source, but that happens only once.
And then for the rest of eternity the source is harder to read because
there's this ridiculous level of indirection through insane macros just
to define some constants.
Anyone trying to use a debugger against this code will see a value in
memory like 0x200 and have to sit down and work out which SETFIELD()
macro it corresponds to.
> +/*
> + * The H_WATCHDOG hypercall first appears in PAPR v2.12 and is
> + * described fully in sections 14.5 and 14.15.6.
> + *
> + *
> + * H_WATCHDOG Input
> + *
> + * R4: "flags":
> + *
> + * Bits 48-55: "operation"
> + *
> + * 0x01 Start Watchdog
> + * 0x02 Stop Watchdog
> + * 0x03 Query Watchdog Capabilities
> + */
> +#define PSERIES_WDTF_OP(op) SETFIELD((op), 48, 55)
> +#define PSERIES_WDTF_OP_START PSERIES_WDTF_OP(0x1)
> +#define PSERIES_WDTF_OP_STOP PSERIES_WDTF_OP(0x2)
> +#define PSERIES_WDTF_OP_QUERY PSERIES_WDTF_OP(0x3)
eg, IMHO these are much more reader friendly:
#define PSERIES_WDTF_OP_START (1 << 8)
#define PSERIES_WDTF_OP_STOP (2 << 8)
#define PSERIES_WDTF_OP_QUERY (3 << 8)
> +/*
> + * Bits 56-63: "timeoutAction" (for "Start Watchdog" only)
> + *
> + * 0x01 Hard poweroff
> + * 0x02 Hard restart
> + * 0x03 Dump restart
> + */
> +#define PSERIES_WDTF_ACTION(ac) SETFIELD(ac, 56, 63)
> +#define PSERIES_WDTF_ACTION_HARD_POWEROFF PSERIES_WDTF_ACTION(0x1)
> +#define PSERIES_WDTF_ACTION_HARD_RESTART PSERIES_WDTF_ACTION(0x2)
> +#define PSERIES_WDTF_ACTION_DUMP_RESTART PSERIES_WDTF_ACTION(0x3)
These are a slam dunk:
#define PSERIES_WDTF_ACTION_HARD_POWEROFF 1
#define PSERIES_WDTF_ACTION_HARD_RESTART 2
#define PSERIES_WDTF_ACTION_DUMP_RESTART 3
> +
> +/*
> + * H_WATCHDOG Output
> + *
> + * R3: Return code
> + *
> + * H_SUCCESS The operation completed.
> + *
> + * H_BUSY The hypervisor is too busy; retry the operation.
> + *
> + * H_PARAMETER The given "flags" are somehow invalid. Either the
> + * "operation" or "timeoutAction" is invalid, or a
> + * reserved bit is set.
> + *
> + * H_P2 The given "watchdogNumber" is zero or exceeds the
> + * supported maximum value.
> + *
> + * H_P3 The given "timeoutInMs" is below the supported
> + * minimum value.
> + *
> + * H_NOOP The given "watchdogNumber" is already stopped.
> + *
> + * H_HARDWARE The operation failed for ineffable reasons.
> + *
> + * H_FUNCTION The H_WATCHDOG hypercall is not supported by this
> + * hypervisor.
> + *
> + * R4:
> + *
> + * - For the "Query Watchdog Capabilities" operation, a 64-bit
> + * value structured as follows:
> + *
> + * Bits 0-15: The minimum supported timeout in milliseconds.
> + * Bits 16-31: The number of watchdogs supported.
> + * Bits 32-63: Reserved.
> + */
> +#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
This one is less obviously better, but I still think it's clearer as all
the logic is there in front of you, rather than hidden in the macro. It
is clearer that we're only returning a 16-bit value.
#define PSERIES_WDTQ_MIN_TIMEOUT(cap) (((cap) >> 48) & 0xffff)
> +#define PSERIES_WDTQ_MAX_NUMBER(cap) GETFIELD((cap), 16, 31)
That's unused.
I guess we're assuming at least one timer is always supported? Seems
reasonable.
> +
> +static const unsigned long pseries_wdt_action[] = {
> + [0] = PSERIES_WDTF_ACTION_HARD_POWEROFF,
> + [1] = PSERIES_WDTF_ACTION_HARD_RESTART,
> + [2] = PSERIES_WDTF_ACTION_DUMP_RESTART,
> +};
If we used the PAPR values we wouldn't need that ^
> +#define WATCHDOG_ACTION 1
DEFAULT_ACTION ?
> +static unsigned int action = WATCHDOG_ACTION;
> +module_param(action, uint, 0444);
> +MODULE_PARM_DESC(action, "Action taken when watchdog expires (default="
> + __MODULE_STRING(WATCHDOG_ACTION) ")");
> +
> +static bool nowayout = WATCHDOG_NOWAYOUT;
> +module_param(nowayout, bool, 0444);
> +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
> + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> +
> +#define WATCHDOG_TIMEOUT 60
DEFAULT_TIMEOUT ?
> +static unsigned int timeout = WATCHDOG_TIMEOUT;
> +module_param(timeout, uint, 0444);
> +MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default="
> + __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
> +
> +struct pseries_wdt {
> + struct watchdog_device wd;
> + unsigned long action;
> + unsigned long num; /* Watchdog numbers are 1-based */
num can just be an int.
But do we even need it, do we anticipate supporting multiple timers?
Should we just hard code '1' ?
> +};
> +
> +static int pseries_wdt_start(struct watchdog_device *wdd)
> +{
> + struct device *dev = wdd->parent;
> + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> + unsigned long flags, msecs;
> + long rc;
> +
> + flags = pw->action | PSERIES_WDTF_OP_START;
We set pw->action at probe time based on the module param action, but
this is the only place we use it.
If we use the PAPR values, this could just be:
flags = (pw->action << 8) | PSERIES_WDTF_OP_START;
And is there any benefit in storing action in pseries_wdt, we could just
use the module param value here.
> + msecs = wdd->timeout * 1000UL;
Using MSEC_PER_SEC makes it clearer what that conversion is doing.
> + rc = plpar_hcall_norets(H_WATCHDOG, flags, pw->num, msecs);
> + if (rc != H_SUCCESS) {
> + dev_crit(dev, "H_WATCHDOG: %ld: failed to start timer %lu",
> + rc, pw->num);
> + return -EIO;
> + }
> + return 0;
> +}
> +
> +static int pseries_wdt_stop(struct watchdog_device *wdd)
> +{
> + struct device *dev = wdd->parent;
> + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> + long rc;
> +
> + rc = plpar_hcall_norets(H_WATCHDOG, PSERIES_WDTF_OP_STOP, pw->num);
> + if (rc != H_SUCCESS && rc != H_NOOP) {
> + dev_crit(dev, "H_WATCHDOG: %ld: failed to stop timer %lu",
> + rc, pw->num);
> + return -EIO;
> + }
> + return 0;
> +}
> +
> +static struct watchdog_info pseries_wdt_info = {
> + .identity = DRV_NAME,
> + .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT
> + | WDIOF_PRETIMEOUT,
I don't know the watchdog code to know if those make sense.
> +};
> +
> +static const struct watchdog_ops pseries_wdt_ops = {
> + .owner = THIS_MODULE,
> + .start = pseries_wdt_start,
> + .stop = pseries_wdt_stop,
> +};
> +
> +static int pseries_wdt_probe(struct platform_device *pdev)
> +{
> + unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
> + unsigned long cap;
> + long rc;
> + struct pseries_wdt *pw;
> + int err;
Try to use reverse xmas tree for new code please.
> + rc = plpar_hcall(H_WATCHDOG, ret, PSERIES_WDTF_OP_QUERY);
> + if (rc == H_FUNCTION)
> + return -ENODEV;
> + if (rc != H_SUCCESS)
> + return -EIO;
> + cap = ret[0];
> +
> + pw = devm_kzalloc(&pdev->dev, sizeof(*pw), GFP_KERNEL);
> + if (!pw)
> + return -ENOMEM;
> +
> + /*
> + * Assume watchdogNumber 1 for now. If we ever support
> + * multiple timers we will need to devise a way to choose a
> + * distinct watchdogNumber for each platform device at device
> + * registration time.
> + */
> + pw->num = 1;
> +
> + if (action >= ARRAY_SIZE(pseries_wdt_action))
> + return -EINVAL;
> + pw->action = pseries_wdt_action[action];
> +
> + pw->wd.parent = &pdev->dev;
> + pw->wd.info = &pseries_wdt_info;
> + pw->wd.ops = &pseries_wdt_ops;
> + pw->wd.min_timeout = DIV_ROUND_UP(PSERIES_WDTQ_MIN_TIMEOUT(cap), 1000);
MSEC_TO_SEC again?
> + pw->wd.max_timeout = UINT_MAX / 1000;
Where does that value come from?
> + pw->wd.timeout = timeout;
> + if (watchdog_init_timeout(&pw->wd, 0, NULL))
> + return -EINVAL;
It's late so maybe I'm misreading it, but does watchdog_init_timeout()
actually clamp the values if we don't pass a timeout?
It looks like basically a nop when we pass timeout_param=0 and dev=NULL.
Which makes me think we aren't checking anywhere that the timeout we are
using >= what firmware will accept.
> + watchdog_set_nowayout(&pw->wd, nowayout);
> + watchdog_stop_on_reboot(&pw->wd);
> + watchdog_stop_on_unregister(&pw->wd);
> + watchdog_set_drvdata(&pw->wd, pw);
> +
> + err = devm_watchdog_register_device(&pdev->dev, &pw->wd);
> + if (err)
> + return err;
> +
> + platform_set_drvdata(pdev, &pw->wd);
> +
> + return 0;
> +}
> +
> +static int pseries_wdt_suspend(struct platform_device *pdev, pm_message_t state)
> +{
> + struct watchdog_device *wd = platform_get_drvdata(pdev);
> +
> + if (watchdog_active(wd))
> + return pseries_wdt_stop(wd);
> + return 0;
> +}
> +
> +static int pseries_wdt_resume(struct platform_device *pdev)
> +{
> + struct watchdog_device *wd = platform_get_drvdata(pdev);
> +
> + if (watchdog_active(wd))
> + return pseries_wdt_start(wd);
> + return 0;
> +}
> +
> +static const struct platform_device_id pseries_wdt_id[] = {
> + { .name = "pseries-wdt" },
> + {}
> +};
> +MODULE_DEVICE_TABLE(platform, pseries_wdt_id);
> +
> +static struct platform_driver pseries_wdt_driver = {
> + .driver = {
> + .name = DRV_NAME,
> + .owner = THIS_MODULE,
> + },
> + .id_table = pseries_wdt_id,
> + .probe = pseries_wdt_probe,
> + .resume = pseries_wdt_resume,
> + .suspend = pseries_wdt_suspend,
I don't see any handling of the possible requirement to suspend timers
across LPM. I don't think just wiring these up is enough?
> +};
> +module_platform_driver(pseries_wdt_driver);
> +
> +MODULE_AUTHOR("Alexey Kardashevskiy <aik@ozlabs.ru>");
> +MODULE_AUTHOR("Scott Cheloha <cheloha@linux.ibm.com>");
I'd prefer the module authors were just the names, email addresses
inevitably bitrot.
Your email address is in the change log.
cheers
> +MODULE_DESCRIPTION("POWER Architecture Platform Watchdog Driver");
> +MODULE_LICENSE("GPL");
> --
> 2.27.0
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
2022-06-24 13:27 ` Michael Ellerman
@ 2022-06-24 15:31 ` Segher Boessenkool
2022-07-08 5:51 ` Scott Cheloha
1 sibling, 0 replies; 39+ messages in thread
From: Segher Boessenkool @ 2022-06-24 15:31 UTC (permalink / raw)
To: Michael Ellerman
Cc: nathanl, wvoigt, linux-watchdog, aik, Scott Cheloha, vaishnavi,
npiggin, tzungbi, brking, linuxppc-dev, linux
On Fri, Jun 24, 2022 at 11:27:24PM +1000, Michael Ellerman wrote:
> Scott Cheloha <cheloha@linux.ibm.com> writes:
> > + * - For the "Query Watchdog Capabilities" operation, a 64-bit
> > + * value structured as follows:
> > + *
> > + * Bits 0-15: The minimum supported timeout in milliseconds.
> > + * Bits 16-31: The number of watchdogs supported.
> > + * Bits 32-63: Reserved.
> > + */
> > +#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
>
> This one is less obviously better, but I still think it's clearer as all
> the logic is there in front of you, rather than hidden in the macro. It
> is clearer that we're only returning a 16-bit value.
>
> #define PSERIES_WDTQ_MIN_TIMEOUT(cap) (((cap) >> 48) & 0xffff)
Or even
((cap) >> 48)
since it is a 64-bit value. If you want better defences you should not
use macros here at all, anyway (but inline functions, instead).
I could rant about the 1000UL being meaningless and/or misleading, or
that 0x1 is just silly, but it is a sunny day :-)
Segher
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
@ 2022-06-24 15:31 ` Segher Boessenkool
0 siblings, 0 replies; 39+ messages in thread
From: Segher Boessenkool @ 2022-06-24 15:31 UTC (permalink / raw)
To: Michael Ellerman
Cc: Scott Cheloha, linux-watchdog, nathanl, wvoigt, aik, vaishnavi,
npiggin, tzungbi, brking, linuxppc-dev, linux
On Fri, Jun 24, 2022 at 11:27:24PM +1000, Michael Ellerman wrote:
> Scott Cheloha <cheloha@linux.ibm.com> writes:
> > + * - For the "Query Watchdog Capabilities" operation, a 64-bit
> > + * value structured as follows:
> > + *
> > + * Bits 0-15: The minimum supported timeout in milliseconds.
> > + * Bits 16-31: The number of watchdogs supported.
> > + * Bits 32-63: Reserved.
> > + */
> > +#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
>
> This one is less obviously better, but I still think it's clearer as all
> the logic is there in front of you, rather than hidden in the macro. It
> is clearer that we're only returning a 16-bit value.
>
> #define PSERIES_WDTQ_MIN_TIMEOUT(cap) (((cap) >> 48) & 0xffff)
Or even
((cap) >> 48)
since it is a 64-bit value. If you want better defences you should not
use macros here at all, anyway (but inline functions, instead).
I could rant about the 1000UL being meaningless and/or misleading, or
that 0x1 is just silly, but it is a sunny day :-)
Segher
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
2022-06-24 13:27 ` Michael Ellerman
@ 2022-07-08 5:51 ` Scott Cheloha
2022-07-08 5:51 ` Scott Cheloha
1 sibling, 0 replies; 39+ messages in thread
From: Scott Cheloha @ 2022-07-08 5:51 UTC (permalink / raw)
To: Michael Ellerman
Cc: linux-watchdog, nathanl, wvoigt, aik, vaishnavi, npiggin,
tzungbi, brking, linuxppc-dev, linux
On Fri, Jun 24, 2022 at 11:27:24PM +1000, Michael Ellerman wrote:
> Hi Scott,
>
> A few comments below ...
>
> Scott Cheloha <cheloha@linux.ibm.com> writes:
> >
> > [...]
> >
> > diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/watchdog/watchdog-parameters.rst
> > index 223c99361a30..29153eed6689 100644
> > --- a/Documentation/watchdog/watchdog-parameters.rst
> > +++ b/Documentation/watchdog/watchdog-parameters.rst
> > @@ -425,6 +425,18 @@ pnx833x_wdt:
> >
> > -------------------------------------------------
> >
> > +pseries-wdt:
> > + action:
> > + Action taken when watchdog expires: 0 (power off), 1 (restart),
> > + 2 (dump and restart). (default=1)
>
> I doesn't look like these values match what other drivers use to any
> great extent.
>
> So why not use the values from PAPR directly?
>
> ie. 1 = power off, 2 = hard reset, 3 = dump & restart.
>
> It seems like it would be easier to follow if the values map directly.
>
> It's possible in future PAPR adds 247 to mean something, in which case
> maybe we'd want to map that to a less silly value, but at least for now
> the PAPR values are sensible enough.
I tried using 1-2-3 in Patch v1 but Guenter objected and we switched:
https://lore.kernel.org/linux-watchdog/a6090ef3-f597-e10b-010b-cc32bff08c93@roeck-us.net/
I think the code is fine to read as-is. We're not expecting the
administrator to read the PAPR, right? So 1-2-3 is not any more
intuitive for the user than 0-1-2.
Given that it's all arbitrary and there aren't any hard rules for
module parameters outside of general programmer "that seems
fine"-ness, I would really like to leave the numbers as-is.
> > + timeout:
> > + Initial watchdog timeout in seconds. (default=60)
>
> That seems like a pretty common value, I don't see any guidance in PAPR.
> Do we have any input from PowerVM on whether that's a good value?
Currently the minimum timeout is 500ms on all the builds I've tried.
I doubt the minimum will ever be anywhere near as large as 60s on a
practical H_WATCHDOG implementation, so I don't think there is any
risk of the driver failing to probe.
Real software using the watchdog API will set a timeout to a smaller
value if it needs to.
60 seconds gives userland ample time to reconfigure the watchdog
without risk of it expiring in the midst of a bunch of ioctl(2) calls
before they reach the main loop.
> > diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
> > new file mode 100644
> > index 000000000000..cfe53587457d
> > --- /dev/null
> > +++ b/drivers/watchdog/pseries-wdt.c
> > @@ -0,0 +1,264 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +/*
> > + * Copyright (c) 2022 International Business Machines, Inc.
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/kernel.h>
> > +#include <linux/limits.h>
> > +#include <linux/math.h>
> > +#include <linux/mod_devicetable.h>
> > +#include <linux/module.h>
> > +#include <linux/moduleparam.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/watchdog.h>
> > +
> > +#define DRV_NAME "pseries-wdt"
> > +
> > +/*
> > + * The PAPR's MSB->LSB bit ordering is 0->63. These macros simplify
> > + * defining bitfields as described in the PAPR without needing to
> > + * transpose values to the more C-like 63->0 ordering.
> > + */
> > +#define SETFIELD(_v, _b, _e) \
> > + (((unsigned long)(_v) << PPC_BITLSHIFT(_e)) & PPC_BITMASK((_b), (_e)))
> > +#define GETFIELD(_v, _b, _e) \
> > + (((unsigned long)(_v) & PPC_BITMASK((_b), (_e))) >> PPC_BITLSHIFT(_e))
>
> This will probably sound like a cranky maintainer rant, but ...,
> I really dislike these GETFIELD/SETFIELD macros.
>
> I know you didn't invent them, but I would be much happier if you didn't
> use them.
>
> I know they (slightly) simplify things when you're transcribing values
> from PAPR into the source, but that happens only once.
>
> And then for the rest of eternity the source is harder to read because
> there's this ridiculous level of indirection through insane macros just
> to define some constants.
>
> Anyone trying to use a debugger against this code will see a value in
> memory like 0x200 and have to sit down and work out which SETFIELD()
> macro it corresponds to.
Don't look at me, I never would have come up with them. I got them
from Alexey :)
I will drop them.
> > +/*
> > + * The H_WATCHDOG hypercall first appears in PAPR v2.12 and is
> > + * described fully in sections 14.5 and 14.15.6.
> > + *
> > + *
> > + * H_WATCHDOG Input
> > + *
> > + * R4: "flags":
> > + *
> > + * Bits 48-55: "operation"
> > + *
> > + * 0x01 Start Watchdog
> > + * 0x02 Stop Watchdog
> > + * 0x03 Query Watchdog Capabilities
> > + */
> > +#define PSERIES_WDTF_OP(op) SETFIELD((op), 48, 55)
> > +#define PSERIES_WDTF_OP_START PSERIES_WDTF_OP(0x1)
> > +#define PSERIES_WDTF_OP_STOP PSERIES_WDTF_OP(0x2)
> > +#define PSERIES_WDTF_OP_QUERY PSERIES_WDTF_OP(0x3)
>
> eg, IMHO these are much more reader friendly:
>
> #define PSERIES_WDTF_OP_START (1 << 8)
> #define PSERIES_WDTF_OP_STOP (2 << 8)
> #define PSERIES_WDTF_OP_QUERY (3 << 8)
>
> > +/*
> > + * Bits 56-63: "timeoutAction" (for "Start Watchdog" only)
> > + *
> > + * 0x01 Hard poweroff
> > + * 0x02 Hard restart
> > + * 0x03 Dump restart
> > + */
> > +#define PSERIES_WDTF_ACTION(ac) SETFIELD(ac, 56, 63)
> > +#define PSERIES_WDTF_ACTION_HARD_POWEROFF PSERIES_WDTF_ACTION(0x1)
> > +#define PSERIES_WDTF_ACTION_HARD_RESTART PSERIES_WDTF_ACTION(0x2)
> > +#define PSERIES_WDTF_ACTION_DUMP_RESTART PSERIES_WDTF_ACTION(0x3)
>
> These are a slam dunk:
>
> #define PSERIES_WDTF_ACTION_HARD_POWEROFF 1
> #define PSERIES_WDTF_ACTION_HARD_RESTART 2
> #define PSERIES_WDTF_ACTION_DUMP_RESTART 3
Yes, yes they are.
> > +
> > +/*
> > + * H_WATCHDOG Output
> > + *
> > + * R3: Return code
> > + *
> > + * H_SUCCESS The operation completed.
> > + *
> > + * H_BUSY The hypervisor is too busy; retry the operation.
> > + *
> > + * H_PARAMETER The given "flags" are somehow invalid. Either the
> > + * "operation" or "timeoutAction" is invalid, or a
> > + * reserved bit is set.
> > + *
> > + * H_P2 The given "watchdogNumber" is zero or exceeds the
> > + * supported maximum value.
> > + *
> > + * H_P3 The given "timeoutInMs" is below the supported
> > + * minimum value.
> > + *
> > + * H_NOOP The given "watchdogNumber" is already stopped.
> > + *
> > + * H_HARDWARE The operation failed for ineffable reasons.
> > + *
> > + * H_FUNCTION The H_WATCHDOG hypercall is not supported by this
> > + * hypervisor.
> > + *
> > + * R4:
> > + *
> > + * - For the "Query Watchdog Capabilities" operation, a 64-bit
> > + * value structured as follows:
> > + *
> > + * Bits 0-15: The minimum supported timeout in milliseconds.
> > + * Bits 16-31: The number of watchdogs supported.
> > + * Bits 32-63: Reserved.
> > + */
> > +#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
>
> This one is less obviously better, but I still think it's clearer as all
> the logic is there in front of you, rather than hidden in the macro. It
> is clearer that we're only returning a 16-bit value.
>
> #define PSERIES_WDTQ_MIN_TIMEOUT(cap) (((cap) >> 48) & 0xffff)
>
> > +#define PSERIES_WDTQ_MAX_NUMBER(cap) GETFIELD((cap), 16, 31)
>
> That's unused.
>
> I guess we're assuming at least one timer is always supported? Seems
> reasonable.
There is a distinction between "we have support for this hypercall"
and "you have a timer available to you". We should double-check.
I can't imagine it ever being an issue on a practical, working
implementation, but it might save us some debugging if there is ever a
hypervisor bug where somehow they allocate us zero timers to work
with.
> > +
> > +static const unsigned long pseries_wdt_action[] = {
> > + [0] = PSERIES_WDTF_ACTION_HARD_POWEROFF,
> > + [1] = PSERIES_WDTF_ACTION_HARD_RESTART,
> > + [2] = PSERIES_WDTF_ACTION_DUMP_RESTART,
> > +};
>
> If we used the PAPR values we wouldn't need that ^
>
> > +#define WATCHDOG_ACTION 1
>
> DEFAULT_ACTION ?
The idiom for the default timeout is "WATCHDOG_TIMEOUT" so I went with
"WATCHDOG_ACTION".
> > +static unsigned int action = WATCHDOG_ACTION;
> > +module_param(action, uint, 0444);
> > +MODULE_PARM_DESC(action, "Action taken when watchdog expires (default="
> > + __MODULE_STRING(WATCHDOG_ACTION) ")");
> > +
> > +static bool nowayout = WATCHDOG_NOWAYOUT;
> > +module_param(nowayout, bool, 0444);
> > +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
> > + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> > +
> > +#define WATCHDOG_TIMEOUT 60
>
> DEFAULT_TIMEOUT ?
"WATCHDOG_TIMEOUT" is the idiomatic name for the default timeout in
drivers/watchdog/.
> > +static unsigned int timeout = WATCHDOG_TIMEOUT;
> > +module_param(timeout, uint, 0444);
> > +MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default="
> > + __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
> > +
> > +struct pseries_wdt {
> > + struct watchdog_device wd;
> > + unsigned long action;
> > + unsigned long num; /* Watchdog numbers are 1-based */
>
> num can just be an int.
It's an argument to the hypercall, which takes an unsigned long. Do
we need to save 4 bytes?
I guess if we wanted to be precise it should be a 16-bit value.
> But do we even need it, do we anticipate supporting multiple timers?
> Should we just hard code '1' ?
We have not had a serious discussion about whether more timers in
userspace make sense. This code let's us experiment with it, though.
> > +};
> > +
> > +static int pseries_wdt_start(struct watchdog_device *wdd)
> > +{
> > + struct device *dev = wdd->parent;
> > + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> > + unsigned long flags, msecs;
> > + long rc;
> > +
> > + flags = pw->action | PSERIES_WDTF_OP_START;
>
> We set pw->action at probe time based on the module param action, but
> this is the only place we use it.
>
> If we use the PAPR values, this could just be:
>
> flags = (pw->action << 8) | PSERIES_WDTF_OP_START;
>
> And is there any benefit in storing action in pseries_wdt, we could just
> use the module param value here.
That was Guenter's idea and I went with it.
> > + msecs = wdd->timeout * 1000UL;
>
> Using MSEC_PER_SEC makes it clearer what that conversion is doing.
Done.
> > + rc = plpar_hcall_norets(H_WATCHDOG, flags, pw->num, msecs);
> > + if (rc != H_SUCCESS) {
> > + dev_crit(dev, "H_WATCHDOG: %ld: failed to start timer %lu",
> > + rc, pw->num);
> > + return -EIO;
> > + }
> > + return 0;
> > +}
> > +
> > +static int pseries_wdt_stop(struct watchdog_device *wdd)
> > +{
> > + struct device *dev = wdd->parent;
> > + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> > + long rc;
> > +
> > + rc = plpar_hcall_norets(H_WATCHDOG, PSERIES_WDTF_OP_STOP, pw->num);
> > + if (rc != H_SUCCESS && rc != H_NOOP) {
> > + dev_crit(dev, "H_WATCHDOG: %ld: failed to stop timer %lu",
> > + rc, pw->num);
> > + return -EIO;
> > + }
> > + return 0;
> > +}
> > +
> > +static struct watchdog_info pseries_wdt_info = {
> > + .identity = DRV_NAME,
> > + .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT
> > + | WDIOF_PRETIMEOUT,
>
> I don't know the watchdog code to know if those make sense.
It makes sense.
> > +};
> > +
> > +static const struct watchdog_ops pseries_wdt_ops = {
> > + .owner = THIS_MODULE,
> > + .start = pseries_wdt_start,
> > + .stop = pseries_wdt_stop,
> > +};
> > +
> > +static int pseries_wdt_probe(struct platform_device *pdev)
> > +{
> > + unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
> > + unsigned long cap;
> > + long rc;
> > + struct pseries_wdt *pw;
> > + int err;
>
> Try to use reverse xmas tree for new code please.
Is it not good practice to keep declarations of a particular type
adjacent?
It feels... correct-ish to keep the longs together.
In this case there is no downside to doing "reverse xmas tree"
because sizeof(long) is the same as sizeof(void *), but this looks
odd to me:
unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
struct pseries_wdt *pw;
unsigned long cap;
long rc;
int err;
> > + rc = plpar_hcall(H_WATCHDOG, ret, PSERIES_WDTF_OP_QUERY);
> > + if (rc == H_FUNCTION)
> > + return -ENODEV;
> > + if (rc != H_SUCCESS)
> > + return -EIO;
> > + cap = ret[0];
> > +
> > + pw = devm_kzalloc(&pdev->dev, sizeof(*pw), GFP_KERNEL);
> > + if (!pw)
> > + return -ENOMEM;
> > +
> > + /*
> > + * Assume watchdogNumber 1 for now. If we ever support
> > + * multiple timers we will need to devise a way to choose a
> > + * distinct watchdogNumber for each platform device at device
> > + * registration time.
> > + */
> > + pw->num = 1;
> > +
> > + if (action >= ARRAY_SIZE(pseries_wdt_action))
> > + return -EINVAL;
> > + pw->action = pseries_wdt_action[action];
> > +
> > + pw->wd.parent = &pdev->dev;
> > + pw->wd.info = &pseries_wdt_info;
> > + pw->wd.ops = &pseries_wdt_ops;
> > + pw->wd.min_timeout = DIV_ROUND_UP(PSERIES_WDTQ_MIN_TIMEOUT(cap), 1000);
>
> MSEC_TO_SEC again?
MSEC_PER_SEC, sure.
> > + pw->wd.max_timeout = UINT_MAX / 1000;
>
> Where does that value come from?
It's just the maximum value the watchdog framework will accept. It's
in one of the watchdog headers.
> > + pw->wd.timeout = timeout;
> > + if (watchdog_init_timeout(&pw->wd, 0, NULL))
> > + return -EINVAL;
>
> It's late so maybe I'm misreading it, but does watchdog_init_timeout()
> actually clamp the values if we don't pass a timeout?
>
> It looks like basically a nop when we pass timeout_param=0 and dev=NULL.
>
> Which makes me think we aren't checking anywhere that the timeout we are
> using >= what firmware will accept.
No, watchdog_init_timeout() checks that
min_timeout <= timeout <= max_timeout
and returns an error if not. If somehow the minimum timeout exceeds
the default 60 seconds we will catch it here and fail the probe.
> > + watchdog_set_nowayout(&pw->wd, nowayout);
> > + watchdog_stop_on_reboot(&pw->wd);
> > + watchdog_stop_on_unregister(&pw->wd);
> > + watchdog_set_drvdata(&pw->wd, pw);
> > +
> > + err = devm_watchdog_register_device(&pdev->dev, &pw->wd);
> > + if (err)
> > + return err;
> > +
> > + platform_set_drvdata(pdev, &pw->wd);
> > +
> > + return 0;
> > +}
> > +
> > +static int pseries_wdt_suspend(struct platform_device *pdev, pm_message_t state)
> > +{
> > + struct watchdog_device *wd = platform_get_drvdata(pdev);
> > +
> > + if (watchdog_active(wd))
> > + return pseries_wdt_stop(wd);
> > + return 0;
> > +}
> > +
> > +static int pseries_wdt_resume(struct platform_device *pdev)
> > +{
> > + struct watchdog_device *wd = platform_get_drvdata(pdev);
> > +
> > + if (watchdog_active(wd))
> > + return pseries_wdt_start(wd);
> > + return 0;
> > +}
> > +
> > +static const struct platform_device_id pseries_wdt_id[] = {
> > + { .name = "pseries-wdt" },
> > + {}
> > +};
> > +MODULE_DEVICE_TABLE(platform, pseries_wdt_id);
> > +
> > +static struct platform_driver pseries_wdt_driver = {
> > + .driver = {
> > + .name = DRV_NAME,
> > + .owner = THIS_MODULE,
> > + },
> > + .id_table = pseries_wdt_id,
> > + .probe = pseries_wdt_probe,
> > + .resume = pseries_wdt_resume,
> > + .suspend = pseries_wdt_suspend,
>
> I don't see any handling of the possible requirement to suspend timers
> across LPM. I don't think just wiring these up is enough?
I talked to Brian King about this and we decided that leaving the
watchdog running across an LPM might lead to some potentially
confusing behavior.
For example, if the watchdog expires while we're suspeded and the
machine is hard reset the instant we come out of it on the other side.
Unless there is an ask by downstream software to actually leave the
timer running over an LPM I think it is safest to err on the side of
caution and unconditionally stop running timers before suspend.
> > +};
> > +module_platform_driver(pseries_wdt_driver);
> > +
> > +MODULE_AUTHOR("Alexey Kardashevskiy <aik@ozlabs.ru>");
> > +MODULE_AUTHOR("Scott Cheloha <cheloha@linux.ibm.com>");
>
> I'd prefer the module authors were just the names, email addresses
> inevitably bitrot.
>
> Your email address is in the change log.
Dropped.
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
@ 2022-07-08 5:51 ` Scott Cheloha
0 siblings, 0 replies; 39+ messages in thread
From: Scott Cheloha @ 2022-07-08 5:51 UTC (permalink / raw)
To: Michael Ellerman
Cc: nathanl, wvoigt, linux-watchdog, aik, vaishnavi, npiggin,
tzungbi, brking, linuxppc-dev, linux
On Fri, Jun 24, 2022 at 11:27:24PM +1000, Michael Ellerman wrote:
> Hi Scott,
>
> A few comments below ...
>
> Scott Cheloha <cheloha@linux.ibm.com> writes:
> >
> > [...]
> >
> > diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/watchdog/watchdog-parameters.rst
> > index 223c99361a30..29153eed6689 100644
> > --- a/Documentation/watchdog/watchdog-parameters.rst
> > +++ b/Documentation/watchdog/watchdog-parameters.rst
> > @@ -425,6 +425,18 @@ pnx833x_wdt:
> >
> > -------------------------------------------------
> >
> > +pseries-wdt:
> > + action:
> > + Action taken when watchdog expires: 0 (power off), 1 (restart),
> > + 2 (dump and restart). (default=1)
>
> I doesn't look like these values match what other drivers use to any
> great extent.
>
> So why not use the values from PAPR directly?
>
> ie. 1 = power off, 2 = hard reset, 3 = dump & restart.
>
> It seems like it would be easier to follow if the values map directly.
>
> It's possible in future PAPR adds 247 to mean something, in which case
> maybe we'd want to map that to a less silly value, but at least for now
> the PAPR values are sensible enough.
I tried using 1-2-3 in Patch v1 but Guenter objected and we switched:
https://lore.kernel.org/linux-watchdog/a6090ef3-f597-e10b-010b-cc32bff08c93@roeck-us.net/
I think the code is fine to read as-is. We're not expecting the
administrator to read the PAPR, right? So 1-2-3 is not any more
intuitive for the user than 0-1-2.
Given that it's all arbitrary and there aren't any hard rules for
module parameters outside of general programmer "that seems
fine"-ness, I would really like to leave the numbers as-is.
> > + timeout:
> > + Initial watchdog timeout in seconds. (default=60)
>
> That seems like a pretty common value, I don't see any guidance in PAPR.
> Do we have any input from PowerVM on whether that's a good value?
Currently the minimum timeout is 500ms on all the builds I've tried.
I doubt the minimum will ever be anywhere near as large as 60s on a
practical H_WATCHDOG implementation, so I don't think there is any
risk of the driver failing to probe.
Real software using the watchdog API will set a timeout to a smaller
value if it needs to.
60 seconds gives userland ample time to reconfigure the watchdog
without risk of it expiring in the midst of a bunch of ioctl(2) calls
before they reach the main loop.
> > diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
> > new file mode 100644
> > index 000000000000..cfe53587457d
> > --- /dev/null
> > +++ b/drivers/watchdog/pseries-wdt.c
> > @@ -0,0 +1,264 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +/*
> > + * Copyright (c) 2022 International Business Machines, Inc.
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/kernel.h>
> > +#include <linux/limits.h>
> > +#include <linux/math.h>
> > +#include <linux/mod_devicetable.h>
> > +#include <linux/module.h>
> > +#include <linux/moduleparam.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/watchdog.h>
> > +
> > +#define DRV_NAME "pseries-wdt"
> > +
> > +/*
> > + * The PAPR's MSB->LSB bit ordering is 0->63. These macros simplify
> > + * defining bitfields as described in the PAPR without needing to
> > + * transpose values to the more C-like 63->0 ordering.
> > + */
> > +#define SETFIELD(_v, _b, _e) \
> > + (((unsigned long)(_v) << PPC_BITLSHIFT(_e)) & PPC_BITMASK((_b), (_e)))
> > +#define GETFIELD(_v, _b, _e) \
> > + (((unsigned long)(_v) & PPC_BITMASK((_b), (_e))) >> PPC_BITLSHIFT(_e))
>
> This will probably sound like a cranky maintainer rant, but ...,
> I really dislike these GETFIELD/SETFIELD macros.
>
> I know you didn't invent them, but I would be much happier if you didn't
> use them.
>
> I know they (slightly) simplify things when you're transcribing values
> from PAPR into the source, but that happens only once.
>
> And then for the rest of eternity the source is harder to read because
> there's this ridiculous level of indirection through insane macros just
> to define some constants.
>
> Anyone trying to use a debugger against this code will see a value in
> memory like 0x200 and have to sit down and work out which SETFIELD()
> macro it corresponds to.
Don't look at me, I never would have come up with them. I got them
from Alexey :)
I will drop them.
> > +/*
> > + * The H_WATCHDOG hypercall first appears in PAPR v2.12 and is
> > + * described fully in sections 14.5 and 14.15.6.
> > + *
> > + *
> > + * H_WATCHDOG Input
> > + *
> > + * R4: "flags":
> > + *
> > + * Bits 48-55: "operation"
> > + *
> > + * 0x01 Start Watchdog
> > + * 0x02 Stop Watchdog
> > + * 0x03 Query Watchdog Capabilities
> > + */
> > +#define PSERIES_WDTF_OP(op) SETFIELD((op), 48, 55)
> > +#define PSERIES_WDTF_OP_START PSERIES_WDTF_OP(0x1)
> > +#define PSERIES_WDTF_OP_STOP PSERIES_WDTF_OP(0x2)
> > +#define PSERIES_WDTF_OP_QUERY PSERIES_WDTF_OP(0x3)
>
> eg, IMHO these are much more reader friendly:
>
> #define PSERIES_WDTF_OP_START (1 << 8)
> #define PSERIES_WDTF_OP_STOP (2 << 8)
> #define PSERIES_WDTF_OP_QUERY (3 << 8)
>
> > +/*
> > + * Bits 56-63: "timeoutAction" (for "Start Watchdog" only)
> > + *
> > + * 0x01 Hard poweroff
> > + * 0x02 Hard restart
> > + * 0x03 Dump restart
> > + */
> > +#define PSERIES_WDTF_ACTION(ac) SETFIELD(ac, 56, 63)
> > +#define PSERIES_WDTF_ACTION_HARD_POWEROFF PSERIES_WDTF_ACTION(0x1)
> > +#define PSERIES_WDTF_ACTION_HARD_RESTART PSERIES_WDTF_ACTION(0x2)
> > +#define PSERIES_WDTF_ACTION_DUMP_RESTART PSERIES_WDTF_ACTION(0x3)
>
> These are a slam dunk:
>
> #define PSERIES_WDTF_ACTION_HARD_POWEROFF 1
> #define PSERIES_WDTF_ACTION_HARD_RESTART 2
> #define PSERIES_WDTF_ACTION_DUMP_RESTART 3
Yes, yes they are.
> > +
> > +/*
> > + * H_WATCHDOG Output
> > + *
> > + * R3: Return code
> > + *
> > + * H_SUCCESS The operation completed.
> > + *
> > + * H_BUSY The hypervisor is too busy; retry the operation.
> > + *
> > + * H_PARAMETER The given "flags" are somehow invalid. Either the
> > + * "operation" or "timeoutAction" is invalid, or a
> > + * reserved bit is set.
> > + *
> > + * H_P2 The given "watchdogNumber" is zero or exceeds the
> > + * supported maximum value.
> > + *
> > + * H_P3 The given "timeoutInMs" is below the supported
> > + * minimum value.
> > + *
> > + * H_NOOP The given "watchdogNumber" is already stopped.
> > + *
> > + * H_HARDWARE The operation failed for ineffable reasons.
> > + *
> > + * H_FUNCTION The H_WATCHDOG hypercall is not supported by this
> > + * hypervisor.
> > + *
> > + * R4:
> > + *
> > + * - For the "Query Watchdog Capabilities" operation, a 64-bit
> > + * value structured as follows:
> > + *
> > + * Bits 0-15: The minimum supported timeout in milliseconds.
> > + * Bits 16-31: The number of watchdogs supported.
> > + * Bits 32-63: Reserved.
> > + */
> > +#define PSERIES_WDTQ_MIN_TIMEOUT(cap) GETFIELD((cap), 0, 15)
>
> This one is less obviously better, but I still think it's clearer as all
> the logic is there in front of you, rather than hidden in the macro. It
> is clearer that we're only returning a 16-bit value.
>
> #define PSERIES_WDTQ_MIN_TIMEOUT(cap) (((cap) >> 48) & 0xffff)
>
> > +#define PSERIES_WDTQ_MAX_NUMBER(cap) GETFIELD((cap), 16, 31)
>
> That's unused.
>
> I guess we're assuming at least one timer is always supported? Seems
> reasonable.
There is a distinction between "we have support for this hypercall"
and "you have a timer available to you". We should double-check.
I can't imagine it ever being an issue on a practical, working
implementation, but it might save us some debugging if there is ever a
hypervisor bug where somehow they allocate us zero timers to work
with.
> > +
> > +static const unsigned long pseries_wdt_action[] = {
> > + [0] = PSERIES_WDTF_ACTION_HARD_POWEROFF,
> > + [1] = PSERIES_WDTF_ACTION_HARD_RESTART,
> > + [2] = PSERIES_WDTF_ACTION_DUMP_RESTART,
> > +};
>
> If we used the PAPR values we wouldn't need that ^
>
> > +#define WATCHDOG_ACTION 1
>
> DEFAULT_ACTION ?
The idiom for the default timeout is "WATCHDOG_TIMEOUT" so I went with
"WATCHDOG_ACTION".
> > +static unsigned int action = WATCHDOG_ACTION;
> > +module_param(action, uint, 0444);
> > +MODULE_PARM_DESC(action, "Action taken when watchdog expires (default="
> > + __MODULE_STRING(WATCHDOG_ACTION) ")");
> > +
> > +static bool nowayout = WATCHDOG_NOWAYOUT;
> > +module_param(nowayout, bool, 0444);
> > +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
> > + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> > +
> > +#define WATCHDOG_TIMEOUT 60
>
> DEFAULT_TIMEOUT ?
"WATCHDOG_TIMEOUT" is the idiomatic name for the default timeout in
drivers/watchdog/.
> > +static unsigned int timeout = WATCHDOG_TIMEOUT;
> > +module_param(timeout, uint, 0444);
> > +MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default="
> > + __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
> > +
> > +struct pseries_wdt {
> > + struct watchdog_device wd;
> > + unsigned long action;
> > + unsigned long num; /* Watchdog numbers are 1-based */
>
> num can just be an int.
It's an argument to the hypercall, which takes an unsigned long. Do
we need to save 4 bytes?
I guess if we wanted to be precise it should be a 16-bit value.
> But do we even need it, do we anticipate supporting multiple timers?
> Should we just hard code '1' ?
We have not had a serious discussion about whether more timers in
userspace make sense. This code let's us experiment with it, though.
> > +};
> > +
> > +static int pseries_wdt_start(struct watchdog_device *wdd)
> > +{
> > + struct device *dev = wdd->parent;
> > + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> > + unsigned long flags, msecs;
> > + long rc;
> > +
> > + flags = pw->action | PSERIES_WDTF_OP_START;
>
> We set pw->action at probe time based on the module param action, but
> this is the only place we use it.
>
> If we use the PAPR values, this could just be:
>
> flags = (pw->action << 8) | PSERIES_WDTF_OP_START;
>
> And is there any benefit in storing action in pseries_wdt, we could just
> use the module param value here.
That was Guenter's idea and I went with it.
> > + msecs = wdd->timeout * 1000UL;
>
> Using MSEC_PER_SEC makes it clearer what that conversion is doing.
Done.
> > + rc = plpar_hcall_norets(H_WATCHDOG, flags, pw->num, msecs);
> > + if (rc != H_SUCCESS) {
> > + dev_crit(dev, "H_WATCHDOG: %ld: failed to start timer %lu",
> > + rc, pw->num);
> > + return -EIO;
> > + }
> > + return 0;
> > +}
> > +
> > +static int pseries_wdt_stop(struct watchdog_device *wdd)
> > +{
> > + struct device *dev = wdd->parent;
> > + struct pseries_wdt *pw = watchdog_get_drvdata(wdd);
> > + long rc;
> > +
> > + rc = plpar_hcall_norets(H_WATCHDOG, PSERIES_WDTF_OP_STOP, pw->num);
> > + if (rc != H_SUCCESS && rc != H_NOOP) {
> > + dev_crit(dev, "H_WATCHDOG: %ld: failed to stop timer %lu",
> > + rc, pw->num);
> > + return -EIO;
> > + }
> > + return 0;
> > +}
> > +
> > +static struct watchdog_info pseries_wdt_info = {
> > + .identity = DRV_NAME,
> > + .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT
> > + | WDIOF_PRETIMEOUT,
>
> I don't know the watchdog code to know if those make sense.
It makes sense.
> > +};
> > +
> > +static const struct watchdog_ops pseries_wdt_ops = {
> > + .owner = THIS_MODULE,
> > + .start = pseries_wdt_start,
> > + .stop = pseries_wdt_stop,
> > +};
> > +
> > +static int pseries_wdt_probe(struct platform_device *pdev)
> > +{
> > + unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
> > + unsigned long cap;
> > + long rc;
> > + struct pseries_wdt *pw;
> > + int err;
>
> Try to use reverse xmas tree for new code please.
Is it not good practice to keep declarations of a particular type
adjacent?
It feels... correct-ish to keep the longs together.
In this case there is no downside to doing "reverse xmas tree"
because sizeof(long) is the same as sizeof(void *), but this looks
odd to me:
unsigned long ret[PLPAR_HCALL_BUFSIZE] = { 0 };
struct pseries_wdt *pw;
unsigned long cap;
long rc;
int err;
> > + rc = plpar_hcall(H_WATCHDOG, ret, PSERIES_WDTF_OP_QUERY);
> > + if (rc == H_FUNCTION)
> > + return -ENODEV;
> > + if (rc != H_SUCCESS)
> > + return -EIO;
> > + cap = ret[0];
> > +
> > + pw = devm_kzalloc(&pdev->dev, sizeof(*pw), GFP_KERNEL);
> > + if (!pw)
> > + return -ENOMEM;
> > +
> > + /*
> > + * Assume watchdogNumber 1 for now. If we ever support
> > + * multiple timers we will need to devise a way to choose a
> > + * distinct watchdogNumber for each platform device at device
> > + * registration time.
> > + */
> > + pw->num = 1;
> > +
> > + if (action >= ARRAY_SIZE(pseries_wdt_action))
> > + return -EINVAL;
> > + pw->action = pseries_wdt_action[action];
> > +
> > + pw->wd.parent = &pdev->dev;
> > + pw->wd.info = &pseries_wdt_info;
> > + pw->wd.ops = &pseries_wdt_ops;
> > + pw->wd.min_timeout = DIV_ROUND_UP(PSERIES_WDTQ_MIN_TIMEOUT(cap), 1000);
>
> MSEC_TO_SEC again?
MSEC_PER_SEC, sure.
> > + pw->wd.max_timeout = UINT_MAX / 1000;
>
> Where does that value come from?
It's just the maximum value the watchdog framework will accept. It's
in one of the watchdog headers.
> > + pw->wd.timeout = timeout;
> > + if (watchdog_init_timeout(&pw->wd, 0, NULL))
> > + return -EINVAL;
>
> It's late so maybe I'm misreading it, but does watchdog_init_timeout()
> actually clamp the values if we don't pass a timeout?
>
> It looks like basically a nop when we pass timeout_param=0 and dev=NULL.
>
> Which makes me think we aren't checking anywhere that the timeout we are
> using >= what firmware will accept.
No, watchdog_init_timeout() checks that
min_timeout <= timeout <= max_timeout
and returns an error if not. If somehow the minimum timeout exceeds
the default 60 seconds we will catch it here and fail the probe.
> > + watchdog_set_nowayout(&pw->wd, nowayout);
> > + watchdog_stop_on_reboot(&pw->wd);
> > + watchdog_stop_on_unregister(&pw->wd);
> > + watchdog_set_drvdata(&pw->wd, pw);
> > +
> > + err = devm_watchdog_register_device(&pdev->dev, &pw->wd);
> > + if (err)
> > + return err;
> > +
> > + platform_set_drvdata(pdev, &pw->wd);
> > +
> > + return 0;
> > +}
> > +
> > +static int pseries_wdt_suspend(struct platform_device *pdev, pm_message_t state)
> > +{
> > + struct watchdog_device *wd = platform_get_drvdata(pdev);
> > +
> > + if (watchdog_active(wd))
> > + return pseries_wdt_stop(wd);
> > + return 0;
> > +}
> > +
> > +static int pseries_wdt_resume(struct platform_device *pdev)
> > +{
> > + struct watchdog_device *wd = platform_get_drvdata(pdev);
> > +
> > + if (watchdog_active(wd))
> > + return pseries_wdt_start(wd);
> > + return 0;
> > +}
> > +
> > +static const struct platform_device_id pseries_wdt_id[] = {
> > + { .name = "pseries-wdt" },
> > + {}
> > +};
> > +MODULE_DEVICE_TABLE(platform, pseries_wdt_id);
> > +
> > +static struct platform_driver pseries_wdt_driver = {
> > + .driver = {
> > + .name = DRV_NAME,
> > + .owner = THIS_MODULE,
> > + },
> > + .id_table = pseries_wdt_id,
> > + .probe = pseries_wdt_probe,
> > + .resume = pseries_wdt_resume,
> > + .suspend = pseries_wdt_suspend,
>
> I don't see any handling of the possible requirement to suspend timers
> across LPM. I don't think just wiring these up is enough?
I talked to Brian King about this and we decided that leaving the
watchdog running across an LPM might lead to some potentially
confusing behavior.
For example, if the watchdog expires while we're suspeded and the
machine is hard reset the instant we come out of it on the other side.
Unless there is an ask by downstream software to actually leave the
timer running over an LPM I think it is safest to err on the side of
caution and unconditionally stop running timers before suspend.
> > +};
> > +module_platform_driver(pseries_wdt_driver);
> > +
> > +MODULE_AUTHOR("Alexey Kardashevskiy <aik@ozlabs.ru>");
> > +MODULE_AUTHOR("Scott Cheloha <cheloha@linux.ibm.com>");
>
> I'd prefer the module authors were just the names, email addresses
> inevitably bitrot.
>
> Your email address is in the change log.
Dropped.
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
2022-06-02 17:53 ` Scott Cheloha
` (3 preceding siblings ...)
(?)
@ 2022-06-24 13:51 ` Michael Ellerman
2022-07-07 15:53 ` Scott Cheloha
-1 siblings, 1 reply; 39+ messages in thread
From: Michael Ellerman @ 2022-06-24 13:51 UTC (permalink / raw)
To: Scott Cheloha, linux-watchdog
Cc: nathanl, wvoigt, aik, Scott Cheloha, vaishnavi, npiggin, tzungbi,
brking, linuxppc-dev, linux
Scott Cheloha <cheloha@linux.ibm.com> writes:
...
> +
> +static struct platform_driver pseries_wdt_driver = {
> + .driver = {
> + .name = DRV_NAME,
> + .owner = THIS_MODULE,
That owner assignment is not required.
It's set for you by platform_driver_register() via
module_platform_driver().
cheers
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
2022-06-24 13:51 ` Michael Ellerman
@ 2022-07-07 15:53 ` Scott Cheloha
0 siblings, 0 replies; 39+ messages in thread
From: Scott Cheloha @ 2022-07-07 15:53 UTC (permalink / raw)
To: Michael Ellerman
Cc: linux-watchdog, nathanl, wvoigt, aik, vaishnavi, npiggin,
tzungbi, brking, linuxppc-dev, linux
On Fri, Jun 24, 2022 at 11:51:01PM +1000, Michael Ellerman wrote:
> Scott Cheloha <cheloha@linux.ibm.com> writes:
> ...
> > +
> > +static struct platform_driver pseries_wdt_driver = {
> > + .driver = {
> > + .name = DRV_NAME,
> > + .owner = THIS_MODULE,
>
> That owner assignment is not required.
>
> It's set for you by platform_driver_register() via
> module_platform_driver().
Great, removed.
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH v2 4/4] watchdog/pseries-wdt: initial support for H_WATCHDOG-based watchdog timers
@ 2022-07-07 15:53 ` Scott Cheloha
0 siblings, 0 replies; 39+ messages in thread
From: Scott Cheloha @ 2022-07-07 15:53 UTC (permalink / raw)
To: Michael Ellerman
Cc: nathanl, wvoigt, linux-watchdog, aik, vaishnavi, npiggin,
tzungbi, brking, linuxppc-dev, linux
On Fri, Jun 24, 2022 at 11:51:01PM +1000, Michael Ellerman wrote:
> Scott Cheloha <cheloha@linux.ibm.com> writes:
> ...
> > +
> > +static struct platform_driver pseries_wdt_driver = {
> > + .driver = {
> > + .name = DRV_NAME,
> > + .owner = THIS_MODULE,
>
> That owner assignment is not required.
>
> It's set for you by platform_driver_register() via
> module_platform_driver().
Great, removed.
^ permalink raw reply [flat|nested] 39+ messages in thread