9 files changed, 109 insertions, 96 deletions

diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index ca71a12b764c..bb028f165fb3 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -82,7 +82,7 @@ static int __init ps3_register_lpm_devices(void)
                 goto fail_rights;
         }
 
-        pr_debug("%s:%d: pu_id %lu, rights %lu(%lxh)\n",
+        pr_debug("%s:%d: pu_id %llu, rights %llu(%llxh)\n",
                 __func__, __LINE__, dev->lpm.pu_id, dev->lpm.rights,
                 dev->lpm.rights);
 
@@ -348,7 +348,7 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
                 return -ENODEV;
         }
 
-        pr_debug("%s:%u: (%u:%u:%u): port %lu blk_size %lu num_blocks %lu "
+        pr_debug("%s:%u: (%u:%u:%u): port %llu blk_size %llu num_blocks %llu "
                  "num_regions %u\n", __func__, __LINE__, repo->bus_index,
                  repo->dev_index, repo->dev_type, port, blk_size, num_blocks,
                  num_regions);
@@ -394,7 +394,7 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
                         result = -ENODEV;
                         goto fail_read_region;
                 }
-                pr_debug("%s:%u: region %u: id %u start %lu size %lu\n",
+                pr_debug("%s:%u: region %u: id %u start %llu size %llu\n",
                          __func__, __LINE__, i, id, start, size);
 
                 p->regions[i].id = id;
@@ -662,13 +662,13 @@ static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
                 if (rem)
                         break;
         }
-        pr_warning("%s:%u: device %lu:%lu not found\n", __func__, __LINE__,
+        pr_warning("%s:%u: device %llu:%llu not found\n", __func__, __LINE__,
                    bus_id, dev_id);
         return;
 
 found:
         if (retries)
-                pr_debug("%s:%u: device %lu:%lu found after %u retries\n",
+                pr_debug("%s:%u: device %llu:%llu found after %u retries\n",
                          __func__, __LINE__, bus_id, dev_id, retries);
 
         ps3_setup_dynamic_device(&repo);
@@ -715,14 +715,14 @@ static irqreturn_t ps3_notification_interrupt(int irq, void *data)
         res = lv1_storage_get_async_status(PS3_NOTIFICATION_DEV_ID, &tag,
                                            &status);
         if (tag != dev->tag)
-                pr_err("%s:%u: tag mismatch, got %lx, expected %lx\n",
+                pr_err("%s:%u: tag mismatch, got %llx, expected %llx\n",
                        __func__, __LINE__, tag, dev->tag);
 
         if (res) {
-                pr_err("%s:%u: res %d status 0x%lx\n", __func__, __LINE__, res,
+                pr_err("%s:%u: res %d status 0x%llx\n", __func__, __LINE__, res,
                        status);
         } else {
-                pr_debug("%s:%u: completed, status 0x%lx\n", __func__,
+                pr_debug("%s:%u: completed, status 0x%llx\n", __func__,
                          __LINE__, status);
                 dev->lv1_status = status;
                 complete(&dev->done);
@@ -761,7 +761,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev,
         }
 
         if (dev->lv1_status) {
-                pr_err("%s:%u: %s not completed, status 0x%lx\n", __func__,
+                pr_err("%s:%u: %s not completed, status 0x%llx\n", __func__,
                        __LINE__, op, dev->lv1_status);
                 return -EIO;
         }
@@ -850,16 +850,16 @@ static int ps3_probe_thread(void *data)
                 if (res)
                         break;
 
-                pr_debug("%s:%u: notify event type 0x%lx bus id %lu dev id %lu"
-                         " type %lu port %lu\n", __func__, __LINE__,
+                pr_debug("%s:%u: notify event type 0x%llx bus id %llu dev id %llu"
+                         " type %llu port %llu\n", __func__, __LINE__,
                          notify_event->event_type, notify_event->bus_id,
                          notify_event->dev_id, notify_event->dev_type,
                          notify_event->dev_port);
 
                 if (notify_event->event_type != notify_region_probe ||
                     notify_event->bus_id != dev.sbd.bus_id) {
-                        pr_warning("%s:%u: bad notify_event: event %lu, "
-                                   "dev_id %lu, dev_type %lu\n",
+                        pr_warning("%s:%u: bad notify_event: event %llu, "
+                                   "dev_id %llu, dev_type %llu\n",
                                    __func__, __LINE__, notify_event->event_type,
                                    notify_event->dev_id,
                                    notify_event->dev_type);
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 6eb1d4d182c9..1e8a1e39dfe8 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -75,7 +75,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va,
 
         if (result) {
                 /* all entries bolted !*/
-                pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%lx r=%lx\n",
+                pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%llx r=%llx\n",
                         __func__, result, va, pa, hpte_group, hpte_v, hpte_r);
                 BUG();
         }
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index e59634f7af96..8ec5ccf76b19 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -60,6 +60,8 @@
  * gives a usable range of plug values of  {NUM_ISA_INTERRUPTS..63}.  Note
  * that there is no constraint on how many in this set an individual thread
  * can acquire.
+ *
+ * The mask is declared as unsigned long so we can use set/clear_bit on it.
  */
 
 #define PS3_BMP_MINALIGN 64
@@ -68,7 +70,7 @@ struct ps3_bmp {
         struct {
                 u64 status;
                 u64 unused_1[3];
-                u64 mask;
+                unsigned long mask;
                 u64 unused_2[3];
         };
         u64 ipi_debug_brk_mask;
@@ -102,7 +104,7 @@ static void ps3_chip_mask(unsigned int virq)
         struct ps3_private *pd = get_irq_chip_data(virq);
         unsigned long flags;
 
-        pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__,
+        pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
                 pd->thread_id, virq);
 
         local_irq_save(flags);
@@ -123,7 +125,7 @@ static void ps3_chip_unmask(unsigned int virq)
         struct ps3_private *pd = get_irq_chip_data(virq);
         unsigned long flags;
 
-        pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__,
+        pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
                 pd->thread_id, virq);
 
         local_irq_save(flags);
@@ -221,7 +223,7 @@ static int ps3_virq_destroy(unsigned int virq)
 {
         const struct ps3_private *pd = get_irq_chip_data(virq);
 
-        pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__,
+        pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
 
         set_irq_chip_data(virq, NULL);
@@ -291,7 +293,7 @@ int ps3_irq_plug_destroy(unsigned int virq)
         int result;
         const struct ps3_private *pd = get_irq_chip_data(virq);
 
-        pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__,
+        pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
 
         ps3_chip_mask(virq);
@@ -322,7 +324,7 @@ EXPORT_SYMBOL_GPL(ps3_irq_plug_destroy);
 int ps3_event_receive_port_setup(enum ps3_cpu_binding cpu, unsigned int *virq)
 {
         int result;
-        unsigned long outlet;
+        u64 outlet;
 
         result = lv1_construct_event_receive_port(&outlet);
 
@@ -468,7 +470,7 @@ int ps3_io_irq_setup(enum ps3_cpu_binding cpu, unsigned int interrupt_id,
         unsigned int *virq)
 {
         int result;
-        unsigned long outlet;
+        u64 outlet;
 
         result = lv1_construct_io_irq_outlet(interrupt_id, &outlet);
 
@@ -525,7 +527,7 @@ int ps3_vuart_irq_setup(enum ps3_cpu_binding cpu, void* virt_addr_bmp,
         unsigned int *virq)
 {
         int result;
-        unsigned long outlet;
+        u64 outlet;
         u64 lpar_addr;
 
         BUG_ON(!is_kernel_addr((u64)virt_addr_bmp));
@@ -581,7 +583,7 @@ int ps3_spe_irq_setup(enum ps3_cpu_binding cpu, unsigned long spe_id,
         unsigned int class, unsigned int *virq)
 {
         int result;
-        unsigned long outlet;
+        u64 outlet;
 
         BUG_ON(class > 2);
 
@@ -691,7 +693,7 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
 
         pd->bmp.ipi_debug_brk_mask = 0x8000000000000000UL >> virq;
 
-        pr_debug("%s:%d: cpu %u, virq %u, mask %lxh\n", __func__, __LINE__,
+        pr_debug("%s:%d: cpu %u, virq %u, mask %llxh\n", __func__, __LINE__,
                 cpu, virq, pd->bmp.ipi_debug_brk_mask);
 }
 
@@ -710,7 +712,7 @@ static unsigned int ps3_get_irq(void)
         plug &= 0x3f;
 
         if (unlikely(plug == NO_IRQ)) {
-                pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
+                pr_debug("%s:%d: no plug found: thread_id %llu\n", __func__,
                         __LINE__, pd->thread_id);
                 dump_bmp(&per_cpu(ps3_private, 0));
                 dump_bmp(&per_cpu(ps3_private, 1));
@@ -745,7 +747,7 @@ void __init ps3_init_IRQ(void)
                 pd->thread_id = get_hard_smp_processor_id(cpu);
                 spin_lock_init(&pd->bmp.lock);
 
-                pr_debug("%s:%d: ppe_id %lu, thread_id %lu, bmp %lxh\n",
+                pr_debug("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n",
                         __func__, __LINE__, pd->ppe_id, pd->thread_id,
                         ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
 
@@ -770,6 +772,6 @@ void ps3_shutdown_IRQ(int cpu)
         lv1_get_logical_ppe_id(&ppe_id);
         result = lv1_configure_irq_state_bitmap(ppe_id, thread_id, 0);
 
-        DBG("%s:%d: lv1_configure_irq_state_bitmap (%lu:%lu/%d) %s\n", __func__,
+        DBG("%s:%d: lv1_configure_irq_state_bitmap (%llu:%llu/%d) %s\n", __func__,
                 __LINE__, ppe_id, thread_id, cpu, ps3_result(result));
 }
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index a4d49dd9e8a9..67de6bf3db3d 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -79,8 +79,8 @@ enum {
  */
 
 struct mem_region {
-        unsigned long base;
-        unsigned long size;
+        u64 base;
+        u64 size;
         unsigned long offset;
 };
 
@@ -103,9 +103,9 @@ struct mem_region {
  */
 
 struct map {
-        unsigned long total;
-        unsigned long vas_id;
-        unsigned long htab_size;
+        u64 total;
+        u64 vas_id;
+        u64 htab_size;
         struct mem_region rm;
         struct mem_region r1;
 };
@@ -114,13 +114,13 @@ struct map {
 static void __maybe_unused _debug_dump_map(const struct map *m,
         const char *func, int line)
 {
-        DBG("%s:%d: map.total     = %lxh\n", func, line, m->total);
-        DBG("%s:%d: map.rm.size   = %lxh\n", func, line, m->rm.size);
-        DBG("%s:%d: map.vas_id    = %lu\n", func, line, m->vas_id);
-        DBG("%s:%d: map.htab_size = %lxh\n", func, line, m->htab_size);
-        DBG("%s:%d: map.r1.base   = %lxh\n", func, line, m->r1.base);
+        DBG("%s:%d: map.total     = %llxh\n", func, line, m->total);
+        DBG("%s:%d: map.rm.size   = %llxh\n", func, line, m->rm.size);
+        DBG("%s:%d: map.vas_id    = %llu\n", func, line, m->vas_id);
+        DBG("%s:%d: map.htab_size = %llxh\n", func, line, m->htab_size);
+        DBG("%s:%d: map.r1.base   = %llxh\n", func, line, m->r1.base);
         DBG("%s:%d: map.r1.offset = %lxh\n", func, line, m->r1.offset);
-        DBG("%s:%d: map.r1.size   = %lxh\n", func, line, m->r1.size);
+        DBG("%s:%d: map.r1.size   = %llxh\n", func, line, m->r1.size);
 }
 
 static struct map map;
@@ -146,11 +146,11 @@ EXPORT_SYMBOL(ps3_mm_phys_to_lpar);
 void __init ps3_mm_vas_create(unsigned long* htab_size)
 {
         int result;
-        unsigned long start_address;
-        unsigned long size;
-        unsigned long access_right;
-        unsigned long max_page_size;
-        unsigned long flags;
+        u64 start_address;
+        u64 size;
+        u64 access_right;
+        u64 max_page_size;
+        u64 flags;
 
         result = lv1_query_logical_partition_address_region_info(0,
                 &start_address, &size, &access_right, &max_page_size,
@@ -164,7 +164,7 @@ void __init ps3_mm_vas_create(unsigned long* htab_size)
         }
 
         if (max_page_size < PAGE_SHIFT_16M) {
-                DBG("%s:%d: bad max_page_size %lxh\n", __func__, __LINE__,
+                DBG("%s:%d: bad max_page_size %llxh\n", __func__, __LINE__,
                         max_page_size);
                 goto fail;
         }
@@ -208,7 +208,7 @@ void ps3_mm_vas_destroy(void)
 {
         int result;
 
-        DBG("%s:%d: map.vas_id    = %lu\n", __func__, __LINE__, map.vas_id);
+        DBG("%s:%d: map.vas_id    = %llu\n", __func__, __LINE__, map.vas_id);
 
         if (map.vas_id) {
                 result = lv1_select_virtual_address_space(0);
@@ -235,15 +235,14 @@ void ps3_mm_vas_destroy(void)
 static int ps3_mm_region_create(struct mem_region *r, unsigned long size)
 {
         int result;
-        unsigned long muid;
+        u64 muid;
 
         r->size = _ALIGN_DOWN(size, 1 << PAGE_SHIFT_16M);
 
         DBG("%s:%d requested  %lxh\n", __func__, __LINE__, size);
-        DBG("%s:%d actual     %lxh\n", __func__, __LINE__, r->size);
-        DBG("%s:%d difference %lxh (%luMB)\n", __func__, __LINE__,
-                (unsigned long)(size - r->size),
-                (size - r->size) / 1024 / 1024);
+        DBG("%s:%d actual     %llxh\n", __func__, __LINE__, r->size);
+        DBG("%s:%d difference %llxh (%lluMB)\n", __func__, __LINE__,
+                size - r->size, (size - r->size) / 1024 / 1024);
 
         if (r->size == 0) {
                 DBG("%s:%d: size == 0\n", __func__, __LINE__);
@@ -277,7 +276,7 @@ static void ps3_mm_region_destroy(struct mem_region *r)
 {
         int result;
 
-        DBG("%s:%d: r->base = %lxh\n", __func__, __LINE__, r->base);
+        DBG("%s:%d: r->base = %llxh\n", __func__, __LINE__, r->base);
         if (r->base) {
                 result = lv1_release_memory(r->base);
                 BUG_ON(result);
@@ -355,7 +354,7 @@ static unsigned long dma_sb_lpar_to_bus(struct ps3_dma_region *r,
 static void  __maybe_unused _dma_dump_region(const struct ps3_dma_region *r,
         const char *func, int line)
 {
-        DBG("%s:%d: dev        %lu:%lu\n", func, line, r->dev->bus_id,
+        DBG("%s:%d: dev        %llu:%llu\n", func, line, r->dev->bus_id,
                 r->dev->dev_id);
         DBG("%s:%d: page_size  %u\n", func, line, r->page_size);
         DBG("%s:%d: bus_addr   %lxh\n", func, line, r->bus_addr);
@@ -390,7 +389,7 @@ struct dma_chunk {
 static void _dma_dump_chunk (const struct dma_chunk* c, const char* func,
         int line)
 {
-        DBG("%s:%d: r.dev        %lu:%lu\n", func, line,
+        DBG("%s:%d: r.dev        %llu:%llu\n", func, line,
                 c->region->dev->bus_id, c->region->dev->dev_id);
         DBG("%s:%d: r.bus_addr   %lxh\n", func, line, c->region->bus_addr);
         DBG("%s:%d: r.page_size  %u\n", func, line, c->region->page_size);
@@ -596,7 +595,7 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
 
         /* build ioptes for the area */
         pages = len >> r->page_size;
-        DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#lx\n", __func__,
+        DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#llx\n", __func__,
             r->page_size, r->len, pages, iopte_flag);
         for (iopage = 0; iopage < pages; iopage++) {
                 offset = (1 << r->page_size) * iopage;
@@ -648,13 +647,14 @@ fail_alloc:
 static int dma_sb_region_create(struct ps3_dma_region *r)
 {
         int result;
+        u64 bus_addr;
 
         DBG(" -> %s:%d:\n", __func__, __LINE__);
 
         BUG_ON(!r);
 
         if (!r->dev->bus_id) {
-                pr_info("%s:%d: %lu:%lu no dma\n", __func__, __LINE__,
+                pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__,
                         r->dev->bus_id, r->dev->dev_id);
                 return 0;
         }
@@ -671,7 +671,8 @@ static int dma_sb_region_create(struct ps3_dma_region *r)
 
         result = lv1_allocate_device_dma_region(r->dev->bus_id, r->dev->dev_id,
                 roundup_pow_of_two(r->len), r->page_size, r->region_type,
-                &r->bus_addr);
+                &bus_addr);
+        r->bus_addr = bus_addr;
 
         if (result) {
                 DBG("%s:%d: lv1_allocate_device_dma_region failed: %s\n",
@@ -685,6 +686,7 @@ static int dma_sb_region_create(struct ps3_dma_region *r)
 static int dma_ioc0_region_create(struct ps3_dma_region *r)
 {
         int result;
+        u64 bus_addr;
 
         INIT_LIST_HEAD(&r->chunk_list.head);
         spin_lock_init(&r->chunk_list.lock);
@@ -692,7 +694,8 @@ static int dma_ioc0_region_create(struct ps3_dma_region *r)
         result = lv1_allocate_io_segment(0,
                                          r->len,
                                          r->page_size,
-                                         &r->bus_addr);
+                                         &bus_addr);
+        r->bus_addr = bus_addr;
         if (result) {
                 DBG("%s:%d: lv1_allocate_io_segment failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
@@ -720,7 +723,7 @@ static int dma_sb_region_free(struct ps3_dma_region *r)
         BUG_ON(!r);
 
         if (!r->dev->bus_id) {
-                pr_info("%s:%d: %lu:%lu no dma\n", __func__, __LINE__,
+                pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__,
                         r->dev->bus_id, r->dev->dev_id);
                 return 0;
         }
@@ -777,7 +780,7 @@ static int dma_ioc0_region_free(struct ps3_dma_region *r)
  */
 
 static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
-           unsigned long len, unsigned long *bus_addr,
+           unsigned long len, dma_addr_t *bus_addr,
            u64 iopte_flag)
 {
         int result;
@@ -800,7 +803,7 @@ static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
                 DBG("%s:%d lpar_addr %lxh\n", __func__, __LINE__,
                         lpar_addr);
                 DBG("%s:%d len       %lxh\n", __func__, __LINE__, len);
-                DBG("%s:%d bus_addr  %lxh (%lxh)\n", __func__, __LINE__,
+                DBG("%s:%d bus_addr  %llxh (%lxh)\n", __func__, __LINE__,
                 *bus_addr, len);
         }
 
@@ -832,7 +835,7 @@ static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
 }
 
 static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
-             unsigned long len, unsigned long *bus_addr,
+             unsigned long len, dma_addr_t *bus_addr,
              u64 iopte_flag)
 {
         int result;
@@ -872,7 +875,7 @@ static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
                 return result;
         }
         *bus_addr = c->bus_addr + phys_addr - aligned_phys;
-        DBG("%s: va=%#lx pa=%#lx a_pa=%#lx bus=%#lx\n", __func__,
+        DBG("%s: va=%#lx pa=%#lx a_pa=%#lx bus=%#llx\n", __func__,
             virt_addr, phys_addr, aligned_phys, *bus_addr);
         c->usage_count = 1;
 
@@ -889,7 +892,7 @@ static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
  * This is the common dma unmap routine.
  */
 
-static int dma_sb_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
+static int dma_sb_unmap_area(struct ps3_dma_region *r, dma_addr_t bus_addr,
         unsigned long len)
 {
         unsigned long flags;
@@ -903,7 +906,7 @@ static int dma_sb_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
                         1 << r->page_size);
                 unsigned long aligned_len = _ALIGN_UP(len + bus_addr
                         - aligned_bus, 1 << r->page_size);
-                DBG("%s:%d: not found: bus_addr %lxh\n",
+                DBG("%s:%d: not found: bus_addr %llxh\n",
                         __func__, __LINE__, bus_addr);
                 DBG("%s:%d: not found: len %lxh\n",
                         __func__, __LINE__, len);
@@ -926,12 +929,12 @@ static int dma_sb_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr,
 }
 
 static int dma_ioc0_unmap_area(struct ps3_dma_region *r,
-                        unsigned long bus_addr, unsigned long len)
+                        dma_addr_t bus_addr, unsigned long len)
 {
         unsigned long flags;
         struct dma_chunk *c;
 
-        DBG("%s: start a=%#lx l=%#lx\n", __func__, bus_addr, len);
+        DBG("%s: start a=%#llx l=%#lx\n", __func__, bus_addr, len);
         spin_lock_irqsave(&r->chunk_list.lock, flags);
         c = dma_find_chunk(r, bus_addr, len);
 
@@ -941,7 +944,7 @@ static int dma_ioc0_unmap_area(struct ps3_dma_region *r,
                 unsigned long aligned_len = _ALIGN_UP(len + bus_addr
                                                       - aligned_bus,
                                                       1 << r->page_size);
-                DBG("%s:%d: not found: bus_addr %lxh\n",
+                DBG("%s:%d: not found: bus_addr %llxh\n",
                     __func__, __LINE__, bus_addr);
                 DBG("%s:%d: not found: len %lxh\n",
                     __func__, __LINE__, len);
@@ -975,7 +978,8 @@ static int dma_ioc0_unmap_area(struct ps3_dma_region *r,
 static int dma_sb_region_create_linear(struct ps3_dma_region *r)
 {
         int result;
-        unsigned long virt_addr, len, tmp;
+        unsigned long virt_addr, len;
+        dma_addr_t tmp;
 
         if (r->len > 16*1024*1024) {    /* FIXME: need proper fix */
                 /* force 16M dma pages for linear mapping */
@@ -1027,7 +1031,8 @@ static int dma_sb_region_create_linear(struct ps3_dma_region *r)
 static int dma_sb_region_free_linear(struct ps3_dma_region *r)
 {
         int result;
-        unsigned long bus_addr, len, lpar_addr;
+        dma_addr_t bus_addr;
+        unsigned long len, lpar_addr;
 
         if (r->offset < map.rm.size) {
                 /* Unmap (part of) 1st RAM chunk */
@@ -1072,7 +1077,7 @@ static int dma_sb_region_free_linear(struct ps3_dma_region *r)
  */
 
 static int dma_sb_map_area_linear(struct ps3_dma_region *r,
-        unsigned long virt_addr, unsigned long len, unsigned long *bus_addr,
+        unsigned long virt_addr, unsigned long len, dma_addr_t *bus_addr,
         u64 iopte_flag)
 {
         unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
@@ -1091,7 +1096,7 @@ static int dma_sb_map_area_linear(struct ps3_dma_region *r,
  */
 
 static int dma_sb_unmap_area_linear(struct ps3_dma_region *r,
-        unsigned long bus_addr, unsigned long len)
+        dma_addr_t bus_addr, unsigned long len)
 {
         return 0;
 };
@@ -1169,13 +1174,13 @@ int ps3_dma_region_free(struct ps3_dma_region *r)
 EXPORT_SYMBOL(ps3_dma_region_free);
 
 int ps3_dma_map(struct ps3_dma_region *r, unsigned long virt_addr,
-        unsigned long len, unsigned long *bus_addr,
+        unsigned long len, dma_addr_t *bus_addr,
         u64 iopte_flag)
 {
         return r->region_ops->map(r, virt_addr, len, bus_addr, iopte_flag);
 }
 
-int ps3_dma_unmap(struct ps3_dma_region *r, unsigned long bus_addr,
+int ps3_dma_unmap(struct ps3_dma_region *r, dma_addr_t bus_addr,
         unsigned long len)
 {
         return r->region_ops->unmap(r, bus_addr, len);
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 1d201782d4e5..e1c83c23b435 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -306,7 +306,7 @@ static void _dump_params(const struct os_area_params *p, const char *func,
 {
         pr_debug("%s:%d: p.boot_flag:       %u\n", func, line, p->boot_flag);
         pr_debug("%s:%d: p.num_params:      %u\n", func, line, p->num_params);
-        pr_debug("%s:%d: p.rtc_diff         %ld\n", func, line, p->rtc_diff);
+        pr_debug("%s:%d: p.rtc_diff         %lld\n", func, line, p->rtc_diff);
         pr_debug("%s:%d: p.av_multi_out     %u\n", func, line, p->av_multi_out);
         pr_debug("%s:%d: p.ctrl_button:     %u\n", func, line, p->ctrl_button);
         pr_debug("%s:%d: p.static_ip_addr:  %u.%u.%u.%u\n", func, line,
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 22063adeb38b..5e304c292f68 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -44,7 +44,7 @@ static void _dump_field(const char *hdr, u64 n, const char *func, int line)
                 s[i] = (in[i] <= 126 && in[i] >= 32) ? in[i] : '.';
         s[i] = 0;
 
-        pr_debug("%s:%d: %s%016lx : %s\n", func, line, hdr, n, s);
+        pr_debug("%s:%d: %s%016llx : %s\n", func, line, hdr, n, s);
 #endif
 }
 
@@ -70,8 +70,8 @@ static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
         _dump_field("n2: ", n2, func, line);
         _dump_field("n3: ", n3, func, line);
         _dump_field("n4: ", n4, func, line);
-        pr_debug("%s:%d: v1: %016lx\n", func, line, v1);
-        pr_debug("%s:%d: v2: %016lx\n", func, line, v2);
+        pr_debug("%s:%d: v1: %016llx\n", func, line, v1);
+        pr_debug("%s:%d: v2: %016llx\n", func, line, v2);
 }
 
 /**
@@ -149,10 +149,10 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
                 *_v2 = v2;
 
         if (v1 && !_v1)
-                pr_debug("%s:%d: warning: discarding non-zero v1: %016lx\n",
+                pr_debug("%s:%d: warning: discarding non-zero v1: %016llx\n",
                         __func__, __LINE__, v1);
         if (v2 && !_v2)
-                pr_debug("%s:%d: warning: discarding non-zero v2: %016lx\n",
+                pr_debug("%s:%d: warning: discarding non-zero v2: %016llx\n",
                         __func__, __LINE__, v2);
 
         return 0;
@@ -327,7 +327,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 return result;
         }
 
-        pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %lu, num_dev %u\n",
+        pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %llu, num_dev %u\n",
                 __func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,
                 num_dev);
 
@@ -353,7 +353,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 return result;
         }
 
-        pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %lu\n",
+        pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %llu\n",
                 __func__, __LINE__, tmp.dev_type, tmp.dev_index, tmp.dev_id);
 
         *repo = tmp;
@@ -367,7 +367,7 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo,
         struct ps3_repository_device tmp;
         unsigned int num_dev;
 
-        pr_debug(" -> %s:%u: find device by id %lu:%lu\n", __func__, __LINE__,
+        pr_debug(" -> %s:%u: find device by id %llu:%llu\n", __func__, __LINE__,
                  bus_id, dev_id);
 
         for (tmp.bus_index = 0; tmp.bus_index < 10; tmp.bus_index++) {
@@ -382,7 +382,7 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo,
                 if (tmp.bus_id == bus_id)
                         goto found_bus;
 
-                pr_debug("%s:%u: skip, bus_id %lu\n", __func__, __LINE__,
+                pr_debug("%s:%u: skip, bus_id %llu\n", __func__, __LINE__,
                          tmp.bus_id);
         }
         pr_debug(" <- %s:%u: bus not found\n", __func__, __LINE__);
@@ -416,7 +416,7 @@ found_bus:
                 if (tmp.dev_id == dev_id)
                         goto found_dev;
 
-                pr_debug("%s:%u: skip, dev_id %lu\n", __func__, __LINE__,
+                pr_debug("%s:%u: skip, dev_id %llu\n", __func__, __LINE__,
                          tmp.dev_id);
         }
         pr_debug(" <- %s:%u: dev not found\n", __func__, __LINE__);
@@ -430,7 +430,7 @@ found_dev:
                 return result;
         }
 
-        pr_debug(" <- %s:%u: found: type (%u:%u) index (%u:%u) id (%lu:%lu)\n",
+        pr_debug(" <- %s:%u: found: type (%u:%u) index (%u:%u) id (%llu:%llu)\n",
                  __func__, __LINE__, tmp.bus_type, tmp.dev_type, tmp.bus_index,
                  tmp.dev_index, tmp.bus_id, tmp.dev_id);
         *repo = tmp;
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 35f3e85cf60e..3331ccbb8d38 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -186,7 +186,7 @@ early_param("ps3flash", early_parse_ps3flash);
 #define prealloc_ps3flash_bounce_buffer()       do { } while (0)
 #endif
 
-static int ps3_set_dabr(u64 dabr)
+static int ps3_set_dabr(unsigned long dabr)
 {
         enum {DABR_USER = 1, DABR_KERNEL = 2,};
 
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index ccae3d446b98..b3c6a993f9f3 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(ps3_get_spe_id);
 
 static unsigned long get_vas_id(void)
 {
-        unsigned long id;
+        u64 id;
 
         lv1_get_logical_ppe_id(&id);
         lv1_get_virtual_address_space_id_of_ppe(id, &id);
@@ -160,14 +160,18 @@ static unsigned long get_vas_id(void)
 static int __init construct_spu(struct spu *spu)
 {
         int result;
-        unsigned long unused;
+        u64 unused;
+        u64 problem_phys;
+        u64 local_store_phys;
 
         result = lv1_construct_logical_spe(PAGE_SHIFT, PAGE_SHIFT, PAGE_SHIFT,
                 PAGE_SHIFT, PAGE_SHIFT, get_vas_id(), SPE_TYPE_LOGICAL,
-                &spu_pdata(spu)->priv2_addr, &spu->problem_phys,
-                &spu->local_store_phys, &unused,
+                &spu_pdata(spu)->priv2_addr, &problem_phys,
+                &local_store_phys, &unused,
                 &spu_pdata(spu)->shadow_addr,
                 &spu_pdata(spu)->spe_id);
+        spu->problem_phys = problem_phys;
+        spu->local_store_phys = local_store_phys;
 
         if (result) {
                 pr_debug("%s:%d: lv1_construct_logical_spe failed: %s\n",
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index ee0d22911621..58311a867851 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -182,7 +182,7 @@ int ps3_open_hv_device(struct ps3_system_bus_device *dev)
         case PS3_MATCH_ID_SYSTEM_MANAGER:
                 pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
                         __LINE__, dev->match_id);
-                pr_debug("%s:%d: bus_id: %lu\n", __func__, __LINE__,
+                pr_debug("%s:%d: bus_id: %llu\n", __func__, __LINE__,
                         dev->bus_id);
                 BUG();
                 return -EINVAL;
@@ -220,7 +220,7 @@ int ps3_close_hv_device(struct ps3_system_bus_device *dev)
         case PS3_MATCH_ID_SYSTEM_MANAGER:
                 pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
                         __LINE__, dev->match_id);
-                pr_debug("%s:%d: bus_id: %lu\n", __func__, __LINE__,
+                pr_debug("%s:%d: bus_id: %llu\n", __func__, __LINE__,
                         dev->bus_id);
                 BUG();
                 return -EINVAL;
@@ -240,7 +240,7 @@ EXPORT_SYMBOL_GPL(ps3_close_hv_device);
 static void _dump_mmio_region(const struct ps3_mmio_region* r,
         const char* func, int line)
 {
-        pr_debug("%s:%d: dev       %lu:%lu\n", func, line, r->dev->bus_id,
+        pr_debug("%s:%d: dev       %llu:%llu\n", func, line, r->dev->bus_id,
                 r->dev->dev_id);
         pr_debug("%s:%d: bus_addr  %lxh\n", func, line, r->bus_addr);
         pr_debug("%s:%d: len       %lxh\n", func, line, r->len);
@@ -250,9 +250,11 @@ static void _dump_mmio_region(const struct ps3_mmio_region* r,
 static int ps3_sb_mmio_region_create(struct ps3_mmio_region *r)
 {
         int result;
+        u64 lpar_addr;
 
         result = lv1_map_device_mmio_region(r->dev->bus_id, r->dev->dev_id,
-                r->bus_addr, r->len, r->page_size, &r->lpar_addr);
+                r->bus_addr, r->len, r->page_size, &lpar_addr);
+        r->lpar_addr = lpar_addr;
 
         if (result) {
                 pr_debug("%s:%d: lv1_map_device_mmio_region failed: %s\n",
@@ -568,7 +570,7 @@ static dma_addr_t ps3_sb_map_page(struct device *_dev, struct page *page,
 {
         struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
         int result;
-        unsigned long bus_addr;
+        dma_addr_t bus_addr;
         void *ptr = page_address(page) + offset;
 
         result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,
@@ -590,7 +592,7 @@ static dma_addr_t ps3_ioc0_map_page(struct device *_dev, struct page *page,
 {
         struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
         int result;
-        unsigned long bus_addr;
+        dma_addr_t bus_addr;
         u64 iopte_flag;
         void *ptr = page_address(page) + offset;