[PATCH] xen: arm: enable sync console in machine_reboot.

[PATCH] xen: arm: enable sync console in machine_reboot.

[Ian Campbell]

Otherwise the last thing printed is "(XE" or something.

In line with x86 also disable the watchdog and spin debugging.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen/arch/arm/shutdown.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c
index 4988b03..e53ec97 100644
--- a/xen/arch/arm/shutdown.c
+++ b/xen/arch/arm/shutdown.c
@@ -38,6 +38,10 @@ void machine_restart(unsigned int delay_millisecs)
 {
     int timeout = 10;
 
+    watchdog_disable();
+    console_start_sync();
+    spin_debug_disable();
+
     local_irq_enable();
     smp_call_function(halt_this_cpu, NULL, 0);
     local_irq_disable();
-- 
1.7.10.4

Re: [PATCH] xen: arm: enable sync console in machine_reboot.

[Julien Grall]

Hi Ian,

On 15/01/15 11:22, Ian Campbell wrote:
> Otherwise the last thing printed is "(XE" or something.
> 
> In line with x86 also disable the watchdog and spin debugging.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Reviewed-by: Julien Grall <julien.grall@linaro.org>

> ---
>  xen/arch/arm/shutdown.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c
> index 4988b03..e53ec97 100644
> --- a/xen/arch/arm/shutdown.c
> +++ b/xen/arch/arm/shutdown.c
> @@ -38,6 +38,10 @@ void machine_restart(unsigned int delay_millisecs)
>  {
>      int timeout = 10;
>  
> +    watchdog_disable();

OOI, it looks like watchdog_disable is a no-op on ARM. Is there any plan
to implement it?

Regards,

-- 
Julien Grall

Re: [PATCH] xen: arm: enable sync console in machine_reboot.

[Ian Campbell]

On Thu, 2015-01-15 at 12:57 +0000, Julien Grall wrote:
> Hi Ian,
> 
> On 15/01/15 11:22, Ian Campbell wrote:
> > Otherwise the last thing printed is "(XE" or something.
> > 
> > In line with x86 also disable the watchdog and spin debugging.
> > 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Reviewed-by: Julien Grall <julien.grall@linaro.org>
> 
> > ---
> >  xen/arch/arm/shutdown.c |    4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c
> > index 4988b03..e53ec97 100644
> > --- a/xen/arch/arm/shutdown.c
> > +++ b/xen/arch/arm/shutdown.c
> > @@ -38,6 +38,10 @@ void machine_restart(unsigned int delay_millisecs)
> >  {
> >      int timeout = 10;
> >  
> > +    watchdog_disable();
> 
> OOI, it looks like watchdog_disable is a no-op on ARM. Is there any plan
> to implement it?

Not by me, would be nice to have though.

> 
> Regards,
> 

Re: [PATCH] xen: arm: enable sync console in machine_reboot.

[Ian Campbell]

On Thu, 2015-01-15 at 12:57 +0000, Julien Grall wrote:
> Hi Ian,
> 
> On 15/01/15 11:22, Ian Campbell wrote:
> > Otherwise the last thing printed is "(XE" or something.
> > 
> > In line with x86 also disable the watchdog and spin debugging.
> > 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Reviewed-by: Julien Grall <julien.grall@linaro.org>

Applied.