arm64: trans_pgd: remove trans_pgd_map_page()

The intend of trans_pgd_map_page() was to map contiguous range of VA
memory to the memory that is getting relocated during kexec. However,
since we are now using linear map instead of contiguous range this
function is not needed

Suggested-by: Pingfan Liu <kernelfans@gmail.com>
Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210930143113.1502553-16-pasha.tatashin@soleen.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/include/asm/trans_pgd.h b/arch/arm64/include/asm/trans_pgd.h
index 7b04d32..033d400 100644 (file)
--- a/arch/arm64/include/asm/trans_pgd.h
+++ b/arch/arm64/include/asm/trans_pgd.h
@@ -15,7 +15,7 @@
 /*
  * trans_alloc_page
  *     - Allocator that should return exactly one zeroed page, if this
- *       allocator fails, trans_pgd_create_copy() and trans_pgd_map_page()
+ *       allocator fails, trans_pgd_create_copy() and trans_pgd_idmap_page()
  *       return -ENOMEM error.
  *
  * trans_alloc_arg
@@ -30,9 +30,6 @@ struct trans_pgd_info {
 int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **trans_pgd,
                          unsigned long start, unsigned long end);
 
-int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd,
-                      void *page, unsigned long dst_addr, pgprot_t pgprot);
-
 int trans_pgd_idmap_page(struct trans_pgd_info *info, phys_addr_t *trans_ttbr0,
                         unsigned long *t0sz, void *page);
 

diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c
index 26bd8f2..d7da8ca 100644 (file)
--- a/arch/arm64/mm/trans_pgd.c
+++ b/arch/arm64/mm/trans_pgd.c
@@ -218,63 +218,6 @@ int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **dst_pgdp,
 }
 
 /*
- * Add map entry to trans_pgd for a base-size page at PTE level.
- * info:       contains allocator and its argument
- * trans_pgd:  page table in which new map is added.
- * page:       page to be mapped.
- * dst_addr:   new VA address for the page
- * pgprot:     protection for the page.
- *
- * Returns 0 on success, and -ENOMEM on failure.
- */
-int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd,
-                      void *page, unsigned long dst_addr, pgprot_t pgprot)
-{
-       pgd_t *pgdp;
-       p4d_t *p4dp;
-       pud_t *pudp;
-       pmd_t *pmdp;
-       pte_t *ptep;
-
-       pgdp = pgd_offset_pgd(trans_pgd, dst_addr);
-       if (pgd_none(READ_ONCE(*pgdp))) {
-               p4dp = trans_alloc(info);
-               if (!pgdp)
-                       return -ENOMEM;
-               pgd_populate(NULL, pgdp, p4dp);
-       }
-
-       p4dp = p4d_offset(pgdp, dst_addr);
-       if (p4d_none(READ_ONCE(*p4dp))) {
-               pudp = trans_alloc(info);
-               if (!pudp)
-                       return -ENOMEM;
-               p4d_populate(NULL, p4dp, pudp);
-       }
-
-       pudp = pud_offset(p4dp, dst_addr);
-       if (pud_none(READ_ONCE(*pudp))) {
-               pmdp = trans_alloc(info);
-               if (!pmdp)
-                       return -ENOMEM;
-               pud_populate(NULL, pudp, pmdp);
-       }
-
-       pmdp = pmd_offset(pudp, dst_addr);
-       if (pmd_none(READ_ONCE(*pmdp))) {
-               ptep = trans_alloc(info);
-               if (!ptep)
-                       return -ENOMEM;
-               pmd_populate_kernel(NULL, pmdp, ptep);
-       }
-
-       ptep = pte_offset_kernel(pmdp, dst_addr);
-       set_pte(ptep, pfn_pte(virt_to_pfn(page), pgprot));
-
-       return 0;
-}
-
-/*
  * The page we want to idmap may be outside the range covered by VA_BITS that
  * can be built using the kernel's p?d_populate() helpers. As a one off, for a
  * single page, we build these page tables bottom up and just assume that will