msm: ipa: add lookup table for pm client names

Adding lookup table to compare pm client names for stats module.

Change-Id: Ia54f6721fe0f1674e2c409b045c1066777bcfe82
Signed-off-by: Michael Adisumarta <[email protected]>

drivers/platform/msm/ipa/ipa_v3/ipa_pm.c

@@ -1488,11 +1488,26 @@ int ipa_pm_get_current_clk_vote(void)
 		return ipa3_ctx->app_clock_vote.cnt;
 }
 
+
+static int ipa_get_pm_hdl_from_name(char *client_name)
+{
+	int i;
+	struct pm_client_name_lookup *lookup;
+
+	for (i = 0; i < NUM_PM_CLIENT_NAMES; i++) {
+		lookup = &client_lookup_table[i];
+		if (!strcmp(lookup->name, client_name))
+			return lookup->idx_hdl;
+	}
+	return NUM_PM_CLIENT_NAMES + 2;
+}
+
 bool ipa_get_pm_client_stats_filled(struct pm_client_stats *pm_stats_ptr,
 	int pm_client_index)
 {
 	struct ipa_pm_client *client;
 	unsigned long flags;
+	int i;
 
 	client = ipa_pm_ctx->clients[pm_client_index];
 	mutex_lock(&ipa_pm_ctx->client_mutex);
@@ -1503,13 +1518,21 @@ bool ipa_get_pm_client_stats_filled(struct pm_client_stats *pm_stats_ptr,
 	spin_lock_irqsave(&client->state_lock, flags);
 	pm_stats_ptr->pm_client_group = client->group;
 	pm_stats_ptr->pm_client_state = client->state;
-	pm_stats_ptr->pm_client_hdl = pm_client_index;
+	pm_stats_ptr->pm_client_hdl = ipa_get_pm_hdl_from_name(client->name);
 	if (client->group == IPA_PM_GROUP_DEFAULT)
 		pm_stats_ptr->pm_client_bw = client->throughput;
 	else {
 		pm_stats_ptr->pm_client_bw = ipa_pm_ctx->group_tput[client->group];
 	}
 
+	pm_stats_ptr->pm_client_type = IPA_CLIENT_MAX;
+	for (i = 0; i < ipa3_get_max_num_pipes(); i++) {
+		if (ipa_pm_ctx->clients_by_pipe[i] == client) {
+			pm_stats_ptr->pm_client_type = ipa3_get_client_by_pipe(i);
+			break;
+		}
+	}
+
 	spin_unlock_irqrestore(&client->state_lock, flags);
 	mutex_unlock(&ipa_pm_ctx->client_mutex);
 	return true;

drivers/platform/msm/ipa/ipa_v3/ipa_stats.c

@@ -416,7 +416,6 @@ static int ipa_get_clock_stats(unsigned long arg)
 	pm_stats_ptr = &clock_stats->pm_clnt_stats[0];
 	for (i = 1; i < ipa_lnx_agent_ctx.alloc_info.num_pm_clients; i++) {
 		if (ipa_get_pm_client_stats_filled(pm_stats_ptr, i)) {
-			pm_stats_ptr->pm_client_type = ipa3_get_client_by_pipe(i);
 			clock_stats->active_clients++;
 			pm_stats_ptr = (struct pm_client_stats *)((uint64_t)pm_stats_ptr +
 				sizeof(struct pm_client_stats));

drivers/platform/msm/ipa/ipa_v3/ipa_stats.h

@@ -62,6 +62,27 @@
 #define SPRHD_IPA_LOG_TYPE_USB_STATS       0x00010
 #define SPRHD_IPA_LOG_TYPE_MHIP_STATS      0x00020
 
+
+/**
+ * Look up table for pm stats client names.
+ * New entry to be added when new client
+ * registers with pm
+ */
+struct pm_client_name_lookup { char *name; int idx_hdl;};
+static struct pm_client_name_lookup client_lookup_table[] = {
+	{"ODL", 1},
+	{"IPA_CLIENT_APPS_LAN_CONS", 2},
+	{"EMB MODEM", 3},
+	{"TETH MODEM", 4},
+	{"rmnet_ipa%d", 5},
+	{"USB", 6},
+	{"USB DPL", 7},
+	{"MODEM (USB RMNET)", 8},
+	{"IPA_CLIENT_APPS_WAN_CONS", 9}
+};
+
+#define NUM_PM_CLIENT_NAMES (sizeof(client_lookup_table)/sizeof(struct pm_client_name_lookup))
+
 /**
  * Every structure is associated with the underlying macro
  * for it's length and that has to be updated every time there