* [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT
@ 2021-06-14 9:42 Anshuman Khandual
2021-06-14 12:44 ` Gavin Shan
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Anshuman Khandual @ 2021-06-14 9:42 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anshuman Khandual, Catalin Marinas, Will Deacon, Mark Rutland,
linux-kernel
ARM64_MEMSTART_SIZE needs to be aligned with CONT_PMD_SIZE on 16K page size
config. Hence just directly use CONT_PMD_SHIFT.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
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 v5.13-rc6.
arch/arm64/include/asm/kernel-pgtable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h
index 88b8d681ad91..a848da2b4d90 100644
--- a/arch/arm64/include/asm/kernel-pgtable.h
+++ b/arch/arm64/include/asm/kernel-pgtable.h
@@ -125,7 +125,7 @@
#if defined(CONFIG_ARM64_4K_PAGES)
#define ARM64_MEMSTART_SHIFT PUD_SHIFT
#elif defined(CONFIG_ARM64_16K_PAGES)
-#define ARM64_MEMSTART_SHIFT (PMD_SHIFT + 5)
+#define ARM64_MEMSTART_SHIFT CONT_PMD_SHIFT
#else
#define ARM64_MEMSTART_SHIFT PMD_SHIFT
#endif
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT
2021-06-14 9:42 [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT Anshuman Khandual
@ 2021-06-14 12:44 ` Gavin Shan
2021-06-14 15:16 ` Catalin Marinas
2021-06-15 12:06 ` Will Deacon
2 siblings, 0 replies; 4+ messages in thread
From: Gavin Shan @ 2021-06-14 12:44 UTC (permalink / raw)
To: Anshuman Khandual, linux-arm-kernel
Cc: Catalin Marinas, Will Deacon, Mark Rutland, linux-kernel
On 6/14/21 7:42 PM, Anshuman Khandual wrote:
> ARM64_MEMSTART_SIZE needs to be aligned with CONT_PMD_SIZE on 16K page size
> config. Hence just directly use CONT_PMD_SHIFT.
>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> 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 v5.13-rc6.
>
> arch/arm64/include/asm/kernel-pgtable.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Yes, It makes the code a bit more understandable.
Reviewed-by: Gavin Shan <gshan@redhat.com>
> diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h
> index 88b8d681ad91..a848da2b4d90 100644
> --- a/arch/arm64/include/asm/kernel-pgtable.h
> +++ b/arch/arm64/include/asm/kernel-pgtable.h
> @@ -125,7 +125,7 @@
> #if defined(CONFIG_ARM64_4K_PAGES)
> #define ARM64_MEMSTART_SHIFT PUD_SHIFT
> #elif defined(CONFIG_ARM64_16K_PAGES)
> -#define ARM64_MEMSTART_SHIFT (PMD_SHIFT + 5)
> +#define ARM64_MEMSTART_SHIFT CONT_PMD_SHIFT
> #else
> #define ARM64_MEMSTART_SHIFT PMD_SHIFT
> #endif
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT
2021-06-14 9:42 [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT Anshuman Khandual
2021-06-14 12:44 ` Gavin Shan
@ 2021-06-14 15:16 ` Catalin Marinas
2021-06-15 12:06 ` Will Deacon
2 siblings, 0 replies; 4+ messages in thread
From: Catalin Marinas @ 2021-06-14 15:16 UTC (permalink / raw)
To: Anshuman Khandual
Cc: linux-arm-kernel, Will Deacon, Mark Rutland, linux-kernel
On Mon, Jun 14, 2021 at 03:12:35PM +0530, Anshuman Khandual wrote:
> ARM64_MEMSTART_SIZE needs to be aligned with CONT_PMD_SIZE on 16K page size
> config. Hence just directly use CONT_PMD_SHIFT.
>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT
2021-06-14 9:42 [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT Anshuman Khandual
2021-06-14 12:44 ` Gavin Shan
2021-06-14 15:16 ` Catalin Marinas
@ 2021-06-15 12:06 ` Will Deacon
2 siblings, 0 replies; 4+ messages in thread
From: Will Deacon @ 2021-06-15 12:06 UTC (permalink / raw)
To: Anshuman Khandual, linux-arm-kernel
Cc: catalin.marinas, kernel-team, Will Deacon, linux-kernel,
Mark Rutland
On Mon, 14 Jun 2021 15:12:35 +0530, Anshuman Khandual wrote:
> ARM64_MEMSTART_SIZE needs to be aligned with CONT_PMD_SIZE on 16K page size
> config. Hence just directly use CONT_PMD_SHIFT.
Applied to arm64 (for-next/mm), thanks!
[1/1] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT
https://git.kernel.org/arm64/c/ca6ece6a76a8
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-15 19:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-14 9:42 [PATCH] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT Anshuman Khandual
2021-06-14 12:44 ` Gavin Shan
2021-06-14 15:16 ` Catalin Marinas
2021-06-15 12:06 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).