lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 032/370] ARM: zynq: Reserve correct amount of non-DMA RAM
    3.16.42-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kyle Roeschley <kyle.roeschley@ni.com>

    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: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/arm/mach-zynq/common.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/arm/mach-zynq/common.c
    +++ b/arch/arm/mach-zynq/common.c
    @@ -59,7 +59,7 @@ void __iomem *zynq_scu_base;
    static void __init zynq_memory_init(void)
    {
    if (!__pa(PAGE_OFFSET))
    - memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir));
    + memblock_reserve(__pa(PAGE_OFFSET), 0x80000);
    }

    static struct platform_device zynq_cpuidle_device = {
    \
     
     \ /
      Last update: 2017-03-10 15:16    [W:3.629 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site