From patchwork Fri Feb 28 13:42:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 3741771 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 AD7719F2ED for ; Fri, 28 Feb 2014 14:28:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D278D20259 for ; Fri, 28 Feb 2014 14:28:56 +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 047F9201BB for ; Fri, 28 Feb 2014 14:28:55 +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 1WJNmN-00047v-96; Fri, 28 Feb 2014 13:47:08 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJNlS-0004Vx-6s; Fri, 28 Feb 2014 13:46:10 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJNjI-00048m-Ls for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2014 13:44:01 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N1P00MX7KS73L70@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2014 13:43:19 +0000 (GMT) X-AuditID: cbfec7f4-b7f796d000005a13-28-5310927652ac Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id AB.55.23059.67290135; Fri, 28 Feb 2014 13:43:18 +0000 (GMT) Received: from amdc1339.mshome.net ([106.116.147.30]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N1P002ZJKROU750@eusync3.samsung.com>; Fri, 28 Feb 2014 13:43:18 +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 v6 09/11] arm: add support for reserved memory defined by device tree Date: Fri, 28 Feb 2014 14:42:54 +0100 Message-id: <1393594976-16728-10-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1393594976-16728-1-git-send-email-m.szyprowski@samsung.com> References: <1393594976-16728-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAyWRa0hTYRzGe8/OzjlbDo/T4iClpYgUZM6CXkIyv71GoGgWFGEnHSo5lU1H BqEtJ3rysiailZeGsw9zXpjlZdhFWZtoiua11LSmlLrKmIjVZjn99vyf5/f79Kd4Yi3uT6Vn 5kjlmWxGECHEh7ZtkyeUWjoh/N3kKejWWkm4rlLz4M9npQA2WEb4sMKh48M3rm4AHWXFOOxp /QHgsMpBwq6SGhJuTHzGoMk+xYe6Ij0Ox821BGyxzJOwfaUPg03TYxh8aivkQ1d1ABycdhLQ aGkkoaa6BYfqlxYSurtMOFztK8JhW80aDg1mF4Arvwbw84eQsd4I0N8/WoDWKjUAjZeXYajn 8TyJSh2FfGQylBBobqqXQB36fDS7beehiQEVH7W6VjFU4Q5HdeZygMqfGwBymgLifK4KI1Ok GelKqfzkuRvCNPuLdTJ7mbxd9bUYFAAjwQEBxdCnmYVXHby9fJAZ/dS20wspMd0EmM7mt2Dv eIAxxoYvfA9F0BKG+87t2n60DjDOetwD8egFgikeK8U8gy99hamaq9gVcDqE2awb3BEoSkTH MNbGC57I0EeYWm2khxDstAXVC7u0mEbM7NY00ADRU7DPAA5Ic5OzFTdTZZIwBStT5GamhiVn yUxg748b3aDRerYf0BQI8hJpYrwTxHxWqciT9QOG4gX5iZZUdIJYlMLm3ZHKs5LkuRlSRT/A KIF/AZByvqIke6hTG//bGpJ4ZltzrO5fu3sx6tL1153c3WEbJ47a5CJusfe6vj00z8SKYj+M HG5CgTNRS9HckFK3Zr6c2LmlTgzXLcqu3Y+OyPdeDo3br/cZmuutLAl8pFZTzRdlqet6JtQr 3paT/2TUO/jj0Xjz0vtgVjAscWaNB+GKNFZynCdXsP8BL3SwbqUCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140228_084357_001560_13391775 X-CRM114-Status: UNSURE ( 8.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.8 (---) 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.1 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/arm/Kconfig | 1 + arch/arm/mm/init.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e25419817791..d0262bea8020 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1918,6 +1918,7 @@ config USE_OF select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE + select OF_RESERVED_MEM help Include support for flattened device tree machine descriptions. diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 804d61566a53..2a77ba8796ae 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -323,6 +323,8 @@ void __init arm_memblock_init(struct meminfo *mi, if (mdesc->reserve) mdesc->reserve(); + early_init_fdt_scan_reserved_mem(); + /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory