Promotion of opensource-tools.lnx.1.0-00012.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2055818   Ieed438c7c1eb21e19e6d9d95ab14023ba6922f7c   ldrpv2: cachedumplib: Change LLCC Client ID.
2059647   I8323da2d4ccd52f3dd27a776e9640e1f0d917675   lrdp_v2 : Fix for broken mmcdoctor.py for kernel 4.9

Change-Id: If11f95074b2f7754a0a7bc91652174aa1a084b2f
CRs-Fixed: 2055818, 2059647

linux-ramdump-parser-v2/cachedumplib.py

@@ -650,10 +650,10 @@ lookuptable[("sdm845", 0x66, 0x14)] = L1_ICache_KRYO3XX_GOLD()
 lookuptable[("sdm845", 0x67, 0x14)] = L1_ICache_KRYO3XX_GOLD()
 
 
-lookuptable[("sdm845", 0x121, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
-lookuptable[("sdm845", 0x122, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
-lookuptable[("sdm845", 0x123, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
-lookuptable[("sdm845", 0x124, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
+lookuptable[("sdm845", 0x140, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
+lookuptable[("sdm845", 0x141, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
+lookuptable[("sdm845", 0x142, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
+lookuptable[("sdm845", 0x143, 0x14)] = LLC_SYSTEM_CACHE_KRYO3XX()
 
 # "sdm660"
 lookuptable[("660", 0x80, 0x14)] = L1_DCache_KRYO2XX_SILVER()

linux-ramdump-parser-v2/debug_image_v2.py

@@ -31,7 +31,7 @@ from tlbdumplib import lookup_tlb_type
 from vsens import VsensData
 
 MEMDUMPV2_MAGIC = 0x42445953
-MAX_NUM_ENTRIES = 0x140
+MAX_NUM_ENTRIES = 0x150
 TRACE_EVENT_FL_TRACEPOINT = 0x40
 
 class client(object):
@@ -52,9 +52,9 @@ class client(object):
     MSM_DUMP_DATA_LOG_BUF = 0x110
     MSM_DUMP_DATA_LOG_BUF_FIRST_IDX = 0x111
     MSM_DUMP_DATA_L2_TLB = 0x120
-    MSM_DUMP_DATA_LLC_CACHE = 0x121
     MSM_DUMP_DATA_SCANDUMP = 0xEB
     MSM_DUMP_DATA_SCANDUMP_PER_CPU = 0x130
+    MSM_DUMP_DATA_LLC_CACHE = 0x140
     MSM_DUMP_DATA_MAX = MAX_NUM_ENTRIES
 
 # Client functions will be executed in top-to-bottom order

linux-ramdump-parser-v2/parsers/mmcdoctor.py

@@ -121,8 +121,12 @@ def get_sdhci_irqs(ram_dump):
     if nr_irqs > 50000:
         return
     for i in range(0, nr_irqs):
-        irq_desc = irqs.radix_tree_lookup_element(
-            ram_dump, irq_desc_tree, i)
+        if (ram_dump.kernel_version >= (4,9,0)):
+            irq_desc = irqs.radix_tree_lookup_element_v2(
+                ram_dump, irq_desc_tree, i)
+        else:
+            irq_desc = irqs.radix_tree_lookup_element(
+                ram_dump, irq_desc_tree, i)
         if irq_desc is None:
             continue
         action = ram_dump.read_word(irq_desc + irq_action_offset)
@@ -144,7 +148,12 @@ def find_sdhci_host(ramdump, irq):
     irq_action_offset = ramdump.field_offset('struct irq_desc', 'action')
     dev_id = ramdump.field_offset('struct irqaction', 'dev_id')
     irqs = IrqParse(RamParser)
-    sdhci_irq_desc = irqs.radix_tree_lookup_element(ramdump, irq_desc_tree, irq)
+    if (ramdump.kernel_version >= (4,9,0)):
+        sdhci_irq_desc = irqs.radix_tree_lookup_element_v2(
+            ramdump, irq_desc_tree, irq)
+    else:
+        sdhci_irq_desc = irqs.radix_tree_lookup_element(
+            ramdump, irq_desc_tree, irq)
     sdhci_irq_action = ramdump.read_word(sdhci_irq_desc + irq_action_offset)
     sdhci_host = ramdump.read_word(sdhci_irq_action + dev_id)
     return sdhci_host