From 7c4b7857842e20d72ebc422671f77af0d2b18b56 Mon Sep 17 00:00:00 2001
From: Eileen Yoon <eyn@gmx.com>
Date: Tue, 15 Aug 2023 02:16:19 +0900
Subject: [PATCH] dapf: Support reg indexing + add ISP

Also enable power if domain exists.

Signed-off-by: Eileen Yoon <eyn@gmx.com>
---
 src/dapf.c  | 39 +++++++++++++++++++++++++++++++--------
 src/dapf.h  |  2 +-
 src/proxy.c |  2 +-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/dapf.c b/src/dapf.c
index cbeb576f..332a1805 100644
--- a/src/dapf.c
+++ b/src/dapf.c
@@ -5,6 +5,7 @@
 #include "assert.h"
 #include "malloc.h"
 #include "memory.h"
+#include "pmgr.h"
 #include "string.h"
 #include "utils.h"
 
@@ -83,7 +84,7 @@ static int dapf_init_t8110(const char *path, u64 base, int node)
     return 0;
 }
 
-int dapf_init(const char *path)
+int dapf_init(const char *path, int index)
 {
     int ret;
     int dart_path[8];
@@ -93,8 +94,14 @@ int dapf_init(const char *path)
         return -1;
     }
 
+    u32 pwr;
+    if (!adt_getprop(adt, node, "clock-gates", &pwr))
+        pwr = 0;
+    if (pwr && (pmgr_adt_power_enable(path) < 0))
+        return -1;
+
     u64 base;
-    if (adt_get_reg(adt, dart_path, "reg", 1, &base, NULL) < 0) {
+    if (adt_get_reg(adt, dart_path, "reg", index, &base, NULL) < 0) {
         printf("dapf: Error getting DAPF %s base address.\n", path);
         return -1;
     }
@@ -110,28 +117,44 @@ int dapf_init(const char *path)
         return -1;
     }
 
+    if (pwr)
+        pmgr_adt_power_disable(path);
+
     if (!ret)
         printf("dapf: Initialized %s\n", path);
 
     return ret;
 }
 
-const char *dapf_paths[] = {"/arm-io/dart-aop", "/arm-io/dart-mtp", "/arm-io/dart-pmp", NULL};
+struct entry {
+    const char *path;
+    int index;
+};
+
+struct entry dapf_entries[] = {
+    {"/arm-io/dart-aop", 1},
+    {"/arm-io/dart-mtp", 1},
+    {"/arm-io/dart-pmp", 1},
+    {"/arm-io/dart-isp", 5},
+    {NULL, -1},
+};
 
 int dapf_init_all(void)
 {
     int ret = 0;
     int count = 0;
 
-    for (const char **path = dapf_paths; *path; path++) {
-        if (adt_path_offset(adt, *path) < 0)
+    struct entry *entry = dapf_entries;
+    while (entry->path != NULL) {
+        if (adt_path_offset(adt, entry->path) < 0) {
+            entry++;
             continue;
-
-        if (dapf_init(*path) < 0) {
+        }
+        if (dapf_init(entry->path, entry->index) < 0) {
             ret = -1;
         }
+        entry++;
         count += 1;
     }
-
     return ret ? ret : count;
 }
diff --git a/src/dapf.h b/src/dapf.h
index 2a7e1bf1..0d36d562 100644
--- a/src/dapf.h
+++ b/src/dapf.h
@@ -4,6 +4,6 @@
 #define DAPF_H
 
 int dapf_init_all(void);
-int dapf_init(const char *path);
+int dapf_init(const char *path, int index);
 
 #endif
diff --git a/src/proxy.c b/src/proxy.c
index fca53ca3..05dcd700 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -586,7 +586,7 @@ int proxy_process(ProxyRequest *request, ProxyReply *reply)
             reply->retval = dapf_init_all();
             break;
         case P_DAPF_INIT:
-            reply->retval = dapf_init((const char *)request->args[0]);
+            reply->retval = dapf_init((const char *)request->args[0], 1);
             break;
 
         case P_CPUFREQ_INIT: