refactor(mm): delete `arch_mm_clear_pa`
It has the same effect as `mm_round_down_to_page`.
Change-Id: Ic86f0ef427660168db83a9fcaa29338053f33dc7
Signed-off-by: Karl Meakin <karl.meakin@arm.com>
diff --git a/inc/hf/arch/mm.h b/inc/hf/arch/mm.h
index d871bf6..5a5f249 100644
--- a/inc/hf/arch/mm.h
+++ b/inc/hf/arch/mm.h
@@ -94,12 +94,6 @@
}
/**
- * Clears the bits of an address that are ignored by the page table. In effect,
- * the address is rounded down to the start of the corresponding PTE range.
- */
-paddr_t arch_mm_clear_pa(paddr_t pa);
-
-/**
* Extracts the start address of the PTE range.
*/
paddr_t arch_mm_block_from_pte(pte_t pte, mm_level_t level);
diff --git a/src/arch/aarch64/mm.c b/src/arch/aarch64/mm.c
index 877d7ab..49ae545 100644
--- a/src/arch/aarch64/mm.c
+++ b/src/arch/aarch64/mm.c
@@ -216,15 +216,6 @@
}
/**
- * Clears the given physical address, i.e., clears the bits of the address that
- * are not used in the pte.
- */
-paddr_t arch_mm_clear_pa(paddr_t pa)
-{
- return pa_init(pte_addr(pa_addr(pa)));
-}
-
-/**
* Extracts the physical address of the block referred to by the given page
* table entry.
*/
diff --git a/src/arch/fake/mm.c b/src/arch/fake/mm.c
index e818579..ea1f6ac 100644
--- a/src/arch/fake/mm.c
+++ b/src/arch/fake/mm.c
@@ -77,12 +77,7 @@
return PTE_TYPE_VALID_BLOCK;
}
-paddr_t arch_mm_clear_pa(paddr_t pa)
-{
- return pa_init(pa_addr(pa) & PTE_ADDR_MASK);
-}
-
-paddr_t pte_addr(pte_t pte, mm_level_t level)
+static paddr_t pte_addr(pte_t pte, mm_level_t level)
{
return pa_init((pte << PTE_LEVEL_SHIFT(level)) & PTE_ADDR_MASK);
}
diff --git a/src/mm.c b/src/mm.c
index 42e3810..9b2c006 100644
--- a/src/mm.c
+++ b/src/mm.c
@@ -435,7 +435,7 @@
mm_level_t root_level = mm_max_level(flags) + 1;
ptable_addr_t ptable_end = mm_ptable_addr_space_end(flags);
ptable_addr_t end = mm_round_up_to_page(pa_addr(pa_end));
- ptable_addr_t begin = pa_addr(arch_mm_clear_pa(pa_begin));
+ ptable_addr_t begin = mm_round_down_to_page(pa_addr(pa_begin));
struct mm_page_table *root_table = &mm_page_table_from_pa(
ptable->root)[mm_index(begin, root_level)];