diff --git a/linux-ramdump-parser-v2/parsers/mdpinfo.py b/linux-ramdump-parser-v2/parsers/mdpinfo.py
old mode 100755
new mode 100644
index a8f0e7d339099a5054eeafc5b4d5fe789101bfa8..beea4872a3cbec29635163a12ac9d0e18075d077
--- a/linux-ramdump-parser-v2/parsers/mdpinfo.py
+++ b/linux-ramdump-parser-v2/parsers/mdpinfo.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, The Linux Foundation. All rights reserved.
+# Copyright (c) 2016, 2018 The Linux Foundation. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 and
@@ -26,7 +26,6 @@ class MdssDbgBase(Struct):
'reg_dump': Struct.get_pointer,
}
-
class MdssDbgXlog(Struct):
def get_dbgbase_arr(self, key):
arr = self.get_array_ptrs(key)
@@ -37,8 +36,16 @@ class MdssDbgXlog(Struct):
'blk_arr': get_dbgbase_arr,
}
+class SdeDbgBase(Struct):
+ _struct_name = "struct sde_dbg_base"
+ _fields = {
+ 'evtlog': Struct.get_pointer,
+ 'reg_base_list': Struct.get_pointer,
+ 'enable_reg_dump' : Struct.get_u32,
+ 'panic_on_err' : Struct.get_u32,
+ }
-class RangeDumpNode(Struct):
+class RangeDumpFbNode(Struct):
def get_offset(self, key):
return Struct(self.ramdump, self.get_address(key),
struct_name="struct dump_offset",
@@ -53,7 +60,25 @@ class RangeDumpNode(Struct):
'range_name': Struct.get_cstring,
'reg_dump': Struct.get_pointer,
}
+class RangeDumpSdeNode(Struct):
+ def get_offset(self, key):
+ return Struct(self.ramdump, self.get_address(key),
+ struct_name="struct sde_dbg_reg_offset",
+ fields={
+ 'start': Struct.get_u32,
+ 'end': Struct.get_u32,
+ })
+ _struct_name = "struct sde_dbg_reg_range"
+ _fields = {
+ 'offset': get_offset,
+ 'range_name': Struct.get_cstring,
+ 'reg_dump': Struct.get_pointer,
+ }
+
+def get_u64(self, key):
+ address = self.get_address(key)
+ return self.ramdump.read_u64(address)
@register_parser('--print-mdpinfo', 'print mdp info')
class MDPinfo(RamParser):
@@ -80,7 +105,7 @@ class MDPinfo(RamParser):
addr += 16
def print_range(self, blk, node):
- rng = RangeDumpNode(self.ramdump, node)
+ rng = RangeDumpFbNode(self.ramdump, node)
if (rng.offset.start > rng.offset.end) or (rng.offset.end == 0):
print_out_str("Invalid offsets (%d, %d) for range: %s" %
@@ -100,37 +125,125 @@ class MDPinfo(RamParser):
self.mdss_dump_reg(addr, length, rng.reg_dump)
- def parse(self):
- mdss_dbg = MdssDbgXlog(self.ramdump, 'mdss_dbg_xlog')
+ def print_sderange(self, node):
+ rng = RangeDumpSdeNode(self.ramdump, node)
- if mdss_dbg.is_empty():
+ if (rng.offset.start > rng.offset.end) or (rng.offset.end == 0):
+ print_out_str("Invalid offsets (%d, %d) for range: %s" %
+ (rng.offset.start, rng.offset.end, rng.range_name))
return
- for blk in mdss_dbg.blk_arr:
- if blk.is_empty():
- continue
+ addr = node + rng.offset.start
+
+ self.outfile.write('{0}: base=0x{1:x} start=0x{2:x} end=0x{3:x}\n'
+ .format(rng.range_name, addr,
+ rng.offset.start, rng.offset.end))
+ self.outfile.write('start_addr:{0:x} end_addr:{1:x} reg_addr={2:x}\n'
+ .format(rng.offset.start, rng.offset.end, addr))
- # Delays file creation until we have found a non-null array element
- if not self.outfile:
- self.outfile = self.ramdump.open_file('mdpinfo_out.txt')
+ # Calculating length
- self.outfile.write('mdss_dump_reg_by_ranges:'
- '=========%s DUMP=========\n' % blk.name)
+ length = rng.offset.end - rng.offset.start
- head_offset = self.ramdump.field_offset('struct range_dump_node',
- 'head')
+ self.mdss_dump_reg(addr, length, rng.reg_dump)
- dump_list = ListWalker(self.ramdump, blk.dump_list, head_offset)
+ def parse(self):
+
+ mdss_dbg = MdssDbgXlog(self.ramdump, 'mdss_dbg_xlog')
+
+ if mdss_dbg.is_empty():
+ mdss_dbg = SdeDbgBase(self.ramdump, 'sde_dbg_base')
+ if mdss_dbg.is_empty():
+ return
+ self.outfile = self.ramdump.open_file('MDPINFO_OUT.txt')
+ dump_list = ListWalker(self.ramdump, mdss_dbg.reg_base_list, 0)
if dump_list.is_empty():
- self.outfile.write('Ranges not found, '
- 'will dump full registers\n')
- self.outfile.write('base:0x%x length:%d\n' %
- (blk.base, blk.max_offset))
-
- self.mdss_dump_reg(blk.base, blk.max_offset, blk.reg_dump)
- else:
- for node in dump_list:
- self.print_range(blk, node)
+ self.outfile.write('%s \n' % ("BLK DUMPLIST IS EMPTY!!!"))
+ return
+ for blk in dump_list:
+ reg_blk = Struct(self.ramdump, blk, struct_name="struct sde_dbg_reg_base",
+ fields={'name': Struct.get_cstring,
+ 'base': Struct.get_pointer,
+ 'max_offset': Struct.get_u32,
+ 'sub_range_list': Struct.get_address,
+ 'reg_dump': Struct.get_pointer})
+ if (reg_blk.base == 0x0000):
+ continue
+ self.outfile.write('%s %x \n' % ("BLK is:", blk))
+ self.outfile.write('%s %s\n' % ("REG BLK is:", reg_blk.name))
+ headoffset_2 = self.ramdump.field_offset('struct sde_dbg_reg_range', 'head')
+ sub_blk_list = ListWalker(self.ramdump, reg_blk.sub_range_list, headoffset_2)
+
+ if sub_blk_list.is_empty():
+ self.outfile.write('Ranges not found, ''will dump full registers\n')
+ self.outfile.write('base:0x%x length:%d\n' % (reg_blk.base, reg_blk.max_offset))
+ self.mdss_dump_reg(reg_blk.base, reg_blk.max_offset, reg_blk.reg_dump)
+ else:
+ for node in sub_blk_list:
+ self.print_sderange(node)
+
+ # EVENT LOGS
+ self.outfile = self.ramdump.open_file('MDP_EVENT_LOGS.txt')
+
+ evt_log = Struct(self.ramdump, mdss_dbg.evtlog,
+ struct_name="struct sde_dbg_evtlog",
+ fields={'name': Struct.get_cstring,
+ 'enable': Struct.get_u32,
+ 'logs': Struct.get_address,
+ 'last_dump': Struct.get_u32})
+
+ SDE_EVTLOG_ENTRY = self.ramdump.sizeof('struct sde_dbg_evtlog')/self.ramdump.sizeof('struct sde_dbg_evtlog_log')
+ SDE_EVTLOG_MAX_DATA = self.ramdump.sizeof('(*(sde_dbg_base.evtlog)).logs[0].data')/4
+ self.outfile.write('\n %s %40s:%s %35s %10s %30s \n ' % ("TIME", "NAME", "LINE", "PID", "DATA_CNT", "DATA"))
+
+ for i in range(SDE_EVTLOG_ENTRY):
+ addr = evt_log.logs + self.ramdump.sizeof('struct sde_dbg_evtlog_log') * i
+ log_log = addr
+ log_log = Struct(self.ramdump, log_log,
+ struct_name="struct sde_dbg_evtlog_log",
+ fields={'name': Struct.get_pointer,
+ 'enable': Struct.get_u32,
+ 'line': Struct.get_u32,
+ 'data_cnt': Struct.get_u32,
+ 'pid': Struct.get_u32,
+ 'data' : Struct.get_address,
+ 'time': get_u64})
+
+ self.outfile.write('\n' % ())
+ self.outfile.write('%d ' % (log_log.time))
+ self.outfile.write('%50s:' % (self.ramdump.read_cstring(log_log.name)))
+ self.outfile.write('%s%d \t\t ' % ("", log_log.line))
+ self.outfile.write('%10d ' % (log_log.pid))
+ self.outfile.write('%6d ' % (log_log.data_cnt))
+ for i in range(SDE_EVTLOG_MAX_DATA):
+ self.outfile.write('%2d ' % (self.ramdump.read_u32(log_log.data+(i*4))))
+
+ else:
+ for blk in mdss_dbg.blk_arr:
+ if blk.is_empty():
+ continue
+
+ # Delays file creation until we have found a non-null array element
+ if not self.outfile:
+ self.outfile = self.ramdump.open_file('mdpinfo_out.txt')
+
+ self.outfile.write('mdss_dump_reg_by_ranges:'
+ '=========%s DUMP=========\n' % blk.name)
+
+ head_offset = self.ramdump.field_offset('struct range_dump_node',
+ 'head')
+
+ dump_list = ListWalker(self.ramdump, blk.dump_list, head_offset)
+ if dump_list.is_empty():
+ self.outfile.write('Ranges not found, '
+ 'will dump full registers\n')
+ self.outfile.write('base:0x%x length:%d\n' %
+ (blk.base, blk.max_offset))
+
+ self.mdss_dump_reg(blk.base, blk.max_offset, blk.reg_dump)
+ else:
+ for node in dump_list:
+ self.print_range(blk, node)
# Close the file only if it was created
if self.outfile: