* [PATCH v4 0/6] watchdog: pnx4008: add restart handler
@ 2016-02-25 18:31 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Sylvain Lemieux <slemieux@tycoint.com>
The LPC32xx provide the capability to perform a soft or hard reset;
a soft reset will no reset the external peripheral
(i.e. RESOUT_N output not asserted).
This changeset migrate the restart code from the "mach-lpc32xx" to
the "pnx-4008" watchdog driver and add the soft reset capability.
The default behavior (i.e. hard reset) remain unchanged.
The core restart handler support added by this change:
2165bf524da5f5e496d - "watchdog: core: add restart handler support"
is not use in this changeset; it does not support the reboot mode.
Note:
Patch #5 was generated with the option "--unified=2" to ensure
it can be apply before or after the changes for the new
LPC32xx irqchip driver:
- http://permalink.gmane.org/gmane.linux.drivers.devicetree/144683
---
Changes from v3 to v4:
* Update the patch as per the feedback received from:
Arnd: http://permalink.gmane.org/gmane.linux.watchdog/3329
- Switch patch #5 and #6 order.
Changes from v2 to v3:
* Update the patch as per the feedback received from:
Joachim: http://permalink.gmane.org/gmane.linux.watchdog/3303
- remove explicit clock enable from restart handler.
- verify "register_restart_handler" return value.
- add call to unregister_restart_handler".
- do the restart handling directly in "pnx4008_restart_handler".
* Move the change to "phy3250.c" into a separate patch and generate
the new patch with the "--unified=2" option.
Changes from v1 to v2:
* Rename patch title;
was "arm: lpc32xx: restart: add support for soft reset"
* Update the patch as per the feedback received from:
Joachim: http://permalink.gmane.org/gmane.linux.ports.arm.kernel/479791
- migrate restart code from "mach-lpc32xx" to "pnx-4008" driver.
* Add soft reset support to "pnx-4008" driver instead of "mach-lpc32xx".
* Use define available in "pnx-4008" when writting to watchdog register.
* Remove restart handler from "mach-lpc32xx".
* Remove restart hook from "phy3250.c".
* Update driver logging during power-on.
Sylvain Lemieux (6):
watchdog: pnx4008: update logging during power-on
watchdog: pnx4008: add restart handler
watchdog: pnx4008: add support for soft reset
watchdog: pnx4008: restart: support "cmd" from userspace
arm: lpc32xx: phy3250 remove restart hook
arm: lpc32xx: remove restart handler
arch/arm/mach-lpc32xx/common.c | 15 ------------
arch/arm/mach-lpc32xx/common.h | 1 -
arch/arm/mach-lpc32xx/phy3250.c | 1 -
drivers/watchdog/pnx4008_wdt.c | 51 +++++++++++++++++++++++++++++++++++++++--
4 files changed, 49 insertions(+), 19 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 1/6] watchdog: pnx4008: update logging during power-on
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-25 18:31 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel, arnd, wim, manabian; +Cc: linux-watchdog, linux, stigge, vz
From: Sylvain Lemieux <slemieux@tycoint.com>
There is no need add the driver name in the text to display
on the console during the power-on:
pnx4008-watchdog 4003c000.watchdog: PNX4008 Watchdog Timer: heartbeat 19 sec
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- none.
Changes from v1 to v2:
- new patch in v2.
drivers/watchdog/pnx4008_wdt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 313cd1c..88264a2 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -178,8 +178,7 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
goto disable_clk;
}
- dev_info(&pdev->dev, "PNX4008 Watchdog Timer: heartbeat %d sec\n",
- pnx4008_wdd.timeout);
+ dev_info(&pdev->dev, "heartbeat %d sec\n", pnx4008_wdd.timeout);
return 0;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 1/6] watchdog: pnx4008: update logging during power-on
@ 2016-02-25 18:31 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Sylvain Lemieux <slemieux@tycoint.com>
There is no need add the driver name in the text to display
on the console during the power-on:
pnx4008-watchdog 4003c000.watchdog: PNX4008 Watchdog Timer: heartbeat 19 sec
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- none.
Changes from v1 to v2:
- new patch in v2.
drivers/watchdog/pnx4008_wdt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 313cd1c..88264a2 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -178,8 +178,7 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
goto disable_clk;
}
- dev_info(&pdev->dev, "PNX4008 Watchdog Timer: heartbeat %d sec\n",
- pnx4008_wdd.timeout);
+ dev_info(&pdev->dev, "heartbeat %d sec\n", pnx4008_wdd.timeout);
return 0;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v4 1/6] watchdog: pnx4008: update logging during power-on
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-26 14:15 ` Guenter Roeck
-1 siblings, 0 replies; 24+ messages in thread
From: Guenter Roeck @ 2016-02-26 14:15 UTC (permalink / raw)
To: Sylvain Lemieux, linux-arm-kernel, arnd, wim, manabian
Cc: linux-watchdog, stigge, vz
On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> From: Sylvain Lemieux <slemieux@tycoint.com>
>
> There is no need add the driver name in the text to display
> on the console during the power-on:
> pnx4008-watchdog 4003c000.watchdog: PNX4008 Watchdog Timer: heartbeat 19 sec
>
> Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Changes from v3 to v4:
> - none.
>
> Changes from v2 to v3:
> - none.
>
> Changes from v1 to v2:
> - new patch in v2.
>
> drivers/watchdog/pnx4008_wdt.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
> index 313cd1c..88264a2 100644
> --- a/drivers/watchdog/pnx4008_wdt.c
> +++ b/drivers/watchdog/pnx4008_wdt.c
> @@ -178,8 +178,7 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
> goto disable_clk;
> }
>
> - dev_info(&pdev->dev, "PNX4008 Watchdog Timer: heartbeat %d sec\n",
> - pnx4008_wdd.timeout);
> + dev_info(&pdev->dev, "heartbeat %d sec\n", pnx4008_wdd.timeout);
>
> return 0;
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 1/6] watchdog: pnx4008: update logging during power-on
@ 2016-02-26 14:15 ` Guenter Roeck
0 siblings, 0 replies; 24+ messages in thread
From: Guenter Roeck @ 2016-02-26 14:15 UTC (permalink / raw)
To: linux-arm-kernel
On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> From: Sylvain Lemieux <slemieux@tycoint.com>
>
> There is no need add the driver name in the text to display
> on the console during the power-on:
> pnx4008-watchdog 4003c000.watchdog: PNX4008 Watchdog Timer: heartbeat 19 sec
>
> Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Changes from v3 to v4:
> - none.
>
> Changes from v2 to v3:
> - none.
>
> Changes from v1 to v2:
> - new patch in v2.
>
> drivers/watchdog/pnx4008_wdt.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
> index 313cd1c..88264a2 100644
> --- a/drivers/watchdog/pnx4008_wdt.c
> +++ b/drivers/watchdog/pnx4008_wdt.c
> @@ -178,8 +178,7 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
> goto disable_clk;
> }
>
> - dev_info(&pdev->dev, "PNX4008 Watchdog Timer: heartbeat %d sec\n",
> - pnx4008_wdd.timeout);
> + dev_info(&pdev->dev, "heartbeat %d sec\n", pnx4008_wdd.timeout);
>
> return 0;
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 2/6] watchdog: pnx4008: add restart handler
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-25 18:31 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel, arnd, wim, manabian; +Cc: linux-watchdog, linux, stigge, vz
From: Sylvain Lemieux <slemieux@tycoint.com>
Add restart handler capability to the driver;
the restart handler implementation was taken from
"mach-lpc32xx" ("lpc23xx_restart" function).
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- remove explicit clock enable from restart handler.
- verify "register_restart_handler" return value.
- add call to unregister_restart_handler".
- do the restart handling directly in "pnx4008_restart_handler".
Changes from v1 to v2:
- new patch in v2.
drivers/watchdog/pnx4008_wdt.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 88264a2..80ee4af 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -31,6 +31,8 @@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/of.h>
+#include <linux/delay.h>
+#include <linux/reboot.h>
#include <mach/hardware.h>
/* WatchDog Timer - Chapter 23 Page 207 */
@@ -77,6 +79,7 @@
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int heartbeat = DEFAULT_HEARTBEAT;
+static struct notifier_block restart_handler;
static DEFINE_SPINLOCK(io_lock);
static void __iomem *wdt_base;
@@ -124,6 +127,19 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
return 0;
}
+static int pnx4008_restart_handler(struct notifier_block *this,
+ unsigned long mode, void *cmd)
+{
+ /* Instant assert of RESETOUT_N with pulse length 1mS */
+ writel(13000, WDTIM_PULSE(wdt_base));
+ writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
+
+ /* Wait for watchdog to reset system */
+ mdelay(1000);
+
+ return NOTIFY_DONE;
+}
+
static const struct watchdog_info pnx4008_wdt_ident = {
.options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
@@ -157,6 +173,15 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
if (IS_ERR(wdt_base))
return PTR_ERR(wdt_base);
+ /* Register restart handler. */
+ restart_handler.notifier_call = pnx4008_restart_handler;
+ restart_handler.priority = 128;
+ ret = register_restart_handler(&restart_handler);
+ if (ret) {
+ dev_warn(&pdev->dev, "cannot register restart handler\n");
+ return ret;
+ }
+
wdt_clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(wdt_clk))
return PTR_ERR(wdt_clk);
@@ -189,6 +214,7 @@ disable_clk:
static int pnx4008_wdt_remove(struct platform_device *pdev)
{
+ unregister_restart_handler(&restart_handler);
watchdog_unregister_device(&pnx4008_wdd);
clk_disable_unprepare(wdt_clk);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 2/6] watchdog: pnx4008: add restart handler
@ 2016-02-25 18:31 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Sylvain Lemieux <slemieux@tycoint.com>
Add restart handler capability to the driver;
the restart handler implementation was taken from
"mach-lpc32xx" ("lpc23xx_restart" function).
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- remove explicit clock enable from restart handler.
- verify "register_restart_handler" return value.
- add call to unregister_restart_handler".
- do the restart handling directly in "pnx4008_restart_handler".
Changes from v1 to v2:
- new patch in v2.
drivers/watchdog/pnx4008_wdt.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 88264a2..80ee4af 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -31,6 +31,8 @@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/of.h>
+#include <linux/delay.h>
+#include <linux/reboot.h>
#include <mach/hardware.h>
/* WatchDog Timer - Chapter 23 Page 207 */
@@ -77,6 +79,7 @@
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int heartbeat = DEFAULT_HEARTBEAT;
+static struct notifier_block restart_handler;
static DEFINE_SPINLOCK(io_lock);
static void __iomem *wdt_base;
@@ -124,6 +127,19 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
return 0;
}
+static int pnx4008_restart_handler(struct notifier_block *this,
+ unsigned long mode, void *cmd)
+{
+ /* Instant assert of RESETOUT_N with pulse length 1mS */
+ writel(13000, WDTIM_PULSE(wdt_base));
+ writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
+
+ /* Wait for watchdog to reset system */
+ mdelay(1000);
+
+ return NOTIFY_DONE;
+}
+
static const struct watchdog_info pnx4008_wdt_ident = {
.options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
@@ -157,6 +173,15 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
if (IS_ERR(wdt_base))
return PTR_ERR(wdt_base);
+ /* Register restart handler. */
+ restart_handler.notifier_call = pnx4008_restart_handler;
+ restart_handler.priority = 128;
+ ret = register_restart_handler(&restart_handler);
+ if (ret) {
+ dev_warn(&pdev->dev, "cannot register restart handler\n");
+ return ret;
+ }
+
wdt_clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(wdt_clk))
return PTR_ERR(wdt_clk);
@@ -189,6 +214,7 @@ disable_clk:
static int pnx4008_wdt_remove(struct platform_device *pdev)
{
+ unregister_restart_handler(&restart_handler);
watchdog_unregister_device(&pnx4008_wdd);
clk_disable_unprepare(wdt_clk);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 3/6] watchdog: pnx4008: add support for soft reset
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-25 18:31 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel, arnd, wim, manabian; +Cc: linux-watchdog, linux, stigge, vz
From: Sylvain Lemieux <slemieux@tycoint.com>
Add support for explicit soft reset using the reboot mode.
The default reboot mode behavior is unchanged;
you can overwrite the default reboot type in the board specific file
"DT_MACHINE_START" definition using the "reboot_mode" parameter.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- no logical change; updated to work with new revision of patch #2.
Changes from v1 to v2:
- Rename patch title;
was "arm: lpc32xx: restart: add support for soft reset"
- Add change to "pnx-4008" driver instead of "mach-lpc32xx".
- Use define available in "pnx-4008" when writting to watchdog register.
drivers/watchdog/pnx4008_wdt.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 80ee4af..fbf027e 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -130,9 +130,16 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
static int pnx4008_restart_handler(struct notifier_block *this,
unsigned long mode, void *cmd)
{
- /* Instant assert of RESETOUT_N with pulse length 1mS */
- writel(13000, WDTIM_PULSE(wdt_base));
- writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
+ if (mode == (unsigned long)REBOOT_SOFT) {
+ /* Force match output active */
+ writel(EXT_MATCH0, WDTIM_EMR(wdt_base));
+ /* Internal reset on match output (RESOUT_N not asserted) */
+ writel(M_RES1, WDTIM_MCTRL(wdt_base));
+ } else {
+ /* Instant assert of RESETOUT_N with pulse length 1mS */
+ writel(13000, WDTIM_PULSE(wdt_base));
+ writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
+ }
/* Wait for watchdog to reset system */
mdelay(1000);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 3/6] watchdog: pnx4008: add support for soft reset
@ 2016-02-25 18:31 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Sylvain Lemieux <slemieux@tycoint.com>
Add support for explicit soft reset using the reboot mode.
The default reboot mode behavior is unchanged;
you can overwrite the default reboot type in the board specific file
"DT_MACHINE_START" definition using the "reboot_mode" parameter.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- no logical change; updated to work with new revision of patch #2.
Changes from v1 to v2:
- Rename patch title;
was "arm: lpc32xx: restart: add support for soft reset"
- Add change to "pnx-4008" driver instead of "mach-lpc32xx".
- Use define available in "pnx-4008" when writting to watchdog register.
drivers/watchdog/pnx4008_wdt.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 80ee4af..fbf027e 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -130,9 +130,16 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
static int pnx4008_restart_handler(struct notifier_block *this,
unsigned long mode, void *cmd)
{
- /* Instant assert of RESETOUT_N with pulse length 1mS */
- writel(13000, WDTIM_PULSE(wdt_base));
- writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
+ if (mode == (unsigned long)REBOOT_SOFT) {
+ /* Force match output active */
+ writel(EXT_MATCH0, WDTIM_EMR(wdt_base));
+ /* Internal reset on match output (RESOUT_N not asserted) */
+ writel(M_RES1, WDTIM_MCTRL(wdt_base));
+ } else {
+ /* Instant assert of RESETOUT_N with pulse length 1mS */
+ writel(13000, WDTIM_PULSE(wdt_base));
+ writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
+ }
/* Wait for watchdog to reset system */
mdelay(1000);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 4/6] watchdog: pnx4008: restart: support "cmd" from userspace
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-25 18:31 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel, arnd, wim, manabian; +Cc: linux-watchdog, linux, stigge, vz
From: Sylvain Lemieux <slemieux@tycoint.com>
Added support to verify if a "cmd" is passed from the userspace program rebooting the system;
- if a valid "cmd" is available, handle it;
- If the received "cmd" is not supported, use the default reboot mode.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- no logical change; updated to work with new revision of patch #2.
Changes from v1 to v2:
- Rename patch title;
was "arm: lpc32xx: restart: support "cmd" from userspace"
- Add change to "pnx-4008" driver instead of "mach-lpc32xx".
drivers/watchdog/pnx4008_wdt.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index fbf027e..e97b611 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -130,6 +130,21 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
static int pnx4008_restart_handler(struct notifier_block *this,
unsigned long mode, void *cmd)
{
+ const char *boot_cmd = (const char *)cmd;
+
+ /*
+ * Verify if a "cmd" passed from the userspace program rebooting
+ * the system; if available, handle it.
+ * - For details, see the 'reboot' syscall in kernel/reboot.c
+ * - If the received "cmd" is not supported, use the default mode.
+ */
+ if (boot_cmd) {
+ if (boot_cmd[0] == 'h')
+ mode = (unsigned long)REBOOT_HARD;
+ else if (boot_cmd[0] == 's')
+ mode = (unsigned long)REBOOT_SOFT;
+ }
+
if (mode == (unsigned long)REBOOT_SOFT) {
/* Force match output active */
writel(EXT_MATCH0, WDTIM_EMR(wdt_base));
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 4/6] watchdog: pnx4008: restart: support "cmd" from userspace
@ 2016-02-25 18:31 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Sylvain Lemieux <slemieux@tycoint.com>
Added support to verify if a "cmd" is passed from the userspace program rebooting the system;
- if a valid "cmd" is available, handle it;
- If the received "cmd" is not supported, use the default reboot mode.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- no logical change; updated to work with new revision of patch #2.
Changes from v1 to v2:
- Rename patch title;
was "arm: lpc32xx: restart: support "cmd" from userspace"
- Add change to "pnx-4008" driver instead of "mach-lpc32xx".
drivers/watchdog/pnx4008_wdt.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index fbf027e..e97b611 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -130,6 +130,21 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
static int pnx4008_restart_handler(struct notifier_block *this,
unsigned long mode, void *cmd)
{
+ const char *boot_cmd = (const char *)cmd;
+
+ /*
+ * Verify if a "cmd" passed from the userspace program rebooting
+ * the system; if available, handle it.
+ * - For details, see the 'reboot' syscall in kernel/reboot.c
+ * - If the received "cmd" is not supported, use the default mode.
+ */
+ if (boot_cmd) {
+ if (boot_cmd[0] == 'h')
+ mode = (unsigned long)REBOOT_HARD;
+ else if (boot_cmd[0] == 's')
+ mode = (unsigned long)REBOOT_SOFT;
+ }
+
if (mode == (unsigned long)REBOOT_SOFT) {
/* Force match output active */
writel(EXT_MATCH0, WDTIM_EMR(wdt_base));
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 5/6] arm: lpc32xx: phy3250 remove restart hook
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-25 18:31 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel, arnd, wim, manabian; +Cc: linux-watchdog, linux, stigge, vz
From: Sylvain Lemieux <slemieux@tycoint.com>
Remove the restart hook assignment from phy3250;
this functionality is now managed by
the pnx4008 watchdog driver.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Note:
This patch was generated with the option "--unified=2" to ensure
it can be apply before or after the changes for the new
LPC32xx irqchip driver:
- http://permalink.gmane.org/gmane.linux.drivers.devicetree/144683
Changes from v3 to v4:
- Switch patch #5 and #6 order.
Changes from v2 to v3:
- new patch in v3.
arch/arm/mach-lpc32xx/phy3250.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index a19071a..9e5c3db 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -211,4 +211,3 @@ DT_MACHINE_START(LPC32XX_DT, "LPC32XX SoC (Flattened Device Tree)")
.init_machine = lpc3250_machine_init,
.dt_compat = lpc32xx_dt_compat,
- .restart = lpc23xx_restart,
MACHINE_END
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 5/6] arm: lpc32xx: phy3250 remove restart hook
@ 2016-02-25 18:31 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Sylvain Lemieux <slemieux@tycoint.com>
Remove the restart hook assignment from phy3250;
this functionality is now managed by
the pnx4008 watchdog driver.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Note:
This patch was generated with the option "--unified=2" to ensure
it can be apply before or after the changes for the new
LPC32xx irqchip driver:
- http://permalink.gmane.org/gmane.linux.drivers.devicetree/144683
Changes from v3 to v4:
- Switch patch #5 and #6 order.
Changes from v2 to v3:
- new patch in v3.
arch/arm/mach-lpc32xx/phy3250.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index a19071a..9e5c3db 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -211,4 +211,3 @@ DT_MACHINE_START(LPC32XX_DT, "LPC32XX SoC (Flattened Device Tree)")
.init_machine = lpc3250_machine_init,
.dt_compat = lpc32xx_dt_compat,
- .restart = lpc23xx_restart,
MACHINE_END
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 6/6] arm: lpc32xx: remove restart handler
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-25 18:31 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel, arnd, wim, manabian; +Cc: linux-watchdog, linux, stigge, vz
From: Sylvain Lemieux <slemieux@tycoint.com>
Remove the restart handler from "mach-lpc32xx";
this functionality is now available in the
pnx4008 watchdog driver.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- Switch patch #5 and #6 order.
Changes from v2 to v3:
- move the change to "phy3250.c" into a separate patch.
Changes from v1 to v2:
- new patch in v2.
arch/arm/mach-lpc32xx/common.c | 15 ---------------
arch/arm/mach-lpc32xx/common.h | 1 -
2 files changed, 16 deletions(-)
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index 716e83e..5b7a1e7 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -194,21 +194,6 @@ void __init lpc32xx_map_io(void)
iotable_init(lpc32xx_io_desc, ARRAY_SIZE(lpc32xx_io_desc));
}
-void lpc23xx_restart(enum reboot_mode mode, const char *cmd)
-{
- /* Make sure WDT clocks are enabled */
- __raw_writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN,
- LPC32XX_CLKPWR_TIMER_CLK_CTRL);
-
- /* Instant assert of RESETOUT_N with pulse length 1mS */
- __raw_writel(13000, io_p2v(LPC32XX_WDTIM_BASE + 0x18));
- __raw_writel(0x70, io_p2v(LPC32XX_WDTIM_BASE + 0xC));
-
- /* Wait for watchdog to reset system */
- while (1)
- ;
-}
-
static int __init lpc32xx_check_uid(void)
{
u32 uid[4];
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h
index 1cd8853..2d90801 100644
--- a/arch/arm/mach-lpc32xx/common.h
+++ b/arch/arm/mach-lpc32xx/common.h
@@ -30,7 +30,6 @@ extern void lpc32xx_timer_init(void);
extern void __init lpc32xx_init_irq(void);
extern void __init lpc32xx_map_io(void);
extern void __init lpc32xx_serial_init(void);
-extern void lpc23xx_restart(enum reboot_mode, const char *);
/*
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 6/6] arm: lpc32xx: remove restart handler
@ 2016-02-25 18:31 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-25 18:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Sylvain Lemieux <slemieux@tycoint.com>
Remove the restart handler from "mach-lpc32xx";
this functionality is now available in the
pnx4008 watchdog driver.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- Switch patch #5 and #6 order.
Changes from v2 to v3:
- move the change to "phy3250.c" into a separate patch.
Changes from v1 to v2:
- new patch in v2.
arch/arm/mach-lpc32xx/common.c | 15 ---------------
arch/arm/mach-lpc32xx/common.h | 1 -
2 files changed, 16 deletions(-)
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index 716e83e..5b7a1e7 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -194,21 +194,6 @@ void __init lpc32xx_map_io(void)
iotable_init(lpc32xx_io_desc, ARRAY_SIZE(lpc32xx_io_desc));
}
-void lpc23xx_restart(enum reboot_mode mode, const char *cmd)
-{
- /* Make sure WDT clocks are enabled */
- __raw_writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN,
- LPC32XX_CLKPWR_TIMER_CLK_CTRL);
-
- /* Instant assert of RESETOUT_N with pulse length 1mS */
- __raw_writel(13000, io_p2v(LPC32XX_WDTIM_BASE + 0x18));
- __raw_writel(0x70, io_p2v(LPC32XX_WDTIM_BASE + 0xC));
-
- /* Wait for watchdog to reset system */
- while (1)
- ;
-}
-
static int __init lpc32xx_check_uid(void)
{
u32 uid[4];
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h
index 1cd8853..2d90801 100644
--- a/arch/arm/mach-lpc32xx/common.h
+++ b/arch/arm/mach-lpc32xx/common.h
@@ -30,7 +30,6 @@ extern void lpc32xx_timer_init(void);
extern void __init lpc32xx_init_irq(void);
extern void __init lpc32xx_map_io(void);
extern void __init lpc32xx_serial_init(void);
-extern void lpc23xx_restart(enum reboot_mode, const char *);
/*
--
1.8.3.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v4 0/6] watchdog: pnx4008: add restart handler
2016-02-25 18:31 ` Sylvain Lemieux
@ 2016-02-26 14:36 ` Guenter Roeck
-1 siblings, 0 replies; 24+ messages in thread
From: Guenter Roeck @ 2016-02-26 14:36 UTC (permalink / raw)
To: Sylvain Lemieux, linux-arm-kernel, arnd, wim, manabian
Cc: linux-watchdog, stigge, vz
On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> From: Sylvain Lemieux <slemieux@tycoint.com>
>
> The LPC32xx provide the capability to perform a soft or hard reset;
> a soft reset will no reset the external peripheral
> (i.e. RESOUT_N output not asserted).
>
> This changeset migrate the restart code from the "mach-lpc32xx" to
> the "pnx-4008" watchdog driver and add the soft reset capability.
>
> The default behavior (i.e. hard reset) remain unchanged.
>
> The core restart handler support added by this change:
> 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
> is not use in this changeset; it does not support the reboot mode.
I finally had the time to look into this. Sorry for the late reply.
Changing the watchdog core to pass the restart mode (or action)
and the cmd/data pointer to the driver would be trivial and should
be done instead.
I wrote a patch to do just that. I'll send it out later today for review,
assuming it passes my internal tests.
Guenter
>
> Note:
> Patch #5 was generated with the option "--unified=2" to ensure
> it can be apply before or after the changes for the new
> LPC32xx irqchip driver:
> - http://permalink.gmane.org/gmane.linux.drivers.devicetree/144683
> ---
> Changes from v3 to v4:
> * Update the patch as per the feedback received from:
> Arnd: http://permalink.gmane.org/gmane.linux.watchdog/3329
> - Switch patch #5 and #6 order.
>
> Changes from v2 to v3:
> * Update the patch as per the feedback received from:
> Joachim: http://permalink.gmane.org/gmane.linux.watchdog/3303
> - remove explicit clock enable from restart handler.
> - verify "register_restart_handler" return value.
> - add call to unregister_restart_handler".
> - do the restart handling directly in "pnx4008_restart_handler".
> * Move the change to "phy3250.c" into a separate patch and generate
> the new patch with the "--unified=2" option.
>
> Changes from v1 to v2:
> * Rename patch title;
> was "arm: lpc32xx: restart: add support for soft reset"
> * Update the patch as per the feedback received from:
> Joachim: http://permalink.gmane.org/gmane.linux.ports.arm.kernel/479791
> - migrate restart code from "mach-lpc32xx" to "pnx-4008" driver.
> * Add soft reset support to "pnx-4008" driver instead of "mach-lpc32xx".
> * Use define available in "pnx-4008" when writting to watchdog register.
> * Remove restart handler from "mach-lpc32xx".
> * Remove restart hook from "phy3250.c".
> * Update driver logging during power-on.
>
> Sylvain Lemieux (6):
> watchdog: pnx4008: update logging during power-on
> watchdog: pnx4008: add restart handler
> watchdog: pnx4008: add support for soft reset
> watchdog: pnx4008: restart: support "cmd" from userspace
> arm: lpc32xx: phy3250 remove restart hook
> arm: lpc32xx: remove restart handler
>
> arch/arm/mach-lpc32xx/common.c | 15 ------------
> arch/arm/mach-lpc32xx/common.h | 1 -
> arch/arm/mach-lpc32xx/phy3250.c | 1 -
> drivers/watchdog/pnx4008_wdt.c | 51 +++++++++++++++++++++++++++++++++++++++--
> 4 files changed, 49 insertions(+), 19 deletions(-)
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 0/6] watchdog: pnx4008: add restart handler
@ 2016-02-26 14:36 ` Guenter Roeck
0 siblings, 0 replies; 24+ messages in thread
From: Guenter Roeck @ 2016-02-26 14:36 UTC (permalink / raw)
To: linux-arm-kernel
On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> From: Sylvain Lemieux <slemieux@tycoint.com>
>
> The LPC32xx provide the capability to perform a soft or hard reset;
> a soft reset will no reset the external peripheral
> (i.e. RESOUT_N output not asserted).
>
> This changeset migrate the restart code from the "mach-lpc32xx" to
> the "pnx-4008" watchdog driver and add the soft reset capability.
>
> The default behavior (i.e. hard reset) remain unchanged.
>
> The core restart handler support added by this change:
> 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
> is not use in this changeset; it does not support the reboot mode.
I finally had the time to look into this. Sorry for the late reply.
Changing the watchdog core to pass the restart mode (or action)
and the cmd/data pointer to the driver would be trivial and should
be done instead.
I wrote a patch to do just that. I'll send it out later today for review,
assuming it passes my internal tests.
Guenter
>
> Note:
> Patch #5 was generated with the option "--unified=2" to ensure
> it can be apply before or after the changes for the new
> LPC32xx irqchip driver:
> - http://permalink.gmane.org/gmane.linux.drivers.devicetree/144683
> ---
> Changes from v3 to v4:
> * Update the patch as per the feedback received from:
> Arnd: http://permalink.gmane.org/gmane.linux.watchdog/3329
> - Switch patch #5 and #6 order.
>
> Changes from v2 to v3:
> * Update the patch as per the feedback received from:
> Joachim: http://permalink.gmane.org/gmane.linux.watchdog/3303
> - remove explicit clock enable from restart handler.
> - verify "register_restart_handler" return value.
> - add call to unregister_restart_handler".
> - do the restart handling directly in "pnx4008_restart_handler".
> * Move the change to "phy3250.c" into a separate patch and generate
> the new patch with the "--unified=2" option.
>
> Changes from v1 to v2:
> * Rename patch title;
> was "arm: lpc32xx: restart: add support for soft reset"
> * Update the patch as per the feedback received from:
> Joachim: http://permalink.gmane.org/gmane.linux.ports.arm.kernel/479791
> - migrate restart code from "mach-lpc32xx" to "pnx-4008" driver.
> * Add soft reset support to "pnx-4008" driver instead of "mach-lpc32xx".
> * Use define available in "pnx-4008" when writting to watchdog register.
> * Remove restart handler from "mach-lpc32xx".
> * Remove restart hook from "phy3250.c".
> * Update driver logging during power-on.
>
> Sylvain Lemieux (6):
> watchdog: pnx4008: update logging during power-on
> watchdog: pnx4008: add restart handler
> watchdog: pnx4008: add support for soft reset
> watchdog: pnx4008: restart: support "cmd" from userspace
> arm: lpc32xx: phy3250 remove restart hook
> arm: lpc32xx: remove restart handler
>
> arch/arm/mach-lpc32xx/common.c | 15 ------------
> arch/arm/mach-lpc32xx/common.h | 1 -
> arch/arm/mach-lpc32xx/phy3250.c | 1 -
> drivers/watchdog/pnx4008_wdt.c | 51 +++++++++++++++++++++++++++++++++++++++--
> 4 files changed, 49 insertions(+), 19 deletions(-)
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v4 0/6] watchdog: pnx4008: add restart handler
2016-02-26 14:36 ` Guenter Roeck
@ 2016-02-26 15:34 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-26 15:34 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-arm-kernel, arnd, wim, manabian, linux-watchdog, stigge, vz
On Fri, 2016-02-26 at 06:36 -0800, Guenter Roeck wrote:
> On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> > From: Sylvain Lemieux <slemieux@tycoint.com>
> >
> > The LPC32xx provide the capability to perform a soft or hard reset;
> > a soft reset will no reset the external peripheral
> > (i.e. RESOUT_N output not asserted).
> >
> > This changeset migrate the restart code from the "mach-lpc32xx" to
> > the "pnx-4008" watchdog driver and add the soft reset capability.
> >
> > The default behavior (i.e. hard reset) remain unchanged.
> >
> > The core restart handler support added by this change:
> > 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
> > is not use in this changeset; it does not support the reboot mode.
>
> I finally had the time to look into this. Sorry for the late reply.
>
> Changing the watchdog core to pass the restart mode (or action)
> and the cmd/data pointer to the driver would be trivial and should
> be done instead.
>
Thanks for the feedback.
Do you want me to rebase this patchset on the patch you will submit
to update the core restart handler support?
> I wrote a patch to do just that. I'll send it out later today for review,
> assuming it passes my internal tests.
>
> Guenter
> >
> > Note:
> > Patch #5 was generated with the option "--unified=2" to ensure
> > it can be apply before or after the changes for the new
> > LPC32xx irqchip driver:
> > - http://permalink.gmane.org/gmane.linux.drivers.devicetree/144683
> > ---
> > Changes from v3 to v4:
> > * Update the patch as per the feedback received from:
> > Arnd: http://permalink.gmane.org/gmane.linux.watchdog/3329
> > - Switch patch #5 and #6 order.
> >
> > Changes from v2 to v3:
> > * Update the patch as per the feedback received from:
> > Joachim: http://permalink.gmane.org/gmane.linux.watchdog/3303
> > - remove explicit clock enable from restart handler.
> > - verify "register_restart_handler" return value.
> > - add call to unregister_restart_handler".
> > - do the restart handling directly in "pnx4008_restart_handler".
> > * Move the change to "phy3250.c" into a separate patch and generate
> > the new patch with the "--unified=2" option.
> >
> > Changes from v1 to v2:
> > * Rename patch title;
> > was "arm: lpc32xx: restart: add support for soft reset"
> > * Update the patch as per the feedback received from:
> > Joachim: http://permalink.gmane.org/gmane.linux.ports.arm.kernel/479791
> > - migrate restart code from "mach-lpc32xx" to "pnx-4008" driver.
> > * Add soft reset support to "pnx-4008" driver instead of "mach-lpc32xx".
> > * Use define available in "pnx-4008" when writting to watchdog register.
> > * Remove restart handler from "mach-lpc32xx".
> > * Remove restart hook from "phy3250.c".
> > * Update driver logging during power-on.
> >
> > Sylvain Lemieux (6):
> > watchdog: pnx4008: update logging during power-on
> > watchdog: pnx4008: add restart handler
> > watchdog: pnx4008: add support for soft reset
> > watchdog: pnx4008: restart: support "cmd" from userspace
> > arm: lpc32xx: phy3250 remove restart hook
> > arm: lpc32xx: remove restart handler
> >
> > arch/arm/mach-lpc32xx/common.c | 15 ------------
> > arch/arm/mach-lpc32xx/common.h | 1 -
> > arch/arm/mach-lpc32xx/phy3250.c | 1 -
> > drivers/watchdog/pnx4008_wdt.c | 51 +++++++++++++++++++++++++++++++++++++++--
> > 4 files changed, 49 insertions(+), 19 deletions(-)
> >
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 0/6] watchdog: pnx4008: add restart handler
@ 2016-02-26 15:34 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-26 15:34 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 2016-02-26 at 06:36 -0800, Guenter Roeck wrote:
> On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> > From: Sylvain Lemieux <slemieux@tycoint.com>
> >
> > The LPC32xx provide the capability to perform a soft or hard reset;
> > a soft reset will no reset the external peripheral
> > (i.e. RESOUT_N output not asserted).
> >
> > This changeset migrate the restart code from the "mach-lpc32xx" to
> > the "pnx-4008" watchdog driver and add the soft reset capability.
> >
> > The default behavior (i.e. hard reset) remain unchanged.
> >
> > The core restart handler support added by this change:
> > 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
> > is not use in this changeset; it does not support the reboot mode.
>
> I finally had the time to look into this. Sorry for the late reply.
>
> Changing the watchdog core to pass the restart mode (or action)
> and the cmd/data pointer to the driver would be trivial and should
> be done instead.
>
Thanks for the feedback.
Do you want me to rebase this patchset on the patch you will submit
to update the core restart handler support?
> I wrote a patch to do just that. I'll send it out later today for review,
> assuming it passes my internal tests.
>
> Guenter
> >
> > Note:
> > Patch #5 was generated with the option "--unified=2" to ensure
> > it can be apply before or after the changes for the new
> > LPC32xx irqchip driver:
> > - http://permalink.gmane.org/gmane.linux.drivers.devicetree/144683
> > ---
> > Changes from v3 to v4:
> > * Update the patch as per the feedback received from:
> > Arnd: http://permalink.gmane.org/gmane.linux.watchdog/3329
> > - Switch patch #5 and #6 order.
> >
> > Changes from v2 to v3:
> > * Update the patch as per the feedback received from:
> > Joachim: http://permalink.gmane.org/gmane.linux.watchdog/3303
> > - remove explicit clock enable from restart handler.
> > - verify "register_restart_handler" return value.
> > - add call to unregister_restart_handler".
> > - do the restart handling directly in "pnx4008_restart_handler".
> > * Move the change to "phy3250.c" into a separate patch and generate
> > the new patch with the "--unified=2" option.
> >
> > Changes from v1 to v2:
> > * Rename patch title;
> > was "arm: lpc32xx: restart: add support for soft reset"
> > * Update the patch as per the feedback received from:
> > Joachim: http://permalink.gmane.org/gmane.linux.ports.arm.kernel/479791
> > - migrate restart code from "mach-lpc32xx" to "pnx-4008" driver.
> > * Add soft reset support to "pnx-4008" driver instead of "mach-lpc32xx".
> > * Use define available in "pnx-4008" when writting to watchdog register.
> > * Remove restart handler from "mach-lpc32xx".
> > * Remove restart hook from "phy3250.c".
> > * Update driver logging during power-on.
> >
> > Sylvain Lemieux (6):
> > watchdog: pnx4008: update logging during power-on
> > watchdog: pnx4008: add restart handler
> > watchdog: pnx4008: add support for soft reset
> > watchdog: pnx4008: restart: support "cmd" from userspace
> > arm: lpc32xx: phy3250 remove restart hook
> > arm: lpc32xx: remove restart handler
> >
> > arch/arm/mach-lpc32xx/common.c | 15 ------------
> > arch/arm/mach-lpc32xx/common.h | 1 -
> > arch/arm/mach-lpc32xx/phy3250.c | 1 -
> > drivers/watchdog/pnx4008_wdt.c | 51 +++++++++++++++++++++++++++++++++++++++--
> > 4 files changed, 49 insertions(+), 19 deletions(-)
> >
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v4 0/6] watchdog: pnx4008: add restart handler
2016-02-26 15:34 ` Sylvain Lemieux
@ 2016-02-26 15:47 ` Guenter Roeck
-1 siblings, 0 replies; 24+ messages in thread
From: Guenter Roeck @ 2016-02-26 15:47 UTC (permalink / raw)
To: Sylvain Lemieux
Cc: linux-arm-kernel, arnd, wim, manabian, linux-watchdog, stigge, vz
On 02/26/2016 07:34 AM, Sylvain Lemieux wrote:
> On Fri, 2016-02-26 at 06:36 -0800, Guenter Roeck wrote:
>> On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
>>> From: Sylvain Lemieux <slemieux@tycoint.com>
>>>
>>> The LPC32xx provide the capability to perform a soft or hard reset;
>>> a soft reset will no reset the external peripheral
>>> (i.e. RESOUT_N output not asserted).
>>>
>>> This changeset migrate the restart code from the "mach-lpc32xx" to
>>> the "pnx-4008" watchdog driver and add the soft reset capability.
>>>
>>> The default behavior (i.e. hard reset) remain unchanged.
>>>
>>> The core restart handler support added by this change:
>>> 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
>>> is not use in this changeset; it does not support the reboot mode.
>>
>> I finally had the time to look into this. Sorry for the late reply.
>>
>> Changing the watchdog core to pass the restart mode (or action)
>> and the cmd/data pointer to the driver would be trivial and should
>> be done instead.
>>
> Thanks for the feedback.
>
> Do you want me to rebase this patchset on the patch you will submit
> to update the core restart handler support?
>
Yes, please. I'll Cc: you on it.
If you want to get started early and are open to do some early testing,
try cloning git://kerneltests.org/git/linux.git. You'll find the patch
in branch 'testing'.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 0/6] watchdog: pnx4008: add restart handler
@ 2016-02-26 15:47 ` Guenter Roeck
0 siblings, 0 replies; 24+ messages in thread
From: Guenter Roeck @ 2016-02-26 15:47 UTC (permalink / raw)
To: linux-arm-kernel
On 02/26/2016 07:34 AM, Sylvain Lemieux wrote:
> On Fri, 2016-02-26 at 06:36 -0800, Guenter Roeck wrote:
>> On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
>>> From: Sylvain Lemieux <slemieux@tycoint.com>
>>>
>>> The LPC32xx provide the capability to perform a soft or hard reset;
>>> a soft reset will no reset the external peripheral
>>> (i.e. RESOUT_N output not asserted).
>>>
>>> This changeset migrate the restart code from the "mach-lpc32xx" to
>>> the "pnx-4008" watchdog driver and add the soft reset capability.
>>>
>>> The default behavior (i.e. hard reset) remain unchanged.
>>>
>>> The core restart handler support added by this change:
>>> 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
>>> is not use in this changeset; it does not support the reboot mode.
>>
>> I finally had the time to look into this. Sorry for the late reply.
>>
>> Changing the watchdog core to pass the restart mode (or action)
>> and the cmd/data pointer to the driver would be trivial and should
>> be done instead.
>>
> Thanks for the feedback.
>
> Do you want me to rebase this patchset on the patch you will submit
> to update the core restart handler support?
>
Yes, please. I'll Cc: you on it.
If you want to get started early and are open to do some early testing,
try cloning git://kerneltests.org/git/linux.git. You'll find the patch
in branch 'testing'.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v4 0/6] watchdog: pnx4008: add restart handler
2016-02-26 15:47 ` Guenter Roeck
@ 2016-02-26 16:50 ` Sylvain Lemieux
-1 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-26 16:50 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-arm-kernel, arnd, wim, manabian, linux-watchdog, stigge, vz
On Fri, 2016-02-26 at 07:47 -0800, Guenter Roeck wrote:
> On 02/26/2016 07:34 AM, Sylvain Lemieux wrote:
> > On Fri, 2016-02-26 at 06:36 -0800, Guenter Roeck wrote:
> >> On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> >>> From: Sylvain Lemieux <slemieux@tycoint.com>
> >>>
> >>> The LPC32xx provide the capability to perform a soft or hard reset;
> >>> a soft reset will no reset the external peripheral
> >>> (i.e. RESOUT_N output not asserted).
> >>>
> >>> This changeset migrate the restart code from the "mach-lpc32xx" to
> >>> the "pnx-4008" watchdog driver and add the soft reset capability.
> >>>
> >>> The default behavior (i.e. hard reset) remain unchanged.
> >>>
> >>> The core restart handler support added by this change:
> >>> 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
> >>> is not use in this changeset; it does not support the reboot mode.
> >>
> >> I finally had the time to look into this. Sorry for the late reply.
> >>
> >> Changing the watchdog core to pass the restart mode (or action)
> >> and the cmd/data pointer to the driver would be trivial and should
> >> be done instead.
> >>
> > Thanks for the feedback.
> >
> > Do you want me to rebase this patchset on the patch you will submit
> > to update the core restart handler support?
> >
>
> Yes, please. I'll Cc: you on it.
>
> If you want to get started early and are open to do some early testing,
> try cloning git://kerneltests.org/git/linux.git. You'll find the patch
> in branch 'testing'.
>
Rebase and tested on a custom LPC32xx board.
> Thanks,
> Guenter
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 0/6] watchdog: pnx4008: add restart handler
@ 2016-02-26 16:50 ` Sylvain Lemieux
0 siblings, 0 replies; 24+ messages in thread
From: Sylvain Lemieux @ 2016-02-26 16:50 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 2016-02-26 at 07:47 -0800, Guenter Roeck wrote:
> On 02/26/2016 07:34 AM, Sylvain Lemieux wrote:
> > On Fri, 2016-02-26 at 06:36 -0800, Guenter Roeck wrote:
> >> On 02/25/2016 10:31 AM, Sylvain Lemieux wrote:
> >>> From: Sylvain Lemieux <slemieux@tycoint.com>
> >>>
> >>> The LPC32xx provide the capability to perform a soft or hard reset;
> >>> a soft reset will no reset the external peripheral
> >>> (i.e. RESOUT_N output not asserted).
> >>>
> >>> This changeset migrate the restart code from the "mach-lpc32xx" to
> >>> the "pnx-4008" watchdog driver and add the soft reset capability.
> >>>
> >>> The default behavior (i.e. hard reset) remain unchanged.
> >>>
> >>> The core restart handler support added by this change:
> >>> 2165bf524da5f5e496d - "watchdog: core: add restart handler support"
> >>> is not use in this changeset; it does not support the reboot mode.
> >>
> >> I finally had the time to look into this. Sorry for the late reply.
> >>
> >> Changing the watchdog core to pass the restart mode (or action)
> >> and the cmd/data pointer to the driver would be trivial and should
> >> be done instead.
> >>
> > Thanks for the feedback.
> >
> > Do you want me to rebase this patchset on the patch you will submit
> > to update the core restart handler support?
> >
>
> Yes, please. I'll Cc: you on it.
>
> If you want to get started early and are open to do some early testing,
> try cloning git://kerneltests.org/git/linux.git. You'll find the patch
> in branch 'testing'.
>
Rebase and tested on a custom LPC32xx board.
> Thanks,
> Guenter
>
^ permalink raw reply [flat|nested] 24+ messages in thread