From 137cd66ae7e966394b40d8820bc454e668bdb95e Mon Sep 17 00:00:00 2001
From: Patrick Daly <pdaly@codeaurora.org>
Date: Thu, 18 May 2017 17:51:38 -0700
Subject: [PATCH] lrdp: iommu: fix page table parsing
New kernel versions have altered the definition of
'struct arm_lpae_io_pgtable'. Get the required values from
'struct io_pgtable_cfg' instead.
Change-Id: Idf91c0efdddb58cdb0130d8a97e4757d05925850
---
linux-ramdump-parser-v2/iommulib.py | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/linux-ramdump-parser-v2/iommulib.py b/linux-ramdump-parser-v2/iommulib.py
index 1ca1d6e..9d9f307 100644
--- a/linux-ramdump-parser-v2/iommulib.py
+++ b/linux-ramdump-parser-v2/iommulib.py
@@ -11,6 +11,7 @@
import rb_tree
import linux_list as llist
+from mm import phys_to_virt
ARM_SMMU_DOMAIN = 0
MSM_SMMU_DOMAIN = 1
@@ -112,30 +113,25 @@ class IommuLib(object):
if pgtbl_ops_ptr is None or pgtbl_ops_ptr == 0:
return
- pg_table = 0
level = 0
fn = self.ramdump.read_structure_field(pgtbl_ops_ptr,
'struct io_pgtable_ops', 'map')
if fn == self.ramdump.address_of('av8l_fast_map'):
- av8l_fast_io_pgtable_ptr = self.ramdump.container_of(
- pgtbl_ops_ptr, 'struct av8l_fast_io_pgtable', 'iop.ops')
-
- pg_table = self.ramdump.read_structure_field(
- av8l_fast_io_pgtable_ptr, 'struct av8l_fast_io_pgtable',
- 'pgd')
level = 3
else:
arm_lpae_io_pgtable_ptr = self.ramdump.container_of(
pgtbl_ops_ptr, 'struct arm_lpae_io_pgtable', 'iop.ops')
- pg_table = self.ramdump.read_structure_field(
- arm_lpae_io_pgtable_ptr, 'struct arm_lpae_io_pgtable',
- 'pgd')
-
level = self.ramdump.read_structure_field(
arm_lpae_io_pgtable_ptr, 'struct arm_lpae_io_pgtable',
'levels')
+ pg_table = self.ramdump.read_structure_field(
+ arm_smmu_domain_ptr, 'struct arm_smmu_domain',
+ 'pgtbl_cfg.arm_lpae_s1_cfg.ttbr[0]')
+
+ pg_table = phys_to_virt(self.ramdump, pg_table)
+
domain_create = Domain(pg_table, 0, [], client_name,
ARM_SMMU_DOMAIN, level)
domain_list.append(domain_create)
--
GitLab