提交 · 8605fec1ce2a397f738f1c394be7847dacf31b0c · openeuler / Kernel

28 12月, 2015 8 次提交

watchdog: omap: don't disable the timer when it should be enabled early · 8605fec1

由 Uwe Kleine-König 提交于 12月 15, 2015

With the early_enable module parameter the watchdog can be started
during driver probe time. If this is requested the bets are good that
the timer is already running, so to narrow the gap where the timer is
disabled only call the disable function when the timer shouldn't be
started.
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

8605fec1

watchdog: omap: don't disable runtime pm before starting device · a6392490

由 Uwe Kleine-König 提交于 12月 15, 2015

omap_wdt_start calls pm_runtime_get_sync so dropping a reference just
before calling omap_wdt_start doesn't make much sense. Moreover there is
no point to use the synchronous variant of pm_runtime_put because the
driver doesn't care if the clock is disabled before or after
omap_wdt_probe returns.
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

a6392490

watchdog: dw_wdt: fix signedness bug in dw_wdt_top_in_seconds() · 3024e0d1

由 Jisheng Zhang 提交于 12月 15, 2015

On 64bit platforms, "(1 << (16 + top)) / clk_get_rate(dw_wdt.clk)" is
sign-extended to 64bit then converted to unsigned 64bit, finally divide
the clk rate. If the top is the maximum TOP i.e 15, "(1 << (16 +15))"
will be sign-extended to 0xffffffff80000000, then converted to unsigned
0xffffffff80000000, which is a huge number, thus the final result is
wrong.

We fix this issue by giving usigned value(1U in this case) at first.

Let's assume clk rate is 25MHZ,
Before the patch:
dw_wdt_top_in_seconds(15) = -864612050

After the patch:
dw_wdt_top_in_seconds(15) = 85
Signed-off-by: NJisheng Zhang <jszhang@marvell.com>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

3024e0d1

watchdog: refuse to unload softdog module when its timer is running · 5889f06b

由 Li RongQing 提交于 12月 17, 2015

the softdog has static variables which are accessed if its timer is
still running after the driver is unloaded. and lead to crash:

   $modprobe softdog
   $echo 1 >/dev/watchdog
   $modprobe -r softdog

   CPU 20 Unable to handle kernel paging request at virtual address
   Oops[#1]:
   CPU: 20 PID: 0 Comm: swapper/20 Not tainted 4.1.13-WR8.0.0.0_standard
   ...
   Modules linked in: [last unloaded: softdog]
    ....
   Call Trace:
   [<ffffffff801e142c>] cascade+0x34/0xb0
   [<ffffffff801e1964>] run_timer_softirq+0x30c/0x368
   [<ffffffff80181044>] __do_softirq+0x1ec/0x418
   [<ffffffff801815d0>] irq_exit+0x90/0x98
   [<ffffffff8010749c>] plat_irq_dispatch+0xa4/0x140
   [<ffffffff80152740>] ret_from_irq+0x0/0x4
   [<ffffffff801529e0>] __r4k_wait+0x20/0x40
   [<ffffffff801c2278>] cpu_startup_entry+0x2a0/0x368
   [<ffffffff8015fa64>] start_secondary+0x444/0x4d8

add the module ref when timer is running to avoid to unload the softdog
module
Signed-off-by: NLi RongQing <roy.qing.li@gmail.com>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

5889f06b

watchdog: stmp3xxx: Stop the watchdog on system halt · 8d2fa171

由 Harald Geyer 提交于 12月 12, 2015

This allows the system to actually halt even if userspace forgot to
disable the watchdog first. Old behaviour was that the watchdog forced
the system to boot again.
Signed-off-by: NHarald Geyer <harald@ccbib.org>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

8d2fa171

sp5100_tco: fix the device check for SB800 and later chipsets · bdecfcdb

由 Huang Rui 提交于 11月 23, 2015

For SB800 and later chipsets, the register definitions are the same
with SB800. And for SB700 and older chipsets, the definitions should
be same with SP5100/SB7x0.
Signed-off-by: NHuang Rui <ray.huang@amd.com>
Cc: Denis Turischev <denis.turischev@compulab.co.il>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

bdecfcdb

sp5100_tco: Add AMD Carrizo platform support · cca118fa

由 Huang Rui 提交于 11月 23, 2015

sp5100_tco watchdog is also supported on AMD KernCZ chipset of Carrizo
platform.
Signed-off-by: NHuang Rui <ray.huang@amd.com>
Cc: Denis Turischev <denis.turischev@compulab.co.il>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

cca118fa

sp5100_tco: Add AMD Mullins platform support · 190aa430

由 Denis Turischev 提交于 11月 24, 2015

AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
reuse the existent sp5100_tco driver.
Signed-off-by: NDenis Turischev <denis.turischev@compulab.co.il>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

190aa430

27 12月, 2015 2 次提交

watchdog: Read device status through sysfs attributes · 33b71126

由 Pratyush Anand 提交于 12月 17, 2015

This patch adds following attributes to watchdog device's sysfs interface
to read its different status.

* state - reads whether device is active or not
* identity - reads Watchdog device's identity string.
* timeout - reads current timeout.
* timeleft - reads timeleft before watchdog generates a reset
* bootstatus - reads status of the watchdog device at boot
* status - reads watchdog device's  internal status bits
* nowayout - reads whether nowayout feature was set or not

Testing with iTCO_wdt:
 # cd /sys/class/watchdog/watchdog1/
 # ls
bootstatus  dev  device  identity  nowayout  power  state
subsystem  timeleft  timeout  uevent
 # cat identity
iTCO_wdt
 # cat timeout
30
 # cat state
inactive
 # echo > /dev/watchdog1
 # cat timeleft
26
 # cat state
active
 # cat bootstatus
0
 # cat nowayout
0
Signed-off-by: NPratyush Anand <panand@redhat.com>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

33b71126

watchdog: Use static struct class watchdog_class in stead of pointer · 906d7a5c

由 Pratyush Anand 提交于 12月 17, 2015

We need few sysfs attributes to know different status of a watchdog device.
To do that, we need to associate .dev_groups with watchdog_class. So
convert it from pointer to static.
Putting this static struct in watchdog_dev.c, so that static device
attributes defined in that file can be attached to it.
Signed-off-by: NPratyush Anand <panand@redhat.com>
Suggested-by: NGuenter Roeck <linux@roeck-us.net>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

906d7a5c

13 12月, 2015 19 次提交

watchdog: w83627hf_wdt: use core reboot notifier · d68106bb

由 Damien Riegel 提交于 11月 20, 2015

Get rid of the custom reboot notifier block registration and use the one
provided by the watchdog core.
Signed-off-by: NDamien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: NVivien Didelot <vivien.didelot@savoirlinux.com>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

d68106bb

watchdog: softdog: use core reboot notifier · 84ebcc17

由 Damien Riegel 提交于 11月 20, 2015

Get rid of the custom reboot notifier block registration and use the one
provided by the watchdog core.
Signed-off-by: NDamien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
Reviewed-by: NVivien Didelot <vivien.didelot@savoirlinux.com>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

84ebcc17

watchdog: gpio_wdt: use core reboot notifier · 28e805b4

由 Damien Riegel 提交于 11月 20, 2015

Get rid of the custom reboot notifier block registration and use the one
provided by the watchdog core.

Note that this watchdog used to stop unconditionnaly on SYS_HALT and
SYS_POWER_OFF. The core function now calls ops->stop on SYS_HALT and
SYS_DOWN. To prevent the watchdog from being stopped on reboot, the
"always-running" property must be set, otherwise it will now be stopped.
Signed-off-by: NDamien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: NVivien Didelot <vivien.didelot@savoirlinux.com>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

28e805b4

watchdog: cadence_wdt: use core reboot notifier · 5e1f976f

由 Damien Riegel 提交于 11月 20, 2015

Get rid of the custom reboot notifier block registration and use the one
provided by the watchdog core.
Signed-off-by: NDamien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
Reviewed-by: NVivien Didelot <vivien.didelot@savoirlinux.com>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

5e1f976f

watchdog: bcm47xx_wdt: use core reboot notifier · 2786aade

由 Damien Riegel 提交于 11月 20, 2015

Get rid of the custom reboot notifier block registration and use the one
provided by the watchdog core.
Signed-off-by: NDamien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
Reviewed-by: NVivien Didelot <vivien.didelot@savoirlinux.com>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

2786aade

watchdog: core: add reboot notifier support · e1313196

由 Damien Riegel 提交于 11月 20, 2015

Many watchdog drivers register a reboot notifier in order to stop the
watchdog on system reboot. Thus we can factorize this code in the
watchdog core.

For that purpose, a new notifier block is added in watchdog_device for
internal use only, as well as a new watchdog_stop_on_reboot helper
function.

If this helper is called, watchdog core registers the related notifier
block and will stop the watchdog when SYS_HALT or SYS_DOWN is received.

Since this operation can be critical on some platforms, abort the device
registration if the reboot notifier registration fails.
Suggested-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: NDamien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>

e1313196

watchdog: sunxi_wdt: use core restart handler · 0ebad1e5