14 files changed, 86 insertions, 73 deletions

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 5cc3279559a4..40e24c39ad06 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -23,7 +23,7 @@ config PPC_CELL_NATIVE
 
 config PPC_IBM_CELL_BLADE
         bool "IBM Cell Blade"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_CELL_NATIVE
         select MMIO_NVRAM
         select PPC_UDBG_16550
@@ -31,7 +31,7 @@ config PPC_IBM_CELL_BLADE
 
 config PPC_CELLEB
         bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_CELL_NATIVE
         select HAS_TXX9_SERIAL
         select PPC_UDBG_BEAT
@@ -40,9 +40,14 @@ config PPC_CELLEB
 
 config PPC_CELL_QPACE
         bool "IBM Cell - QPACE"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_CELL_COMMON
 
+config AXON_MSI
+        bool
+        depends on PPC_IBM_CELL_BLADE && PCI_MSI
+        default y
+
 menu "Cell Broadband Engine options"
         depends on PPC_CELL
 
@@ -98,7 +103,7 @@ config PPC_IBM_CELL_RESETBUTTON
 
 config PPC_IBM_CELL_POWERBUTTON
         tristate "IBM Cell Blade power button"
-        depends on PPC_IBM_CELL_BLADE && PPC_PMI && INPUT_EVDEV
+        depends on PPC_IBM_CELL_BLADE && INPUT_EVDEV
         default y
         help
           Support Powerbutton on IBM Cell blades.
@@ -118,9 +123,9 @@ config CBE_CPUFREQ
           For details, take a look at <file:Documentation/cpu-freq/>.
           If you don't have such processor, say N
 
-config CBE_CPUFREQ_PMI
-        tristate "CBE frequency scaling using PMI interface"
-        depends on CBE_CPUFREQ && PPC_PMI && EXPERIMENTAL
+config CBE_CPUFREQ_PMI_ENABLE
+        bool "CBE frequency scaling using PMI interface"
+        depends on CBE_CPUFREQ && EXPERIMENTAL
         default n
         help
           Select this, if you want to use the PMI interface
@@ -128,6 +133,20 @@ config CBE_CPUFREQ_PMI
           processor will not only be able to run at lower speed,
           but also at lower core voltage.
 
+config CBE_CPUFREQ_PMI
+        tristate
+        depends on CBE_CPUFREQ_PMI_ENABLE
+        default CBE_CPUFREQ
+
+config PPC_PMI
+        tristate
+        default y
+        depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON
+        help
+          PMI (Platform Management Interrupt) is a way to
+          communicate with the BMC (Baseboard Management Controller).
+          It is used in some IBM Cell blades.
+
 config CBE_CPUFREQ_SPU_GOVERNOR
         tristate "CBE frequency scaling based on SPU usage"
         depends on SPU_FS && CPU_FREQ
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 43eccb270301..83fafe922641 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \
                                            $(spu-manage-y) \
                                            spufs/
 
-obj-$(CONFIG_PCI_MSI)                   += axon_msi.o
+obj-$(CONFIG_AXON_MSI)                  += axon_msi.o
 
 # qpace setup
 obj-$(CONFIG_PPC_CELL_QPACE)            += qpace_setup.o
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 28c04dab2633..882e47080e74 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -237,8 +237,6 @@ extern int noirqdebug;
 
 static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
 {
-        const unsigned int cpu = smp_processor_id();
-
         spin_lock(&desc->lock);
 
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
@@ -254,7 +252,7 @@ static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
                 goto out_eoi;
         }
 
-        kstat_cpu(cpu).irqs[irq]++;
+        kstat_incr_irqs_this_cpu(irq, desc);
 
         /* Mark the IRQ currently in progress.*/
         desc->status |= IRQ_INPROGRESS;
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
index 059cad6c3f69..5c1118e31940 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -131,10 +131,10 @@ static const struct ppc_pci_io __devinitconst iowa_pci_io = {
 };
 
 static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,
-                                                unsigned long flags)
+                                  unsigned long flags, void *caller)
 {
         struct iowa_bus *bus;
-        void __iomem *res = __ioremap(addr, size, flags);
+        void __iomem *res = __ioremap_caller(addr, size, flags, caller);
         int busno;
 
         bus = iowa_pci_find(0, (unsigned long)addr);
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index ee5033eddf01..5744527a7f2a 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -74,7 +74,7 @@
 #define IOC_IO_ExcpStat_V               0x8000000000000000ul
 #define IOC_IO_ExcpStat_SPF_Mask        0x6000000000000000ul
 #define IOC_IO_ExcpStat_SPF_S           0x6000000000000000ul
-#define IOC_IO_ExcpStat_SPF_P           0x4000000000000000ul
+#define IOC_IO_ExcpStat_SPF_P           0x2000000000000000ul
 #define IOC_IO_ExcpStat_ADDR_Mask       0x00000007fffff000ul
 #define IOC_IO_ExcpStat_RW_Mask         0x0000000000000800ul
 #define IOC_IO_ExcpStat_IOID_Mask       0x00000000000007fful
@@ -247,17 +247,18 @@ static void tce_free_cell(struct iommu_table *tbl, long index, long npages)
 
 static irqreturn_t ioc_interrupt(int irq, void *data)
 {
-        unsigned long stat;
+        unsigned long stat, spf;
         struct cbe_iommu *iommu = data;
 
         stat = in_be64(iommu->xlate_regs + IOC_IO_ExcpStat);
+        spf = stat & IOC_IO_ExcpStat_SPF_Mask;
 
         /* Might want to rate limit it */
         printk(KERN_ERR "iommu: DMA exception 0x%016lx\n", stat);
         printk(KERN_ERR "  V=%d, SPF=[%c%c], RW=%s, IOID=0x%04x\n",
                !!(stat & IOC_IO_ExcpStat_V),
-               (stat & IOC_IO_ExcpStat_SPF_S) ? 'S' : ' ',
-               (stat & IOC_IO_ExcpStat_SPF_P) ? 'P' : ' ',
+               (spf == IOC_IO_ExcpStat_SPF_S) ? 'S' : ' ',
+               (spf == IOC_IO_ExcpStat_SPF_P) ? 'P' : ' ',
                (stat & IOC_IO_ExcpStat_RW_Mask) ? "Read" : "Write",
                (unsigned int)(stat & IOC_IO_ExcpStat_IOID_Mask));
         printk(KERN_ERR "  page=0x%016lx\n",
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index be84e6a16b30..c5ce02e84c8e 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -81,16 +81,6 @@ static int __init qpace_publish_devices(void)
 }
 machine_subsys_initcall(qpace, qpace_publish_devices);
 
-extern int qpace_notify(struct device *dev)
-{
-        /* set dma_ops for of_platform bus */
-        if (dev->bus && dev->bus->name
-                        && !strcmp(dev->bus->name, "of_platform"))
-                set_dma_ops(dev, &dma_direct_ops);
-
-        return 0;
-}
-
 static void __init qpace_setup_arch(void)
 {
 #ifdef CONFIG_SPU_BASE
@@ -115,9 +105,6 @@ static void __init qpace_setup_arch(void)
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif
-
-        /* set notifier function */
-        platform_notify = &qpace_notify;
 }
 
 static int __init qpace_probe(void)
@@ -141,6 +128,8 @@ define_machine(qpace) {
         .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .get_boot_time          = rtas_get_boot_time,
+        .get_rtc_time           = rtas_get_rtc_time,
+        .set_rtc_time           = rtas_set_rtc_time,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = qpace_progress,
         .init_IRQ               = iic_init_IRQ,
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index e487ad68ac11..9abd210d87c1 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -114,7 +114,7 @@ static inline void mm_needs_global_tlbie(struct mm_struct *mm)
         int nr = (NR_CPUS > 1) ? NR_CPUS : NR_CPUS + 1;
 
         /* Global TLBIE broadcast required with SPEs. */
-        __cpus_setall(&mm->cpu_vm_mask, nr);
+        bitmap_fill(cpumask_bits(mm_cpumask(mm)), nr);
 }
 
 void spu_associate_mm(struct spu *spu, struct mm_struct *mm)
diff --git a/arch/powerpc/platforms/cell/spu_fault.c b/arch/powerpc/platforms/cell/spu_fault.c
index c8b1cd42905d..95d8dadf2d87 100644
--- a/arch/powerpc/platforms/cell/spu_fault.c
+++ b/arch/powerpc/platforms/cell/spu_fault.c
@@ -39,60 +39,56 @@ int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea,
         unsigned long is_write;
         int ret;
 
-#if 0
-        if (!IS_VALID_EA(ea)) {
+        if (mm == NULL)
                 return -EFAULT;
-        }
-#endif /* XXX */
-        if (mm == NULL) {
-                return -EFAULT;
-        }
-        if (mm->pgd == NULL) {
+
+        if (mm->pgd == NULL)
                 return -EFAULT;
-        }
 
         down_read(&mm->mmap_sem);
+        ret = -EFAULT;
         vma = find_vma(mm, ea);
         if (!vma)
-                goto bad_area;
-        if (vma->vm_start <= ea)
-                goto good_area;
-        if (!(vma->vm_flags & VM_GROWSDOWN))
-                goto bad_area;
-        if (expand_stack(vma, ea))
-                goto bad_area;
-good_area:
+                goto out_unlock;
+
+        if (ea < vma->vm_start) {
+                if (!(vma->vm_flags & VM_GROWSDOWN))
+                        goto out_unlock;
+                if (expand_stack(vma, ea))
+                        goto out_unlock;
+        }
+
         is_write = dsisr & MFC_DSISR_ACCESS_PUT;
         if (is_write) {
                 if (!(vma->vm_flags & VM_WRITE))
-                        goto bad_area;
+                        goto out_unlock;
         } else {
                 if (dsisr & MFC_DSISR_ACCESS_DENIED)
-                        goto bad_area;
+                        goto out_unlock;
                 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
-                        goto bad_area;
+                        goto out_unlock;
         }
+
         ret = 0;
         *flt = handle_mm_fault(mm, vma, ea, is_write);
         if (unlikely(*flt & VM_FAULT_ERROR)) {
                 if (*flt & VM_FAULT_OOM) {
                         ret = -ENOMEM;
-                        goto bad_area;
+                        goto out_unlock;
                 } else if (*flt & VM_FAULT_SIGBUS) {
                         ret = -EFAULT;
-                        goto bad_area;
+                        goto out_unlock;
                 }
                 BUG();
         }
+
         if (*flt & VM_FAULT_MAJOR)
                 current->maj_flt++;
         else
                 current->min_flt++;
-        up_read(&mm->mmap_sem);
-        return ret;
 
-bad_area:
+out_unlock:
         up_read(&mm->mmap_sem);
-        return -EFAULT;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(spu_handle_mm_fault);
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 6653ddbed048..db5398c0339f 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -35,6 +35,8 @@ atomic_t nr_spu_contexts = ATOMIC_INIT(0);
 struct spu_context *alloc_spu_context(struct spu_gang *gang)
 {
         struct spu_context *ctx;
+        struct timespec ts;
+
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
         if (!ctx)
                 goto out;
@@ -64,6 +66,8 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
         __spu_update_sched_info(ctx);
         spu_set_timeslice(ctx);
         ctx->stats.util_state = SPU_UTIL_IDLE_LOADED;
+        ktime_get_ts(&ts);
+        ctx->stats.tstamp = timespec_to_ns(&ts);
 
         atomic_inc(&nr_spu_contexts);
         goto out;
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 0da7f2bf5ee1..d6a519e6e1c1 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -568,16 +568,17 @@ spufs_regs_write(struct file *file, const char __user *buffer,
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
         int ret;
 
-        size = min_t(ssize_t, sizeof lscsa->gprs - *pos, size);
-        if (size <= 0)
+        if (*pos >= sizeof(lscsa->gprs))
                 return -EFBIG;
+
+        size = min_t(ssize_t, sizeof(lscsa->gprs) - *pos, size);
         *pos += size;
 
         ret = spu_acquire_saved(ctx);
         if (ret)
                 return ret;
 
-        ret = copy_from_user(lscsa->gprs + *pos - size,
+        ret = copy_from_user((char *)lscsa->gprs + *pos - size,
                              buffer, size) ? -EFAULT : size;
 
         spu_release_saved(ctx);
@@ -623,10 +624,11 @@ spufs_fpcr_write(struct file *file, const char __user * buffer,
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
         int ret;
 
-        size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
-        if (size <= 0)
+        if (*pos >= sizeof(lscsa->fpcr))
                 return -EFBIG;
 
+        size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
+
         ret = spu_acquire_saved(ctx);
         if (ret)
                 return ret;
@@ -2665,7 +2667,7 @@ static const struct file_operations spufs_ctx_fops = {
         .release        = single_release,
 };
 
-struct spufs_tree_descr spufs_dir_contents[] = {
+const struct spufs_tree_descr spufs_dir_contents[] = {
         { "capabilities", &spufs_caps_fops, 0444, },
         { "mem",  &spufs_mem_fops,  0666, LS_SIZE, },
         { "regs", &spufs_regs_fops,  0666, sizeof(struct spu_reg128[128]), },
@@ -2706,7 +2708,7 @@ struct spufs_tree_descr spufs_dir_contents[] = {
         {},
 };
 
-struct spufs_tree_descr spufs_dir_nosched_contents[] = {
+const struct spufs_tree_descr spufs_dir_nosched_contents[] = {
         { "capabilities", &spufs_caps_fops, 0444, },
         { "mem",  &spufs_mem_fops,  0666, LS_SIZE, },
         { "mbox", &spufs_mbox_fops, 0444, },
@@ -2731,12 +2733,12 @@ struct spufs_tree_descr spufs_dir_nosched_contents[] = {
         {},
 };
 
-struct spufs_tree_descr spufs_dir_debug_contents[] = {
+const struct spufs_tree_descr spufs_dir_debug_contents[] = {
         { ".ctx", &spufs_ctx_fops, 0444, },
         {},
 };
 
-struct spufs_coredump_reader spufs_coredump_read[] = {
+const struct spufs_coredump_reader spufs_coredump_read[] = {
         { "regs", __spufs_regs_read, NULL, sizeof(struct spu_reg128[128])},
         { "fpcr", __spufs_fpcr_read, NULL, sizeof(struct spu_reg128) },
         { "lslr", NULL, spufs_lslr_get, 19 },
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index e309ef70a531..64f068540d0d 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -186,8 +186,9 @@ static int spufs_rmdir(struct inode *parent, struct dentry *dir)
         return simple_rmdir(parent, dir);
 }
 
-static int spufs_fill_dir(struct dentry *dir, struct spufs_tree_descr *files,
-                          int mode, struct spu_context *ctx)
+static int spufs_fill_dir(struct dentry *dir,
+                const struct spufs_tree_descr *files, int mode,
+                struct spu_context *ctx)
 {
         struct dentry *dentry, *tmp;
         int ret;
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index c58bd36b0c5b..4ddf769a64e5 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -117,6 +117,9 @@ static int spu_setup_isolated(struct spu_context *ctx)
                 cond_resched();
         }
 
+        /* clear purge status */
+        out_be64(mfc_cntl, 0);
+
         /* put the SPE in kernel mode to allow access to the loader */
         sr1 = spu_mfc_sr1_get(ctx->spu);
         sr1 &= ~MFC_STATE1_PROBLEM_STATE_MASK;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 6a0ad196aeb3..f085369301b1 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -508,7 +508,7 @@ static void __spu_add_to_rq(struct spu_context *ctx)
                 list_add_tail(&ctx->rq, &spu_prio->runq[ctx->prio]);
                 set_bit(ctx->prio, spu_prio->bitmap);
                 if (!spu_prio->nr_waiting++)
-                        __mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
+                        mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
         }
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 3bf908e2873a..ae31573bea4a 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -241,9 +241,9 @@ struct spufs_tree_descr {
         size_t size;
 };
 
-extern struct spufs_tree_descr spufs_dir_contents[];
-extern struct spufs_tree_descr spufs_dir_nosched_contents[];
-extern struct spufs_tree_descr spufs_dir_debug_contents[];
+extern const struct spufs_tree_descr spufs_dir_contents[];
+extern const struct spufs_tree_descr spufs_dir_nosched_contents[];
+extern const struct spufs_tree_descr spufs_dir_debug_contents[];
 
 /* system call implementation */
 extern struct spufs_calls spufs_calls;
@@ -358,7 +358,7 @@ struct spufs_coredump_reader {
         u64 (*get)(struct spu_context *ctx);
         size_t size;
 };
-extern struct spufs_coredump_reader spufs_coredump_read[];
+extern const struct spufs_coredump_reader spufs_coredump_read[];
 extern int spufs_coredump_num_notes;
 
 extern int spu_init_csa(struct spu_state *csa);