target/linux/bcm27xx/patches-5.4/950-0633-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch

   1 From d4cf092a0e923361f521e1bc7d1fbfb1907958b3 Mon Sep 17 00:00:00 2001
   2 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
   3 Date: Thu, 7 Nov 2019 10:56:11 +0100
   4 Subject: [PATCH] arm64: mm: reserve CMA and crashkernel in ZONE_DMA32
   5
   6 commit bff3b04460a80f425442fe8e5c6ee8c3ebef611f upstream.
   7
   8 With the introduction of ZONE_DMA in arm64 we moved the default CMA and
   9 crashkernel reservation into that area. This caused a regression on big
  10 machines that need big CMA and crashkernel reservations. Note that
  11 ZONE_DMA is only 1GB big.
  12
  13 Restore the previous behavior as the wide majority of devices are OK
  14 with reserving these in ZONE_DMA32. The ones that need them in ZONE_DMA
  15 will configure it explicitly.
  16
  17 Fixes: 1a8e1cef7603 ("arm64: use both ZONE_DMA and ZONE_DMA32")
  18 Reported-by: Qian Cai <cai@lca.pw>
  19 Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  20 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  21 ---
  22  arch/arm64/mm/init.c | 4 ++--
  23  1 file changed, 2 insertions(+), 2 deletions(-)
  24
  25 --- a/arch/arm64/mm/init.c
  26 +++ b/arch/arm64/mm/init.c
  27 @@ -91,7 +91,7 @@ static void __init reserve_crashkernel(v
  28
  29         if (crash_base == 0) {
  30                 /* Current arm64 boot protocol requires 2MB alignment */
  31 -               crash_base = memblock_find_in_range(0, ARCH_LOW_ADDRESS_LIMIT,
  32 +               crash_base = memblock_find_in_range(0, arm64_dma32_phys_limit,
  33                                 crash_size, SZ_2M);
  34                 if (crash_base == 0) {
  35                         pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
  36 @@ -459,7 +459,7 @@ void __init arm64_memblock_init(void)
  37
  38         high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
  39
  40 -       dma_contiguous_reserve(arm64_dma_phys_limit ? : arm64_dma32_phys_limit);
  41 +       dma_contiguous_reserve(arm64_dma32_phys_limit);
  42  }
  43
  44  void __init bootmem_init(void)