powerpc/kvm/book3s_hv: Preserve guest CFAR register value

The CFAR (Come-From Address Register) is a useful debugging aid that
exists on POWER7 processors.  Currently HV KVM doesn't save or restore
the CFAR register for guest vcpus, making the CFAR of limited use in
guests.

This adds the necessary code to capture the CFAR value saved in the
early exception entry code (it has to be saved before any branch is
executed), save it in the vcpu.arch struct, and restore it on entry
to the guest.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 4dfc51588be5..05e6d2ee1db9 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -199,10 +199,14 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 
 #define __KVM_HANDLER(area, h, n)                                       \
 do_kvm_##n:                                                             \
+        BEGIN_FTR_SECTION_NESTED(947)                                   \
+        ld      r10,area+EX_CFAR(r13);                                  \
+        std     r10,HSTATE_CFAR(r13);                                   \
+        END_FTR_SECTION_NESTED(CPU_FTR_CFAR,CPU_FTR_CFAR,947);          \
         ld      r10,area+EX_R10(r13);                                   \
-        stw     r9,HSTATE_SCRATCH1(r13);                        \
+        stw     r9,HSTATE_SCRATCH1(r13);                                \
         ld      r9,area+EX_R9(r13);                                     \
-        std     r12,HSTATE_SCRATCH0(r13);                       \
+        std     r12,HSTATE_SCRATCH0(r13);                               \
         li      r12,n;                                                  \
         b       kvmppc_interrupt