proxyclient: Add support for /arm-io/pmgr with 8-bit IDs

Add support for /arm-io/pmgr with 8-bit IDs, as seen on A7-A11, T2 SoCs.

Signed-off-by: Nick Chan <towinchenmi@gmail.com>

Author: asdfugil

proxyclient/experiments/mmio_sweep.py

@@ -22,7 +22,10 @@
 		print(dev.name)
 	sys.exit(0)
 
-granule = 0x4000
+if chip_id in (0x8960, 0x7000, 0x7001):
+	granule = 0x1000
+else:
+	granule = 0x4000
 
 lp = LinkedProgram(u)
 lp.load_inline_c(f'''
@@ -96,7 +99,7 @@ def describe_mask(mask, maskrange):
 
 pd_did_enable = set()
 pmgr = u.adt["/arm-io/pmgr"]
-ps_dev_by_id = {dev.id: dev for dev in pmgr.devices}
+ps_dev_by_id = {u.adt.pmgr_dev_get_id(dev): dev for dev in pmgr.devices}
 ps_deps = dict()
 ps_addrs = dict()
 
@@ -110,7 +113,7 @@ def describe_mask(mask, maskrange):
 	ps_addrs[dev.name] = addr
 	ps_deps[dev.name] = [
 		ps_dev_by_id[idx].name for idx
-		in dev.parents if idx in ps_dev_by_id
+		in u.adt.pmgr_dev_get_parents(dev) if idx in ps_dev_by_id
 	]
 
 if lp.is_t6000():

proxyclient/m1n1/adt.py

@@ -85,19 +85,27 @@
     "flags" / PMGRDeviceFlags,
     "unk1_0" / Int8ul,
     "unk1_1" / Int8ul,
-    "unk1_2" / Int8ul,
-    "parents" / Array(2, Int16ul),
+    "id1" / Int8ul,
+    "parents_un" / Union (0,
+        "u8id" / Struct(
+            "parents" / Array(2, Int8ul),
+            "unk_u8id" / Array(2, Int8ul),
+        ),
+        "u16id" / Struct (
+            "parents" / Array(2, Int16ul),
+        ),
+    ),
     "perf_idx" / Int8ul,
     "perf_block" / Int8ul,
     "psidx" / Int8ul,
     "psreg" / Int8ul,
     "unk2_0" / Int16ul,
     "pd" / Int8ul,
     "ps_cfg16" / Int8ul,
-    Const(0, Int32ul),
-    Const(0, Int32ul),
+    "unk2_1" / Int32ul,
+    "unk2_2" / Int32ul,
     "unk2_3" / Int16ul,
-    "id" / Int16ul,
+    "id2" / Int16ul,
     "unk3" / Int32ul,
     "name" / PaddedString(16, "ascii")
 ))
@@ -801,8 +809,25 @@ def create_node(self, name):
         self[name] = node
         return node
 
+    def pmgr_init(self):
+        self.pmgr_u8id = (self["/arm-io/pmgr"].devices[0].id1 != self["/arm-io/pmgr"].devices[1].id1)
+
+    def pmgr_dev_get_id(self, dev):
+        if self.pmgr_u8id:
+            return dev.id1
+        else:
+            return dev.id2
+
+    def pmgr_dev_get_parents(self, dev):
+        if self.pmgr_u8id:
+            return dev.parents_un.u8id.parents 
+        else:
+            return dev.parents_un.u16id.parents 
+
 def load_adt(data):
-    return ADTNode(ADTNodeStruct.parse(data))
+    node = ADTNode(ADTNodeStruct.parse(data))
+    node.pmgr_init()
+    return node
 
 if __name__ == "__main__":
     import sys, argparse, pathlib

proxyclient/m1n1/hv/__init__.py

@@ -1482,7 +1482,7 @@ def rh(base, off, width):
 
         pmgr = self.adt["/arm-io/pmgr"]
         dev_by_name = {dev.name: dev for dev in pmgr.devices}
-        dev_by_id = {dev.id: dev for dev in pmgr.devices}
+        dev_by_id = {self.adt.pmgr_dev_get_id(dev): dev for dev in pmgr.devices}
 
         pmgr_hooks = []
 
@@ -1491,7 +1491,7 @@ def hook_pmgr_dev(dev):
             if dev.psidx or dev.psreg:
                 addr = pmgr.get_reg(ps.reg)[0] + ps.offset + dev.psidx * 8
                 pmgr_hooks.append(addr)
-                for idx in dev.parents:
+                for idx in self.adt.pmgr_dev_get_parents(dev):
                     if idx in dev_by_id:
                         hook_pmgr_dev(dev_by_id[idx])
 

proxyclient/tools/dump_pmgr.py

@@ -11,7 +11,7 @@
 
 pmgr = dt["/arm-io/pmgr"]
 
-dev_by_id = {dev.id: dev for dev in pmgr.devices}
+dev_by_id = {dt.pmgr_dev_get_id(dev): dev for dev in pmgr.devices}
 pd_by_id = {pd.id: pd for pd in pmgr.power_domains}
 clk_by_id = {clk.id: clk for clk in pmgr.clocks}
 
@@ -47,8 +47,8 @@
 print("=== Devices ===")
 for i, dev in enumerate(pmgr.devices):
     flags = ", ".join(k for k in dev.flags if k[0] != "_" and dev.flags[k])
-    s = f" #{i:3d} {dev.name:20s} id: {dev.id:3d} psreg: {dev.psreg:2d}:{dev.psidx:2d} "
-    s += f" flags: {flags:24s} unk1_0: {dev.unk1_0} unk1_1: {dev.unk1_1} unk1_2: {dev.unk1_2} "
+    s = f" #{i:3d} {dev.name:20s} id: {u.adt.pmgr_dev_get_id(dev):3d} psreg: {dev.psreg:2d}:{dev.psidx:2d} "
+    s += f" flags: {flags:24s} unk1_0: {dev.unk1_0} unk1_1: {dev.unk1_1} id1: {dev.id1} "
     s += f" perf_reg: {dev.perf_block}:{dev.perf_idx:#04x} unk3: {dev.unk3:3d} {dev.unk2_0:2d} {dev.ps_cfg16:2d} {dev.unk2_3:3d}"
 
     if not dev.flags.no_ps:
@@ -63,10 +63,10 @@
         s += f" pd: {pd.name:20s}"
     else:
         s += "                         "
-    if any(dev.parents):
-        s += " parents: " + ", ".join(dev_by_id[idx].name if idx in dev_by_id else f"#{idx}" for idx in dev.parents if idx)
+    if any(dt.pmgr_dev_get_parents(dev)):
+        s += " parents: " + ", ".join(dev_by_id[idx].name if idx in dev_by_id else f"#{idx}" for idx in dt.pmgr_dev_get_parents(dev) if idx)
     print(s)
-    for i in dev_users.get(dev.id, []):
+    for i in dev_users.get(dt.pmgr_dev_get_id(dev), []):
         print(f"  User: {i}")
 
 print()
@@ -107,6 +107,10 @@
             print(f"  User: {j}")
 
 print()
+
+if chip_id in (0x8960, 0x7000, 0x7001, 0x8000, 0x8001, 0x8003, 0x8010, 0x8012, 0x8015):
+    exit(0)
+
 print("=== Boot clocks ===")
 for i, (freq, reg, nclk) in enumerate(zip(arm_io.clock_frequencies,
                                           arm_io.clock_frequencies_regs,

proxyclient/tools/pmgr_adt2dt.py

@@ -18,7 +18,7 @@
 
 pmgr = dt["/arm-io/pmgr"]
 
-dev_by_id = {dev.id: dev for dev in pmgr.devices}
+dev_by_id = {dt.pmgr_dev_get_id(dev): dev for dev in pmgr.devices}
 
 blocks = {}
 maxaddr = {}
@@ -83,8 +83,8 @@ def die_label(s):
         if dev.flags.critical:
             print("\t\tapple,always-on;")
 
-        if any(dev.parents):
-            domains = [f"<&{die_node('ps_'+dev_by_id[idx].name.lower())}>" for idx in dev.parents if idx]
+        if any(dt.pmgr_dev_get_parents(dev)):
+            domains = [f"<&{die_node('ps_'+dev_by_id[idx].name.lower())}>" for idx in dt.pmgr_dev_get_parents(dev) if idx]
             print(f"\t\tpower-domains = {', '.join(domains)};")
 
         print( "\t};")