quick_dump: pass register offsets as int

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[imre: fix s/regi/intreg/ typo]
Reviewed-by: Imre Deak <imre.deak@intel.com>
This commit is contained in:
Ville Syrjälä 2014-05-28 18:32:39 +03:00 committed by Imre Deak
parent 76bc5fdf46
commit 4e696ff8c9
2 changed files with 10 additions and 14 deletions

View File

@ -36,13 +36,13 @@ def parse_file(file):
if ignore_line(line): if ignore_line(line):
continue continue
register = ast.literal_eval(line) register = ast.literal_eval(line)
if register[2] == 'DPIO':
val = reg.dpio_read(register[1], 0)
elif register[2] == 'FLISDSI':
val = reg.flisdsi_read(register[1])
else:
val = reg.read(register[1])
intreg = int(register[1], 16) intreg = int(register[1], 16)
if register[2] == 'FLISDSI':
val = reg.flisdsi_read(intreg)
elif register[2] == 'DPIO':
val = reg.dpio_read(intreg, 0)
else:
val = reg.read(intreg)
print('{0:#010x} | {1:<28} | {2:#010x}'.format(intreg, register[0], val)) print('{0:#010x} | {1:<28} | {2:#010x}'.format(intreg, register[0], val))
print('') print('')

View File

@ -3,7 +3,6 @@
import chipset import chipset
def read(reg): def read(reg):
reg = int(reg, 16)
val = chipset.intel_register_read(reg) val = chipset.intel_register_read(reg)
return val return val
@ -12,15 +11,15 @@ def write(reg, val):
def gen6_forcewake_get(): def gen6_forcewake_get():
write(0xa18c, 0x1) write(0xa18c, 0x1)
read("0xa180") read(0xa180)
def mt_forcewake_get(): def mt_forcewake_get():
write(0xa188, 0x10001) write(0xa188, 0x10001)
read("0xa180") read(0xa180)
def vlv_forcewake_get(): def vlv_forcewake_get():
write(0x1300b0, 0x10001) write(0x1300b0, 0x10001)
read("0x1300b4") read(0x1300b4)
# don't be clever, just try all possibilities # don't be clever, just try all possibilities
def get_wake(): def get_wake():
@ -29,15 +28,12 @@ def get_wake():
vlv_forcewake_get() vlv_forcewake_get()
def dpio_read(reg, phy): def dpio_read(reg, phy):
reg = int(reg, 16)
phy = int(phy) phy = int(phy)
val = chipset.intel_dpio_reg_read(reg, phy) val = chipset.intel_dpio_reg_read(reg, phy)
return val return val
def flisdsi_read(reg): def flisdsi_read(reg):
reg = int(reg, 16)
val = chipset.intel_flisdsi_reg_read(reg) val = chipset.intel_flisdsi_reg_read(reg)
return val return val
@ -62,5 +58,5 @@ if __name__ == "__main__":
sys.exit() sys.exit()
reg = sys.argv[1] reg = sys.argv[1]
print(hex(read(reg))) print(hex(read(int(reg,16))))
chipset.intel_register_access_fini() chipset.intel_register_access_fini()