9 files changed, 194 insertions, 167 deletions

diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index b39cb52c6fb9..2c8e641a739b 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -106,7 +106,6 @@ static struct of_device_id mpc832x_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .type = "qe", },
-        { .type = "mdio", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index b2b28a44738c..090906170a41 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -70,7 +70,6 @@ static struct of_device_id mpc832x_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .type = "qe", },
-        { .type = "mdio", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 0e615fd65c1f..84b58934aafd 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -113,7 +113,6 @@ static struct of_device_id mpc836x_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .type = "qe", },
-        { .type = "mdio", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index e8003bf00c9a..be25ecd911ba 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -142,7 +142,6 @@ static struct of_device_id mpc85xx_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .type = "qe", },
-        { .type = "mdio", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 90124228b8f4..095a30304c56 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -36,7 +36,6 @@
 #include <asm/spu_priv1.h>
 #include <asm/xmon.h>
 #include <asm/prom.h>
-#include "spu_priv1_mmio.h"
 
 const struct spu_management_ops *spu_management_ops;
 EXPORT_SYMBOL_GPL(spu_management_ops);
@@ -636,138 +635,6 @@ static ssize_t spu_stat_show(struct sys_device *sysdev, char *buf)
 
 static SYSDEV_ATTR(stat, 0644, spu_stat_show, NULL);
 
-/* Hardcoded affinity idxs for QS20 */
-#define SPES_PER_BE 8
-static int QS20_reg_idxs[SPES_PER_BE] =   { 0, 2, 4, 6, 7, 5, 3, 1 };
-static int QS20_reg_memory[SPES_PER_BE] = { 1, 1, 0, 0, 0, 0, 0, 0 };
-
-static struct spu *spu_lookup_reg(int node, u32 reg)
-{
-        struct spu *spu;
-
-        list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
-                if (*(u32 *)get_property(spu_devnode(spu), "reg", NULL) == reg)
-                        return spu;
-        }
-        return NULL;
-}
-
-static void init_aff_QS20_harcoded(void)
-{
-        int node, i;
-        struct spu *last_spu, *spu;
-        u32 reg;
-
-        for (node = 0; node < MAX_NUMNODES; node++) {
-                last_spu = NULL;
-                for (i = 0; i < SPES_PER_BE; i++) {
-                        reg = QS20_reg_idxs[i];
-                        spu = spu_lookup_reg(node, reg);
-                        if (!spu)
-                                continue;
-                        spu->has_mem_affinity = QS20_reg_memory[reg];
-                        if (last_spu)
-                                list_add_tail(&spu->aff_list,
-                                                &last_spu->aff_list);
-                        last_spu = spu;
-                }
-        }
-}
-
-static int of_has_vicinity(void)
-{
-        struct spu* spu;
-
-        spu = list_entry(cbe_spu_info[0].spus.next, struct spu, cbe_list);
-        return of_find_property(spu_devnode(spu), "vicinity", NULL) != NULL;
-}
-
-static struct spu *aff_devnode_spu(int cbe, struct device_node *dn)
-{
-        struct spu *spu;
-
-        list_for_each_entry(spu, &cbe_spu_info[cbe].spus, cbe_list)
-                if (spu_devnode(spu) == dn)
-                        return spu;
-        return NULL;
-}
-
-static struct spu *
-aff_node_next_to(int cbe, struct device_node *target, struct device_node *avoid)
-{
-        struct spu *spu;
-        const phandle *vic_handles;
-        int lenp, i;
-
-        list_for_each_entry(spu, &cbe_spu_info[cbe].spus, cbe_list) {
-                if (spu_devnode(spu) == avoid)
-                        continue;
-                vic_handles = get_property(spu_devnode(spu), "vicinity", &lenp);
-                for (i=0; i < (lenp / sizeof(phandle)); i++) {
-                        if (vic_handles[i] == target->linux_phandle)
-                                return spu;
-                }
-        }
-        return NULL;
-}
-
-static void init_aff_fw_vicinity_node(int cbe)
-{
-        struct spu *spu, *last_spu;
-        struct device_node *vic_dn, *last_spu_dn;
-        phandle avoid_ph;
-        const phandle *vic_handles;
-        const char *name;
-        int lenp, i, added, mem_aff;
-
-        last_spu = list_entry(cbe_spu_info[cbe].spus.next, struct spu, cbe_list);
-        avoid_ph = 0;
-        for (added = 1; added < cbe_spu_info[cbe].n_spus; added++) {
-                last_spu_dn = spu_devnode(last_spu);
-                vic_handles = get_property(last_spu_dn, "vicinity", &lenp);
-
-                for (i = 0; i < (lenp / sizeof(phandle)); i++) {
-                        if (vic_handles[i] == avoid_ph)
-                                continue;
-
-                        vic_dn = of_find_node_by_phandle(vic_handles[i]);
-                        if (!vic_dn)
-                                continue;
-
-                        name = get_property(vic_dn, "name", NULL);
-                        if (strcmp(name, "spe") == 0) {
-                                spu = aff_devnode_spu(cbe, vic_dn);
-                                avoid_ph = last_spu_dn->linux_phandle;
-                        }
-                        else {
-                                mem_aff = strcmp(name, "mic-tm") == 0;
-                                spu = aff_node_next_to(cbe, vic_dn, last_spu_dn);
-                                if (!spu)
-                                        continue;
-                                if (mem_aff) {
-                                        last_spu->has_mem_affinity = 1;
-                                        spu->has_mem_affinity = 1;
-                                }
-                                avoid_ph = vic_dn->linux_phandle;
-                        }
-                        list_add_tail(&spu->aff_list, &last_spu->aff_list);
-                        last_spu = spu;
-                        break;
-                }
-        }
-}
-
-static void init_aff_fw_vicinity(void)
-{
-        int cbe;
-
-        /* sets has_mem_affinity for each spu, as long as the
-         * spu->aff_list list, linking each spu to its neighbors
-         */
-        for (cbe = 0; cbe < MAX_NUMNODES; cbe++)
-                init_aff_fw_vicinity_node(cbe);
-}
-
 static int __init init_spu_base(void)
 {
         int i, ret = 0;
@@ -811,13 +678,7 @@ static int __init init_spu_base(void)
         mutex_unlock(&spu_full_list_mutex);
         spu_add_sysdev_attr(&attr_stat);
 
-        if (of_has_vicinity()) {
-                init_aff_fw_vicinity();
-        } else {
-                long root = of_get_flat_dt_root();
-                if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
-                        init_aff_QS20_harcoded();
-        }
+        spu_init_affinity();
 
         return 0;
 
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 75ed50fcc3db..5eb88346181a 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -361,8 +361,171 @@ static int of_destroy_spu(struct spu *spu)
         return 0;
 }
 
+/* Hardcoded affinity idxs for qs20 */
+#define QS20_SPES_PER_BE 8
+static int qs20_reg_idxs[QS20_SPES_PER_BE] =   { 0, 2, 4, 6, 7, 5, 3, 1 };
+static int qs20_reg_memory[QS20_SPES_PER_BE] = { 1, 1, 0, 0, 0, 0, 0, 0 };
+
+static struct spu *spu_lookup_reg(int node, u32 reg)
+{
+        struct spu *spu;
+        u32 *spu_reg;
+
+        list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
+                spu_reg = (u32*)of_get_property(spu_devnode(spu), "reg", NULL);
+                if (*spu_reg == reg)
+                        return spu;
+        }
+        return NULL;
+}
+
+static void init_affinity_qs20_harcoded(void)
+{
+        int node, i;
+        struct spu *last_spu, *spu;
+        u32 reg;
+
+        for (node = 0; node < MAX_NUMNODES; node++) {
+                last_spu = NULL;
+                for (i = 0; i < QS20_SPES_PER_BE; i++) {
+                        reg = qs20_reg_idxs[i];
+                        spu = spu_lookup_reg(node, reg);
+                        if (!spu)
+                                continue;
+                        spu->has_mem_affinity = qs20_reg_memory[reg];
+                        if (last_spu)
+                                list_add_tail(&spu->aff_list,
+                                                &last_spu->aff_list);
+                        last_spu = spu;
+                }
+        }
+}
+
+static int of_has_vicinity(void)
+{
+        struct spu* spu;
+
+        spu = list_first_entry(&cbe_spu_info[0].spus, struct spu, cbe_list);
+        return of_find_property(spu_devnode(spu), "vicinity", NULL) != NULL;
+}
+
+static struct spu *devnode_spu(int cbe, struct device_node *dn)
+{
+        struct spu *spu;
+
+        list_for_each_entry(spu, &cbe_spu_info[cbe].spus, cbe_list)
+                if (spu_devnode(spu) == dn)
+                        return spu;
+        return NULL;
+}
+
+static struct spu *
+neighbour_spu(int cbe, struct device_node *target, struct device_node *avoid)
+{
+        struct spu *spu;
+        struct device_node *spu_dn;
+        const phandle *vic_handles;
+        int lenp, i;
+
+        list_for_each_entry(spu, &cbe_spu_info[cbe].spus, cbe_list) {
+                spu_dn = spu_devnode(spu);
+                if (spu_dn == avoid)
+                        continue;
+                vic_handles = of_get_property(spu_dn, "vicinity", &lenp);
+                for (i=0; i < (lenp / sizeof(phandle)); i++) {
+                        if (vic_handles[i] == target->linux_phandle)
+                                return spu;
+                }
+        }
+        return NULL;
+}
+
+static void init_affinity_node(int cbe)
+{
+        struct spu *spu, *last_spu;
+        struct device_node *vic_dn, *last_spu_dn;
+        phandle avoid_ph;
+        const phandle *vic_handles;
+        const char *name;
+        int lenp, i, added;
+
+        last_spu = list_first_entry(&cbe_spu_info[cbe].spus, struct spu,
+                                                                cbe_list);
+        avoid_ph = 0;
+        for (added = 1; added < cbe_spu_info[cbe].n_spus; added++) {
+                last_spu_dn = spu_devnode(last_spu);
+                vic_handles = of_get_property(last_spu_dn, "vicinity", &lenp);
+
+                /*
+                 * Walk through each phandle in vicinity property of the spu
+                 * (tipically two vicinity phandles per spe node)
+                 */
+                for (i = 0; i < (lenp / sizeof(phandle)); i++) {
+                        if (vic_handles[i] == avoid_ph)
+                                continue;
+
+                        vic_dn = of_find_node_by_phandle(vic_handles[i]);
+                        if (!vic_dn)
+                                continue;
+
+                        /* a neighbour might be spe, mic-tm, or bif0 */
+                        name = of_get_property(vic_dn, "name", NULL);
+                        if (!name)
+                                continue;
+
+                        if (strcmp(name, "spe") == 0) {
+                                spu = devnode_spu(cbe, vic_dn);
+                                avoid_ph = last_spu_dn->linux_phandle;
+                        } else {
+                                /*
+                                 * "mic-tm" and "bif0" nodes do not have
+                                 * vicinity property. So we need to find the
+                                 * spe which has vic_dn as neighbour, but
+                                 * skipping the one we came from (last_spu_dn)
+                                 */
+                                spu = neighbour_spu(cbe, vic_dn, last_spu_dn);
+                                if (!spu)
+                                        continue;
+                                if (!strcmp(name, "mic-tm")) {
+                                        last_spu->has_mem_affinity = 1;
+                                        spu->has_mem_affinity = 1;
+                                }
+                                avoid_ph = vic_dn->linux_phandle;
+                        }
+
+                        list_add_tail(&spu->aff_list, &last_spu->aff_list);
+                        last_spu = spu;
+                        break;
+                }
+        }
+}
+
+static void init_affinity_fw(void)
+{
+        int cbe;
+
+        for (cbe = 0; cbe < MAX_NUMNODES; cbe++)
+                init_affinity_node(cbe);
+}
+
+static int __init init_affinity(void)
+{
+        if (of_has_vicinity()) {
+                init_affinity_fw();
+        } else {
+                long root = of_get_flat_dt_root();
+                if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
+                        init_affinity_qs20_harcoded();
+                else
+                        printk("No affinity configuration found");
+        }
+
+        return 0;
+}
+
 const struct spu_management_ops spu_management_of_ops = {
         .enumerate_spus = of_enumerate_spus,
         .create_spu = of_create_spu,
         .destroy_spu = of_destroy_spu,
+        .init_affinity = init_affinity,
 };
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index d4fc74f7bb15..67144d1d1405 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -1,5 +1,5 @@
 config PPC_PS3
-        bool "Sony PS3 (incomplete)"
+        bool "Sony PS3"
         depends on PPC_MULTIPLATFORM && PPC64
         select PPC_CELL
         select USB_ARCH_HAS_OHCI
@@ -10,10 +10,10 @@ config PPC_PS3
         select MEMORY_HOTPLUG
         help
           This option enables support for the Sony PS3 game console
-          and other platforms using the PS3 hypervisor.
-          Support for this platform is not yet complete, so
-          enabling this will not result in a bootable kernel on a
-          PS3 system.
+          and other platforms using the PS3 hypervisor.  Enabling this
+          option will allow building otheros.bld, a kernel image suitable
+          for programming into flash memory, and vmlinux, a kernel image
+          suitable for loading via kexec.
 
 menu "PS3 Platform Options"
         depends on PPC_PS3
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index 825ebb2cbc2a..e23a5a874ad3 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -273,55 +273,58 @@ static int ps3stor_wait_for_completion(u64 dev_id, u64 tag,
 
 static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
 {
+        int error = -ENODEV;
         int result;
         const u64 notification_dev_id = (u64)-1LL;
         const unsigned int timeout = HZ;
         u64 lpar;
         u64 tag;
+        void *buf;
+        enum ps3_notify_type {
+                notify_device_ready = 0,
+                notify_region_probe = 1,
+                notify_region_update = 2,
+        };
         struct {
                 u64 operation_code;     /* must be zero */
-                u64 event_mask;         /* 1 = device ready */
+                u64 event_mask;         /* OR of 1UL << enum ps3_notify_type */
         } *notify_cmd;
         struct {
-                u64 event_type;         /* notify_device_ready */
+                u64 event_type;         /* enum ps3_notify_type */
                 u64 bus_id;
                 u64 dev_id;
                 u64 dev_type;
                 u64 dev_port;
         } *notify_event;
-        enum {
-                notify_device_ready = 1
-        };
 
         pr_debug(" -> %s:%u: bus_id %u, dev_id %u, dev_type %u\n", __func__,
                  __LINE__, repo->bus_id, repo->dev_id, repo->dev_type);
 
-        notify_cmd = kzalloc(512, GFP_KERNEL);
-        notify_event = (void *)notify_cmd;
-        if (!notify_cmd)
+        buf = kzalloc(512, GFP_KERNEL);
+        if (!buf)
                 return -ENOMEM;
 
-        lpar = ps3_mm_phys_to_lpar(__pa(notify_cmd));
+        lpar = ps3_mm_phys_to_lpar(__pa(buf));
+        notify_cmd = buf;
+        notify_event = buf;
 
         result = lv1_open_device(repo->bus_id, notification_dev_id, 0);
         if (result) {
                 printk(KERN_ERR "%s:%u: lv1_open_device %s\n", __func__,
                        __LINE__, ps3_result(result));
-                result = -ENODEV;
                 goto fail_free;
         }
 
         /* Setup and write the request for device notification. */
 
-        notify_cmd->operation_code = 0; /* must be zero */
-        notify_cmd->event_mask = 0x01;  /* device ready */
+        notify_cmd->operation_code = 0; /* must be zero */
+        notify_cmd->event_mask = 1UL << notify_region_probe;
 
         result = lv1_storage_write(notification_dev_id, 0, 0, 1, 0, lpar,
                                    &tag);
         if (result) {
                 printk(KERN_ERR "%s:%u: write failed %s\n", __func__, __LINE__,
                        ps3_result(result));
-                result = -ENODEV;
                 goto fail_close;
         }
 
@@ -332,13 +335,11 @@ static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
         if (result) {
                 printk(KERN_ERR "%s:%u: write not completed %s\n", __func__,
                        __LINE__, ps3_result(result));
-                result = -ENODEV;
                 goto fail_close;
         }
 
         /* Loop here processing the requested notification events. */
 
-        result = -ENODEV;
         while (1) {
                 memset(notify_event, 0, sizeof(*notify_event));
 
@@ -358,7 +359,7 @@ static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
                         break;
                 }
 
-                if (notify_event->event_type != notify_device_ready ||
+                if (notify_event->event_type != notify_region_probe ||
                     notify_event->bus_id != repo->bus_id) {
                         pr_debug("%s:%u: bad notify_event: event %lu, "
                                  "dev_id %lu, dev_type %lu\n",
@@ -386,9 +387,9 @@ static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
 fail_close:
         lv1_close_device(repo->bus_id, notification_dev_id);
 fail_free:
-        kfree(notify_cmd);
+        kfree(buf);
         pr_debug(" <- %s:%u\n", __func__, __LINE__);
-        return result;
+        return error;
 }
 
 static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 502d80ed982b..ac2a4b8a4c14 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -414,10 +414,16 @@ static int __init ps3_enumerate_spus(int (*fn)(void *data))
         return num_resource_id;
 }
 
+static int ps3_init_affinity(void)
+{
+        return 0;
+}
+
 const struct spu_management_ops spu_management_ps3_ops = {
         .enumerate_spus = ps3_enumerate_spus,
         .create_spu = ps3_create_spu,
         .destroy_spu = ps3_destroy_spu,
+        .init_affinity = ps3_init_affinity,
 };
 
 /* spu_priv1_ops */