190 files changed, 3163 insertions, 1588 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 25cd7073a20b..7e86286ddf1e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1783,6 +1783,13 @@ W:     http://www.penguinppc.org/
 L:     linuxppc-embedded@ozlabs.org
 S:     Maintained
+LINUX FOR POWERPC PA SEMI PWRFICIENT
+P:      Olof Johansson
+M:      olof@lixom.net
+W:      http://www.pasemi.com/
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
 LLC (802.2)
 P:      Arnaldo Carvalho de Melo
 M:      acme@conectiva.com.br
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 694b0c63ee50..de1ef2fa1a20 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -417,6 +417,17 @@ config PPC_MAPLE
          This option enables support for the Maple 970FX Evaluation Board.
          For more informations, refer to <http://www.970eval.com>
+config PPC_PASEMI
+        depends on PPC_MULTIPLATFORM && PPC64
+        bool "PA Semi SoC-based platforms"
+        default n
+        select MPIC
+        select PPC_UDBG_16550
+        select GENERIC_TBSYNC
+        help
+          This option enables support for PA Semi's PWRficient line
+          of SoC processors, including PA6T-1682M
 config PPC_CELL
        bool
        default n
@@ -436,7 +447,8 @@ config PPC_IBM_CELL_BLADE
        select UDBG_RTAS_CONSOLE
 config UDBG_RTAS_CONSOLE
-        bool
+        bool "RTAS based debug console"
+        depends on PPC_RTAS
        default n
 config XICS
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index e29ef77d3b00..5ad149b47e34 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -18,6 +18,20 @@ config DEBUG_STACK_USAGE
          This option will slow down process creation somewhat.
+config HCALL_STATS
+        bool "Hypervisor call instrumentation"
+        depends on PPC_PSERIES && DEBUG_FS
+        help
+          Adds code to keep track of the number of hypervisor calls made and
+          the amount of time spent in hypervisor callsr.  Wall time spent in
+          each call is always calculated, and if available CPU cycles spent
+          are also calculated.  A directory named hcall_inst is added at the
+          root of the debugfs filesystem.  Within the hcall_inst directory
+          are files that contain CPU specific call statistics.
+          This option will add a small amount of overhead to all hypervisor
+          calls.
 config DEBUGGER
        bool "Enable debugger hooks"
        depends on DEBUG_KERNEL
@@ -74,6 +88,8 @@ config XMON
          very early during boot. 'xmon=on' will just enable the xmon
          debugger hooks.  'xmon=off' will disable the debugger hooks
          if CONFIG_XMON_DEFAULT is set.
+          xmon will print a backtrace on the very first invocation.
+          'xmon=nobt' will disable this autobacktrace.
 config XMON_DEFAULT
        bool "Enable xmon by default"
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index d961bfeed05f..afc776f821e5 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -41,6 +41,10 @@ src-boot += $(zlib)
 src-boot := $(addprefix $(obj)/, $(src-boot))
 obj-boot := $(addsuffix .o, $(basename $(src-boot)))
+ifeq ($(call cc-option-yn, -fstack-protector),y)
+BOOTCFLAGS      += -fno-stack-protector
+endif
 BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj)
 quiet_cmd_copy_zlib = COPY    $@
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 2860be106f4f..62ba66091a13 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -496,7 +496,7 @@ CONFIG_E1000=y
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
+CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 # CONFIG_MV643XX_ETH is not set
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 7d32ad0194a4..8b3f4faf5768 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -16,7 +16,7 @@ obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \
 obj-y                           += vdso32/
 obj-$(CONFIG_PPC64)             += setup_64.o binfmt_elf32.o sys_ppc32.o \
                                   signal_64.o ptrace32.o \
-                                   paca.o cpu_setup_power4.o \
+                                   paca.o cpu_setup_ppc970.o \
                                   firmware.o sysfs.o
 obj-$(CONFIG_PPC64)             += vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 7ee84968087b..c578e7ab8173 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -40,9 +40,9 @@
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #include <asm/lppaca.h>
-#include <asm/iseries/hv_lp_event.h>
 #include <asm/cache.h>
 #include <asm/compat.h>
+#include <asm/mmu.h>
 #endif
 #define DEFINE(sym, val) \
@@ -136,11 +136,18 @@ int main(void)
        DEFINE(PACA_STARTPURR, offsetof(struct paca_struct, startpurr));
        DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));
        DEFINE(PACA_SYSTEM_TIME, offsetof(struct paca_struct, system_time));
+        DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));
+        DEFINE(PACA_DATA_OFFSET, offsetof(struct paca_struct, data_offset));
+        DEFINE(SLBSHADOW_STACKVSID,
+               offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid));
+        DEFINE(SLBSHADOW_STACKESID,
+               offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid));
        DEFINE(LPPACASRR0, offsetof(struct lppaca, saved_srr0));
        DEFINE(LPPACASRR1, offsetof(struct lppaca, saved_srr1));
        DEFINE(LPPACAANYINT, offsetof(struct lppaca, int_dword.any_int));
        DEFINE(LPPACADECRINT, offsetof(struct lppaca, int_dword.fields.decr_int));
+        DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));
 #endif /* CONFIG_PPC64 */
        /* RTAS */
@@ -159,6 +166,12 @@ int main(void)
        /* Create extra stack space for SRR0 and SRR1 when calling prom/rtas. */
        DEFINE(PROM_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs) + 16);
        DEFINE(RTAS_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs) + 16);
+        /* hcall statistics */
+        DEFINE(HCALL_STAT_SIZE, sizeof(struct hcall_stats));
+        DEFINE(HCALL_STAT_CALLS, offsetof(struct hcall_stats, num_calls));
+        DEFINE(HCALL_STAT_TB, offsetof(struct hcall_stats, tb_total));
+        DEFINE(HCALL_STAT_PURR, offsetof(struct hcall_stats, purr_total));
 #endif /* CONFIG_PPC64 */
        DEFINE(GPR0, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[0]));
        DEFINE(GPR1, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[1]));
@@ -240,6 +253,7 @@ int main(void)
        DEFINE(CPU_SPEC_PVR_VALUE, offsetof(struct cpu_spec, pvr_value));
        DEFINE(CPU_SPEC_FEATURES, offsetof(struct cpu_spec, cpu_features));
        DEFINE(CPU_SPEC_SETUP, offsetof(struct cpu_spec, cpu_setup));
+        DEFINE(CPU_SPEC_RESTORE, offsetof(struct cpu_spec, cpu_restore));
 #ifndef CONFIG_PPC64
        DEFINE(pbe_address, offsetof(struct pbe, address));
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index f4e5e14ee2b6..995fcef156fd 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -158,35 +158,35 @@ int btext_initialize(struct device_node *np)
 {
        unsigned int width, height, depth, pitch;
        unsigned long address = 0;
-        u32 *prop;
+        const u32 *prop;
-        prop = (u32 *)get_property(np, "linux,bootx-width", NULL);
+        prop = get_property(np, "linux,bootx-width", NULL);
        if (prop == NULL)
-                prop = (u32 *)get_property(np, "width", NULL);
+                prop = get_property(np, "width", NULL);
        if (prop == NULL)
                return -EINVAL;
        width = *prop;
-        prop = (u32 *)get_property(np, "linux,bootx-height", NULL);
+        prop = get_property(np, "linux,bootx-height", NULL);
        if (prop == NULL)
-                prop = (u32 *)get_property(np, "height", NULL);
+                prop = get_property(np, "height", NULL);
        if (prop == NULL)
                return -EINVAL;
        height = *prop;
-        prop = (u32 *)get_property(np, "linux,bootx-depth", NULL);
+        prop = get_property(np, "linux,bootx-depth", NULL);
        if (prop == NULL)
-                prop = (u32 *)get_property(np, "depth", NULL);
+                prop = get_property(np, "depth", NULL);
        if (prop == NULL)
                return -EINVAL;
        depth = *prop;
        pitch = width * ((depth + 7) / 8);
-        prop = (u32 *)get_property(np, "linux,bootx-linebytes", NULL);
+        prop = get_property(np, "linux,bootx-linebytes", NULL);
        if (prop == NULL)
-                prop = (u32 *)get_property(np, "linebytes", NULL);
+                prop = get_property(np, "linebytes", NULL);
        if (prop)
                pitch = *prop;
        if (pitch == 1)
                pitch = 0x1000;
-        prop = (u32 *)get_property(np, "address", NULL);
+        prop = get_property(np, "address", NULL);
        if (prop)
                address = *prop;
@@ -214,11 +214,11 @@ int btext_initialize(struct device_node *np)
 int __init btext_find_display(int allow_nonstdout)
 {
-        char *name;
+        const char *name;
        struct device_node *np = NULL; 
        int rc = -ENODEV;
-        name = (char *)get_property(of_chosen, "linux,stdout-path", NULL);
+        name = get_property(of_chosen, "linux,stdout-path", NULL);
        if (name != NULL) {
                np = of_find_node_by_path(name);
                if (np != NULL) {
diff --git a/arch/powerpc/kernel/cpu_setup_power4.S b/arch/powerpc/kernel/cpu_setup_ppc970.S
index 76e97aa71c45..652594891d58 100644
--- a/arch/powerpc/kernel/cpu_setup_power4.S
+++ b/arch/powerpc/kernel/cpu_setup_ppc970.S
@@ -16,27 +16,12 @@
 #include <asm/asm-offsets.h>
 #include <asm/cache.h>
-_GLOBAL(__970_cpu_preinit)
+_GLOBAL(__cpu_preinit_ppc970)
-        /*
+        /* Do nothing if not running in HV mode */
-         * Do nothing if not running in HV mode
-         */
        mfmsr   r0
        rldicl. r0,r0,4,63
        beqlr
-        /*
-         * Deal only with PPC970 and PPC970FX.
-         */
-        mfspr   r0,SPRN_PVR
-        srwi    r0,r0,16
-        cmpwi   r0,0x39
-        beq     1f
-        cmpwi   r0,0x3c
-        beq     1f
-        cmpwi   r0,0x44
-        bnelr
-1:
        /* Make sure HID4:rm_ci is off before MMU is turned off, that large
         * pages are enabled with HID4:61 and clear HID5:DCBZ_size and
         * HID5:DCBZ32_ill
@@ -72,23 +57,6 @@ _GLOBAL(__970_cpu_preinit)
        isync
        blr
-_GLOBAL(__setup_cpu_ppc970)
-        mfspr   r0,SPRN_HID0
-        li      r11,5                   /* clear DOZE and SLEEP */
-        rldimi  r0,r11,52,8             /* set NAP and DPM */
-        li      r11,0
-        rldimi  r0,r11,32,31            /* clear EN_ATTN */
-        mtspr   SPRN_HID0,r0
-        mfspr   r0,SPRN_HID0
-        mfspr   r0,SPRN_HID0
-        mfspr   r0,SPRN_HID0
-        mfspr   r0,SPRN_HID0
-        mfspr   r0,SPRN_HID0
-        mfspr   r0,SPRN_HID0
-        sync
-        isync
-        blr
 /* Definitions for the table use to save CPU states */
 #define CS_HID0         0
 #define CS_HID1         8
@@ -103,33 +71,30 @@ cpu_state_storage:
        .balign L1_CACHE_BYTES,0
        .text
-/* Called in normal context to backup CPU 0 state. This
- * does not include cache settings. This function is also
- * called for machine sleep. This does not include the MMU
- * setup, BATs, etc... but rather the "special" registers
- * like HID0, HID1, HID4, etc...
- */
-_GLOBAL(__save_cpu_setup)
-        /* Some CR fields are volatile, we back it up all */
-        mfcr    r7
-        /* Get storage ptr */
-        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
-        /* We only deal with 970 for now */
+_GLOBAL(__setup_cpu_ppc970)
-        mfspr   r0,SPRN_PVR
+        /* Do nothing if not running in HV mode */
-        srwi    r0,r0,16
-        cmpwi   r0,0x39
-        beq     1f
-        cmpwi   r0,0x3c
-        beq     1f
-        cmpwi   r0,0x44
-        bne     2f
-1:      /* skip if not running in HV mode */
        mfmsr   r0
        rldicl. r0,r0,4,63
-        beq     2f
+        beqlr
+        mfspr   r0,SPRN_HID0
+        li      r11,5                   /* clear DOZE and SLEEP */
+        rldimi  r0,r11,52,8             /* set NAP and DPM */
+        li      r11,0
+        rldimi  r0,r11,32,31            /* clear EN_ATTN */
+        mtspr   SPRN_HID0,r0
+        mfspr   r0,SPRN_HID0
+        mfspr   r0,SPRN_HID0
+        mfspr   r0,SPRN_HID0
+        mfspr   r0,SPRN_HID0
+        mfspr   r0,SPRN_HID0
+        mfspr   r0,SPRN_HID0
+        sync
+        isync
+        /* Save away cpu state */
+        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
        /* Save HID0,1,4 and 5 */
        mfspr   r3,SPRN_HID0
@@ -141,35 +106,19 @@ _GLOBAL(__save_cpu_setup)
        mfspr   r3,SPRN_HID5
        std     r3,CS_HID5(r5)
-2:
-        mtcr    r7
        blr
 /* Called with no MMU context (typically MSR:IR/DR off) to
 * restore CPU state as backed up by the previous
 * function. This does not include cache setting
 */
-_GLOBAL(__restore_cpu_setup)
+_GLOBAL(__restore_cpu_ppc970)
-        /* Get storage ptr (FIXME when using anton reloc as we
+        /* Do nothing if not running in HV mode */
-         * are running with translation disabled here
-         */
-        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
-        /* We only deal with 970 for now */
-        mfspr   r0,SPRN_PVR
-        srwi    r0,r0,16
-        cmpwi   r0,0x39
-        beq     1f
-        cmpwi   r0,0x3c
-        beq     1f
-        cmpwi   r0,0x44
-        bnelr
-1:      /* skip if not running in HV mode */
        mfmsr   r0
        rldicl. r0,r0,4,63
        beqlr
+        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
        /* Before accessing memory, we make sure rm_ci is clear */
        li      r0,0
        mfspr   r3,SPRN_HID4
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 272e43622fd6..db65c9f6559a 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -39,7 +39,10 @@ extern void __setup_cpu_7400(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_7410(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec);
 #endif /* CONFIG_PPC32 */
+#ifdef CONFIG_PPC64
 extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
+extern void __restore_cpu_ppc970(void);
+#endif /* CONFIG_PPC64 */
 /* This table only contains "desktop" CPUs, it need to be filled with embedded
 * ones as well...
@@ -55,6 +58,9 @@ extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
 #define COMMON_USER_POWER6      (COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_05 |\
                                 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \
                                 PPC_FEATURE_TRUE_LE)
+#define COMMON_USER_PA6T        (COMMON_USER_PPC64 | PPC_FEATURE_PA6T |\
+                                 PPC_FEATURE_TRUE_LE | \
+                                 PPC_FEATURE_HAS_ALTIVEC_COMP)
 #define COMMON_USER_BOOKE       (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \
                                 PPC_FEATURE_BOOKE)
@@ -184,6 +190,7 @@ struct cpu_spec	cpu_specs[] = {
                .dcache_bsize           = 128,
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_ppc970,
+                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "ppc970",
@@ -199,6 +206,7 @@ struct cpu_spec	cpu_specs[] = {
                .dcache_bsize           = 128,
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_ppc970,
+                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "ppc970",
@@ -214,6 +222,7 @@ struct cpu_spec	cpu_specs[] = {
                .dcache_bsize           = 128,
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_ppc970,
+                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "ppc970",
@@ -280,6 +289,17 @@ struct cpu_spec	cpu_specs[] = {
                .dcache_bsize           = 128,
                .platform               = "ppc-cell-be",
        },
+        {       /* PA Semi PA6T */
+                .pvr_mask               = 0x7fff0000,
+                .pvr_value              = 0x00900000,
+                .cpu_name               = "PA6T",
+                .cpu_features           = CPU_FTRS_PA6T,
+                .cpu_user_features      = COMMON_USER_PA6T,
+                .icache_bsize           = 64,
+                .dcache_bsize           = 64,
+                .num_pmcs               = 6,
+                .platform               = "pa6t",
+        },
        {       /* default match */
                .pvr_mask               = 0x00000000,
                .pvr_value              = 0x00000000,
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index 371973be8d71..2f6f5a7bc69e 100644
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -80,7 +80,7 @@ static int __init parse_savemaxmem(char *p)
 }
 __setup("savemaxmem=", parse_savemaxmem);
-/*
+/**
 * copy_oldmem_page - copy one page from "oldmem"
 * @pfn: page frame number to be copied
 * @buf: target memory address for the copy; this can be in kernel address
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c
index 36aaa7663f02..6c168f6ea142 100644
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma_64.c
@@ -35,10 +35,9 @@ int dma_supported(struct device *dev, u64 mask)
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                return dma_ops->dma_supported(dev, mask);
-        BUG();
+        return dma_ops->dma_supported(dev, mask);
-        return 0;
 }
 EXPORT_SYMBOL(dma_supported);
@@ -66,10 +65,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
-        BUG();
+        return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
-        return NULL;
 }
 EXPORT_SYMBOL(dma_alloc_coherent);
@@ -78,10 +76,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
-        else
+        dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
-                BUG();
 }
 EXPORT_SYMBOL(dma_free_coherent);
@@ -90,10 +87,9 @@ dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, size_t size,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                return dma_ops->map_single(dev, cpu_addr, size, direction);
-        BUG();
+        return dma_ops->map_single(dev, cpu_addr, size, direction);
-        return (dma_addr_t)0;
 }
 EXPORT_SYMBOL(dma_map_single);
@@ -102,10 +98,9 @@ void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                dma_ops->unmap_single(dev, dma_addr, size, direction);
-        else
+        dma_ops->unmap_single(dev, dma_addr, size, direction);
-                BUG();
 }
 EXPORT_SYMBOL(dma_unmap_single);
@@ -115,11 +110,10 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                return dma_ops->map_single(dev,
-                                (page_address(page) + offset), size, direction);
+        return dma_ops->map_single(dev, page_address(page) + offset, size,
-        BUG();
+                        direction);
-        return (dma_addr_t)0;
 }
 EXPORT_SYMBOL(dma_map_page);
@@ -128,10 +122,9 @@ void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                dma_ops->unmap_single(dev, dma_address, size, direction);
-        else
+        dma_ops->unmap_single(dev, dma_address, size, direction);
-                BUG();
 }
 EXPORT_SYMBOL(dma_unmap_page);
@@ -140,10 +133,9 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                return dma_ops->map_sg(dev, sg, nents, direction);
-        BUG();
+        return dma_ops->map_sg(dev, sg, nents, direction);
-        return 0;
 }
 EXPORT_SYMBOL(dma_map_sg);
@@ -152,9 +144,8 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
 {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-        if (dma_ops)
+        BUG_ON(!dma_ops);
-                dma_ops->unmap_sg(dev, sg, nhwentries, direction);
-        else
+        dma_ops->unmap_sg(dev, sg, nhwentries, direction);
-                BUG();
 }
 EXPORT_SYMBOL(dma_unmap_sg);
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 54d9f5cdaab4..2cd872b5283b 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -375,6 +375,14 @@ BEGIN_FTR_SECTION
        ld      r7,KSP_VSID(r4) /* Get new stack's VSID */
        oris    r0,r6,(SLB_ESID_V)@h
        ori     r0,r0,(SLB_NUM_BOLTED-1)@l
+        /* Update the last bolted SLB */
+        ld      r9,PACA_SLBSHADOWPTR(r13)
+        li      r12,0
+        std     r12,SLBSHADOW_STACKESID(r9) /* Clear ESID */
+        std     r7,SLBSHADOW_STACKVSID(r9)  /* Save VSID */
+        std     r0,SLBSHADOW_STACKESID(r9)  /* Save ESID */
        slbie   r6
        slbie   r6              /* Workaround POWER5 < DD2.1 issue */
        slbmte  r7,r0
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 6ff3cf506088..3065b472b95d 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -132,7 +132,7 @@ _GLOBAL(__secondary_hold)
        bne     100b
 #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
-        LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init)
+        LOAD_REG_IMMEDIATE(r4, .generic_secondary_smp_init)
        mtctr   r4
        mr      r3,r24
        bctr
@@ -1484,19 +1484,17 @@ fwnmi_data_area:
        . = 0x8000
 /*
- * On pSeries, secondary processors spin in the following code.
+ * On pSeries and most other platforms, secondary processors spin
+ * in the following code.
 * At entry, r3 = this processor's number (physical cpu id)
 */
-_GLOBAL(pSeries_secondary_smp_init)
+_GLOBAL(generic_secondary_smp_init)
        mr      r24,r3
        
        /* turn on 64-bit mode */
        bl      .enable_64b_mode
        isync
-        /* Copy some CPU settings from CPU 0 */
-        bl      .__restore_cpu_setup
        /* Set up a paca value for this processor. Since we have the
         * physical cpu id in r24, we need to search the pacas to find
         * which logical id maps to our physical one.
@@ -1522,15 +1520,28 @@ _GLOBAL(pSeries_secondary_smp_init)
                                        /* start.                        */
        sync
-        /* Create a temp kernel stack for use before relocation is on.  */
+#ifndef CONFIG_SMP
+        b       3b                      /* Never go on non-SMP           */
+#else
+        cmpwi   0,r23,0
+        beq     3b                      /* Loop until told to go         */
+        /* See if we need to call a cpu state restore handler */
+        LOAD_REG_IMMEDIATE(r23, cur_cpu_spec)
+        ld      r23,0(r23)
+        ld      r23,CPU_SPEC_RESTORE(r23)
+        cmpdi   0,r23,0
+        beq     4f
+        ld      r23,0(r23)
+        mtctr   r23
+        bctrl
+4:      /* Create a temp kernel stack for use before relocation is on.  */
        ld      r1,PACAEMERGSP(r13)
        subi    r1,r1,STACK_FRAME_OVERHEAD
-        cmpwi   0,r23,0
+        b       .__secondary_start
-#ifdef CONFIG_SMP
-        bne     .__secondary_start
 #endif
-        b       3b                      /* Loop until told to go         */
 #ifdef CONFIG_PPC_ISERIES
 _STATIC(__start_initialization_iSeries)
@@ -1611,7 +1622,16 @@ _GLOBAL(__start_initialization_multiplatform)
        bl      .enable_64b_mode
        /* Setup some critical 970 SPRs before switching MMU off */
-        bl      .__970_cpu_preinit
+        mfspr   r0,SPRN_PVR
+        srwi    r0,r0,16
+        cmpwi   r0,0x39         /* 970 */
+        beq     1f
+        cmpwi   r0,0x3c         /* 970FX */
+        beq     1f
+        cmpwi   r0,0x44         /* 970MP */
+        bne     2f
+1:      bl      .__cpu_preinit_ppc970
+2:
        /* Switch off MMU if not already */
        LOAD_REG_IMMEDIATE(r4, .__after_prom_start - KERNELBASE)
@@ -1728,7 +1748,7 @@ _STATIC(__after_prom_start)
 _GLOBAL(copy_and_flush)
        addi    r5,r5,-8
        addi    r6,r6,-8
-4:      li      r0,16                   /* Use the least common         */
+4:      li      r0,8                    /* Use the smallest common      */
                                        /* denominator cache line       */
                                        /* size.  This results in       */
                                        /* extra cache line flushes     */
@@ -1782,7 +1802,7 @@ _GLOBAL(pmac_secondary_start)
        isync
        /* Copy some CPU settings from CPU 0 */
-        bl      .__restore_cpu_setup
+        bl      .__restore_cpu_ppc970
        /* pSeries do that early though I don't think we really need it */
        mfmsr   r3
@@ -1932,12 +1952,6 @@ _STATIC(start_here_multiplatform)
        mr      r5,r26
        bl      .identify_cpu
-        /* Save some low level config HIDs of CPU0 to be copied to
-         * other CPUs later on, or used for suspend/resume
-         */
-        bl      .__save_cpu_setup
-        sync
        /* Do very early kernel initializations, including initial hash table,
         * stab and slb setup before we turn on relocation.     */
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 68e5ab0443d2..124dbcba94a8 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -167,7 +167,7 @@ static DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, ibmebusdev_show_name,
                   NULL);
 static struct ibmebus_dev* __devinit ibmebus_register_device_common(
-        struct ibmebus_dev *dev, char *name)
+        struct ibmebus_dev *dev, const char *name)
 {
        int err = 0;
@@ -194,10 +194,10 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
        struct device_node *dn)
 {
        struct ibmebus_dev *dev;
-        char *loc_code;
+        const char *loc_code;
        int length;
-        loc_code = (char *)get_property(dn, "ibm,loc-code", NULL);
+        loc_code = get_property(dn, "ibm,loc-code", NULL);
        if (!loc_code) {
                printk(KERN_WARNING "%s: node %s missing 'ibm,loc-code'\n",
                       __FUNCTION__, dn->name ? dn->name : "<unknown>");
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 12c5971d6565..b4432332341f 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -52,6 +52,7 @@
 #include <linux/radix-tree.h>
 #include <linux/mutex.h>
 #include <linux/bootmem.h>
+#include <linux/pci.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -875,12 +876,14 @@ int pci_enable_msi(struct pci_dev * pdev)
        else
                return -1;
 }
+EXPORT_SYMBOL(pci_enable_msi);
 void pci_disable_msi(struct pci_dev * pdev)
 {
        if (ppc_md.disable_msi)
                ppc_md.disable_msi(pdev);
 }
+EXPORT_SYMBOL(pci_disable_msi);
 void pci_scan_msi_device(struct pci_dev *dev) {}
 int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec) {return -1;}
@@ -888,6 +891,8 @@ void pci_disable_msix(struct pci_dev *dev) {}
 void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}
 void disable_msi_mode(struct pci_dev *dev, int pos, int type) {}
 void pci_no_msi(void) {}
+EXPORT_SYMBOL(pci_enable_msix);
+EXPORT_SYMBOL(pci_disable_msix);
 #endif
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 40a39291861f..5e6ddfa474c0 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -39,16 +39,17 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
                                  phys_addr_t taddr, unsigned long irq,
                                  upf_t flags, int irq_check_parent)
 {
-        u32 *clk, *spd, clock = BASE_BAUD * 16;
+        const u32 *clk, *spd;
+        u32 clock = BASE_BAUD * 16;
        int index;
        /* get clock freq. if present */
-        clk = (u32 *)get_property(np, "clock-frequency", NULL);
+        clk = get_property(np, "clock-frequency", NULL);
        if (clk && *clk)
                clock = *clk;
        /* get default speed if present */
-        spd = (u32 *)get_property(np, "current-speed", NULL);
+        spd = get_property(np, "current-speed", NULL);
        /* If we have a location index, then try to use it */
        if (want_index >= 0 && want_index < MAX_LEGACY_SERIAL_PORTS)
@@ -113,7 +114,7 @@ static int __init add_legacy_soc_port(struct device_node *np,
                                      struct device_node *soc_dev)
 {
        u64 addr;
-        u32 *addrp;
+        const u32 *addrp;
        upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
        struct device_node *tsi = of_get_parent(np);
@@ -144,15 +145,15 @@ static int __init add_legacy_soc_port(struct device_node *np,
 static int __init add_legacy_isa_port(struct device_node *np,
                                      struct device_node *isa_brg)
 {
-        u32 *reg;
+        const u32 *reg;
-        char *typep;
+        const char *typep;
        int index = -1;
        u64 taddr;
        DBG(" -> add_legacy_isa_port(%s)\n", np->full_name);
        /* Get the ISA port number */
-        reg = (u32 *)get_property(np, "reg", NULL);
+        reg = get_property(np, "reg", NULL);
        if (reg == NULL)
                return -1;
@@ -163,7 +164,7 @@ static int __init add_legacy_isa_port(struct device_node *np,
        /* Now look for an "ibm,aix-loc" property that gives us ordering
         * if any...
         */
-        typep = (char *)get_property(np, "ibm,aix-loc", NULL);
+        typep = get_property(np, "ibm,aix-loc", NULL);
        /* If we have a location index, then use it */
        if (typep && *typep == 'S')
@@ -188,7 +189,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
                                      struct device_node *pci_dev)
 {
        u64 addr, base;
-        u32 *addrp;
+        const u32 *addrp;
        unsigned int flags;
        int iotype, index = -1, lindex = 0;
@@ -227,7 +228,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
         * we get to their "reg" property
         */
        if (np != pci_dev) {
-                u32 *reg = (u32 *)get_property(np, "reg", NULL);
+                const u32 *reg = get_property(np, "reg", NULL);
                if (reg && (*reg < 4))
                        index = lindex = *reg;
        }
@@ -285,13 +286,13 @@ static void __init setup_legacy_serial_console(int console)
 void __init find_legacy_serial_ports(void)
 {
        struct device_node *np, *stdout = NULL;
-        char *path;
+        const char *path;
        int index;
        DBG(" -> find_legacy_serial_port()\n");
        /* Now find out if one of these is out firmware console */
-        path = (char *)get_property(of_chosen, "linux,stdout-path", NULL);
+        path = get_property(of_chosen, "linux,stdout-path", NULL);
        if (path != NULL) {
                stdout = of_find_node_by_path(path);
                if (stdout)
@@ -491,8 +492,8 @@ static int __init check_legacy_serial_console(void)
 {
        struct device_node *prom_stdout = NULL;
        int speed = 0, offset = 0;
-        char *name;
+        const char *name;
-        u32 *spd;
+        const u32 *spd;
        DBG(" -> check_legacy_serial_console()\n");
@@ -513,7 +514,7 @@ static int __init check_legacy_serial_console(void)
        }
        /* We are getting a weird phandle from OF ... */
        /* ... So use the full path instead */
-        name = (char *)get_property(of_chosen, "linux,stdout-path", NULL);
+        name = get_property(of_chosen, "linux,stdout-path", NULL);
        if (name == NULL) {
                DBG(" no linux,stdout-path !\n");
                return -ENODEV;
@@ -525,12 +526,12 @@ static int __init check_legacy_serial_console(void)
        }
        DBG("stdout is %s\n", prom_stdout->full_name);
-        name = (char *)get_property(prom_stdout, "name", NULL);
+        name = get_property(prom_stdout, "name", NULL);
        if (!name) {
                DBG(" stdout package has no name !\n");
                goto not_found;
        }
-        spd = (u32 *)get_property(prom_stdout, "current-speed", NULL);
+        spd = get_property(prom_stdout, "current-speed", NULL);
        if (spd)
                speed = *spd;
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 23f34daa044a..41c05dcd68f4 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -32,7 +32,6 @@
 #include <asm/rtas.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/prom.h>
 #include <asm/vdso_datapage.h>
@@ -183,8 +182,14 @@ static unsigned int h_get_ppp(unsigned long *entitled,
                              unsigned long *resource)
 {
        unsigned long rc;
-        rc = plpar_hcall_4out(H_GET_PPP, 0, 0, 0, 0, entitled, unallocated,
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-                              aggregation, resource);
+        rc = plpar_hcall(H_GET_PPP, retbuf);
+        *entitled = retbuf[0];
+        *unallocated = retbuf[1];
+        *aggregation = retbuf[2];
+        *resource = retbuf[3];
        log_plpar_hcall_return(rc, "H_GET_PPP");
@@ -194,8 +199,12 @@ static unsigned int h_get_ppp(unsigned long *entitled,
 static void h_pic(unsigned long *pool_idle_time, unsigned long *num_procs)
 {
        unsigned long rc;
-        unsigned long dummy;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-        rc = plpar_hcall(H_PIC, 0, 0, 0, 0, pool_idle_time, num_procs, &dummy);
+        rc = plpar_hcall(H_PIC, retbuf);
+        *pool_idle_time = retbuf[0];
+        *num_procs = retbuf[1];
        if (rc != H_AUTHORITY)
                log_plpar_hcall_return(rc, "H_PIC");
@@ -310,12 +319,11 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v)
        int partition_potential_processors;
        int partition_active_processors;
        struct device_node *rtas_node;
-        int *lrdrp = NULL;
+        const int *lrdrp = NULL;
        rtas_node = find_path_device("/rtas");
        if (rtas_node)
-                lrdrp = (int *)get_property(rtas_node, "ibm,lrdr-capacity",
+                lrdrp = get_property(rtas_node, "ibm,lrdr-capacity", NULL);
-                                            NULL);
        if (lrdrp == NULL) {
                partition_potential_processors = vdso_data->processorCount;
@@ -520,7 +528,8 @@ static int lparcfg_data(struct seq_file *m, void *v)
        const char *model = "";
        const char *system_id = "";
        const char *tmp;
-        unsigned int *lp_index_ptr, lp_index = 0;
+        const unsigned int *lp_index_ptr;
+        unsigned int lp_index = 0;
        seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);
@@ -540,8 +549,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
                        if (firmware_has_feature(FW_FEATURE_ISERIES))
                                system_id += 4;
                }
-                lp_index_ptr = (unsigned int *)
+                lp_index_ptr = get_property(rootdn, "ibm,partition-no", NULL);
-                        get_property(rootdn, "ibm,partition-no", NULL);
                if (lp_index_ptr)
                        lp_index = *lp_index_ptr;
        }
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index be58985c7681..a24b09c27718 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -31,8 +31,8 @@ int default_machine_kexec_prepare(struct kimage *image)
        unsigned long begin, end;       /* limits of segment */
        unsigned long low, high;        /* limits of blocked memory range */
        struct device_node *node;
-        unsigned long *basep;
+        const unsigned long *basep;
-        unsigned int *sizep;
+        const unsigned int *sizep;
        if (!ppc_md.hpte_clear_all)
                return -ENOENT;
@@ -72,10 +72,8 @@ int default_machine_kexec_prepare(struct kimage *image)
        /* We also should not overwrite the tce tables */
        for (node = of_find_node_by_type(NULL, "pci"); node != NULL;
                        node = of_find_node_by_type(node, "pci")) {
-                basep = (unsigned long *)get_property(node, "linux,tce-base",
+                basep = get_property(node, "linux,tce-base", NULL);
-                                                        NULL);
+                sizep = get_property(node, "linux,tce-size", NULL);
-                sizep = (unsigned int *)get_property(node, "linux,tce-size",
-                                                        NULL);
                if (basep == NULL || sizep == NULL)
                        continue;
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 3262b73a3a68..397c83eda20e 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -189,27 +189,9 @@ void of_release_dev(struct device *dev)
 int of_device_register(struct of_device *ofdev)
 {
        int rc;
-        struct of_device **odprop;
        BUG_ON(ofdev->node == NULL);
-        odprop = (struct of_device **)get_property(ofdev->node, "linux,device", NULL);
-        if (!odprop) {
-                struct property *new_prop;
-        
-                new_prop = kmalloc(sizeof(struct property) + sizeof(struct of_device *),
-                        GFP_KERNEL);
-                if (new_prop == NULL)
-                        return -ENOMEM;
-                new_prop->name = "linux,device";
-                new_prop->length = sizeof(sizeof(struct of_device *));
-                new_prop->value = (unsigned char *)&new_prop[1];
-                odprop = (struct of_device **)new_prop->value;
-                *odprop = NULL;
-                prom_add_property(ofdev->node, new_prop);
-        }
-        *odprop = ofdev;
        rc = device_register(&ofdev->dev);
        if (rc)
                return rc;
@@ -221,14 +203,8 @@ int of_device_register(struct of_device *ofdev)
 void of_device_unregister(struct of_device *ofdev)
 {
-        struct of_device **odprop;
        device_remove_file(&ofdev->dev, &dev_attr_devspec);
-        odprop = (struct of_device **)get_property(ofdev->node, "linux,device", NULL);
-        if (odprop)
-                *odprop = NULL;
        device_unregister(&ofdev->dev);
 }
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index c68741fed14b..55f1a25085cd 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -17,6 +17,7 @@
 #include <asm/lppaca.h>
 #include <asm/iseries/it_lp_reg_save.h>
 #include <asm/paca.h>
+#include <asm/mmu.h>
 /* This symbol is provided by the linker - let it fill in the paca
@@ -45,6 +46,17 @@ struct lppaca lppaca[] = {
        },
 };
+/*
+ * 3 persistent SLBs are registered here.  The buffer will be zero
+ * initially, hence will all be invaild until we actually write them.
+ */
+struct slb_shadow slb_shadow[] __cacheline_aligned = {
+        [0 ... (NR_CPUS-1)] = {
+                .persistent = SLB_NUM_BOLTED,
+                .buffer_length = sizeof(struct slb_shadow),
+        },
+};
 /* The Paca is an array with one entry per processor.  Each contains an
 * lppaca, which contains the information shared between the
 * hypervisor and Linux.
@@ -59,7 +71,8 @@ struct lppaca lppaca[] = {
        .lock_token = 0x8000,                                               \
        .paca_index = (number),         /* Paca Index */                    \
        .kernel_toc = (unsigned long)(&__toc_start) + 0x8000UL,             \
-        .hw_cpu_id = 0xffff,
+        .hw_cpu_id = 0xffff,                                                \
+        .slb_shadow_ptr = &slb_shadow[number],
 #ifdef CONFIG_PPC_ISERIES
 #define PACA_INIT_ISERIES(number)                                           \
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 09b1e1bbb29b..9b49f8691d29 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -633,12 +633,12 @@ pcibios_alloc_controller(void)
 static void
 make_one_node_map(struct device_node* node, u8 pci_bus)
 {
-        int *bus_range;
+        const int *bus_range;
        int len;
        if (pci_bus >= pci_bus_count)
                return;
-        bus_range = (int *) get_property(node, "bus-range", &len);
+        bus_range = get_property(node, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s, "
                       "assuming it starts at 0\n", node->full_name);
@@ -648,13 +648,13 @@ make_one_node_map(struct device_node* node, u8 pci_bus)
        for (node=node->child; node != 0;node = node->sibling) {
                struct pci_dev* dev;
-                unsigned int *class_code, *reg;
+                const unsigned int *class_code, *reg;
        
-                class_code = (unsigned int *) get_property(node, "class-code", NULL);
+                class_code = get_property(node, "class-code", NULL);
                if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI &&
                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS))
                        continue;
-                reg = (unsigned int *)get_property(node, "reg", NULL);
+                reg = get_property(node, "reg", NULL);
                if (!reg)
                        continue;
                dev = pci_find_slot(pci_bus, ((reg[0] >> 8) & 0xff));
@@ -669,7 +669,7 @@ pcibios_make_OF_bus_map(void)
 {
        int i;
        struct pci_controller* hose;
-        u8* of_prop_map;
+        struct property *map_prop;
        pci_to_OF_bus_map = (u8*)kmalloc(pci_bus_count, GFP_KERNEL);
        if (!pci_to_OF_bus_map) {
@@ -691,9 +691,12 @@ pcibios_make_OF_bus_map(void)
                        continue;
                make_one_node_map(node, hose->first_busno);
        }
-        of_prop_map = get_property(find_path_device("/"), "pci-OF-bus-map", NULL);
+        map_prop = of_find_property(find_path_device("/"),
-        if (of_prop_map)
+                        "pci-OF-bus-map", NULL);
-                memcpy(of_prop_map, pci_to_OF_bus_map, pci_bus_count);
+        if (map_prop) {
+                BUG_ON(pci_bus_count > map_prop->length);
+                memcpy(map_prop->value, pci_to_OF_bus_map, pci_bus_count);
+        }
 #ifdef DEBUG
        printk("PCI->OF bus map:\n");
        for (i=0; i<pci_bus_count; i++) {
@@ -712,7 +715,7 @@ scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void*
        struct device_node* sub_node;
        for (; node != 0;node = node->sibling) {
-                unsigned int *class_code;
+                const unsigned int *class_code;
        
                if (filter(node, data))
                        return node;
@@ -722,7 +725,7 @@ scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void*
                 * a fake root for all functions of a multi-function device,
                 * we go down them as well.
                 */
-                class_code = (unsigned int *) get_property(node, "class-code", NULL);
+                class_code = get_property(node, "class-code", NULL);
                if ((!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI &&
                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) &&
                        strcmp(node->name, "multifunc-device"))
@@ -737,10 +740,10 @@ scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void*
 static int
 scan_OF_pci_childs_iterator(struct device_node* node, void* data)
 {
-        unsigned int *reg;
+        const unsigned int *reg;
        u8* fdata = (u8*)data;
        
-        reg = (unsigned int *) get_property(node, "reg", NULL);
+        reg = get_property(node, "reg", NULL);
        if (reg && ((reg[0] >> 8) & 0xff) == fdata[1]
                && ((reg[0] >> 16) & 0xff) == fdata[0])
                return 1;
@@ -841,7 +844,7 @@ find_OF_pci_device_filter(struct device_node* node, void* data)
 int
 pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
 {
-        unsigned int *reg;
+        const unsigned int *reg;
        struct pci_controller* hose;
        struct pci_dev* dev = NULL;
        
@@ -854,7 +857,7 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
        if (!scan_OF_pci_childs(((struct device_node*)hose->arch_data)->child,
                        find_OF_pci_device_filter, (void *)node))
                return -ENODEV;
-        reg = (unsigned int *) get_property(node, "reg", NULL);
+        reg = get_property(node, "reg", NULL);
        if (!reg)
                return -ENODEV;
        *bus = (reg[0] >> 16) & 0xff;
@@ -885,8 +888,8 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
                           struct device_node *dev, int primary)
 {
        static unsigned int static_lc_ranges[256] __initdata;
-        unsigned int *dt_ranges, *lc_ranges, *ranges, *prev;
+        const unsigned int *dt_ranges;
-        unsigned int size;
+        unsigned int *lc_ranges, *ranges, *prev, size;
        int rlen = 0, orig_rlen;
        int memno = 0;
        struct resource *res;
@@ -897,7 +900,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,
         * that can have more than 3 ranges, fortunately using contiguous
         * addresses -- BenH
         */
-        dt_ranges = (unsigned int *) get_property(dev, "ranges", &rlen);
+        dt_ranges = get_property(dev, "ranges", &rlen);
        if (!dt_ranges)
                return;
        /* Sanity check, though hopefully that never happens */
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 138134c8c17d..c1b1e14775e4 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -185,34 +185,6 @@ static void __devinit pci_setup_pci_controller(struct pci_controller *hose)
        spin_unlock(&hose_spinlock);
 }
-static void add_linux_pci_domain(struct device_node *dev,
-                                 struct pci_controller *phb)
-{
-        struct property *of_prop;
-        unsigned int size;
-        of_prop = (struct property *)
-                get_property(dev, "linux,pci-domain", &size);
-        if (of_prop != NULL)
-                return;
-        WARN_ON(of_prop && size < sizeof(int));
-        if (of_prop && size < sizeof(int))
-                of_prop = NULL;
-        size = sizeof(struct property) + sizeof(int);
-        if (of_prop == NULL) {
-                if (mem_init_done)
-                        of_prop = kmalloc(size, GFP_KERNEL);
-                else
-                        of_prop = alloc_bootmem(size);
-        }
-        memset(of_prop, 0, sizeof(struct property));
-        of_prop->name = "linux,pci-domain";
-        of_prop->length = sizeof(int);
-        of_prop->value = (unsigned char *)&of_prop[1];
-        *((int *)of_prop->value) = phb->global_number;
-        prom_add_property(dev, of_prop);
-}
 struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
 {
        struct pci_controller *phb;
@@ -226,22 +198,13 @@ struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
        pci_setup_pci_controller(phb);
        phb->arch_data = dev;
        phb->is_dynamic = mem_init_done;
-        if (dev) {
+        if (dev)
                PHB_SET_NODE(phb, of_node_to_nid(dev));
-                add_linux_pci_domain(dev, phb);
-        }
        return phb;
 }
 void pcibios_free_controller(struct pci_controller *phb)
 {
-        if (phb->arch_data) {
-                struct device_node *np = phb->arch_data;
-                int *domain = (int *)get_property(np,
-                                                  "linux,pci-domain", NULL);
-                if (domain)
-                        *domain = -1;
-        }
        if (phb->is_dynamic)
                kfree(phb);
 }
@@ -283,10 +246,10 @@ static void __init pcibios_claim_of_setup(void)
 #ifdef CONFIG_PPC_MULTIPLATFORM
 static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
 {
-        u32 *prop;
+        const u32 *prop;
        int len;
-        prop = (u32 *) get_property(np, name, &len);
+        prop = get_property(np, name, &len);
        if (prop && len >= 4)
                return *prop;
        return def;
@@ -315,10 +278,11 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
        u64 base, size;
        unsigned int flags;
        struct resource *res;
-        u32 *addrs, i;
+        const u32 *addrs;
+        u32 i;
        int proplen;
-        addrs = (u32 *) get_property(node, "assigned-addresses", &proplen);
+        addrs = get_property(node, "assigned-addresses", &proplen);
        if (!addrs)
                return;
        DBG("    parse addresses (%d bytes) @ %p\n", proplen, addrs);
@@ -418,7 +382,7 @@ void __devinit of_scan_bus(struct device_node *node,
                                  struct pci_bus *bus)
 {
        struct device_node *child = NULL;
-        u32 *reg;
+        const u32 *reg;
        int reglen, devfn;
        struct pci_dev *dev;
@@ -426,7 +390,7 @@ void __devinit of_scan_bus(struct device_node *node,
        while ((child = of_get_next_child(node, child)) != NULL) {
                DBG("  * %s\n", child->full_name);
-                reg = (u32 *) get_property(child, "reg", &reglen);
+                reg = get_property(child, "reg", &reglen);
                if (reg == NULL || reglen < 20)
                        continue;
                devfn = (reg[0] >> 8) & 0xff;
@@ -450,7 +414,7 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
                                struct pci_dev *dev)
 {
        struct pci_bus *bus;
-        u32 *busrange, *ranges;
+        const u32 *busrange, *ranges;
        int len, i, mode;
        struct resource *res;
        unsigned int flags;
@@ -459,13 +423,13 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
        DBG("of_scan_pci_bridge(%s)\n", node->full_name);
        /* parse bus-range property */
-        busrange = (u32 *) get_property(node, "bus-range", &len);
+        busrange = get_property(node, "bus-range", &len);
        if (busrange == NULL || len != 8) {
                printk(KERN_DEBUG "Can't get bus-range for PCI-PCI bridge %s\n",
                       node->full_name);
                return;
        }
-        ranges = (u32 *) get_property(node, "ranges", &len);
+        ranges = get_property(node, "ranges", &len);
        if (ranges == NULL) {
                printk(KERN_DEBUG "Can't get ranges for PCI-PCI bridge %s\n",
                       node->full_name);
@@ -929,13 +893,13 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
                unsigned int size;
        };
-        struct isa_range *range;
+        const struct isa_range *range;
        unsigned long pci_addr;
        unsigned int isa_addr;
        unsigned int size;
        int rlen = 0;
-        range = (struct isa_range *) get_property(isa_node, "ranges", &rlen);
+        range = get_property(isa_node, "ranges", &rlen);
        if (range == NULL || (rlen < sizeof(struct isa_range))) {
                printk(KERN_ERR "no ISA ranges or unexpected isa range size,"
                       "mapping 64k\n");
@@ -976,7 +940,8 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
 void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                            struct device_node *dev, int prim)
 {
-        unsigned int *ranges, pci_space;
+        const unsigned int *ranges;
+        unsigned int pci_space;
        unsigned long size;
        int rlen = 0;
        int memno = 0;
@@ -994,7 +959,7 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
         *                      (size depending on dev->n_addr_cells)
         *   cells 4+5 or 5+6:  the size of the range
         */
-        ranges = (unsigned int *) get_property(dev, "ranges", &rlen);
+        ranges = get_property(dev, "ranges", &rlen);
        if (ranges == NULL)
                return;
        hose->io_base_phys = 0;
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index 1c18953514c3..68df018dae0e 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -40,8 +40,8 @@
 static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
 {
        struct pci_controller *phb = data;
-        int *type = (int *)get_property(dn, "ibm,pci-config-space-type", NULL);
+        const int *type = get_property(dn, "ibm,pci-config-space-type", NULL);
-        u32 *regs;
+        const u32 *regs;
        struct pci_dn *pdn;
        if (mem_init_done)
@@ -54,14 +54,14 @@ static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
        dn->data = pdn;
        pdn->node = dn;
        pdn->phb = phb;
-        regs = (u32 *)get_property(dn, "reg", NULL);
+        regs = get_property(dn, "reg", NULL);
        if (regs) {
                /* First register entry is addr (00BBSS00)  */
                pdn->busno = (regs[0] >> 16) & 0xff;
                pdn->devfn = (regs[0] >> 8) & 0xff;
        }
        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-                u32 *busp = (u32 *)get_property(dn, "linux,subbus", NULL);
+                const u32 *busp = get_property(dn, "linux,subbus", NULL);
                if (busp)
                        pdn->bussubno = *busp;
        }
@@ -96,10 +96,11 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
        /* We started with a phb, iterate all childs */
        for (dn = start->child; dn; dn = nextdn) {
-                u32 *classp, class;
+                const u32 *classp;
+                u32 class;
                nextdn = NULL;
-                classp = (u32 *)get_property(dn, "class-code", NULL);
+                classp = get_property(dn, "class-code", NULL);
                class = classp ? *classp : 0;
                if (pre && ((ret = pre(dn, data)) != NULL))
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 39d3bfcabcd2..b2edac8ddf0a 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -91,6 +91,9 @@ EXPORT_SYMBOL(__copy_tofrom_user);
 EXPORT_SYMBOL(__clear_user);
 EXPORT_SYMBOL(__strncpy_from_user);
 EXPORT_SYMBOL(__strnlen_user);
+#ifdef CONFIG_PPC64
+EXPORT_SYMBOL(copy_4K_page);
+#endif
 #ifndef  __powerpc64__
 EXPORT_SYMBOL(__ide_mm_insl);
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index a1787ffb6319..bf2005b2feb6 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -942,11 +942,11 @@ void __init early_init_devtree(void *params)
 int
 prom_n_addr_cells(struct device_node* np)
 {
-        int* ip;
+        const int *ip;
        do {
                if (np->parent)
                        np = np->parent;
-                ip = (int *) get_property(np, "#address-cells", NULL);
+                ip = get_property(np, "#address-cells", NULL);
                if (ip != NULL)
                        return *ip;
        } while (np->parent);
@@ -958,11 +958,11 @@ EXPORT_SYMBOL(prom_n_addr_cells);
 int
 prom_n_size_cells(struct device_node* np)
 {
-        int* ip;
+        const int* ip;
        do {
                if (np->parent)
                        np = np->parent;
-                ip = (int *) get_property(np, "#size-cells", NULL);
+                ip = get_property(np, "#size-cells", NULL);
                if (ip != NULL)
                        return *ip;
        } while (np->parent);
@@ -1034,7 +1034,7 @@ int device_is_compatible(struct device_node *device, const char *compat)
        const char* cp;
        int cplen, l;
-        cp = (char *) get_property(device, "compatible", &cplen);
+        cp = get_property(device, "compatible", &cplen);
        if (cp == NULL)
                return 0;
        while (cplen > 0) {
@@ -1449,7 +1449,7 @@ static int of_finish_dynamic_node(struct device_node *node)
 {
        struct device_node *parent = of_get_parent(node);
        int err = 0;
-        phandle *ibm_phandle;
+        const phandle *ibm_phandle;
        node->name = get_property(node, "name", NULL);
        node->type = get_property(node, "device_type", NULL);
@@ -1466,8 +1466,7 @@ static int of_finish_dynamic_node(struct device_node *node)
                return -ENODEV;
        /* fix up new node's linux_phandle field */
-        if ((ibm_phandle = (unsigned int *)get_property(node,
+        if ((ibm_phandle = get_property(node, "ibm,phandle", NULL)))
-                                                        "ibm,phandle", NULL)))
                node->linux_phandle = *ibm_phandle;
 out:
@@ -1528,7 +1527,7 @@ struct property *of_find_property(struct device_node *np, const char *name,
 * Find a property with a given name for a given node
 * and return the value.
 */
-void *get_property(struct device_node *np, const char *name, int *lenp)
+const void *get_property(struct device_node *np, const char *name, int *lenp)
 {
        struct property *pp = of_find_property(np,name,lenp);
        return pp ? pp->value : NULL;
@@ -1658,16 +1657,16 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
        hardid = get_hard_smp_processor_id(cpu);
        for_each_node_by_type(np, "cpu") {
-                u32 *intserv;
+                const u32 *intserv;
                unsigned int plen, t;
                /* Check for ibm,ppc-interrupt-server#s. If it doesn't exist
                 * fallback to "reg" property and assume no threads
                 */
-                intserv = (u32 *)get_property(np, "ibm,ppc-interrupt-server#s",
+                intserv = get_property(np, "ibm,ppc-interrupt-server#s",
-                                              &plen);
+                                &plen);
                if (intserv == NULL) {
-                        u32 *reg = (u32 *)get_property(np, "reg", NULL);
+                        const u32 *reg = get_property(np, "reg", NULL);
                        if (reg == NULL)
                                continue;
                        if (*reg == hardid) {
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 4394e545f9f7..b91761639d96 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2033,16 +2033,22 @@ static void __init fixup_device_tree_maple(void)
 #endif
 #ifdef CONFIG_PPC_CHRP
-/* Pegasos lacks the "ranges" property in the isa node */
+/* Pegasos and BriQ lacks the "ranges" property in the isa node */
 static void __init fixup_device_tree_chrp(void)
 {
        phandle isa;
        u32 isa_ranges[6];
+        u32 rloc = 0x01006000; /* IO space; PCI device = 12 */
        char *name;
        int rc;
        name = "/pci@80000000/isa@c";
        isa = call_prom("finddevice", 1, 1, ADDR(name));
+        if (!PHANDLE_VALID(isa)) {
+                name = "/pci@ff500000/isa@6";
+                isa = call_prom("finddevice", 1, 1, ADDR(name));
+                rloc = 0x01003000; /* IO space; PCI device = 6 */
+        }
        if (!PHANDLE_VALID(isa))
                return;
@@ -2054,7 +2060,7 @@ static void __init fixup_device_tree_chrp(void)
        isa_ranges[0] = 0x1;
        isa_ranges[1] = 0x0;
-        isa_ranges[2] = 0x01006000;
+        isa_ranges[2] = rloc;
        isa_ranges[3] = 0x0;
        isa_ranges[4] = 0x0;
        isa_ranges[5] = 0x00010000;
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index a10825a5dfe6..603dff3ad62a 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -27,7 +27,7 @@
 /* Debug utility */
 #ifdef DEBUG
-static void of_dump_addr(const char *s, u32 *addr, int na)
+static void of_dump_addr(const char *s, const u32 *addr, int na)
 {
        printk("%s", s);
        while(na--)
@@ -35,7 +35,7 @@ static void of_dump_addr(const char *s, u32 *addr, int na)
        printk("\n");
 }
 #else
-static void of_dump_addr(const char *s, u32 *addr, int na) { }
+static void of_dump_addr(const char *s, const u32 *addr, int na) { }
 #endif
@@ -46,9 +46,10 @@ struct of_bus {
        int             (*match)(struct device_node *parent);
        void            (*count_cells)(struct device_node *child,
                                       int *addrc, int *sizec);
-        u64             (*map)(u32 *addr, u32 *range, int na, int ns, int pna);
+        u64             (*map)(u32 *addr, const u32 *range,
+                                int na, int ns, int pna);
        int             (*translate)(u32 *addr, u64 offset, int na);
-        unsigned int    (*get_flags)(u32 *addr);
+        unsigned int    (*get_flags)(const u32 *addr);
 };
@@ -65,7 +66,8 @@ static void of_bus_default_count_cells(struct device_node *dev,
                *sizec = prom_n_size_cells(dev);
 }
-static u64 of_bus_default_map(u32 *addr, u32 *range, int na, int ns, int pna)
+static u64 of_bus_default_map(u32 *addr, const u32 *range,
+                int na, int ns, int pna)
 {
        u64 cp, s, da;
@@ -93,7 +95,7 @@ static int of_bus_default_translate(u32 *addr, u64 offset, int na)
        return 0;
 }
-static unsigned int of_bus_default_get_flags(u32 *addr)
+static unsigned int of_bus_default_get_flags(const u32 *addr)
 {
        return IORESOURCE_MEM;
 }
@@ -118,7 +120,7 @@ static void of_bus_pci_count_cells(struct device_node *np,
                *sizec = 2;
 }
-static u64 of_bus_pci_map(u32 *addr, u32 *range, int na, int ns, int pna)
+static u64 of_bus_pci_map(u32 *addr, const u32 *range, int na, int ns, int pna)
 {
        u64 cp, s, da;
@@ -143,7 +145,7 @@ static int of_bus_pci_translate(u32 *addr, u64 offset, int na)
        return of_bus_default_translate(addr + 1, offset, na - 1);
 }
-static unsigned int of_bus_pci_get_flags(u32 *addr)
+static unsigned int of_bus_pci_get_flags(const u32 *addr)
 {
        unsigned int flags = 0;
        u32 w = addr[0];
@@ -178,7 +180,7 @@ static void of_bus_isa_count_cells(struct device_node *child,
                *sizec = 1;
 }
-static u64 of_bus_isa_map(u32 *addr, u32 *range, int na, int ns, int pna)
+static u64 of_bus_isa_map(u32 *addr, const u32 *range, int na, int ns, int pna)
 {
        u64 cp, s, da;
@@ -203,7 +205,7 @@ static int of_bus_isa_translate(u32 *addr, u64 offset, int na)
        return of_bus_default_translate(addr + 1, offset, na - 1);
 }
-static unsigned int of_bus_isa_get_flags(u32 *addr)
+static unsigned int of_bus_isa_get_flags(const u32 *addr)
 {
        unsigned int flags = 0;
        u32 w = addr[0];
@@ -268,7 +270,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
                            struct of_bus *pbus, u32 *addr,
                            int na, int ns, int pna)
 {
-        u32 *ranges;
+        const u32 *ranges;
        unsigned int rlen;
        int rone;
        u64 offset = OF_BAD_ADDR;
@@ -285,7 +287,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
         * to translate addresses that aren't supposed to be translated in
         * the first place. --BenH.
         */
-        ranges = (u32 *)get_property(parent, "ranges", &rlen);
+        ranges = get_property(parent, "ranges", &rlen);
        if (ranges == NULL || rlen == 0) {
                offset = of_read_number(addr, na);
                memset(addr, 0, pna * 4);
@@ -328,7 +330,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
 * that can be mapped to a cpu physical address). This is not really specified
 * that way, but this is traditionally the way IBM at least do things
 */
-u64 of_translate_address(struct device_node *dev, u32 *in_addr)
+u64 of_translate_address(struct device_node *dev, const u32 *in_addr)
 {
        struct device_node *parent = NULL;
        struct of_bus *bus, *pbus;
@@ -405,10 +407,10 @@ u64 of_translate_address(struct device_node *dev, u32 *in_addr)
 }
 EXPORT_SYMBOL(of_translate_address);
-u32 *of_get_address(struct device_node *dev, int index, u64 *size,
+const u32 *of_get_address(struct device_node *dev, int index, u64 *size,
                    unsigned int *flags)
 {
-        u32 *prop;
+        const u32 *prop;
        unsigned int psize;
        struct device_node *parent;
        struct of_bus *bus;
@@ -425,7 +427,7 @@ u32 *of_get_address(struct device_node *dev, int index, u64 *size,
                return NULL;
        /* Get "reg" or "assigned-addresses" property */
-        prop = (u32 *)get_property(dev, bus->addresses, &psize);
+        prop = get_property(dev, bus->addresses, &psize);
        if (prop == NULL)
                return NULL;
        psize /= 4;
@@ -443,10 +445,10 @@ u32 *of_get_address(struct device_node *dev, int index, u64 *size,
 }
 EXPORT_SYMBOL(of_get_address);
-u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
+const u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
                        unsigned int *flags)
 {
-        u32 *prop;
+        const u32 *prop;
        unsigned int psize;
        struct device_node *parent;
        struct of_bus *bus;
@@ -467,7 +469,7 @@ u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
                return NULL;
        /* Get "reg" or "assigned-addresses" property */
-        prop = (u32 *)get_property(dev, bus->addresses, &psize);
+        prop = get_property(dev, bus->addresses, &psize);
        if (prop == NULL)
                return NULL;
        psize /= 4;
@@ -485,7 +487,7 @@ u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,
 }
 EXPORT_SYMBOL(of_get_pci_address);
-static int __of_address_to_resource(struct device_node *dev, u32 *addrp,
+static int __of_address_to_resource(struct device_node *dev, const u32 *addrp,
                                    u64 size, unsigned int flags,
                                    struct resource *r)
 {
@@ -516,7 +518,7 @@ static int __of_address_to_resource(struct device_node *dev, u32 *addrp,
 int of_address_to_resource(struct device_node *dev, int index,
                           struct resource *r)
 {
-        u32             *addrp;
+        const u32       *addrp;
        u64             size;
        unsigned int    flags;
@@ -530,7 +532,7 @@ EXPORT_SYMBOL_GPL(of_address_to_resource);
 int of_pci_address_to_resource(struct device_node *dev, int bar,
                               struct resource *r)
 {
-        u32             *addrp;
+        const u32       *addrp;
        u64             size;
        unsigned int    flags;
@@ -541,13 +543,14 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,
 }
 EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
-void of_parse_dma_window(struct device_node *dn, unsigned char *dma_window_prop,
+void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
                unsigned long *busno, unsigned long *phys, unsigned long *size)
 {
-        u32 *dma_window, cells;
+        const u32 *dma_window;
-        unsigned char *prop;
+        u32 cells;
+        const unsigned char *prop;
-        dma_window = (u32 *)dma_window_prop;
+        dma_window = dma_window_prop;
        /* busno is always one cell */
        *busno = *(dma_window++);
@@ -576,13 +579,13 @@ static struct device_node *of_irq_dflt_pic;
 static struct device_node *of_irq_find_parent(struct device_node *child)
 {
        struct device_node *p;
-        phandle *parp;
+        const phandle *parp;
        if (!of_node_get(child))
                return NULL;
        do {
-                parp = (phandle *)get_property(child, "interrupt-parent", NULL);
+                parp = get_property(child, "interrupt-parent", NULL);
                if (parp == NULL)
                        p = of_get_parent(child);
                else {
@@ -639,11 +642,11 @@ void of_irq_map_init(unsigned int flags)
 }
-int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
+int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
-                   u32 *addr, struct of_irq *out_irq)
+                const u32 *addr, struct of_irq *out_irq)
 {
        struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL;
-        u32 *tmp, *imap, *imask;
+        const u32 *tmp, *imap, *imask;
        u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;
        int imaplen, match, i;
@@ -657,7 +660,7 @@ int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
         * is none, we are nice and just walk up the tree
         */
        do {
-                tmp = (u32 *)get_property(ipar, "#interrupt-cells", NULL);
+                tmp = get_property(ipar, "#interrupt-cells", NULL);
                if (tmp != NULL) {
                        intsize = *tmp;
                        break;
@@ -681,7 +684,7 @@ int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
         */
        old = of_node_get(ipar);
        do {
-                tmp = (u32 *)get_property(old, "#address-cells", NULL);
+                tmp = get_property(old, "#address-cells", NULL);
                tnode = of_get_parent(old);
                of_node_put(old);
                old = tnode;
@@ -708,7 +711,7 @@ int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
                }
                /* Now look for an interrupt-map */
-                imap = (u32 *)get_property(ipar, "interrupt-map", &imaplen);
+                imap = get_property(ipar, "interrupt-map", &imaplen);
                /* No interrupt map, check for an interrupt parent */
                if (imap == NULL) {
                        DBG(" -> no map, getting parent\n");
@@ -718,7 +721,7 @@ int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
                imaplen /= sizeof(u32);
                /* Look for a mask */
-                imask = (u32 *)get_property(ipar, "interrupt-map-mask", NULL);
+                imask = get_property(ipar, "interrupt-map-mask", NULL);
                /* If we were passed no "reg" property and we attempt to parse
                 * an interrupt-map, then #address-cells must be 0.
@@ -765,14 +768,14 @@ int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
                        /* Get #interrupt-cells and #address-cells of new
                         * parent
                         */
-                        tmp = (u32 *)get_property(newpar, "#interrupt-cells",
+                        tmp = get_property(newpar, "#interrupt-cells",
                                                  NULL);
                        if (tmp == NULL) {
                                DBG(" -> parent lacks #interrupt-cells !\n");
                                goto fail;
                        }
                        newintsize = *tmp;
-                        tmp = (u32 *)get_property(newpar, "#address-cells",
+                        tmp = get_property(newpar, "#address-cells",
                                                  NULL);
                        newaddrsize = (tmp == NULL) ? 0 : *tmp;
@@ -818,14 +821,14 @@ EXPORT_SYMBOL_GPL(of_irq_map_raw);
 static int of_irq_map_oldworld(struct device_node *device, int index,
                               struct of_irq *out_irq)
 {
-        u32 *ints;
+        const u32 *ints;
        int intlen;
        /*
         * Old machines just have a list of interrupt numbers
         * and no interrupt-controller nodes.
         */
-        ints = (u32 *) get_property(device, "AAPL,interrupts", &intlen);
+        ints = get_property(device, "AAPL,interrupts", &intlen);
        if (ints == NULL)
                return -EINVAL;
        intlen /= sizeof(u32);
@@ -850,7 +853,8 @@ static int of_irq_map_oldworld(struct device_node *device, int index,
 int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq)
 {
        struct device_node *p;
-        u32 *intspec, *tmp, intsize, intlen, *addr;
+        const u32 *intspec, *tmp, *addr;
+        u32 intsize, intlen;
        int res;
        DBG("of_irq_map_one: dev=%s, index=%d\n", device->full_name, index);
@@ -860,13 +864,13 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
                return of_irq_map_oldworld(device, index, out_irq);
        /* Get the interrupts property */
-        intspec = (u32 *)get_property(device, "interrupts", &intlen);
+        intspec = get_property(device, "interrupts", &intlen);
        if (intspec == NULL)
                return -EINVAL;
        intlen /= sizeof(u32);
        /* Get the reg property (if any) */
-        addr = (u32 *)get_property(device, "reg", NULL);
+        addr = get_property(device, "reg", NULL);
        /* Look for the interrupt parent. */
        p = of_irq_find_parent(device);
@@ -874,7 +878,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
                return -EINVAL;
        /* Get size of interrupt specifier */
-        tmp = (u32 *)get_property(p, "#interrupt-cells", NULL);
+        tmp = get_property(p, "#interrupt-cells", NULL);
        if (tmp == NULL) {
                of_node_put(p);
                return -EINVAL;
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 9c9ad1fa9cce..2fe82abf1c52 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -246,12 +246,12 @@ struct file_operations ppc_rtas_rmo_buf_ops = {
 static int ppc_rtas_find_all_sensors(void);
 static void ppc_rtas_process_sensor(struct seq_file *m,
-        struct individual_sensor *s, int state, int error, char *loc);
+        struct individual_sensor *s, int state, int error, const char *loc);
 static char *ppc_rtas_process_error(int error);
 static void get_location_code(struct seq_file *m,
-        struct individual_sensor *s, char *loc);
+        struct individual_sensor *s, const char *loc);
-static void check_location_string(struct seq_file *m, char *c);
+static void check_location_string(struct seq_file *m, const char *c);
-static void check_location(struct seq_file *m, char *c);
+static void check_location(struct seq_file *m, const char *c);
 static int __init proc_rtas_init(void)
 {
@@ -446,11 +446,11 @@ static int ppc_rtas_sensors_show(struct seq_file *m, void *v)
        for (i=0; i<sensors.quant; i++) {
                struct individual_sensor *p = &sensors.sensor[i];
                char rstr[64];
-                char *loc;
+                const char *loc;
                int llen, offs;
                sprintf (rstr, SENSOR_PREFIX"%04d", p->token);
-                loc = (char *) get_property(rtas_node, rstr, &llen);
+                loc = get_property(rtas_node, rstr, &llen);
                /* A sensor may have multiple instances */
                for (j = 0, offs = 0; j <= p->quant; j++) {
@@ -474,10 +474,10 @@ static int ppc_rtas_sensors_show(struct seq_file *m, void *v)
 static int ppc_rtas_find_all_sensors(void)
 {
-        unsigned int *utmp;
+        const unsigned int *utmp;
        int len, i;
-        utmp = (unsigned int *) get_property(rtas_node, "rtas-sensors", &len);
+        utmp = get_property(rtas_node, "rtas-sensors", &len);
        if (utmp == NULL) {
                printk (KERN_ERR "error: could not get rtas-sensors\n");
                return 1;
@@ -530,7 +530,7 @@ static char *ppc_rtas_process_error(int error)
 */
 static void ppc_rtas_process_sensor(struct seq_file *m,
-        struct individual_sensor *s, int state, int error, char *loc)
+        struct individual_sensor *s, int state, int error, const char *loc)
 {
        /* Defined return vales */
        const char * key_switch[]        = { "Off\t", "Normal\t", "Secure\t", 
@@ -682,7 +682,7 @@ static void ppc_rtas_process_sensor(struct seq_file *m,
 /* ****************************************************************** */
-static void check_location(struct seq_file *m, char *c)
+static void check_location(struct seq_file *m, const char *c)
 {
        switch (c[0]) {
                case LOC_PLANAR:
@@ -719,7 +719,7 @@ static void check_location(struct seq_file *m, char *c)
 * ${LETTER}${NUMBER}[[-/]${LETTER}${NUMBER} [ ... ] ]
 * the '.' may be an abbrevation
 */
-static void check_location_string(struct seq_file *m, char *c)
+static void check_location_string(struct seq_file *m, const char *c)
 {
        while (*c) {
                if (isalpha(*c) || *c == '.')
@@ -733,7 +733,8 @@ static void check_location_string(struct seq_file *m, char *c)
 /* ****************************************************************** */
-static void get_location_code(struct seq_file *m, struct individual_sensor *s, char *loc)
+static void get_location_code(struct seq_file *m, struct individual_sensor *s,
+                const char *loc)
 {
        if (!loc || !*loc) {
                seq_printf(m, "---");/* does not have a location */
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 77f1e06d208d..6ef80d4e38d3 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -177,10 +177,12 @@ void __init udbg_init_rtas_console(void)
 void rtas_progress(char *s, unsigned short hex)
 {
        struct device_node *root;
-        int width, *p;
+        int width;
+        const int *p;
        char *os;
        static int display_character, set_indicator;
-        static int display_width, display_lines, *row_width, form_feed;
+        static int display_width, display_lines, form_feed;
+        const static int *row_width;
        static DEFINE_SPINLOCK(progress_lock);
        static int current_line;
        static int pending_newline = 0;  /* did last write end with unprinted newline? */
@@ -191,16 +193,16 @@ void rtas_progress(char *s, unsigned short hex)
        if (display_width == 0) {
                display_width = 0x10;
                if ((root = find_path_device("/rtas"))) {
-                        if ((p = (unsigned int *)get_property(root,
+                        if ((p = get_property(root,
                                        "ibm,display-line-length", NULL)))
                                display_width = *p;
-                        if ((p = (unsigned int *)get_property(root,
+                        if ((p = get_property(root,
                                        "ibm,form-feed", NULL)))
                                form_feed = *p;
-                        if ((p = (unsigned int *)get_property(root,
+                        if ((p = get_property(root,
                                        "ibm,display-number-of-lines", NULL)))
                                display_lines = *p;
-                        row_width = (unsigned int *)get_property(root,
+                        row_width = get_property(root,
                                        "ibm,display-truncation-length", NULL);
                }
                display_character = rtas_token("display-character");
@@ -293,10 +295,10 @@ EXPORT_SYMBOL(rtas_progress);		/* needed by rtas_flash module */
 int rtas_token(const char *service)
 {
-        int *tokp;
+        const int *tokp;
        if (rtas.dev == NULL)
                return RTAS_UNKNOWN_SERVICE;
-        tokp = (int *) get_property(rtas.dev, service, NULL);
+        tokp = get_property(rtas.dev, service, NULL);
        return tokp ? *tokp : RTAS_UNKNOWN_SERVICE;
 }
 EXPORT_SYMBOL(rtas_token);
@@ -626,6 +628,9 @@ void rtas_os_term(char *str)
 {
        int status;
+        if (panic_timeout)
+                return;
        if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term"))
                return;
@@ -687,15 +692,14 @@ static int rtas_ibm_suspend_me(struct rtas_args *args)
        int i;
        long state;
        long rc;
-        unsigned long dummy;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
        struct rtas_suspend_me_data data;
        /* Make sure the state is valid */
-        rc = plpar_hcall(H_VASI_STATE,
+        rc = plpar_hcall(H_VASI_STATE, retbuf,
-                         ((u64)args->args[0] << 32) | args->args[1],
+                         ((u64)args->args[0] << 32) | args->args[1]);
-                         0, 0, 0,
-                         &state, &dummy, &dummy);
+        state = retbuf[0];
        if (rc) {
                printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned %ld\n",rc);
@@ -845,15 +849,15 @@ void __init rtas_initialize(void)
         */
        rtas.dev = of_find_node_by_name(NULL, "rtas");
        if (rtas.dev) {
-                u32 *basep, *entryp;
+                const u32 *basep, *entryp, *sizep;
-                u32 *sizep;
-                basep = (u32 *)get_property(rtas.dev, "linux,rtas-base", NULL);
+                basep = get_property(rtas.dev, "linux,rtas-base", NULL);
-                sizep = (u32 *)get_property(rtas.dev, "rtas-size", NULL);
+                sizep = get_property(rtas.dev, "rtas-size", NULL);
                if (basep != NULL && sizep != NULL) {
                        rtas.base = *basep;
                        rtas.size = *sizep;
-                        entryp = (u32 *)get_property(rtas.dev, "linux,rtas-entry", NULL);
+                        entryp = get_property(rtas.dev,
+                                        "linux,rtas-entry", NULL);
                        if (entryp == NULL) /* Ugh */
                                rtas.entry = rtas.base;
                        else
@@ -909,6 +913,11 @@ int __init early_init_dt_scan_rtas(unsigned long node,
        basep = of_get_flat_dt_prop(node, "get-term-char", NULL);
        if (basep)
                rtas_getchar_token = *basep;
+        if (rtas_putchar_token != RTAS_UNKNOWN_SERVICE &&
+            rtas_getchar_token != RTAS_UNKNOWN_SERVICE)
+                udbg_init_rtas_console();
 #endif
        /* break now */
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index cda022657324..b4a0de79c060 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -57,7 +57,7 @@ static inline int config_access_valid(struct pci_dn *dn, int where)
 static int of_device_available(struct device_node * dn)
 {
-        char * status;
+        const char *status;
        status = get_property(dn, "status", NULL);
@@ -81,8 +81,7 @@ int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
        if (!config_access_valid(pdn, where))
                return PCIBIOS_BAD_REGISTER_NUMBER;
-        addr = ((where & 0xf00) << 20) | (pdn->busno << 16) |
+        addr = rtas_config_addr(pdn->busno, pdn->devfn, where);
-                (pdn->devfn << 8) | (where & 0xff);
        buid = pdn->phb->buid;
        if (buid) {
                ret = rtas_call(ibm_read_pci_config, 4, 2, &returnval,
@@ -134,8 +133,7 @@ int rtas_write_config(struct pci_dn *pdn, int where, int size, u32 val)
        if (!config_access_valid(pdn, where))
                return PCIBIOS_BAD_REGISTER_NUMBER;
-        addr = ((where & 0xf00) << 20) | (pdn->busno << 16) |
+        addr = rtas_config_addr(pdn->busno, pdn->devfn, where);
-                (pdn->devfn << 8) | (where & 0xff);
        buid = pdn->phb->buid;
        if (buid) {
                ret = rtas_call(ibm_write_pci_config, 5, 1, NULL, addr,
@@ -178,7 +176,7 @@ struct pci_ops rtas_pci_ops = {
 int is_python(struct device_node *dev)
 {
-        char *model = (char *)get_property(dev, "model", NULL);
+        const char *model = get_property(dev, "model", NULL);
        if (model && strstr(model, "Python"))
                return 1;
@@ -234,7 +232,7 @@ void __init init_pci_config_tokens (void)
 unsigned long __devinit get_phb_buid (struct device_node *phb)
 {
        int addr_cells;
-        unsigned int *buid_vals;
+        const unsigned int *buid_vals;
        unsigned int len;
        unsigned long buid;
@@ -247,7 +245,7 @@ unsigned long __devinit get_phb_buid (struct device_node *phb)
        if (phb->parent->parent)
                return 0;
-        buid_vals = (unsigned int *) get_property(phb, "reg", &len);
+        buid_vals = get_property(phb, "reg", &len);
        if (buid_vals == NULL)
                return 0;
@@ -264,10 +262,10 @@ unsigned long __devinit get_phb_buid (struct device_node *phb)
 static int phb_set_bus_ranges(struct device_node *dev,
                              struct pci_controller *phb)
 {
-        int *bus_range;
+        const int *bus_range;
        unsigned int len;
-        bus_range = (int *) get_property(dev, "bus-range", &len);
+        bus_range = get_property(dev, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                return 1;
        }
@@ -325,15 +323,15 @@ unsigned long __init find_and_init_phbs(void)
         * in chosen.
         */
        if (of_chosen) {
-                int *prop;
+                const int *prop;
-                prop = (int *)get_property(of_chosen, "linux,pci-probe-only",
+                prop = get_property(of_chosen,
-                                           NULL);
+                                "linux,pci-probe-only", NULL);
                if (prop)
                        pci_probe_only = *prop;
-                prop = (int *)get_property(of_chosen,
+                prop = get_property(of_chosen,
-                                           "linux,pci-assign-all-buses", NULL);
+                                "linux,pci-assign-all-buses", NULL);
                if (prop)
                        pci_assign_all_buses = *prop;
        }
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 499c3861074f..465e7435efbc 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -304,16 +304,15 @@ struct seq_operations cpuinfo_op = {
 void __init check_for_initrd(void)
 {
 #ifdef CONFIG_BLK_DEV_INITRD
-        unsigned long *prop;
+        const unsigned long *prop;
        DBG(" -> check_for_initrd()\n");
        if (of_chosen) {
-                prop = (unsigned long *)get_property(of_chosen,
+                prop = get_property(of_chosen, "linux,initrd-start", NULL);
-                                "linux,initrd-start", NULL);
                if (prop != NULL) {
                        initrd_start = (unsigned long)__va(*prop);
-                        prop = (unsigned long *)get_property(of_chosen,
+                        prop = get_property(of_chosen,
                                        "linux,initrd-end", NULL);
                        if (prop != NULL) {
                                initrd_end = (unsigned long)__va(*prop);
@@ -366,15 +365,14 @@ void __init smp_setup_cpu_maps(void)
        int cpu = 0;
        while ((dn = of_find_node_by_type(dn, "cpu")) && cpu < NR_CPUS) {
-                int *intserv;
+                const int *intserv;
                int j, len = sizeof(u32), nthreads = 1;
-                intserv = (int *)get_property(dn, "ibm,ppc-interrupt-server#s",
+                intserv = get_property(dn, "ibm,ppc-interrupt-server#s", &len);
-                                              &len);
                if (intserv)
                        nthreads = len / sizeof(int);
                else {
-                        intserv = (int *) get_property(dn, "reg", NULL);
+                        intserv = get_property(dn, "reg", NULL);
                        if (!intserv)
                                intserv = &cpu; /* assume logical == phys */
                }
@@ -395,13 +393,12 @@ void __init smp_setup_cpu_maps(void)
        if (machine_is(pseries) && firmware_has_feature(FW_FEATURE_LPAR) &&
            (dn = of_find_node_by_path("/rtas"))) {
                int num_addr_cell, num_size_cell, maxcpus;
-                unsigned int *ireg;
+                const unsigned int *ireg;
                num_addr_cell = prom_n_addr_cells(dn);
                num_size_cell = prom_n_size_cells(dn);
-                ireg = (unsigned int *)
+                ireg = get_property(dn, "ibm,lrdr-capacity", NULL);
-                        get_property(dn, "ibm,lrdr-capacity", NULL);
                if (!ireg)
                        goto out;
@@ -444,6 +441,8 @@ void __init smp_setup_cpu_maps(void)
 int __initdata do_early_xmon;
 #ifdef CONFIG_XMON
+extern int xmon_no_auto_backtrace;
 static int __init early_xmon(char *p)
 {
        /* ensure xmon is enabled */
@@ -452,6 +451,8 @@ static int __init early_xmon(char *p)
                        xmon_init(1);
                if (strncmp(p, "off", 3) == 0)
                        xmon_init(0);
+                if (strncmp(p, "nobt", 4) == 0)
+                        xmon_no_auto_backtrace = 1;
                if (strncmp(p, "early", 5) != 0)
                        return 0;
        }
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index fd1785e4c9bb..00d6b8addd78 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -56,7 +56,6 @@
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/lmb.h>
-#include <asm/iseries/it_lp_naca.h>
 #include <asm/firmware.h>
 #include <asm/xmon.h>
 #include <asm/udbg.h>
@@ -79,10 +78,10 @@ u64 ppc64_pft_size;
 * before we've read this from the device tree.
 */
 struct ppc64_caches ppc64_caches = {
-        .dline_size = 0x80,
+        .dline_size = 0x40,
-        .log_dline_size = 7,
+        .log_dline_size = 6,
-        .iline_size = 0x80,
+        .iline_size = 0x40,
-        .log_iline_size = 7
+        .log_iline_size = 6
 };
 EXPORT_SYMBOL_GPL(ppc64_caches);
@@ -107,7 +106,7 @@ static int smt_enabled_cmdline;
 static void check_smt_enabled(void)
 {
        struct device_node *dn;
-        char *smt_option;
+        const char *smt_option;
        /* Allow the command line to overrule the OF option */
        if (smt_enabled_cmdline)
@@ -116,7 +115,7 @@ static void check_smt_enabled(void)
        dn = of_find_node_by_path("/options");
        if (dn) {
-                smt_option = (char *)get_property(dn, "ibm,smt-enabled", NULL);
+                smt_option = get_property(dn, "ibm,smt-enabled", NULL);
                if (smt_option) {
                        if (!strcmp(smt_option, "on"))
@@ -293,7 +292,7 @@ static void __init initialize_cache_info(void)
                 */
                if ( num_cpus == 1 ) {
-                        u32 *sizep, *lsizep;
+                        const u32 *sizep, *lsizep;
                        u32 size, lsize;
                        const char *dc, *ic;
@@ -308,10 +307,10 @@ static void __init initialize_cache_info(void)
                        size = 0;
                        lsize = cur_cpu_spec->dcache_bsize;
-                        sizep = (u32 *)get_property(np, "d-cache-size", NULL);
+                        sizep = get_property(np, "d-cache-size", NULL);
                        if (sizep != NULL)
                                size = *sizep;
-                        lsizep = (u32 *) get_property(np, dc, NULL);
+                        lsizep = get_property(np, dc, NULL);
                        if (lsizep != NULL)
                                lsize = *lsizep;
                        if (sizep == 0 || lsizep == 0)
@@ -325,10 +324,10 @@ static void __init initialize_cache_info(void)
                        size = 0;
                        lsize = cur_cpu_spec->icache_bsize;
-                        sizep = (u32 *)get_property(np, "i-cache-size", NULL);
+                        sizep = get_property(np, "i-cache-size", NULL);
                        if (sizep != NULL)
                                size = *sizep;
-                        lsizep = (u32 *)get_property(np, ic, NULL);
+                        lsizep = get_property(np, ic, NULL);
                        if (lsizep != NULL)
                                lsize = *lsizep;
                        if (sizep == 0 || lsizep == 0)
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index fec228cd0163..406f308ddead 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -60,7 +60,7 @@ static int smt_snooze_cmdline;
 static int __init smt_setup(void)
 {
        struct device_node *options;
-        unsigned int *val;
+        const unsigned int *val;
        unsigned int cpu;
        if (!cpu_has_feature(CPU_FTR_SMT))
@@ -70,8 +70,7 @@ static int __init smt_setup(void)
        if (!options)
                return -ENODEV;
-        val = (unsigned int *)get_property(options, "ibm,smt-snooze-delay",
+        val = get_property(options, "ibm,smt-snooze-delay", NULL);
-                                           NULL);
        if (!smt_snooze_cmdline && val) {
                for_each_possible_cpu(cpu)
                        per_cpu(smt_snooze_delay, cpu) = *val;
@@ -231,7 +230,7 @@ static void register_cpu_online(unsigned int cpu)
        if (cur_cpu_spec->num_pmcs >= 8)
                sysdev_create_file(s, &attr_pmc8);
-        if (cpu_has_feature(CPU_FTR_SMT))
+        if (cpu_has_feature(CPU_FTR_PURR))
                sysdev_create_file(s, &attr_purr);
 }
@@ -273,7 +272,7 @@ static void unregister_cpu_online(unsigned int cpu)
        if (cur_cpu_spec->num_pmcs >= 8)
                sysdev_remove_file(s, &attr_pmc8);
-        if (cpu_has_feature(CPU_FTR_SMT))
+        if (cpu_has_feature(CPU_FTR_PURR))
                sysdev_remove_file(s, &attr_purr);
 }
 #endif /* CONFIG_HOTPLUG_CPU */
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index a124499e65d9..b9a2061cfdb7 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -860,14 +860,14 @@ EXPORT_SYMBOL(do_settimeofday);
 static int __init get_freq(char *name, int cells, unsigned long *val)
 {
        struct device_node *cpu;
-        unsigned int *fp;
+        const unsigned int *fp;
        int found = 0;
        /* The cpu node should have timebase and clock frequency properties */
        cpu = of_find_node_by_type(NULL, "cpu");
        if (cpu) {
-                fp = (unsigned int *)get_property(cpu, name, NULL);
+                fp = get_property(cpu, name, NULL);
                if (fp) {
                        found = 1;
                        *val = 0;
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 9b352bd0a460..d9f10f2fc372 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -598,6 +598,9 @@ static void parse_fpe(struct pt_regs *regs)
 #define INST_STSWI              0x7c0005aa
 #define INST_STSWX              0x7c00052a
+#define INST_POPCNTB            0x7c0000f4
+#define INST_POPCNTB_MASK       0xfc0007fe
 static int emulate_string_inst(struct pt_regs *regs, u32 instword)
 {
        u8 rT = (instword >> 21) & 0x1f;
@@ -666,6 +669,23 @@ static int emulate_string_inst(struct pt_regs *regs, u32 instword)
        return 0;
 }
+static int emulate_popcntb_inst(struct pt_regs *regs, u32 instword)
+{
+        u32 ra,rs;
+        unsigned long tmp;
+        ra = (instword >> 16) & 0x1f;
+        rs = (instword >> 21) & 0x1f;
+        tmp = regs->gpr[rs];
+        tmp = tmp - ((tmp >> 1) & 0x5555555555555555ULL);
+        tmp = (tmp & 0x3333333333333333ULL) + ((tmp >> 2) & 0x3333333333333333ULL);
+        tmp = (tmp + (tmp >> 4)) & 0x0f0f0f0f0f0f0f0fULL;
+        regs->gpr[ra] = tmp;
+        return 0;
+}
 static int emulate_instruction(struct pt_regs *regs)
 {
        u32 instword;
@@ -703,6 +723,11 @@ static int emulate_instruction(struct pt_regs *regs)
        if ((instword & INST_STRING_GEN_MASK) == INST_STRING)
                return emulate_string_inst(regs, instword);
+        /* Emulate the popcntb (Population Count Bytes) instruction. */
+        if ((instword & INST_POPCNTB_MASK) == INST_POPCNTB) {
+                return emulate_popcntb_inst(regs, instword);
+        }
        return -EINVAL;
 }
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index fad8580f9081..cb87e71eec66 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -77,7 +77,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
        } else
 #endif
        {
-                unsigned char *dma_window;
+                const unsigned char *dma_window;
                struct iommu_table *tbl;
                unsigned long offset, size;
@@ -217,7 +217,7 @@ static void __devinit vio_dev_release(struct device *dev)
 struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
 {
        struct vio_dev *viodev;
-        unsigned int *unit_address;
+        const unsigned int *unit_address;
        /* we need the 'device_type' property, in order to match with drivers */
        if (of_node->type == NULL) {
@@ -227,7 +227,7 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
                return NULL;
        }
-        unit_address = (unsigned int *)get_property(of_node, "reg", NULL);
+        unit_address = get_property(of_node, "reg", NULL);
        if (unit_address == NULL) {
                printk(KERN_WARNING "%s: node %s missing 'reg'\n",
                                __FUNCTION__,
@@ -249,7 +249,7 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
        viodev->type = of_node->type;
        viodev->unit_address = *unit_address;
        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-                unit_address = (unsigned int *)get_property(of_node,
+                unit_address = get_property(of_node,
                                "linux,unit_address", NULL);
                if (unit_address != NULL)
                        viodev->unit_address = *unit_address;
@@ -423,7 +423,7 @@ static int vio_hotplug(struct device *dev, char **envp, int num_envp,
 {
        const struct vio_dev *vio_dev = to_vio_dev(dev);
        struct device_node *dn = dev->platform_data;
-        char *cp;
+        const char *cp;
        int length;
        if (!num_envp)
@@ -431,7 +431,7 @@ static int vio_hotplug(struct device *dev, char **envp, int num_envp,
        if (!dn)
                return -ENODEV;
-        cp = (char *)get_property(dn, "compatible", &length);
+        cp = get_property(dn, "compatible", &length);
        if (!cp)
                return -ENODEV;
@@ -493,11 +493,11 @@ static struct vio_dev *vio_find_name(const char *kobj_name)
 */
 struct vio_dev *vio_find_node(struct device_node *vnode)
 {
-        uint32_t *unit_address;
+        const uint32_t *unit_address;
        char kobj_name[BUS_ID_SIZE];
        /* construct the kobject name from the device node */
-        unit_address = (uint32_t *)get_property(vnode, "reg", NULL);
+        unit_address = get_property(vnode, "reg", NULL);
        if (!unit_address)
                return NULL;
        snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address);
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index ff7096458249..336dd191f768 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -14,7 +14,6 @@ endif
 obj-$(CONFIG_PPC64)     += checksum_64.o copypage_64.o copyuser_64.o \
                           memcpy_64.o usercopy_64.o mem_64.o string.o \
                           strcase.o
-obj-$(CONFIG_PPC_ISERIES) += e2a.o
 obj-$(CONFIG_XMON)      += sstep.o
 ifeq ($(CONFIG_PPC64),y)
diff --git a/arch/powerpc/lib/e2a.c b/arch/powerpc/lib/e2a.c
deleted file mode 100644
index 4b72ed8fd50e..000000000000
--- a/arch/powerpc/lib/e2a.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  EBCDIC to ASCII conversion
- *
- * This function moved here from arch/powerpc/platforms/iseries/viopath.c 
- *
- * (C) Copyright 2000-2004 IBM Corporation
- *
- * This program is free software;  you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) anyu later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#include <linux/module.h>
-unsigned char e2a(unsigned char x)
-{
-        switch (x) {
-        case 0xF0:
-                return '0';
-        case 0xF1:
-                return '1';
-        case 0xF2:
-                return '2';
-        case 0xF3:
-                return '3';
-        case 0xF4:
-                return '4';
-        case 0xF5:
-                return '5';
-        case 0xF6:
-                return '6';
-        case 0xF7:
-                return '7';
-        case 0xF8:
-                return '8';
-        case 0xF9:
-                return '9';
-        case 0xC1:
-                return 'A';
-        case 0xC2:
-                return 'B';
-        case 0xC3:
-                return 'C';
-        case 0xC4:
-                return 'D';
-        case 0xC5:
-                return 'E';
-        case 0xC6:
-                return 'F';
-        case 0xC7:
-                return 'G';
-        case 0xC8:
-                return 'H';
-        case 0xC9:
-                return 'I';
-        case 0xD1:
-                return 'J';
-        case 0xD2:
-                return 'K';
-        case 0xD3:
-                return 'L';
-        case 0xD4:
-                return 'M';
-        case 0xD5:
-                return 'N';
-        case 0xD6:
-                return 'O';
-        case 0xD7:
-                return 'P';
-        case 0xD8:
-                return 'Q';
-        case 0xD9:
-                return 'R';
-        case 0xE2:
-                return 'S';
-        case 0xE3:
-                return 'T';
-        case 0xE4:
-                return 'U';
-        case 0xE5:
-                return 'V';
-        case 0xE6:
-                return 'W';
-        case 0xE7:
-                return 'X';
-        case 0xE8:
-                return 'Y';
-        case 0xE9:
-                return 'Z';
-        }
-        return ' ';
-}
-EXPORT_SYMBOL(e2a);
-unsigned char* strne2a(unsigned char *dest, const unsigned char *src, size_t n)
-{
-        int i;
-        n = strnlen(src, n);
-        for (i = 0; i < n; i++)
-                dest[i] = e2a(src[i]);
-        return dest;
-}
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index fbe23933f731..6c0f1c7d83e5 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -159,12 +159,12 @@ static struct device_node * __cpuinit find_cpu_node(unsigned int cpu)
 {
        unsigned int hw_cpuid = get_hard_smp_processor_id(cpu);
        struct device_node *cpu_node = NULL;
-        unsigned int *interrupt_server, *reg;
+        const unsigned int *interrupt_server, *reg;
        int len;
        while ((cpu_node = of_find_node_by_type(cpu_node, "cpu")) != NULL) {
                /* Try interrupt server first */
-                interrupt_server = (unsigned int *)get_property(cpu_node,
+                interrupt_server = get_property(cpu_node,
                                        "ibm,ppc-interrupt-server#s", &len);
                len = len / sizeof(u32);
@@ -175,8 +175,7 @@ static struct device_node * __cpuinit find_cpu_node(unsigned int cpu)
                                        return cpu_node;
                        }
                } else {
-                        reg = (unsigned int *)get_property(cpu_node,
+                        reg = get_property(cpu_node, "reg", &len);
-                                                           "reg", &len);
                        if (reg && (len > 0) && (reg[0] == hw_cpuid))
                                return cpu_node;
                }
@@ -186,9 +185,9 @@ static struct device_node * __cpuinit find_cpu_node(unsigned int cpu)
 }
 /* must hold reference to node during call */
-static int *of_get_associativity(struct device_node *dev)
+static const int *of_get_associativity(struct device_node *dev)
 {
-        return (unsigned int *)get_property(dev, "ibm,associativity", NULL);
+        return get_property(dev, "ibm,associativity", NULL);
 }
 /* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa
@@ -197,7 +196,7 @@ static int *of_get_associativity(struct device_node *dev)
 static int of_node_to_nid_single(struct device_node *device)
 {
        int nid = -1;
-        unsigned int *tmp;
+        const unsigned int *tmp;
        if (min_common_depth == -1)
                goto out;
@@ -255,7 +254,7 @@ EXPORT_SYMBOL_GPL(of_node_to_nid);
 static int __init find_min_common_depth(void)
 {
        int depth;
-        unsigned int *ref_points;
+        const unsigned int *ref_points;
        struct device_node *rtas_root;
        unsigned int len;
@@ -270,7 +269,7 @@ static int __init find_min_common_depth(void)
         * configuration (should be all 0's) and the second is for a normal
         * NUMA configuration.
         */
-        ref_points = (unsigned int *)get_property(rtas_root,
+        ref_points = get_property(rtas_root,
                        "ibm,associativity-reference-points", &len);
        if ((len >= 1) && ref_points) {
@@ -297,7 +296,7 @@ static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells)
        of_node_put(memory);
 }
-static unsigned long __devinit read_n_cells(int n, unsigned int **buf)
+static unsigned long __devinit read_n_cells(int n, const unsigned int **buf)
 {
        unsigned long result = 0;
@@ -435,15 +434,13 @@ static int __init parse_numa_properties(void)
                unsigned long size;
                int nid;
                int ranges;
-                unsigned int *memcell_buf;
+                const unsigned int *memcell_buf;
                unsigned int len;
-                memcell_buf = (unsigned int *)get_property(memory,
+                memcell_buf = get_property(memory,
                        "linux,usable-memory", &len);
                if (!memcell_buf || len <= 0)
-                        memcell_buf =
+                        memcell_buf = get_property(memory, "reg", &len);
-                                (unsigned int *)get_property(memory, "reg",
-                                        &len);
                if (!memcell_buf || len <= 0)
                        continue;
@@ -787,10 +784,10 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
        while ((memory = of_find_node_by_type(memory, "memory")) != NULL) {
                unsigned long start, size;
                int ranges;
-                unsigned int *memcell_buf;
+                const unsigned int *memcell_buf;
                unsigned int len;
-                memcell_buf = (unsigned int *)get_property(memory, "reg", &len);
+                memcell_buf = get_property(memory, "reg", &len);
                if (!memcell_buf || len <= 0)
                        continue;
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index de0c8842415c..d3733912adb4 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -22,6 +22,8 @@
 #include <asm/paca.h>
 #include <asm/cputable.h>
 #include <asm/cacheflush.h>
+#include <asm/smp.h>
+#include <linux/compiler.h>
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -50,9 +52,32 @@ static inline unsigned long mk_vsid_data(unsigned long ea, unsigned long flags)
        return (get_kernel_vsid(ea) << SLB_VSID_SHIFT) | flags;
 }
-static inline void create_slbe(unsigned long ea, unsigned long flags,
+static inline void slb_shadow_update(unsigned long esid, unsigned long vsid,
-                               unsigned long entry)
+                                     unsigned long entry)
 {
+        /*
+         * Clear the ESID first so the entry is not valid while we are
+         * updating it.
+         */
+        get_slb_shadow()->save_area[entry].esid = 0;
+        barrier();
+        get_slb_shadow()->save_area[entry].vsid = vsid;
+        barrier();
+        get_slb_shadow()->save_area[entry].esid = esid;
+}
+static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
+                                        unsigned long entry)
+{
+        /*
+         * Updating the shadow buffer before writing the SLB ensures
+         * we don't get a stale entry here if we get preempted by PHYP
+         * between these two statements.
+         */
+        slb_shadow_update(mk_esid_data(ea, entry), mk_vsid_data(ea, flags),
+                          entry);
        asm volatile("slbmte  %0,%1" :
                     : "r" (mk_vsid_data(ea, flags)),
                       "r" (mk_esid_data(ea, entry))
@@ -77,6 +102,10 @@ void slb_flush_and_rebolt(void)
        if ((ksp_esid_data & ESID_MASK) == PAGE_OFFSET)
                ksp_esid_data &= ~SLB_ESID_V;
+        /* Only third entry (stack) may change here so only resave that */
+        slb_shadow_update(ksp_esid_data,
+                          mk_vsid_data(ksp_esid_data, lflags), 2);
        /* We need to do this all in asm, so we're sure we don't touch
         * the stack between the slbia and rebolting it. */
        asm volatile("isync\n"
@@ -209,9 +238,9 @@ void slb_initialize(void)
        asm volatile("isync":::"memory");
        asm volatile("slbmte  %0,%0"::"r" (0) : "memory");
        asm volatile("isync; slbia; isync":::"memory");
-        create_slbe(PAGE_OFFSET, lflags, 0);
+        create_shadowed_slbe(PAGE_OFFSET, lflags, 0);
-        create_slbe(VMALLOC_START, vflags, 1);
+        create_shadowed_slbe(VMALLOC_START, vflags, 1);
        /* We don't bolt the stack for the time being - we're in boot,
         * so the stack is in the bolted segment.  By the time it goes
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index f6eef78efd29..b58baa65c4a7 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -146,6 +146,7 @@ void hpte_update(struct mm_struct *mm, unsigned long addr,
                psize = mmu_huge_psize;
 #else
                BUG();
+                psize = pte_pagesize_index(pte); /* shutup gcc */
 #endif
        } else
                psize = pte_pagesize_index(pte);
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index cf3967a66fb5..969fbb6d8c46 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -60,8 +60,8 @@ static void __init mpc834x_itx_setup_arch(void)
        np = of_find_node_by_type(NULL, "cpu");
        if (np != 0) {
-                unsigned int *fp =
+                const unsigned int *fp =
-                    (int *)get_property(np, "clock-frequency", NULL);
+                        get_property(np, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_sys.c
index 32df239d1c48..677196187a4e 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_sys.c
@@ -57,8 +57,8 @@ static void __init mpc834x_sys_setup_arch(void)
        np = of_find_node_by_type(NULL, "cpu");
        if (np != 0) {
-                unsigned int *fp =
+                const unsigned int *fp =
-                    (int *)get_property(np, "clock-frequency", NULL);
+                        get_property(np, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 5d84a9ccd103..4557ac5255c1 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -59,7 +59,7 @@ int __init add_bridge(struct device_node *dev)
        int len;
        struct pci_controller *hose;
        struct resource rsrc;
-        int *bus_range;
+        const int *bus_range;
        int primary = 1, has_address = 0;
        phys_addr_t immr = get_immrbase();
@@ -69,7 +69,7 @@ int __init add_bridge(struct device_node *dev)
        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
        /* Get bus range if any */
-        bus_range = (int *)get_property(dev, "bus-range", &len);
+        bus_range = get_property(dev, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", dev->full_name);
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 9d2acfbbeccd..cae6b73357d5 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -121,9 +121,9 @@ static void __init mpc85xx_ads_setup_arch(void)
        cpu = of_find_node_by_type(NULL, "cpu");
        if (cpu != 0) {
-                unsigned int *fp;
+                const unsigned int *fp;
-                fp = (int *)get_property(cpu, "clock-frequency", NULL);
+                fp = get_property(cpu, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 1d357d32a29f..4c1fede6470e 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -241,9 +241,9 @@ mpc85xx_cds_setup_arch(void)
        cpu = of_find_node_by_type(NULL, "cpu");
        if (cpu != 0) {
-                unsigned int *fp;
+                const unsigned int *fp;
-                fp = (int *)get_property(cpu, "clock-frequency", NULL);
+                fp = get_property(cpu, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else
diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c
index 1d51f3242ab1..05930eeb6e7f 100644
--- a/arch/powerpc/platforms/85xx/pci.c
+++ b/arch/powerpc/platforms/85xx/pci.c
@@ -41,7 +41,7 @@ int __init add_bridge(struct device_node *dev)
        int len;
        struct pci_controller *hose;
        struct resource rsrc;
-        int *bus_range;
+        const int *bus_range;
        int primary = 1, has_address = 0;
        phys_addr_t immr = get_immrbase();
@@ -51,7 +51,7 @@ int __init add_bridge(struct device_node *dev)
        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
        /* Get bus range if any */
-        bus_range = (int *) get_property(dev, "bus-range", &len);
+        bus_range = get_property(dev, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", dev->full_name);
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 5e583cf38786..b637e8157f7b 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -347,9 +347,9 @@ mpc86xx_hpcn_setup_arch(void)
        np = of_find_node_by_type(NULL, "cpu");
        if (np != 0) {
-                unsigned int *fp;
+                const unsigned int *fp;
-                fp = (int *)get_property(np, "clock-frequency", NULL);
+                fp = get_property(np, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index a8c8f0a44055..481e18ed5be9 100644
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
@@ -153,7 +153,7 @@ int __init add_bridge(struct device_node *dev)
        int len;
        struct pci_controller *hose;
        struct resource rsrc;
-        int *bus_range;
+        const int *bus_range;
        int has_address = 0;
        int primary = 0;
@@ -163,7 +163,7 @@ int __init add_bridge(struct device_node *dev)
        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
        /* Get bus range if any */
-        bus_range = (int *) get_property(dev, "bus-range", &len);
+        bus_range = get_property(dev, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int))
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", dev->full_name);
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 5cf46dc57895..e58fa953a50b 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -13,5 +13,6 @@ obj-$(CONFIG_PPC_86xx)		+= 86xx/
 obj-$(CONFIG_PPC_PSERIES)       += pseries/
 obj-$(CONFIG_PPC_ISERIES)       += iseries/
 obj-$(CONFIG_PPC_MAPLE)         += maple/
+obj-$(CONFIG_PPC_PASEMI)                += pasemi/
 obj-$(CONFIG_PPC_CELL)          += cell/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c
index ce696c1cca75..3f3859d12e00 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.c
+++ b/arch/powerpc/platforms/cell/cbe_regs.c
@@ -97,7 +97,7 @@ void __init cbe_regs_init(void)
                struct cbe_regs_map *map = &cbe_regs_maps[cbe_regs_map_count++];
                /* That hack must die die die ! */
-                struct address_prop {
+                const struct address_prop {
                        unsigned long address;
                        unsigned int len;
                } __attribute__((packed)) *prop;
@@ -114,13 +114,11 @@ void __init cbe_regs_init(void)
                        if (cbe_thread_map[i].cpu_node == cpu)
                                cbe_thread_map[i].regs = map;
-                prop = (struct address_prop *)get_property(cpu, "pervasive",
+                prop = get_property(cpu, "pervasive", NULL);
-                                                           NULL);
                if (prop != NULL)
                        map->pmd_regs = ioremap(prop->address, prop->len);
-                prop = (struct address_prop *)get_property(cpu, "iic",
+                prop = get_property(cpu, "iic", NULL);
-                                                           NULL);
                if (prop != NULL)
                        map->iic_regs = ioremap(prop->address, prop->len);
        }
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index d7bbb61109f9..6b57a47c5d37 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -89,17 +89,17 @@ static struct irq_chip iic_chip = {
 /* Get an IRQ number from the pending state register of the IIC */
 static unsigned int iic_get_irq(struct pt_regs *regs)
 {
-        struct cbe_iic_pending_bits pending;
+        struct cbe_iic_pending_bits pending;
-        struct iic *iic;
+        struct iic *iic;
-        iic = &__get_cpu_var(iic);
+        iic = &__get_cpu_var(iic);
-        *(unsigned long *) &pending =
+        *(unsigned long *) &pending =
-                in_be64((unsigned long __iomem *) &iic->regs->pending_destr);
+                in_be64((unsigned long __iomem *) &iic->regs->pending_destr);
-        iic->eoi_stack[++iic->eoi_ptr] = pending.prio;
+        iic->eoi_stack[++iic->eoi_ptr] = pending.prio;
-        BUG_ON(iic->eoi_ptr > 15);
+        BUG_ON(iic->eoi_ptr > 15);
        if (pending.flags & CBE_IIC_IRQ_VALID)
                return irq_linear_revmap(iic->host,
-                                         iic_pending_to_hwnum(pending));
+                                         iic_pending_to_hwnum(pending));
        return NO_IRQ;
 }
@@ -250,16 +250,15 @@ static int __init setup_iic(void)
        struct resource r0, r1;
        struct irq_host *host;
        int found = 0;
-        u32 *np;
+        const u32 *np;
        for (dn = NULL;
             (dn = of_find_node_by_name(dn,"interrupt-controller")) != NULL;) {
                if (!device_is_compatible(dn,
                                     "IBM,CBEA-Internal-Interrupt-Controller"))
                        continue;
-                np = (u32 *)get_property(dn, "ibm,interrupt-server-ranges",
+                np = get_property(dn, "ibm,interrupt-server-ranges", NULL);
-                                         NULL);
+                if (np == NULL) {
-                if (np == NULL) {
                        printk(KERN_WARNING "IIC: CPU association not found\n");
                        of_node_put(dn);
                        return -ENODEV;
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index a35004e14c69..d2b20eba5b87 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -308,15 +308,16 @@ static void cell_do_map_iommu(struct cell_iommu *iommu,
 static void iommu_devnode_setup(struct device_node *d)
 {
-        unsigned int *ioid;
+        const unsigned int *ioid;
-        unsigned long *dma_window, map_start, map_size, token;
+        unsigned long map_start, map_size, token;
+        const unsigned long *dma_window;
        struct cell_iommu *iommu;
-        ioid = (unsigned int *)get_property(d, "ioid", NULL);
+        ioid = get_property(d, "ioid", NULL);
        if (!ioid)
                pr_debug("No ioid entry found !\n");
-        dma_window = (unsigned long *)get_property(d, "ibm,dma-window", NULL);
+        dma_window = get_property(d, "ibm,dma-window", NULL);
        if (!dma_window)
                pr_debug("No ibm,dma-window entry found !\n");
@@ -371,8 +372,9 @@ static int cell_map_iommu_hardcoded(int num_nodes)
 static int cell_map_iommu(void)
 {
-        unsigned int num_nodes = 0, *node_id;
+        unsigned int num_nodes = 0;
-        unsigned long *base, *mmio_base;
+        const unsigned int *node_id;
+        const unsigned long *base, *mmio_base;
        struct device_node *dn;
        struct cell_iommu *iommu = NULL;
@@ -381,7 +383,7 @@ static int cell_map_iommu(void)
        for(dn = of_find_node_by_type(NULL, "cpu");
            dn;
            dn = of_find_node_by_type(dn, "cpu")) {
-                node_id = (unsigned int *)get_property(dn, "node-id", NULL);
+                node_id = get_property(dn, "node-id", NULL);
                if (num_nodes < *node_id)
                        num_nodes = *node_id;
@@ -396,9 +398,9 @@ static int cell_map_iommu(void)
            dn;
            dn = of_find_node_by_type(dn, "cpu")) {
-                node_id = (unsigned int *)get_property(dn, "node-id", NULL);
+                node_id = get_property(dn, "node-id", NULL);
-                base = (unsigned long *)get_property(dn, "ioc-cache", NULL);
+                base = get_property(dn, "ioc-cache", NULL);
-                mmio_base = (unsigned long *)get_property(dn, "ioc-translation", NULL);
+                mmio_base = get_property(dn, "ioc-translation", NULL);
                if (!base || !mmio_base || !node_id)
                        return cell_map_iommu_hardcoded(num_nodes);
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 282987d6d4a2..22c228a49c33 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -150,10 +150,6 @@ static int __init cell_probe(void)
            !of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
                return 0;
-#ifdef CONFIG_UDBG_RTAS_CONSOLE
-        udbg_init_rtas_console();
-#endif
        hpte_init_native();
        return 1;
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index 46aef0640742..1c0acbad7425 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -57,7 +57,7 @@
 */
 static cpumask_t of_spin_map;
-extern void pSeries_secondary_smp_init(unsigned long);
+extern void generic_secondary_smp_init(unsigned long);
 /**
 * smp_startup_cpu() - start the given cpu
@@ -74,7 +74,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
 {
        int status;
        unsigned long start_here = __pa((u32)*((unsigned long *)
-                                               pSeries_secondary_smp_init));
+                                               generic_secondary_smp_init));
        unsigned int pcpu;
        int start_cpu;
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 15217bb0402f..742a03282b44 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -240,7 +240,7 @@ static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc,
 static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
 {
        unsigned int virq;
-        u32 *imap, *tmp;
+        const u32 *imap, *tmp;
        int imaplen, intsize, unit;
        struct device_node *iic;
        struct irq_host *iic_host;
@@ -258,25 +258,25 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
 #endif
        /* Now do the horrible hacks */
-        tmp = (u32 *)get_property(pic->of_node, "#interrupt-cells", NULL);
+        tmp = get_property(pic->of_node, "#interrupt-cells", NULL);
        if (tmp == NULL)
                return NO_IRQ;
        intsize = *tmp;
-        imap = (u32 *)get_property(pic->of_node, "interrupt-map", &imaplen);
+        imap = get_property(pic->of_node, "interrupt-map", &imaplen);
        if (imap == NULL || imaplen < (intsize + 1))
                return NO_IRQ;
        iic = of_find_node_by_phandle(imap[intsize]);
        if (iic == NULL)
                return NO_IRQ;
        imap += intsize + 1;
-        tmp = (u32 *)get_property(iic, "#interrupt-cells", NULL);
+        tmp = get_property(iic, "#interrupt-cells", NULL);
        if (tmp == NULL)
                return NO_IRQ;
        intsize = *tmp;
        /* Assume unit is last entry of interrupt specifier */
        unit = imap[intsize - 1];
        /* Ok, we have a unit, now let's try to get the node */
-        tmp = (u32 *)get_property(iic, "ibm,interrupt-server-ranges", NULL);
+        tmp = get_property(iic, "ibm,interrupt-server-ranges", NULL);
        if (tmp == NULL) {
                of_node_put(iic);
                return NO_IRQ;
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index d06042deb021..3bd36d46ab4a 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -488,10 +488,10 @@ int spu_irq_class_1_bottom(struct spu *spu)
 static int __init find_spu_node_id(struct device_node *spe)
 {
-        unsigned int *id;
+        const unsigned int *id;
        struct device_node *cpu;
        cpu = spe->parent->parent;
-        id = (unsigned int *)get_property(cpu, "node-id", NULL);
+        id = get_property(cpu, "node-id", NULL);
        return id ? *id : 0;
 }
@@ -500,7 +500,7 @@ static int __init cell_spuprop_present(struct spu *spu, struct device_node *spe,
 {
        static DEFINE_MUTEX(add_spumem_mutex);
-        struct address_prop {
+        const struct address_prop {
                unsigned long address;
                unsigned int len;
        } __attribute__((packed)) *p;
@@ -511,7 +511,7 @@ static int __init cell_spuprop_present(struct spu *spu, struct device_node *spe,
        struct zone *zone;
        int ret;
-        p = (void*)get_property(spe, prop, &proplen);
+        p = get_property(spe, prop, &proplen);
        WARN_ON(proplen != sizeof (*p));
        start_pfn = p->address >> PAGE_SHIFT;
@@ -531,12 +531,12 @@ static int __init cell_spuprop_present(struct spu *spu, struct device_node *spe,
 static void __iomem * __init map_spe_prop(struct spu *spu,
                struct device_node *n, const char *name)
 {
-        struct address_prop {
+        const struct address_prop {
                unsigned long address;
                unsigned int len;
        } __attribute__((packed)) *prop;
-        void *p;
+        const void *p;
        int proplen;
        void* ret = NULL;
        int err = 0;
@@ -570,14 +570,14 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
 {
        struct irq_host *host;
        unsigned int isrc;
-        u32 *tmp;
+        const u32 *tmp;
        host = iic_get_irq_host(spu->node);
        if (host == NULL)
                return -ENODEV;
        /* Get the interrupt source from the device-tree */
-        tmp = (u32 *)get_property(np, "isrc", NULL);
+        tmp = get_property(np, "isrc", NULL);
        if (!tmp)
                return -ENODEV;
        spu->isrc = isrc = tmp[0];
@@ -593,7 +593,7 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
 static int __init spu_map_device(struct spu *spu, struct device_node *node)
 {
-        char *prop;
+        const char *prop;
        int ret;
        ret = -ENODEV;
diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c
index 150f67d6f90c..0dd4a64757d9 100644
--- a/arch/powerpc/platforms/chrp/nvram.c
+++ b/arch/powerpc/platforms/chrp/nvram.c
@@ -67,13 +67,14 @@ static void chrp_nvram_write(int addr, unsigned char val)
 void __init chrp_nvram_init(void)
 {
        struct device_node *nvram;
-        unsigned int *nbytes_p, proplen;
+        const unsigned int *nbytes_p;
+        unsigned int proplen;
        nvram = of_find_node_by_type(NULL, "nvram");
        if (nvram == NULL)
                return;
-        nbytes_p = (unsigned int *)get_property(nvram, "#bytes", &proplen);
+        nbytes_p = get_property(nvram, "#bytes", &proplen);
        if (nbytes_p == NULL || proplen != sizeof(unsigned int))
                return;
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 6802cdc3168a..0f4340506c75 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -214,11 +214,11 @@ void __init
 chrp_find_bridges(void)
 {
        struct device_node *dev;
-        int *bus_range;
+        const int *bus_range;
        int len, index = -1;
        struct pci_controller *hose;
-        unsigned int *dma;
+        const unsigned int *dma;
-        char *model, *machine;
+        const char *model, *machine;
        int is_longtrail = 0, is_mot = 0, is_pegasos = 0;
        struct device_node *root = find_path_device("/");
        struct resource r;
@@ -246,7 +246,7 @@ chrp_find_bridges(void)
                               dev->full_name);
                        continue;
                }
-                bus_range = (int *) get_property(dev, "bus-range", &len);
+                bus_range = get_property(dev, "bus-range", &len);
                if (bus_range == NULL || len < 2 * sizeof(int)) {
                        printk(KERN_WARNING "Can't get bus-range for %s\n",
                                dev->full_name);
@@ -257,7 +257,7 @@ chrp_find_bridges(void)
                else
                        printk(KERN_INFO "PCI buses %d..%d",
                               bus_range[0], bus_range[1]);
-                printk(" controlled by %s", dev->type);
+                printk(" controlled by %s", dev->full_name);
                if (!is_longtrail)
                        printk(" at %llx", (unsigned long long)r.start);
                printk("\n");
@@ -289,6 +289,19 @@ chrp_find_bridges(void)
                        setup_indirect_pci(hose, 0xfec00cf8, 0xfee00cfc);
                } else if (is_pegasos == 2) {
                        setup_peg2(hose, dev);
+                } else if (!strncmp(model, "IBM,CPC710", 10)) {
+                        setup_indirect_pci(hose,
+                                           r.start + 0x000f8000,
+                                           r.start + 0x000f8010);
+                        if (index == 0) {
+                                dma = get_property(dev, "system-dma-base",&len);
+                                if (dma && len >= sizeof(*dma)) {
+                                        dma = (unsigned int *)
+                                                (((unsigned long)dma) +
+                                                len - sizeof(*dma));
+                                                pci_dram_offset = *dma;
+                                }
+                        }
                } else {
                        printk("No methods for %s (model %s), using RTAS\n",
                               dev->full_name, model);
@@ -299,15 +312,35 @@ chrp_find_bridges(void)
                /* check the first bridge for a property that we can
                   use to set pci_dram_offset */
-                dma = (unsigned int *)
+                dma = get_property(dev, "ibm,dma-ranges", &len);
-                        get_property(dev, "ibm,dma-ranges", &len);
                if (index == 0 && dma != NULL && len >= 6 * sizeof(*dma)) {
                        pci_dram_offset = dma[2] - dma[3];
                        printk("pci_dram_offset = %lx\n", pci_dram_offset);
                }
        }
+}
+/* SL82C105 IDE Control/Status Register */
+#define SL82C105_IDECSR                0x40
+/* Fixup for Winbond ATA quirk, required for briq */
+void chrp_pci_fixup_winbond_ata(struct pci_dev *sl82c105)
+{
+        u8 progif;
-        /* Do not fixup interrupts from OF tree on pegasos */
+        /* If non-briq machines need that fixup too, please speak up */
-        if (is_pegasos)
+        if (!machine_is(chrp) || _chrp_type != _CHRP_briq)
-                ppc_md.pcibios_fixup = NULL;
+                return;
+        if ((sl82c105->class & 5) != 5) {
+                printk("W83C553: Switching SL82C105 IDE to PCI native mode\n");
+                /* Enable SL82C105 PCI native IDE mode */
+                pci_read_config_byte(sl82c105, PCI_CLASS_PROG, &progif);
+                pci_write_config_byte(sl82c105, PCI_CLASS_PROG, progif | 0x05);
+                sl82c105->class |= 0x05;
+                /* Disable SL82C105 second port */
+                pci_write_config_word(sl82c105, SL82C105_IDECSR, 0x0003);
+        }
 }
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
+                chrp_pci_fixup_winbond_ata);
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 9c08ff322290..488dbd9b51ae 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -74,6 +74,9 @@ extern irqreturn_t xmon_irq(int, void *, struct pt_regs *);
 extern unsigned long loops_per_jiffy;
+/* To be replaced by RTAS when available */
+static unsigned int *briq_SPOR;
 #ifdef CONFIG_SMP
 extern struct smp_ops_t chrp_smp_ops;
 #endif
@@ -92,6 +95,15 @@ static const char *gg2_cachemodes[4] = {
        "Disabled", "Write-Through", "Copy-Back", "Transparent Mode"
 };
+static const char *chrp_names[] = {
+        "Unknown",
+        "","","",
+        "Motorola",
+        "IBM or Longtrail",
+        "Genesi Pegasos",
+        "Total Impact Briq"
+};
 void chrp_show_cpuinfo(struct seq_file *m)
 {
        int i, sdramen;
@@ -214,8 +226,7 @@ static void __init pegasos_set_l2cr(void)
        /* Enable L2 cache if needed */
        np = find_type_devices("cpu");
        if (np != NULL) {
-                unsigned int *l2cr = (unsigned int *)
+                const unsigned int *l2cr = get_property(np, "l2cr", NULL);
-                        get_property (np, "l2cr", NULL);
                if (l2cr == NULL) {
                        printk ("Pegasos l2cr : no cpu l2cr property found\n");
                        return;
@@ -229,10 +240,18 @@ static void __init pegasos_set_l2cr(void)
        }
 }
+static void briq_restart(char *cmd)
+{
+        local_irq_disable();
+        if (briq_SPOR)
+                out_be32(briq_SPOR, 0);
+        for(;;);
+}
 void __init chrp_setup_arch(void)
 {
        struct device_node *root = find_path_device ("/");
-        char *machine = NULL;
+        const char *machine = NULL;
        /* init to some ~sane value until calibrate_delay() runs */
        loops_per_jiffy = 50000000/HZ;
@@ -245,11 +264,16 @@ void __init chrp_setup_arch(void)
                _chrp_type = _CHRP_IBM;
        } else if (machine && strncmp(machine, "MOT", 3) == 0) {
                _chrp_type = _CHRP_Motorola;
+        } else if (machine && strncmp(machine, "TotalImpact,BRIQ-1", 18) == 0) {
+                _chrp_type = _CHRP_briq;
+                /* Map the SPOR register on briq and change the restart hook */
+                briq_SPOR = (unsigned int *)ioremap(0xff0000e8, 4);
+                ppc_md.restart = briq_restart;
        } else {
                /* Let's assume it is an IBM chrp if all else fails */
                _chrp_type = _CHRP_IBM;
        }
-        printk("chrp type = %x\n", _chrp_type);
+        printk("chrp type = %x [%s]\n", _chrp_type, chrp_names[_chrp_type]);
        rtas_initialize();
        if (rtas_token("display-character") >= 0)
@@ -328,7 +352,7 @@ static void __init chrp_find_openpic(void)
        struct device_node *np, *root;
        int len, i, j;
        int isu_size, idu_size;
-        unsigned int *iranges, *opprop = NULL;
+        const unsigned int *iranges, *opprop = NULL;
        int oplen = 0;
        unsigned long opaddr;
        int na = 1;
@@ -338,8 +362,7 @@ static void __init chrp_find_openpic(void)
                return;
        root = of_find_node_by_path("/");
        if (root) {
-                opprop = (unsigned int *) get_property
+                opprop = get_property(root, "platform-open-pic", &oplen);
-                        (root, "platform-open-pic", &oplen);
                na = prom_n_addr_cells(root);
        }
        if (opprop && oplen >= na * sizeof(unsigned int)) {
@@ -356,7 +379,7 @@ static void __init chrp_find_openpic(void)
        printk(KERN_INFO "OpenPIC at %lx\n", opaddr);
-        iranges = (unsigned int *) get_property(np, "interrupt-ranges", &len);
+        iranges = get_property(np, "interrupt-ranges", &len);
        if (iranges == NULL)
                len = 0;        /* non-distributed mpic */
        else
@@ -442,8 +465,8 @@ static void __init chrp_find_8259(void)
         * from anyway
         */
        for (np = find_devices("pci"); np != NULL; np = np->next) {
-                unsigned int *addrp = (unsigned int *)
+                const unsigned int *addrp = get_property(np,
-                        get_property(np, "8259-interrupt-acknowledge", NULL);
+                                "8259-interrupt-acknowledge", NULL);
                if (addrp == NULL)
                        continue;
@@ -502,7 +525,7 @@ void __init
 chrp_init2(void)
 {
        struct device_node *device;
-        unsigned int *p = NULL;
+        const unsigned int *p = NULL;
 #ifdef CONFIG_NVRAM
        chrp_nvram_init();
@@ -520,8 +543,7 @@ chrp_init2(void)
         */
        device = find_devices("rtas");
        if (device)
-                p = (unsigned int *) get_property
+                p = get_property(device, "rtas-event-scan-rate", NULL);
-                        (device, "rtas-event-scan-rate", NULL);
        if (p && *p) {
                /*
                 * Arrange to call chrp_event_scan at least *p times
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 5d393eb94935..e4f2b9df5e17 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -95,7 +95,7 @@ void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)
 {
        struct pci_controller *hose;
        struct device_node *node;
-        unsigned int *interrupt;
+        const unsigned int *interrupt;
        int busnr;
        int len;
        u8 slot;
@@ -112,7 +112,7 @@ void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)
        if (!node)
                printk(KERN_ERR "No pci node found\n");
-        interrupt = (unsigned int *) get_property(node, "interrupt-map", &len);
+        interrupt = get_property(node, "interrupt-map", &len);
        slot = find_slot_by_devfn(interrupt, dev->devfn);
        pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
        if (pin == 0 || pin > 4)
@@ -141,9 +141,9 @@ static void __init mpc7448_hpc2_setup_arch(void)
        cpu = of_find_node_by_type(NULL, "cpu");
        if (cpu != 0) {
-                unsigned int *fp;
+                const unsigned int *fp;
-                fp = (int *)get_property(cpu, "clock-frequency", NULL);
+                fp = get_property(cpu, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 3d957a30c8c2..887b68804e6d 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -3,13 +3,17 @@ menu "iSeries device drivers"
        depends on PPC_ISERIES
 config VIOCONS
-        tristate "iSeries Virtual Console Support"
+        tristate "iSeries Virtual Console Support (Obsolete)"
+        help
+          This is the old virtual console driver for legacy iSeries.
+          You should use the iSeries Hypervisor Virtual Console
+          support instead.
 config VIODASD
        tristate "iSeries Virtual I/O disk support"
        help
          If you are running on an iSeries system and you want to use
-          virtual disks created and managed by OS/400, say Y.
+          virtual disks created and managed by OS/400, say Y.
 config VIOCD
        tristate "iSeries Virtual I/O CD support"
diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c
index d194140c1ebf..e305deee7f44 100644
--- a/arch/powerpc/platforms/iseries/dt.c
+++ b/arch/powerpc/platforms/iseries/dt.c
@@ -1,5 +1,6 @@
 /*
- *    Copyright (c) 2005-2006 Michael Ellerman, IBM Corporation
+ *    Copyright (C) 2005-2006 Michael Ellerman, IBM Corporation
+ *    Copyright (C) 2000-2004, IBM Corporation
 *
 *    Description:
 *      This file contains all the routines to build a flattened device
@@ -33,13 +34,13 @@
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call_xm.h>
-#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/udbg.h>
 #include "processor_vpd.h"
 #include "call_hpt.h"
 #include "call_pci.h"
 #include "pci.h"
+#include "it_exp_vpd_panel.h"
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -76,6 +77,43 @@ static char __initdata device_type_pci[] = "pci";
 static char __initdata device_type_vdevice[] = "vdevice";
 static char __initdata device_type_vscsi[] = "vscsi";
+/* EBCDIC to ASCII conversion routines */
+static unsigned char __init e2a(unsigned char x)
+{
+        switch (x) {
+        case 0x81 ... 0x89:
+                return x - 0x81 + 'a';
+        case 0x91 ... 0x99:
+                return x - 0x91 + 'j';
+        case 0xA2 ... 0xA9:
+                return x - 0xA2 + 's';
+        case 0xC1 ... 0xC9:
+                return x - 0xC1 + 'A';
+        case 0xD1 ... 0xD9:
+                return x - 0xD1 + 'J';
+        case 0xE2 ... 0xE9:
+                return x - 0xE2 + 'S';
+        case 0xF0 ... 0xF9:
+                return x - 0xF0 + '0';
+        }
+        return ' ';
+}
+static unsigned char * __init strne2a(unsigned char *dest,
+                const unsigned char *src, size_t n)
+{
+        int i;
+        n = strnlen(src, n);
+        for (i = 0; i < n; i++)
+                dest[i] = e2a(src[i]);
+        return dest;
+}
 static struct iseries_flat_dt * __init dt_init(void)
 {
        struct iseries_flat_dt *dt;
@@ -298,7 +336,8 @@ static void __init dt_vdevices(struct iseries_flat_dt *dt)
        dt_prop_u32(dt, "#address-cells", 1);
        dt_prop_u32(dt, "#size-cells", 0);
-        dt_do_vdevice(dt, "vty", reg, -1, device_type_serial, NULL, 1);
+        dt_do_vdevice(dt, "vty", reg, -1, device_type_serial,
+                        "IBM,iSeries-vty", 1);
        reg++;
        dt_do_vdevice(dt, "v-scsi", reg, -1, device_type_vscsi,
diff --git a/arch/powerpc/platforms/iseries/hvlpconfig.c b/arch/powerpc/platforms/iseries/hvlpconfig.c
index 663a1affb4bb..f0475f0b1853 100644
--- a/arch/powerpc/platforms/iseries/hvlpconfig.c
+++ b/arch/powerpc/platforms/iseries/hvlpconfig.c
@@ -18,9 +18,22 @@
 #include <linux/module.h>
 #include <asm/iseries/hv_lp_config.h>
+#include "it_lp_naca.h"
 HvLpIndex HvLpConfig_getLpIndex_outline(void)
 {
        return HvLpConfig_getLpIndex();
 }
 EXPORT_SYMBOL(HvLpConfig_getLpIndex_outline);
+HvLpIndex HvLpConfig_getLpIndex(void)
+{
+        return itLpNaca.xLpIndex;
+}
+EXPORT_SYMBOL(HvLpConfig_getLpIndex);
+HvLpIndex HvLpConfig_getPrimaryLpIndex(void)
+{
+        return itLpNaca.xPrimaryLpIndex;
+}
+EXPORT_SYMBOL_GPL(HvLpConfig_getPrimaryLpIndex);
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index e3bd2015f2c9..f4cbbcf8773a 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -88,6 +88,23 @@ static void tce_free_iSeries(struct iommu_table *tbl, long index, long npages)
 }
 /*
+ * Structure passed to HvCallXm_getTceTableParms
+ */
+struct iommu_table_cb {
+        unsigned long   itc_busno;      /* Bus number for this tce table */
+        unsigned long   itc_start;      /* Will be NULL for secondary */
+        unsigned long   itc_totalsize;  /* Size (in pages) of whole table */
+        unsigned long   itc_offset;     /* Index into real tce table of the
+                                           start of our section */
+        unsigned long   itc_size;       /* Size (in pages) of our section */
+        unsigned long   itc_index;      /* Index of this tce table */
+        unsigned short  itc_maxtables;  /* Max num of tables for partition */
+        unsigned char   itc_virtbus;    /* Flag to indicate virtual bus */
+        unsigned char   itc_slotno;     /* IOA Tce Slot Index */
+        unsigned char   itc_rsvd[4];
+};
+/*
 * Call Hv with the architected data structure to get TCE table info.
 * info. Put the returned data into the Linux representation of the
 * TCE table data.
@@ -162,7 +179,7 @@ void iommu_devnode_init_iSeries(struct device_node *dn)
 {
        struct iommu_table *tbl;
        struct pci_dn *pdn = PCI_DN(dn);
-        u32 *lsn = (u32 *)get_property(dn, "linux,logical-slot-number", NULL);
+        const u32 *lsn = get_property(dn, "linux,logical-slot-number", NULL);
        BUG_ON(lsn == NULL);
diff --git a/include/asm-powerpc/iseries/it_exp_vpd_panel.h b/arch/powerpc/platforms/iseries/it_exp_vpd_panel.h
index 304a609ae21a..6de9097b7f57 100644
--- a/include/asm-powerpc/iseries/it_exp_vpd_panel.h
+++ b/arch/powerpc/platforms/iseries/it_exp_vpd_panel.h
@@ -15,8 +15,8 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
-#ifndef _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H
+#ifndef _PLATFORMS_ISERIES_IT_EXT_VPD_PANEL_H
-#define _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H
+#define _PLATFORMS_ISERIES_IT_EXT_VPD_PANEL_H
 /*
 *      This struct maps the panel information
@@ -48,4 +48,4 @@ struct ItExtVpdPanel {
 extern struct ItExtVpdPanel     xItExtVpdPanel;
-#endif /* _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H */
+#endif /* _PLATFORMS_ISERIES_IT_EXT_VPD_PANEL_H */
diff --git a/include/asm-powerpc/iseries/it_lp_naca.h b/arch/powerpc/platforms/iseries/it_lp_naca.h
index 4fdcf052927f..9bbf58986819 100644
--- a/include/asm-powerpc/iseries/it_lp_naca.h
+++ b/arch/powerpc/platforms/iseries/it_lp_naca.h
@@ -15,8 +15,8 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
-#ifndef _ASM_POWERPC_ISERIES_IT_LP_NACA_H
+#ifndef _PLATFORMS_ISERIES_IT_LP_NACA_H
-#define _ASM_POWERPC_ISERIES_IT_LP_NACA_H
+#define _PLATFORMS_ISERIES_IT_LP_NACA_H
 #include <linux/types.h>
@@ -77,4 +77,4 @@ extern struct ItLpNaca		itLpNaca;
 #define ITLPNACA_HWSYNCEDTBS    0x20    /* Hardware synced TBs */
 #define ITLPNACA_HMTINT         0x10    /* Utilize MHT for interrupts */
-#endif /* _ASM_POWERPC_ISERIES_IT_LP_NACA_H */
+#endif /* _PLATFORMS_ISERIES_IT_LP_NACA_H */
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
index a7769445d6c7..8162049bb04d 100644
--- a/arch/powerpc/platforms/iseries/lpardata.c
+++ b/arch/powerpc/platforms/iseries/lpardata.c
@@ -13,12 +13,10 @@
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/abs_addr.h>
-#include <asm/iseries/it_lp_naca.h>
 #include <asm/lppaca.h>
 #include <asm/iseries/it_lp_reg_save.h>
 #include <asm/paca.h>
 #include <asm/iseries/lpar_map.h>
-#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/iseries/it_lp_queue.h>
 #include "naca.h"
@@ -27,6 +25,8 @@
 #include "ipl_parms.h"
 #include "processor_vpd.h"
 #include "release_data.h"
+#include "it_exp_vpd_panel.h"
+#include "it_lp_naca.h"
 /* The HvReleaseData is the root of the information shared between
 * the hypervisor and Linux.
@@ -127,14 +127,12 @@ struct ItLpNaca itLpNaca = {
                (u64)instruction_access_slb_iSeries /* 0x480 I-SLB */
        }
 };
-EXPORT_SYMBOL(itLpNaca);
 /* May be filled in by the hypervisor so cannot end up in the BSS */
 struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));
 /* May be filled in by the hypervisor so cannot end up in the BSS */
 struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
-EXPORT_SYMBOL(xItExtVpdPanel);
 #define maxPhysicalProcessors 32
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index 2a9f81ea27d6..98c1c2440aad 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -20,7 +20,7 @@
 #include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
-#include <asm/iseries/it_lp_naca.h>
+#include "it_lp_naca.h"
 /*
 * The LpQueue is used to pass event data from the hypervisor to
diff --git a/arch/powerpc/platforms/iseries/main_store.h b/arch/powerpc/platforms/iseries/main_store.h
index 74f6889f834f..1a7a3f50e40b 100644
--- a/arch/powerpc/platforms/iseries/main_store.h
+++ b/arch/powerpc/platforms/iseries/main_store.h
@@ -61,9 +61,9 @@ struct IoHriMainStoreSegment4 {
 };
 /* Main Store VPD for Power4 */
-struct IoHriMainStoreChipInfo1 {
+struct __attribute((packed)) IoHriMainStoreChipInfo1 {
-        u32     chipMfgID       __attribute((packed));
+        u32     chipMfgID;
-        char    chipECLevel[4]  __attribute((packed));
+        char    chipECLevel[4];
 };
 struct IoHriMainStoreVpdIdData {
@@ -73,72 +73,72 @@ struct IoHriMainStoreVpdIdData {
        char    serialNumber[12];
 };
-struct IoHriMainStoreVpdFruData {
+struct  __attribute((packed)) IoHriMainStoreVpdFruData {
-        char    fruLabel[8]     __attribute((packed));
+        char    fruLabel[8];
-        u8      numberOfSlots   __attribute((packed));
+        u8      numberOfSlots;
-        u8      pluggingType    __attribute((packed));
+        u8      pluggingType;
-        u16     slotMapIndex    __attribute((packed));
+        u16     slotMapIndex;
 };
-struct IoHriMainStoreAdrRangeBlock {
+struct  __attribute((packed)) IoHriMainStoreAdrRangeBlock {
-        void    *blockStart      __attribute((packed));
+        void    *blockStart;
-        void    *blockEnd        __attribute((packed));
+        void    *blockEnd;
-        u32     blockProcChipId __attribute((packed));
+        u32     blockProcChipId;
 };
 #define MaxAreaAdrRangeBlocks 4
-struct IoHriMainStoreArea4 {
+struct __attribute((packed)) IoHriMainStoreArea4 {
-        u32     msVpdFormat                     __attribute((packed));
+        u32     msVpdFormat;
-        u8      containedVpdType                __attribute((packed));
+        u8      containedVpdType;
-        u8      reserved1                       __attribute((packed));
+        u8      reserved1;
-        u16     reserved2                       __attribute((packed));
+        u16     reserved2;
-        u64     msExists                        __attribute((packed));
+        u64     msExists;
-        u64     msFunctional                    __attribute((packed));
+        u64     msFunctional;
-        u32     memorySize                      __attribute((packed));
+        u32     memorySize;
-        u32     procNodeId                      __attribute((packed));
+        u32     procNodeId;
-        u32     numAdrRangeBlocks               __attribute((packed));
+        u32     numAdrRangeBlocks;
-        struct IoHriMainStoreAdrRangeBlock xAdrRangeBlock[MaxAreaAdrRangeBlocks]        __attribute((packed));
+        struct IoHriMainStoreAdrRangeBlock xAdrRangeBlock[MaxAreaAdrRangeBlocks];
-        struct IoHriMainStoreChipInfo1  chipInfo0       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo0;
-        struct IoHriMainStoreChipInfo1  chipInfo1       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo1;
-        struct IoHriMainStoreChipInfo1  chipInfo2       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo2;
-        struct IoHriMainStoreChipInfo1  chipInfo3       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo3;
-        struct IoHriMainStoreChipInfo1  chipInfo4       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo4;
-        struct IoHriMainStoreChipInfo1  chipInfo5       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo5;
-        struct IoHriMainStoreChipInfo1  chipInfo6       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo6;
-        struct IoHriMainStoreChipInfo1  chipInfo7       __attribute((packed));
+        struct IoHriMainStoreChipInfo1  chipInfo7;
-        void    *msRamAreaArray                 __attribute((packed));
+        void    *msRamAreaArray;
-        u32     msRamAreaArrayNumEntries        __attribute((packed));
+        u32     msRamAreaArrayNumEntries;
-        u32     msRamAreaArrayEntrySize         __attribute((packed));
+        u32     msRamAreaArrayEntrySize;
-        u32     numaDimmExists                  __attribute((packed));
+        u32     numaDimmExists;
-        u32     numaDimmFunctional              __attribute((packed));
+        u32     numaDimmFunctional;
-        void    *numaDimmArray                  __attribute((packed));
+        void    *numaDimmArray;
-        u32     numaDimmArrayNumEntries         __attribute((packed));
+        u32     numaDimmArrayNumEntries;
-        u32     numaDimmArrayEntrySize          __attribute((packed));
+        u32     numaDimmArrayEntrySize;
-        struct IoHriMainStoreVpdIdData idData   __attribute((packed));
+        struct IoHriMainStoreVpdIdData idData;
-        u64     powerData                       __attribute((packed));
+        u64     powerData;
-        u64     cardAssemblyPartNum             __attribute((packed));
+        u64     cardAssemblyPartNum;
-        u64     chipSerialNum                   __attribute((packed));
+        u64     chipSerialNum;
-        u64     reserved3                       __attribute((packed));
+        u64     reserved3;
-        char    reserved4[16]                   __attribute((packed));
+        char    reserved4[16];
-        struct IoHriMainStoreVpdFruData fruData __attribute((packed));
+        struct IoHriMainStoreVpdFruData fruData;
-        u8      vpdPortNum                      __attribute((packed));
+        u8      vpdPortNum;
-        u8      reserved5                       __attribute((packed));
+        u8      reserved5;
-        u8      frameId                         __attribute((packed));
+        u8      frameId;
-        u8      rackUnit                        __attribute((packed));
+        u8      rackUnit;
-        char    asciiKeywordVpd[256]            __attribute((packed));
+        char    asciiKeywordVpd[256];
-        u32     reserved6                       __attribute((packed));
+        u32     reserved6;
 };
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 35bcc98111f5..f4d427a7bb2d 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -176,12 +176,12 @@ void iSeries_pcibios_init(void)
        }
        while ((node = of_get_next_child(root, node)) != NULL) {
                HvBusNumber bus;
-                u32 *busp;
+                const u32 *busp;
                if ((node->type == NULL) || (strcmp(node->type, "pci") != 0))
                        continue;
-                busp = (u32 *)get_property(node, "bus-range", NULL);
+                busp = get_property(node, "bus-range", NULL);
                if (busp == NULL)
                        continue;
                bus = *busp;
@@ -221,10 +221,9 @@ void __init iSeries_pci_final_fixup(void)
                if (node != NULL) {
                        struct pci_dn *pdn = PCI_DN(node);
-                        u32 *agent;
+                        const u32 *agent;
-                        agent = (u32 *)get_property(node, "linux,agent-id",
+                        agent = get_property(node, "linux,agent-id", NULL);
-                                        NULL);
                        if ((pdn != NULL) && (agent != NULL)) {
                                u8 irq = iSeries_allocate_IRQ(pdn->busno, 0,
                                                pdn->bussubno);
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index c9605d773a77..7f1953066ff8 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -59,6 +59,7 @@
 #include "irq.h"
 #include "vpd_areas.h"
 #include "processor_vpd.h"
+#include "it_lp_naca.h"
 #include "main_store.h"
 #include "call_sm.h"
 #include "call_hpt.h"
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 622a30149b48..9baa4ee82592 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -41,8 +41,8 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
+#include <asm/prom.h>
 #include <asm/iseries/hv_types.h>
-#include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/mf.h>
@@ -116,6 +116,8 @@ static int proc_viopath_show(struct seq_file *m, void *v)
        dma_addr_t handle;
        HvLpEvent_Rc hvrc;
        DECLARE_MUTEX_LOCKED(Semaphore);
+        struct device_node *node;
+        const char *sysid;
        buf = kmalloc(HW_PAGE_SIZE, GFP_KERNEL);
        if (!buf)
@@ -143,20 +145,26 @@ static int proc_viopath_show(struct seq_file *m, void *v)
        buf[HW_PAGE_SIZE-1] = '\0';
        seq_printf(m, "%s", buf);
-        seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap);
-        seq_printf(m, "SRLNBR=%c%c%c%c%c%c%c\n",
-                   e2a(xItExtVpdPanel.mfgID[2]),
-                   e2a(xItExtVpdPanel.mfgID[3]),
-                   e2a(xItExtVpdPanel.systemSerial[1]),
-                   e2a(xItExtVpdPanel.systemSerial[2]),
-                   e2a(xItExtVpdPanel.systemSerial[3]),
-                   e2a(xItExtVpdPanel.systemSerial[4]),
-                   e2a(xItExtVpdPanel.systemSerial[5]));
        dma_unmap_single(iSeries_vio_dev, handle, HW_PAGE_SIZE,
                         DMA_FROM_DEVICE);
        kfree(buf);
+        seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap);
+        node = of_find_node_by_path("/");
+        sysid = NULL;
+        if (node != NULL)
+                sysid = get_property(node, "system-id", NULL);
+        if (sysid == NULL)
+                seq_printf(m, "SRLNBR=<UNKNOWN>\n");
+        else
+                /* Skip "IBM," on front of serial number, see dt.c */
+                seq_printf(m, "SRLNBR=%s\n", sysid + 4);
+        of_node_put(node);
        return 0;
 }
diff --git a/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c
index 23a6d1e5b429..9f83878a0c2e 100644
--- a/arch/powerpc/platforms/iseries/vpdinfo.c
+++ b/arch/powerpc/platforms/iseries/vpdinfo.c
@@ -188,7 +188,7 @@ static void __init iSeries_Parse_Vpd(u8 *VpdData, int VpdDataLen,
 {
        u8 *TagPtr = VpdData;
        int DataLen = VpdDataLen - 3;
-        u8 PhbId;
+        u8 PhbId = 0xff;
        while ((*TagPtr != VpdEndOfAreaTag) && (DataLen > 0)) {
                int AreaLen = *(TagPtr + 1) + (*(TagPtr + 2) * 256);
@@ -205,15 +205,16 @@ static void __init iSeries_Parse_Vpd(u8 *VpdData, int VpdDataLen,
        }
 }
-static void __init iSeries_Get_Location_Code(u16 bus, HvAgentId agent,
+static int __init iSeries_Get_Location_Code(u16 bus, HvAgentId agent,
                u8 *frame, char card[4])
 {
+        int status = 0;
        int BusVpdLen = 0;
        u8 *BusVpdPtr = kmalloc(BUS_VPDSIZE, GFP_KERNEL);
        if (BusVpdPtr == NULL) {
                printk("PCI: Bus VPD Buffer allocation failure.\n");
-                return;
+                return 0;
        }
        BusVpdLen = HvCallPci_getBusVpd(bus, iseries_hv_addr(BusVpdPtr),
                                        BUS_VPDSIZE);
@@ -228,8 +229,10 @@ static void __init iSeries_Get_Location_Code(u16 bus, HvAgentId agent,
                goto out_free;
        }
        iSeries_Parse_Vpd(BusVpdPtr, BusVpdLen, agent, frame, card);
+        status = 1;
 out_free:
        kfree(BusVpdPtr);
+        return status;
 }
 /*
@@ -246,7 +249,7 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count)
        struct device_node *DevNode = PciDev->sysdata;
        struct pci_dn *pdn;
        u16 bus;
-        u8 frame;
+        u8 frame = 0;
        char card[4];
        HvSubBusNumber subbus;
        HvAgentId agent;
@@ -262,10 +265,11 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count)
        subbus = pdn->bussubno;
        agent = ISERIES_PCI_AGENTID(ISERIES_GET_DEVICE_FROM_SUBBUS(subbus),
                        ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus));
-        iSeries_Get_Location_Code(bus, agent, &frame, card);
-        printk("%d. PCI: Bus%3d, Device%3d, Vendor %04X Frame%3d, Card %4s  ",
+        if (iSeries_Get_Location_Code(bus, agent, &frame, card)) {
-                        count, bus, PCI_SLOT(PciDev->devfn), PciDev->vendor,
+                printk("%d. PCI: Bus%3d, Device%3d, Vendor %04X Frame%3d, "
-                        frame, card);
+                        "Card %4s  0x%04X\n", count, bus,
-        printk("0x%04X\n", (int)(PciDev->class >> 8));
+                        PCI_SLOT(PciDev->devfn), PciDev->vendor, frame,
+                        card, (int)(PciDev->class >> 8));
+        }
 }
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 63a1670d3bfd..dc05af5156a9 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -38,16 +38,16 @@ static struct pci_controller *u3_agp, *u3_ht;
 static int __init fixup_one_level_bus_range(struct device_node *node, int higher)
 {
        for (; node != 0;node = node->sibling) {
-                int * bus_range;
+                const int *bus_range;
-                unsigned int *class_code;
+                const unsigned int *class_code;
                int len;
                /* For PCI<->PCI bridges or CardBus bridges, we go down */
-                class_code = (unsigned int *) get_property(node, "class-code", NULL);
+                class_code = get_property(node, "class-code", NULL);
                if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI &&
                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS))
                        continue;
-                bus_range = (int *) get_property(node, "bus-range", &len);
+                bus_range = get_property(node, "bus-range", &len);
                if (bus_range != NULL && len > 2 * sizeof(int)) {
                        if (bus_range[1] > higher)
                                higher = bus_range[1];
@@ -65,16 +65,18 @@ static int __init fixup_one_level_bus_range(struct device_node *node, int higher
 */
 static void __init fixup_bus_range(struct device_node *bridge)
 {
-        int * bus_range;
+        int *bus_range;
+        struct property *prop;
        int len;
        /* Lookup the "bus-range" property for the hose */
-        bus_range = (int *) get_property(bridge, "bus-range", &len);
+        prop = of_find_property(bridge, "bus-range", &len);
-        if (bus_range == NULL || len < 2 * sizeof(int)) {
+        if (prop == NULL  || prop->value == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s\n",
                               bridge->full_name);
                return;
        }
+        bus_range = (int *)prop->value;
        bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);
 }
@@ -314,12 +316,12 @@ static int __init add_bridge(struct device_node *dev)
        int len;
        struct pci_controller *hose;
        char* disp_name;
-        int *bus_range;
+        const int *bus_range;
        int primary = 1;
        DBG("Adding PCI host bridge %s\n", dev->full_name);
-        bus_range = (int *) get_property(dev, "bus-range", &len);
+        bus_range = get_property(dev, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n",
                dev->full_name);
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 57567dfb9819..fe6b9bff61b9 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -99,8 +99,7 @@ static unsigned long maple_find_nvram_base(void)
 static void maple_restart(char *cmd)
 {
        unsigned int maple_nvram_base;
-        unsigned int maple_nvram_offset;
+        const unsigned int *maple_nvram_offset, *maple_nvram_command;
-        unsigned int maple_nvram_command;
        struct device_node *sp;
        maple_nvram_base = maple_find_nvram_base();
@@ -113,14 +112,12 @@ static void maple_restart(char *cmd)
                printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
                goto fail;
        }
-        maple_nvram_offset = *(unsigned int*) get_property(sp,
+        maple_nvram_offset = get_property(sp, "restart-addr", NULL);
-                        "restart-addr", NULL);
+        maple_nvram_command = get_property(sp, "restart-value", NULL);
-        maple_nvram_command = *(unsigned int*) get_property(sp,
-                        "restart-value", NULL);
        of_node_put(sp);
        /* send command */
-        outb_p(maple_nvram_command, maple_nvram_base + maple_nvram_offset);
+        outb_p(*maple_nvram_command, maple_nvram_base + *maple_nvram_offset);
        for (;;) ;
 fail:
        printk(KERN_EMERG "Maple: Manual Restart Required\n");
@@ -129,8 +126,7 @@ static void maple_restart(char *cmd)
 static void maple_power_off(void)
 {
        unsigned int maple_nvram_base;
-        unsigned int maple_nvram_offset;
+        const unsigned int *maple_nvram_offset, *maple_nvram_command;
-        unsigned int maple_nvram_command;
        struct device_node *sp;
        maple_nvram_base = maple_find_nvram_base();
@@ -143,14 +139,12 @@ static void maple_power_off(void)
                printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
                goto fail;
        }
-        maple_nvram_offset = *(unsigned int*) get_property(sp,
+        maple_nvram_offset = get_property(sp, "power-off-addr", NULL);
-                        "power-off-addr", NULL);
+        maple_nvram_command = get_property(sp, "power-off-value", NULL);
-        maple_nvram_command = *(unsigned int*) get_property(sp,
-                        "power-off-value", NULL);
        of_node_put(sp);
        /* send command */
-        outb_p(maple_nvram_command, maple_nvram_base + maple_nvram_offset);
+        outb_p(*maple_nvram_command, maple_nvram_base + *maple_nvram_offset);
        for (;;) ;
 fail:
        printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
@@ -211,7 +205,7 @@ static void __init maple_init_early(void)
 static void __init maple_init_IRQ(void)
 {
        struct device_node *root, *np, *mpic_node = NULL;
-        unsigned int *opprop;
+        const unsigned int *opprop;
        unsigned long openpic_addr = 0;
        int naddr, n, i, opplen, has_isus = 0;
        struct mpic *mpic;
@@ -241,8 +235,7 @@ static void __init maple_init_IRQ(void)
        /* Find address list in /platform-open-pic */
        root = of_find_node_by_path("/");
        naddr = prom_n_addr_cells(root);
-        opprop = (unsigned int *) get_property(root, "platform-open-pic",
+        opprop = get_property(root, "platform-open-pic", &opplen);
-                                               &opplen);
        if (opprop != 0) {
                openpic_addr = of_read_number(opprop, naddr);
                has_isus = (opplen > naddr);
diff --git a/arch/powerpc/platforms/pasemi/Makefile b/arch/powerpc/platforms/pasemi/Makefile
new file mode 100644
index 000000000000..1be1a993c5f5
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@ -0,0 +1 @@
+obj-y   += setup.o pci.o time.o
diff --git a/arch/powerpc/platforms/pasemi/pasemi.h b/arch/powerpc/platforms/pasemi/pasemi.h
new file mode 100644
index 000000000000..fd71d72736b2
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/pasemi.h
@@ -0,0 +1,8 @@
+#ifndef _PASEMI_PASEMI_H
+#define _PASEMI_PASEMI_H
+extern unsigned long pas_get_boot_time(void);
+extern void pas_pci_init(void);
+extern void pas_pcibios_fixup(void);
+#endif /* _PASEMI_PASEMI_H */
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
new file mode 100644
index 000000000000..4679c5230413
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2006 PA Semi, Inc
+ *
+ * Authors: Kip Walker, PA Semi
+ *          Olof Johansson, PA Semi
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * Based on arch/powerpc/platforms/maple/pci.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <asm/pci-bridge.h>
+#include <asm/machdep.h>
+#include <asm/ppc-pci.h>
+#define PA_PXP_CFA(bus, devfn, off) (((bus) << 20) | ((devfn) << 12) | (off))
+#define CONFIG_OFFSET_VALID(off) ((off) < 4096)
+static unsigned long pa_pxp_cfg_addr(struct pci_controller *hose,
+                                       u8 bus, u8 devfn, int offset)
+{
+        return ((unsigned long)hose->cfg_data) + PA_PXP_CFA(bus, devfn, offset);
+}
+static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn,
+                              int offset, int len, u32 *val)
+{
+        struct pci_controller *hose;
+        unsigned long addr;
+        hose = pci_bus_to_host(bus);
+        if (!hose)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        if (!CONFIG_OFFSET_VALID(offset))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        addr = pa_pxp_cfg_addr(hose, bus->number, devfn, offset);
+        /*
+         * Note: the caller has already checked that offset is
+         * suitably aligned and that len is 1, 2 or 4.
+         */
+        switch (len) {
+        case 1:
+                *val = in_8((u8 *)addr);
+                break;
+        case 2:
+                *val = in_le16((u16 *)addr);
+                break;
+        default:
+                *val = in_le32((u32 *)addr);
+                break;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+static int pa_pxp_write_config(struct pci_bus *bus, unsigned int devfn,
+                               int offset, int len, u32 val)
+{
+        struct pci_controller *hose;
+        unsigned long addr;
+        hose = pci_bus_to_host(bus);
+        if (!hose)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        if (!CONFIG_OFFSET_VALID(offset))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        addr = pa_pxp_cfg_addr(hose, bus->number, devfn, offset);
+        /*
+         * Note: the caller has already checked that offset is
+         * suitably aligned and that len is 1, 2 or 4.
+         */
+        switch (len) {
+        case 1:
+                out_8((u8 *)addr, val);
+                (void) in_8((u8 *)addr);
+                break;
+        case 2:
+                out_le16((u16 *)addr, val);
+                (void) in_le16((u16 *)addr);
+                break;
+        default:
+                out_le32((u32 *)addr, val);
+                (void) in_le32((u32 *)addr);
+                break;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+static struct pci_ops pa_pxp_ops = {
+        pa_pxp_read_config,
+        pa_pxp_write_config,
+};
+static void __init setup_pa_pxp(struct pci_controller *hose)
+{
+        hose->ops = &pa_pxp_ops;
+        hose->cfg_data = ioremap(0xe0000000, 0x10000000);
+}
+static int __init add_bridge(struct device_node *dev)
+{
+        struct pci_controller *hose;
+        pr_debug("Adding PCI host bridge %s\n", dev->full_name);
+        hose = pcibios_alloc_controller(dev);
+        if (!hose)
+                return -ENOMEM;
+        hose->first_busno = 0;
+        hose->last_busno = 0xff;
+        setup_pa_pxp(hose);
+        printk(KERN_INFO "Found PA-PXP PCI host bridge.\n");
+        /* Interpret the "ranges" property */
+        /* This also maps the I/O region and sets isa_io/mem_base */
+        pci_process_bridge_OF_ranges(hose, dev, 1);
+        pci_setup_phb_io(hose, 1);
+        return 0;
+}
+void __init pas_pcibios_fixup(void)
+{
+        struct pci_dev *dev = NULL;
+        for_each_pci_dev(dev)
+                pci_read_irq_line(dev);
+}
+static void __init pas_fixup_phb_resources(void)
+{
+        struct pci_controller *hose, *tmp;
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
+                unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
+                hose->io_resource.start += offset;
+                hose->io_resource.end += offset;
+                printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
+                       hose->global_number,
+                       hose->io_resource.start, hose->io_resource.end);
+        }
+}
+void __init pas_pci_init(void)
+{
+        struct device_node *np, *root;
+        root = of_find_node_by_path("/");
+        if (!root) {
+                printk(KERN_CRIT "pas_pci_init: can't find root "
+                        "of device tree\n");
+                return;
+        }
+        for (np = NULL; (np = of_get_next_child(root, np)) != NULL;)
+                if (np->name && !strcmp(np->name, "pxp") && !add_bridge(np))
+                        of_node_get(np);
+        of_node_put(root);
+        pas_fixup_phb_resources();
+        /* Setup the linkage between OF nodes and PHBs */
+        pci_devs_phb_init();
+        /* Use the common resource allocation mechanism */
+        pci_probe_only = 1;
+}
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
new file mode 100644
index 000000000000..628482671c15
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2006 PA Semi, Inc
+ *
+ * Authors: Kip Walker, PA Semi
+ *          Olof Johansson, PA Semi
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * Based on arch/powerpc/platforms/maple/setup.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/console.h>
+#include <asm/prom.h>
+#include <asm/system.h>
+#include <asm/iommu.h>
+#include <asm/machdep.h>
+#include <asm/mpic.h>
+#include <asm/smp.h>
+#include <asm/time.h>
+#include "pasemi.h"
+static void pas_restart(char *cmd)
+{
+        printk("restart unimplemented, looping...\n");
+        for (;;) ;
+}
+static void pas_power_off(void)
+{
+        printk("power off unimplemented, looping...\n");
+        for (;;) ;
+}
+static void pas_halt(void)
+{
+        pas_power_off();
+}
+#ifdef CONFIG_SMP
+struct smp_ops_t pas_smp_ops = {
+        .probe          = smp_mpic_probe,
+        .message_pass   = smp_mpic_message_pass,
+        .kick_cpu       = smp_generic_kick_cpu,
+        .setup_cpu      = smp_mpic_setup_cpu,
+        .give_timebase  = smp_generic_give_timebase,
+        .take_timebase  = smp_generic_take_timebase,
+};
+#endif /* CONFIG_SMP */
+void __init pas_setup_arch(void)
+{
+#ifdef CONFIG_SMP
+        /* Setup SMP callback */
+        smp_ops = &pas_smp_ops;
+#endif
+        /* Lookup PCI hosts */
+        pas_pci_init();
+#ifdef CONFIG_DUMMY_CONSOLE
+        conswitchp = &dummy_con;
+#endif
+        printk(KERN_DEBUG "Using default idle loop\n");
+}
+static void iommu_dev_setup_null(struct pci_dev *dev) { }
+static void iommu_bus_setup_null(struct pci_bus *bus) { }
+static void __init pas_init_early(void)
+{
+        /* No iommu code yet */
+        ppc_md.iommu_dev_setup = iommu_dev_setup_null;
+        ppc_md.iommu_bus_setup = iommu_bus_setup_null;
+        pci_direct_iommu_init();
+}
+/* No legacy IO on our parts */
+static int pas_check_legacy_ioport(unsigned int baseport)
+{
+        return -ENODEV;
+}
+static __init void pas_init_IRQ(void)
+{
+        struct device_node *np;
+        struct device_node *root, *mpic_node;
+        unsigned long openpic_addr;
+        const unsigned int *opprop;
+        int naddr, opplen;
+        struct mpic *mpic;
+        mpic_node = NULL;
+        for_each_node_by_type(np, "interrupt-controller")
+                if (device_is_compatible(np, "open-pic")) {
+                        mpic_node = np;
+                        break;
+                }
+        if (!mpic_node)
+                for_each_node_by_type(np, "open-pic") {
+                        mpic_node = np;
+                        break;
+                }
+        if (!mpic_node) {
+                printk(KERN_ERR
+                        "Failed to locate the MPIC interrupt controller\n");
+                return;
+        }
+        /* Find address list in /platform-open-pic */
+        root = of_find_node_by_path("/");
+        naddr = prom_n_addr_cells(root);
+        opprop = get_property(root, "platform-open-pic", &opplen);
+        if (!opprop) {
+                printk(KERN_ERR "No platform-open-pic property.\n");
+                of_node_put(root);
+                return;
+        }
+        openpic_addr = of_read_number(opprop, naddr);
+        printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
+        of_node_put(root);
+        mpic = mpic_alloc(mpic_node, openpic_addr, MPIC_PRIMARY, 0, 0,
+                          " PAS-OPIC  ");
+        BUG_ON(!mpic);
+        mpic_assign_isu(mpic, 0, openpic_addr + 0x10000);
+        mpic_init(mpic);
+        of_node_put(mpic_node);
+        of_node_put(root);
+}
+static void __init pas_progress(char *s, unsigned short hex)
+{
+        printk("[%04x] : %s\n", hex, s ? s : "");
+}
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init pas_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        if (!of_flat_dt_is_compatible(root, "PA6T-1682M"))
+                return 0;
+        hpte_init_native();
+        return 1;
+}
+define_machine(pas) {
+        .name                   = "PA Semi PA6T-1682M",
+        .probe                  = pas_probe,
+        .setup_arch             = pas_setup_arch,
+        .init_early             = pas_init_early,
+        .init_IRQ               = pas_init_IRQ,
+        .get_irq                = mpic_get_irq,
+        .pcibios_fixup          = pas_pcibios_fixup,
+        .restart                = pas_restart,
+        .power_off              = pas_power_off,
+        .halt                   = pas_halt,
+        .get_boot_time          = pas_get_boot_time,
+        .calibrate_decr         = generic_calibrate_decr,
+        .check_legacy_ioport    = pas_check_legacy_ioport,
+        .progress               = pas_progress,
+};
diff --git a/arch/powerpc/platforms/pasemi/time.c b/arch/powerpc/platforms/pasemi/time.c
new file mode 100644
index 000000000000..9bd410b8fec6
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/time.c
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2006 PA Semi, Inc
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#include <linux/config.h>
+#include <linux/time.h>
+#include <asm/time.h>
+unsigned long __init pas_get_boot_time(void)
+{
+        /* Let's just return a fake date right now */
+        return mktime(2006, 1, 1, 12, 0, 0);
+}
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index d66415491055..afa593a8544a 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -60,7 +60,8 @@ int pmac_has_backlight_type(const char *type)
        struct device_node* bk_node = find_devices("backlight");
        if (bk_node) {
-                char *prop = get_property(bk_node, "backlight-control", NULL);
+                const char *prop = get_property(bk_node,
+                                "backlight-control", NULL);
                if (prop && strncmp(prop, type, strlen(type)) == 0)
                        return 1;
        }
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 62926248bdb8..c2b6b4134f68 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -421,7 +421,7 @@ static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
 static u32 read_gpio(struct device_node *np)
 {
-        u32 *reg = (u32 *)get_property(np, "reg", NULL);
+        const u32 *reg = get_property(np, "reg", NULL);
        u32 offset;
        if (reg == NULL)
@@ -497,7 +497,7 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
                                                                "frequency-gpio");
        struct device_node *slew_done_gpio_np = of_find_node_by_name(NULL,
                                                                     "slewing-done");
-        u32 *value;
+        const u32 *value;
        /*
         * Check to see if it's GPIO driven or PMU only
@@ -519,15 +519,15 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
         */
        if (frequency_gpio && slew_done_gpio) {
                int lenp, rc;
-                u32 *freqs, *ratio;
+                const u32 *freqs, *ratio;
-                freqs = (u32 *)get_property(cpunode, "bus-frequencies", &lenp);
+                freqs = get_property(cpunode, "bus-frequencies", &lenp);
                lenp /= sizeof(u32);
                if (freqs == NULL || lenp != 2) {
                        printk(KERN_ERR "cpufreq: bus-frequencies incorrect or missing\n");
                        return 1;
                }
-                ratio = (u32 *)get_property(cpunode, "processor-to-bus-ratio*2", NULL);
+                ratio = get_property(cpunode, "processor-to-bus-ratio*2", NULL);
                if (ratio == NULL) {
                        printk(KERN_ERR "cpufreq: processor-to-bus-ratio*2 missing\n");
                        return 1;
@@ -562,7 +562,7 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
        /* If we use the PMU, look for the min & max frequencies in the
         * device-tree
         */
-        value = (u32 *)get_property(cpunode, "min-clock-frequency", NULL);
+        value = get_property(cpunode, "min-clock-frequency", NULL);
        if (!value)
                return 1;
        low_freq = (*value) / 1000;
@@ -571,7 +571,7 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
        if (low_freq < 100000)
                low_freq *= 10;
-        value = (u32 *)get_property(cpunode, "max-clock-frequency", NULL);
+        value = get_property(cpunode, "max-clock-frequency", NULL);
        if (!value)
                return 1;
        hi_freq = (*value) / 1000;
@@ -611,13 +611,14 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode)
 static int pmac_cpufreq_init_750FX(struct device_node *cpunode)
 {
        struct device_node *volt_gpio_np;
-        u32 pvr, *value;
+        u32 pvr;
+        const u32 *value;
        if (get_property(cpunode, "dynamic-power-step", NULL) == NULL)
                return 1;
        hi_freq = cur_freq;
-        value = (u32 *)get_property(cpunode, "reduced-clock-frequency", NULL);
+        value = get_property(cpunode, "reduced-clock-frequency", NULL);
        if (!value)
                return 1;
        low_freq = (*value) / 1000;
@@ -650,7 +651,7 @@ static int pmac_cpufreq_init_750FX(struct device_node *cpunode)
 static int __init pmac_cpufreq_setup(void)
 {
        struct device_node      *cpunode;
-        u32                     *value;
+        const u32               *value;
        if (strstr(cmd_line, "nocpufreq"))
                return 0;
@@ -661,7 +662,7 @@ static int __init pmac_cpufreq_setup(void)
                goto out;
        /* Get current cpu clock freq */
-        value = (u32 *)get_property(cpunode, "clock-frequency", NULL);
+        value = get_property(cpunode, "clock-frequency", NULL);
        if (!value)
                goto out;
        cur_freq = (*value) / 1000;
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 7b1156ea5341..167cd3ce8a13 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -391,7 +391,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        unsigned int psize, ssize;
        unsigned long max_freq;
        char *freq_method, *volt_method;
-        u32 *valp, pvr_hi;
+        const u32 *valp;
+        u32 pvr_hi;
        int use_volts_vdnap = 0;
        int use_volts_smu = 0;
        int rc = -ENODEV;
@@ -409,8 +410,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        /* Get first CPU node */
        for (cpunode = NULL;
             (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
-                u32 *reg =
+                const u32 *reg = get_property(cpunode, "reg", NULL);
-                        (u32 *)get_property(cpunode, "reg", NULL);
                if (reg == NULL || (*reg) != 0)
                        continue;
                if (!strcmp(cpunode->type, "cpu"))
@@ -422,7 +422,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        }
        /* Check 970FX for now */
-        valp = (u32 *)get_property(cpunode, "cpu-version", NULL);
+        valp = get_property(cpunode, "cpu-version", NULL);
        if (!valp) {
                DBG("No cpu-version property !\n");
                goto bail_noprops;
@@ -434,7 +434,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        }
        /* Look for the powertune data in the device-tree */
-        g5_pmode_data = (u32 *)get_property(cpunode, "power-mode-data",&psize);
+        g5_pmode_data = get_property(cpunode, "power-mode-data",&psize);
        if (!g5_pmode_data) {
                DBG("No power-mode-data !\n");
                goto bail_noprops;
@@ -442,7 +442,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        g5_pmode_max = psize / sizeof(u32) - 1;
        if (use_volts_smu) {
-                struct smu_sdbp_header *shdr;
+                const struct smu_sdbp_header *shdr;
                /* Look for the FVT table */
                shdr = smu_get_sdb_partition(SMU_SDB_FVT_ID, NULL);
@@ -493,7 +493,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         * half freq in this version. So far, I haven't yet seen a machine
         * supporting anything else.
         */
-        valp = (u32 *)get_property(cpunode, "clock-frequency", NULL);
+        valp = get_property(cpunode, "clock-frequency", NULL);
        if (!valp)
                return -ENODEV;
        max_freq = (*valp)/1000;
@@ -541,8 +541,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
 static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
 {
        struct device_node *cpuid = NULL, *hwclock = NULL, *cpunode = NULL;
-        u8 *eeprom = NULL;
+        const u8 *eeprom = NULL;
-        u32 *valp;
+        const u32 *valp;
        u64 max_freq, min_freq, ih, il;
        int has_volt = 1, rc = 0;
@@ -563,7 +563,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
        /* Lookup the cpuid eeprom node */
        cpuid = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/cpuid@a0");
        if (cpuid != NULL)
-                eeprom = (u8 *)get_property(cpuid, "cpuid", NULL);
+                eeprom = get_property(cpuid, "cpuid", NULL);
        if (eeprom == NULL) {
                printk(KERN_ERR "cpufreq: Can't find cpuid EEPROM !\n");
                rc = -ENODEV;
@@ -573,7 +573,8 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
        /* Lookup the i2c hwclock */
        for (hwclock = NULL;
             (hwclock = of_find_node_by_name(hwclock, "i2c-hwclock")) != NULL;){
-                char *loc = get_property(hwclock, "hwctrl-location", NULL);
+                const char *loc = get_property(hwclock,
+                                "hwctrl-location", NULL);
                if (loc == NULL)
                        continue;
                if (strcmp(loc, "CPU CLOCK"))
@@ -637,7 +638,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
         */
        /* Get max frequency from device-tree */
-        valp = (u32 *)get_property(cpunode, "clock-frequency", NULL);
+        valp = get_property(cpunode, "clock-frequency", NULL);
        if (!valp) {
                printk(KERN_ERR "cpufreq: Can't find CPU frequency !\n");
                rc = -ENODEV;
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index f8313bf9a9f7..13fcaf5b1796 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -1058,8 +1058,8 @@ core99_reset_cpu(struct device_node *node, long param, long value)
        if (np == NULL)
                return -ENODEV;
        for (np = np->child; np != NULL; np = np->sibling) {
-                u32 *num = (u32 *)get_property(np, "reg", NULL);
+                u32 *num = get_property(np, "reg", NULL);
-                u32 *rst = (u32 *)get_property(np, "soft-reset", NULL);
+                u32 *rst = get_property(np, "soft-reset", NULL);
                if (num == NULL || rst == NULL)
                        continue;
                if (param == *num) {
@@ -1087,7 +1087,7 @@ core99_usb_enable(struct device_node *node, long param, long value)
 {
        struct macio_chip *macio;
        unsigned long flags;
-        char *prop;
+        const char *prop;
        int number;
        u32 reg;
@@ -1096,7 +1096,7 @@ core99_usb_enable(struct device_node *node, long param, long value)
            macio->type != macio_intrepid)
                return -ENODEV;
-        prop = (char *)get_property(node, "AAPL,clock-id", NULL);
+        prop = get_property(node, "AAPL,clock-id", NULL);
        if (!prop)
                return -ENODEV;
        if (strncmp(prop, "usb0u048", 8) == 0)
@@ -1507,8 +1507,8 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
        if (np == NULL)
                return -ENODEV;
        for (np = np->child; np != NULL; np = np->sibling) {
-                u32 *num = (u32 *)get_property(np, "reg", NULL);
+                const u32 *num = get_property(np, "reg", NULL);
-                u32 *rst = (u32 *)get_property(np, "soft-reset", NULL);
+                const u32 *rst = get_property(np, "soft-reset", NULL);
                if (num == NULL || rst == NULL)
                        continue;
                if (param == *num) {
@@ -2408,7 +2408,7 @@ static int __init probe_motherboard(void)
         */
        dt = find_devices("device-tree");
        if (dt != NULL)
-                model = (const char *) get_property(dt, "model", NULL);
+                model = get_property(dt, "model", NULL);
        for(i=0; model && i<(sizeof(pmac_mb_defs)/sizeof(struct pmac_mb_def)); i++) {
            if (strcmp(model, pmac_mb_defs[i].model_string) == 0) {
                pmac_mb = pmac_mb_defs[i];
@@ -2536,7 +2536,7 @@ found:
 */
 static void __init probe_uninorth(void)
 {
-        u32 *addrp;
+        const u32 *addrp;
        phys_addr_t address;
        unsigned long actrl;
@@ -2555,7 +2555,7 @@ static void __init probe_uninorth(void)
        if (uninorth_node == NULL)
                return;
-        addrp = (u32 *)get_property(uninorth_node, "reg", NULL);
+        addrp = get_property(uninorth_node, "reg", NULL);
        if (addrp == NULL)
                return;
        address = of_translate_address(uninorth_node, addrp);
@@ -2596,7 +2596,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
        struct device_node*     node;
        int                     i;
        volatile u32 __iomem    *base;
-        u32                     *addrp, *revp;
+        const u32               *addrp, *revp;
        phys_addr_t             addr;
        u64                     size;
@@ -2639,7 +2639,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
                return;
        }
        if (type == macio_keylargo || type == macio_keylargo2) {
-                u32 *did = (u32 *)get_property(node, "device-id", NULL);
+                const u32 *did = get_property(node, "device-id", NULL);
                if (*did == 0x00000025)
                        type = macio_pangea;
                if (*did == 0x0000003e)
@@ -2652,7 +2652,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
        macio_chips[i].base     = base;
        macio_chips[i].flags    = MACIO_FLAG_SCCB_ON | MACIO_FLAG_SCCB_ON;
        macio_chips[i].name     = macio_names[type];
-        revp = (u32 *)get_property(node, "revision-id", NULL);
+        revp = get_property(node, "revision-id", NULL);
        if (revp)
                macio_chips[i].rev = *revp;
        printk(KERN_INFO "Found a %s mac-io controller, rev: %d, mapped at 0x%p\n",
@@ -2695,15 +2695,15 @@ static void __init
 initial_serial_shutdown(struct device_node *np)
 {
        int len;
-        struct slot_names_prop {
+        const struct slot_names_prop {
                int     count;
                char    name[1];
        } *slots;
-        char *conn;
+        const char *conn;
        int port_type = PMAC_SCC_ASYNC;
        int modem = 0;
-        slots = (struct slot_names_prop *)get_property(np, "slot-names", &len);
+        slots = get_property(np, "slot-names", &len);
        conn = get_property(np, "AAPL,connector", &len);
        if (conn && (strcmp(conn, "infrared") == 0))
                port_type = PMAC_SCC_IRDA;
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 8677f50c2586..c2c7cf75dd5f 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -477,7 +477,8 @@ static int kw_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize,
 static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
 {
        struct pmac_i2c_host_kw *host;
-        u32                     *psteps, *prate, *addrp, steps;
+        const u32               *psteps, *prate, *addrp;
+        u32                     steps;
        host = kzalloc(sizeof(struct pmac_i2c_host_kw), GFP_KERNEL);
        if (host == NULL) {
@@ -490,7 +491,7 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
         * on all i2c keywest nodes so far ... we would have to fallback
         * to macio parsing if that wasn't the case
         */
-        addrp = (u32 *)get_property(np, "AAPL,address", NULL);
+        addrp = get_property(np, "AAPL,address", NULL);
        if (addrp == NULL) {
                printk(KERN_ERR "low_i2c: Can't find address for %s\n",
                       np->full_name);
@@ -504,13 +505,13 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
        host->timeout_timer.function = kw_i2c_timeout;
        host->timeout_timer.data = (unsigned long)host;
-        psteps = (u32 *)get_property(np, "AAPL,address-step", NULL);
+        psteps = get_property(np, "AAPL,address-step", NULL);
        steps = psteps ? (*psteps) : 0x10;
        for (host->bsteps = 0; (steps & 0x01) == 0; host->bsteps++)
                steps >>= 1;
        /* Select interface rate */
        host->speed = KW_I2C_MODE_25KHZ;
-        prate = (u32 *)get_property(np, "AAPL,i2c-rate", NULL);
+        prate = get_property(np, "AAPL,i2c-rate", NULL);
        if (prate) switch(*prate) {
        case 100:
                host->speed = KW_I2C_MODE_100KHZ;
@@ -618,8 +619,8 @@ static void __init kw_i2c_probe(void)
                } else {
                        for (child = NULL;
                             (child = of_get_next_child(np, child)) != NULL;) {
-                                u32 *reg =
+                                const u32 *reg = get_property(child,
-                                        (u32 *)get_property(child, "reg", NULL);
+                                                "reg", NULL);
                                if (reg == NULL)
                                        continue;
                                kw_i2c_add(host, np, child, *reg);
@@ -881,7 +882,7 @@ static void __init smu_i2c_probe(void)
 {
        struct device_node *controller, *busnode;
        struct pmac_i2c_bus *bus;
-        u32 *reg;
+        const u32 *reg;
        int sz;
        if (!smu_present())
@@ -904,7 +905,7 @@ static void __init smu_i2c_probe(void)
                if (strcmp(busnode->type, "i2c") &&
                    strcmp(busnode->type, "i2c-bus"))
                        continue;
-                reg = (u32 *)get_property(busnode, "reg", NULL);
+                reg = get_property(busnode, "reg", NULL);
                if (reg == NULL)
                        continue;
@@ -948,9 +949,8 @@ struct pmac_i2c_bus *pmac_i2c_find_bus(struct device_node *node)
                list_for_each_entry(bus, &pmac_i2c_busses, link) {
                        if (p == bus->busnode) {
                                if (prev && bus->flags & pmac_i2c_multibus) {
-                                        u32 *reg;
+                                        const u32 *reg;
-                                        reg = (u32 *)get_property(prev, "reg",
+                                        reg = get_property(prev, "reg", NULL);
-                                                                  NULL);
                                        if (!reg)
                                                continue;
                                        if (((*reg) >> 8) != bus->channel)
@@ -971,7 +971,7 @@ EXPORT_SYMBOL_GPL(pmac_i2c_find_bus);
 u8 pmac_i2c_get_dev_addr(struct device_node *device)
 {
-        u32 *reg = (u32 *)get_property(device, "reg", NULL);
+        const u32 *reg = get_property(device, "reg", NULL);
        if (reg == NULL)
                return 0;
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 205d04471161..9923adc5248e 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -66,16 +66,16 @@ struct device_node *k2_skiplist[2];
 static int __init fixup_one_level_bus_range(struct device_node *node, int higher)
 {
        for (; node != 0;node = node->sibling) {
-                int * bus_range;
+                const int * bus_range;
-                unsigned int *class_code;
+                const unsigned int *class_code;
                int len;
                /* For PCI<->PCI bridges or CardBus bridges, we go down */
-                class_code = (unsigned int *) get_property(node, "class-code", NULL);
+                class_code = get_property(node, "class-code", NULL);
                if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI &&
                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS))
                        continue;
-                bus_range = (int *) get_property(node, "bus-range", &len);
+                bus_range = get_property(node, "bus-range", &len);
                if (bus_range != NULL && len > 2 * sizeof(int)) {
                        if (bus_range[1] > higher)
                                higher = bus_range[1];
@@ -93,13 +93,15 @@ static int __init fixup_one_level_bus_range(struct device_node *node, int higher
 */
 static void __init fixup_bus_range(struct device_node *bridge)
 {
-        int * bus_range;
+        int *bus_range, len;
-        int len;
+        struct property *prop;
        /* Lookup the "bus-range" property for the hose */
-        bus_range = (int *) get_property(bridge, "bus-range", &len);
+        prop = of_find_property(bridge, "bus-range", &len);
-        if (bus_range == NULL || len < 2 * sizeof(int))
+        if (prop == NULL || prop->length < 2 * sizeof(int))
                return;
+        bus_range = (int *)prop->value;
        bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);
 }
@@ -237,7 +239,7 @@ static struct pci_ops macrisc_pci_ops =
 static int chaos_validate_dev(struct pci_bus *bus, int devfn, int offset)
 {
        struct device_node *np;
-        u32 *vendor, *device;
+        const u32 *vendor, *device;
        if (offset >= 0x100)
                return  PCIBIOS_BAD_REGISTER_NUMBER;
@@ -245,8 +247,8 @@ static int chaos_validate_dev(struct pci_bus *bus, int devfn, int offset)
        if (np == NULL)
                return PCIBIOS_DEVICE_NOT_FOUND;
-        vendor = (u32 *)get_property(np, "vendor-id", NULL);
+        vendor = get_property(np, "vendor-id", NULL);
-        device = (u32 *)get_property(np, "device-id", NULL);
+        device = get_property(np, "device-id", NULL);
        if (vendor == NULL || device == NULL)
                return PCIBIOS_DEVICE_NOT_FOUND;
@@ -686,20 +688,21 @@ static void __init fixup_nec_usb2(void)
        for (nec = NULL; (nec = of_find_node_by_name(nec, "usb")) != NULL;) {
                struct pci_controller *hose;
-                u32 data, *prop;
+                u32 data;
+                const u32 *prop;
                u8 bus, devfn;
-                prop = (u32 *)get_property(nec, "vendor-id", NULL);
+                prop = get_property(nec, "vendor-id", NULL);
                if (prop == NULL)
                        continue;
                if (0x1033 != *prop)
                        continue;
-                prop = (u32 *)get_property(nec, "device-id", NULL);
+                prop = get_property(nec, "device-id", NULL);
                if (prop == NULL)
                        continue;
                if (0x0035 != *prop)
                        continue;
-                prop = (u32 *)get_property(nec, "reg", NULL);
+                prop = get_property(nec, "reg", NULL);
                if (prop == NULL)
                        continue;
                devfn = (prop[0] >> 8) & 0xff;
@@ -898,7 +901,7 @@ static int __init add_bridge(struct device_node *dev)
        struct pci_controller *hose;
        struct resource rsrc;
        char *disp_name;
-        int *bus_range;
+        const int *bus_range;
        int primary = 1, has_address = 0;
        DBG("Adding PCI host bridge %s\n", dev->full_name);
@@ -907,7 +910,7 @@ static int __init add_bridge(struct device_node *dev)
        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
        /* Get bus range if any */
-        bus_range = (int *) get_property(dev, "bus-range", &len);
+        bus_range = get_property(dev, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", dev->full_name);
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c
index aacfa59595d1..ee3b223ab17a 100644
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -114,7 +114,7 @@ static void macio_gpio_init_one(struct macio_chip *macio)
         * we just create them all
         */
        for (gp = NULL; (gp = of_get_next_child(gparent, gp)) != NULL;) {
-                u32 *reg = (u32 *)get_property(gp, "reg", NULL);
+                const u32 *reg = get_property(gp, "reg", NULL);
                unsigned long offset;
                if (reg == NULL)
                        continue;
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index b117adbf9571..7651f278615a 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -813,14 +813,15 @@ struct pmf_function *__pmf_find_function(struct device_node *target,
        struct pmf_device *dev;
        struct pmf_function *func, *result = NULL;
        char fname[64];
-        u32 *prop, ph;
+        const u32 *prop;
+        u32 ph;
        /*
         * Look for a "platform-*" function reference. If we can't find
         * one, then we fallback to a direct call attempt
         */
        snprintf(fname, 63, "platform-%s", name);
-        prop = (u32 *)get_property(target, fname, NULL);
+        prop = get_property(target, fname, NULL);
        if (prop == NULL)
                goto find_it;
        ph = *prop;
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 31a9da769fa2..824a618396ab 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -116,7 +116,7 @@ extern struct smp_ops_t core99_smp_ops;
 static void pmac_show_cpuinfo(struct seq_file *m)
 {
        struct device_node *np;
-        char *pp;
+        const char *pp;
        int plen;
        int mbmodel;
        unsigned int mbflags;
@@ -134,12 +134,12 @@ static void pmac_show_cpuinfo(struct seq_file *m)
        seq_printf(m, "machine\t\t: ");
        np = of_find_node_by_path("/");
        if (np != NULL) {
-                pp = (char *) get_property(np, "model", NULL);
+                pp = get_property(np, "model", NULL);
                if (pp != NULL)
                        seq_printf(m, "%s\n", pp);
                else
                        seq_printf(m, "PowerMac\n");
-                pp = (char *) get_property(np, "compatible", &plen);
+                pp = get_property(np, "compatible", &plen);
                if (pp != NULL) {
                        seq_printf(m, "motherboard\t:");
                        while (plen > 0) {
@@ -163,10 +163,8 @@ static void pmac_show_cpuinfo(struct seq_file *m)
        if (np == NULL)
                np = of_find_node_by_type(NULL, "cache");
        if (np != NULL) {
-                unsigned int *ic = (unsigned int *)
+                const unsigned int *ic = get_property(np, "i-cache-size", NULL);
-                        get_property(np, "i-cache-size", NULL);
+                const unsigned int *dc = get_property(np, "d-cache-size", NULL);
-                unsigned int *dc = (unsigned int *)
-                        get_property(np, "d-cache-size", NULL);
                seq_printf(m, "L2 cache\t:");
                has_l2cache = 1;
                if (get_property(np, "cache-unified", NULL) != 0 && dc) {
@@ -254,7 +252,7 @@ static void __init l2cr_init(void)
                if (np == 0)
                        np = find_type_devices("cpu");
                if (np != 0) {
-                        unsigned int *l2cr = (unsigned int *)
+                        const unsigned int *l2cr =
                                get_property(np, "l2cr-value", NULL);
                        if (l2cr != 0) {
                                ppc_override_l2cr = 1;
@@ -277,7 +275,7 @@ static void __init l2cr_init(void)
 static void __init pmac_setup_arch(void)
 {
        struct device_node *cpu, *ic;
-        int *fp;
+        const int *fp;
        unsigned long pvr;
        pvr = PVR_VER(mfspr(SPRN_PVR));
@@ -287,7 +285,7 @@ static void __init pmac_setup_arch(void)
        loops_per_jiffy = 50000000 / HZ;
        cpu = of_find_node_by_type(NULL, "cpu");
        if (cpu != NULL) {
-                fp = (int *) get_property(cpu, "clock-frequency", NULL);
+                fp = get_property(cpu, "clock-frequency", NULL);
                if (fp != NULL) {
                        if (pvr >= 0x30 && pvr < 0x80)
                                /* PPC970 etc. */
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 827b7121ffb8..653eeb64d1e2 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -548,7 +548,7 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
        struct device_node *cc = NULL;  
        struct device_node *p;
        const char *name = NULL;
-        u32 *reg;
+        const u32 *reg;
        int ok;
        /* Look for the clock chip */
@@ -562,7 +562,7 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
                pmac_tb_clock_chip_host = pmac_i2c_find_bus(cc);
                if (pmac_tb_clock_chip_host == NULL)
                        continue;
-                reg = (u32 *)get_property(cc, "reg", NULL);
+                reg = get_property(cc, "reg", NULL);
                if (reg == NULL)
                        continue;
                switch (*reg) {
@@ -707,8 +707,7 @@ static void __init smp_core99_setup(int ncpus)
                core99_tb_gpio = KL_GPIO_TB_ENABLE;     /* default value */
                cpu = of_find_node_by_type(NULL, "cpu");
                if (cpu != NULL) {
-                        tbprop = (u32 *)get_property(cpu, "timebase-enable",
+                        tbprop = get_property(cpu, "timebase-enable", NULL);
-                                                     NULL);
                        if (tbprop)
                                core99_tb_gpio = *tbprop;
                        of_node_put(cpu);
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c
index 37e5b1eff911..ce1a235855f7 100644
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -68,11 +68,11 @@ static unsigned char scc_inittab[] = {
 void udbg_scc_init(int force_scc)
 {
-        u32 *reg;
+        const u32 *reg;
        unsigned long addr;
        struct device_node *stdout = NULL, *escc = NULL, *macio = NULL;
        struct device_node *ch, *ch_def = NULL, *ch_a = NULL;
-        char *path;
+        const char *path;
        int i, x;
        escc = of_find_node_by_name(NULL, "escc");
@@ -81,7 +81,7 @@ void udbg_scc_init(int force_scc)
        macio = of_get_parent(escc);
        if (macio == NULL)
                goto bail;
-        path = (char *)get_property(of_chosen, "linux,stdout-path", NULL);
+        path = get_property(of_chosen, "linux,stdout-path", NULL);
        if (path != NULL)
                stdout = of_find_node_by_path(path);
        for (ch = NULL; (ch = of_get_next_child(escc, ch)) != NULL;) {
@@ -96,13 +96,13 @@ void udbg_scc_init(int force_scc)
        ch = ch_def ? ch_def : ch_a;
        /* Get address within mac-io ASIC */
-        reg = (u32 *)get_property(escc, "reg", NULL);
+        reg = get_property(escc, "reg", NULL);
        if (reg == NULL)
                goto bail;
        addr = reg[0];
        /* Get address of mac-io PCI itself */
-        reg = (u32 *)get_property(macio, "assigned-addresses", NULL);
+        reg = get_property(macio, "assigned-addresses", NULL);
        if (reg == NULL)
                goto bail;
        addr += reg[2];
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index e5e0ff466904..997243a91be8 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_EEH)	+= eeh.o eeh_cache.o eeh_driver.o eeh_event.o
 obj-$(CONFIG_HVC_CONSOLE)       += hvconsole.o
 obj-$(CONFIG_HVCS)              += hvcserver.o
+obj-$(CONFIG_HCALL_STATS)       += hvCall_inst.o
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 32eaddfa5470..5a23ce5e16ff 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -691,11 +691,11 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
 {
        struct eeh_early_enable_info *info = data;
        int ret;
-        char *status = get_property(dn, "status", NULL);
+        const char *status = get_property(dn, "status", NULL);
-        u32 *class_code = (u32 *)get_property(dn, "class-code", NULL);
+        const u32 *class_code = get_property(dn, "class-code", NULL);
-        u32 *vendor_id = (u32 *)get_property(dn, "vendor-id", NULL);
+        const u32 *vendor_id = get_property(dn, "vendor-id", NULL);
-        u32 *device_id = (u32 *)get_property(dn, "device-id", NULL);
+        const u32 *device_id = get_property(dn, "device-id", NULL);
-        u32 *regs;
+        const u32 *regs;
        int enable;
        struct pci_dn *pdn = PCI_DN(dn);
@@ -737,7 +737,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
        /* Ok... see if this device supports EEH.  Some do, some don't,
         * and the only way to find out is to check each and every one. */
-        regs = (u32 *)get_property(dn, "reg", NULL);
+        regs = get_property(dn, "reg", NULL);
        if (regs) {
                /* First register entry is addr (00BBSS00)  */
                /* Try to enable eeh */
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index aaad2c0afcbf..3269d2cd428b 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -268,14 +268,14 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
        if (!frozen_dn) {
-                location = (char *) get_property(event->dn, "ibm,loc-code", NULL);
+                location = get_property(event->dn, "ibm,loc-code", NULL);
                location = location ? location : "unknown";
                printk(KERN_ERR "EEH: Error: Cannot find partition endpoint "
                                "for location=%s pci addr=%s\n",
                        location, pci_name(event->dev));
                return NULL;
        }
-        location = (char *) get_property(frozen_dn, "ibm,loc-code", NULL);
+        location = get_property(frozen_dn, "ibm,loc-code", NULL);
        location = location ? location : "unknown";
        /* There are two different styles for coming up with the PE.
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index 45ccc687e57c..137077451316 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -124,11 +124,11 @@ int eeh_send_failure_event (struct device_node *dn,
 {
        unsigned long flags;
        struct eeh_event *event;
-        char *location;
+        const char *location;
        if (!mem_init_done) {
                printk(KERN_ERR "EEH: event during early boot not handled\n");
-                location = (char *) get_property(dn, "ibm,loc-code", NULL);
+                location = get_property(dn, "ibm,loc-code", NULL);
                printk(KERN_ERR "EEH: device node = %s\n", dn->full_name);
                printk(KERN_ERR "EEH: PCI location = %s\n", location);
                return 1;
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index c01d8f0cbe6d..1c7b2baa5f73 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -68,7 +68,7 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = {
 void __init fw_feature_init(void)
 {
        struct device_node *dn;
-        char *hypertas, *s;
+        const char *hypertas, *s;
        int len, i;
        DBG(" -> fw_feature_init()\n");
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S
index c9ff547f9d25..c00cfed7af2c 100644
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -1,7 +1,6 @@
 /*
 * This file contains the generic code to perform a call to the
 * pSeries LPAR hypervisor.
- * NOTE: this file will go away when we move to inline this work.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -11,217 +10,153 @@
 #include <asm/hvcall.h>
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
        
 #define STK_PARM(i)     (48 + ((i)-3)*8)
-        .text
+#ifdef CONFIG_HCALL_STATS
+/*
-/* long plpar_hcall(unsigned long opcode,               R3
+ * precall must preserve all registers.  use unused STK_PARM()
-                        unsigned long arg1,             R4
+ * areas to save snapshots and opcode.
-                        unsigned long arg2,             R5
-                        unsigned long arg3,             R6
-                        unsigned long arg4,             R7
-                        unsigned long *out1,            R8
-                        unsigned long *out2,            R9
-                        unsigned long *out3);           R10
 */
-_GLOBAL(plpar_hcall)
+#define HCALL_INST_PRECALL                                      \
-        HMT_MEDIUM
+        std     r3,STK_PARM(r3)(r1);    /* save opcode */       \
+        mftb    r0;                     /* get timebase and */  \
-        mfcr    r0
+        std     r0,STK_PARM(r5)(r1);    /* save for later */    \
+BEGIN_FTR_SECTION;                                              \
-        std     r8,STK_PARM(r8)(r1)     /* Save out ptrs */
+        mfspr   r0,SPRN_PURR;           /* get PURR and */      \
-        std     r9,STK_PARM(r9)(r1)
+        std     r0,STK_PARM(r6)(r1);    /* save for later */    \
-        std     r10,STK_PARM(r10)(r1)
+END_FTR_SECTION_IFCLR(CPU_FTR_PURR);
+        
-        stw     r0,8(r1)
+/*
+ * postcall is performed immediately before function return which
-        HVSC                            /* invoke the hypervisor */
+ * allows liberal use of volatile registers.
+ */
-        lwz     r0,8(r1)
+#define HCALL_INST_POSTCALL                                     \
+        ld      r4,STK_PARM(r3)(r1);    /* validate opcode */   \
-        ld      r8,STK_PARM(r8)(r1)     /* Fetch r4-r6 ret args */
+        cmpldi  cr7,r4,MAX_HCALL_OPCODE;                        \
-        ld      r9,STK_PARM(r9)(r1)
+        bgt-    cr7,1f;                                         \
-        ld      r10,STK_PARM(r10)(r1)
+                                                                \
-        std     r4,0(r8)
+        /* get time and PURR snapshots after hcall */           \
-        std     r5,0(r9)
+        mftb    r7;                     /* timebase after */    \
-        std     r6,0(r10)
+BEGIN_FTR_SECTION;                                              \
+        mfspr   r8,SPRN_PURR;           /* PURR after */        \
-        mtcrf   0xff,r0
+        ld      r6,STK_PARM(r6)(r1);    /* PURR before */       \
-        blr                             /* return r3 = status */
+        subf    r6,r6,r8;               /* delta */             \
+END_FTR_SECTION_IFCLR(CPU_FTR_PURR);                            \
+        ld      r5,STK_PARM(r5)(r1);    /* timebase before */   \
+        subf    r5,r5,r7;               /* time delta */        \
+                                                                \
+        /* calculate address of stat structure r4 = opcode */   \
+        srdi    r4,r4,2;                /* index into array */  \
+        mulli   r4,r4,HCALL_STAT_SIZE;                          \
+        LOAD_REG_ADDR(r7, per_cpu__hcall_stats);                \
+        add     r4,r4,r7;                                       \
+        ld      r7,PACA_DATA_OFFSET(r13); /* per cpu offset */  \
+        add     r4,r4,r7;                                       \
+                                                                \
+        /* update stats */                                      \
+        ld      r7,HCALL_STAT_CALLS(r4); /* count */            \
+        addi    r7,r7,1;                                        \
+        std     r7,HCALL_STAT_CALLS(r4);                        \
+        ld      r7,HCALL_STAT_TB(r4);   /* timebase */          \
+        add     r7,r7,r5;                                       \
+        std     r7,HCALL_STAT_TB(r4);                           \
+BEGIN_FTR_SECTION;                                              \
+        ld      r7,HCALL_STAT_PURR(r4); /* PURR */              \
+        add     r7,r7,r6;                                       \
+        std     r7,HCALL_STAT_PURR(r4);                         \
+END_FTR_SECTION_IFCLR(CPU_FTR_PURR);                            \
+1:
+#else
+#define HCALL_INST_PRECALL
+#define HCALL_INST_POSTCALL
+#endif
+        .text
-/* Simple interface with no output values (other than status) */
 _GLOBAL(plpar_hcall_norets)
        HMT_MEDIUM
        mfcr    r0
        stw     r0,8(r1)
-        HVSC                            /* invoke the hypervisor */
+        HCALL_INST_PRECALL
-        lwz     r0,8(r1)
-        mtcrf   0xff,r0
-        blr                             /* return r3 = status */
-/* long plpar_hcall_8arg_2ret(unsigned long opcode,     R3
-                        unsigned long arg1,             R4
-                        unsigned long arg2,             R5
-                        unsigned long arg3,             R6
-                        unsigned long arg4,             R7
-                        unsigned long arg5,             R8
-                        unsigned long arg6,             R9
-                        unsigned long arg7,             R10
-                        unsigned long arg8,             112(R1)
-                        unsigned long *out1);           120(R1)
- */
-_GLOBAL(plpar_hcall_8arg_2ret)
-        HMT_MEDIUM
-        mfcr    r0
-        ld      r11,STK_PARM(r11)(r1)   /* put arg8 in R11 */
-        stw     r0,8(r1)
        HVSC                            /* invoke the hypervisor */
+        HCALL_INST_POSTCALL
        lwz     r0,8(r1)
-        ld      r10,STK_PARM(r12)(r1)   /* Fetch r4 ret arg */
-        std     r4,0(r10)
        mtcrf   0xff,r0
        blr                             /* return r3 = status */
+_GLOBAL(plpar_hcall)
-/* long plpar_hcall_4out(unsigned long opcode,          R3
-                        unsigned long arg1,             R4
-                        unsigned long arg2,             R5
-                        unsigned long arg3,             R6
-                        unsigned long arg4,             R7
-                        unsigned long *out1,            R8
-                        unsigned long *out2,            R9
-                        unsigned long *out3,            R10
-                        unsigned long *out4);           112(R1)
- */
-_GLOBAL(plpar_hcall_4out)
        HMT_MEDIUM
        mfcr    r0
        stw     r0,8(r1)
-        std     r8,STK_PARM(r8)(r1)     /* Save out ptrs */
+        HCALL_INST_PRECALL
-        std     r9,STK_PARM(r9)(r1)
-        std     r10,STK_PARM(r10)(r1)
-        HVSC                            /* invoke the hypervisor */
-        lwz     r0,8(r1)
-        ld      r8,STK_PARM(r8)(r1)     /* Fetch r4-r7 ret args */
+        std     r4,STK_PARM(r4)(r1)     /* Save ret buffer */
-        ld      r9,STK_PARM(r9)(r1)
-        ld      r10,STK_PARM(r10)(r1)
-        ld      r11,STK_PARM(r11)(r1)
-        std     r4,0(r8)
-        std     r5,0(r9)
-        std     r6,0(r10)
-        std     r7,0(r11)
-        mtcrf   0xff,r0
+        mr      r4,r5
-        blr                             /* return r3 = status */
+        mr      r5,r6
+        mr      r6,r7
-/* plpar_hcall_7arg_7ret(unsigned long opcode,          R3
+        mr      r7,r8
-                         unsigned long arg1,            R4
+        mr      r8,r9
-                         unsigned long arg2,            R5
+        mr      r9,r10
-                         unsigned long arg3,            R6
-                         unsigned long arg4,            R7
-                         unsigned long arg5,            R8
-                         unsigned long arg6,            R9
-                         unsigned long arg7,            R10
-                         unsigned long *out1,           112(R1)
-                         unsigned long *out2,           110(R1)
-                         unsigned long *out3,           108(R1)
-                         unsigned long *out4,           106(R1)
-                         unsigned long *out5,           104(R1)
-                         unsigned long *out6,           102(R1)
-                         unsigned long *out7);          100(R1)
-*/
-_GLOBAL(plpar_hcall_7arg_7ret)
-        HMT_MEDIUM
-        mfcr    r0
-        stw     r0,8(r1)
        HVSC                            /* invoke the hypervisor */
-        lwz     r0,8(r1)
+        ld      r12,STK_PARM(r4)(r1)
+        std     r4,  0(r12)
+        std     r5,  8(r12)
+        std     r6, 16(r12)
+        std     r7, 24(r12)
-        ld      r11,STK_PARM(r11)(r1)   /* Fetch r4 ret arg */
+        HCALL_INST_POSTCALL
-        std     r4,0(r11)
-        ld      r11,STK_PARM(r12)(r1)   /* Fetch r5 ret arg */
-        std     r5,0(r11)
-        ld      r11,STK_PARM(r13)(r1)   /* Fetch r6 ret arg */
-        std     r6,0(r11)
-        ld      r11,STK_PARM(r14)(r1)   /* Fetch r7 ret arg */
-        std     r7,0(r11)
-        ld      r11,STK_PARM(r15)(r1)   /* Fetch r8 ret arg */
-        std     r8,0(r11)
-        ld      r11,STK_PARM(r16)(r1)   /* Fetch r9 ret arg */
-        std     r9,0(r11)
-        ld      r11,STK_PARM(r17)(r1)   /* Fetch r10 ret arg */
-        std     r10,0(r11)
+        lwz     r0,8(r1)
        mtcrf   0xff,r0
        blr                             /* return r3 = status */
-/* plpar_hcall_9arg_9ret(unsigned long opcode,          R3
+_GLOBAL(plpar_hcall9)
-                         unsigned long arg1,            R4
-                         unsigned long arg2,            R5
-                         unsigned long arg3,            R6
-                         unsigned long arg4,            R7
-                         unsigned long arg5,            R8
-                         unsigned long arg6,            R9
-                         unsigned long arg7,            R10
-                         unsigned long arg8,            112(R1)
-                         unsigned long arg9,            110(R1)
-                         unsigned long *out1,           108(R1)
-                         unsigned long *out2,           106(R1)
-                         unsigned long *out3,           104(R1)
-                         unsigned long *out4,           102(R1)
-                         unsigned long *out5,           100(R1)
-                         unsigned long *out6,            98(R1)
-                         unsigned long *out7);           96(R1)
-                         unsigned long *out8,            94(R1)
-                         unsigned long *out9,            92(R1)
-*/
-_GLOBAL(plpar_hcall_9arg_9ret)
        HMT_MEDIUM
        mfcr    r0
        stw     r0,8(r1)
-        ld      r11,STK_PARM(r11)(r1)    /* put arg8 in R11 */
+        HCALL_INST_PRECALL
-        ld      r12,STK_PARM(r12)(r1)    /* put arg9 in R12 */
+        std     r4,STK_PARM(r4)(r1)     /* Save ret buffer */
+        mr      r4,r5
+        mr      r5,r6
+        mr      r6,r7
+        mr      r7,r8
+        mr      r8,r9
+        mr      r9,r10
+        ld      r10,STK_PARM(r11)(r1)    /* put arg7 in R10 */
+        ld      r11,STK_PARM(r12)(r1)    /* put arg8 in R11 */
+        ld      r12,STK_PARM(r13)(r1)    /* put arg9 in R12 */
        HVSC                            /* invoke the hypervisor */
-        ld      r0,STK_PARM(r13)(r1)    /* Fetch r4 ret arg */
+        ld      r12,STK_PARM(r4)(r1)
-        stdx    r4,r0,r0
+        std     r4,  0(r12)
-        ld      r0,STK_PARM(r14)(r1)    /* Fetch r5 ret arg */
+        std     r5,  8(r12)
-        stdx    r5,r0,r0
+        std     r6, 16(r12)
-        ld      r0,STK_PARM(r15)(r1)    /* Fetch r6 ret arg */
+        std     r7, 24(r12)
-        stdx    r6,r0,r0
+        std     r8, 32(r12)
-        ld      r0,STK_PARM(r16)(r1)    /* Fetch r7 ret arg */
+        std     r9, 40(r12)
-        stdx    r7,r0,r0
+        std     r10,48(r12)
-        ld      r0,STK_PARM(r17)(r1)    /* Fetch r8 ret arg */
+        std     r11,56(r12)
-        stdx    r8,r0,r0
+        std     r12,64(r12)
-        ld      r0,STK_PARM(r18)(r1)    /* Fetch r9 ret arg */
-        stdx    r9,r0,r0
+        HCALL_INST_POSTCALL
-        ld      r0,STK_PARM(r19)(r1)    /* Fetch r10 ret arg */
-        stdx    r10,r0,r0
-        ld      r0,STK_PARM(r20)(r1)    /* Fetch r11 ret arg */
-        stdx    r11,r0,r0
-        ld      r0,STK_PARM(r21)(r1)    /* Fetch r12 ret arg */
-        stdx    r12,r0,r0
        lwz     r0,8(r1)
        mtcrf   0xff,r0
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
new file mode 100644
index 000000000000..641e6511cf06
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2006 Mike Kravetz IBM Corporation
+ *
+ * Hypervisor Call Instrumentation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#include <linux/kernel.h>
+#include <linux/percpu.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+#include <linux/cpumask.h>
+#include <asm/hvcall.h>
+#include <asm/firmware.h>
+#include <asm/cputable.h>
+DEFINE_PER_CPU(struct hcall_stats[HCALL_STAT_ARRAY_SIZE], hcall_stats);
+/*
+ * Routines for displaying the statistics in debugfs
+ */
+static void *hc_start(struct seq_file *m, loff_t *pos)
+{
+        if ((int)*pos < HCALL_STAT_ARRAY_SIZE)
+                return (void *)(unsigned long)(*pos + 1);
+        return NULL;
+}
+static void *hc_next(struct seq_file *m, void *p, loff_t * pos)
+{
+        ++*pos;
+        return hc_start(m, pos);
+}
+static void hc_stop(struct seq_file *m, void *p)
+{
+}
+static int hc_show(struct seq_file *m, void *p)
+{
+        unsigned long h_num = (unsigned long)p;
+        struct hcall_stats *hs = (struct hcall_stats *)m->private;
+        if (hs[h_num].num_calls) {
+                if (!cpu_has_feature(CPU_FTR_PURR))
+                        seq_printf(m, "%lu %lu %lu %lu\n", h_num<<2,
+                                   hs[h_num].num_calls,
+                                   hs[h_num].tb_total,
+                                   hs[h_num].purr_total);
+                else
+                        seq_printf(m, "%lu %lu %lu\n", h_num<<2,
+                                   hs[h_num].num_calls,
+                                   hs[h_num].tb_total);
+        }
+        return 0;
+}
+static struct seq_operations hcall_inst_seq_ops = {
+        .start = hc_start,
+        .next  = hc_next,
+        .stop  = hc_stop,
+        .show  = hc_show
+};
+static int hcall_inst_seq_open(struct inode *inode, struct file *file)
+{
+        int rc;
+        struct seq_file *seq;
+        rc = seq_open(file, &hcall_inst_seq_ops);
+        seq = file->private_data;
+        seq->private = file->f_dentry->d_inode->u.generic_ip;
+        return rc;
+}
+static struct file_operations hcall_inst_seq_fops = {
+        .open = hcall_inst_seq_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = seq_release,
+};
+#define HCALL_ROOT_DIR          "hcall_inst"
+#define CPU_NAME_BUF_SIZE       32
+static int __init hcall_inst_init(void)
+{
+        struct dentry *hcall_root;
+        struct dentry *hcall_file;
+        char cpu_name_buf[CPU_NAME_BUF_SIZE];
+        int cpu;
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
+                return 0;
+        hcall_root = debugfs_create_dir(HCALL_ROOT_DIR, NULL);
+        if (!hcall_root)
+                return -ENOMEM;
+        for_each_possible_cpu(cpu) {
+                snprintf(cpu_name_buf, CPU_NAME_BUF_SIZE, "cpu%d", cpu);
+                hcall_file = debugfs_create_file(cpu_name_buf, S_IRUGO,
+                                                 hcall_root,
+                                                 per_cpu(hcall_stats, cpu),
+                                                 &hcall_inst_seq_fops);
+                if (!hcall_file)
+                        return -ENOMEM;
+        }
+        return 0;
+}
+__initcall(hcall_inst_init);
diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c
index a72a987f1d4d..3f6a89b09816 100644
--- a/arch/powerpc/platforms/pseries/hvconsole.c
+++ b/arch/powerpc/platforms/pseries/hvconsole.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <asm/hvcall.h>
 #include <asm/hvconsole.h>
+#include "plpar_wrappers.h"
 /**
 * hvc_get_chars - retrieve characters from firmware for denoted vterm adatper
@@ -40,9 +41,9 @@ int hvc_get_chars(uint32_t vtermno, char *buf, int count)
 {
        unsigned long got;
-        if (plpar_hcall(H_GET_TERM_CHAR, vtermno, 0, 0, 0, &got,
+        if (plpar_get_term_char(vtermno, &got, buf) == H_SUCCESS)
-                (unsigned long *)buf, (unsigned long *)buf+1) == H_SUCCESS)
                return got;
        return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index d67af2c65754..bbf2e34dc358 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -267,13 +267,12 @@ static void iommu_table_setparms(struct pci_controller *phb,
                                 struct iommu_table *tbl)
 {
        struct device_node *node;
-        unsigned long *basep;
+        const unsigned long *basep, *sizep;
-        unsigned int *sizep;
        node = (struct device_node *)phb->arch_data;
-        basep = (unsigned long *)get_property(node, "linux,tce-base", NULL);
+        basep = get_property(node, "linux,tce-base", NULL);
-        sizep = (unsigned int *)get_property(node, "linux,tce-size", NULL);
+        sizep = get_property(node, "linux,tce-size", NULL);
        if (basep == NULL || sizep == NULL) {
                printk(KERN_ERR "PCI_DMA: iommu_table_setparms: %s has "
                                "missing tce entries !\n", dn->full_name);
@@ -315,7 +314,7 @@ static void iommu_table_setparms(struct pci_controller *phb,
 static void iommu_table_setparms_lpar(struct pci_controller *phb,
                                      struct device_node *dn,
                                      struct iommu_table *tbl,
-                                      unsigned char *dma_window)
+                                      const void *dma_window)
 {
        unsigned long offset, size;
@@ -415,7 +414,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
        struct iommu_table *tbl;
        struct device_node *dn, *pdn;
        struct pci_dn *ppci;
-        unsigned char *dma_window = NULL;
+        const void *dma_window = NULL;
        DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self);
@@ -519,7 +518,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
 {
        struct device_node *pdn, *dn;
        struct iommu_table *tbl;
-        unsigned char *dma_window = NULL;
+        const void *dma_window = NULL;
        struct pci_dn *pci;
        DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev));
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 3aeb40699042..1820a0b0a8c6 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -48,13 +48,11 @@
 #define DBG_LOW(fmt...) do { } while(0)
 #endif
-/* in pSeries_hvCall.S */
+/* in hvCall.S */
 EXPORT_SYMBOL(plpar_hcall);
-EXPORT_SYMBOL(plpar_hcall_4out);
+EXPORT_SYMBOL(plpar_hcall9);
 EXPORT_SYMBOL(plpar_hcall_norets);
-EXPORT_SYMBOL(plpar_hcall_8arg_2ret);
-EXPORT_SYMBOL(plpar_hcall_7arg_7ret);
-EXPORT_SYMBOL(plpar_hcall_9arg_9ret);
 extern void pSeries_find_serial_port(void);
@@ -204,20 +202,20 @@ void __init udbg_init_debug_lpar(void)
 void __init find_udbg_vterm(void)
 {
        struct device_node *stdout_node;
-        u32 *termno;
+        const u32 *termno;
-        char *name;
+        const char *name;
        int add_console;
        /* find the boot console from /chosen/stdout */
        if (!of_chosen)
                return;
-        name = (char *)get_property(of_chosen, "linux,stdout-path", NULL);
+        name = get_property(of_chosen, "linux,stdout-path", NULL);
        if (name == NULL)
                return;
        stdout_node = of_find_node_by_path(name);
        if (!stdout_node)
                return;
-        name = (char *)get_property(stdout_node, "name", NULL);
+        name = get_property(stdout_node, "name", NULL);
        if (!name) {
                printk(KERN_WARNING "stdout node missing 'name' property!\n");
                goto out;
@@ -228,7 +226,7 @@ void __init find_udbg_vterm(void)
        /* Check if it's a virtual terminal */
        if (strncmp(name, "vty", 3) != 0)
                goto out;
-        termno = (u32 *)get_property(stdout_node, "reg", NULL);
+        termno = get_property(stdout_node, "reg", NULL);
        if (termno == NULL)
                goto out;
        vtermno = termno[0];
@@ -254,18 +252,34 @@ out:
 void vpa_init(int cpu)
 {
        int hwcpu = get_hard_smp_processor_id(cpu);
-        unsigned long vpa = __pa(&lppaca[cpu]);
+        unsigned long addr;
        long ret;
        if (cpu_has_feature(CPU_FTR_ALTIVEC))
                lppaca[cpu].vmxregs_in_use = 1;
-        ret = register_vpa(hwcpu, vpa);
+        addr = __pa(&lppaca[cpu]);
+        ret = register_vpa(hwcpu, addr);
-        if (ret)
+        if (ret) {
                printk(KERN_ERR "WARNING: vpa_init: VPA registration for "
                                "cpu %d (hw %d) of area %lx returns %ld\n",
-                                cpu, hwcpu, vpa, ret);
+                                cpu, hwcpu, addr, ret);
+                return;
+        }
+        /*
+         * PAPR says this feature is SLB-Buffer but firmware never
+         * reports that.  All SPLPAR support SLB shadow buffer.
+         */
+        addr = __pa(&slb_shadow[cpu]);
+        if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
+                ret = register_slb_shadow(hwcpu, addr);
+                if (ret)
+                        printk(KERN_ERR
+                               "WARNING: vpa_init: SLB shadow buffer "
+                               "registration for cpu %d (hw %d) of area %lx "
+                               "returns %ld\n", cpu, hwcpu, addr, ret);
+        }
 }
 long pSeries_lpar_hpte_insert(unsigned long hpte_group,
@@ -277,7 +291,6 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
        unsigned long flags;
        unsigned long slot;
        unsigned long hpte_v, hpte_r;
-        unsigned long dummy0, dummy1;
        if (!(vflags & HPTE_V_BOLTED))
                DBG_LOW("hpte_insert(group=%lx, va=%016lx, pa=%016lx, "
@@ -302,8 +315,7 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
        if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
                hpte_r &= ~_PAGE_COHERENT;
-        lpar_rc = plpar_hcall(H_ENTER, flags, hpte_group, hpte_v,
+        lpar_rc = plpar_pte_enter(flags, hpte_group, hpte_v, hpte_r, &slot);
-                              hpte_r, &slot, &dummy0, &dummy1);
        if (unlikely(lpar_rc == H_PTEG_FULL)) {
                if (!(vflags & HPTE_V_BOLTED))
                        DBG_LOW(" full\n");
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index 18abfb1f4e24..64163cecdf93 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -123,13 +123,14 @@ static ssize_t pSeries_nvram_get_size(void)
 int __init pSeries_nvram_init(void)
 {
        struct device_node *nvram;
-        unsigned int *nbytes_p, proplen;
+        const unsigned int *nbytes_p;
+        unsigned int proplen;
        nvram = of_find_node_by_type(NULL, "nvram");
        if (nvram == NULL)
                return -ENODEV;
-        nbytes_p = (unsigned int *)get_property(nvram, "#bytes", &proplen);
+        nbytes_p = get_property(nvram, "#bytes", &proplen);
        if (nbytes_p == NULL || proplen != sizeof(unsigned int))
                return -EIO;
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index e97e67f5e079..410a6bcc4ca0 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -60,7 +60,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
 static void __devinit check_s7a(void)
 {
        struct device_node *root;
-        char *model;
+        const char *model;
        s7a_workaround = 0;
        root = of_find_node_by_path("/");
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index 3bd1b3e06003..3eb7b294d92f 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -5,20 +5,17 @@
 static inline long poll_pending(void)
 {
-        unsigned long dummy;
+        return plpar_hcall_norets(H_POLL_PENDING);
-        return plpar_hcall(H_POLL_PENDING, 0, 0, 0, 0, &dummy, &dummy, &dummy);
 }
 static inline long prod_processor(void)
 {
-        plpar_hcall_norets(H_PROD);
+        return plpar_hcall_norets(H_PROD);
-        return 0;
 }
 static inline long cede_processor(void)
 {
-        plpar_hcall_norets(H_CEDE);
+        return plpar_hcall_norets(H_CEDE);
-        return 0;
 }
 static inline long vpa_call(unsigned long flags, unsigned long cpu,
@@ -40,23 +37,59 @@ static inline long register_vpa(unsigned long cpu, unsigned long vpa)
        return vpa_call(0x1, cpu, vpa);
 }
+static inline long unregister_slb_shadow(unsigned long cpu, unsigned long vpa)
+{
+        return vpa_call(0x7, cpu, vpa);
+}
+static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa)
+{
+        return vpa_call(0x3, cpu, vpa);
+}
 extern void vpa_init(int cpu);
+static inline long plpar_pte_enter(unsigned long flags,
+                unsigned long hpte_group, unsigned long hpte_v,
+                unsigned long hpte_r, unsigned long *slot)
+{
+        long rc;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+        rc = plpar_hcall(H_ENTER, retbuf, flags, hpte_group, hpte_v, hpte_r);
+        *slot = retbuf[0];
+        return rc;
+}
 static inline long plpar_pte_remove(unsigned long flags, unsigned long ptex,
                unsigned long avpn, unsigned long *old_pteh_ret,
                unsigned long *old_ptel_ret)
 {
-        unsigned long dummy;
+        long rc;
-        return plpar_hcall(H_REMOVE, flags, ptex, avpn, 0, old_pteh_ret,
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-                        old_ptel_ret, &dummy);
+        rc = plpar_hcall(H_REMOVE, retbuf, flags, ptex, avpn);
+        *old_pteh_ret = retbuf[0];
+        *old_ptel_ret = retbuf[1];
+        return rc;
 }
 static inline long plpar_pte_read(unsigned long flags, unsigned long ptex,
                unsigned long *old_pteh_ret, unsigned long *old_ptel_ret)
 {
-        unsigned long dummy;
+        long rc;
-        return plpar_hcall(H_READ, flags, ptex, 0, 0, old_pteh_ret,
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-                        old_ptel_ret, &dummy);
+        rc = plpar_hcall(H_READ, retbuf, flags, ptex);
+        *old_pteh_ret = retbuf[0];
+        *old_ptel_ret = retbuf[1];
+        return rc;
 }
 static inline long plpar_pte_protect(unsigned long flags, unsigned long ptex,
@@ -68,9 +101,14 @@ static inline long plpar_pte_protect(unsigned long flags, unsigned long ptex,
 static inline long plpar_tce_get(unsigned long liobn, unsigned long ioba,
                unsigned long *tce_ret)
 {
-        unsigned long dummy;
+        long rc;
-        return plpar_hcall(H_GET_TCE, liobn, ioba, 0, 0, tce_ret, &dummy,
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-                        &dummy);
+        rc = plpar_hcall(H_GET_TCE, retbuf, liobn, ioba);
+        *tce_ret = retbuf[0];
+        return rc;
 }
 static inline long plpar_tce_put(unsigned long liobn, unsigned long ioba,
@@ -94,9 +132,17 @@ static inline long plpar_tce_stuff(unsigned long liobn, unsigned long ioba,
 static inline long plpar_get_term_char(unsigned long termno,
                unsigned long *len_ret, char *buf_ret)
 {
+        long rc;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
        unsigned long *lbuf = (unsigned long *)buf_ret; /* TODO: alignment? */
-        return plpar_hcall(H_GET_TERM_CHAR, termno, 0, 0, 0, len_ret,
-                        lbuf + 0, lbuf + 1);
+        rc = plpar_hcall(H_GET_TERM_CHAR, retbuf, termno);
+        *len_ret = retbuf[0];
+        lbuf[0] = retbuf[1];
+        lbuf[1] = retbuf[2];
+        return rc;
 }
 static inline long plpar_put_term_char(unsigned long termno, unsigned long len,
@@ -107,4 +153,31 @@ static inline long plpar_put_term_char(unsigned long termno, unsigned long len,
                        lbuf[1]);
 }
+static inline long plpar_eoi(unsigned long xirr)
+{
+        return plpar_hcall_norets(H_EOI, xirr);
+}
+static inline long plpar_cppr(unsigned long cppr)
+{
+        return plpar_hcall_norets(H_CPPR, cppr);
+}
+static inline long plpar_ipi(unsigned long servernum, unsigned long mfrr)
+{
+        return plpar_hcall_norets(H_IPI, servernum, mfrr);
+}
+static inline long plpar_xirr(unsigned long *xirr_ret)
+{
+        long rc;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+        rc = plpar_hcall(H_XIRR, retbuf);
+        *xirr_ret = retbuf[0];
+        return rc;
+}
 #endif /* _PSERIES_PLPAR_WRAPPERS_H */
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index c7ffde1a614e..903115d67fdc 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -79,7 +79,7 @@ static void request_ras_irqs(struct device_node *np,
 {
        int i, index, count = 0;
        struct of_irq oirq;
-        u32 *opicprop;
+        const u32 *opicprop;
        unsigned int opicplen;
        unsigned int virqs[16];
@@ -87,7 +87,7 @@ static void request_ras_irqs(struct device_node *np,
         * map those interrupts using the default interrupt host and default
         * trigger
         */
-        opicprop = (u32 *)get_property(np, "open-pic-interrupt", &opicplen);
+        opicprop = get_property(np, "open-pic-interrupt", &opicplen);
        if (opicprop) {
                opicplen /= sizeof(u32);
                for (i = 0; i < opicplen; i++) {
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 2e4e04042d85..8ca2612221d6 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -359,11 +359,11 @@ static int enable_surveillance(int timeout)
 static int get_eventscan_parms(void)
 {
        struct device_node *node;
-        int *ip;
+        const int *ip;
        node = of_find_node_by_path("/rtas");
-        ip = (int *)get_property(node, "rtas-event-scan-rate", NULL);
+        ip = get_property(node, "rtas-event-scan-rate", NULL);
        if (ip == NULL) {
                printk(KERN_ERR "rtasd: no rtas-event-scan-rate\n");
                of_node_put(node);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 31867a701fcb..a6398fbe530d 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -133,9 +133,9 @@ void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc,
 static void __init pseries_mpic_init_IRQ(void)
 {
        struct device_node *np, *old, *cascade = NULL;
-        unsigned int *addrp;
+        const unsigned int *addrp;
        unsigned long intack = 0;
-        unsigned int *opprop;
+        const unsigned int *opprop;
        unsigned long openpic_addr = 0;
        unsigned int cascade_irq;
        int naddr, n, i, opplen;
@@ -143,7 +143,7 @@ static void __init pseries_mpic_init_IRQ(void)
        np = of_find_node_by_path("/");
        naddr = prom_n_addr_cells(np);
-        opprop = (unsigned int *) get_property(np, "platform-open-pic", &opplen);
+        opprop = get_property(np, "platform-open-pic", &opplen);
        if (opprop != 0) {
                openpic_addr = of_read_number(opprop, naddr);
                printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
@@ -192,7 +192,7 @@ static void __init pseries_mpic_init_IRQ(void)
                        break;
                if (strcmp(np->name, "pci") != 0)
                        continue;
-                addrp = (u32 *)get_property(np, "8259-interrupt-acknowledge",
+                addrp = get_property(np, "8259-interrupt-acknowledge",
                                            NULL);
                if (addrp == NULL)
                        continue;
@@ -223,23 +223,37 @@ static void pseries_lpar_enable_pmcs(void)
 }
 #ifdef CONFIG_KEXEC
-static void pseries_kexec_cpu_down_mpic(int crash_shutdown, int secondary)
+static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
-{
-        mpic_teardown_this_cpu(secondary);
-}
-static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary)
 {
        /* Don't risk a hypervisor call if we're crashing */
        if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) {
-                unsigned long vpa = __pa(get_lppaca());
+                unsigned long addr;
-                if (unregister_vpa(hard_smp_processor_id(), vpa)) {
+                addr = __pa(get_slb_shadow());
+                if (unregister_slb_shadow(hard_smp_processor_id(), addr))
+                        printk("SLB shadow buffer deregistration of "
+                               "cpu %u (hw_cpu_id %d) failed\n",
+                               smp_processor_id(),
+                               hard_smp_processor_id());
+                addr = __pa(get_lppaca());
+                if (unregister_vpa(hard_smp_processor_id(), addr)) {
                        printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
                                        "failed\n", smp_processor_id(),
                                        hard_smp_processor_id());
                }
        }
+}
+static void pseries_kexec_cpu_down_mpic(int crash_shutdown, int secondary)
+{
+        pseries_kexec_cpu_down(crash_shutdown, secondary);
+        mpic_teardown_this_cpu(secondary);
+}
+static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary)
+{
+        pseries_kexec_cpu_down(crash_shutdown, secondary);
        xics_teardown_cpu(secondary);
 }
 #endif /* CONFIG_KEXEC */
@@ -247,11 +261,11 @@ static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary)
 static void __init pseries_discover_pic(void)
 {
        struct device_node *np;
-        char *typep;
+        const char *typep;
        for (np = NULL; (np = of_find_node_by_name(np,
                                                   "interrupt-controller"));) {
-                typep = (char *)get_property(np, "compatible", NULL);
+                typep = get_property(np, "compatible", NULL);
                if (strstr(typep, "open-pic")) {
                        pSeries_mpic_node = of_node_get(np);
                        ppc_md.init_IRQ       = pseries_mpic_init_IRQ;
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index ac61098ff401..c6624b8a0e77 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -62,7 +62,7 @@
 */
 static cpumask_t of_spin_map;
-extern void pSeries_secondary_smp_init(unsigned long);
+extern void generic_secondary_smp_init(unsigned long);
 #ifdef CONFIG_HOTPLUG_CPU
@@ -145,9 +145,9 @@ static int pSeries_add_processor(struct device_node *np)
        unsigned int cpu;
        cpumask_t candidate_map, tmp = CPU_MASK_NONE;
        int err = -ENOSPC, len, nthreads, i;
-        u32 *intserv;
+        const u32 *intserv;
-        intserv = (u32 *)get_property(np, "ibm,ppc-interrupt-server#s", &len);
+        intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
        if (!intserv)
                return 0;
@@ -205,9 +205,9 @@ static void pSeries_remove_processor(struct device_node *np)
 {
        unsigned int cpu;
        int len, nthreads, i;
-        u32 *intserv;
+        const u32 *intserv;
-        intserv = (u32 *)get_property(np, "ibm,ppc-interrupt-server#s", &len);
+        intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len);
        if (!intserv)
                return;
@@ -270,7 +270,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
 {
        int status;
        unsigned long start_here = __pa((u32)*((unsigned long *)
-                                               pSeries_secondary_smp_init));
+                                               generic_secondary_smp_init));
        unsigned int pcpu;
        int start_cpu;
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index e98863025721..253972e5479f 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -34,6 +34,7 @@
 #include <asm/i8259.h>
 #include "xics.h"
+#include "plpar_wrappers.h"
 #define XICS_IPI                2
 #define XICS_IRQ_SPURIOUS       0
@@ -110,27 +111,6 @@ static inline void direct_qirr_info(int n_cpu, u8 value)
 /* LPAR low level accessors */
-static inline long plpar_eoi(unsigned long xirr)
-{
-        return plpar_hcall_norets(H_EOI, xirr);
-}
-static inline long plpar_cppr(unsigned long cppr)
-{
-        return plpar_hcall_norets(H_CPPR, cppr);
-}
-static inline long plpar_ipi(unsigned long servernum, unsigned long mfrr)
-{
-        return plpar_hcall_norets(H_IPI, servernum, mfrr);
-}
-static inline long plpar_xirr(unsigned long *xirr_ret)
-{
-        unsigned long dummy;
-        return plpar_hcall(H_XIRR, 0, 0, 0, 0, xirr_ret, &dummy, &dummy);
-}
 static inline unsigned int lpar_xirr_info_get(int n_cpu)
 {
        unsigned long lpar_rc;
@@ -590,14 +570,14 @@ static void __init xics_init_one_node(struct device_node *np,
                                      unsigned int *indx)
 {
        unsigned int ilen;
-        u32 *ireg;
+        const u32 *ireg;
        /* This code does the theorically broken assumption that the interrupt
         * server numbers are the same as the hard CPU numbers.
         * This happens to be the case so far but we are playing with fire...
         * should be fixed one of these days. -BenH.
         */
-        ireg = (u32 *)get_property(np, "ibm,interrupt-server-ranges", NULL);
+        ireg = get_property(np, "ibm,interrupt-server-ranges", NULL);
        /* Do that ever happen ? we'll know soon enough... but even good'old
         * f80 does have that property ..
@@ -609,7 +589,7 @@ static void __init xics_init_one_node(struct device_node *np,
                 */
                *indx = *ireg;
        }
-        ireg = (u32 *)get_property(np, "reg", &ilen);
+        ireg = get_property(np, "reg", &ilen);
        if (!ireg)
                panic("xics_init_IRQ: can't find interrupt reg property");
@@ -635,7 +615,7 @@ static void __init xics_setup_8259_cascade(void)
 {
        struct device_node *np, *old, *found = NULL;
        int cascade, naddr;
-        u32 *addrp;
+        const u32 *addrp;
        unsigned long intack = 0;
        for_each_node_by_type(np, "interrupt-controller")
@@ -661,7 +641,7 @@ static void __init xics_setup_8259_cascade(void)
                        break;
                if (strcmp(np->name, "pci") != 0)
                        continue;
-                addrp = (u32 *)get_property(np, "8259-interrupt-acknowledge", NULL);
+                addrp = get_property(np, "8259-interrupt-acknowledge", NULL);
                if (addrp == NULL)
                        continue;
                naddr = prom_n_addr_cells(np);
@@ -680,7 +660,8 @@ void __init xics_init_IRQ(void)
 {
        int i;
        struct device_node *np;
-        u32 *ireg, ilen, indx = 0;
+        u32 ilen, indx = 0;
+        const u32 *ireg;
        int found = 0;
        ppc64_boot_msg(0x20, "XICS Init");
@@ -705,18 +686,17 @@ void __init xics_init_IRQ(void)
        for (np = of_find_node_by_type(NULL, "cpu");
             np;
             np = of_find_node_by_type(np, "cpu")) {
-                ireg = (u32 *)get_property(np, "reg", &ilen);
+                ireg = get_property(np, "reg", &ilen);
                if (ireg && ireg[0] == get_hard_smp_processor_id(boot_cpuid)) {
-                        ireg = (u32 *)get_property(np,
+                        ireg = get_property(np,
-                                                  "ibm,ppc-interrupt-gserver#s",
+                                        "ibm,ppc-interrupt-gserver#s", &ilen);
-                                                   &ilen);
                        i = ilen / sizeof(int);
                        if (ireg && i > 0) {
                                default_server = ireg[0];
                                /* take last element */
                                default_distrib_server = ireg[i-1];
                        }
-                        ireg = (u32 *)get_property(np,
+                        ireg = get_property(np,
                                        "ibm,interrupt-server#-size", NULL);
                        if (ireg)
                                interrupt_server_size = *ireg;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index ef10bcf2d943..92ba378b7990 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -41,7 +41,7 @@ phys_addr_t get_immrbase(void)
        soc = of_find_node_by_type(NULL, "soc");
        if (soc) {
                unsigned int size;
-                void *prop = get_property(soc, "reg", &size);
+                const void *prop = get_property(soc, "reg", &size);
                immrbase = of_translate_address(soc, prop);
                of_node_put(soc);
        };
@@ -85,7 +85,7 @@ static int __init gfar_mdio_of_init(void)
                        mdio_data.irq[k] = -1;
                while ((child = of_get_next_child(np, child)) != NULL) {
-                        u32 *id = get_property(child, "reg", NULL);
+                        const u32 *id = get_property(child, "reg", NULL);
                        mdio_data.irq[*id] = irq_of_parse_and_map(child, 0);
                }
@@ -124,10 +124,10 @@ static int __init gfar_of_init(void)
                struct resource r[4];
                struct device_node *phy, *mdio;
                struct gianfar_platform_data gfar_data;
-                unsigned int *id;
+                const unsigned int *id;
-                char *model;
+                const char *model;
-                void *mac_addr;
+                const void *mac_addr;
-                phandle *ph;
+                const phandle *ph;
                int n_res = 1;
                memset(r, 0, sizeof(r));
@@ -193,7 +193,7 @@ static int __init gfar_of_init(void)
                            FSL_GIANFAR_DEV_HAS_VLAN |
                            FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
-                ph = (phandle *) get_property(np, "phy-handle", NULL);
+                ph = get_property(np, "phy-handle", NULL);
                phy = of_find_node_by_phandle(*ph);
                if (phy == NULL) {
@@ -203,7 +203,7 @@ static int __init gfar_of_init(void)
                mdio = of_get_parent(phy);
-                id = (u32 *) get_property(phy, "reg", NULL);
+                id = get_property(phy, "reg", NULL);
                ret = of_address_to_resource(mdio, 0, &res);
                if (ret) {
                        of_node_put(phy);
@@ -247,7 +247,7 @@ static int __init fsl_i2c_of_init(void)
             i++) {
                struct resource r[2];
                struct fsl_i2c_platform_data i2c_data;
-                unsigned char *flags = NULL;
+                const unsigned char *flags = NULL;
                memset(&r, 0, sizeof(r));
                memset(&i2c_data, 0, sizeof(i2c_data));
@@ -298,7 +298,7 @@ static int __init mpc83xx_wdt_init(void)
        struct resource r;
        struct device_node *soc, *np;
        struct platform_device *dev;
-        unsigned int *freq;
+        const unsigned int *freq;
        int ret;
        np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
@@ -315,7 +315,7 @@ static int __init mpc83xx_wdt_init(void)
                goto nosoc;
        }
-        freq = (unsigned int *)get_property(soc, "bus-frequency", NULL);
+        freq = get_property(soc, "bus-frequency", NULL);
        if (!freq) {
                ret = -ENODEV;
                goto err;
@@ -355,7 +355,7 @@ nodev:
 arch_initcall(mpc83xx_wdt_init);
 #endif
-static enum fsl_usb2_phy_modes determine_usb_phy(char * phy_type)
+static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
 {
        if (!phy_type)
                return FSL_USB2_PHY_NONE;
@@ -383,7 +383,7 @@ static int __init fsl_usb_of_init(void)
             i++) {
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
-                unsigned char *prop = NULL;
+                const unsigned char *prop = NULL;
                memset(&r, 0, sizeof(r));
                memset(&usb_data, 0, sizeof(usb_data));
@@ -431,7 +431,7 @@ static int __init fsl_usb_of_init(void)
             i++) {
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
-                unsigned char *prop = NULL;
+                const unsigned char *prop = NULL;
                memset(&r, 0, sizeof(r));
                memset(&usb_data, 0, sizeof(usb_data));
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 9855820b9548..26a6a3becd66 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -224,7 +224,7 @@ static struct irq_host_ops i8259_host_ops = {
        .xlate = i8259_host_xlate,
 };
-/****
+/**
 * i8259_init - Initialize the legacy controller
 * @node: device node of the legacy PIC (can be NULL, but then, it will match
 *        all interrupts, so beware)
diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c
index 615350d46b52..ff23f5a4d4b9 100644
--- a/arch/powerpc/sysdev/mmio_nvram.c
+++ b/arch/powerpc/sysdev/mmio_nvram.c
@@ -80,7 +80,7 @@ static ssize_t mmio_nvram_get_size(void)
 int __init mmio_nvram_init(void)
 {
        struct device_node *nvram_node;
-        unsigned long *buffer;
+        const unsigned long *buffer;
        int proplen;
        unsigned long nvram_addr;
        int ret;
@@ -91,7 +91,7 @@ int __init mmio_nvram_init(void)
                goto out;
        ret = -EIO;
-        buffer = (unsigned long *)get_property(nvram_node, "reg", &proplen);
+        buffer = get_property(nvram_node, "reg", &proplen);
        if (proplen != 2*sizeof(unsigned long))
                goto out;
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 2ab06ed3ae73..c28f69bef8e2 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -194,7 +194,7 @@ int __init tsi108_setup_pci(struct device_node *dev)
        int len;
        struct pci_controller *hose;
        struct resource rsrc;
-        int *bus_range;
+        const int *bus_range;
        int primary = 0, has_address = 0;
        /* PCI Config mapping */
@@ -207,7 +207,7 @@ int __init tsi108_setup_pci(struct device_node *dev)
        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
        /* Get bus range if any */
-        bus_range = (int *)get_property(dev, "bus-range", &len);
+        bus_range = get_property(dev, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", dev->full_name);
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 179b10ced8c7..8adad1444a51 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -137,10 +137,14 @@ static void bootcmds(void);
 static void proccall(void);
 void dump_segments(void);
 static void symbol_lookup(void);
+static void xmon_show_stack(unsigned long sp, unsigned long lr,
+                            unsigned long pc);
 static void xmon_print_symbol(unsigned long address, const char *mid,
                              const char *after);
 static const char *getvecname(unsigned long vec);
+int xmon_no_auto_backtrace;
 extern int print_insn_powerpc(unsigned long, unsigned long, int);
 extern void xmon_enter(void);
@@ -736,6 +740,12 @@ cmds(struct pt_regs *excp)
        last_cmd = NULL;
        xmon_regs = excp;
+        if (!xmon_no_auto_backtrace) {
+                xmon_no_auto_backtrace = 1;
+                xmon_show_stack(excp->gpr[1], excp->link, excp->nip);
+        }
        for(;;) {
 #ifdef CONFIG_SMP
                printf("%x:", smp_processor_id());
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index a04cdf01596b..8fa10cf661a8 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1204,7 +1204,7 @@ config PCI_DOMAINS
        default PCI
 config MPC83xx_PCI2
-        bool "  Supprt for 2nd PCI host controller"
+        bool "Support for 2nd PCI host controller"
        depends on PCI && MPC834x
        default y if MPC834x_SYS
@@ -1223,12 +1223,12 @@ config PCI_8260
        default y
 config 8260_PCI9
-        bool "  Enable workaround for MPC826x erratum PCI 9"
+        bool "Enable workaround for MPC826x erratum PCI 9"
        depends on PCI_8260 && !ADS8272
        default y
 choice
-        prompt "  IDMA channel for PCI 9 workaround"
+        prompt "IDMA channel for PCI 9 workaround"
        depends on 8260_PCI9
 config 8260_PCI9_IDMA1
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index a74f46d9826f..5458ac5da7c3 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -127,11 +127,8 @@ void machine_restart(char *cmd)
        ppc_md.restart(cmd);
 }
-void machine_power_off(void)
+static void ppc_generic_power_off(void)
 {
-#ifdef CONFIG_NVRAM
-        nvram_sync();
-#endif
        ppc_md.power_off();
 }
@@ -143,7 +140,17 @@ void machine_halt(void)
        ppc_md.halt();
 }
-void (*pm_power_off)(void) = machine_power_off;
+void (*pm_power_off)(void) = ppc_generic_power_off;
+void machine_power_off(void)
+{
+#ifdef CONFIG_NVRAM
+        nvram_sync();
+#endif
+        if (pm_power_off)
+                pm_power_off();
+        ppc_generic_power_off();
+}
 #ifdef CONFIG_TAU
 extern u32 cpu_temp(unsigned long cpu);
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index f7e92986952a..d74a883e5bde 100644
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -15,6 +15,7 @@
 #include <asm/processor.h>
 #include <asm/delay.h>
 #include <asm/btext.h>
+#include <asm/ibm4xx.h>
 static volatile unsigned char *sccc, *sccd;
 unsigned int TXRDY, RXRDY, DLAB;
@@ -57,23 +58,30 @@ static struct sysrq_key_op sysrq_xmon_op =
 void
 xmon_map_scc(void)
 {
-#ifdef CONFIG_PPC_PREP
+#if defined(CONFIG_GEMINI)
-        volatile unsigned char *base;
-#elif defined(CONFIG_GEMINI)
        /* should already be mapped by the kernel boot */
-        sccc = (volatile unsigned char *) 0xffeffb0d;
        sccd = (volatile unsigned char *) 0xffeffb08;
-        TXRDY = 0x20;
-        RXRDY = 1;
-        DLAB = 0x80;
 #elif defined(CONFIG_405GP)
-        sccc = (volatile unsigned char *)0xef600305;
        sccd = (volatile unsigned char *)0xef600300;
+#elif defined(CONFIG_440EP)
+        sccd = (volatile unsigned char *) ioremap(PPC440EP_UART0_ADDR, 8);
+#elif defined(CONFIG_440SP)
+        sccd = (volatile unsigned char *) ioremap64(PPC440SP_UART0_ADDR, 8);
+#elif defined(CONFIG_440SPE)
+        sccd = (volatile unsigned char *) ioremap64(PPC440SPE_UART0_ADDR, 8);
+#elif defined(CONFIG_44x)
+        /* This is the default for 44x platforms.  Any boards that have a
+           different UART address need to be put in cases before this or the
+           port will be mapped incorrectly */
+        sccd = (volatile unsigned char *) ioremap64(PPC440GP_UART0_ADDR, 8);
+#endif /* platform */
+#ifndef CONFIG_PPC_PREP
+        sccc = sccd + 5;
        TXRDY = 0x20;
        RXRDY = 1;
        DLAB = 0x80;
-#endif /* platform */
+#endif
        register_sysrq_key('x', &sysrq_xmon_op);
 }
diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c
index 37d234f93394..25d032b2aec7 100644
--- a/arch/ppc/xmon/xmon.c
+++ b/arch/ppc/xmon/xmon.c
@@ -153,6 +153,12 @@ static int xmon_trace[NR_CPUS];
 #define SSTEP   1               /* stepping because of 's' command */
 #define BRSTEP  2               /* stepping over breakpoint */
+#ifdef CONFIG_4xx
+#define MSR_SSTEP_ENABLE 0x200
+#else
+#define MSR_SSTEP_ENABLE 0x400
+#endif
 static struct pt_regs *xmon_regs[NR_CPUS];
 extern inline void sync(void)
@@ -211,6 +217,14 @@ static void get_tb(unsigned *p)
        p[1] = lo;
 }
+static inline void xmon_enable_sstep(struct pt_regs *regs)
+{
+        regs->msr |= MSR_SSTEP_ENABLE;
+#ifdef CONFIG_4xx
+        mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM);
+#endif
+}
 int xmon(struct pt_regs *excp)
 {
        struct pt_regs regs;
@@ -254,10 +268,10 @@ int xmon(struct pt_regs *excp)
        cmd = cmds(excp);
        if (cmd == 's') {
                xmon_trace[smp_processor_id()] = SSTEP;
-                excp->msr |= 0x400;
+                xmon_enable_sstep(excp);
        } else if (at_breakpoint(excp->nip)) {
                xmon_trace[smp_processor_id()] = BRSTEP;
-                excp->msr |= 0x400;
+                xmon_enable_sstep(excp);
        } else {
                xmon_trace[smp_processor_id()] = 0;
                insert_bpts();
@@ -298,7 +312,7 @@ xmon_bpt(struct pt_regs *regs)
                remove_bpts();
                excprint(regs);
                xmon_trace[smp_processor_id()] = BRSTEP;
-                regs->msr |= 0x400;
+                xmon_enable_sstep(regs);
        } else {
                xmon(regs);
        }
@@ -385,7 +399,7 @@ insert_bpts(void)
                }
                store_inst((void *) bp->address);
        }
-#if !defined(CONFIG_8xx)
+#if ! (defined(CONFIG_8xx) || defined(CONFIG_4xx))
        if (dabr.enabled)
                set_dabr(dabr.address);
        if (iabr.enabled)
@@ -400,7 +414,7 @@ remove_bpts(void)
        struct bpt *bp;
        unsigned instr;
-#if !defined(CONFIG_8xx)
+#if ! (defined(CONFIG_8xx) || defined(CONFIG_4xx))
        set_dabr(0);
        set_iabr(0);
 #endif
@@ -677,7 +691,7 @@ bpt_cmds(void)
        cmd = inchar();
        switch (cmd) {
-#if !defined(CONFIG_8xx)
+#if ! (defined(CONFIG_8xx) || defined(CONFIG_4xx))
        case 'd':
                mode = 7;
                cmd = inchar();
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c40e487d9f5c..52ea94b891f5 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -495,6 +495,21 @@ config LEGACY_PTY_COUNT
          When not in use, each legacy PTY occupies 12 bytes on 32-bit
          architectures and 24 bytes on 64-bit architectures.
+config BRIQ_PANEL
+        tristate 'Total Impact briQ front panel driver'
+        depends on PPC_CHRP
+        ---help---
+          The briQ is a small footprint CHRP computer with a frontpanel VFD, a
+          tristate led and two switches. It is the size of a CDROM drive.
+          If you have such one and want anything showing on the VFD then you
+          must answer Y here.
+          To compile this driver as a module, choose M here: the
+          module will be called briq_panel.
+          It's safe to say N here.
 config PRINTER
        tristate "Parallel printer support"
        depends on PARPORT
@@ -596,6 +611,13 @@ config HVC_CONSOLE
          console. This driver allows each pSeries partition to have a console
          which is accessed via the HMC.
+config HVC_ISERIES
+        bool "iSeries Hypervisor Virtual Console support"
+        depends on PPC_ISERIES && !VIOCONS
+        select HVC_DRIVER
+        help
+          iSeries machines support a hypervisor virtual console.
 config HVC_RTAS
        bool "IBM RTAS Console support"
        depends on PPC_RTAS
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 6e0f4469d8bb..8c6dfc621520 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 obj-$(CONFIG_SX)                += sx.o generic_serial.o
 obj-$(CONFIG_RIO)               += rio/ generic_serial.o
 obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi.o
+obj-$(CONFIG_HVC_ISERIES)       += hvc_iseries.o
 obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
 obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
@@ -51,6 +52,7 @@ obj-$(CONFIG_VIOCONS)		+= viocons.o
 obj-$(CONFIG_VIOTAPE)           += viotape.o
 obj-$(CONFIG_HVCS)              += hvcs.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
+obj-$(CONFIG_BRIQ_PANEL)        += briq_panel.o
 obj-$(CONFIG_PRINTER)           += lp.o
 obj-$(CONFIG_TIPAR)             += tipar.o
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 1de1b12043bf..91b71e750ee1 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -601,8 +601,8 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
                uninorth_node = of_find_node_by_name(NULL, "u3");
        }
        if (uninorth_node) {
-                int *revprop = (int *)
+                const int *revprop = get_property(uninorth_node,
-                        get_property(uninorth_node, "device-rev", NULL);
+                                "device-rev", NULL);
                if (revprop != NULL)
                        uninorth_rev = *revprop & 0x3f;
                of_node_put(uninorth_node);
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
new file mode 100644
index 000000000000..a0e5eac5f33a
--- /dev/null
+++ b/drivers/char/briq_panel.c
@@ -0,0 +1,268 @@
+/*
+ * Drivers for the Total Impact PPC based computer "BRIQ"
+ * by Dr. Karsten Jeppesen
+ *
+ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/tty.h>
+#include <linux/timer.h>
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/wait.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/delay.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#define         BRIQ_PANEL_MINOR        156
+#define         BRIQ_PANEL_VFD_IOPORT   0x0390
+#define         BRIQ_PANEL_LED_IOPORT   0x0398
+#define         BRIQ_PANEL_VER          "1.1 (04/20/2002)"
+#define         BRIQ_PANEL_MSG0         "Loading Linux"
+static int              vfd_is_open;
+static unsigned char    vfd[40];
+static int              vfd_cursor;
+static unsigned char    ledpb, led;
+static void update_vfd(void)
+{
+        int     i;
+        /* cursor home */
+        outb(0x02, BRIQ_PANEL_VFD_IOPORT);
+        for (i=0; i<20; i++)
+                outb(vfd[i], BRIQ_PANEL_VFD_IOPORT + 1);
+        /* cursor to next line */
+        outb(0xc0, BRIQ_PANEL_VFD_IOPORT);
+        for (i=20; i<40; i++)
+                outb(vfd[i], BRIQ_PANEL_VFD_IOPORT + 1);
+}
+static void set_led(char state)
+{
+        if (state == 'R')
+                led = 0x01;
+        else if (state == 'G')
+                led = 0x02;
+        else if (state == 'Y')
+                led = 0x03;
+        else if (state == 'X')
+                led = 0x00;
+        outb(led, BRIQ_PANEL_LED_IOPORT);
+}
+static int briq_panel_open(struct inode *ino, struct file *filep)
+{
+        /* enforce single access */
+        if (vfd_is_open)
+                return -EBUSY;
+        vfd_is_open = 1;
+        return 0;
+}
+static int briq_panel_release(struct inode *ino, struct file *filep)
+{
+        if (!vfd_is_open)
+                return -ENODEV;
+        vfd_is_open = 0;
+        return 0;
+}
+static ssize_t briq_panel_read(struct file *file, char *buf, size_t count,
+                         loff_t *ppos)
+{
+        unsigned short c;
+        unsigned char cp;
+#if 0   /*  Can't seek (pread) on this device  */
+        if (ppos != &file->f_pos)
+                return -ESPIPE;
+#endif
+        if (!vfd_is_open)
+                return -ENODEV;
+        c = (inb(BRIQ_PANEL_LED_IOPORT) & 0x000c) | (ledpb & 0x0003);
+        set_led(' ');
+        /* upper button released */
+        if ((!(ledpb & 0x0004)) && (c & 0x0004)) {
+                cp = ' ';
+                ledpb = c;
+                if (copy_to_user(buf, &cp, 1))
+                        return -EFAULT;
+                return 1;
+        }
+        /* lower button released */
+        else if ((!(ledpb & 0x0008)) && (c & 0x0008)) {
+                cp = '\r';
+                ledpb = c;
+                if (copy_to_user(buf, &cp, 1))
+                        return -EFAULT;
+                return 1;
+        } else {
+                ledpb = c;
+                return 0;
+        }
+}
+static void scroll_vfd( void )
+{
+        int     i;
+        for (i=0; i<20; i++) {
+                vfd[i] = vfd[i+20];
+                vfd[i+20] = ' ';
+        }
+        vfd_cursor = 20;
+}
+static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
+                          loff_t *ppos)
+{
+        size_t indx = len;
+        int i, esc = 0;
+#if 0   /*  Can't seek (pwrite) on this device  */
+        if (ppos != &file->f_pos)
+                return -ESPIPE;
+#endif
+        if (!vfd_is_open)
+                return -EBUSY;
+        for (;;) {
+                if (!indx)
+                        break;
+                if (esc) {
+                        set_led(*buf);
+                        esc = 0;
+                } else if (*buf == 27) {
+                        esc = 1;
+                } else if (*buf == 12) {
+                        /* do a form feed */
+                        for (i=0; i<40; i++)
+                                vfd[i] = ' ';
+                        vfd_cursor = 0;
+                } else if (*buf == 10) {
+                        if (vfd_cursor < 20)
+                                vfd_cursor = 20;
+                        else if (vfd_cursor < 40)
+                                vfd_cursor = 40;
+                        else if (vfd_cursor < 60)
+                                vfd_cursor = 60;
+                        if (vfd_cursor > 59)
+                                scroll_vfd();
+                } else {
+                        /* just a character */
+                        if (vfd_cursor > 39)
+                                scroll_vfd();
+                        vfd[vfd_cursor++] = *buf;
+                }
+                indx--;
+                buf++;
+        }
+        update_vfd();
+        return len;
+}
+static struct file_operations briq_panel_fops = {
+        .owner          = THIS_MODULE,
+        .read           = briq_panel_read,
+        .write          = briq_panel_write,
+        .open           = briq_panel_open,
+        .release        = briq_panel_release,
+};
+static struct miscdevice briq_panel_miscdev = {
+        BRIQ_PANEL_MINOR,
+        "briq_panel",
+        &briq_panel_fops
+};
+static int __init briq_panel_init(void)
+{
+        struct device_node *root = find_path_device("/");
+        char *machine;
+        int i;
+        machine = get_property(root, "model", NULL);
+        if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0)
+                return -ENODEV;
+        printk(KERN_INFO
+                "briq_panel: v%s Dr. Karsten Jeppesen (kj@totalimpact.com)\n",
+                BRIQ_PANEL_VER);
+        if (!request_region(BRIQ_PANEL_VFD_IOPORT, 4, "BRIQ Front Panel"))
+                return -EBUSY;
+        if (!request_region(BRIQ_PANEL_LED_IOPORT, 2, "BRIQ Front Panel")) {
+                release_region(BRIQ_PANEL_VFD_IOPORT, 4);
+                return -EBUSY;
+        }
+        ledpb = inb(BRIQ_PANEL_LED_IOPORT) & 0x000c;
+        if (misc_register(&briq_panel_miscdev) < 0) {
+                release_region(BRIQ_PANEL_VFD_IOPORT, 4);
+                release_region(BRIQ_PANEL_LED_IOPORT, 2);
+                return -EBUSY;
+        }
+        outb(0x38, BRIQ_PANEL_VFD_IOPORT);      /* Function set */
+        outb(0x01, BRIQ_PANEL_VFD_IOPORT);      /* Clear display */
+        outb(0x0c, BRIQ_PANEL_VFD_IOPORT);      /* Display on */
+        outb(0x06, BRIQ_PANEL_VFD_IOPORT);      /* Entry normal */
+        for (i=0; i<40; i++)
+                vfd[i]=' ';
+#ifndef MODULE
+        vfd[0] = 'L';
+        vfd[1] = 'o';
+        vfd[2] = 'a';
+        vfd[3] = 'd';
+        vfd[4] = 'i';
+        vfd[5] = 'n';
+        vfd[6] = 'g';
+        vfd[7] = ' ';
+        vfd[8] = '.';
+        vfd[9] = '.';
+        vfd[10] = '.';
+#endif /* !MODULE */
+        update_vfd();
+        return 0;
+}
+static void __exit briq_panel_exit(void)
+{
+        misc_deregister(&briq_panel_miscdev);
+        release_region(BRIQ_PANEL_VFD_IOPORT, 4);
+        release_region(BRIQ_PANEL_LED_IOPORT, 2);
+}
+module_init(briq_panel_init);
+module_exit(briq_panel_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Karsten Jeppesen <karsten@jeppesens.com>");
+MODULE_DESCRIPTION("Driver for the Total Impact briQ front panel");
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index ca2f538e549e..1d1bd34b7f12 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -80,7 +80,8 @@ struct hvc_struct {
        struct tty_struct *tty;
        unsigned int count;
        int do_wakeup;
-        char outbuf[N_OUTBUF] __ALIGNED__;
+        char *outbuf;
+        int outbuf_size;
        int n_outbuf;
        uint32_t vtermno;
        struct hv_ops *ops;
@@ -319,10 +320,8 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
        struct kobject *kobjp;
        /* Auto increments kobject reference if found. */
-        if (!(hp = hvc_get_by_index(tty->index))) {
+        if (!(hp = hvc_get_by_index(tty->index)))
-                printk(KERN_WARNING "hvc_console: tty open failed, no vty associated with tty.\n");
                return -ENODEV;
-        }
        spin_lock_irqsave(&hp->lock, flags);
        /* Check and then increment for fast path open. */
@@ -505,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
        if (hp->n_outbuf > 0)
                hvc_push(hp);
-        while (count > 0 && (rsize = N_OUTBUF - hp->n_outbuf) > 0) {
+        while (count > 0 && (rsize = hp->outbuf_size - hp->n_outbuf) > 0) {
                if (rsize > count)
                        rsize = count;
                memcpy(hp->outbuf + hp->n_outbuf, buf, rsize);
@@ -538,7 +537,7 @@ static int hvc_write_room(struct tty_struct *tty)
        if (!hp)
                return -1;
-        return N_OUTBUF - hp->n_outbuf;
+        return hp->outbuf_size - hp->n_outbuf;
 }
 static int hvc_chars_in_buffer(struct tty_struct *tty)
@@ -728,12 +727,13 @@ static struct kobj_type hvc_kobj_type = {
 };
 struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int irq,
-                                        struct hv_ops *ops)
+                                        struct hv_ops *ops, int outbuf_size)
 {
        struct hvc_struct *hp;
        int i;
-        hp = kmalloc(sizeof(*hp), GFP_KERNEL);
+        hp = kmalloc(ALIGN(sizeof(*hp), sizeof(long)) + outbuf_size,
+                        GFP_KERNEL);
        if (!hp)
                return ERR_PTR(-ENOMEM);
@@ -742,6 +742,8 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int irq,
        hp->vtermno = vtermno;
        hp->irq = irq;
        hp->ops = ops;
+        hp->outbuf_size = outbuf_size;
+        hp->outbuf = &((char *)hp)[ALIGN(sizeof(*hp), sizeof(long))];
        kobject_init(&hp->kobj);
        hp->kobj.ktype = &hvc_kobj_type;
diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
index 96b7401319c1..8c59818050e6 100644
--- a/drivers/char/hvc_console.h
+++ b/drivers/char/hvc_console.h
@@ -56,7 +56,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
 /* register a vterm for hvc tty operation (module_init or hotplug add) */
 extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
-                                                 struct hv_ops *ops);
+                                struct hv_ops *ops, int outbuf_size);
 /* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
 extern int __devexit hvc_remove(struct hvc_struct *hp);
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
new file mode 100644
index 000000000000..4747729459c7
--- /dev/null
+++ b/drivers/char/hvc_iseries.c
@@ -0,0 +1,594 @@
+/*
+ * iSeries vio driver interface to hvc_console.c
+ *
+ * This code is based heavily on hvc_vio.c and viocons.c
+ *
+ * Copyright (C) 2006 Stephen Rothwell, IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#include <stdarg.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/console.h>
+#include <asm/hvconsole.h>
+#include <asm/vio.h>
+#include <asm/prom.h>
+#include <asm/iseries/vio.h>
+#include <asm/iseries/hv_call.h>
+#include <asm/iseries/hv_lp_config.h>
+#include <asm/iseries/hv_lp_event.h>
+#include "hvc_console.h"
+#define VTTY_PORTS 10
+static DEFINE_SPINLOCK(consolelock);
+static DEFINE_SPINLOCK(consoleloglock);
+static const char hvc_driver_name[] = "hvc_console";
+#define IN_BUF_SIZE     200
+/*
+ * Our port information.
+ */
+static struct port_info {
+        HvLpIndex lp;
+        u64 seq;        /* sequence number of last HV send */
+        u64 ack;        /* last ack from HV */
+        struct hvc_struct *hp;
+        int in_start;
+        int in_end;
+        unsigned char in_buf[IN_BUF_SIZE];
+} port_info[VTTY_PORTS] = {
+        [ 0 ... VTTY_PORTS - 1 ] = {
+                .lp = HvLpIndexInvalid
+        }
+};
+#define viochar_is_console(pi)  ((pi) == &port_info[0])
+static struct vio_device_id hvc_driver_table[] __devinitdata = {
+        {"serial", "IBM,iSeries-vty"},
+        { "", "" }
+};
+MODULE_DEVICE_TABLE(vio, hvc_driver_table);
+static void hvlog(char *fmt, ...)
+{
+        int i;
+        unsigned long flags;
+        va_list args;
+        static char buf[256];
+        spin_lock_irqsave(&consoleloglock, flags);
+        va_start(args, fmt);
+        i = vscnprintf(buf, sizeof(buf) - 1, fmt, args);
+        va_end(args);
+        buf[i++] = '\r';
+        HvCall_writeLogBuffer(buf, i);
+        spin_unlock_irqrestore(&consoleloglock, flags);
+}
+/*
+ * Initialize the common fields in a charLpEvent
+ */
+static void init_data_event(struct viocharlpevent *viochar, HvLpIndex lp)
+{
+        struct HvLpEvent *hev = &viochar->event;
+        memset(viochar, 0, sizeof(struct viocharlpevent));
+        hev->flags = HV_LP_EVENT_VALID | HV_LP_EVENT_DEFERRED_ACK |
+                HV_LP_EVENT_INT;
+        hev->xType = HvLpEvent_Type_VirtualIo;
+        hev->xSubtype = viomajorsubtype_chario | viochardata;
+        hev->xSourceLp = HvLpConfig_getLpIndex();
+        hev->xTargetLp = lp;
+        hev->xSizeMinus1 = sizeof(struct viocharlpevent);
+        hev->xSourceInstanceId = viopath_sourceinst(lp);
+        hev->xTargetInstanceId = viopath_targetinst(lp);
+}
+static int get_chars(uint32_t vtermno, char *buf, int count)
+{
+        struct port_info *pi;
+        int n = 0;
+        unsigned long flags;
+        if (vtermno >= VTTY_PORTS)
+                return -EINVAL;
+        if (count == 0)
+                return 0;
+        pi = &port_info[vtermno];
+        spin_lock_irqsave(&consolelock, flags);
+        if (pi->in_end == 0)
+                goto done;
+        n = pi->in_end - pi->in_start;
+        if (n > count)
+                n = count;
+        memcpy(buf, &pi->in_buf[pi->in_start], n);
+        pi->in_start += n;
+        if (pi->in_start == pi->in_end) {
+                pi->in_start = 0;
+                pi->in_end = 0;
+        }
+done:
+        spin_unlock_irqrestore(&consolelock, flags);
+        return n;
+}
+static int put_chars(uint32_t vtermno, const char *buf, int count)
+{
+        struct viocharlpevent *viochar;
+        struct port_info *pi;
+        HvLpEvent_Rc hvrc;
+        unsigned long flags;
+        int sent = 0;
+        if (vtermno >= VTTY_PORTS)
+                return -EINVAL;
+        pi = &port_info[vtermno];
+        spin_lock_irqsave(&consolelock, flags);
+        if (viochar_is_console(pi) && !viopath_isactive(pi->lp)) {
+                spin_lock_irqsave(&consoleloglock, flags);
+                HvCall_writeLogBuffer(buf, count);
+                spin_unlock_irqrestore(&consoleloglock, flags);
+                sent = count;
+                goto done;
+        }
+        viochar = vio_get_event_buffer(viomajorsubtype_chario);
+        if (viochar == NULL) {
+                hvlog("\n\rviocons: Can't get viochar buffer.");
+                goto done;
+        }
+        while ((count > 0) && ((pi->seq - pi->ack) < VIOCHAR_WINDOW)) {
+                int len;
+                len = (count > VIOCHAR_MAX_DATA) ? VIOCHAR_MAX_DATA : count;
+                if (viochar_is_console(pi)) {
+                        spin_lock_irqsave(&consoleloglock, flags);
+                        HvCall_writeLogBuffer(buf, len);
+                        spin_unlock_irqrestore(&consoleloglock, flags);
+                }
+                init_data_event(viochar, pi->lp);
+                viochar->len = len;
+                viochar->event.xCorrelationToken = pi->seq++;
+                viochar->event.xSizeMinus1 =
+                        offsetof(struct viocharlpevent, data) + len;
+                memcpy(viochar->data, buf, len);
+                hvrc = HvCallEvent_signalLpEvent(&viochar->event);
+                if (hvrc)
+                        hvlog("\n\rerror sending event! return code %d\n\r",
+                                (int)hvrc);
+                sent += len;
+                count -= len;
+                buf += len;
+        }
+        vio_free_event_buffer(viomajorsubtype_chario, viochar);
+done:
+        spin_unlock_irqrestore(&consolelock, flags);
+        return sent;
+}
+static struct hv_ops hvc_get_put_ops = {
+        .get_chars = get_chars,
+        .put_chars = put_chars,
+};
+static int __devinit hvc_vio_probe(struct vio_dev *vdev,
+                        const struct vio_device_id *id)
+{
+        struct hvc_struct *hp;
+        struct port_info *pi;
+        /* probed with invalid parameters. */
+        if (!vdev || !id)
+                return -EPERM;
+        if (vdev->unit_address >= VTTY_PORTS)
+                return -ENODEV;
+        pi = &port_info[vdev->unit_address];
+        hp = hvc_alloc(vdev->unit_address, vdev->irq, &hvc_get_put_ops,
+                        VIOCHAR_MAX_DATA);
+        if (IS_ERR(hp))
+                return PTR_ERR(hp);
+        pi->hp = hp;
+        dev_set_drvdata(&vdev->dev, pi);
+        return 0;
+}
+static int __devexit hvc_vio_remove(struct vio_dev *vdev)
+{
+        struct port_info *pi = dev_get_drvdata(&vdev->dev);
+        struct hvc_struct *hp = pi->hp;
+        return hvc_remove(hp);
+}
+static struct vio_driver hvc_vio_driver = {
+        .id_table       = hvc_driver_table,
+        .probe          = hvc_vio_probe,
+        .remove         = hvc_vio_remove,
+        .driver         = {
+                .name   = hvc_driver_name,
+                .owner  = THIS_MODULE,
+        }
+};
+static void hvc_open_event(struct HvLpEvent *event)
+{
+        unsigned long flags;
+        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
+        u8 port = cevent->virtual_device;
+        struct port_info *pi;
+        int reject = 0;
+        if (hvlpevent_is_ack(event)) {
+                if (port >= VTTY_PORTS)
+                        return;
+                spin_lock_irqsave(&consolelock, flags);
+                pi = &port_info[port];
+                if (event->xRc == HvLpEvent_Rc_Good) {
+                        pi->seq = pi->ack = 0;
+                        /*
+                         * This line allows connections from the primary
+                         * partition but once one is connected from the
+                         * primary partition nothing short of a reboot
+                         * of linux will allow access from the hosting
+                         * partition again without a required iSeries fix.
+                         */
+                        pi->lp = event->xTargetLp;
+                }
+                spin_unlock_irqrestore(&consolelock, flags);
+                if (event->xRc != HvLpEvent_Rc_Good)
+                        printk(KERN_WARNING
+                               "hvc: handle_open_event: event->xRc == (%d).\n",
+                               event->xRc);
+                if (event->xCorrelationToken != 0) {
+                        atomic_t *aptr= (atomic_t *)event->xCorrelationToken;
+                        atomic_set(aptr, 1);
+                } else
+                        printk(KERN_WARNING
+                               "hvc: weird...got open ack without atomic\n");
+                return;
+        }
+        /* This had better require an ack, otherwise complain */
+        if (!hvlpevent_need_ack(event)) {
+                printk(KERN_WARNING "hvc: viocharopen without ack bit!\n");
+                return;
+        }
+        spin_lock_irqsave(&consolelock, flags);
+        /* Make sure this is a good virtual tty */
+        if (port >= VTTY_PORTS) {
+                event->xRc = HvLpEvent_Rc_SubtypeError;
+                cevent->subtype_result_code = viorc_openRejected;
+                /*
+                 * Flag state here since we can't printk while holding
+                 * the consolelock spinlock.
+                 */
+                reject = 1;
+        } else {
+                pi = &port_info[port];
+                if ((pi->lp != HvLpIndexInvalid) &&
+                                (pi->lp != event->xSourceLp)) {
+                        /*
+                         * If this is tty is already connected to a different
+                         * partition, fail.
+                         */
+                        event->xRc = HvLpEvent_Rc_SubtypeError;
+                        cevent->subtype_result_code = viorc_openRejected;
+                        reject = 2;
+                } else {
+                        pi->lp = event->xSourceLp;
+                        event->xRc = HvLpEvent_Rc_Good;
+                        cevent->subtype_result_code = viorc_good;
+                        pi->seq = pi->ack = 0;
+                }
+        }
+        spin_unlock_irqrestore(&consolelock, flags);
+        if (reject == 1)
+                printk(KERN_WARNING "hvc: open rejected: bad virtual tty.\n");
+        else if (reject == 2)
+                printk(KERN_WARNING "hvc: open rejected: console in exclusive "
+                                "use by another partition.\n");
+        /* Return the acknowledgement */
+        HvCallEvent_ackLpEvent(event);
+}
+/*
+ * Handle a close charLpEvent.  This should ONLY be an Interrupt because the
+ * virtual console should never actually issue a close event to the hypervisor
+ * because the virtual console never goes away.  A close event coming from the
+ * hypervisor simply means that there are no client consoles connected to the
+ * virtual console.
+ */
+static void hvc_close_event(struct HvLpEvent *event)
+{
+        unsigned long flags;
+        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
+        u8 port = cevent->virtual_device;
+        if (!hvlpevent_is_int(event)) {
+                printk(KERN_WARNING
+                        "hvc: got unexpected close acknowlegement\n");
+                return;
+        }
+        if (port >= VTTY_PORTS) {
+                printk(KERN_WARNING
+                        "hvc: close message from invalid virtual device.\n");
+                return;
+        }
+        /* For closes, just mark the console partition invalid */
+        spin_lock_irqsave(&consolelock, flags);
+        if (port_info[port].lp == event->xSourceLp)
+                port_info[port].lp = HvLpIndexInvalid;
+        spin_unlock_irqrestore(&consolelock, flags);
+}
+static void hvc_data_event(struct HvLpEvent *event)
+{
+        unsigned long flags;
+        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
+        struct port_info *pi;
+        int n;
+        u8 port = cevent->virtual_device;
+        if (port >= VTTY_PORTS) {
+                printk(KERN_WARNING "hvc: data on invalid virtual device %d\n",
+                                port);
+                return;
+        }
+        if (cevent->len == 0)
+                return;
+        /*
+         * Change 05/01/2003 - Ryan Arnold: If a partition other than
+         * the current exclusive partition tries to send us data
+         * events then just drop them on the floor because we don't
+         * want his stinking data.  He isn't authorized to receive
+         * data because he wasn't the first one to get the console,
+         * therefore he shouldn't be allowed to send data either.
+         * This will work without an iSeries fix.
+         */
+        pi = &port_info[port];
+        if (pi->lp != event->xSourceLp)
+                return;
+        spin_lock_irqsave(&consolelock, flags);
+        n = IN_BUF_SIZE - pi->in_end;
+        if (n > cevent->len)
+                n = cevent->len;
+        if (n > 0) {
+                memcpy(&pi->in_buf[pi->in_end], cevent->data, n);
+                pi->in_end += n;
+        }
+        spin_unlock_irqrestore(&consolelock, flags);
+        if (n == 0)
+                printk(KERN_WARNING "hvc: input buffer overflow\n");
+}
+static void hvc_ack_event(struct HvLpEvent *event)
+{
+        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
+        unsigned long flags;
+        u8 port = cevent->virtual_device;
+        if (port >= VTTY_PORTS) {
+                printk(KERN_WARNING "hvc: data on invalid virtual device\n");
+                return;
+        }
+        spin_lock_irqsave(&consolelock, flags);
+        port_info[port].ack = event->xCorrelationToken;
+        spin_unlock_irqrestore(&consolelock, flags);
+}
+static void hvc_config_event(struct HvLpEvent *event)
+{
+        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
+        if (cevent->data[0] == 0x01)
+                printk(KERN_INFO "hvc: window resized to %d: %d: %d: %d\n",
+                       cevent->data[1], cevent->data[2],
+                       cevent->data[3], cevent->data[4]);
+        else
+                printk(KERN_WARNING "hvc: unknown config event\n");
+}
+static void hvc_handle_event(struct HvLpEvent *event)
+{
+        int charminor;
+        if (event == NULL)
+                return;
+        charminor = event->xSubtype & VIOMINOR_SUBTYPE_MASK;
+        switch (charminor) {
+        case viocharopen:
+                hvc_open_event(event);
+                break;
+        case viocharclose:
+                hvc_close_event(event);
+                break;
+        case viochardata:
+                hvc_data_event(event);
+                break;
+        case viocharack:
+                hvc_ack_event(event);
+                break;
+        case viocharconfig:
+                hvc_config_event(event);
+                break;
+        default:
+                if (hvlpevent_is_int(event) && hvlpevent_need_ack(event)) {
+                        event->xRc = HvLpEvent_Rc_InvalidSubtype;
+                        HvCallEvent_ackLpEvent(event);
+                }
+        }
+}
+static int send_open(HvLpIndex remoteLp, void *sem)
+{
+        return HvCallEvent_signalLpEventFast(remoteLp,
+                        HvLpEvent_Type_VirtualIo,
+                        viomajorsubtype_chario | viocharopen,
+                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
+                        viopath_sourceinst(remoteLp),
+                        viopath_targetinst(remoteLp),
+                        (u64)(unsigned long)sem, VIOVERSION << 16,
+                        0, 0, 0, 0);
+}
+static int hvc_vio_init(void)
+{
+        atomic_t wait_flag;
+        int rc;
+        /* +2 for fudge */
+        rc = viopath_open(HvLpConfig_getPrimaryLpIndex(),
+                        viomajorsubtype_chario, VIOCHAR_WINDOW + 2);
+        if (rc)
+                printk(KERN_WARNING "hvc: error opening to primary %d\n", rc);
+        if (viopath_hostLp == HvLpIndexInvalid)
+                vio_set_hostlp();
+        /*
+         * And if the primary is not the same as the hosting LP, open to the
+         * hosting lp
+         */
+        if ((viopath_hostLp != HvLpIndexInvalid) &&
+            (viopath_hostLp != HvLpConfig_getPrimaryLpIndex())) {
+                printk(KERN_INFO "hvc: open path to hosting (%d)\n",
+                                viopath_hostLp);
+                rc = viopath_open(viopath_hostLp, viomajorsubtype_chario,
+                                VIOCHAR_WINDOW + 2);    /* +2 for fudge */
+                if (rc)
+                        printk(KERN_WARNING
+                                "error opening to partition %d: %d\n",
+                                viopath_hostLp, rc);
+        }
+        if (vio_setHandler(viomajorsubtype_chario, hvc_handle_event) < 0)
+                printk(KERN_WARNING
+                        "hvc: error seting handler for console events!\n");
+        /*
+         * First, try to open the console to the hosting lp.
+         * Wait on a semaphore for the response.
+         */
+        atomic_set(&wait_flag, 0);
+        if ((viopath_isactive(viopath_hostLp)) &&
+            (send_open(viopath_hostLp, &wait_flag) == 0)) {
+                printk(KERN_INFO "hvc: hosting partition %d\n", viopath_hostLp);
+                while (atomic_read(&wait_flag) == 0)
+                        mb();
+                atomic_set(&wait_flag, 0);
+        }
+        /*
+         * If we don't have an active console, try the primary
+         */
+        if ((!viopath_isactive(port_info[0].lp)) &&
+            (viopath_isactive(HvLpConfig_getPrimaryLpIndex())) &&
+            (send_open(HvLpConfig_getPrimaryLpIndex(), &wait_flag) == 0)) {
+                printk(KERN_INFO "hvc: opening console to primary partition\n");
+                while (atomic_read(&wait_flag) == 0)
+                        mb();
+        }
+        /* Register as a vio device to receive callbacks */
+        rc = vio_register_driver(&hvc_vio_driver);
+        return rc;
+}
+module_init(hvc_vio_init); /* after drivers/char/hvc_console.c */
+static void hvc_vio_exit(void)
+{
+        vio_unregister_driver(&hvc_vio_driver);
+}
+module_exit(hvc_vio_exit);
+/* the device tree order defines our numbering */
+static int hvc_find_vtys(void)
+{
+        struct device_node *vty;
+        int num_found = 0;
+        for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL;
+                        vty = of_find_node_by_name(vty, "vty")) {
+                uint32_t *vtermno;
+                /* We have statically defined space for only a certain number
+                 * of console adapters.
+                 */
+                if ((num_found >= MAX_NR_HVC_CONSOLES) ||
+                                (num_found >= VTTY_PORTS))
+                        break;
+                vtermno = (uint32_t *)get_property(vty, "reg", NULL);
+                if (!vtermno)
+                        continue;
+                if (!device_is_compatible(vty, "IBM,iSeries-vty"))
+                        continue;
+                if (num_found == 0)
+                        add_preferred_console("hvc", 0, NULL);
+                hvc_instantiate(*vtermno, num_found, &hvc_get_put_ops);
+                ++num_found;
+        }
+        return num_found;
+}
+console_initcall(hvc_find_vtys);
diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
index 57106e02fd2e..4b97eaf18602 100644
--- a/drivers/char/hvc_rtas.c
+++ b/drivers/char/hvc_rtas.c
@@ -94,7 +94,7 @@ static int hvc_rtas_init(void)
        /* Allocate an hvc_struct for the console device we instantiated
         * earlier.  Save off hp so that we can return it on exit */
-        hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops);
+        hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops, 16);
        if (IS_ERR(hp))
                return PTR_ERR(hp);
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index 9add81ceb440..cc95941148fb 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -90,7 +90,8 @@ static int __devinit hvc_vio_probe(struct vio_dev *vdev,
        if (!vdev || !id)
                return -EPERM;
-        hp = hvc_alloc(vdev->unit_address, vdev->irq, &hvc_get_put_ops);
+        hp = hvc_alloc(vdev->unit_address, vdev->irq, &hvc_get_put_ops,
+                        MAX_VIO_PUT_CHARS);
        if (IS_ERR(hp))
                return PTR_ERR(hp);
        dev_set_drvdata(&vdev->dev, hp);
@@ -140,7 +141,7 @@ static int hvc_find_vtys(void)
        for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL;
                        vty = of_find_node_by_name(vty, "vty")) {
-                uint32_t *vtermno;
+                const uint32_t *vtermno;
                /* We have statically defined space for only a certain number
                 * of console adapters.
@@ -148,7 +149,7 @@ static int hvc_find_vtys(void)
                if (num_found >= MAX_NR_HVC_CONSOLES)
                        break;
-                vtermno = (uint32_t *)get_property(vty, "reg", NULL);
+                vtermno = get_property(vty, "reg", NULL);
                if (!vtermno)
                        continue;
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index 017f755632a3..a89a95fb5e40 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1274,11 +1274,10 @@ static int __init hvsi_console_init(void)
                        vty != NULL;
                        vty = of_find_compatible_node(vty, "serial", "hvterm-protocol")) {
                struct hvsi_struct *hp;
-                uint32_t *vtermno;
+                const uint32_t *vtermno, *irq;
-                uint32_t *irq;
-                vtermno = (uint32_t *)get_property(vty, "reg", NULL);
+                vtermno = get_property(vty, "reg", NULL);
-                irq = (uint32_t *)get_property(vty, "interrupts", NULL);
+                irq = get_property(vty, "interrupts", NULL);
                if (!vtermno || !irq)
                        continue;
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
index 2e68eeb8a2cd..aefd683c60b7 100644
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/drivers/char/tpm/tpm_atmel.h
@@ -37,7 +37,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)
 {
        struct device_node *dn;
        unsigned long address, size;
-        unsigned int *reg;
+        const unsigned int *reg;
        int reglen;
        int naddrc;
        int nsizec;
@@ -52,7 +52,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)
                return NULL;
        }
-        reg = (unsigned int *) get_property(dn, "reg", &reglen);
+        reg = get_property(dn, "reg", &reglen);
        naddrc = prom_n_addr_cells(dn);
        nsizec = prom_n_size_cells(dn);
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 766f7864c6c6..f3efeaf2826e 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -43,7 +43,6 @@
 #include <linux/sysrq.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_lp_config.h>
@@ -67,35 +66,6 @@ static int vio_sysrq_pressed;
 extern int sysrq_enabled;
 #endif
-/*
- * The structure of the events that flow between us and OS/400.  You can't
- * mess with this unless the OS/400 side changes too
- */
-struct viocharlpevent {
-        struct HvLpEvent event;
-        u32 reserved;
-        u16 version;
-        u16 subtype_result_code;
-        u8 virtual_device;
-        u8 len;
-        u8 data[VIOCHAR_MAX_DATA];
-};
-#define VIOCHAR_WINDOW          10
-#define VIOCHAR_HIGHWATERMARK   3
-enum viocharsubtype {
-        viocharopen = 0x0001,
-        viocharclose = 0x0002,
-        viochardata = 0x0003,
-        viocharack = 0x0004,
-        viocharconfig = 0x0005
-};
-enum viochar_rc {
-        viochar_rc_ebusy = 1
-};
 #define VIOCHAR_NUM_BUF         16
 /*
@@ -1183,6 +1153,7 @@ static int __init viocons_init(void)
                port_info[i].magic = VIOTTY_MAGIC;
        }
        HvCall_setLogBufferFormatAndCodepage(HvCall_LogBuffer_ASCII, 437);
+        add_preferred_console("viocons", 0, NULL);
        register_console(&viocons_early);
        return 0;
 }
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index b72b2049aaae..73c78bf75d7f 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -940,7 +940,6 @@ static void vioHandleTapeEvent(struct HvLpEvent *event)
 static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 {
-        char tapename[32];
        int i = vdev->unit_address;
        int j;
@@ -956,10 +955,9 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
                        "iseries!vt%d", i);
        class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
                        NULL, "iseries!nvt%d", i);
-        sprintf(tapename, "iseries/vt%d", i);
+        printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries "
-        printk(VIOTAPE_KERN_INFO "tape %s is iSeries "
                        "resource %10.10s type %4.4s, model %3.3s\n",
-                        tapename, viotape_unitinfo[i].rsrcname,
+                        i, viotape_unitinfo[i].rsrcname,
                        viotape_unitinfo[i].type, viotape_unitinfo[i].model);
        return 0;
 }
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 53bb43593863..d658d9107955 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -207,7 +207,8 @@ static int i2c_powermac_probe(struct device *dev)
        struct pmac_i2c_bus *bus = dev->platform_data;
        struct device_node *parent = NULL;
        struct i2c_adapter *adapter;
-        char name[32], *basename;
+        char name[32];
+        const char *basename;
        int rc;
        if (bus == NULL)
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index ebf961f1718d..fa46856e8068 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1154,7 +1154,7 @@ static int
 pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 {
        struct device_node *np = pmif->node;
-        int *bidp;
+        const int *bidp;
        pmif->cable_80 = 0;
        pmif->broken_dma = pmif->broken_dma_warn = 0;
@@ -1176,14 +1176,14 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
                pmif->broken_dma = 1;
        }
-        bidp = (int *)get_property(np, "AAPL,bus-id", NULL);
+        bidp = get_property(np, "AAPL,bus-id", NULL);
        pmif->aapl_bus_id =  bidp ? *bidp : 0;
        /* Get cable type from device-tree */
        if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6
            || pmif->kind == controller_k2_ata6
            || pmif->kind == controller_sh_ata6) {
-                char* cable = get_property(np, "cable-type", NULL);
+                const char* cable = get_property(np, "cable-type", NULL);
                if (cable && !strncmp(cable, "80-", 3))
                        pmif->cable_80 = 1;
        }
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 82657bc86d19..d56216067549 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -139,7 +139,9 @@ static int macio_uevent(struct device *dev, char **envp, int num_envp,
 {
        struct macio_dev * macio_dev;
        struct of_device * of;
-        char *scratch, *compat, *compat2;
+        char *scratch;
+        const char *compat, *compat2;
        int i = 0;
        int length, cplen, cplen2, seen = 0;
@@ -173,7 +175,7 @@ static int macio_uevent(struct device *dev, char **envp, int num_envp,
         * it's not really legal to split it out with commas. We split it
         * up using a number of environment variables instead. */
-        compat = (char *) get_property(of->node, "compatible", &cplen);
+        compat = get_property(of->node, "compatible", &cplen);
        compat2 = compat;
        cplen2= cplen;
        while (compat && cplen > 0) {
@@ -454,7 +456,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
                                               struct resource *parent_res)
 {
        struct macio_dev *dev;
-        u32 *reg;
+        const u32 *reg;
        
        if (np == NULL)
                return NULL;
@@ -489,7 +491,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #endif
                        MAX_NODE_NAME_SIZE, np->name);
        } else {
-                reg = (u32 *)get_property(np, "reg", NULL);
+                reg = get_property(np, "reg", NULL);
                sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
                        chip->lbus.index,
                        reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index cae24a13526a..8566bdfdd4b8 100644
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -16,12 +16,12 @@ static ssize_t
 compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct of_device *of;
-        char *compat;
+        const char *compat;
        int cplen;
        int length = 0;
        of = &to_macio_device (dev)->ofdev;
-        compat = (char *) get_property(of->node, "compatible", &cplen);
+        compat = get_property(of->node, "compatible", &cplen);
        if (!compat) {
                *buf = '\0';
                return 0;
@@ -42,12 +42,12 @@ static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
                              char *buf)
 {
        struct of_device *of;
-        char *compat;
+        const char *compat;
        int cplen;
        int length;
        of = &to_macio_device (dev)->ofdev;
-        compat = (char *) get_property (of->node, "compatible", &cplen);
+        compat = get_property(of->node, "compatible", &cplen);
        if (!compat) compat = "", cplen = 1;
        length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
        buf += length;
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 00ef46898147..090e40fc5013 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -454,7 +454,7 @@ EXPORT_SYMBOL(smu_present);
 int __init smu_init (void)
 {
        struct device_node *np;
-        u32 *data;
+        const u32 *data;
        np = of_find_node_by_type(NULL, "smu");
        if (np == NULL)
@@ -490,7 +490,7 @@ int __init smu_init (void)
                printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
                goto fail;
        }
-        data = (u32 *)get_property(smu->db_node, "reg", NULL);
+        data = get_property(smu->db_node, "reg", NULL);
        if (data == NULL) {
                of_node_put(smu->db_node);
                smu->db_node = NULL;
@@ -511,7 +511,7 @@ int __init smu_init (void)
                smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
                if (smu->msg_node == NULL)
                        break;
-                data = (u32 *)get_property(smu->msg_node, "reg", NULL);
+                data = get_property(smu->msg_node, "reg", NULL);
                if (data == NULL) {
                        of_node_put(smu->msg_node);
                        smu->msg_node = NULL;
@@ -982,11 +982,11 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
 /* Note: Only allowed to return error code in pointers (using ERR_PTR)
 * when interruptible is 1
 */
-struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
+const struct smu_sdbp_header *__smu_get_sdb_partition(int id,
-                                                int interruptible)
+                unsigned int *size, int interruptible)
 {
        char pname[32];
-        struct smu_sdbp_header *part;
+        const struct smu_sdbp_header *part;
        if (!smu)
                return NULL;
@@ -1003,8 +1003,7 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
        } else
                mutex_lock(&smu_part_access);
-        part = (struct smu_sdbp_header *)get_property(smu->of_node,
+        part = get_property(smu->of_node, pname, size);
-                                                      pname, size);
        if (part == NULL) {
                DPRINTK("trying to extract from SMU ...\n");
                part = smu_create_sdb_partition(id);
@@ -1015,7 +1014,7 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
        return part;
 }
-struct smu_sdbp_header *smu_get_sdb_partition(int id, unsigned int *size)
+const struct smu_sdbp_header *smu_get_sdb_partition(int id, unsigned int *size)
 {
        return __smu_get_sdb_partition(id, size, 0);
 }
@@ -1094,7 +1093,7 @@ static ssize_t smu_write(struct file *file, const char __user *buf,
                pp->mode = smu_file_events;
                return 0;
        } else if (hdr.cmdtype == SMU_CMDTYPE_GET_PARTITION) {
-                struct smu_sdbp_header *part;
+                const struct smu_sdbp_header *part;
                part = __smu_get_sdb_partition(hdr.cmd, NULL, 1);
                if (part == NULL)
                        return -EINVAL;
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 7f86478bdd36..a0f30d0853ea 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -47,7 +47,7 @@ static u8 FAN_SPD_SET[2] = {0x30, 0x31};
 static u8 default_limits_local[3] = {70, 50, 70};    /* local, sensor1, sensor2 */
 static u8 default_limits_chip[3] = {80, 65, 80};    /* local, sensor1, sensor2 */
-static char *sensor_location[3] = {NULL, NULL, NULL};
+static const char *sensor_location[3] = {NULL, NULL, NULL};
 static int limit_adjust = 0;
 static int fan_speed = -1;
@@ -553,7 +553,7 @@ static int __init
 thermostat_init(void)
 {
        struct device_node* np;
-        u32 *prop;
+        const u32 *prop;
        int i = 0, offset = 0;
        
        np = of_find_node_by_name(NULL, "fan");
@@ -566,13 +566,13 @@ thermostat_init(void)
        else
                return -ENODEV;
-        prop = (u32 *)get_property(np, "hwsensor-params-version", NULL);
+        prop = get_property(np, "hwsensor-params-version", NULL);
        printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
                         (*prop == 1)?"":"un");
        if (*prop != 1)
                return -ENODEV;
-        prop = (u32 *)get_property(np, "reg", NULL);
+        prop = get_property(np, "reg", NULL);
        if (!prop)
                return -ENODEV;
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 20bf67244e2c..d00c0c37a12e 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -660,7 +660,7 @@ static int read_eeprom(int cpu, struct mpu_data *out)
 {
        struct device_node *np;
        char nodename[64];
-        u8 *data;
+        const u8 *data;
        int len;
        /* prom.c routine for finding a node by path is a bit brain dead
@@ -673,7 +673,7 @@ static int read_eeprom(int cpu, struct mpu_data *out)
                printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
                return -ENODEV;
        }
-        data = (u8 *)get_property(np, "cpuid", &len);
+        data = get_property(np, "cpuid", &len);
        if (data == NULL) {
                printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
                of_node_put(np);
@@ -1336,7 +1336,7 @@ static int init_backside_state(struct backside_pid_state *state)
         */
        u3 = of_find_node_by_path("/u3@0,f8000000");
        if (u3 != NULL) {
-                u32 *vers = (u32 *)get_property(u3, "device-rev", NULL);
+                const u32 *vers = get_property(u3, "device-rev", NULL);
                if (vers)
                        if (((*vers) & 0x3f) < 0x34)
                                u3h = 0;
@@ -2111,8 +2111,8 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
        while ((np = of_get_next_child(fcu_node, np)) != NULL) {
                int type = -1;
-                char *loc;
+                const char *loc;
-                u32 *reg;
+                const u32 *reg;
                DBG(" control: %s, type: %s\n", np->name, np->type);
@@ -2128,8 +2128,8 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
                        continue;
                /* Lookup for a matching location */
-                loc = (char *)get_property(np, "location", NULL);
+                loc = get_property(np, "location", NULL);
-                reg = (u32 *)get_property(np, "reg", NULL);
+                reg = get_property(np, "reg", NULL);
                if (loc == NULL || reg == NULL)
                        continue;
                DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg);
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index c7d1c290cb0c..738faab1b22c 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -484,14 +484,14 @@ struct apple_thermal_info {
 static int __init
 g4fan_init( void )
 {
-        struct apple_thermal_info *info;
+        const struct apple_thermal_info *info;
        struct device_node *np;
        init_MUTEX( &x.lock );
        if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
                return -ENODEV;
-        info = (struct apple_thermal_info*)get_property(np, "thermal-info", NULL);
+        info = get_property(np, "thermal-info", NULL);
        of_node_put(np);
        if( !info || !machine_is_compatible("PowerMac3,6") )
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c
index 69d5452fd22f..7512d1c15207 100644
--- a/drivers/macintosh/via-cuda.c
+++ b/drivers/macintosh/via-cuda.c
@@ -123,7 +123,7 @@ int __init find_via_cuda(void)
 {
    struct adb_request req;
    phys_addr_t taddr;
-    u32 *reg;
+    const u32 *reg;
    int err;
    if (vias != 0)
@@ -132,7 +132,7 @@ int __init find_via_cuda(void)
    if (vias == 0)
        return 0;
-    reg = (u32 *)get_property(vias, "reg", NULL);
+    reg = get_property(vias, "reg", NULL);
    if (reg == NULL) {
            printk(KERN_ERR "via-cuda: No \"reg\" property !\n");
            goto fail;
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index 5189d5454b1f..179af10105d9 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -120,7 +120,7 @@ static int __init via_pmu_led_init(void)
        dt = of_find_node_by_path("/");
        if (dt == NULL)
                return -ENODEV;
-        model = (const char *)get_property(dt, "model", NULL);
+        model = get_property(dt, "model", NULL);
        if (model == NULL)
                return -ENODEV;
        if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 14610a63f580..dda03985dcf5 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -280,7 +280,7 @@ static char *pbook_type[] = {
 int __init find_via_pmu(void)
 {
        u64 taddr;
-        u32 *reg;
+        const u32 *reg;
        if (via != 0)
                return 1;
@@ -288,7 +288,7 @@ int __init find_via_pmu(void)
        if (vias == NULL)
                return 0;
-        reg = (u32 *)get_property(vias, "reg", NULL);
+        reg = get_property(vias, "reg", NULL);
        if (reg == NULL) {
                printk(KERN_ERR "via-pmu: No \"reg\" property !\n");
                goto fail;
@@ -330,7 +330,7 @@ int __init find_via_pmu(void)
                
                gpiop = of_find_node_by_name(NULL, "gpio");
                if (gpiop) {
-                        reg = (u32 *)get_property(gpiop, "reg", NULL);
+                        reg = get_property(gpiop, "reg", NULL);
                        if (reg)
                                gaddr = of_translate_address(gpiop, reg);
                        if (gaddr != OF_BAD_ADDR)
@@ -479,9 +479,9 @@ static int __init via_pmu_dev_init(void)
                pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART;
        } else {
                struct device_node* prim = find_devices("power-mgt");
-                u32 *prim_info = NULL;
+                const u32 *prim_info = NULL;
                if (prim)
-                        prim_info = (u32 *)get_property(prim, "prim-info", NULL);
+                        prim_info = get_property(prim, "prim-info", NULL);
                if (prim_info) {
                        /* Other stuffs here yet unknown */
                        pmu_battery_count = (prim_info[6] >> 16) & 0xff;
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index f1df6efcbe68..2ff546e4c92f 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -396,7 +396,7 @@ static void wf_smu_sys_fans_tick(struct wf_smu_sys_fans_state *st)
 static void wf_smu_create_cpu_fans(void)
 {
        struct wf_cpu_pid_param pid_param;
-        struct smu_sdbp_header *hdr;
+        const struct smu_sdbp_header *hdr;
        struct smu_sdbp_cpupiddata *piddata;
        struct smu_sdbp_fvt *fvt;
        s32 tmax, tdelta, maxpow, powadj;
@@ -702,7 +702,7 @@ static struct notifier_block wf_smu_events = {
 static int wf_init_pm(void)
 {
-        struct smu_sdbp_header *hdr;
+        const struct smu_sdbp_header *hdr;
        hdr = smu_get_sdb_partition(SMU_SDB_SENSORTREE_ID, NULL);
        if (hdr != 0) {
diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
index 0d6372e96d32..59e9ffe37c39 100644
--- a/drivers/macintosh/windfarm_pm91.c
+++ b/drivers/macintosh/windfarm_pm91.c
@@ -144,7 +144,7 @@ static struct wf_smu_slots_fans_state *wf_smu_slots_fans;
 static void wf_smu_create_cpu_fans(void)
 {
        struct wf_cpu_pid_param pid_param;
-        struct smu_sdbp_header *hdr;
+        const struct smu_sdbp_header *hdr;
        struct smu_sdbp_cpupiddata *piddata;
        struct smu_sdbp_fvt *fvt;
        s32 tmax, tdelta, maxpow, powadj;
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index a9e88edc0c72..bff1f372f188 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -159,14 +159,15 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
                                              int pwm_fan)
 {
        struct smu_fan_control *fct;
-        s32 *v; u32 *reg;
+        const s32 *v;
-        char *l;
+        const u32 *reg;
+        const char *l;
        fct = kmalloc(sizeof(struct smu_fan_control), GFP_KERNEL);
        if (fct == NULL)
                return NULL;
        fct->ctrl.ops = &smu_fan_ops;
-        l = (char *)get_property(node, "location", NULL);
+        l = get_property(node, "location", NULL);
        if (l == NULL)
                goto fail;
@@ -223,17 +224,17 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
                goto fail;
        /* Get min & max values*/
-        v = (s32 *)get_property(node, "min-value", NULL);
+        v = get_property(node, "min-value", NULL);
        if (v == NULL)
                goto fail;
        fct->min = *v;
-        v = (s32 *)get_property(node, "max-value", NULL);
+        v = get_property(node, "max-value", NULL);
        if (v == NULL)
                goto fail;
        fct->max = *v;
        /* Get "reg" value */
-        reg = (u32 *)get_property(node, "reg", NULL);
+        reg = get_property(node, "reg", NULL);
        if (reg == NULL)
                goto fail;
        fct->reg = *reg;
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index e295a07a1ebc..aceb61d9fbc8 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -233,15 +233,15 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
 {
        struct wf_sat *sat;
        struct wf_sat_sensor *sens;
-        u32 *reg;
+        const u32 *reg;
-        char *loc, *type;
+        const char *loc, *type;
        u8 addr, chip, core;
        struct device_node *child;
        int shift, cpu, index;
        char *name;
        int vsens[2], isens[2];
-        reg = (u32 *) get_property(dev, "reg", NULL);
+        reg = get_property(dev, "reg", NULL);
        if (reg == NULL)
                return;
        addr = *reg;
@@ -268,7 +268,7 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
        isens[0] = isens[1] = -1;
        child = NULL;
        while ((child = of_get_next_child(dev, child)) != NULL) {
-                reg = (u32 *) get_property(child, "reg", NULL);
+                reg = get_property(child, "reg", NULL);
                type = get_property(child, "device_type", NULL);
                loc = get_property(child, "location", NULL);
                if (reg == NULL || loc == NULL)
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c
index bed25dcf8a1e..defe9922ebd1 100644
--- a/drivers/macintosh/windfarm_smu_sensors.c
+++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -198,14 +198,14 @@ static struct wf_sensor_ops smu_slotspow_ops = {
 static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
 {
        struct smu_ad_sensor *ads;
-        char *c, *l;
+        const char *c, *l;
-        u32 *v;
+        const u32 *v;
        ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL);
        if (ads == NULL)
                return NULL;
-        c = (char *)get_property(node, "device_type", NULL);
+        c = get_property(node, "device_type", NULL);
-        l = (char *)get_property(node, "location", NULL);
+        l = get_property(node, "location", NULL);
        if (c == NULL || l == NULL)
                goto fail;
@@ -255,7 +255,7 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
        } else
                goto fail;
-        v = (u32 *)get_property(node, "reg", NULL);
+        v = get_property(node, "reg", NULL);
        if (v == NULL)
                goto fail;
        ads->reg = *v;
@@ -382,7 +382,7 @@ smu_cpu_power_create(struct wf_sensor *volts, struct wf_sensor *amps)
 static void smu_fetch_param_partitions(void)
 {
-        struct smu_sdbp_header *hdr;
+        const struct smu_sdbp_header *hdr;
        /* Get CPU voltage/current/power calibration data */
        hdr = smu_get_sdb_partition(SMU_SDB_CPUVCP_ID, NULL);
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 6fad83f24c4f..711609665632 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1264,7 +1264,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
 {
        int j, rev, ret;
        struct bmac_data *bp;
-        unsigned char *addr;
+        const unsigned char *prop_addr;
+        unsigned char addr[6];
        struct net_device *dev;
        int is_bmac_plus = ((int)match->data) != 0;
@@ -1272,14 +1273,16 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
                printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
                return -ENODEV;
        }
-        addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
+        prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
-        if (addr == NULL) {
+        if (prop_addr == NULL) {
-                addr = get_property(macio_get_of_node(mdev), "local-mac-address", NULL);
+                prop_addr = get_property(macio_get_of_node(mdev),
-                if (addr == NULL) {
+                                "local-mac-address", NULL);
+                if (prop_addr == NULL) {
                        printk(KERN_ERR "BMAC: Can't get mac-address\n");
                        return -ENODEV;
                }
        }
+        memcpy(addr, prop_addr, sizeof(addr));
        dev = alloc_etherdev(PRIV_BYTES);
        if (!dev) {
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 0464e78f733a..e56eac88b809 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -702,7 +702,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                                             desc[3].desc,
                                             desc[4].desc,
                                             desc[5].desc,
-                                             correlator);
+                                             correlator,
+                                             &correlator);
        } while ((lpar_rc == H_BUSY) && (retry_count--));
        if(lpar_rc != H_SUCCESS && lpar_rc != H_DROPPED) {
diff --git a/drivers/net/ibmveth.h b/drivers/net/ibmveth.h
index 8385bf836507..f5b25bff1540 100644
--- a/drivers/net/ibmveth.h
+++ b/drivers/net/ibmveth.h
@@ -41,16 +41,6 @@
 #define IbmVethMcastRemoveFilter     0x2UL
 #define IbmVethMcastClearFilterTable 0x3UL
-/* hcall numbers */
-#define H_VIO_SIGNAL             0x104
-#define H_REGISTER_LOGICAL_LAN   0x114
-#define H_FREE_LOGICAL_LAN       0x118
-#define H_ADD_LOGICAL_LAN_BUFFER 0x11C
-#define H_SEND_LOGICAL_LAN       0x120
-#define H_MULTICAST_CTRL         0x130
-#define H_CHANGE_LOGICAL_LAN_MAC 0x14C
-#define H_FREE_LOGICAL_LAN_BUFFER 0x1D4
 /* hcall macros */
 #define h_register_logical_lan(ua, buflst, rxq, fltlst, mac) \
  plpar_hcall_norets(H_REGISTER_LOGICAL_LAN, ua, buflst, rxq, fltlst, mac)
@@ -61,8 +51,21 @@
 #define h_add_logical_lan_buffer(ua, buf) \
  plpar_hcall_norets(H_ADD_LOGICAL_LAN_BUFFER, ua, buf)
-#define h_send_logical_lan(ua, buf1, buf2, buf3, buf4, buf5, buf6, correlator) \
+static inline long h_send_logical_lan(unsigned long unit_address,
-  plpar_hcall_8arg_2ret(H_SEND_LOGICAL_LAN, ua, buf1, buf2, buf3, buf4, buf5, buf6, correlator, &correlator)
+                unsigned long desc1, unsigned long desc2, unsigned long desc3,
+                unsigned long desc4, unsigned long desc5, unsigned long desc6,
+                unsigned long corellator_in, unsigned long *corellator_out)
+{
+        long rc;
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
+        rc = plpar_hcall9(H_SEND_LOGICAL_LAN, retbuf, unit_address, desc1,
+                        desc2, desc3, desc4, desc5, desc6, corellator_in);
+        *corellator_out = retbuf[0];
+        return rc;
+}
 #define h_multicast_ctrl(ua, cmd, mac) \
  plpar_hcall_norets(H_MULTICAST_CTRL, ua, cmd, mac)
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 29e4b5aa6ead..5d80e0e6a8e9 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -113,7 +113,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
        struct device_node *mace = macio_get_of_node(mdev);
        struct net_device *dev;
        struct mace_data *mp;
-        unsigned char *addr;
+        const unsigned char *addr;
        int j, rev, rc = -EBUSY;
        if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 88907218457a..d64e718afbd2 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1697,10 +1697,10 @@ spider_net_setup_phy(struct spider_net_card *card)
 */
 static int
 spider_net_download_firmware(struct spider_net_card *card,
-                             u8 *firmware_ptr)
+                             const void *firmware_ptr)
 {
        int sequencer, i;
-        u32 *fw_ptr = (u32 *)firmware_ptr;
+        const u32 *fw_ptr = firmware_ptr;
        /* stop sequencers */
        spider_net_write_reg(card, SPIDER_NET_GSINIT,
@@ -1757,7 +1757,7 @@ spider_net_init_firmware(struct spider_net_card *card)
 {
        struct firmware *firmware = NULL;
        struct device_node *dn;
-        u8 *fw_prop = NULL;
+        const u8 *fw_prop = NULL;
        int err = -ENOENT;
        int fw_size;
@@ -1783,7 +1783,7 @@ try_host_fw:
        if (!dn)
                goto out_err;
-        fw_prop = (u8 *)get_property(dn, "firmware", &fw_size);
+        fw_prop = get_property(dn, "firmware", &fw_size);
        if (!fw_prop)
                goto out_err;
@@ -1986,7 +1986,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
        struct net_device *netdev = card->netdev;
        struct device_node *dn;
        struct sockaddr addr;
-        u8 *mac;
+        const u8 *mac;
        SET_MODULE_OWNER(netdev);
        SET_NETDEV_DEV(netdev, &card->pdev->dev);
@@ -2019,7 +2019,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
        if (!dn)
                return -EIO;
-        mac = (u8 *)get_property(dn, "local-mac-address", NULL);
+        mac = get_property(dn, "local-mac-address", NULL);
        if (!mac)
                return -EIO;
        memcpy(addr.sa_data, mac, ETH_ALEN);
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index b70bbd748978..d7b1d1882cab 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2896,7 +2896,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
        if (use_idprom)
                memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
 #elif defined(CONFIG_PPC_PMAC)
-        unsigned char *addr;
+        const unsigned char *addr;
        addr = get_property(gp->of_node, "local-mac-address", NULL);
        if (addr == NULL) {
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 076bd6dcafae..7288a3eccfb3 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -176,16 +176,16 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
        return 0;
 }
-static int get_children_props(struct device_node *dn, int **drc_indexes,
+static int get_children_props(struct device_node *dn, const int **drc_indexes,
-                int **drc_names, int **drc_types, int **drc_power_domains)
+                const int **drc_names, const int **drc_types,
+                const int **drc_power_domains)
 {
-        int *indexes, *names;
+        const int *indexes, *names, *types, *domains;
-        int *types, *domains;
-        indexes = (int *) get_property(dn, "ibm,drc-indexes", NULL);
+        indexes = get_property(dn, "ibm,drc-indexes", NULL);
-        names = (int *) get_property(dn, "ibm,drc-names", NULL);
+        names = get_property(dn, "ibm,drc-names", NULL);
-        types = (int *) get_property(dn, "ibm,drc-types", NULL);
+        types = get_property(dn, "ibm,drc-types", NULL);
-        domains = (int *) get_property(dn, "ibm,drc-power-domains", NULL);
+        domains = get_property(dn, "ibm,drc-power-domains", NULL);
        if (!indexes || !names || !types || !domains) {
                /* Slot does not have dynamically-removable children */
@@ -212,13 +212,13 @@ static int get_children_props(struct device_node *dn, int **drc_indexes,
 int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
                char **drc_name, char **drc_type, int *drc_power_domain)
 {
-        int *indexes, *names;
+        const int *indexes, *names;
-        int *types, *domains;
+        const int *types, *domains;
-        unsigned int *my_index;
+        const unsigned int *my_index;
        char *name_tmp, *type_tmp;
        int i, rc;
-        my_index = (int *) get_property(dn, "ibm,my-drc-index", NULL);
+        my_index = get_property(dn, "ibm,my-drc-index", NULL);
        if (!my_index) {
                /* Node isn't DLPAR/hotplug capable */
                return -EINVAL;
@@ -265,10 +265,10 @@ static int is_php_type(char *drc_type)
        return 1;
 }
-static int is_php_dn(struct device_node *dn, int **indexes, int **names,
+static int is_php_dn(struct device_node *dn, const int **indexes,
-                int **types, int **power_domains)
+                const int **names, const int **types, const int **power_domains)
 {
-        int *drc_types;
+        const int *drc_types;
        int rc;
        rc = get_children_props(dn, indexes, names, &drc_types, power_domains);
@@ -296,7 +296,7 @@ int rpaphp_add_slot(struct device_node *dn)
        struct slot *slot;
        int retval = 0;
        int i;
-        int *indexes, *names, *types, *power_domains;
+        const int *indexes, *names, *types, *power_domains;
        char *name, *type;
        dbg("Entry %s: dn->full_name=%s\n", __FUNCTION__, dn->full_name);
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index ed22b96580c6..01b8ac641eb8 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -156,8 +156,8 @@ static void gather_partition_info(void)
 {
        struct device_node *rootdn;
-        char *ppartition_name;
+        const char *ppartition_name;
-        unsigned int *p_number_ptr;
+        const unsigned int *p_number_ptr;
        /* Retrieve information about this partition */
        rootdn = find_path_device("/");
@@ -165,14 +165,11 @@ static void gather_partition_info(void)
                return;
        }
-        ppartition_name =
+        ppartition_name = get_property(rootdn, "ibm,partition-name", NULL);
-                get_property(rootdn, "ibm,partition-name", NULL);
        if (ppartition_name)
                strncpy(partition_name, ppartition_name,
                                sizeof(partition_name));
-        p_number_ptr =
+        p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL);
-                (unsigned int *)get_property(rootdn, "ibm,partition-no",
-                                             NULL);
        if (p_number_ptr)
                partition_number = *p_number_ptr;
 }
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 89ef34df5a1d..6422de72bf43 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -431,7 +431,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
        struct fsc_state *state;
        struct Scsi_Host *host;
        void *dma_cmd_space;
-        unsigned char *clkprop;
+        const unsigned char *clkprop;
        int proplen, rc = -ENODEV;
        if (macio_resource_count(mdev) != 2 || macio_irq_count(mdev) != 2) {
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 5572981a9f92..592b52afe658 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1850,7 +1850,8 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
 {
        struct device_node *mesh = macio_get_of_node(mdev);
        struct pci_dev* pdev = macio_get_pci_dev(mdev);
-        int tgt, *cfp, minper;
+        int tgt, minper;
+        const int *cfp;
        struct mesh_state *ms;
        struct Scsi_Host *mesh_host;
        void *dma_cmd_space;
@@ -1939,7 +1940,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
                ms->tgts[tgt].current_req = NULL;
        }
-        if ((cfp = (int *) get_property(mesh, "clock-frequency", NULL)))
+        if ((cfp = get_property(mesh, "clock-frequency", NULL)))
                ms->clk_freq = *cfp;
        else {
                printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 7d0858095e1f..6b70c3c76dfd 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -268,7 +268,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
        /* Match it to a port node */
        index = (ap == ap->host_set->ports[0]) ? 0 : 1;
        for (np = np->child; np != NULL; np = np->sibling) {
-                u32 *reg = (u32 *)get_property(np, "reg", NULL);
+                const u32 *reg = get_property(np, "reg", NULL);
                if (!reg)
                        continue;
                if (index == *reg)
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index bfd2a22759eb..a3b99caf80e6 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1400,8 +1400,8 @@ static struct uart_ops pmz_pops = {
 static int __init pmz_init_port(struct uart_pmac_port *uap)
 {
        struct device_node *np = uap->node;
-        char *conn;
+        const char *conn;
-        struct slot_names_prop {
+        const struct slot_names_prop {
                int     count;
                char    name[1];
        } *slots;
@@ -1458,7 +1458,7 @@ no_dma:
                uap->flags |= PMACZILOG_FLAG_IS_IRDA;
        uap->port_type = PMAC_SCC_ASYNC;
        /* 1999 Powerbook G3 has slot-names property instead */
-        slots = (struct slot_names_prop *)get_property(np, "slot-names", &len);
+        slots = get_property(np, "slot-names", &len);
        if (slots && slots->count > 0) {
                if (strcmp(slots->name, "IrDA") == 0)
                        uap->flags |= PMACZILOG_FLAG_IS_IRDA;
@@ -1470,7 +1470,8 @@ no_dma:
        if (ZS_IS_INTMODEM(uap)) {
                struct device_node* i2c_modem = find_devices("i2c-modem");
                if (i2c_modem) {
-                        char* mid = get_property(i2c_modem, "modem-id", NULL);
+                        const char* mid =
+                                get_property(i2c_modem, "modem-id", NULL);
                        if (mid) switch(*mid) {
                        case 0x04 :
                        case 0x05 :
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index afd146f5f683..397005eb392d 100644
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -349,30 +349,30 @@ static void __init s3triofb_of_init(struct device_node *dp)
    s3trio_name[sizeof(s3trio_name)-1] = '\0';
    strcpy(fb_fix.id, s3trio_name);
-    if((pp = (int *)get_property(dp, "vendor-id", &len)) != NULL
+    if((pp = get_property(dp, "vendor-id", &len)) != NULL
        && *pp!=PCI_VENDOR_ID_S3) {
        printk("%s: can't find S3 Trio board\n", dp->full_name);
        return;
    }
-    if((pp = (int *)get_property(dp, "device-id", &len)) != NULL
+    if((pp = get_property(dp, "device-id", &len)) != NULL
        && *pp!=PCI_DEVICE_ID_S3_TRIO) {
        printk("%s: can't find S3 Trio board\n", dp->full_name);
        return;
    }
-    if ((pp = (int *)get_property(dp, "depth", &len)) != NULL
+    if ((pp = get_property(dp, "depth", &len)) != NULL
        && len == sizeof(int) && *pp != 8) {
        printk("%s: can't use depth = %d\n", dp->full_name, *pp);
        return;
    }
-    if ((pp = (int *)get_property(dp, "width", &len)) != NULL
+    if ((pp = get_property(dp, "width", &len)) != NULL
        && len == sizeof(int))
        fb_var.xres = fb_var.xres_virtual = *pp;
-    if ((pp = (int *)get_property(dp, "height", &len)) != NULL
+    if ((pp = get_property(dp, "height", &len)) != NULL
        && len == sizeof(int))
        fb_var.yres = fb_var.yres_virtual = *pp;
-    if ((pp = (int *)get_property(dp, "linebytes", &len)) != NULL
+    if ((pp = get_property(dp, "linebytes", &len)) != NULL
        && len == sizeof(int))
        fb_fix.line_length = *pp;
    else
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 8e3400d5dd21..0ed577e7cc21 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -413,11 +413,11 @@ static int  __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo)
 static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
 {
        struct device_node *dp = rinfo->of_node;
-        u32 *val;
+        const u32 *val;
        if (dp == NULL)
                return -ENODEV;
-        val = (u32 *) get_property(dp, "ATY,RefCLK", NULL);
+        val = get_property(dp, "ATY,RefCLK", NULL);
        if (!val || !*val) {
                printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n");
                return -EINVAL;
@@ -425,11 +425,11 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
        rinfo->pll.ref_clk = (*val) / 10;
-        val = (u32 *) get_property(dp, "ATY,SCLK", NULL);
+        val = get_property(dp, "ATY,SCLK", NULL);
        if (val && *val)
                rinfo->pll.sclk = (*val) / 10;
-        val = (u32 *) get_property(dp, "ATY,MCLK", NULL);
+        val = get_property(dp, "ATY,MCLK", NULL);
        if (val && *val)
                rinfo->pll.mclk = (*val) / 10;
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index 98c05bc0de44..ea531a6f45d1 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -64,13 +64,13 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
 {
        static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
                                     "EDID1", "EDID2",  NULL };
-        u8 *pedid = NULL;
+        const u8 *pedid = NULL;
-        u8 *pmt = NULL;
+        const u8 *pmt = NULL;
        u8 *tmp;
        int i, mt = MT_NONE;  
        
        RTRACE("analyzing OF properties...\n");
-        pmt = (u8 *)get_property(dp, "display-type", NULL);
+        pmt = get_property(dp, "display-type", NULL);
        if (!pmt)
                return MT_NONE;
        RTRACE("display-type: %s\n", pmt);
@@ -89,7 +89,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
        }
        for (i = 0; propnames[i] != NULL; ++i) {
-                pedid = (u8 *)get_property(dp, propnames[i], NULL);
+                pedid = get_property(dp, propnames[i], NULL);
                if (pedid != NULL)
                        break;
        }
@@ -124,14 +124,14 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
                return MT_NONE;
        if (rinfo->has_CRTC2) {
-                char *pname;
+                const char *pname;
                int len, second = 0;
                dp = dp->child;
                do {
                        if (!dp)
                                return MT_NONE;
-                        pname = (char *)get_property(dp, "name", NULL);
+                        pname = get_property(dp, "name", NULL);
                        if (!pname)
                                return MT_NONE;
                        len = strlen(pname);
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index f31e606a2ded..e308ed2d249a 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -1268,7 +1268,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
                          0x21320032, 0xa1320032, 0x21320032, 0xffffffff,
                          0x31320032 };
-                u32 *mrtable = default_mrtable;
+                const u32 *mrtable = default_mrtable;
                int i, mrtable_size = ARRAY_SIZE(default_mrtable);
                mdelay(30);
@@ -1287,7 +1287,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
                if (rinfo->of_node != NULL) {
                        int size;
-                        mrtable = (u32 *)get_property(rinfo->of_node, "ATY,MRT", &size);
+                        mrtable = get_property(rinfo->of_node, "ATY,MRT", &size);
                        if (mrtable)
                                mrtable_size = size >> 2;
                        else
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index 8209106e26ee..d9af88c2b580 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -32,7 +32,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
 {
        struct nvidia_par *par = info->par;
        struct device_node *parent, *dp;
-        unsigned char *pedid = NULL;
+        const unsigned char *pedid = NULL;
        static char *propnames[] = {
                "DFP,EDID", "LCD,EDID", "EDID", "EDID1",
                "EDID,B", "EDID,A", NULL };
@@ -42,20 +42,19 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
        if (parent == NULL)
                return -1;
        if (par->twoHeads) {
-                char *pname;
+                const char *pname;
                int len;
                for (dp = NULL;
                     (dp = of_get_next_child(parent, dp)) != NULL;) {
-                        pname = (char *)get_property(dp, "name", NULL);
+                        pname = get_property(dp, "name", NULL);
                        if (!pname)
                                continue;
                        len = strlen(pname);
                        if ((pname[len-1] == 'A' && conn == 1) ||
                            (pname[len-1] == 'B' && conn == 2)) {
                                for (i = 0; propnames[i] != NULL; ++i) {
-                                        pedid = (unsigned char *)
+                                        pedid = get_property(dp, propnames[i],
-                                                get_property(dp, propnames[i],
                                                             NULL);
                                        if (pedid != NULL)
                                                break;
@@ -67,8 +66,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
        }
        if (pedid == NULL) {
                for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = (unsigned char *)
+                        pedid = get_property(parent, propnames[i], NULL);
-                                get_property(parent, propnames[i], NULL);
                        if (pedid != NULL)
                                break;
                }
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 0013311e0564..bad0e98fb3b6 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -409,30 +409,30 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
        unsigned int flags, rsize, addr_prop = 0;
        unsigned long max_size = 0;
        u64 rstart, address = OF_BAD_ADDR;
-        u32 *pp, *addrp, *up;
+        const u32 *pp, *addrp, *up;
        u64 asize;
-        pp = (u32 *)get_property(dp, "linux,bootx-depth", &len);
+        pp = get_property(dp, "linux,bootx-depth", &len);
        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "depth", &len);
+                pp = get_property(dp, "depth", &len);
        if (pp && len == sizeof(u32))
                depth = *pp;
-        pp = (u32 *)get_property(dp, "linux,bootx-width", &len);
+        pp = get_property(dp, "linux,bootx-width", &len);
        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "width", &len);
+                pp = get_property(dp, "width", &len);
        if (pp && len == sizeof(u32))
                width = *pp;
-        pp = (u32 *)get_property(dp, "linux,bootx-height", &len);
+        pp = get_property(dp, "linux,bootx-height", &len);
        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "height", &len);
+                pp = get_property(dp, "height", &len);
        if (pp && len == sizeof(u32))
                height = *pp;
-        pp = (u32 *)get_property(dp, "linux,bootx-linebytes", &len);
+        pp = get_property(dp, "linux,bootx-linebytes", &len);
        if (pp == NULL)
-                pp = (u32 *)get_property(dp, "linebytes", &len);
+                pp = get_property(dp, "linebytes", &len);
        if (pp && len == sizeof(u32))
                pitch = *pp;
        else
@@ -450,9 +450,9 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
         * ranges and pick one that is both big enough and if possible encloses
         * the "address" property. If none match, we pick the biggest
         */
-        up = (u32 *)get_property(dp, "linux,bootx-addr", &len);
+        up = get_property(dp, "linux,bootx-addr", &len);
        if (up == NULL)
-                up = (u32 *)get_property(dp, "address", &len);
+                up = get_property(dp, "address", &len);
        if (up && len == sizeof(u32))
                addr_prop = *up;
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 8ddb47a56b07..67d1e1c8813d 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1835,14 +1835,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
        NVTRACE_ENTER();
        dp = pci_device_to_OF_node(pd);
        for (; dp != NULL; dp = dp->child) {
-                disptype = (unsigned char *)get_property(dp, "display-type", NULL);
+                disptype = get_property(dp, "display-type", NULL);
                if (disptype == NULL)
                        continue;
                if (strncmp(disptype, "LCD", 3) != 0)
                        continue;
                for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = (unsigned char *)
+                        pedid = get_property(dp, propnames[i], NULL);
-                                get_property(dp, propnames[i], NULL);
                        if (pedid != NULL) {
                                par->EDID = pedid;
                                NVTRACE("LCD found.\n");
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h
index 1ba3c9983614..12707ab9dc98 100644
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@ -23,6 +23,7 @@
 #define PPC_FEATURE_SMT                 0x00004000
 #define PPC_FEATURE_ICACHE_SNOOP        0x00002000
 #define PPC_FEATURE_ARCH_2_05           0x00001000
+#define PPC_FEATURE_PA6T                0x00000800
 #define PPC_FEATURE_TRUE_LE             0x00000002
 #define PPC_FEATURE_PPC_LE              0x00000001
@@ -36,6 +37,7 @@
 struct cpu_spec;
 typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec);
+typedef void (*cpu_restore_t)(void);
 enum powerpc_oprofile_type {
        PPC_OPROFILE_INVALID = 0,
@@ -65,6 +67,8 @@ struct cpu_spec {
         * BHT, SPD, etc... from head.S before branching to identify_machine
         */
        cpu_setup_t     cpu_setup;
+        /* Used to restore cpu setup on secondary processors and at resume */
+        cpu_restore_t   cpu_restore;
        /* Used by oprofile userspace to select the right counters */
        char            *oprofile_cpu_type;
@@ -145,7 +149,7 @@ extern void do_cpu_ftr_fixups(unsigned long offset);
 #define CPU_FTR_PPCAS_ARCH_V2_BASE (CPU_FTR_SLB | \
                                        CPU_FTR_TLBIEL | CPU_FTR_NOEXECUTE | \
-                                        CPU_FTR_NODSISRALIGN | CPU_FTR_CTRL)
+                                        CPU_FTR_NODSISRALIGN)
 /* iSeries doesn't support large pages */
 #ifdef CONFIG_PPC_ISERIES
@@ -310,24 +314,29 @@ extern void do_cpu_ftr_fixups(unsigned long offset);
            CPU_FTR_HPTE_TABLE | CPU_FTR_IABR | \
            CPU_FTR_MMCRA | CPU_FTR_CTRL)
 #define CPU_FTRS_POWER4 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_MMCRA)
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
+            CPU_FTR_MMCRA)
 #define CPU_FTRS_PPC970 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_ALTIVEC_COMP | CPU_FTR_CAN_NAP | CPU_FTR_MMCRA)
 #define CPU_FTRS_POWER5 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_MMCRA | CPU_FTR_SMT | \
            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
            CPU_FTR_PURR)
 #define CPU_FTRS_POWER6 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_MMCRA | CPU_FTR_SMT | \
            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
            CPU_FTR_PURR | CPU_FTR_CI_LARGE_PAGE | CPU_FTR_REAL_LE)
 #define CPU_FTRS_CELL   (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
-            CPU_FTR_CTRL | CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE)
+            CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE)
+#define CPU_FTRS_PA6T (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_ALTIVEC_COMP | CPU_FTR_CI_LARGE_PAGE | \
+            CPU_FTR_PURR | CPU_FTR_REAL_LE)
 #define CPU_FTRS_COMPATIBLE     (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2)
 #endif
@@ -336,7 +345,7 @@ extern void do_cpu_ftr_fixups(unsigned long offset);
 #define CPU_FTRS_POSSIBLE       \
            (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |        \
            CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_POWER6 |       \
-            CPU_FTRS_CELL | CPU_FTR_CI_LARGE_PAGE)
+            CPU_FTRS_CELL | CPU_FTRS_PA6T)
 #else
 enum {
        CPU_FTRS_POSSIBLE =
@@ -375,7 +384,7 @@ enum {
 #define CPU_FTRS_ALWAYS         \
            (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &        \
            CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_POWER6 &       \
-            CPU_FTRS_CELL & CPU_FTRS_POSSIBLE)
+            CPU_FTRS_CELL & CPU_FTRS_PA6T & CPU_FTRS_POSSIBLE)
 #else
 enum {
        CPU_FTRS_ALWAYS =
diff --git a/include/asm-powerpc/hvcall.h b/include/asm-powerpc/hvcall.h
index 0d3c4e85711a..257d1cecb8c9 100644
--- a/include/asm-powerpc/hvcall.h
+++ b/include/asm-powerpc/hvcall.h
@@ -164,9 +164,15 @@
 #define H_VIO_SIGNAL            0x104
 #define H_SEND_CRQ              0x108
 #define H_COPY_RDMA             0x110
+#define H_REGISTER_LOGICAL_LAN  0x114
+#define H_FREE_LOGICAL_LAN      0x118
+#define H_ADD_LOGICAL_LAN_BUFFER 0x11C
+#define H_SEND_LOGICAL_LAN      0x120
+#define H_MULTICAST_CTRL        0x130
 #define H_SET_XDABR             0x134
 #define H_STUFF_TCE             0x138
 #define H_PUT_TCE_INDIRECT      0x13C
+#define H_CHANGE_LOGICAL_LAN_MAC 0x14C
 #define H_VTERM_PARTNER_INFO    0x150
 #define H_REGISTER_VTERM        0x154
 #define H_FREE_VTERM            0x158
@@ -196,102 +202,59 @@
 #define H_GET_HCA_INFO          0x1B8
 #define H_GET_PERF_COUNT        0x1BC
 #define H_MANAGE_TRACE          0x1C0
+#define H_FREE_LOGICAL_LAN_BUFFER 0x1D4
 #define H_QUERY_INT_STATE       0x1E4
 #define H_POLL_PENDING          0x1D8
 #define H_JOIN                  0x298
 #define H_VASI_STATE            0x2A4
 #define H_ENABLE_CRQ            0x2B0
+#define MAX_HCALL_OPCODE        H_ENABLE_CRQ
 #ifndef __ASSEMBLY__
-/* plpar_hcall() -- Generic call interface using above opcodes
+/**
+ * plpar_hcall_norets: - Make a pseries hypervisor call with no return arguments
+ * @opcode: The hypervisor call to make.
 *
- * The actual call interface is a hypervisor call instruction with
+ * This call supports up to 7 arguments and only returns the status of
- * the opcode in R3 and input args in R4-R7.
+ * the hcall. Use this version where possible, its slightly faster than
- * Status is returned in R3 with variable output values in R4-R11.
+ * the other plpar_hcalls.
- * Only H_PTE_READ with H_READ_4 uses R6-R11 so we ignore it for now
- * and return only two out args which MUST ALWAYS BE PROVIDED.
- */
-long plpar_hcall(unsigned long opcode,
-                 unsigned long arg1,
-                 unsigned long arg2,
-                 unsigned long arg3,
-                 unsigned long arg4,
-                 unsigned long *out1,
-                 unsigned long *out2,
-                 unsigned long *out3);
-/* Same as plpar_hcall but for those opcodes that return no values
- * other than status.  Slightly more efficient.
 */
 long plpar_hcall_norets(unsigned long opcode, ...);
-/*
+/**
- * Special hcall interface for ibmveth support.
+ * plpar_hcall: - Make a pseries hypervisor call
- * Takes 8 input parms. Returns a rc and stores the
+ * @opcode: The hypervisor call to make.
- * R4 return value in *out1.
+ * @retbuf: Buffer to store up to 4 return arguments in.
- */
-long plpar_hcall_8arg_2ret(unsigned long opcode,
-                           unsigned long arg1,
-                           unsigned long arg2,
-                           unsigned long arg3,
-                           unsigned long arg4,
-                           unsigned long arg5,
-                           unsigned long arg6,
-                           unsigned long arg7,
-                           unsigned long arg8,
-                           unsigned long *out1);
-/* plpar_hcall_4out()
 *
- * same as plpar_hcall except with 4 output arguments.
+ * This call supports up to 6 arguments and 4 return arguments. Use
+ * PLPAR_HCALL_BUFSIZE to size the return argument buffer.
 *
+ * Used for all but the craziest of phyp interfaces (see plpar_hcall9)
 */
-long plpar_hcall_4out(unsigned long opcode,
+#define PLPAR_HCALL_BUFSIZE 4
-                      unsigned long arg1,
+long plpar_hcall(unsigned long opcode, unsigned long *retbuf, ...);
-                      unsigned long arg2,
-                      unsigned long arg3,
-                      unsigned long arg4,
-                      unsigned long *out1,
-                      unsigned long *out2,
-                      unsigned long *out3,
-                      unsigned long *out4);
-long plpar_hcall_7arg_7ret(unsigned long opcode,
+/**
-                           unsigned long arg1,
+ * plpar_hcall9: - Make a pseries hypervisor call with up to 9 return arguments
-                           unsigned long arg2,
+ * @opcode: The hypervisor call to make.
-                           unsigned long arg3,
+ * @retbuf: Buffer to store up to 9 return arguments in.
-                           unsigned long arg4,
+ *
-                           unsigned long arg5,
+ * This call supports up to 9 arguments and 9 return arguments. Use
-                           unsigned long arg6,
+ * PLPAR_HCALL9_BUFSIZE to size the return argument buffer.
-                           unsigned long arg7,
+ */
-                           unsigned long *out1,
+#define PLPAR_HCALL9_BUFSIZE 9
-                           unsigned long *out2,
+long plpar_hcall9(unsigned long opcode, unsigned long *retbuf, ...);
-                           unsigned long *out3,
-                           unsigned long *out4,
-                           unsigned long *out5,
-                           unsigned long *out6,
-                           unsigned long *out7);
-long plpar_hcall_9arg_9ret(unsigned long opcode,
+/* For hcall instrumentation.  One structure per-hcall, per-CPU */
-                           unsigned long arg1,
+struct hcall_stats {
-                           unsigned long arg2,
+        unsigned long   num_calls;      /* number of calls (on this CPU) */
-                           unsigned long arg3,
+        unsigned long   tb_total;       /* total wall time (mftb) of calls. */
-                           unsigned long arg4,
+        unsigned long   purr_total;     /* total cpu time (PURR) of calls. */
-                           unsigned long arg5,
+};
-                           unsigned long arg6,
+void update_hcall_stats(unsigned long opcode, unsigned long tb_delta,
-                           unsigned long arg7,
+                        unsigned long purr_delta);
-                           unsigned long arg8,
+#define HCALL_STAT_ARRAY_SIZE   ((MAX_HCALL_OPCODE >> 2) + 1)
-                           unsigned long arg9,
-                           unsigned long *out1,
-                           unsigned long *out2,
-                           unsigned long *out3,
-                           unsigned long *out4,
-                           unsigned long *out5,
-                           unsigned long *out6,
-                           unsigned long *out7,
-                           unsigned long *out8,
-                           unsigned long *out9);
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/ibmebus.h b/include/asm-powerpc/ibmebus.h
index 7a42723d107c..7ab195a27888 100644
--- a/include/asm-powerpc/ibmebus.h
+++ b/include/asm-powerpc/ibmebus.h
@@ -48,7 +48,7 @@ extern struct dma_mapping_ops ibmebus_dma_ops;
 extern struct bus_type ibmebus_bus_type;
 struct ibmebus_dev {    
-        char *name;
+        const char *name;
        struct of_device ofdev;
 };
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index d903a62959da..4da41efb1319 100644
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -137,7 +137,7 @@ struct irq_map_entry {
 extern struct irq_map_entry irq_map[NR_IRQS];
-/***
+/**
 * irq_alloc_host - Allocate a new irq_host data structure
 * @node: device-tree node of the interrupt controller
 * @revmap_type: type of reverse mapping to use
@@ -159,14 +159,14 @@ extern struct irq_host *irq_alloc_host(unsigned int revmap_type,
                                       irq_hw_number_t inval_irq);
-/***
+/**
 * irq_find_host - Locates a host for a given device node
 * @node: device-tree node of the interrupt controller
 */
 extern struct irq_host *irq_find_host(struct device_node *node);
-/***
+/**
 * irq_set_default_host - Set a "default" host
 * @host: default host pointer
 *
@@ -178,7 +178,7 @@ extern struct irq_host *irq_find_host(struct device_node *node);
 extern void irq_set_default_host(struct irq_host *host);
-/***
+/**
 * irq_set_virq_count - Set the maximum number of virt irqs
 * @count: number of linux virtual irqs, capped with NR_IRQS
 *
@@ -188,7 +188,7 @@ extern void irq_set_default_host(struct irq_host *host);
 extern void irq_set_virq_count(unsigned int count);
-/***
+/**
 * irq_create_mapping - Map a hardware interrupt into linux virq space
 * @host: host owning this hardware interrupt or NULL for default host
 * @hwirq: hardware irq number in that host space
@@ -202,13 +202,13 @@ extern unsigned int irq_create_mapping(struct irq_host *host,
                                       irq_hw_number_t hwirq);
-/***
+/**
 * irq_dispose_mapping - Unmap an interrupt
 * @virq: linux virq number of the interrupt to unmap
 */
 extern void irq_dispose_mapping(unsigned int virq);
-/***
+/**
 * irq_find_mapping - Find a linux virq from an hw irq number.
 * @host: host owning this hardware interrupt
 * @hwirq: hardware irq number in that host space
@@ -221,7 +221,7 @@ extern unsigned int irq_find_mapping(struct irq_host *host,
                                     irq_hw_number_t hwirq);
-/***
+/**
 * irq_radix_revmap - Find a linux virq from a hw irq number.
 * @host: host owning this hardware interrupt
 * @hwirq: hardware irq number in that host space
@@ -232,7 +232,7 @@ extern unsigned int irq_find_mapping(struct irq_host *host,
 extern unsigned int irq_radix_revmap(struct irq_host *host,
                                     irq_hw_number_t hwirq);
-/***
+/**
 * irq_linear_revmap - Find a linux virq from a hw irq number.
 * @host: host owning this hardware interrupt
 * @hwirq: hardware irq number in that host space
@@ -247,7 +247,7 @@ extern unsigned int irq_linear_revmap(struct irq_host *host,
-/***
+/**
 * irq_alloc_virt - Allocate virtual irq numbers
 * @host: host owning these new virtual irqs
 * @count: number of consecutive numbers to allocate
@@ -261,7 +261,7 @@ extern unsigned int irq_alloc_virt(struct irq_host *host,
                                   unsigned int count,
                                   unsigned int hint);
-/***
+/**
 * irq_free_virt - Free virtual irq numbers
 * @virq: virtual irq number of the first interrupt to free
 * @count: number of interrupts to free
@@ -300,7 +300,7 @@ extern unsigned int irq_of_parse_and_map(struct device_node *dev, int index);
 /* -- End OF helpers -- */
-/***
+/**
 * irq_early_init - Init irq remapping subsystem
 */
 extern void irq_early_init(void);
diff --git a/include/asm-powerpc/iseries/hv_call_xm.h b/include/asm-powerpc/iseries/hv_call_xm.h
index ca9202cb01ed..392ac3f54df0 100644
--- a/include/asm-powerpc/iseries/hv_call_xm.h
+++ b/include/asm-powerpc/iseries/hv_call_xm.h
@@ -16,23 +16,6 @@
 #define HvCallXmSetTce                  HvCallXm + 11
 #define HvCallXmSetTces                 HvCallXm + 13
-/*
- * Structure passed to HvCallXm_getTceTableParms
- */
-struct iommu_table_cb {
-        unsigned long   itc_busno;      /* Bus number for this tce table */
-        unsigned long   itc_start;      /* Will be NULL for secondary */
-        unsigned long   itc_totalsize;  /* Size (in pages) of whole table */
-        unsigned long   itc_offset;     /* Index into real tce table of the
-                                           start of our section */
-        unsigned long   itc_size;       /* Size (in pages) of our section */
-        unsigned long   itc_index;      /* Index of this tce table */
-        unsigned short  itc_maxtables;  /* Max num of tables for partition */
-        unsigned char   itc_virtbus;    /* Flag to indicate virtual bus */
-        unsigned char   itc_slotno;     /* IOA Tce Slot Index */
-        unsigned char   itc_rsvd[4];
-};
 static inline void HvCallXm_getTceTableParms(u64 cb)
 {
        HvCall1(HvCallXmGetTceTableParms, cb);
diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/include/asm-powerpc/iseries/hv_lp_config.h
index df8b20739719..a006fd1e4a2c 100644
--- a/include/asm-powerpc/iseries/hv_lp_config.h
+++ b/include/asm-powerpc/iseries/hv_lp_config.h
@@ -25,7 +25,6 @@
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>
-#include <asm/iseries/it_lp_naca.h>
 enum {
        HvCallCfg_Cur   = 0,
@@ -44,16 +43,8 @@ enum {
 #define HvCallCfgGetHostingLpIndex                      HvCallCfg + 32
 extern HvLpIndex HvLpConfig_getLpIndex_outline(void);
+extern HvLpIndex HvLpConfig_getLpIndex(void);
-static inline HvLpIndex HvLpConfig_getLpIndex(void)
+extern HvLpIndex HvLpConfig_getPrimaryLpIndex(void);
-{
-        return itLpNaca.xLpIndex;
-}
-static inline HvLpIndex HvLpConfig_getPrimaryLpIndex(void)
-{
-        return itLpNaca.xPrimaryLpIndex;
-}
 static inline u64 HvLpConfig_getMsChunks(void)
 {
diff --git a/include/asm-powerpc/iseries/it_lp_queue.h b/include/asm-powerpc/iseries/it_lp_queue.h
index 284c5a7db3ac..3f6814769295 100644
--- a/include/asm-powerpc/iseries/it_lp_queue.h
+++ b/include/asm-powerpc/iseries/it_lp_queue.h
@@ -27,8 +27,6 @@
 #include <asm/types.h>
 #include <asm/ptrace.h>
-struct HvLpEvent;
 #define IT_LP_MAX_QUEUES        8
 #define IT_LP_NOT_USED          0       /* Queue will not be used by PLIC */
diff --git a/include/asm-powerpc/iseries/vio.h b/include/asm-powerpc/iseries/vio.h
index 72a97d37aac3..7a95d296abd1 100644
--- a/include/asm-powerpc/iseries/vio.h
+++ b/include/asm-powerpc/iseries/vio.h
@@ -122,6 +122,34 @@ enum viorc {
        viorc_openRejected = 0x0301
 };
+/*
+ * The structure of the events that flow between us and OS/400 for chario
+ * events.  You can't mess with this unless the OS/400 side changes too.
+ */
+struct viocharlpevent {
+        struct HvLpEvent event;
+        u32 reserved;
+        u16 version;
+        u16 subtype_result_code;
+        u8 virtual_device;
+        u8 len;
+        u8 data[VIOCHAR_MAX_DATA];
+};
+#define VIOCHAR_WINDOW          10
+enum viocharsubtype {
+        viocharopen = 0x0001,
+        viocharclose = 0x0002,
+        viochardata = 0x0003,
+        viocharack = 0x0004,
+        viocharconfig = 0x0005
+};
+enum viochar_rc {
+        viochar_rc_ebusy = 1
+};
 struct device;
 extern struct device *iSeries_vio_dev;
diff --git a/include/asm-powerpc/lppaca.h b/include/asm-powerpc/lppaca.h
index 4dc514aabfe7..821ea0c512b4 100644
--- a/include/asm-powerpc/lppaca.h
+++ b/include/asm-powerpc/lppaca.h
@@ -27,7 +27,9 @@
 //
 //
 //----------------------------------------------------------------------------
+#include <linux/cache.h>
 #include <asm/types.h>
+#include <asm/mmu.h>
 /* The Hypervisor barfs if the lppaca crosses a page boundary.  A 1k
 * alignment is sufficient to prevent this */
@@ -114,7 +116,7 @@ struct lppaca {
 //=============================================================================
-// CACHE_LINE_3 0x0100 - 0x007F: This line is shared with other processors
+// CACHE_LINE_3 0x0100 - 0x017F: This line is shared with other processors
 //=============================================================================
        // This is the yield_count.  An "odd" value (low bit on) means that
        // the processor is yielded (either because of an OS yield or a PLIC
@@ -126,12 +128,29 @@ struct lppaca {
        u8      reserved6[124];         // Reserved                     x04-x7F
 //=============================================================================
-// CACHE_LINE_4-5 0x0100 - 0x01FF Contains PMC interrupt data
+// CACHE_LINE_4-5 0x0180 - 0x027F Contains PMC interrupt data
 //=============================================================================
        u8      pmc_save_area[256];     // PMC interrupt Area           x00-xFF
 } __attribute__((__aligned__(0x400)));
 extern struct lppaca lppaca[];
+/*
+ * SLB shadow buffer structure as defined in the PAPR.  The save_area
+ * contains adjacent ESID and VSID pairs for each shadowed SLB.  The
+ * ESID is stored in the lower 64bits, then the VSID.
+ */
+struct slb_shadow {
+        u32     persistent;             // Number of persistent SLBs    x00-x03
+        u32     buffer_length;          // Total shadow buffer length   x04-x07
+        u64     reserved;               // Alignment                    x08-x0f
+        struct  {
+                u64     esid;
+                u64     vsid;
+        } save_area[SLB_NUM_BOLTED];    //                              x10-x40
+} ____cacheline_aligned;
+extern struct slb_shadow slb_shadow[];
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_LPPACA_H */
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index 3d5d590bc4b0..0a4e5c93e8e6 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -23,6 +23,7 @@
 register struct paca_struct *local_paca asm("r13");
 #define get_paca()      local_paca
 #define get_lppaca()    (get_paca()->lppaca_ptr)
+#define get_slb_shadow()        (get_paca()->slb_shadow_ptr)
 struct task_struct;
@@ -99,6 +100,8 @@ struct paca_struct {
        u64 user_time;                  /* accumulated usermode TB ticks */
        u64 system_time;                /* accumulated system TB ticks */
        u64 startpurr;                  /* PURR/TB value snapshot */
+        struct slb_shadow *slb_shadow_ptr;
 };
 extern struct paca_struct paca[];
diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h
index 22e54a2a6604..6cb6fb19e57f 100644
--- a/include/asm-powerpc/processor.h
+++ b/include/asm-powerpc/processor.h
@@ -32,6 +32,7 @@
 #define _CHRP_Motorola  0x04    /* motorola chrp, the cobra */
 #define _CHRP_IBM       0x05    /* IBM chrp, the longtrail and longtrail 2 */
 #define _CHRP_Pegasos   0x06    /* Genesi/bplan's Pegasos and Pegasos2 */
+#define _CHRP_briq      0x07    /* TotalImpact's briQ */
 #if defined(__KERNEL__) && defined(CONFIG_PPC32)
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index d0fa1b9aed35..c15e66a2e681 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -72,8 +72,8 @@ struct property {
 };
 struct device_node {
-        char    *name;
+        const char *name;
-        char    *type;
+        const char *type;
        phandle node;
        phandle linux_phandle;
        char    *full_name;
@@ -160,7 +160,7 @@ extern void unflatten_device_tree(void);
 extern void early_init_devtree(void *);
 extern int device_is_compatible(struct device_node *device, const char *);
 extern int machine_is_compatible(const char *compat);
-extern void *get_property(struct device_node *node, const char *name,
+extern const void *get_property(struct device_node *node, const char *name,
                int *lenp);
 extern void print_properties(struct device_node *node);
 extern int prom_n_addr_cells(struct device_node* np);
@@ -198,7 +198,7 @@ extern int release_OF_resource(struct device_node* node, int index);
 /* Helper to read a big number */
-static inline u64 of_read_number(u32 *cell, int size)
+static inline u64 of_read_number(const u32 *cell, int size)
 {
        u64 r = 0;
        while (size--)
@@ -209,15 +209,15 @@ static inline u64 of_read_number(u32 *cell, int size)
 /* Translate an OF address block into a CPU physical address
 */
 #define OF_BAD_ADDR     ((u64)-1)
-extern u64 of_translate_address(struct device_node *np, u32 *addr);
+extern u64 of_translate_address(struct device_node *np, const u32 *addr);
 /* Extract an address from a device, returns the region size and
 * the address space flags too. The PCI version uses a BAR number
 * instead of an absolute index
 */
-extern u32 *of_get_address(struct device_node *dev, int index,
+extern const u32 *of_get_address(struct device_node *dev, int index,
                           u64 *size, unsigned int *flags);
-extern u32 *of_get_pci_address(struct device_node *dev, int bar_no,
+extern const u32 *of_get_pci_address(struct device_node *dev, int bar_no,
                               u64 *size, unsigned int *flags);
 /* Get an address as a resource. Note that if your address is
@@ -234,7 +234,7 @@ extern int of_pci_address_to_resource(struct device_node *dev, int bar,
 /* Parse the ibm,dma-window property of an OF node into the busno, phys and
 * size parameters.
 */
-void of_parse_dma_window(struct device_node *dn, unsigned char *dma_window_prop,
+void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
                unsigned long *busno, unsigned long *phys, unsigned long *size);
 extern void kdump_move_device_tree(void);
@@ -259,7 +259,7 @@ struct of_irq {
        u32 specifier[OF_MAX_IRQ_SPEC]; /* Specifier copy */
 };
-/***
+/**
 * of_irq_map_init - Initialize the irq remapper
 * @flags:      flags defining workarounds to enable
 *
@@ -272,7 +272,7 @@ struct of_irq {
 extern void of_irq_map_init(unsigned int flags);
-/***
+/**
 * of_irq_map_raw - Low level interrupt tree parsing
 * @parent:     the device interrupt parent
 * @intspec:    interrupt specifier ("interrupts" property of the device)
@@ -289,12 +289,12 @@ extern void of_irq_map_init(unsigned int flags);
 *
 */
-extern int of_irq_map_raw(struct device_node *parent, u32 *intspec,
+extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
-                          u32 ointsize, u32 *addr,
+                          u32 ointsize, const u32 *addr,
                          struct of_irq *out_irq);
-/***
+/**
 * of_irq_map_one - Resolve an interrupt for a device
 * @device:     the device whose interrupt is to be resolved
 * @index:      index of the interrupt to resolve
@@ -307,7 +307,7 @@ extern int of_irq_map_raw(struct device_node *parent, u32 *intspec,
 extern int of_irq_map_one(struct device_node *device, int index,
                          struct of_irq *out_irq);
-/***
+/**
 * of_irq_map_pci - Resolve the interrupt for a PCI device
 * @pdev:       the device whose interrupt is to be resolved
 * @out_irq:    structure of_irq filled by this function
diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h
index cf73475a0c69..3a9fcc15811b 100644
--- a/include/asm-powerpc/reg.h
+++ b/include/asm-powerpc/reg.h
@@ -592,6 +592,7 @@
 #define PV_630p 0x0041
 #define PV_970MP        0x0044
 #define PV_BE           0x0070
+#define PV_PA6T         0x0090
 /*
 * Number of entries in the SLB. If this ever changes we should handle
diff --git a/include/asm-powerpc/rtas.h b/include/asm-powerpc/rtas.h
index 82a27e9a041f..d34f9e1f242c 100644
--- a/include/asm-powerpc/rtas.h
+++ b/include/asm-powerpc/rtas.h
@@ -230,5 +230,21 @@ extern unsigned long rtas_rmo_buf;
 #define GLOBAL_INTERRUPT_QUEUE 9005
+/**
+ * rtas_config_addr - Format a busno, devfn and reg for RTAS.
+ * @busno: The bus number.
+ * @devfn: The device and function number as encoded by PCI_DEVFN().
+ * @reg: The register number.
+ *
+ * This function encodes the given busno, devfn and register number as
+ * required for RTAS calls that take a "config_addr" parameter.
+ * See PAPR requirement 7.3.4-1 for more info.
+ */
+static inline u32 rtas_config_addr(int busno, int devfn, int reg)
+{
+        return ((reg & 0xf00) << 20) | ((busno & 0xff) << 16) |
+                        (devfn << 8) | (reg & 0xff);
+}
 #endif /* __KERNEL__ */
 #endif /* _POWERPC_RTAS_H */
diff --git a/include/asm-powerpc/smu.h b/include/asm-powerpc/smu.h
index 51e65fc46a03..e49f644ca63a 100644
--- a/include/asm-powerpc/smu.h
+++ b/include/asm-powerpc/smu.h
@@ -517,7 +517,7 @@ struct smu_sdbp_cpupiddata {
 * This returns the pointer to an SMU "sdb" partition data or NULL
 * if not found. The data format is described below
 */
-extern struct smu_sdbp_header *smu_get_sdb_partition(int id,
+extern const struct smu_sdbp_header *smu_get_sdb_partition(int id,
                                        unsigned int *size);
 /* Get "sdb" partition data from an SMU satellite */
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index c02d105d8294..b42b53c40f5d 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -106,7 +106,7 @@ struct spu_context;
 struct spu_runqueue;
 struct spu {
-        char *name;
+        const char *name;
        unsigned long local_store_phys;
        u8 *local_store;
        unsigned long problem_phys;
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index 4c9f5229e833..4b41deaa8d8d 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -177,11 +177,6 @@ extern u32 booke_wdt_enabled;
 extern u32 booke_wdt_period;
 #endif /* CONFIG_BOOKE_WDT */
-/* EBCDIC -> ASCII conversion for [0-9A-Z] on iSeries */
-extern unsigned char e2a(unsigned char);
-extern unsigned char* strne2a(unsigned char *dest,
-                const unsigned char *src, size_t n);
 struct device_node;
 extern void note_scsi_host(struct device_node *, void *);
diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index dc9bd101ca14..4b51d42e1419 100644
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -46,8 +46,8 @@ struct iommu_table;
 */
 struct vio_dev {
        struct iommu_table *iommu_table;     /* vio_map_* uses this */
-        char *name;
+        const char *name;
-        char *type;
+        const char *type;
        uint32_t unit_address;
        unsigned int irq;
        struct device dev;
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index b34924663ac1..f7844f6aa487 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -62,6 +62,8 @@ my (@stack, $re, $x, $xs);
        } elsif ($arch eq 'ppc64') {
                #XXX
                $re = qr/.*stdu.*r1,-($x{1,8})\(r1\)/o;
+        } elsif ($arch eq 'powerpc') {
+                $re = qr/.*st[dw]u.*r1,-($x{1,8})\(r1\)/o;
        } elsif ($arch =~ /^s390x?$/) {
                #   11160:       a7 fb ff 60             aghi   %r15,-160
                $re = qr/.*ag?hi.*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})/o;
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c
index f69d33357a28..7c26089527f6 100644
--- a/sound/aoa/core/snd-aoa-gpio-feature.c
+++ b/sound/aoa/core/snd-aoa-gpio-feature.c
@@ -56,7 +56,7 @@ static struct device_node *get_gpio(char *name,
 {
        struct device_node *np, *gpio;
        u32 *reg;
-        char *audio_gpio;
+        const char *audio_gpio;
        *gpioptr = -1;
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 4359903f4376..9ae659f82430 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -347,8 +347,8 @@ int
 setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* gpio_pol)
 {
        struct device_node *np;
-        u32* pp;
+        const u32* pp;
-        
        np = find_devices("gpio");
        if (!np)
                return -ENODEV;
@@ -356,7 +356,8 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int*
        np = np->child;
        while(np != 0) {
                if (name) {
-                        char *property = get_property(np,"audio-gpio",NULL);
+                        const char *property =
+                                get_property(np,"audio-gpio",NULL);
                        if (property != 0 && strcmp(property,name) == 0)
                                break;
                } else if (compatible && device_is_compatible(np, compatible))
@@ -365,11 +366,11 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int*
        }
        if (!np)
                return -ENODEV;
-        pp = (u32 *)get_property(np, "AAPL,address", NULL);
+        pp = get_property(np, "AAPL,address", NULL);
        if (!pp)
                return -ENODEV;
        *gpio_addr = (*pp) & 0x0000ffff;
-        pp = (u32 *)get_property(np, "audio-gpio-active-state", NULL);
+        pp = get_property(np, "audio-gpio-active-state", NULL);
        if (pp)
                *gpio_pol = *pp;
        else
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 84f6b19c07ca..6ae2d5b9aa4a 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1035,7 +1035,7 @@ static struct device_node *find_audio_device(const char *name)
                return NULL;
  
        for (np = np->child; np; np = np->sibling) {
-                char *property = get_property(np, "audio-gpio", NULL);
+                const char *property = get_property(np, "audio-gpio", NULL);
                if (property && strcmp(property, name) == 0)
                        return np;
        }  
@@ -1062,7 +1062,8 @@ static long tumbler_find_device(const char *device, const char *platform,
                                struct pmac_gpio *gp, int is_compatible)
 {
        struct device_node *node;
-        u32 *base, addr;
+        const u32 *base;
+        u32 addr;
        if (is_compatible)
                node = find_compatible_audio_device(device);
@@ -1074,9 +1075,9 @@ static long tumbler_find_device(const char *device, const char *platform,
                return -ENODEV;
        }
-        base = (u32 *)get_property(node, "AAPL,address", NULL);
+        base = get_property(node, "AAPL,address", NULL);
        if (! base) {
-                base = (u32 *)get_property(node, "reg", NULL);
+                base = get_property(node, "reg", NULL);
                if (!base) {
                        DBG("(E) cannot find address for device %s !\n", device);
                        snd_printd("cannot find address for device %s\n", device);
@@ -1090,13 +1091,13 @@ static long tumbler_find_device(const char *device, const char *platform,
        gp->addr = addr & 0x0000ffff;
        /* Try to find the active state, default to 0 ! */
-        base = (u32 *)get_property(node, "audio-gpio-active-state", NULL);
+        base = get_property(node, "audio-gpio-active-state", NULL);
        if (base) {
                gp->active_state = *base;
                gp->active_val = (*base) ? 0x5 : 0x4;
                gp->inactive_val = (*base) ? 0x4 : 0x5;
        } else {
-                u32 *prop = NULL;
+                const u32 *prop = NULL;
                gp->active_state = 0;
                gp->active_val = 0x4;
                gp->inactive_val = 0x5;
@@ -1105,7 +1106,7 @@ static long tumbler_find_device(const char *device, const char *platform,
                 * as we don't yet have an interpreter for these things
                 */
                if (platform)
-                        prop = (u32 *)get_property(node, platform, NULL);
+                        prop = get_property(node, platform, NULL);
                if (prop) {
                        if (prop[3] == 0x9 && prop[4] == 0x9) {
                                gp->active_val = 0xd;