[10/10] Revert "powerpc/watchdog: Don't enable interrupt on PPC64 BookE"

This reverts commit 3978bdb4ed653342b0be66c031bf61b72cc55d60, now that
critical interrupts are properly supported on ppc64 booke.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
---
 drivers/watchdog/booke_wdt.c | 8 --------
 1 file changed, 8 deletions(-)

Hi Scott,

> This reverts commit 3978bdb4ed653342b0be66c031bf61b72cc55d60, now that
> critical interrupts are properly supported on ppc64 booke.
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> Cc: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
> Cc: Wim Van Sebroeck <wim@iguana.be>
> ---
>  drivers/watchdog/booke_wdt.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
> index f1b8d55..a8dbceb3 100644
> --- a/drivers/watchdog/booke_wdt.c
> +++ b/drivers/watchdog/booke_wdt.c
> @@ -138,14 +138,6 @@ static void __booke_wdt_enable(void *data)
>  	val &= ~WDTP_MASK;
>  	val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
>  
> -#ifdef CONFIG_PPC_BOOK3E_64
> -	/*
> -	 * Crit ints are currently broken on PPC64 Book-E, so
> -	 * just disable them for now.
> -	 */
> -	val &= ~TCR_WIE;
> -#endif
> -
>  	mtspr(SPRN_TCR, val);
>  }
>  

Patch has been added to linux-watchdog-next.

Kind regards,
Wim.

On Sat, 2014-03-15 at 20:51 +0100, Wim Van Sebroeck wrote:
> Hi Scott,
> 
> > This reverts commit 3978bdb4ed653342b0be66c031bf61b72cc55d60, now that
> > critical interrupts are properly supported on ppc64 booke.
> > 
> > Signed-off-by: Scott Wood <scottwood@freescale.com>
> > Cc: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
> > Cc: Wim Van Sebroeck <wim@iguana.be>
> > ---
> >  drivers/watchdog/booke_wdt.c | 8 --------
> >  1 file changed, 8 deletions(-)
> > 
> > diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
> > index f1b8d55..a8dbceb3 100644
> > --- a/drivers/watchdog/booke_wdt.c
> > +++ b/drivers/watchdog/booke_wdt.c
> > @@ -138,14 +138,6 @@ static void __booke_wdt_enable(void *data)
> >  	val &= ~WDTP_MASK;
> >  	val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
> >  
> > -#ifdef CONFIG_PPC_BOOK3E_64
> > -	/*
> > -	 * Crit ints are currently broken on PPC64 Book-E, so
> > -	 * just disable them for now.
> > -	 */
> > -	val &= ~TCR_WIE;
> > -#endif
> > -
> >  	mtspr(SPRN_TCR, val);
> >  }
> >  
> 
> Patch has been added to linux-watchdog-next.

Please unapply it.  It is patch 10/10 and depends on the previous parts
of the patchset to make critical interrupts work properly.

-Scott

Hi Scott,

> On Sat, 2014-03-15 at 20:51 +0100, Wim Van Sebroeck wrote:
> > Hi Scott,
> > 
> > > This reverts commit 3978bdb4ed653342b0be66c031bf61b72cc55d60, now that
> > > critical interrupts are properly supported on ppc64 booke.
> > > 
> > > Signed-off-by: Scott Wood <scottwood@freescale.com>
> > > Cc: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
> > > Cc: Wim Van Sebroeck <wim@iguana.be>
> > > ---
> > >  drivers/watchdog/booke_wdt.c | 8 --------
> > >  1 file changed, 8 deletions(-)
> > > 
> > > diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
> > > index f1b8d55..a8dbceb3 100644
> > > --- a/drivers/watchdog/booke_wdt.c
> > > +++ b/drivers/watchdog/booke_wdt.c
> > > @@ -138,14 +138,6 @@ static void __booke_wdt_enable(void *data)
> > >  	val &= ~WDTP_MASK;
> > >  	val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
> > >  
> > > -#ifdef CONFIG_PPC_BOOK3E_64
> > > -	/*
> > > -	 * Crit ints are currently broken on PPC64 Book-E, so
> > > -	 * just disable them for now.
> > > -	 */
> > > -	val &= ~TCR_WIE;
> > > -#endif
> > > -
> > >  	mtspr(SPRN_TCR, val);
> > >  }
> > >  
> > 
> > Patch has been added to linux-watchdog-next.
> 
> Please unapply it.  It is patch 10/10 and depends on the previous parts
> of the patchset to make critical interrupts work properly.

Unapplied.

Kind regards,
Wim.