]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
ARM: zynq: Reserve correct amount of non-DMA RAM
authorKyle Roeschley <kyle.roeschley@ni.com>
Mon, 31 Oct 2016 16:26:17 +0000 (11:26 -0500)
committerLuis Henriques <luis.henriques@canonical.com>
Fri, 20 Jan 2017 11:27:23 +0000 (11:27 +0000)
commit81ff00b9d1ea718b1f3b7c573e31d75a125e2fdd
tree45e9ef696091f2e127bf0fa73e2d3ec3523f89ec
parentdbc539218e62e6cea15251e6cd42e62ab07666b3
ARM: zynq: Reserve correct amount of non-DMA RAM

BugLink: http://bugs.launchpad.net/bugs/1656876
commit 7a3cc2a7b2c723aa552028f4e66841cec183756d upstream.

On Zynq, we haven't been reserving the correct amount of DMA-incapable
RAM to keep DMA away from it (per the Zynq TRM Section 4.1, it should be
the first 512k). In older kernels, this was masked by the
memblock_reserve call in arm_memblock_init(). Now, reserve the correct
amount excplicitly rather than relying on swapper_pg_dir, which is an
address and not a size anyway.

Fixes: 46f5b96 ("ARM: zynq: Reserve not DMAable space in front of the kernel")
Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Tested-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
arch/arm/mach-zynq/common.c