Skip to contentSkip to conversation

KVM: PPC: fix incorrect way saving SPRN_MMCR2

PATCH In review Xiao Guangrong 3 participants 3 messages Jul 23, 2014 – Jul 24, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM: PPC: fix incorrect way saving SPRN_MMCR2

SPRN_SIER and SPRN_MMCR2 are doublely saved, particularly SPRN_MMCR2 is oversaved with a incorrect value which comes from SPRN_PMC5

---
 arch/powerpc/kvm/book3s_hv_interrupts.S | 5 -----
 1 file changed, 5 deletions(-)
arch/powerpc/kvm/book3s_hv_interrupts.S +0 -5
index 8c86422..731be74 100644
@@ -127,11 +127,6 @@ BEGIN_FTR_SECTION
 	stw	r10, HSTATE_PMC + 24(r13)
 	stw	r11, HSTATE_PMC + 28(r13)
 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_201)
-BEGIN_FTR_SECTION
-	mfspr	r9, SPRN_SIER
-	std	r8, HSTATE_MMCR + 40(r13)
-	std	r9, HSTATE_MMCR + 48(r13)
-END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
 31:
 
 	/*
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 5 lines · Xiao Guangrong

SPRN_SIER and SPRN_MMCR2 are doublely saved, particularly SPRN_MMCR2 is oversaved with a incorrect value which comes from SPRN_PMC5

This patch is already in upstream:

f73128f4f680e8be68cda831f2710214559583cb

Alex

#2 lore raw
Quoted 11 lines · Alexander Graf
Quoted 5 lines · Xiao Guangrong

SPRN_SIER and SPRN_MMCR2 are doublely saved, particularly SPRN_MMCR2 is oversaved with a incorrect value which comes from SPRN_PMC5

This patch is already in upstream:

f73128f4f680e8be68cda831f2710214559583cb

I was using kvm tree and did not find it on ‘queue’ branch, maybe i should use your tree instead. Sorry for the noise and thanks for you check. :)