arm64/mm: Drop unused restore_ttbr1

[PATCH] arm64/mm: Drop unused restore_ttbr1

Posted by Anshuman Khandual 3 years, 4 months ago

restore_ttbr1 procedure is not used anywhere, hence just drop it.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
This applies on v6.1-rc5

 arch/arm64/include/asm/assembler.h | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index e5957a53be39..f13bc52ab347 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -619,17 +619,6 @@ alternative_endif
 #endif
 	.endm
 
-/*
- * Perform the reverse of offset_ttbr1.
- * bic is used as it can cover the immediate value and, in future, won't need
- * to be nop'ed out when dealing with 52-bit kernel VAs.
- */
-	.macro	restore_ttbr1, ttbr
-#ifdef CONFIG_ARM64_VA_BITS_52
-	bic	\ttbr, \ttbr, #TTBR1_BADDR_4852_OFFSET
-#endif
-	.endm
-
 /*
  * Arrange a physical address in a TTBR register, taking care of 52-bit
  * addresses.
-- 
2.25.1

Re: [PATCH] arm64/mm: Drop unused restore_ttbr1

Posted by Will Deacon 3 years, 4 months ago

On Thu, 17 Nov 2022 18:01:44 +0530, Anshuman Khandual wrote:
> restore_ttbr1 procedure is not used anywhere, hence just drop it.
> 
> 

Applied to arm64 (for-next/trivial), thanks!

[1/1] arm64/mm: Drop unused restore_ttbr1
      https://git.kernel.org/arm64/c/5b468dad6e5c

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

Re: [PATCH] arm64/mm: Drop unused restore_ttbr1

Posted by Mark Rutland 3 years, 4 months ago

On Thu, Nov 17, 2022 at 06:01:44PM +0530, Anshuman Khandual wrote:
> restore_ttbr1 procedure is not used anywhere, hence just drop it.
> 
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
> This applies on v6.1-rc5
> 
>  arch/arm64/include/asm/assembler.h | 11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
> index e5957a53be39..f13bc52ab347 100644
> --- a/arch/arm64/include/asm/assembler.h
> +++ b/arch/arm64/include/asm/assembler.h
> @@ -619,17 +619,6 @@ alternative_endif
>  #endif
>  	.endm
>  
> -/*
> - * Perform the reverse of offset_ttbr1.
> - * bic is used as it can cover the immediate value and, in future, won't need
> - * to be nop'ed out when dealing with 52-bit kernel VAs.
> - */
> -	.macro	restore_ttbr1, ttbr
> -#ifdef CONFIG_ARM64_VA_BITS_52
> -	bic	\ttbr, \ttbr, #TTBR1_BADDR_4852_OFFSET
> -#endif
> -	.endm
> -
>  /*
>   * Arrange a physical address in a TTBR register, taking care of 52-bit
>   * addresses.
> -- 
> 2.25.1
>