From 1207ffdd2e4b4e6162d8d6fbb6c7a4410650c8c1 Mon Sep 17 00:00:00 2001 From: Soumen Ghosh <soumeng@codeaurora.org> Date: Wed, 28 Sep 2016 14:33:37 +0530 Subject: [PATCH] lrdp-v2: changes to get proper cpr3 information exception is handled to generate cpr3 info Change-Id: Ifecd73af655aad018c26615e0ee816e59ffa4ef0 --- linux-ramdump-parser-v2/mmu.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/linux-ramdump-parser-v2/mmu.py b/linux-ramdump-parser-v2/mmu.py index fe21488..4444cd2 100644 --- a/linux-ramdump-parser-v2/mmu.py +++ b/linux-ramdump-parser-v2/mmu.py @@ -506,7 +506,7 @@ class Armv8MMU(MMU): else: raise Exception( 'Invalid stage 1 first- or second-level translation\ndescriptor: (%s)\naddr: (%s)' - % (str(descriptor), str(addr)) + % (str(descriptor), str(addr)) ) return descriptor @@ -589,7 +589,10 @@ class Armv8MMU(MMU): tl_index=(20,12), page_index=(11,0)) - fl_desc = self.do_fl_sl_level_lookup(self.ttbr, virt_r.fl_index, 12, 30) + try: + fl_desc = self.do_fl_sl_level_lookup(self.ttbr, virt_r.fl_index, 12, 30) + except: + return None if fl_desc.dtype == Armv8MMU.DESCRIPTOR_BLOCK: return self.fl_block_desc_2_phys(fl_desc, virt_r) -- GitLab