experiments/cpu_pstate_latencies.py: Fix stuff

Extra pstates only for J416c, drop the second pstate field sets (still
no idea what that does), fix a mask.

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

proxyclient/experiments/cpu_pstate_latencies.py

@@ -31,10 +31,10 @@
         0x211e00000,
     ]
 
-    if chip_id == 0x8112:
-        MAX_PSTATE = [7, 17]
-    else:
+    if u.adt["/chosen"].target_type == "J416c":
         MAX_PSTATE = [7, 19]
+    else:
+        MAX_PSTATE = [7, 17]
 
 code = u.malloc(0x1000)
 
@@ -98,7 +98,7 @@ def bench_cpu(idx, loops=10000000):
     return mhz
 
 def set_pstate(cluster, pstate):
-    p.mask64(CREG[cluster] + CLUSTER_PSTATE, 0x1f01f, (1<<25) | pstate | (pstate << 12))
+    p.mask64(CREG[cluster] + CLUSTER_PSTATE, 0x1f01f, (1<<25) | pstate)
 
 print()
 
@@ -110,7 +110,7 @@ def bench_latency(cluster, cpu, from_pstate, to_pstate, verbose=False):
     bench_cpu(cpu)
 
     p.smp_call(cpu, util.timelog, logbuf, LOG_ITERS)
-    psreg = (p.read64(CREG[cluster] + CLUSTER_PSTATE) & ~0x1f001f) | (1<<25) | to_pstate | (to_pstate << 12)
+    psreg = (p.read64(CREG[cluster] + CLUSTER_PSTATE) & ~0x1f01f) | (1<<25) | to_pstate
     tval = p.call(util.signal_and_write, CREG[cluster] + CLUSTER_PSTATE, psreg)
     p.smp_wait(cpu)