Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

watchdog-mm git tree

7 views
Skip to first unread message

Wim Van Sebroeck

unread,
Aug 17, 2005, 11:06:48 AM8/17/05
to Andrew Morton, linux-...@vger.kernel.org, David Hardeman, Naveen Gupta, Jiri Slaby, P @ Draig Brady, Ben Dooks, James Chapman, Olaf Hering
Hi Andrew,

I (finaly) converted the watchdog-mm bitkeeper tree to a git repository
:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdo
g-mm.git

The tree contains the following patches at this moment (in reverse orde
r):

Author: Wim Van Sebroeck <w...@iguana.be>
Date: Tue Aug 16 14:52:23 2005 -0700

[WATCHDOG] Kconfig-clean

Move the ppc64 rtas drivers together with the other ppc drivers.

Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: Naveen Gupta <ngu...@google.com>
Date: Tue Aug 16 14:46:17 2005 -0700

[WATCHDOG] i6300esb-set_correct_reload_register_bit

This patch writes into bit 8 of the reload register to perform the
correct 'Reload Sequence' instead of writing into bit 4 of Watchdog
for
Intel 6300ESB chipset.

Signed-off-by: Naveen Gupta <ngu...@google.com>
Signed-off-by: David Härdeman <da...@2gen.com>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: Naveen Gupta <ngu...@google.com>
Date: Tue Aug 16 14:41:06 2005 -0700

[WATCHDOG] i6300esb.c-WDT_ENABLE-bug

This patch sets the WDT_ENABLE bit of the Lock Register to enable t
he
watchdog and WDT_LOCK bit only if nowayout is set. The old code alw
ays
sets the WDT_LOCK bit of watchdog timer for Intel 6300ESB chipset.
So, we
end up locking the watchdog instead of enabling it.

Signed-off-by: Naveen Gupta <ngu...@google.com>
Signed-off-by: David Härdeman <da...@2gen.com>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: Jiri Slaby <xsl...@fi.muni.cz>
Date: Tue Aug 16 14:35:42 2005 -0700

[WATCHDOG] removes pci_find_device from i6300esb.c

This patch changes pci_find_device to pci_get_device
(encapsulated in for_each_pci_dev) in i6300esb watchdog
card with appropriate adding pci_dev_put.

Generated in 2.6.13-rc5-mm1 kernel version.

Signed-off-by: Jiri Slaby <xsl...@fi.muni.cz>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: David Hardeman <da...@2gen.com>
Date: Tue Aug 16 14:17:18 2005 -0700

[WATCHDOG] i6300esb.patch

From: David Hardeman <da...@2gen.com>

I wrote earlier to the list[1] asking for a driver for the watchdog
included in the 6300ESB chipset. I got a 2.4 driver via private em
ail
from Ross Biro which I've changed into what I hope resembles a 2.6
driver (which was done by looking a lot at the watchdog drivers
already in the 2.6 tree).

I've attached the result, and I'm hoping to get some feedback on th
e
coding as a first step. I can't actually test it on the hardware
right now as I won't have physical access until April. So my own te
sts
have been limited to "compiles-without-warnings" and
"can-be-insmodded-in-other-machine-without-oops".

[1] http://marc.theaimsgroup.com/?l=linux-kernel&m=110711079825
794&w=2
[2] http://marc.theaimsgroup.com/?l=linux-kernel&m=110711973917
746&w=2

Signed-off-by: Andrew Morton <ak...@osdl.org>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: P@Draig Brady <P...@draigBrady.com>
Date: Tue Aug 16 14:02:15 2005 -0700

[WATCHDOG] w83627hf_wdt.c-initialized_bios_bug

Attached is a small update to the w83627hf watchdog driver
to initialise appropriately if it was already initialised
in the BIOS. On tyan motherboards for e.g. you can init
the watchdog to 4 mins, then when the driver is loaded it
sets the watchdog to "seconds" mode, and then machine will
reboot within 4 seconds. So this patch resets the timeout
to the configured value if the watchdog is already running.

Signed-off-by: P@draig Brady <P...@draigBrady.com>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: Ben Dooks <ben-...@fluff.org>
Date: Tue Aug 16 13:51:51 2005 -0700

[WATCHDOG] s3c2410 watchdog - replace reboot notifier

Patch from Dimitry Andric <dimitry...@tomtom.com>

Change to using platfrom driver's .shutdown method instead
of an reboot notifier

Signed-off-by: Dimitry Andric <dimitry...@tomtom.com>
Signed-off-by: Ben Dooks <ben-...@fluff.org>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: Ben Dooks <ben-...@fluff.org>
Date: Tue Aug 16 13:45:04 2005 -0700

[WATCHDOG] s3c2410 watchdog power management

Patch from Dimitry Andric <dimitry...@tomtom.com>, updated
by Ben Dooks <ben-...@fluff.org>. Patch is against 2.6.11-mm2

Add power management support to the s3c2410 watchdog, so that
it is shut-down over suspend, and re-initialised on resume.

Also add Dimitry to the list of authors.

Signed-off-by: Dimitry Andric <dimitry...@tomtom.com>
Signed-off-by: Ben Dooks <ben-...@fluff.org>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: James Chapman <jcha...@katalix.com>
Date: Tue Aug 16 13:38:15 2005 -0700

[WATCHDOG] mv64x60_wdt.patch

Add mv64x60 (Marvell Discovery) watchdog support.

Signed-off-by: James Chapman <jcha...@katalix.com>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: Olaf Hering <o...@suse.de>
Date: Tue Aug 16 13:23:31 2005 -0700

[WATCHDOG] correct sysfs name for watchdog devices

While looking for possible candidates for our udev.rules package,
I found a few odd ->name properties. /dev/watchdog has minor 130
according to devices.txt. Since all watchdog drivers use the
misc_register() call, they will end up in /sys/class/misc/$foo.
udev may create the /dev/watchdog node if the driver is loaded.
I dont have such a device, so I cant test it.
The drivers below provide names with spaces and even with / in it.
Not a big deal, but apps may expect /dev/watchdog.

Signed-off-by: Olaf Hering <o...@suse.de>
Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Author: Wim Van Sebroeck <w...@iguana.be>
Date: Tue Aug 16 13:08:25 2005 -0700

[WATCHDOG] Makefile-probe_order-patch

Re-arrange Makefile according to what we want to probe first.

Signed-off-by: Wim Van Sebroeck <w...@iguana.be>

Greetings,
Wim.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel"
in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Jiri Slaby

unread,
Aug 17, 2005, 6:31:36 PM8/17/05
to Wim Van Sebroeck, Andrew Morton, Linux Kernel Mailing List, David Hardeman, Naveen Gupta, P...@draigbrady.com, Ben Dooks, James Chapman, Olaf Hering
>Author: Jiri Slaby <xsl...@fi.muni.cz>
>Date: Tue Aug 16 14:35:42 2005 -0700
>
>[WATCHDOG] removes pci_find_device from i6300esb.c
>
>This patch changes
>pci_find_device to pci_get_device (encapsulated in for_each_pci_dev) in
>i6300esb watchdog card with appropriate adding pci_dev_put. Generated in
>2.6.13-rc5-mm1 kernel version.
This is bad. One pci_dev_put was misused (there was one case without putting
the device).
Thanks to Naveen Gupta.

Generated in 2.6.13-rc5-mm1 kernel version.

Signed-off-by: Jiri Slaby <xsl...@fi.muni.cz>

i6300esb.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c
--- a/drivers/char/watchdog/i6300esb.c
+++ b/drivers/char/watchdog/i6300esb.c
@@ -368,12 +368,11 @@ static unsigned char __init esb_getdevic
* Find the PCI device
*/

- while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ for_each_pci_dev(dev)
if (pci_match_id(esb_pci_tbl, dev)) {
esb_pci = dev;
break;
}
- }

if (esb_pci) {
if (pci_enable_device(esb_pci)) {
@@ -432,6 +431,7 @@ err_disable:
pci_disable_device(esb_pci);
}
out:
+ pci_dev_put(esb_pci);
return 0;
}

@@ -481,6 +481,7 @@ err_unmap:
pci_release_region(esb_pci, 0);
/* err_disable: */
pci_disable_device(esb_pci);
+ pci_dev_put(esb_pci);
/* out: */
return ret;
}
@@ -497,6 +498,7 @@ static void __exit watchdog_cleanup (voi
iounmap(BASEADDR);
pci_release_region(esb_pci, 0);
pci_disable_device(esb_pci);
+ pci_dev_put(esb_pci);
}

module_init(watchdog_init);

0 new messages