arm64: assembler: Align phys_to_pte with pte_to_phys
"Linux Kernel Mailing List" <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.head |
|---|---|
| Message-ID | <[email protected]> |
Web: https://git.kernel.org/torvalds/c/79ddab3b05ca903f552fd5bf920efa055210322b Commit: 79ddab3b05ca903f552fd5bf920efa055210322b Parent: f167211a93ac41a65b7a0ab79d4479d0fb58c4f1 Refname: refs/heads/master Author: Will Deacon <[email protected]> AuthorDate: Mon Jan 29 11:59:59 2018 +0000 Committer: Catalin Marinas <[email protected]> CommitDate: Tue Feb 6 22:53:25 2018 +0000 arm64: assembler: Align phys_to_pte with pte_to_phys pte_to_phys lives in assembler.h and takes its destination register as the first argument. Move phys_to_pte out of head.S to sit with its counterpart and rejig it to follow the same calling convention. Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> --- arch/arm64/include/asm/assembler.h | 13 +++++++++++++ arch/arm64/kernel/head.S | 24 ++---------------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 47555f632ffd..544878a9f29e 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -523,6 +523,19 @@ alternative_endif #endif .endm + .macro phys_to_pte, pte, phys +#ifdef CONFIG_ARM64_PA_BITS_52 + /* + * We assume \phys is 64K aligned and this is guaranteed by only + * supporting this configuration with 64K pages. + */ + orr \pte, \phys, \phys, lsr #36 + and \pte, \pte, #PTE_ADDR_MASK +#else + mov \pte, \phys +#endif + .endm + .macro pte_to_phys, phys, pte #ifdef CONFIG_ARM64_PA_BITS_52 ubfiz \phys, \pte, #(48 - 16 - 12), #16 diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 341649c08337..25f5b2e400fb 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -147,26 +147,6 @@ preserve_boot_args: b __inval_dcache_area // tail call ENDPROC(preserve_boot_args) -/* - * Macro to arrange a physical address in a page table entry, taking care of - * 52-bit addresses. - * - * Preserves: phys - * Returns: pte - */ - .macro phys_to_pte, phys, pte -#ifdef CONFIG_ARM64_PA_BITS_52 - /* - * We assume \phys is 64K aligned and this is guaranteed by only - * supporting this configuration with 64K pages. - */ - orr \pte, \phys, \phys, lsr #36 - and \pte, \pte, #PTE_ADDR_MASK -#else - mov \pte, \phys -#endif - .endm