diff --git a/linux-ramdump-parser-v2/ramdump.py b/linux-ramdump-parser-v2/ramdump.py
index f4db068d12d0448739e71313bd60a906b544ad3b..34bb0a087028fdd34a29657d8f0ca8865851efca 100644
--- a/linux-ramdump-parser-v2/ramdump.py
+++ b/linux-ramdump-parser-v2/ramdump.py
@@ -543,6 +543,7 @@ class RamDump():
         self.autodump = options.autodump
         self.module_table = module_table.module_table_class()
         self.module_table.setup_sym_path(options.sym_path)
+        self.currentEL = options.currentEL or None
         if self.minidump:
             try:
                 mod = import_module('elftools.elf.elffile')
diff --git a/linux-ramdump-parser-v2/ramparse.py b/linux-ramdump-parser-v2/ramparse.py
index 786450218bd7ef1767f2b5c9327a624753f8802e..9223dc2ff548154e34e43427866277035089db88 100644
--- a/linux-ramdump-parser-v2/ramparse.py
+++ b/linux-ramdump-parser-v2/ramparse.py
@@ -120,6 +120,8 @@ if __name__ == '__main__':
     parser.add_option(
         '', '--force-version', type='int', dest='force_hardware_version',
         help='Force the hardware detection to a specific hardware version')
+    parser.add_option('-l', '--kernel-exception-level', type='int',
+                      dest='currentEL', help='Current exception level for kernel')
     parser.add_option('', '--parse-qdss', action='store_true',
                       dest='qdss', help='Parse QDSS (deprecated)')
     parser.add_option('', '--shell', action='store_true',
diff --git a/linux-ramdump-parser-v2/scandump_reader.py b/linux-ramdump-parser-v2/scandump_reader.py
index 36e7a2ca21da2760a044bf961930a08cd3b46116..e91a011cc129b6e2fb09cc942ef0fc0e55ecca4a 100644
--- a/linux-ramdump-parser-v2/scandump_reader.py
+++ b/linux-ramdump-parser-v2/scandump_reader.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017, 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
@@ -243,7 +243,10 @@ class Scandump_v2():
         pc = self.regs['pc']
         if ram_dump.arm64:
             lr = self.regs['x30']
-            bt = self.regs['sp_el1']
+            if ram_dump.currentEL == 0x2:
+                bt = self.regs['sp_el2']
+            else:
+                bt = self.regs['sp_el1']
             fp = self.regs['x29']
         else:
             lr = self.regs['r14_svc']
diff --git a/linux-ramdump-parser-v2/watchdog_v2.py b/linux-ramdump-parser-v2/watchdog_v2.py
index 76fc99a5953d0d7788e2c8a3c89586c2ef24a9da..0e70ddceb8bf3d1d8b467869ece416d4e9b5de42 100644
--- a/linux-ramdump-parser-v2/watchdog_v2.py
+++ b/linux-ramdump-parser-v2/watchdog_v2.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+# Copyright (c) 2012-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
@@ -724,7 +724,10 @@ class TZRegDump_v2():
         pc = self.core_regs.regs['pc']
         if ram_dump.arm64:
             lr = self.core_regs.regs['x30']
-            bt = self.core_regs.regs['sp_el1']
+            if ram_dump.currentEL == 0x2:
+                bt = self.core_regs.regs['sp_el2']
+            else:
+                bt = self.core_regs.regs['sp_el1']
             fp = self.core_regs.regs['x29']
         else:
             lr = self.core_regs.regs['r14_svc']