powerpc: Save Come-From Address Register (CFAR) in exception frame

Recent 64-bit server processors (POWER6 and POWER7) have a "Come-From
Address Register" (CFAR), that records the address of the most recent
branch or rfid (return from interrupt) instruction for debugging purposes.

This saves the value of the CFAR in the exception entry code and stores
it in the exception frame.  We also make xmon print the CFAR value in
its register dump code.

Rather than extend the pt_regs struct at this time, we steal the orig_gpr3
field, which is only used for system calls, and use it for the CFAR value
for all exceptions/interrupts other than system calls.  This means we
don't save the CFAR on system calls, which is not a great problem since
system calls tend not to happen unexpectedly, and also avoids adding the
overhead of reading the CFAR to the system call entry path.

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

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 96ccef136ca9..f5dfe3411f64 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -46,6 +46,7 @@
 #define EX_CCR          60
 #define EX_R3           64
 #define EX_LR           72
+#define EX_CFAR         80
 
 /*
  * We're short on space and time in the exception prolog, so we can't
@@ -66,6 +67,10 @@
         std     r10,area+EX_R10(r13);                                   \
         std     r11,area+EX_R11(r13);                                   \
         std     r12,area+EX_R12(r13);                                   \
+        BEGIN_FTR_SECTION_NESTED(66);                                   \
+        mfspr   r10,SPRN_CFAR;                                          \
+        std     r10,area+EX_CFAR(r13);                                  \
+        END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66);         \
         GET_SCRATCH0(r9);                                               \
         std     r9,area+EX_R13(r13);                                    \
         mfcr    r9
@@ -130,6 +135,10 @@
         std     r9,GPR11(r1);                                              \
         std     r10,GPR12(r1);                                             \
         std     r11,GPR13(r1);                                             \
+        BEGIN_FTR_SECTION_NESTED(66);                                      \
+        ld      r10,area+EX_CFAR(r13);                                     \
+        std     r10,ORIG_GPR3(r1);                                         \
+        END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66);            \
         ld      r2,PACATOC(r13);        /* get kernel TOC into r2       */ \
         mflr    r9;                     /* save LR in stackframe        */ \
         std     r9,_LINK(r1);                                              \