|
|
@@ -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,
|
|
|
};
|
Andre Detsch