25 May, 2010
9 commits
-
This is the driver for the hardware watchdog on the Freescale IMX2 and later processors.
Signed-off-by: Wolfram Sang
Cc: Vladimir Zapolskiy
Cc: Sascha Hauer
Tested-by: Juergen Beisert
Signed-off-by: Wim Van Sebroeck -
If the request for wdt_mem region fails, this patch modifies the driver
such that, it does not try to release the wdt_mem region on exit.Signed-off-by: Banajit Goswami
Signed-off-by: Kukjin Kim
Signed-off-by: Ben Dooks
Signed-off-by: Wim Van Sebroeck -
This patch adds HAVE_S3C2410_WATCHDOG to control inclusion of watchdog driver
for Samsung SoCs. This option will help to include the driver only for the
necessary machines and not for all for any given arch.Signed-off-by: Banajit Goswami
Signed-off-by: Kukjin Kim
Signed-off-by: Ben Dooks
Signed-off-by: Wim Van Sebroeck -
For TCO V1 devices the programmed timeout was twice too long
because the fact that the TCO V1 timer needs to count down
twice before triggering the watchdog, wasn't accounted for.
Also the timeout values in the module description and error
message were clarified. And the _STS registers are 16 bit
instead of 8 bit.Signed-off-by: Pádraig Brady
Tested-by: Simon Kagstrom
Signed-off-by: Wim Van Sebroeck -
If we are not able to register then it is better to have
watchdog in disabled state than noticing a system reboot.Signed-off-by: Ameya Palande
Acked-By: Timo Kokkonen
Signed-off-by: Wim Van Sebroeck -
Move the limited watchdog driver help from kernel-parameters.txt
to Documentation/watchdog/watchdog-parameters.txt and add info to it
for all watchdog drivers except the ones that have driver-specific
files already.Correct minor comments and MODULE_PARM_DESC() text in 2 places.
Signed-off-by: Randy Dunlap
Signed-off-by: Wim Van Sebroeck -
The WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS ioctl calls return the WDIOF_* flags
and nothing else.Signed-off-by: Wim Van Sebroeck
-
Fix MODULE_PARM_DESC() strings in several watchdog drivers.
Some are simple as add a parenthesis.
Others are problems from __stringify() being used on a
variable name instead of a macro name, so the variable name
is produced in the string instead of its build-time value.
In these cases, create a macro for the value so that the
module param description string is useful.Only pc87413_wdt has been built (due to toolchains).
Signed-off-by: Randy Dunlap
Signed-off-by: Wim Van Sebroeck -
use new common Blackfin watchdog header
Signed-off-by: Mike Frysinger
Signed-off-by: Wim Van Sebroeck
22 May, 2010
2 commits
-
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.cAlso fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.Signed-off-by: Grant Likely
-
.name, .match_table and .owner are duplicated in both of_platform_driver
and device_driver. This patch is a removes the extra copies from struct
of_platform_driver and converts all users to the device_driver members.This patch is a pretty mechanical change. The usage model doesn't change
and if any drivers have been missed, or if anything has been fixed up
incorrectly, then it will fail with a compile time error, and the fixup
will be trivial. This patch looks big and scary because it touches so
many files, but it should be pretty safe.Signed-off-by: Grant Likely
Acked-by: Sean MacLennan
21 May, 2010
1 commit
-
For more clearance what the functions actually do,
usb_buffer_alloc() is renamed to usb_alloc_coherent()
usb_buffer_free() is renamed to usb_free_coherent()They should only be used in code which really needs DMA coherency.
All call sites have been changed accordingly, except for staging
drivers.Signed-off-by: Daniel Mack
Cc: Alan Stern
Cc: Pedro Ribeiro
Signed-off-by: Greg Kroah-Hartman
19 May, 2010
1 commit
-
The following structure elements duplicate the information in
'struct device.of_node' and so are being eliminated. This patch
makes all readers of these elements use device.of_node instead.(struct of_device *)->node
(struct dev_archdata *)->prom_node (sparc)
(struct dev_archdata *)->of_node (powerpc & microblaze)Signed-off-by: Grant Likely
12 May, 2010
1 commit
-
This fixes the build failures seen when building mpcore_wdt and it
also removes the nonexistent ARM_MPCORE_PLATFORM dependency, instead
make it dependent on HAVE_ARM_TWD.Also this fixes spinlock usage appropriately.
Signed-off-by: srinidhi kasagar
Acked-by: Linus Walleij
Signed-off-by: Russell King
03 May, 2010
1 commit
-
The WATCHDOG_TIMEOUT macro does not exist. The default timeout value is WDT_TIMEOUT.
Fix the MODULE_PARM_DESC so that the code can compile again.reported-by: Randy Dunlap
Signed-off-by: Wim Van Sebroeck
27 Apr, 2010
4 commits
-
commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG] watchdog_info
constify") introduced the following build failure:CC booke_wdt.o
booke_wdt.c: In function 'booke_wdt_init':
booke_wdt.c:220: error: assignment of read-only variable 'ident'Fix this by removing 'const' qualifier from watchdog_info struct.
Signed-off-by: Anton Vorontsov
Signed-off-by: Wim Van Sebroeck
Cc: Kumar Gala
Signed-off-by: Andrew Morton -
spinlock need to be replaced by mutex because of sleep functions
inside wdt_send_data.Signed-off-by: Denis Turischev
Signed-off-by: Wim Van Sebroeck -
There are fitpc2 compatible boards that hang with existent i/o
operations order. Solution is to switch between writing to data
and command ports.Signed-off-by: Denis Turischev
Signed-off-by: Wim Van Sebroeck -
Watchdog configuration register and timer count register were interchanged,
causing wrong values to be written into both registers.
This caused watchdog triggered resets even if the watchdog was reset in time.Signed-off-by: Guenter Roeck
Acked-by: Ralf Baechle
Signed-off-by: Wim Van Sebroeck
16 Apr, 2010
4 commits
-
Correct fix for the "ioremap() causes build failure on S390" should have been
a dependancy on HAS_IOMEM. So we add this dependancy also (and leave the driver
in the ARM section for now).Signed-off-by: Geert Uytterhoeven
Signed-off-by: Wim Van Sebroeck -
When shutting down the watchdog timer, special care must be taken
not to overwrite other bits in the register, as it may be shared
with other peripherals.For example, on the Arcom Vulcan, the register is shared between
the watchdog and the PCI reset line...Signed-off-by: Marc Zyngier
Signed-off-by: Wim Van Sebroeck -
A previous fix changed the WDTP function to use the period directly,
rather than subtracting from 63. However the mask generation was
not changed, so the mask was coming out as 0. This patch fixes it.Signed-off-by: Luuk Paulussen
Signed-off-by: Wim Van Sebroeck -
This patch allows Watchdog timer to be selected for OMAP4 by fixing
Kconfig entrySigned-off-by: Santosh Shilimkar
Signed-off-by: Wim Van Sebroeck
07 Apr, 2010
1 commit
-
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] hpwdt - fix lower timeout limit
[WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs
[WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.
[WATCHDOG] doc: watchdog simple example: don't fail on fsync()
[WATCHDOG] set max63xx driver as ARM only
[WATCHDOG] powerpc: pika_wdt ident cannot be const
06 Apr, 2010
2 commits
-
[Novell Bug 581103] HP Watchdog driver has arbitrary (wrong) timeout limits.
Fix the lower timeout limit to a more appropriate value.Signed-off-by: Thomas Mingarelli
Signed-off-by: Wim Van Sebroeck
Cc: stable -
This patch adds the Intel Cougar Point PCH LPC Controller DeviceIDs for iTCO Watchdog.
Signed-off-by: Seth Heasley
Signed-off-by: Wim Van Sebroeck
Cc: stable
04 Apr, 2010
2 commits
-
Use of ioremap() causes build failure on S390.
Restrict the driver to ARM until another architecture comes along
and enables the driver for its own use.Signed-off-by: Marc Zyngier
Signed-off-by: Wim Van Sebroeck
Signed-off-by: Andrew Morton -
The watchdog_info struct cannot be a const since we dynamically fill
in the firmware version.Signed-off-by: Sean MacLennan
Signed-off-by: Wim Van Sebroeck
30 Mar, 2010
1 commit
-
…it slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
08 Mar, 2010
2 commits
-
Since the intel 6300esb platform uses a dedicated PCI ID for
it's watchdog timer (00:1d.4), it's better and easier to have
this as a pci_driver.Signed-off-by: Wim Van Sebroeck
-
Before you can read or write from the i6300esb memeory mapped registers,
you need to unlock these. This is done by writing the magic numbers 0x80
and 0x86 to the reload register. The size of the reload register is 32bit
though.Also binary 11 is hex 0x03 and not 0x11.
Signed-off-by: Wim Van Sebroeck
07 Mar, 2010
3 commits
-
Making this instance static exposes the code to SMP races, etc.
Signed-off-by: Andrew Morton
Signed-off-by: Wim Van Sebroeck -
Platform device drivers can use the .shutdown method to handle soft
shutdown's instead of reboot_notifier's.Signed-off-by: Wim Van Sebroeck
-
make the watchdog_info struct const where possible.
Signed-off-by: Wim Van Sebroeck
06 Mar, 2010
5 commits
-
This patch corrects author and copyright notices following the split-up of
the GE Fanuc joint venture.Signed-off-by: Martyn Welch
Signed-off-by: Wim Van Sebroeck -
It's possible that the platform is not allowing reboot via TCO timer
expiration.Also, differentiate between not finding a chipset that has TCO, and the case
where TCO is present but the driver fails to initialize for some reason.Signed-off-by: Naga Chumbalkar
Signed-off-by: Wim Van Sebroeck -
Clean-up driver:
* make release the reverse of probe so that both are consistent
* add WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS ioctls.Signed-off-by: Wim Van Sebroeck
-
This driver adds support for the max63{69,70,71,72,73,74} family of
watchdog timer chips.It has been tested on an Arcom Zeus (max6369).
Signed-off-by: Marc Zyngier
Signed-off-by: Wim Van Sebroeck -
Technologic Systems TS-72xx SBCs have external glue logic
CPLD which includes watchdog timer. This driver implements
kernel support for that.Signed-off-by: Mika Westerberg
Signed-off-by: Wim Van Sebroeck
02 Mar, 2010
1 commit
-
Conflicts:
arch/arm/plat-omap/Kconfig
