16 files changed, 408 insertions, 14 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3934e2659407..a5e9912e2d37 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -105,11 +105,13 @@ config ARCH_NO_VIRT_TO_BUS
 config PPC
         bool
         default y
+        select HAVE_DYNAMIC_FTRACE
+        select HAVE_FTRACE
         select HAVE_IDE
-        select HAVE_OPROFILE
         select HAVE_KPROBES
         select HAVE_KRETPROBES
         select HAVE_LMB
+        select HAVE_OPROFILE
 
 config EARLY_PRINTK
         bool
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 1cee2f9fdf06..095e04db1c0e 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -273,7 +273,8 @@ endif
 initrd-  := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-))
 initrd-y := $(patsubst zImage%, zImage.initrd%, \
                 $(patsubst dtbImage%, dtbImage.initrd%, \
-                $(patsubst treeImage%, treeImage.initrd%, $(image-y))))
+                $(patsubst simpleImage%, simpleImage.initrd%, \
+                $(patsubst treeImage%, treeImage.initrd%, $(image-y)))))
 initrd-y := $(filter-out $(image-y), $(initrd-y))
 targets += $(image-y) $(initrd-y)
 
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 2346d271fbfd..f3f5e2641432 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -12,6 +12,18 @@ CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o          += -fPIC
 endif
 
+ifdef CONFIG_FTRACE
+# Do not trace early boot code
+CFLAGS_REMOVE_cputable.o = -pg
+CFLAGS_REMOVE_prom_init.o = -pg
+
+ifdef CONFIG_DYNAMIC_FTRACE
+# dynamic ftrace setup.
+CFLAGS_REMOVE_ftrace.o = -pg
+endif
+
+endif
+
 obj-y                           := cputable.o ptrace.o syscalls.o \
                                    irq.o align.o signal_32.o pmc.o vdso.o \
                                    init_task.o process.o systbl.o idle.o \
@@ -78,6 +90,8 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o \
 obj-$(CONFIG_AUDIT)             += audit.o
 obj64-$(CONFIG_AUDIT)           += compat_audit.o
 
+obj-$(CONFIG_DYNAMIC_FTRACE)    += ftrace.o
+
 obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
 
 ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 0c8614d9875c..7231a708af0d 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -30,6 +30,7 @@
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
 #include <asm/unistd.h>
+#include <asm/ftrace.h>
 
 #undef SHOW_SYSCALLS
 #undef SHOW_SYSCALLS_TASK
@@ -1035,3 +1036,129 @@ machine_check_in_rtas:
         /* XXX load up BATs and panic */
 
 #endif /* CONFIG_PPC_RTAS */
+
+#ifdef CONFIG_FTRACE
+#ifdef CONFIG_DYNAMIC_FTRACE
+_GLOBAL(mcount)
+_GLOBAL(_mcount)
+        stwu    r1,-48(r1)
+        stw     r3, 12(r1)
+        stw     r4, 16(r1)
+        stw     r5, 20(r1)
+        stw     r6, 24(r1)
+        mflr    r3
+        stw     r7, 28(r1)
+        mfcr    r5
+        stw     r8, 32(r1)
+        stw     r9, 36(r1)
+        stw     r10,40(r1)
+        stw     r3, 44(r1)
+        stw     r5, 8(r1)
+        subi    r3, r3, MCOUNT_INSN_SIZE
+        .globl mcount_call
+mcount_call:
+        bl      ftrace_stub
+        nop
+        lwz     r6, 8(r1)
+        lwz     r0, 44(r1)
+        lwz     r3, 12(r1)
+        mtctr   r0
+        lwz     r4, 16(r1)
+        mtcr    r6
+        lwz     r5, 20(r1)
+        lwz     r6, 24(r1)
+        lwz     r0, 52(r1)
+        lwz     r7, 28(r1)
+        lwz     r8, 32(r1)
+        mtlr    r0
+        lwz     r9, 36(r1)
+        lwz     r10,40(r1)
+        addi    r1, r1, 48
+        bctr
+
+_GLOBAL(ftrace_caller)
+        /* Based off of objdump optput from glibc */
+        stwu    r1,-48(r1)
+        stw     r3, 12(r1)
+        stw     r4, 16(r1)
+        stw     r5, 20(r1)
+        stw     r6, 24(r1)
+        mflr    r3
+        lwz     r4, 52(r1)
+        mfcr    r5
+        stw     r7, 28(r1)
+        stw     r8, 32(r1)
+        stw     r9, 36(r1)
+        stw     r10,40(r1)
+        stw     r3, 44(r1)
+        stw     r5, 8(r1)
+        subi    r3, r3, MCOUNT_INSN_SIZE
+.globl ftrace_call
+ftrace_call:
+        bl      ftrace_stub
+        nop
+        lwz     r6, 8(r1)
+        lwz     r0, 44(r1)
+        lwz     r3, 12(r1)
+        mtctr   r0
+        lwz     r4, 16(r1)
+        mtcr    r6
+        lwz     r5, 20(r1)
+        lwz     r6, 24(r1)
+        lwz     r0, 52(r1)
+        lwz     r7, 28(r1)
+        lwz     r8, 32(r1)
+        mtlr    r0
+        lwz     r9, 36(r1)
+        lwz     r10,40(r1)
+        addi    r1, r1, 48
+        bctr
+#else
+_GLOBAL(mcount)
+_GLOBAL(_mcount)
+        stwu    r1,-48(r1)
+        stw     r3, 12(r1)
+        stw     r4, 16(r1)
+        stw     r5, 20(r1)
+        stw     r6, 24(r1)
+        mflr    r3
+        lwz     r4, 52(r1)
+        mfcr    r5
+        stw     r7, 28(r1)
+        stw     r8, 32(r1)
+        stw     r9, 36(r1)
+        stw     r10,40(r1)
+        stw     r3, 44(r1)
+        stw     r5, 8(r1)
+
+        subi    r3, r3, MCOUNT_INSN_SIZE
+        LOAD_REG_ADDR(r5, ftrace_trace_function)
+        lwz     r5,0(r5)
+
+        mtctr   r5
+        bctrl
+
+        nop
+
+        lwz     r6, 8(r1)
+        lwz     r0, 44(r1)
+        lwz     r3, 12(r1)
+        mtctr   r0
+        lwz     r4, 16(r1)
+        mtcr    r6
+        lwz     r5, 20(r1)
+        lwz     r6, 24(r1)
+        lwz     r0, 52(r1)
+        lwz     r7, 28(r1)
+        lwz     r8, 32(r1)
+        mtlr    r0
+        lwz     r9, 36(r1)
+        lwz     r10,40(r1)
+        addi    r1, r1, 48
+        bctr
+#endif
+
+_GLOBAL(ftrace_stub)
+        blr
+
+#endif /* CONFIG_MCOUNT */
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index c0db5b769e55..2f511a969d2c 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -31,6 +31,7 @@
 #include <asm/bug.h>
 #include <asm/ptrace.h>
 #include <asm/irqflags.h>
+#include <asm/ftrace.h>
 
 /*
  * System calls.
@@ -870,3 +871,67 @@ _GLOBAL(enter_prom)
         ld      r0,16(r1)
         mtlr    r0
         blr
+
+#ifdef CONFIG_FTRACE
+#ifdef CONFIG_DYNAMIC_FTRACE
+_GLOBAL(mcount)
+_GLOBAL(_mcount)
+        /* Taken from output of objdump from lib64/glibc */
+        mflr    r3
+        stdu    r1, -112(r1)
+        std     r3, 128(r1)
+        subi    r3, r3, MCOUNT_INSN_SIZE
+        .globl mcount_call
+mcount_call:
+        bl      ftrace_stub
+        nop
+        ld      r0, 128(r1)
+        mtlr    r0
+        addi    r1, r1, 112
+        blr
+
+_GLOBAL(ftrace_caller)
+        /* Taken from output of objdump from lib64/glibc */
+        mflr    r3
+        ld      r11, 0(r1)
+        stdu    r1, -112(r1)
+        std     r3, 128(r1)
+        ld      r4, 16(r11)
+        subi    r3, r3, MCOUNT_INSN_SIZE
+.globl ftrace_call
+ftrace_call:
+        bl      ftrace_stub
+        nop
+        ld      r0, 128(r1)
+        mtlr    r0
+        addi    r1, r1, 112
+_GLOBAL(ftrace_stub)
+        blr
+#else
+_GLOBAL(mcount)
+        blr
+
+_GLOBAL(_mcount)
+        /* Taken from output of objdump from lib64/glibc */
+        mflr    r3
+        ld      r11, 0(r1)
+        stdu    r1, -112(r1)
+        std     r3, 128(r1)
+        ld      r4, 16(r11)
+
+        subi    r3, r3, MCOUNT_INSN_SIZE
+        LOAD_REG_ADDR(r5,ftrace_trace_function)
+        ld      r5,0(r5)
+        ld      r5,0(r5)
+        mtctr   r5
+        bctrl
+
+        nop
+        ld      r0, 128(r1)
+        mtlr    r0
+        addi    r1, r1, 112
+_GLOBAL(ftrace_stub)
+        blr
+
+#endif
+#endif
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
new file mode 100644
index 000000000000..3855ceb937b0
--- /dev/null
+++ b/arch/powerpc/kernel/ftrace.c
@@ -0,0 +1,154 @@
+/*
+ * Code for replacing ftrace calls with jumps.
+ *
+ * Copyright (C) 2007-2008 Steven Rostedt <srostedt@redhat.com>
+ *
+ * Thanks goes out to P.A. Semi, Inc for supplying me with a PPC64 box.
+ *
+ */
+
+#include <linux/spinlock.h>
+#include <linux/hardirq.h>
+#include <linux/ftrace.h>
+#include <linux/percpu.h>
+#include <linux/init.h>
+#include <linux/list.h>
+
+#include <asm/cacheflush.h>
+#include <asm/ftrace.h>
+
+
+static unsigned int ftrace_nop = 0x60000000;
+
+#ifdef CONFIG_PPC32
+# define GET_ADDR(addr) addr
+#else
+/* PowerPC64's functions are data that points to the functions */
+# define GET_ADDR(addr) *(unsigned long *)addr
+#endif
+
+
+static unsigned int notrace ftrace_calc_offset(long ip, long addr)
+{
+        return (int)(addr - ip);
+}
+
+notrace unsigned char *ftrace_nop_replace(void)
+{
+        return (char *)&ftrace_nop;
+}
+
+notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
+{
+        static unsigned int op;
+
+        /*
+         * It would be nice to just use create_function_call, but that will
+         * update the code itself. Here we need to just return the
+         * instruction that is going to be modified, without modifying the
+         * code.
+         */
+        addr = GET_ADDR(addr);
+
+        /* Set to "bl addr" */
+        op = 0x48000001 | (ftrace_calc_offset(ip, addr) & 0x03fffffc);
+
+        /*
+         * No locking needed, this must be called via kstop_machine
+         * which in essence is like running on a uniprocessor machine.
+         */
+        return (unsigned char *)&op;
+}
+
+#ifdef CONFIG_PPC64
+# define _ASM_ALIGN     " .align 3 "
+# define _ASM_PTR       " .llong "
+#else
+# define _ASM_ALIGN     " .align 2 "
+# define _ASM_PTR       " .long "
+#endif
+
+notrace int
+ftrace_modify_code(unsigned long ip, unsigned char *old_code,
+                   unsigned char *new_code)
+{
+        unsigned replaced;
+        unsigned old = *(unsigned *)old_code;
+        unsigned new = *(unsigned *)new_code;
+        int faulted = 0;
+
+        /*
+         * Note: Due to modules and __init, code can
+         *  disappear and change, we need to protect against faulting
+         *  as well as code changing.
+         *
+         * No real locking needed, this code is run through
+         * kstop_machine.
+         */
+        asm volatile (
+                "1: lwz         %1, 0(%2)\n"
+                "   cmpw        %1, %5\n"
+                "   bne         2f\n"
+                "   stwu        %3, 0(%2)\n"
+                "2:\n"
+                ".section .fixup, \"ax\"\n"
+                "3:     li %0, 1\n"
+                "       b 2b\n"
+                ".previous\n"
+                ".section __ex_table,\"a\"\n"
+                _ASM_ALIGN "\n"
+                _ASM_PTR "1b, 3b\n"
+                ".previous"
+                : "=r"(faulted), "=r"(replaced)
+                : "r"(ip), "r"(new),
+                  "0"(faulted), "r"(old)
+                : "memory");
+
+        if (replaced != old && replaced != new)
+                faulted = 2;
+
+        if (!faulted)
+                flush_icache_range(ip, ip + 8);
+
+        return faulted;
+}
+
+notrace int ftrace_update_ftrace_func(ftrace_func_t func)
+{
+        unsigned long ip = (unsigned long)(&ftrace_call);
+        unsigned char old[MCOUNT_INSN_SIZE], *new;
+        int ret;
+
+        memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
+        new = ftrace_call_replace(ip, (unsigned long)func);
+        ret = ftrace_modify_code(ip, old, new);
+
+        return ret;
+}
+
+notrace int ftrace_mcount_set(unsigned long *data)
+{
+        unsigned long ip = (long)(&mcount_call);
+        unsigned long *addr = data;
+        unsigned char old[MCOUNT_INSN_SIZE], *new;
+
+        /*
+         * Replace the mcount stub with a pointer to the
+         * ip recorder function.
+         */
+        memcpy(old, &mcount_call, MCOUNT_INSN_SIZE);
+        new = ftrace_call_replace(ip, *addr);
+        *addr = ftrace_modify_code(ip, old, new);
+
+        return 0;
+}
+
+int __init ftrace_dyn_arch_init(void *data)
+{
+        /* This is running in kstop_machine */
+
+        ftrace_mcount_set(data);
+
+        return 0;
+}
+
diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c
index e31aca9208eb..1882bf419fa6 100644
--- a/arch/powerpc/kernel/io.c
+++ b/arch/powerpc/kernel/io.c
@@ -120,7 +120,8 @@ EXPORT_SYMBOL(_outsl_ns);
 
 #define IO_CHECK_ALIGN(v,a) ((((unsigned long)(v)) & ((a) - 1)) == 0)
 
-void _memset_io(volatile void __iomem *addr, int c, unsigned long n)
+notrace void
+_memset_io(volatile void __iomem *addr, int c, unsigned long n)
 {
         void *p = (void __force *)addr;
         u32 lc = c;
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index bcc249d90c4d..dcc946e67099 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(irq_desc);
 
 int distribute_irqs = 1;
 
-static inline unsigned long get_hard_enabled(void)
+static inline notrace unsigned long get_hard_enabled(void)
 {
         unsigned long enabled;
 
@@ -108,13 +108,13 @@ static inline unsigned long get_hard_enabled(void)
         return enabled;
 }
 
-static inline void set_soft_enabled(unsigned long enable)
+static inline notrace void set_soft_enabled(unsigned long enable)
 {
         __asm__ __volatile__("stb %0,%1(13)"
         : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
 }
 
-void raw_local_irq_restore(unsigned long en)
+notrace void raw_local_irq_restore(unsigned long en)
 {
         /*
          * get_paca()->soft_enabled = en;
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 61dd17449ddc..4d96e1db55ee 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -33,13 +33,14 @@ static struct legacy_serial_info {
         phys_addr_t                     taddr;
 } legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS];
 
-static struct __initdata of_device_id parents[] = {
+static struct __initdata of_device_id legacy_serial_parents[] = {
         {.type = "soc",},
         {.type = "tsi-bridge",},
         {.type = "opb", },
         {.compatible = "ibm,opb",},
         {.compatible = "simple-bus",},
         {.compatible = "wrs,epld-localbus",},
+        {},
 };
 
 static unsigned int legacy_serial_count;
@@ -136,6 +137,11 @@ static int __init add_legacy_soc_port(struct device_node *np,
         if (of_get_property(np, "clock-frequency", NULL) == NULL)
                 return -1;
 
+        /* if reg-shift or offset, don't try to use it */
+        if ((of_get_property(np, "reg-shift", NULL) != NULL) ||
+                (of_get_property(np, "reg-offset", NULL) != NULL))
+                return -1;
+
         /* if rtas uses this device, don't try to use it as well */
         if (of_get_property(np, "used-by-rtas", NULL) != NULL)
                 return -1;
@@ -322,7 +328,7 @@ void __init find_legacy_serial_ports(void)
                 struct device_node *parent = of_get_parent(np);
                 if (!parent)
                         continue;
-                if (of_match_node(parents, parent) != NULL) {
+                if (of_match_node(legacy_serial_parents, parent) != NULL) {
                         index = add_legacy_soc_port(np, np);
                         if (index >= 0 && np == stdout)
                                 legacy_serial_console = index;
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index e79ad8afda07..3f37a6e62771 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -76,6 +76,8 @@ struct of_device* of_platform_device_create(struct device_node *np,
                 return NULL;
 
         dev->dma_mask = 0xffffffffUL;
+        dev->dev.coherent_dma_mask = DMA_32BIT_MASK;
+
         dev->dev.bus = &of_platform_bus_type;
 
         /* We do not fill the DMA ops for platform devices by default.
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index d3ac631cbd26..a8d02506468a 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -42,6 +42,7 @@
 #include <asm/div64.h>
 #include <asm/signal.h>
 #include <asm/dcr.h>
+#include <asm/ftrace.h>
 
 #ifdef CONFIG_PPC32
 extern void transfer_to_handler(void);
@@ -67,6 +68,10 @@ EXPORT_SYMBOL(single_step_exception);
 EXPORT_SYMBOL(sys_sigreturn);
 #endif
 
+#ifdef CONFIG_FTRACE
+EXPORT_SYMBOL(_mcount);
+#endif
+
 EXPORT_SYMBOL(strcpy);
 EXPORT_SYMBOL(strncpy);
 EXPORT_SYMBOL(strcat);
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 5112a4aa801d..19e8fcb9cea8 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -81,7 +81,7 @@ int ucache_bsize;
  * from the address that it was linked at, so we must use RELOC/PTRRELOC
  * to access static data (including strings).  -- paulus
  */
-unsigned long __init early_init(unsigned long dt_ptr)
+notrace unsigned long __init early_init(unsigned long dt_ptr)
 {
         unsigned long offset = reloc_offset();
         struct cpu_spec *spec;
@@ -111,7 +111,7 @@ unsigned long __init early_init(unsigned long dt_ptr)
  * This is called very early on the boot process, after a minimal
  * MMU environment has been set up but before MMU_init is called.
  */
-void __init machine_init(unsigned long dt_ptr, unsigned long phys)
+notrace void __init machine_init(unsigned long dt_ptr, unsigned long phys)
 {
         /* Enable early debugging if any specified (see udbg.h) */
         udbg_early_init();
@@ -133,7 +133,7 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys)
 
 #ifdef CONFIG_BOOKE_WDT
 /* Checks wdt=x and wdt_period=xx command-line option */
-int __init early_parse_wdt(char *p)
+notrace int __init early_parse_wdt(char *p)
 {
         if (p && strncmp(p, "0", 1) != 0)
                booke_wdt_enabled = 1;
diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c
index 962944038430..3cf0d94ba340 100644
--- a/arch/powerpc/kernel/stacktrace.c
+++ b/arch/powerpc/kernel/stacktrace.c
@@ -12,6 +12,7 @@
 
 #include <linux/sched.h>
 #include <linux/stacktrace.h>
+#include <linux/module.h>
 #include <asm/ptrace.h>
 
 /*
@@ -44,3 +45,4 @@ void save_stack_trace(struct stack_trace *trace)
                 sp = newsp;
         }
 }
+EXPORT_SYMBOL_GPL(save_stack_trace);
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 0c3000bf8d75..53d57d17a894 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -64,8 +64,6 @@ SECTIONS
 
         NOTES
 
-        BUG_TABLE
-
 /*
  * Init sections discarded at runtime
  */
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
index 41c7fd91e99e..fe92e65103ed 100644
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -14,6 +14,7 @@ static struct mpc52xx_sdma __iomem *bes;
 static struct mpc52xx_xlb __iomem *xlb;
 static struct mpc52xx_gpio __iomem *gps;
 static struct mpc52xx_gpio_wkup __iomem *gpw;
+static void __iomem *pci;
 static void __iomem *sram;
 static const int sram_size = 0x4000;    /* 16 kBytes */
 static void __iomem *mbar;
@@ -50,6 +51,8 @@ static int lite5200_pm_prepare(void)
                 { .type = "builtin", .compatible = "mpc5200", }, /* efika */
                 {}
         };
+        u64 regaddr64 = 0;
+        const u32 *regaddr_p;
 
         /* deep sleep? let mpc52xx code handle that */
         if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
@@ -60,8 +63,12 @@ static int lite5200_pm_prepare(void)
 
         /* map registers */
         np = of_find_matching_node(NULL, immr_ids);
-        mbar = of_iomap(np, 0);
+        regaddr_p = of_get_address(np, 0, NULL, NULL);
+        if (regaddr_p)
+                regaddr64 = of_translate_address(np, regaddr_p);
         of_node_put(np);
+
+        mbar = ioremap((u32) regaddr64, 0xC000);
         if (!mbar) {
                 printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__);
                 return -ENOSYS;
@@ -71,6 +78,7 @@ static int lite5200_pm_prepare(void)
         pic = mbar + 0x500;
         gps = mbar + 0xb00;
         gpw = mbar + 0xc00;
+        pci = mbar + 0xd00;
         bes = mbar + 0x1200;
         xlb = mbar + 0x1f00;
         sram = mbar + 0x8000;
@@ -85,6 +93,7 @@ static struct mpc52xx_sdma sbes;
 static struct mpc52xx_xlb sxlb;
 static struct mpc52xx_gpio sgps;
 static struct mpc52xx_gpio_wkup sgpw;
+static char spci[0x200];
 
 static void lite5200_save_regs(void)
 {
@@ -94,6 +103,7 @@ static void lite5200_save_regs(void)
         _memcpy_fromio(&sxlb, xlb, sizeof(*xlb));
         _memcpy_fromio(&sgps, gps, sizeof(*gps));
         _memcpy_fromio(&sgpw, gpw, sizeof(*gpw));
+        _memcpy_fromio(spci, pci, 0x200);
 
         _memcpy_fromio(saved_sram, sram, sram_size);
 }
@@ -103,6 +113,8 @@ static void lite5200_restore_regs(void)
         int i;
         _memcpy_toio(sram, saved_sram, sram_size);
 
+        /* PCI Configuration */
+        _memcpy_toio(pci, spci, 0x200);
 
         /*
          * GPIOs. Interrupt Master Enable has higher address then other
diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 4d72c8f72159..89774177b209 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -1,5 +1,10 @@
 CFLAGS_bootx_init.o             += -fPIC
 
+ifdef CONFIG_FTRACE
+# Do not trace early boot code
+CFLAGS_REMOVE_bootx_init.o = -pg
+endif
+
 obj-y                           += pic.o setup.o time.o feature.o pci.o \
                                    sleep.o low_i2c.o cache.o pfunc_core.o \
                                    pfunc_base.o