Re: [PATCH] add reg and stack dump to booke WD handler

[Sergei Shtylyov <sshtylyov@ru.mvista.com>]

Dave Jiang wrote:
> Have the booke watchdog dump some useful information when triggered. Hopefully
> that'll give the user some hint of what happened rather than just a mysterious
> reboot. 

   Why not do this in drivers/watchdog/booke_wdt.c -- WatchdogHandler() is a weak symbol?
 
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index f786222..1af83b7 100644
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -1108,9 +1108,42 @@ void unrecoverable_exception(struct pt_regs *regs)
>   */
>  void __attribute__ ((weak)) WatchdogHandler(struct pt_regs *regs)
>  {
> +	unsigned long flags;
> +
>  	/* Generic WatchdogHandler, implement your own */
>  	mtspr(SPRN_TCR, mfspr(SPRN_TCR)&(~TCR_WIE));
> -	return;
> +	oops_enter();
> +
> +	console_verbose();
> +	bust_spinlocks(1);
> +	local_save_flags(flags);
> +
> +	printk(KERN_ERR "PowerPC Book-E Watchdog detected LOCKUP\n");
> +	printk(KERN_ERR "Watchdog exception at PC=%lx MSR=%lx\n",

   This partly duplicates printk() in WatchdogException().

> +			regs->nip, regs->msr);

  These regs are later dumped by show_regs() anyway.

> +#ifdef CONFIG_PREEMPT
> +	printk(KERN_ERR "PREEMPT ");

   Does specifying loglevel on non '\n' terminated lines really make sense?  I suspect all what you'll get will be ugly output with <3> insterted here and there.

> +#endif
> +#ifdef CONFIG_SMP
> +	printk(KERN_ERR "SMP NR_CPUS=%d ", NR_CPUS);
> +#endif
> +#ifdef CONFIG_DEBUG_PAGEALLOC
> +	printk(KERN_ERR "DEBUG_PAGEALLOC ");
> +#endif
> +#ifdef CONFIG_NUMA
> +	printk(KERN_ERR "NUMA ");
> +#endif
> +	printk(KERN_ERR "%s\n", ppc_md.name ? ppc_md.name : "");
> +
> +	print_modules();
> +	show_regs(regs);
> +
> +	bust_spinlocks(0);
> +
> +	printk(KERN_ERR "Wating for hardware watchdog reset...\n");

   A typo here.

> +	/* spin until hardware reset */
> +	while(1)
> +		cpu_relax();

   Not even giving it a chance? That's cruel. :-)
   Seriously, this seems too specific watchdog behavior to be here.

WBR, Sergei