Message ID | 20140324.125358.1420654948419843545.davem@davemloft.net |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
On Monday 2014-03-24 17:53, David Miller wrote: >diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c >index 32a280e..d7b4967 100644 >--- a/arch/sparc/kernel/process_64.c >+++ b/arch/sparc/kernel/process_64.c >@@ -58,9 +58,12 @@ void arch_cpu_idle(void) > { > if (tlb_type != hypervisor) { > touch_nmi_watchdog(); >+ local_irq_enable(); > } else { > unsigned long pstate; > >+ local_irq_enable(); >+ > /* The sun4v sleeping code requires that we have PSTATE.IE cleared over > * the cpu sleep hypervisor call. > */ >@@ -82,7 +85,6 @@ void arch_cpu_idle(void) > : "=&r" (pstate) > : "i" (PSTATE_IE)); > } >- local_irq_enable(); > } > > #ifdef CONFIG_HOTPLUG_CPU With this patch, the boot succeeds. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jan Engelhardt <jengelh@inai.de> Date: Mon, 24 Mar 2014 19:19:44 +0100 (CET) > > On Monday 2014-03-24 17:53, David Miller wrote: >>diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c >>index 32a280e..d7b4967 100644 >>--- a/arch/sparc/kernel/process_64.c >>+++ b/arch/sparc/kernel/process_64.c >>@@ -58,9 +58,12 @@ void arch_cpu_idle(void) >> { >> if (tlb_type != hypervisor) { >> touch_nmi_watchdog(); >>+ local_irq_enable(); >> } else { >> unsigned long pstate; >> >>+ local_irq_enable(); >>+ >> /* The sun4v sleeping code requires that we have PSTATE.IE cleared over >> * the cpu sleep hypervisor call. >> */ >>@@ -82,7 +85,6 @@ void arch_cpu_idle(void) >> : "=&r" (pstate) >> : "i" (PSTATE_IE)); >> } >>- local_irq_enable(); >> } >> >> #ifdef CONFIG_HOTPLUG_CPU > > With this patch, the boot succeeds. Thanks for testing, I'll get this merged upstream and to -stable. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index 32a280e..d7b4967 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c @@ -58,9 +58,12 @@ void arch_cpu_idle(void) { if (tlb_type != hypervisor) { touch_nmi_watchdog(); + local_irq_enable(); } else { unsigned long pstate; + local_irq_enable(); + /* The sun4v sleeping code requires that we have PSTATE.IE cleared over * the cpu sleep hypervisor call. */ @@ -82,7 +85,6 @@ void arch_cpu_idle(void) : "=&r" (pstate) : "i" (PSTATE_IE)); } - local_irq_enable(); } #ifdef CONFIG_HOTPLUG_CPU