Home » Mailing list archives » linux-kernel » 2008 » June » 2

[PATCH 1/8] [WATCHDOG] mpc83xx_wdt: fix checkpatch issues

Previous thread: re: [LTP] [ANNOUNCE] The Linux Test Project has been Released for MAY 2008 by Guillaume FORTAINE on Monday, June 2, 2008 - 10:16 am. (1 message)

Next thread: ck804rom: fix driver_data in probe table by Thomas Meyer on Monday, June 2, 2008 - 1:54 pm. (1 message)
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Monday, June 2, 2008 - 1:37 pm

Hi all,


No comments on the previous version for two weeks... resending once

again.


Changes since v3:


- None. Simply resending, plus adding Andrew Morton and linux-kernel

  to Cc, since I'm constantly getting bounces from Wim Van Sebroeck's

  email:


  - - - -

  <wim@iguana.be>:

  213.249.96.99 does not like recipient.

  Remote host said: 450 Client host rejected: cannot find your hostname, [85.21.88.2]

  Giving up on 213.249.96.99.

  I'm not going to try again; this message has been in the queue too long.

  - - - -


  Not sure whose fault is it though.


  Andrew, if Wim will not get this series and there will no objections,

  could you please pick [WATCHDOG] ones?


Changes since v2:


- New patch to fix current driver's checkpatch issues;

- New patch supporting MPC8xx watchdogs;

- Removed MODULE_ALIAS("platform:mpc83xx_wdt"), since this driver is no

  longer on the platform bus;

- When renaming the driver also mention what kind of CPUs we support.

  Also give a pointer for BookE watchdog driver. Though BookE users will

  not see the MPC8xxx driver at all, because we're explicitly listing the

  CPU families in "depends on". But this tip might be useful for

  developers.

- Scott Wood noticed that we don't need device_type anymore. I thought

  that OpenFirmware defines this type, but google didn't prove that.

  So I just removed the device_type.


Changes since v1:


- Scott Wood asked for mpc83xx_wdt on multiplatform kernels. Done via

  OF platform driver;

- Kumar Gala asked for mpc83xx_wdt -> mpc8xxx_wdt rename. Done in two

  steps;

- Segher Boessenkool noticed a negligence in the wdt device tree node.

  Fixed by removing mpc83xx_wdt compatible entry.


--

Anton Vorontsov

email: cbouatmailru@gmail.com

irc://irc.freenode.net/bd2

--
[view original message]
From: Andrew Morton <akpm@...>
To: <avorontsov@...>
Cc: <galak@...>, <wim@...>, <jochen@...>, <sfr@...>, <segher@...>, <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: Re: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Tuesday, June 3, 2008 - 7:48 pm

On Mon, 2 Jun 2008 21:37:26 +0400


I did all the rework to make the patches apply on top of all the

pending watchdog work in Wim's tree and in -mm.  I haven't build tested

it yet.


I'll assume that


 [PATCH 7/8] [POWERPC] fsl_soc: remove mpc83xx_wdt code


and


 [PATCH 8/8] [POWERPC] 86xx: mpc8610_hpcd: add watchdog node


are dependent upon the preceding six patches.  This might be wrong.


Please put the subsystem identifier (eg, "watchdog" and "powerpc")

outside the [], for reasons which should be in

Documentation/SubmittingPatches, which used to be there but which got

lost.  Bascially the text inside [] is for temporary not-for-committing

information such as "rfc", "2.6.24-rc4", "resend", etc and should be stripped

by the email recipient before merging.


--
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Andrew Morton <akpm@...>
Cc: <galak@...>, <wim@...>, <jochen@...>, <sfr@...>, <segher@...>, <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH -mm] watchdog: mpc8xxx_wdt: fix build
Date: Saturday, June 7, 2008 - 1:57 pm

CC      drivers/watchdog/mpc8xxx_wdt.o

drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_ioctl':

drivers/watchdog/mpc8xxx_wdt.c:156: error: 'cmd' undeclared (first use in this function)

drivers/watchdog/mpc8xxx_wdt.c:156: error: (Each undeclared identifier is reported only once

drivers/watchdog/mpc8xxx_wdt.c:156: error: for each function it appears in.)

drivers/watchdog/mpc8xxx_wdt.c: At top level:

drivers/watchdog/mpc8xxx_wdt.c:176: warning: initialization from incompatible pointer type


This patch ought to be folded into

mpc8xxx_wdt-various-renames-mostly-s-mpc83xx-mpc8xxx-g.patch


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

---


Well, only one hunk is mis-merged, in

mpc8xxx_wdt-various-renames-mostly-s-mpc83xx-mpc8xxx-g.patch.


Here is the patch to fix it.


I also run-time tested it, everything seem to work great.


p.s. Would be very handy if linux-trees.git would track mmotm snapshots.


 drivers/watchdog/mpc8xxx_wdt.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c

index 8b82b91..3c5ed9e 100644

--- a/drivers/watchdog/mpc8xxx_wdt.c

+++ b/drivers/watchdog/mpc8xxx_wdt.c

@@ -142,7 +142,7 @@ static int mpc8xxx_wdt_release(struct inode *inode, struct file *file)

 	return 0;

 }


-static long mpc8xxx_wdt_ioctl(struct inode *inode, struct file *file,

+static long mpc8xxx_wdt_ioctl(struct file *file, unsigned int cmd,

 							unsigned long arg)

 {

 	void __user *argp = (void __user *)arg;

--

1.5.5.1


--
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Andrew Morton <akpm@...>
Cc: <galak@...>, <wim@...>, <jochen@...>, <sfr@...>, <segher@...>, <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: Re: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Tuesday, June 3, 2008 - 8:17 pm

Yeah, I know. It is just hard to remember all the preferences.


For example, PowerPC maintainers asking to do patches with "[POWERPC]"

identifier, this identifier purposely keeps intact for git-log.


--

Anton Vorontsov

email: cbouatmailru@gmail.com

irc://irc.freenode.net/bd2

--
[view original message]
From: Andrew Morton <akpm@...>
To: <avorontsov@...>
Cc: <galak@...>, <wim@...>, <jochen@...>, <sfr@...>, <segher@...>, <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: Re: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Tuesday, June 3, 2008 - 8:32 pm

On Wed, 4 Jun 2008 04:17:39 +0400


Addition of "[powerpc]" if it was absent can be scripted.


However, the retaining of "[powerpc]" (etc) while not retaining "[rfc]"

(etc) is not practical.


Plus putting things into git with "[powerpc]" in the title is wrong.

The chances are good that anyone who is taking such a patch off the

git-commits list (say, for a backport) will lose that part of the

title.  It should be "powerpc: "


(http://userweb.kernel.org/~akpm/dh.gif)

--
[view original message]
From: Paul Mackerras <paulus@...>
To: Andrew Morton <akpm@...>
Cc: <avorontsov@...>, <sfr@...>, <linux-kernel@...>, <linuxppc-dev@...>, <wim@...>, <scottwood@...>
Subject: Re: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Wednesday, June 4, 2008 - 12:07 am

I think Anton is confusing two things: (a) what should be in the

subject line of a patch posted to a mailing list, and (b) what should

be in the headline of a commit put into a git tree that I pull from.

As for (a), people can put whatever they like in [], and if people put

"powerpc:" in the subject, I edit it out since my scripts put

[POWERPC] in the git commit headline.  For (b), I ask git tree

maintainers that I'm going to pull from to put [POWERPC] at the start

of the headline for consistency with what I do.


Looking at Linus' git tree, it's evident that some subsystems use the

the "[SUBSYSTEM]" notation and some use "subsystem:".  If there is now

an edict from on high that only "subsystem:" is acceptable, then I

must have missed that memo.


Paul.

--
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Paul Mackerras <paulus@...>
Cc: Andrew Morton <akpm@...>, <sfr@...>, <linux-kernel@...>, <linuxppc-dev@...>, <wim@...>, <scottwood@...>
Subject: Re: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Wednesday, June 4, 2008 - 8:27 am

I found original email.. yes, you indeed ask for [POWERPC] in git

trees.


But. I believe anyone who send patches, tries to mimic existing practice,

and thus please the maintainer. Personally, I'm doing git log subsystem/

and looking for the preferred format for the commit message. And I'm not

alone: linuxppc-dev is full of [POWERPC] in the patch subjects, despite

the fact that you didn't explicitly ask for it.


Asking to send patches with "subsystem: " and then seeing them as

"[SUBSYSTEM] " in git-log is more confusing. Since new authors will

personalize this thinking: "Oh, maintainer fixed my negligence.

Next time I should send a patch with [SUBSYSTEM]".


--

Anton Vorontsov

email: cbouatmailru@gmail.com

irc://irc.freenode.net/bd2

--
[view original message]
From: Andrew Morton <akpm@...>
To: Paul Mackerras <paulus@...>
Cc: <avorontsov@...>, <sfr@...>, <linux-kernel@...>, <linuxppc-dev@...>, <wim@...>, <scottwood@...>
Subject: Re: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Wednesday, June 4, 2008 - 12:15 am

I'm all edicted out.  Sometimes one just puts forth the reasoning and

lets others decide whether it's worth bothering about.  I could understand

that decision being "no" :)

--
[view original message]
From: Randy Dunlap <rdunlap@...>
To: Andrew Morton <akpm@...>
Cc: Paul Mackerras <paulus@...>, <avorontsov@...>, <sfr@...>, <linux-kernel@...>, <linuxppc-dev@...>, <wim@...>, <scottwood@...>
Subject: Re: [PATCH 0/8 v4] mpc83xx_wdt rework, support for mpc8610 and mpc8xx
Date: Wednesday, June 4, 2008 - 1:31 pm

Well, it would be a Good Thing if all subsystem/arch maintainers would do it

in the same format, whatever that format is.


---

~Randy

<quote:>

"It's the Government of the United States." ... The largest, and yet

the least efficient, producer of computer software in the world.

--
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 8/8] [POWERPC] 86xx: mpc8610_hpcd: add watchdog node
Date: Monday, June 2, 2008 - 1:38 pm

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

---

 arch/powerpc/boot/dts/mpc8610_hpcd.dts |    5 +++++

 1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts

index fa9c297..bb0395b 100644

--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts

+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts

@@ -204,6 +204,11 @@

 			fsl,has-rstcr;

 		};


+		wdt@e4000 {

+			compatible = "fsl,mpc8610-wdt";

+			reg = <0xe4000 0x100>;

+		};

+

 		i2s@16000 {

 			compatible = "fsl,mpc8610-ssi";

 			cell-index = <0>;

--

1.5.5.1

--
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 7/8] [POWERPC] fsl_soc: remove mpc83xx_wdt code
Date: Monday, June 2, 2008 - 1:38 pm

mpc83xx_wdt is the OF driver now, so we don't need fsl_soc constructor.


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

---

 arch/powerpc/sysdev/fsl_soc.c |   46 -----------------------------------------

 1 files changed, 0 insertions(+), 46 deletions(-)


diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c

index a5ceeef..32a3ac8 100644

--- a/arch/powerpc/sysdev/fsl_soc.c

+++ b/arch/powerpc/sysdev/fsl_soc.c

@@ -545,52 +545,6 @@ err:

 arch_initcall(fsl_i2c_of_init);

 #endif


-#ifdef CONFIG_PPC_83xx

-static int __init mpc83xx_wdt_init(void)

-{

-	struct resource r;

-	struct device_node *np;

-	struct platform_device *dev;

-	u32 freq = fsl_get_sys_freq();

-	int ret;

-

-	np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");

-

-	if (!np) {

-		ret = -ENODEV;

-		goto nodev;

-	}

-

-	memset(&r, 0, sizeof(r));

-

-	ret = of_address_to_resource(np, 0, &r);

-	if (ret)

-		goto err;

-

-	dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1);

-	if (IS_ERR(dev)) {

-		ret = PTR_ERR(dev);

-		goto err;

-	}

-

-	ret = platform_device_add_data(dev, &freq, sizeof(freq));

-	if (ret)

-		goto unreg;

-

-	of_node_put(np);

-	return 0;

-

-unreg:

-	platform_device_unregister(dev);

-err:

-	of_node_put(np);

-nodev:

-	return ret;

-}

-

-arch_initcall(mpc83xx_wdt_init);

-#endif

-

 static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)

 {

 	if (!phy_type)

--

1.5.5.1


--
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 6/8] [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs
Date: Monday, June 2, 2008 - 1:38 pm

The mpc8xxx_wdt driver is using two registers: SWSRR to push magic

numbers, and SWCRR to control the watchdog. Both registers are available

on the MPC8xx, and seem to have the same offsets and semantics as in

MPC83xx/MPC86xx watchdogs. The only difference is prescale value. So this

driver simply works on the MPC8xx CPUs.


One quirk is needed for the MPC8xx, though. It has small prescale value

and slow CPU, so the watchdog resets board prior to the driver has time

to load. To solve this we should split initialization in two steps: start

ping the watchdog early, and register the watchdog userspace interface

later.


MPC823 seem to be the first CPU in MPC8xx line, so we use fsl,mpc823-wdt

compatible matching.


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

Tested-by: Jochen Friedrich <jochen@scram.de>

---

 drivers/watchdog/Kconfig       |    3 +-

 drivers/watchdog/mpc8xxx_wdt.c |   44 ++++++++++++++++++++++++++++++----------

 2 files changed, 35 insertions(+), 12 deletions(-)


diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig

index 008eaa6..f9e617b 100644

--- a/drivers/watchdog/Kconfig

+++ b/drivers/watchdog/Kconfig

@@ -684,10 +684,11 @@ config 8xx_WDT


 config 8xxx_WDT

 	tristate "MPC8xxx Platform Watchdog Timer"

-	depends on PPC_83xx || PPC_86xx

+	depends on PPC_8xx || PPC_83xx || PPC_86xx

 	help

 	  This driver is for a SoC level watchdog that exists on some

 	  Freescale PowerPC processors. So far this driver supports:

+	  - MPC8xx watchdogs

 	  - MPC83xx watchdogs

 	  - MPC86xx watchdogs


diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c

index 2f0681f..0f7e165 100644

--- a/drivers/watchdog/mpc8xxx_wdt.c

+++ b/drivers/watchdog/mpc8xxx_wdt.c

@@ -1,5 +1,5 @@

 /*

- * mpc8xxx_wdt.c - MPC83xx/MPC86xx watchdog userspace interface

+ * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface

  *

  * Authors: Dave Updegraff <dave@cray.org>

  * 	    Kumar Gala <galak@kernel.crashing.org&gt...
[ message continues ]
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 5/8] [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g
Date: Monday, June 2, 2008 - 1:38 pm

mpc83xx_wdt.c renamed to mpc8xxx_wdt.c, now we can do various renames

in the file itself.


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

---

 drivers/watchdog/mpc8xxx_wdt.c |  104 ++++++++++++++++++++--------------------

 1 files changed, 52 insertions(+), 52 deletions(-)


diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c

index 19e3082..2f0681f 100644

--- a/drivers/watchdog/mpc8xxx_wdt.c

+++ b/drivers/watchdog/mpc8xxx_wdt.c

@@ -1,5 +1,5 @@

 /*

- * mpc83xx_wdt.c - MPC83xx/MPC86xx watchdog userspace interface

+ * mpc8xxx_wdt.c - MPC83xx/MPC86xx watchdog userspace interface

  *

  * Authors: Dave Updegraff <dave@cray.org>

  * 	    Kumar Gala <galak@kernel.crashing.org>

@@ -29,7 +29,7 @@

 #include <linux/uaccess.h>

 #include <sysdev/fsl_soc.h>


-struct mpc83xx_wdt {

+struct mpc8xxx_wdt {

 	__be32 res0;

 	__be32 swcrr; /* System watchdog control register */

 #define SWCRR_SWTC 0xFFFF0000 /* Software Watchdog Time Count. */

@@ -42,12 +42,12 @@ struct mpc83xx_wdt {

 	u8 res2[0xF0];

 };


-struct mpc83xx_wdt_type {

+struct mpc8xxx_wdt_type {

 	int prescaler;

 	bool hw_enabled;

 };


-static struct mpc83xx_wdt __iomem *wd_base;

+static struct mpc8xxx_wdt __iomem *wd_base;


 static u16 timeout = 0xffff;

 module_param(timeout, ushort, 0);

@@ -74,7 +74,7 @@ static unsigned int timeout_sec;

 static unsigned long wdt_is_open;

 static DEFINE_SPINLOCK(wdt_spinlock);


-static void mpc83xx_wdt_keepalive(void)

+static void mpc8xxx_wdt_keepalive(void)

 {

 	/* Ping the WDT */

 	spin_lock(&wdt_spinlock);

@@ -83,31 +83,31 @@ static void mpc83xx_wdt_keepalive(void)

 	spin_unlock(&wdt_spinlock);

 }


-static void mpc83xx_wdt_timer_ping(unsigned long arg);

-static DEFINE_TIMER(wdt_timer, mpc83xx_wdt_timer_ping, 0, 0);

+static void mpc8xxx_wdt_timer_ping(unsigned long arg);

+static DEFINE_TIMER(wdt_timer, mpc8xxx_wdt_timer_ping, 0, 0);


-static void mpc83xx_wdt_timer_ping(unsigned long arg)

+static v...
[ message continues ]
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 4/8] [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt
Date: Monday, June 2, 2008 - 1:38 pm

Rename the driver because now we support some MPC86xx processors.


There are no changes to the mpc83xx_wdt.c file, yet. When possible, we do

file renames and changes separately (because Linus once asked so, because

it helps git to track the renamed files).


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

---

 drivers/watchdog/Kconfig       |   11 ++-

 drivers/watchdog/Makefile      |    2 +-

 drivers/watchdog/mpc83xx_wdt.c |  294 ----------------------------------------

 drivers/watchdog/mpc8xxx_wdt.c |  294 ++++++++++++++++++++++++++++++++++++++++

 4 files changed, 304 insertions(+), 297 deletions(-)

 delete mode 100644 drivers/watchdog/mpc83xx_wdt.c

 create mode 100644 drivers/watchdog/mpc8xxx_wdt.c


diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig

index 2929055..008eaa6 100644

--- a/drivers/watchdog/Kconfig

+++ b/drivers/watchdog/Kconfig

@@ -682,9 +682,16 @@ config 8xx_WDT

 	tristate "MPC8xx Watchdog Timer"

 	depends on 8xx


-config 83xx_WDT

-	tristate "MPC83xx/MPC86xx Watchdog Timer"

+config 8xxx_WDT

+	tristate "MPC8xxx Platform Watchdog Timer"

 	depends on PPC_83xx || PPC_86xx

+	help

+	  This driver is for a SoC level watchdog that exists on some

+	  Freescale PowerPC processors. So far this driver supports:

+	  - MPC83xx watchdogs

+	  - MPC86xx watchdogs

+

+	  For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.


 config MV64X60_WDT

 	tristate "MV64X60 (Marvell Discovery) Watchdog Timer"

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile

index f3fb170..d5782f9 100644

--- a/drivers/watchdog/Makefile

+++ b/drivers/watchdog/Makefile

@@ -102,7 +102,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o

 # POWERPC Architecture

 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o

 obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o

-obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o

+obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o

 obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o

 obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o


diff --git a/drivers/watchdog/mpc83xx_wdt...
[ message continues ]
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 3/8] [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs
Date: Monday, June 2, 2008 - 1:38 pm

On MPC86xx the watchdog could be enabled only at power-on-reset, and

could not be disabled afterwards. We must ping the watchdog from the

kernel until the userspace handles it.


MPC83xx CPUs are only differ in a way that watchdog could be disabled

once, but after it was enabled via software it becomes just the same

as MPC86xx.


Thus, to support MPC86xx I added the kernel timer which pings the

watchdog until the userspace opens it.


Since we implemented the timer, now we're able to implement proper

handling for the CONFIG_WATCHDOG_NOWAYOUT case, for MPC83xx and MPC86xx.


Also move the probe code into subsys_initcall, because we want start

pinging the watchdog ASAP, and misc devices are available in

subsys_initcall.


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

---

 drivers/watchdog/Kconfig       |    4 +-

 drivers/watchdog/mpc83xx_wdt.c |   80 ++++++++++++++++++++++++++++++++++++----

 2 files changed, 74 insertions(+), 10 deletions(-)


diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig

index 254d115..2929055 100644

--- a/drivers/watchdog/Kconfig

+++ b/drivers/watchdog/Kconfig

@@ -683,8 +683,8 @@ config 8xx_WDT

 	depends on 8xx


 config 83xx_WDT

-	tristate "MPC83xx Watchdog Timer"

-	depends on PPC_83xx

+	tristate "MPC83xx/MPC86xx Watchdog Timer"

+	depends on PPC_83xx || PPC_86xx


 config MV64X60_WDT

 	tristate "MV64X60 (Marvell Discovery) Watchdog Timer"

diff --git a/drivers/watchdog/mpc83xx_wdt.c b/drivers/watchdog/mpc83xx_wdt.c

index 127d85e..19e3082 100644

--- a/drivers/watchdog/mpc83xx_wdt.c

+++ b/drivers/watchdog/mpc83xx_wdt.c

@@ -1,10 +1,12 @@

 /*

- * mpc83xx_wdt.c - MPC83xx watchdog userspace interface

+ * mpc83xx_wdt.c - MPC83xx/MPC86xx watchdog userspace interface

  *

  * Authors: Dave Updegraff <dave@cray.org>

  * 	    Kumar Gala <galak@kernel.crashing.org>

  * 		Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org>

  * 				..and from sc520_wdt

+ * Copyright (c) 2008  MontaVista Software, Inc....
[ message continues ]
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 2/8] [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver
Date: Monday, June 2, 2008 - 1:38 pm

This patch simply converts mpc83xx_wdt to the OF platform driver so we

can directly work with the device tree without passing various stuff

through platform data.


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>

---

 drivers/watchdog/mpc83xx_wdt.c |   62 +++++++++++++++++++--------------------

 1 files changed, 30 insertions(+), 32 deletions(-)


diff --git a/drivers/watchdog/mpc83xx_wdt.c b/drivers/watchdog/mpc83xx_wdt.c

index 6905712..127d85e 100644

--- a/drivers/watchdog/mpc83xx_wdt.c

+++ b/drivers/watchdog/mpc83xx_wdt.c

@@ -19,11 +19,12 @@

 #include <linux/init.h>

 #include <linux/kernel.h>

 #include <linux/miscdevice.h>

-#include <linux/platform_device.h>

+#include <linux/of_platform.h>

 #include <linux/module.h>

 #include <linux/watchdog.h>

 #include <linux/io.h>

 #include <linux/uaccess.h>

+#include <sysdev/fsl_soc.h>


 struct mpc83xx_wdt {

 	__be32 res0;

@@ -149,53 +150,42 @@ static struct miscdevice mpc83xx_wdt_miscdev = {

 	.fops	= &mpc83xx_wdt_fops,

 };


-static int __devinit mpc83xx_wdt_probe(struct platform_device *dev)

+static int __devinit mpc83xx_wdt_probe(struct of_device *ofdev,

+				       const struct of_device_id *match)

 {

-	struct resource *r;

 	int ret;

-	unsigned int *freq = dev->dev.platform_data;

+	u32 freq = fsl_get_sys_freq();


-	/* get a pointer to the register memory */

-	r = platform_get_resource(dev, IORESOURCE_MEM, 0);

+	if (!freq || freq == -1)

+		return -EINVAL;


-	if (!r) {

-		ret = -ENODEV;

-		goto err_out;

-	}

-

-	wd_base = ioremap(r->start, sizeof(struct mpc83xx_wdt));

-

-	if (wd_base == NULL) {

-		ret = -ENOMEM;

-		goto err_out;

-	}

+	wd_base = of_iomap(ofdev->node, 0);

+	if (!wd_base)

+		return -ENOMEM;


 	ret = misc_register(&mpc83xx_wdt_miscdev);

 	if (ret) {

-		printk(KERN_ERR "cannot register miscdev on minor=%d "

-				"(err=%d)\n",

-				WATCHDOG_MINOR, ...
[ message continues ]
[view original message]
From: Anton Vorontsov <avorontsov@...>
To: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>
Cc: Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: [PATCH 1/8] [WATCHDOG] mpc83xx_wdt: fix checkpatch issues
Date: Monday, June 2, 2008 - 1:38 pm

Quite tired of these warnings ;-), checkpatch spitting them when

seeing the rename patch.


WARNING: Use #include <linux/io.h> instead of <asm/io.h>

#25: FILE: watchdog/mpc83xx_wdt.c:25:

+#include <asm/io.h>


WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>

#26: FILE: watchdog/mpc83xx_wdt.c:26:

+#include <asm/uaccess.h>


WARNING: line over 80 characters

#45: FILE: watchdog/mpc83xx_wdt.c:45:

+MODULE_PARM_DESC(timeout, "Watchdog timeout in ticks. (0<timeout<65536, default=65535");


WARNING: line over 80 characters

#49: FILE: watchdog/mpc83xx_wdt.c:49:

+MODULE_PARM_DESC(reset, "Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset");


WARNING: space prohibited between function name and open parenthesis '('

#164: FILE: watchdog/mpc83xx_wdt.c:164:

+       wd_base = ioremap(r->start, sizeof (struct mpc83xx_wdt));


total: 0 errors, 5 warnings, 230 lines checked


Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

---

 drivers/watchdog/mpc83xx_wdt.c |   12 +++++++-----

 1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/drivers/watchdog/mpc83xx_wdt.c b/drivers/watchdog/mpc83xx_wdt.c

index b16c5cd..6905712 100644

--- a/drivers/watchdog/mpc83xx_wdt.c

+++ b/drivers/watchdog/mpc83xx_wdt.c

@@ -22,8 +22,8 @@

 #include <linux/platform_device.h>

 #include <linux/module.h>

 #include <linux/watchdog.h>

-#include <asm/io.h>

-#include <asm/uaccess.h>

+#include <linux/io.h>

+#include <linux/uaccess.h>


 struct mpc83xx_wdt {

 	__be32 res0;

@@ -42,11 +42,13 @@ static struct mpc83xx_wdt __iomem *wd_base;


 static u16 timeout = 0xffff;

 module_param(timeout, ushort, 0);

-MODULE_PARM_DESC(timeout, "Watchdog timeout in ticks. (0<timeout<65536, default=65535");

+MODULE_PARM_DESC(timeout, "Watchdog timeout in ticks. "

+		 "(0<timeout<65536, default=65535");


 static int reset = 1;

 module_param(reset, bool, 0);

-MODULE_PARM_DESC(reset, "Watchdog...
[ message continues ]
[view original message]
From: Alan Cox <alan@...>
To: Anton Vorontsov <avorontsov@...>
Cc: Kumar Gala <galak@...>, Wim Van Sebroeck <wim@...>, Andrew Morton <akpm@...>, Jochen Friedrich <jochen@...>, Stephen Rothwell <sfr@...>, Segher Boessenkool <segher@...>, Scott Wood <scottwood@...>, <linuxppc-dev@...>, <linux-kernel@...>
Subject: Re: [PATCH 1/8] [WATCHDOG] mpc83xx_wdt: fix checkpatch issues
Date: Monday, June 2, 2008 - 3:43 pm

On Mon, 2 Jun 2008 21:38:36 +0400


I've already sent the maintainer a complete overhaul of watchdog via

checkpatch.


Alan

--
[view original message]
From: Anton Vorontsov <cbouatmailru@...>
To: Alan Cox <alan@...>
Cc: Anton Vorontsov <avorontsov@...>, Stephen Rothwell <sfr@...>, <linux-kernel@...>, <linuxppc-dev@...>, Wim Van Sebroeck <wim@...>, Scott Wood <scottwood@...>, Andrew Morton <akpm@...>, <Jochen@...>
Subject: Re: [PATCH 1/8] [WATCHDOG] mpc83xx_wdt: fix checkpatch issues
Date: Monday, June 2, 2008 - 4:49 pm

Oh, I see it now, thanks. I've just read Wim's comments there, and I

think I'll have to wait for git-watchdog update and then will rebase my

work on top.


Thanks,


--

Anton Vorontsov

email: cbouatmailru@gmail.com

irc://irc.freenode.net/bd2

--
Previous thread: re: [LTP] [ANNOUNCE] The Linux Test Project has been Released for MAY 2008 by Guillaume FORTAINE on Monday, June 2, 2008 - 10:16 am. (1 message)

Next thread: ck804rom: fix driver_data in probe table by Thomas Meyer on Monday, June 2, 2008 - 1:54 pm. (1 message)