arm64 :show_regs: show the address before relocation

[people/ms/u-boot.git] / arch / arm / lib / interrupts_64.c

diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 7c9cfce69fafe7f1ef4055e2af69a1d67ca3c7ca..cbcfeec2b030056094f9c2d76da2dc9734c28cf8 100644 (file)
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -9,6 +9,7 @@
 #include <linux/compiler.h>
 #include <efi_loader.h>
 
+DECLARE_GLOBAL_DATA_PTR;
 
 int interrupt_init(void)
 {
@@ -29,8 +30,13 @@ void show_regs(struct pt_regs *regs)
 {
        int i;
 
-       printf("ELR:     %lx\n", regs->elr);
-       printf("LR:      %lx\n", regs->regs[30]);
+       if (gd->flags & GD_FLG_RELOC) {
+               printf("ELR:     %lx\n", regs->elr - gd->reloc_off);
+               printf("LR:      %lx\n", regs->regs[30] - gd->reloc_off);
+       } else {
+               printf("ELR:     %lx\n", regs->elr);
+               printf("LR:      %lx\n", regs->regs[30]);
+       }
        for (i = 0; i < 29; i += 2)
                printf("x%-2d: %016lx x%-2d: %016lx\n",
                       i, regs->regs[i], i+1, regs->regs[i+1]);