[Powerpc-utils-devel] [PATCH] drmgr: Correct memory affinity when adding memory

[Nathan F. <nf...@li...>]

When adding a LMB we need to update the affinity as part of the add process.
The affinity for the LMB we are adding is conveyed in the
ibm,associativity property for the device tree node of the LMB we are adding.

To clarify, a little history. Previously LMB information in the device tree
was done as a node per LMB in the form memory@XXX, and all of the information
about the LMB as properties under this node. When we moved to using the
ibm,dynamic-reconfiguration-memory node to convey LMB information the
ibm,dynamic-memory property provides an index for each LMB into the
ibm,associativity-lookup-arrays property. This is where we determine the
affinity for each LMB.

In order to update the affinity for a LMB we are adding we have to call
configure connector to get the memory@XXX node and its properties for the
LMB we are adding (yes, rtas did not change this part), find the
ibm,associativity property, then find the entry in the associativity
lookup array that matches it. We then update the ibm,dynamic-memory
property with the proper index into the associativity lookup array.

Signed-off-by: Nathan Fontenot <nf...@li...>
---
 src/drmgr/drslot_chrp_mem.c |   72 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 60 insertions(+), 12 deletions(-)

diff --git a/src/drmgr/drslot_chrp_mem.c b/src/drmgr/drslot_chrp_mem.c
index 0a5b84e..ce58c42 100644
--- a/src/drmgr/drslot_chrp_mem.c
+++ b/src/drmgr/drslot_chrp_mem.c
@@ -544,6 +544,56 @@ get_available_lmb(struct options *opts, struct dr_node *start_lmb)
 	return usable_lmb;
 }
 
+static void update_drconf_affinity(struct dr_node *lmb,
+				   struct drconf_mem *drmem)
+{
+	struct of_node *node;
+	struct of_property *prop;
+	uint32_t assoc_prop_sz;
+	uint32_t *assoc_prop;
+	uint32_t assoc_entries;
+	uint32_t assoc_entry_sz;
+	uint32_t *prop_val;
+	int i;
+
+	/* find the ibm,associativity property */
+	node = lmb->lmb_of_node;
+	for (prop = node->properties; prop; prop = prop->next) {
+		if (!strcmp(prop->name, "ibm,associativity"))
+			break;
+	}
+
+	if (!prop)
+		return;
+
+	/* find the associtivity index atrrays */
+	assoc_prop_sz = get_property_size(DYNAMIC_RECONFIG_MEM,
+					  "ibm,associativity-lookup-arrays");
+	assoc_prop = zalloc(assoc_prop_sz);
+	if (!assoc_prop)
+		return;
+
+	get_property(DYNAMIC_RECONFIG_MEM, "ibm,associativity-lookup-arrays",
+		     assoc_prop, assoc_prop_sz);
+
+	assoc_entries = be32toh(assoc_prop[0]);
+	assoc_entry_sz = be32toh(assoc_prop[1]);
+
+	prop_val = (uint32_t *)prop->value;
+	for (i = 0; i < assoc_entries; i++) {
+		if (memcmp(&assoc_prop[(i * assoc_entry_sz) + 2], &prop_val[1],
+			   assoc_entry_sz * sizeof(uint32_t)))
+			continue;
+
+		/* found it */
+		drmem->assoc_index = htobe32(i);
+		break;
+	}
+
+	free(assoc_prop);
+	return;
+}
+	
 /**
  * update_drconf_node
  * @brief update the ibm,dynamic-memory property for added/removed memory
@@ -580,10 +630,12 @@ update_drconf_node(struct dr_node *lmb, struct lmb_list_head *lmb_list,
 			continue;
 		}
 
-		if (action == ADD)
+		if (action == ADD) {
 			drmem->flags |= be32toh(DRMEM_ASSIGNED);
-		else
+			update_drconf_affinity(lmb, drmem);
+		} else {
 			drmem->flags &= be32toh(~DRMEM_ASSIGNED);
+		}
 
 		break;
 	}
@@ -660,6 +712,12 @@ add_device_tree_lmb(struct dr_node *lmb, struct lmb_list_head *lmb_list)
 {
         int rc;
 
+	lmb->lmb_of_node = configure_connector(lmb->drc_index);
+	if (lmb->lmb_of_node == NULL) {
+		release_drc(lmb->drc_index, MEM_DEV);
+		return -1;
+	}
+	
 	if (lmb_list->drconf_buf) {
 		errno = 0;
 		rc = update_drconf_node(lmb, lmb_list, ADD);
@@ -672,11 +730,6 @@ add_device_tree_lmb(struct dr_node *lmb, struct lmb_list_head *lmb_list)
 			 */
 			say(DEBUG, "Assuming older kernel, trying to add "
 			    "node\n");
-			lmb->lmb_of_node = configure_connector(lmb->drc_index);
-			if (lmb->lmb_of_node == NULL) {
-				release_drc(lmb->drc_index, MEM_DEV);
-				return -1;
-			}
 
 			sprintf(lmb->ofdt_path, "%s/%s", OFDT_BASE,
 				lmb->lmb_of_node->name);
@@ -687,11 +740,6 @@ add_device_tree_lmb(struct dr_node *lmb, struct lmb_list_head *lmb_list)
 		}
 	} else {
 		/* Add the new nodes to the device tree */
-		lmb->lmb_of_node = configure_connector(lmb->drc_index);
-		if (lmb->lmb_of_node == NULL) {
-			release_drc(lmb->drc_index, MEM_DEV);
-			return -1;
-		}
 		sprintf(lmb->ofdt_path, "%s/%s", OFDT_BASE,
 			lmb->lmb_of_node->name);
 		rc = add_device_tree_nodes(OFDT_BASE, lmb->lmb_of_node);