proxyclient: pmgr: s/clock/power/

proxyclient/experiments/aes.py

@@ -113,7 +113,7 @@ def test_custom_key(key, keygen=0):
     aes.R_CONTROL.set(STOP=1)
 
 
-p.pmgr_adt_clocks_enable("/arm-io/aes")
+p.pmgr_adt_power_enable("/arm-io/aes")
 
 dart = DART.from_adt(u, "/arm-io/dart-sio")
 dart.initialize()

proxyclient/experiments/agx_1tri.py

@@ -15,9 +15,9 @@
 from m1n1.agx import AGX
 from m1n1.agx.context import *
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
-#p.pmgr_adt_clocks_enable("/arm-io/pmp")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
+#p.pmgr_adt_power_enable("/arm-io/pmp")
 
 # [cpu0] [0xfffffe00124bf5c0] MMIO: R.4   0x204d14000 (sgx, offset 0xd14000) = 0x0
 p.read32(0x204000000 + 0xd14000)

proxyclient/experiments/agx_boot.py

@@ -14,8 +14,8 @@
 
 from m1n1.fw.agx import Agx
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 
 agx = Agx(u)
 agx.verbose = 10

proxyclient/experiments/agx_cancel.py

@@ -21,8 +21,8 @@
 
 analyzer_cpu = 1
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 p.smp_start_secondaries()
 p.mmu_init_secondary(analyzer_cpu)
 iface.dev.timeout = 42

proxyclient/experiments/agx_deps.py

@@ -21,8 +21,8 @@
 
 analyzer_cpu = 1
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 p.smp_start_secondaries()
 p.mmu_init_secondary(analyzer_cpu)
 iface.dev.timeout = 42

proxyclient/experiments/agx_parallel.py

@@ -21,8 +21,8 @@
 
 analyzer_cpu = 1
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 p.smp_start_secondaries()
 p.mmu_init_secondary(analyzer_cpu)
 iface.dev.timeout = 42

proxyclient/experiments/agx_renderframe.py

@@ -17,8 +17,8 @@
 
 from m1n1 import asm
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 
 agx = AGX(u)
 mon = RegMonitor(u, ascii=True, bufsize=0x8000000)

proxyclient/experiments/agx_tlb.py

@@ -21,8 +21,8 @@
 
 analyzer_cpu = 1
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 p.smp_start_secondaries()
 p.mmu_init_secondary(analyzer_cpu)
 iface.dev.timeout = 42

proxyclient/experiments/agx_tracetimings.py

@@ -19,8 +19,8 @@
 
 analyzer_cpu = 1
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 p.smp_start_secondaries()
 p.mmu_init_secondary(analyzer_cpu)
 iface.dev.timeout = 10

proxyclient/experiments/agx_xtest.py

@@ -14,8 +14,8 @@
 from m1n1.setup import *
 from m1n1 import asm
 
-p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-p.pmgr_adt_clocks_enable("/arm-io/sgx")
+p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+p.pmgr_adt_power_enable("/arm-io/sgx")
 
 agx = AGX(u)
 agx.mon = mon

proxyclient/experiments/aop_als.py

@@ -12,8 +12,8 @@
 from m1n1.fw.aop.ipc import *
 
 # aop nodes have no clocks described in adt for j293. it does it itself
-p.pmgr_adt_clocks_enable("/arm-io/aop")
-p.pmgr_adt_clocks_enable("/arm-io/dart-aop")
+p.pmgr_adt_power_enable("/arm-io/aop")
+p.pmgr_adt_power_enable("/arm-io/dart-aop")
 
 dart = DART.from_adt(u, "/arm-io/dart-aop",
                      iova_range=(u.adt["/arm-io/dart-aop"].vm_base, 0x1000000000))

proxyclient/experiments/aop_audio.py

@@ -20,8 +20,8 @@
 # see povik's commit #fc66046
 
 # aop nodes have no clocks described in adt for j293. it does it itself
-p.pmgr_adt_clocks_enable("/arm-io/aop")
-p.pmgr_adt_clocks_enable("/arm-io/dart-aop")
+p.pmgr_adt_power_enable("/arm-io/aop")
+p.pmgr_adt_power_enable("/arm-io/dart-aop")
 
 # Set up a secondary proxy channel so that we can stream
 # the microphone samples

proxyclient/experiments/aop_vt.py

@@ -13,8 +13,8 @@
 from m1n1.fw.aop.ipc import *
 
 # aop nodes have no clocks described in adt for j293. it does it itself
-p.pmgr_adt_clocks_enable("/arm-io/aop")
-p.pmgr_adt_clocks_enable("/arm-io/dart-aop")
+p.pmgr_adt_power_enable("/arm-io/aop")
+p.pmgr_adt_power_enable("/arm-io/dart-aop")
 
 p.usb_iodev_vuart_setup(p.iodev_whoami())
 p.iodev_set_usage(IODEV.USB_VUART, USAGE.UARTPROXY)

proxyclient/experiments/audio_capture.py

@@ -18,11 +18,11 @@
 from m1n1.hw.admac import *
 from m1n1.hw.mca import *
 
-p.pmgr_adt_clocks_enable("/arm-io/i2c2")
-p.pmgr_adt_clocks_enable("/arm-io/admac-sio")
-p.pmgr_adt_clocks_enable("/arm-io/dart-sio")
-p.pmgr_adt_clocks_enable("/arm-io/mca-switch")
-p.pmgr_adt_clocks_enable("/arm-io/mca3")
+p.pmgr_adt_power_enable("/arm-io/i2c2")
+p.pmgr_adt_power_enable("/arm-io/admac-sio")
+p.pmgr_adt_power_enable("/arm-io/dart-sio")
+p.pmgr_adt_power_enable("/arm-io/mca-switch")
+p.pmgr_adt_power_enable("/arm-io/mca3")
 
 # reset AUDIO_P
 PS_AUDIO_P = PMGR(u).regs[0].PS4[10]

proxyclient/experiments/i2c.py

@@ -111,7 +111,7 @@ def tps6598x_exec_cmd(addr, cmd, data_in, out_len):
     return i2c_read_reg(addr, 0x09, out_len)
 
 
-print("make sure to run pmgr_adt_clocks_enable for /arm-io/i2c0 before this script.")
+print("make sure to run pmgr_adt_power_enable for /arm-io/i2c0 before this script.")
 
 # apple-specific command to bring the power state to zero
 # (or any other value specified as an argument)

proxyclient/experiments/jpeg.py

@@ -337,8 +337,8 @@ def rgb2yuv(r, g, b):
     print(f"Using size {output_mem_sz:08X} for output data")
 
 # Turn on the JPEG block
-p.pmgr_adt_clocks_enable(f'/arm-io/dart-{args.which_jpeg}')
-p.pmgr_adt_clocks_enable(f'/arm-io/{args.which_jpeg}')
+p.pmgr_adt_power_enable(f'/arm-io/dart-{args.which_jpeg}')
+p.pmgr_adt_power_enable(f'/arm-io/{args.which_jpeg}')
 
 dart = DART.from_adt(u, f'/arm-io/dart-{args.which_jpeg}')
 dart.initialize()

proxyclient/experiments/ohmmeter.py

@@ -67,7 +67,7 @@ def wait_for_unplug():
         time.sleep(0.001)
 
 
-p.pmgr_adt_clocks_enable("/arm-io/i2c2")
+p.pmgr_adt_power_enable("/arm-io/i2c2")
 i2c2 = I2C(u, "/arm-io/i2c2")
 
 p.write32(0x2921f0010, 0x76a02) # invoke reset

proxyclient/experiments/prores.py

@@ -26,8 +26,8 @@ def bswp16(x):
 image_data_luma = im_data[:im_W*im_H]
 image_data_chroma = im_data[im_W*im_H:]
 
-p.pmgr_adt_clocks_enable(f'/arm-io/dart-apr0')
-p.pmgr_adt_clocks_enable(f'/arm-io/apr0')
+p.pmgr_adt_power_enable(f'/arm-io/dart-apr0')
+p.pmgr_adt_power_enable(f'/arm-io/apr0')
 
 dart = DART8110.from_adt(u, f'/arm-io/dart-apr0')
 dart.initialize()

proxyclient/experiments/scaler.py

@@ -14,8 +14,8 @@
 SCALER_ADT = '/arm-io/scaler0'
 DART_ADT = '/arm-io/dart-scaler0'
 
-p.pmgr_adt_clocks_enable(DART_ADT)
-p.pmgr_adt_clocks_enable(SCALER_ADT)
+p.pmgr_adt_power_enable(DART_ADT)
+p.pmgr_adt_power_enable(SCALER_ADT)
 
 dart = DART.from_adt(u, DART_ADT)
 dart.initialize()

proxyclient/experiments/speaker_amp.py

@@ -33,10 +33,10 @@
 inputf = open(args.file, "rb") if args.file is not None \
             else sys.stdin.buffer 
 
-p.pmgr_adt_clocks_enable("/arm-io/i2c1")
-p.pmgr_adt_clocks_enable("/arm-io/admac-sio")
-p.pmgr_adt_clocks_enable("/arm-io/dart-sio")
-p.pmgr_adt_clocks_enable("/arm-io/mca-switch")
+p.pmgr_adt_power_enable("/arm-io/i2c1")
+p.pmgr_adt_power_enable("/arm-io/admac-sio")
+p.pmgr_adt_power_enable("/arm-io/dart-sio")
+p.pmgr_adt_power_enable("/arm-io/mca-switch")
 
 # reset AUDIO_P
 PS_AUDIO_P = PMGR(u).regs[0].PS4[5]

proxyclient/hv/trace_avd.py

@@ -215,8 +215,8 @@ def save_firmware(self, path="fw.bin"):
         firmware = self.read_regs(self.base + 0x1080000, 0x10000)
         open(path, "wb").write(firmware)
 
-p.pmgr_adt_clocks_enable('/arm-io/dart-avd')
-p.pmgr_adt_clocks_enable('/arm-io/avd')
+p.pmgr_adt_power_enable('/arm-io/dart-avd')
+p.pmgr_adt_power_enable('/arm-io/avd')
 dart_tracer = DARTTracer(hv, "/arm-io/dart-avd", verbose=0)
 dart_tracer.start()
 dart = dart_tracer.dart

proxyclient/hv/trace_prores.py

@@ -4,8 +4,8 @@
 from m1n1.utils import *
 import struct
 
-p.pmgr_adt_clocks_enable('/arm-io/dart-apr0')
-p.pmgr_adt_clocks_enable('/arm-io/dart-apr1')
+p.pmgr_adt_power_enable('/arm-io/dart-apr0')
+p.pmgr_adt_power_enable('/arm-io/dart-apr1')
 
 dart0_tracer = DART8110Tracer(hv, "/arm-io/dart-apr0", verbose=1)
 dart0_tracer.start()
@@ -77,8 +77,8 @@ def w_DR_HEAD(self, val):
 
 ProResTracer = ProResTracer._reloadcls()
 
-p.pmgr_adt_clocks_enable('/arm-io/apr0')
-p.pmgr_adt_clocks_enable('/arm-io/apr1')
+p.pmgr_adt_power_enable('/arm-io/apr0')
+p.pmgr_adt_power_enable('/arm-io/apr1')
 
 tracer0 = ProResTracer(hv, '/arm-io/apr0', dart0_tracer)
 tracer0.start()

proxyclient/m1n1/agx/shim.py

@@ -81,8 +81,8 @@ def read_buf(self, ptr, size):
     def init_agx(self):
         from m1n1.setup import p, u, iface
 
-        p.pmgr_adt_clocks_enable("/arm-io/gfx-asc")
-        p.pmgr_adt_clocks_enable("/arm-io/sgx")
+        p.pmgr_adt_power_enable("/arm-io/gfx-asc")
+        p.pmgr_adt_power_enable("/arm-io/sgx")
 
         self.agx = agx = AGX(u)
 

proxyclient/m1n1/fw/ane.py

@@ -16,8 +16,8 @@ def __init__(self, u):
 		self.p = u.proxy
 
 		self.name = "ane"
-		self.p.pmgr_adt_clocks_enable(f'/arm-io/{self.name}')
-		self.p.pmgr_adt_clocks_enable(f'/arm-io/dart-{self.name}')
+		self.p.pmgr_adt_power_enable(f'/arm-io/{self.name}')
+		self.p.pmgr_adt_power_enable(f'/arm-io/dart-{self.name}')
 
 		self.base_addr = u.adt[f'arm-io/{self.name}'].get_reg(0)[0]
 		self.regs = ANERegs(self.u, self.base_addr)
@@ -64,8 +64,8 @@ def apply_static_tunables(self):  # this cost me a solid week
 			self.p.write32(self.base_addr + offset, value)
 
 	def power_up(self):
-		self.p.pmgr_adt_clocks_enable(f'/arm-io/{self.name}')
-		self.p.pmgr_adt_clocks_enable(f'/arm-io/dart-{self.name}')
+		self.p.pmgr_adt_power_enable(f'/arm-io/{self.name}')
+		self.p.pmgr_adt_power_enable(f'/arm-io/dart-{self.name}')
 		self.power_down()
 		for offset in range(0x0, 0x30+0x8, 0x8):
 			self.p.write32(self.ps_base_addr + offset, 0xf)

proxyclient/m1n1/fw/avd/__init__.py

@@ -17,8 +17,8 @@ def __init__(self, u, dev_path="/arm-io/avd", dart_path="/arm-io/dart-avd"):
         self.base = u.adt[dev_path].get_reg(0)[0] # 0x268000000
         self.node = u.adt[dev_path]
 
-        self.p.pmgr_adt_clocks_enable(dev_path)
-        self.p.pmgr_adt_clocks_enable(dart_path)
+        self.p.pmgr_adt_power_enable(dev_path)
+        self.p.pmgr_adt_power_enable(dart_path)
         dart = DART.from_adt(u, dart_path)
         dart.initialize()
         self.dart = dart

proxyclient/m1n1/fw/isp/isp_base.py

@@ -116,8 +116,8 @@ def __init__(self, u):
         self.PAGE_SIZE = 0x4000
         self.page_size = self.PAGE_SIZE
 
-        self.p.pmgr_adt_clocks_enable("/arm-io/isp")
-        self.p.pmgr_adt_clocks_enable("/arm-io/dart-isp")
+        self.p.pmgr_adt_power_enable("/arm-io/isp")
+        self.p.pmgr_adt_power_enable("/arm-io/dart-isp")
         self.dart = DART.from_adt(self.u, "/arm-io/dart-isp",
                 iova_range=(0x3a28000, 0x20000000))  # +0x4000 extra heap
         self.dart.initialize()
@@ -244,8 +244,8 @@ def sync_ttbr(self):
         self.p.write32(self.isp_dart2_base + 0x200, self.dart.dart.regs.TTBR[0, 0].val)
 
     def power_on(self):
-        self.p.pmgr_adt_clocks_enable("/arm-io/isp")
-        self.p.pmgr_adt_clocks_enable("/arm-io/dart-isp")
+        self.p.pmgr_adt_power_enable("/arm-io/isp")
+        self.p.pmgr_adt_power_enable("/arm-io/dart-isp")
 
         # power domains, low -> high
         self.ps.ISP_PS_00 = 0xf

proxyclient/m1n1/proxy.py

@@ -575,10 +575,10 @@ class M1N1Proxy(Reloadable):
     P_KBOOT_PREPARE_DT = 0x703
     P_KBOOT_SET_UBOOT = 0x704
 
-    P_PMGR_CLOCK_ENABLE = 0x800
-    P_PMGR_CLOCK_DISABLE = 0x801
-    P_PMGR_ADT_CLOCKS_ENABLE = 0x802
-    P_PMGR_ADT_CLOCKS_DISABLE = 0x803
+    P_PMGR_POWER_ENABLE = 0x800
+    P_PMGR_POWER_DISABLE = 0x801
+    P_PMGR_ADT_POWER_ENABLE = 0x802
+    P_PMGR_ADT_POWER_DISABLE = 0x803
     P_PMGR_RESET = 0x804
 
     P_IODEV_SET_USAGE = 0x900
@@ -1016,14 +1016,14 @@ def kboot_prepare_dt(self, dt_addr):
     def kboot_set_uboot(self, name, value):
         self.request(self.P_KBOOT_SET_UBOOT, name, value)
 
-    def pmgr_clock_enable(self, clkid):
-        return self.request(self.P_PMGR_CLOCK_ENABLE, clkid)
-    def pmgr_clock_disable(self, clkid):
-        return self.request(self.P_PMGR_CLOCK_DISABLE, clkid)
-    def pmgr_adt_clocks_enable(self, path):
-        return self.request(self.P_PMGR_ADT_CLOCKS_ENABLE, path)
-    def pmgr_adt_clocks_disable(self, path):
-        return self.request(self.P_PMGR_ADT_CLOCKS_DISABLE, path)
+    def pmgr_power_enable(self, clkid):
+        return self.request(self.P_PMGR_POWER_ENABLE, clkid)
+    def pmgr_power_disable(self, clkid):
+        return self.request(self.P_PMGR_POWER_DISABLE, clkid)
+    def pmgr_adt_power_enable(self, path):
+        return self.request(self.P_PMGR_ADT_POWER_ENABLE, path)
+    def pmgr_adt_power_disable(self, path):
+        return self.request(self.P_PMGR_ADT_POWER_DISABLE, path)
     def pmgr_reset(self, die, name):
         return self.request(self.P_PMGR_RESET, die, name)
 

proxyclient/m1n1/trace/isp.py

@@ -177,7 +177,7 @@ class ISPTracer(ADTDevTracer):
 
     def __init__(self, hv, dev_path, dart_dev_path, verbose):
         super().__init__(hv, dev_path, verbose)
-        hv.p.pmgr_adt_clocks_enable(dart_dev_path)
+        hv.p.pmgr_adt_power_enable(dart_dev_path)
         self.dart_tracer = DARTTracer(hv, dart_dev_path, verbose=0)
         self.dart_tracer.start()
         self.dart = self.dart_tracer.dart

proxyclient/tools/admac_stream.py

@@ -30,7 +30,7 @@
         print(f"Found {path}", file=sys.stderr)
         if "clock-gates" in node._properties:
             print(f"Enabling {path}", file=sys.stderr)
-            p.pmgr_adt_clocks_enable(path)
+            p.pmgr_adt_power_enable(path)
         break
 
 if path is None:
@@ -50,7 +50,7 @@
 
 if "clock-gates" in u.adt[dart_path]._properties:
     print(f"Enabling {dart_path}", file=sys.stderr)
-    p.pmgr_adt_clocks_enable(path)
+    p.pmgr_adt_power_enable(path)
 
 dart = DART.from_adt(u, dart_path)
 admac = ADMAC(u, admac_node.get_reg(0)[0], dart,