Merge "LRDP: Add support to RDP for DCC dumps from SDI" into opensource-tools.lnx.1.0

linux-ramdump-parser-v2/debug_image_v2.py

@@ -264,7 +264,6 @@ class DebugImage_v2():
     def parse_system_cache_common(self, version, start, end, client_id, ramdump):
         client_name = self.dump_data_id_lookup_table[client_id]
         bank_number = client_id - client.MSM_DUMP_DATA_LLC_CACHE
-
         filename = '{0}_0x{1:x}'.format(client_name, bank_number)
         outfile = ramdump.open_file(filename)
         cache_type = lookup_cache_type(ramdump.hw_id, client_id, version)
@@ -458,12 +457,11 @@ class DebugImage_v2():
         subprocess.call('{0} -c {1} exit'.format(qtf_path, port))
         server_proc.communicate('quit')
 
-    def parse_dcc(self, ram_dump, config_offset):
+    def parse_dcc(self, ram_dump):
         out_dir = ram_dump.outdir
         bin_dir = ram_dump.ram_addr
         bin_dir="\\".join(bin_dir[0][0].split('\\')[:-1])
         dcc_parser_path = os.path.join(os.path.dirname(__file__), '..', 'dcc_parser', 'dcc_parser.py')
-
         if dcc_parser_path is None:
             print_out_str("!!! Incorrect path for DCC specified.")
             return
@@ -472,22 +470,21 @@ class DebugImage_v2():
             print_out_str("!!! dcc_parser_path {0} does not exist! Check your settings!".format(dcc_parser_path))
             return
 
-        if os.path.isfile(os.path.join(out_dir, 'sram.bin')) > 0:
-            sram_file = os.path.join(out_dir, 'sram.bin')
-        elif os.path.isfile(os.path.join(bin_dir, 'DCC_SRAM.BIN')):
+        if (os.path.isfile(os.path.join(bin_dir, 'DCC_SRAM.BIN'))):
             sram_file = os.path.join(bin_dir, 'DCC_SRAM.BIN')
-        else:
-            return
-
-        if (os.path.isfile(os.path.join(bin_dir, 'DCC_SRAM.BIN'))) and (config_offset != None):
-            cmd = ["-s ", sram_file, " --out-dir ", out_dir, " --config-offset ", str(config_offset), " --v2"]
+            cmd = ["-s ", sram_file, " --out-dir ", out_dir, " --config-offset ", "0x6000", " --v2"]
             p = subprocess.Popen([sys.executable, dcc_parser_path, cmd], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        elif config_offset == None:
+            print_out_str('--------')
+            print_out_str(p.communicate()[0])
+        elif os.path.isfile(os.path.join(out_dir, 'sram.bin')):
+            sram_file = os.path.join(out_dir, 'sram.bin')
             p = subprocess.Popen([sys.executable, dcc_parser_path, '-s', sram_file, '--out-dir', out_dir],
                     stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
-        print_out_str('--------')
-        print_out_str(p.communicate()[0])
+            print_out_str('--------')
+            print_out_str(p.communicate()[0])
+        else:
+            print_out_str('DCC SRAM data is not populated!!')
+            return
 
     def parse_sysreg(self,ram_dump):
         out_dir = ram_dump.outdir
@@ -807,10 +804,8 @@ class DebugImage_v2():
                             getattr(DebugImage_v2, func)(
                                 self, 20, client_entry,
                                 client_end, client_id, ram_dump)
-        if ram_dump.dcc:
-            self.parse_dcc(ram_dump, config_offset = None)
-        else:
-            self.parse_dcc(ram_dump, config_offset = "0x6000")
+
+        self.parse_dcc(ram_dump)
         if ram_dump.sysreg:
             self.parse_sysreg(ram_dump)
         self.qdss.dump_standard(ram_dump)