Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e22eb61 authored by Laura Abbott's avatar Laura Abbott Committed by Will Deacon
Browse files

arm64: Move some macros under #ifndef __ASSEMBLY__ 



Several macros for various x_to_y exist outside the bounds of an
__ASSEMBLY__ guard. Move them in preparation for support for
CONFIG_DEBUG_VIRTUAL.

Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 42d1a731

arch/arm64/include/asm/memory.h

+19 −19
Original line number Diff line number Diff line
@@ -101,25 +101,6 @@ 
#define KASAN_SHADOW_SIZE	(0)

#endif



/*

 * Physical vs virtual RAM address space conversion.  These are

 * private definitions which should NOT be used outside memory.h

 * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.

 */

#define __virt_to_phys(x) ({						\

	phys_addr_t __x = (phys_addr_t)(x);				\

	__x & BIT(VA_BITS - 1) ? (__x & ~PAGE_OFFSET) + PHYS_OFFSET :	\

				 (__x - kimage_voffset); })



#define __phys_to_virt(x)	((unsigned long)((x) - PHYS_OFFSET) | PAGE_OFFSET)

#define __phys_to_kimg(x)	((unsigned long)((x) + kimage_voffset))



/*

 * Convert a page to/from a physical address

 */

#define page_to_phys(page)	(__pfn_to_phys(page_to_pfn(page)))

#define phys_to_page(phys)	(pfn_to_page(__phys_to_pfn(phys)))



/*

 * Memory types available.

 */
@@ -186,6 +167,25 @@ static inline unsigned long kaslr_offset(void) 
 */

#define PHYS_PFN_OFFSET	(PHYS_OFFSET >> PAGE_SHIFT)



/*

 * Physical vs virtual RAM address space conversion.  These are

 * private definitions which should NOT be used outside memory.h

 * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.

 */

#define __virt_to_phys(x) ({						\

	phys_addr_t __x = (phys_addr_t)(x);				\

	__x & BIT(VA_BITS - 1) ? (__x & ~PAGE_OFFSET) + PHYS_OFFSET :	\

				 (__x - kimage_voffset); })



#define __phys_to_virt(x)	((unsigned long)((x) - PHYS_OFFSET) | PAGE_OFFSET)

#define __phys_to_kimg(x)	((unsigned long)((x) + kimage_voffset))



/*

 * Convert a page to/from a physical address

 */

#define page_to_phys(page)	(__pfn_to_phys(page_to_pfn(page)))

#define phys_to_page(phys)	(pfn_to_page(__phys_to_pfn(phys)))



/*

 * Note: Drivers should NOT use these.  They are the wrong

 * translation for translating DMA addresses.  Use the driver