[PATCH] omap: wd_timer: Fix crash frm wdt_probe when!CONFIG_RUNTIME_PM

[Russell King - ARM Linux]

On Thu, Jan 06, 2011 at 09:27:32AM +0530, Santosh Shilimkar wrote:
> > -----Original Message-----
> > From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
> > Sent: Thursday, January 06, 2011 3:49 AM
> > To: Santosh Shilimkar
> > Cc: linux-omap at vger.kernel.org; Paul Walmsley; linux-arm-
> > kernel at lists.infradead.org
> > Subject: Re: [PATCH] omap: wd_timer: Fix crash frm wdt_probe
> > when!CONFIG_RUNTIME_PM
> >
> > On Wed, Jan 05, 2011 at 07:10:55PM +0530, Santosh Shilimkar wrote:
> > > Commit ff2516fb 'wd_timer: disable on boot via hwmod postsetup
> > mechanism'
> > > introduced watchdog timer state state management using
> > postsetup_state.
> > > This was done to allow some board files to support watchdog
> > coverage
> > > throughout kernel initialization and it work as intended when
> > RUNTIME_PM
> > > is enabled.
> > >
> > > With !CONFIG_RUNTIME_PM and no board is specifically requests
> > watchdog
> > > to remain enabled the omap_wdt_probe crashesh. This is because
> > hwmod
> > > in absense of runtime PM unable to turn watchdog clocks because
> > it's
> > > state is set to be disabled. For rest of the device, the state is
> > > set as enabled in absense of RUNTIME_PM
> >
> > Err... wasn't this provoked by an attempt to fix the LDP issue, that
> > is
> > (I believe) because the boot loader enables the watchdog and pre-
> > hwmod
> > kernels used to disable it.  Post-hwmod kernels stopped disabling
> > the
> > watchdog, resulting in a few seconds booting userspace before the
> > system
> > resets itself.
> 
> Yes. That's managed through the shutdown part. Apart from that there
> is another enhancement done in case some one wants to have WDT running
> throughout the kernel boot.

Good - and just to confirm, the fix for LDP watchdogging will be submitted
in the current merge window?