From: Will Deacon <will@kernel.org>
Date: Fri, 9 Aug 2019 15:27:32 +0100
Subject: arm64: mm: Simplify definition of virt_addr_valid()
Patch-mainline: v5.4-rc1
Git-commit: d2d73d2fef421ca0d447946cc430fdf5c4c5b06a
References: jsc#SLE-16407
_virt_addr_valid() is defined as the same value in two places and rolls
its own version of virt_to_pfn() in both cases.
Consolidate these definitions by inlining a simplified version directly
into virt_addr_valid().
Signed-off-by: Will Deacon <will@kernel.org>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
---
arch/arm64/include/asm/memory.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -307,7 +307,6 @@ static inline void *phys_to_virt(phys_ad
#if !defined(CONFIG_SPARSEMEM_VMEMMAP) || defined(CONFIG_DEBUG_VIRTUAL)
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define _virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
#else
#define __virt_to_pgoff(kaddr) (((u64)(kaddr) - PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))
#define __page_to_voff(kaddr) (((u64)(kaddr) - VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
@@ -321,15 +320,14 @@ static inline void *phys_to_virt(phys_ad
})
#define virt_to_page(vaddr) ((struct page *)((__virt_to_pgoff(vaddr)) + VMEMMAP_START))
-
-#define _virt_addr_valid(kaddr) pfn_valid(__virt_to_phys((u64)(kaddr)) >> PAGE_SHIFT)
#endif
#endif
#define _virt_addr_is_linear(kaddr) \
(__tag_reset((u64)(kaddr)) >= PAGE_OFFSET)
+
#define virt_addr_valid(kaddr) \
- (_virt_addr_is_linear(kaddr) && _virt_addr_valid(kaddr))
+ (_virt_addr_is_linear(kaddr) && pfn_valid(virt_to_pfn(kaddr)))
/*
* Given that the GIC architecture permits ITS implementations that can only be