1 files changed, 12 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index a8fa1eeeb174..269dda4fd0b4 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -111,7 +111,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
 extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
 static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
 {
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s, %lx, %lx\n", __FUNCTION__, dsisr, ea);
 
         /* Handle kernel space hash faults immediately.
            User hash faults need to be deferred to process context. */
@@ -168,7 +168,7 @@ static int __spu_trap_halt(struct spu *spu)
 static int __spu_trap_tag_group(struct spu *spu)
 {
         pr_debug("%s\n", __FUNCTION__);
-        /* wake_up(&spu->dma_wq); */
+        spu->mfc_callback(spu);
         return 0;
 }
 
@@ -242,6 +242,8 @@ spu_irq_class_1(int irq, void *data, struct pt_regs *regs)
                 spu_mfc_dsisr_set(spu, 0ul);
         spu_int_stat_clear(spu, 1, stat);
         spin_unlock(&spu->register_lock);
+        pr_debug("%s: %lx %lx %lx %lx\n", __FUNCTION__, mask, stat,
+                        dar, dsisr);
 
         if (stat & 1) /* segment fault */
                 __spu_trap_data_seg(spu, dar);
@@ -484,14 +486,13 @@ int spu_irq_class_1_bottom(struct spu *spu)
 
         ea = spu->dar;
         dsisr = spu->dsisr;
-        if (dsisr & MFC_DSISR_PTE_NOT_FOUND) {
+        if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) {
                 access = (_PAGE_PRESENT | _PAGE_USER);
                 access |= (dsisr & MFC_DSISR_ACCESS_PUT) ? _PAGE_RW : 0UL;
                 if (hash_page(ea, access, 0x300) != 0)
                         error |= CLASS1_ENABLE_STORAGE_FAULT_INTR;
         }
-        if ((error & CLASS1_ENABLE_STORAGE_FAULT_INTR) ||
-            (dsisr & MFC_DSISR_ACCESS_DENIED)) {
+        if (error & CLASS1_ENABLE_STORAGE_FAULT_INTR) {
                 if ((ret = spu_handle_mm_fault(spu)) != 0)
                         error |= CLASS1_ENABLE_STORAGE_FAULT_INTR;
                 else
@@ -568,6 +569,11 @@ static int __init spu_map_device(struct spu *spu, struct device_node *spe)
         if (!spu->local_store)
                 goto out;
 
+        prop = get_property(spe, "problem", NULL);
+        if (!prop)
+                goto out_unmap;
+        spu->problem_phys = *(unsigned long *)prop;
+
         spu->problem= map_spe_prop(spe, "problem");
         if (!spu->problem)
                 goto out_unmap;
@@ -632,6 +638,7 @@ static int __init create_spu(struct device_node *spe)
         spu->ibox_callback = NULL;
         spu->wbox_callback = NULL;
         spu->stop_callback = NULL;
+        spu->mfc_callback = NULL;
 
         mutex_lock(&spu_mutex);
         spu->number = number++;