From patchwork Thu Feb 20 10:52:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 3685941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 41CFF9F1EE for ; Thu, 20 Feb 2014 10:55:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FC96201B6 for ; Thu, 20 Feb 2014 10:55:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B13F2012E for ; Thu, 20 Feb 2014 10:54:59 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGRGW-00048R-2L; Thu, 20 Feb 2014 10:54:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGRGM-0000yq-R7; Thu, 20 Feb 2014 10:53:54 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGRFs-0000sI-Ta for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2014 10:53:25 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N1A00BG6JKFS300@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2014 10:53:03 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-37-5305de8d5a77 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 3F.C1.18565.D8ED5035; Thu, 20 Feb 2014 10:53:01 +0000 (GMT) Received: from amdc1339.mshome.net ([106.116.147.30]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N1A005WSJK1HXB0@eusync2.samsung.com>; Thu, 20 Feb 2014 10:53:01 +0000 (GMT) From: Marek Szyprowski To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v4 6/7] arm64: add support for reserved memory defined by device tree Date: Thu, 20 Feb 2014 11:52:46 +0100 Message-id: <1392893567-31623-7-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1392893567-31623-1-git-send-email-m.szyprowski@samsung.com> References: <1392893567-31623-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAyXRXUjTURgG8M72/9ps9XdqHEREBl2oaBolJzHJLuJ0E9FIxQtt6VLLqWwp GWRrfi+dc0KamSmp0PCLpamrWY6lVrhcDofUZmY3zpWWfVhNyendj/fh4bl4Ga5QRwQzuflX pfJ8SZ6I4hNvtibtUXUuUhxjsyWgTd0EjdZUFVy02l0L0AOLlUT1ng4SvfCOAOSpqybQaN9X gKZVHhoN1zTT6Id9kYMMS3Mk6qjsJNCssZVCvRYnjQaWxzmoy2HjoPbJchJ5m0LRa8c6hXos D2mkbeolUIXJQqPNYQOB3OOVBOpvXiGQ3ugFaPnbFHEiBPe09QD8768O4JVGLcCzmjoOHm1x 0rjWU05ig76Gwh/mnlH4cedN/H5riYvtUyoS93ndHFy/GYPvGzUAawb1AK8bQs/6p/ETsqR5 ucVS+aHEC/wcu9ZBF24w15wbDZQSGGk14DGQPQKtViW56wNwxtVPqQGfEbJdAC6bVglfIGRv c6B5RugzxcZC9Rc15XMg2wHgehvhK3DZBQpW22o5viCATYEfh27tmGAPwsG3n3csYDGsWhza NrO9FgZbdQm+M489DctcTnJ3C0NjyyypBYJ2sEcPgqRFmYWKi9myw9EKiUxRlJ8dnVkgM4Dd P/4cAV0T8WbAMkC0V5DqIMRCUlKsKJGZAWS4okDBk3lSLBRkSUquS+UFGfKiPKnCDDgML1gJ 7ihd4qd+r0olHvVAwK+mcHEqvBye1v9HmyXfiivwZgbzzg3H+6+xrVV0CIzj6+HGvLU00tqY 8k5vvhQQZDn68rfbrTp1MqItPXFf2Fhy0n5T9bHnpeP3zkR2Zwx8ClyNX7ibPlZ5nJdkb5h+ 5IrSmG4oyoA++cr3To/fzPkREaHIkcRGcOUKyX8DABzepQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140220_055325_186324_1D00623F X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.5 (----) Cc: Mark Rutland , Benjamin Herrenschmidt , Tomasz Figa , Will Deacon , Tomasz Figa , Paul Mackerras , Marek Szyprowski , Arnd Bergmann , Josh Cartwright , Catalin Marinas , Grant Likely , Laura Abbott , Ian Campbell , Pawel Moll , Stephen Warren , Sascha Hauer , Michal Nazarewicz , Marc , Nishanth Peethambaran , Rob Herring , Kumar Gala , Olof Johansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Enable reserved memory initialization from device tree. Signed-off-by: Marek Szyprowski --- arch/arm64/Kconfig | 1 + arch/arm64/mm/init.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 27bbcfc7202a..6abf15407dca 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -43,6 +43,7 @@ config ARM64 select NO_BOOTMEM select OF select OF_EARLY_FLATTREE + select OF_RESERVED_MEM select PERF_USE_VMALLOC select POWER_RESET select POWER_SUPPLY diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index d0b4c2efda90..447550d6bd9b 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -160,6 +161,7 @@ void __init arm64_memblock_init(void) memblock_reserve(base, size); } + early_init_fdt_scan_reserved_mem(); dma_contiguous_reserve(0); memblock_allow_resize();