From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: catalin.marinas@arm.com, linux-kernel@vger.kernel.org Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, Qian Cai <cai@lca.pw>, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/2] arm64: mm: reserve CMA and crashkernel in ZONE_DMA32 Date: Thu, 7 Nov 2019 10:56:11 +0100 [thread overview] Message-ID: <20191107095611.18429-3-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20191107095611.18429-1-nsaenzjulienne@suse.de> With the introduction of ZONE_DMA in arm64 we moved the default CMA and crashkernel reservation into that area. This caused a regression on big machines that need big CMA and crashkernel reservations. Note that ZONE_DMA is only 1GB big. Restore the previous behavior as the wide majority of devices are OK with reserving these in ZONE_DMA32. The ones that need them in ZONE_DMA will configure it explicitly. Reported-by: Qian Cai <cai@lca.pw> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- arch/arm64/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 580d1052ac34..8385d3c0733f 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -88,7 +88,7 @@ static void __init reserve_crashkernel(void) if (crash_base == 0) { /* Current arm64 boot protocol requires 2MB alignment */ - crash_base = memblock_find_in_range(0, ARCH_LOW_ADDRESS_LIMIT, + crash_base = memblock_find_in_range(0, arm64_dma32_phys_limit, crash_size, SZ_2M); if (crash_base == 0) { pr_warn("cannot allocate crashkernel (size:0x%llx)\n", @@ -454,7 +454,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; - dma_contiguous_reserve(arm64_dma_phys_limit ? : arm64_dma32_phys_limit); + dma_contiguous_reserve(arm64_dma32_phys_limit); } void __init bootmem_init(void) -- 2.23.0
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: catalin.marinas@arm.com, linux-kernel@vger.kernel.org Cc: Will Deacon <will@kernel.org>, Qian Cai <cai@lca.pw>, linux-arm-kernel@lists.infradead.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Subject: [PATCH v3 2/2] arm64: mm: reserve CMA and crashkernel in ZONE_DMA32 Date: Thu, 7 Nov 2019 10:56:11 +0100 [thread overview] Message-ID: <20191107095611.18429-3-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20191107095611.18429-1-nsaenzjulienne@suse.de> With the introduction of ZONE_DMA in arm64 we moved the default CMA and crashkernel reservation into that area. This caused a regression on big machines that need big CMA and crashkernel reservations. Note that ZONE_DMA is only 1GB big. Restore the previous behavior as the wide majority of devices are OK with reserving these in ZONE_DMA32. The ones that need them in ZONE_DMA will configure it explicitly. Reported-by: Qian Cai <cai@lca.pw> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- arch/arm64/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 580d1052ac34..8385d3c0733f 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -88,7 +88,7 @@ static void __init reserve_crashkernel(void) if (crash_base == 0) { /* Current arm64 boot protocol requires 2MB alignment */ - crash_base = memblock_find_in_range(0, ARCH_LOW_ADDRESS_LIMIT, + crash_base = memblock_find_in_range(0, arm64_dma32_phys_limit, crash_size, SZ_2M); if (crash_base == 0) { pr_warn("cannot allocate crashkernel (size:0x%llx)\n", @@ -454,7 +454,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; - dma_contiguous_reserve(arm64_dma_phys_limit ? : arm64_dma32_phys_limit); + dma_contiguous_reserve(arm64_dma32_phys_limit); } void __init bootmem_init(void) -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-07 9:56 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-07 9:56 [PATCH v3 0/2] arm64: Fix CMA/crashkernel reservation Nicolas Saenz Julienne 2019-11-07 9:56 ` Nicolas Saenz Julienne 2019-11-07 9:56 ` [PATCH v3 1/2] ARM: dts: bcm2711: force CMA into first GB of memory Nicolas Saenz Julienne 2019-11-07 9:56 ` Nicolas Saenz Julienne 2019-11-07 11:20 ` Catalin Marinas 2019-11-07 11:20 ` Catalin Marinas 2019-11-07 17:59 ` Florian Fainelli 2019-11-07 17:59 ` Florian Fainelli 2019-11-07 19:09 ` Stefan Wahren 2019-11-07 19:09 ` Stefan Wahren 2019-11-14 20:35 ` Florian Fainelli 2019-11-14 20:35 ` Florian Fainelli 2019-11-15 9:02 ` Nicolas Saenz Julienne 2019-11-15 9:02 ` Nicolas Saenz Julienne 2019-11-07 9:56 ` Nicolas Saenz Julienne [this message] 2019-11-07 9:56 ` [PATCH v3 2/2] arm64: mm: reserve CMA and crashkernel in ZONE_DMA32 Nicolas Saenz Julienne 2021-03-22 18:34 ` Jon Masters 2021-03-22 18:34 ` Jon Masters 2021-03-22 18:40 ` Jon Masters 2021-03-22 18:40 ` Jon Masters 2021-03-22 18:48 ` Nicolas Saenz Julienne 2021-03-22 18:48 ` Nicolas Saenz Julienne
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191107095611.18429-3-nsaenzjulienne@suse.de \ --to=nsaenzjulienne@suse.de \ --cc=cai@lca.pw \ --cc=catalin.marinas@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.