13 files changed, 68 insertions, 17 deletions

diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc8544_ds.c
index 0f834d8be444..48983bc56d46 100644
--- a/arch/powerpc/platforms/85xx/mpc8544_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8544_ds.c
@@ -178,7 +178,9 @@ define_machine(mpc8544_ds) {
         .probe                  = mpc8544_ds_probe,
         .setup_arch             = mpc8544_ds_setup_arch,
         .init_IRQ               = mpc8544_ds_pic_init,
+#ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
         .get_irq                = mpic_get_irq,
         .restart                = mpc85xx_restart,
         .calibrate_decr         = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 040233472385..b46c8d50f6d1 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -350,10 +350,10 @@ define_machine(mpc85xx_cds) {
         .get_irq        = mpic_get_irq,
 #ifdef CONFIG_PCI
         .restart        = mpc85xx_cds_restart,
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #else
         .restart        = mpc85xx_restart,
 #endif
         .calibrate_decr = generic_calibrate_decr,
         .progress       = udbg_progress,
-        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 };
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 53830c9a88fd..66366a023820 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -206,5 +206,7 @@ define_machine(mpc85xx_mds) {
         .restart        = mpc85xx_restart,
         .calibrate_decr = generic_calibrate_decr,
         .progress       = udbg_progress,
+#ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
 };
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 56b27caf7a27..47aafa76c933 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -250,5 +250,7 @@ define_machine(mpc86xx_hpcn) {
         .time_init              = mpc86xx_time_init,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
+#ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
 };
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 8eb8d400ecb2..065f3b19d6c7 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -286,6 +286,7 @@ config AXON_RAM
 config FSL_ULI1575
         bool
         default n
+        select GENERIC_ISA_DMA
         help
           Supports for the ULI1575 PCIe south bridge that exists on some
           Freescale reference boards. The boards all use the ULI in pretty
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 095a30304c56..106d2921e2d9 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -236,27 +236,34 @@ static irqreturn_t
 spu_irq_class_0(int irq, void *data)
 {
         struct spu *spu;
+        unsigned long stat, mask;
 
         spu = data;
-        spu->class_0_pending = 1;
+
+        mask = spu_int_mask_get(spu, 0);
+        stat = spu_int_stat_get(spu, 0);
+        stat &= mask;
+
+        spin_lock(&spu->register_lock);
+        spu->class_0_pending |= stat;
+        spin_unlock(&spu->register_lock);
+
         spu->stop_callback(spu);
 
+        spu_int_stat_clear(spu, 0, stat);
+
         return IRQ_HANDLED;
 }
 
 int
 spu_irq_class_0_bottom(struct spu *spu)
 {
-        unsigned long stat, mask;
         unsigned long flags;
-
-        spu->class_0_pending = 0;
+        unsigned long stat;
 
         spin_lock_irqsave(&spu->register_lock, flags);
-        mask = spu_int_mask_get(spu, 0);
-        stat = spu_int_stat_get(spu, 0);
-
-        stat &= mask;
+        stat = spu->class_0_pending;
+        spu->class_0_pending = 0;
 
         if (stat & 1) /* invalid DMA alignment */
                 __spu_trap_dma_align(spu);
@@ -267,7 +274,6 @@ spu_irq_class_0_bottom(struct spu *spu)
         if (stat & 4) /* error on SPU */
                 __spu_trap_error(spu);
 
-        spu_int_stat_clear(spu, 0, stat);
         spin_unlock_irqrestore(&spu->register_lock, flags);
 
         return (stat & 0x7) ? -EIO : 0;
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 7c0668a9dcc7..0e14f532500e 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -48,10 +48,18 @@ static u64 __init find_spu_unit_number(struct device_node *spe)
 {
         const unsigned int *prop;
         int proplen;
+
+        /* new device trees should provide the physical-id attribute */
         prop = of_get_property(spe, "physical-id", &proplen);
         if (proplen == 4)
                 return (u64)*prop;
 
+        /* celleb device tree provides the unit-id */
+        prop = of_get_property(spe, "unit-id", &proplen);
+        if (proplen == 4)
+                return (u64)*prop;
+
+        /* legacy device trees provide the id in the reg attribute */
         prop = of_get_property(spe, "reg", &proplen);
         if (proplen == 4)
                 return (u64)*prop;
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c
index 07a0e815abf5..ec01214e51ee 100644
--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c
@@ -162,7 +162,8 @@ static int spu_backing_wbox_write(struct spu_context *ctx, u32 data)
                 BUG_ON(avail != (4 - slot));
                 ctx->csa.spu_mailbox_data[slot] = data;
                 ctx->csa.spu_chnlcnt_RW[29] = ++slot;
-                ctx->csa.prob.mb_stat_R = (((4 - slot) & 0xff) << 8);
+                ctx->csa.prob.mb_stat_R &= ~(0x00ff00);
+                ctx->csa.prob.mb_stat_R |= (((4 - slot) & 0xff) << 8);
                 gen_spu_event(ctx, MFC_SPU_MAILBOX_WRITTEN_EVENT);
                 ret = 4;
         } else {
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 6abdd8fe2098..958f10e90fdd 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -193,11 +193,7 @@ static int spu_reacquire_runnable(struct spu_context *ctx, u32 *npc,
         if (ret)
                 return ret;
 
-        ret = spu_run_init(ctx, npc);
-        if (ret) {
-                spu_release(ctx);
-                return ret;
-        }
+        spuctx_switch_state(ctx, SPU_UTIL_USER);
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 87d52060fec0..2eb8f92704b4 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -83,6 +83,7 @@ enum ps3_dev_type {
         PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
         PS3_DEV_TYPE_SB_GPIO = 6,
         PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,     /* 14 */
+        PS3_DEV_TYPE_STOR_DUMMY = 32,
         PS3_DEV_TYPE_NOACCESS = 255,
 };
 
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 8cc37cfea0f2..1c94824f7b63 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -349,6 +349,35 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 return result;
         }
 
+        if (tmp.bus_type == PS3_BUS_TYPE_STORAGE) {
+                /*
+                 * A storage device may show up in the repository before the
+                 * hypervisor has finished probing its type and regions
+                 */
+                unsigned int num_regions;
+
+                if (tmp.dev_type == PS3_DEV_TYPE_STOR_DUMMY) {
+                        pr_debug("%s:%u storage device not ready\n", __func__,
+                                 __LINE__);
+                        return -ENODEV;
+                }
+
+                result = ps3_repository_read_stor_dev_num_regions(tmp.bus_index,
+                                                                  tmp.dev_index,
+                                                                  &num_regions);
+                if (result) {
+                        pr_debug("%s:%d read_stor_dev_num_regions failed\n",
+                                 __func__, __LINE__);
+                        return result;
+                }
+
+                if (!num_regions) {
+                        pr_debug("%s:%u storage device has no regions yet\n",
+                                 __func__, __LINE__);
+                        return -ENODEV;
+                }
+        }
+
         result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index,
                 &tmp.dev_id);
 
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 2952b22f1c84..609945dbe394 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -63,7 +63,8 @@ int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
         x.minor = minor;
         x.rev = rev;
 
-        return (ps3_firmware_version.raw - x.raw);
+        return (ps3_firmware_version.raw > x.raw) -
+               (ps3_firmware_version.raw < x.raw);
 }
 EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
 
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index ac2a4b8a4c14..d1630a074acf 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -505,6 +505,8 @@ static void mfc_sr1_set(struct spu *spu, u64 sr1)
         static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK
                 | MFC_STATE1_PROBLEM_STATE_MASK);
 
+        sr1 |= MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+
         BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
 
         spu_pdata(spu)->cache.sr1 = sr1;