]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - drivers/watchdog/aspeed_wdt.c
watchdog: aspeed: Fix translation of reset mode to ctrl register
authorMilton Miller <miltonm@us.ibm.com>
Fri, 9 Mar 2018 21:58:19 +0000 (15:58 -0600)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 27 Aug 2018 14:40:05 +0000 (16:40 +0200)
commitafd2a5d968915a5805df3d22d951ab7f50d9fae5
tree9ea3ec3f275a103cbf261084b6792fbed09577a5
parentd4ef6f3ceb947b9986d5aa23ac92b649fa4469f1
watchdog: aspeed: Fix translation of reset mode to ctrl register

BugLink: http://bugs.launchpad.net/bugs/1786352
[ Upstream commit d2fc8db691bf3197d43b2afb553311a9bf257bff ]

Assert RESET_SYSTEM bit for any reset and set MODE field from reset
type.

The watchdog control register has a RESET_SYSTEM bit that is really
closer to activate a reset, and RESET_SYSTEM_MODE field that chooses
how much to reset.

Before this patch, a node without these optional property would do a
SOC reset, but a node with properties requesting a cpu or SOC reset
would do nothing and a node requesting a system reset would do a
SOC reset.

Fixes: b7f0b8ad25f3 ("drivers/watchdog: ASPEED reference dev tree properties for config")
Signed-off-by: Milton Miller <miltonm@us.ibm.com>
Signed-off-by: Eddie James <eajames@linux.vnet.ibm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/watchdog/aspeed_wdt.c