Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: CMA: Do not reserve memory if not required

Even if CMA is disabled, the for_each_memblock macro expands
to run reserve_bootmem once. Hence, reserve_bootmem attempts to
reserve location 0 of size 0.

Add a check to avoid that.

Issue was highlighted during testing with EVA enabled.
resrve_bootmem used to exit gracefully when passed arguments to
reserve 0 size location at 0 without EVA.

But with EVA enabled, macros would point to different addresses
and the code would trigger a BUG.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Tested-by: Markos Chandras <markos.chandras@imgtec.com>
Tested-by: Huacai Chen <chenhc@lemote.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8231/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Zubair Lutfullah Kakakhel and committed by
Ralf Baechle
30fa0530 5df4c8db

+2 -1
+2 -1
arch/mips/kernel/setup.c
··· 683 683 dma_contiguous_reserve(PFN_PHYS(max_low_pfn)); 684 684 /* Tell bootmem about cma reserved memblock section */ 685 685 for_each_memblock(reserved, reg) 686 - reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); 686 + if (reg->size != 0) 687 + reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); 687 688 } 688 689 689 690 static void __init resource_init(void)