Merge "lrdp_v2: Remove scandump dependency on core context."

linux-ramdump-parser-v2/debug_image_v2.py

@@ -98,7 +98,6 @@ class DebugImage_v2():
         else:
             self.event_call = 'struct ftrace_event_call'
             self.event_class = 'struct ftrace_event_class'
-        self.has_scan_dump = False
 
     def parse_scandump(self, version, start, end, client_id, ram_dump):
         scandump_file_prefix = "scandump"
@@ -107,8 +106,6 @@ class DebugImage_v2():
         except AttributeError:
             print_out_str('Could not find scandump_parser_path . Please define scandump_parser_path in local_settings')
             return
-        if client_id == client.MSM_DUMP_DATA_SCANDUMP:
-            self.has_scan_dump = True
         output = os.path.join(ram_dump.outdir, scandump_file_prefix)
         input = os.path.join(ram_dump.outdir, "vv_msg_4_header.bin")
         print_out_str(
@@ -129,7 +126,7 @@ class DebugImage_v2():
         print_out_str(
             'Parsing CPU{2} context start {0:x} end {1:x}'.format(start, end, core))
 
-        regs = TZRegDump_v2(self.has_scan_dump)
+        regs = TZRegDump_v2()
         if regs.init_regs(version, start, end, core, ram_dump) is False:
             print_out_str('!!! Could not get registers from TZ dump')
             return

linux-ramdump-parser-v2/watchdog_v2.py

@@ -12,7 +12,6 @@
 import struct
 import re
 
-from scandump_reader import Scandump_v2
 from print_out import print_out_str
 from bitops import is_set
 from parser_util import register_parser, RamParser
@@ -696,7 +695,7 @@ class TZCpuCtx_v2():
 
 class TZRegDump_v2():
 
-    def __init__(self, has_scan_dump):
+    def __init__(self):
         self.core_regs = None
         self.sec_regs = None
         self.neon_regs = {}
@@ -706,7 +705,6 @@ class TZRegDump_v2():
         self.core = 0
         self.status = []
         self.neon_fields = []
-        self.has_scan_dump = has_scan_dump
 
     def dump_all_regs(self, ram_dump):
         coren_regs = ram_dump.open_file('core{0}_regs.cmm'.format(self.core))
@@ -819,21 +817,9 @@ class TZRegDump_v2():
             self.start_addr += struct.calcsize(
                 sysdbg_cpu32_ctxt_regs_type[self.version])
 
-        if self.has_scan_dump:
-           if core > 3:
-              self.scan_data = Scandump_v2(self.core, ram_dump, self.version)
-              self.scan_regs = self.scan_data.prepare_dict()
-        else:
-           print_out_str("No Scan dump data to be processed...")
-
         self.core_regs = TZCpuCtx_v2(self.version, sc_regs,
                                      self.neon_regs, ram_dump)
 
-        if core > 3:
-            if self.has_scan_dump:
-               self.scan_regs['pc'] = self.core_regs.regs['pc']
-               self.core_regs.regs = self.scan_regs
-
         self.sec_regs = TZCpuCtx_v2(self.version, sc_secure,
                                     self.neon_regs, ram_dump)
         return True