Add Peer targets

Author: deepakala-k

libpdbg/device.c

@@ -657,6 +657,36 @@ static void dt_link_virtual(struct pdbg_target *node, struct pdbg_target *vnode)
 	vnode->vnode = node;
 }
 
+static void dt_link_peer(struct pdbg_target *node, struct pdbg_target *pnode)
+{
+	node->pnode = pnode;
+	pnode->pnode = node;
+}
+
+
+static void pdbg_targets_init_peer(struct pdbg_target *node, struct pdbg_target *root)
+{
+	struct pdbg_target *child = NULL;
+	
+	/* Skip virtual nodes */
+	if (target_is_virtual(node))
+		goto skip;
+
+	struct pdbg_target *pnode = NULL;
+	pnode = pdbg_get_peer_target(node);
+
+	if (!pnode)
+		goto skip;
+
+	dt_link_peer(node, pnode);
+
+skip:
+	list_for_each(&node->children, child, list) {
+		pdbg_targets_init_peer(child, root);
+	}
+}
+
+
 static void pdbg_targets_init_virtual(struct pdbg_target *node, struct pdbg_target *root)
 {
 	struct pdbg_target *vnode, *child = NULL;
@@ -803,6 +833,8 @@ bool pdbg_targets_init(void *fdt)
 
 	pdbg_targets_init_virtual(pdbg_dt_root, pdbg_dt_root);
 
+	pdbg_targets_init_peer(pdbg_dt_root, pdbg_dt_root);
+
 	//Close any FDs which might be still opened
 	close(dtb->system.fd);
 	close(dtb->backend.fd);

libpdbg/libpdbg.c

@@ -7,6 +7,19 @@
 static pdbg_progress_tick_t progress_tick;
 static bool pdbg_short_context = false;
 
+#define MAX_PEER_TYPE_ENTRIES 3  
+
+typedef struct {
+    char key[120];
+    char value[120];
+} peer_map_struct;
+
+peer_map_struct peer_map[MAX_PEER_TYPE_ENTRIES] = {
+    {"tbusl", "tbusl"},
+    {"core", "l3cache"},
+    {"l3cache", "core"},
+};
+
 struct pdbg_target *get_parent(struct pdbg_target *target, bool system)
 {
 	struct pdbg_target *parent;
@@ -372,33 +385,61 @@ char* extract_string_after_colon(char* input)
     return ""; 
 }
 
+
+// Function to get peer class name
+const char* get_peer_class_name(const char *key) {
+
+    for (int i = 0; i < MAX_PEER_TYPE_ENTRIES; i++) {
+        if (strcmp(peer_map[i].key, key) == 0) {
+            return peer_map[i].value;
+        }
+    }
+    return NULL;  // Key not found
+}
+
+struct pdbg_target *pdbg_get_pnode(struct pdbg_target *target)
+{
+	return target->pnode;
+}
+
 struct pdbg_target *pdbg_get_peer_target(struct pdbg_target *target)
 {
-	char tgtPeerPath[120];
-	if (!pdbg_target_get_attribute(target, "ATTR_PEER_PATH", 1, 120,
-				tgtPeerPath)) {
-					//unable to find the path
-					pdbg_log(PDBG_ERROR, "unable to find the attribute ATTR_PEER_PATH for %s\n", 
-						pdbg_target_path(target));
-	}
-	else
+	//Get the class type to find its appropriate peer
+	const char* peer_class_name = get_peer_class_name(target->class);
+
+	//As get attr is an expensive operation, check if the current class
+	//is expected to have a peer class
+	if(peer_class_name)
 	{
-		struct pdbg_target *same_class_target;
-		//The peer could only be of the same type, so look for all the targets of that type
-		pdbg_for_each_class_target(target->class, same_class_target)
+		char tgtPeerPath[120];
+		if (!pdbg_target_get_attribute(target, "ATTR_PEER_PATH", 1, 120,
+					tgtPeerPath)) {
+						//unable to find the path
+						pdbg_log(PDBG_ERROR, "unable to find the attribute ATTR_PEER_PATH for %s\n", 
+							pdbg_target_path(target));
+		}
+		else
 		{
-			char tgtPhyPath[120];
-			if (pdbg_target_get_attribute(same_class_target, "ATTR_PHYS_DEV_PATH", 1, 120,
-						tgtPhyPath)) {
-				//unable to find the path
-				if( strcmp(extract_string_after_colon(tgtPhyPath), extract_string_after_colon(tgtPeerPath)) == 0)
-				{
-					return same_class_target;
+			struct pdbg_target *traversed_target;
+			//The peer could only be of the same type, so look for all the targets of that type
+			pdbg_for_each_class_target(peer_class_name, traversed_target)
+			{
+				char tgtPhyPath[120];
+				if (pdbg_target_get_attribute(traversed_target, "ATTR_PHYS_DEV_PATH", 1, 120,
+							tgtPhyPath)) {
+					//unable to find the path
+					if( strcmp(extract_string_after_colon(tgtPhyPath), extract_string_after_colon(tgtPeerPath)) == 0)
+					{
+						return traversed_target;
+					}
 				}
 			}
+			
 		}
+		pdbg_log(PDBG_ERROR, "unable to find the peer target for %s\n", 
+			pdbg_target_path(target));
 	}
-	pdbg_log(PDBG_ERROR, "unable to find the peer target for %s\n", 
-		pdbg_target_path(target));
+	pdbg_log(PDBG_ERROR, "Peer class not identified for target class :: %s\n", 
+		target->class);
 	return NULL;
 }

libpdbg/libpdbg.h

@@ -343,6 +343,8 @@ struct pdbg_target *pdbg_target_require_parent(const char *klass, struct pdbg_ta
  */
 struct pdbg_target *pdbg_get_peer_target(struct pdbg_target *target);
 
+struct pdbg_target *pdbg_get_pnode(struct pdbg_target *target);
+
 /**
  * @brief Overwrite the given property in device tree
  * @param[in] target pdbg_target to set the property on

libpdbg/target.c

@@ -327,10 +327,10 @@ int opb_write(struct pdbg_target *opb_dt, uint32_t addr, uint32_t data)
 
 int fsi_read(struct pdbg_target *fsi_dt, uint32_t addr, uint32_t *data)
 {
+	
 	struct fsi *fsi;
 	int rc;
 	uint64_t addr64 = addr;
-
 	fsi_dt = get_class_target_addr(fsi_dt, "fsi", &addr64);
 	fsi = target_to_fsi(fsi_dt);
 
@@ -350,10 +350,8 @@ int fsi_write(struct pdbg_target *fsi_dt, uint32_t addr, uint32_t data)
 	struct fsi *fsi;
 	int rc;
 	uint64_t addr64 = addr;
-
 	fsi_dt = get_class_target_addr(fsi_dt, "fsi", &addr64);
 	fsi = target_to_fsi(fsi_dt);
-
 	if (!fsi->write) {
 		PR_ERROR("write() not implemented for the target\n");
 		return -1;
@@ -689,7 +687,6 @@ enum pdbg_target_status pdbg_target_probe(struct pdbg_target *target)
 	enum pdbg_target_status status;
 
 	assert(target);
-
 	status = pdbg_target_status(target);
 	assert(status != PDBG_TARGET_RELEASED);
 
@@ -740,7 +737,9 @@ enum pdbg_target_status pdbg_target_probe(struct pdbg_target *target)
 	/* Make sure any virtual nodes are also probed */
 	vnode = target_to_virtual(target, true);
 	if (vnode)
+	{
 		pdbg_target_probe(vnode);
+	}
 
 	/* At this point any parents must exist and have already been probed */
 	if (target->probe && target->probe(target)) {

libpdbg/target.h

@@ -62,6 +62,7 @@ struct pdbg_target {
 	struct list_node class_link;
 	void *priv;
 	struct pdbg_target *vnode;
+	struct pdbg_target *pnode;
 };
 
 struct pdbg_mfile {