Patchwork [2/2] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state

login
register
mail settings
Submitter Tiejun Chen
Date Aug. 6, 2013, 9:31 a.m.
Message ID <1375781469-27164-3-git-send-email-tiejun.chen@windriver.com>
Download mbox | patch
Permalink /patch/264941/
State New
Headers show

Comments

Tiejun Chen - Aug. 6, 2013, 9:31 a.m.
We enter with interrupts disabled in hardware, but we need to
call SOFT_DISABLE_INTS anyway to ensure that the software state
is kept in sync.

Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
---
 arch/powerpc/kvm/bookehv_interrupts.S |   10 ++++++++++
 1 file changed, 10 insertions(+)

Patch

diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
index e8ed7d6..4deaf2e 100644
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -33,6 +33,8 @@ 
 
 #ifdef CONFIG_64BIT
 #include <asm/exception-64e.h>
+#include <asm/hw_irq.h>
+#include <asm/irqflags.h>
 #else
 #include "../kernel/head_booke.h" /* for THREAD_NORMSAVE() */
 #endif
@@ -465,6 +467,14 @@  _GLOBAL(kvmppc_resume_host)
 	mtspr	SPRN_EPCR, r3
 	isync
 
+#ifdef CONFIG_64BIT
+	/*
+	 * We enter with interrupts disabled in hardware, but
+	 * we need to call SOFT_DISABLE_INTS anyway to ensure
+	 * that the software state is kept in sync.
+	 */
+	SOFT_DISABLE_INTS(r3,r5)
+#endif
 	/* Switch to kernel stack and jump to handler. */
 	PPC_LL	r3, HOST_RUN(r1)
 	mr	r5, r14 /* intno */