From patchwork Fri Feb 28 13:42:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 3741711 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A71FABF13A for ; Fri, 28 Feb 2014 14:22:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D943020225 for ; Fri, 28 Feb 2014 14:22: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 B76BB2021C for ; Fri, 28 Feb 2014 14:21: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 1WJNmF-00041m-AC; Fri, 28 Feb 2014 13:47:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJNlI-0004VP-6Z; Fri, 28 Feb 2014 13:46:00 +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 1WJNjH-00049A-6S for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2014 13:43:59 +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 <0N1P00HBNKS9BR80@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2014 13:43:21 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-4e-531092788412 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id CC.BE.18565.87290135; Fri, 28 Feb 2014 13:43:20 +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:20 +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 10/11] arm64: add support for reserved memory defined by device tree Date: Fri, 28 Feb 2014 14:42:55 +0100 Message-id: <1393594976-16728-11-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: H4sIAAAAAAAAAyWRW0iTYQCG+/79h7la/a0pP1ImgzAiT9XFh4gURnwrwsAuMiFdOtTYVDYn mkQy1OY8jQVq02xLZ7Gmxsp0wyBt6DAq15ZGzkOsi9RZ1jQ6zNWcdy8Pz8t78bJZPC0ezS4q LhPLikUSAcnBXwUn3sdXaOnMpHduHG5qxym4pqxlwW+9jQDes78hYIvPQMAXgWEAfU0qHFr7 vwL4Wumj4FB9OwXX3Z8waPFOE9BQ14NDl62ThH32OQo+XhrFoHHGiUH9RA0BA20xcHLGT0Kz vZuCmrY+HNY+t1Nwc8iCw+XROhwOtK/g0GQLALj03YGf3I/MXWaA/v7RArRyWwOQq7kJQ1bd HIUafTUEspjqSeSZHiHRk56baDboZSG3Q0mg/sAyhlo2k9BdWzNAzU9NAPktMRf2Xuak5osl ReViWWJaLqewYVEFSh9SFfMNX8hqUE+qQQSboU8w3a4P2HaOYqbmB8KcRxsBYwhkqAEnlBsw JjjkDkskncyoV9VhiU8bAOPvwrckFr1AMipnY1jaR2cxtskN1lbG6UOMeqE1XODSQmb991qo wA6txTKd2tQtHBHC1W0LxPYwYmZ/zQAN4OrBDhOIFCvySuVXC6THEuQiqVxRXJCQVyK1gO0f N4aBcTxlDNBsINjF1Qj3ZPIIUbm8UjoGGDZLwOd+VtKZPG6+qPK6WFaSI1NIxPIxgLEjoqtB ypLQ65nK8qRVxdY9yvEE0/+lX9yNIs26QfGpEVyYbY36SOqOtxrvB0aqblyxH345qDoq5NsH 8TNwuFzX/zb3QWvGJehYPDCa6JF1REqcyHUnm/bzz/7MqXToT8etKA7Wdqzqn+10xuWdE5y3 tnfd6k3eKEP2HwJvafzqNQEuLxQlH2HJ5KL/kD+pbaUCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140228_084355_414315_BD855C30 X-CRM114-Status: UNSURE ( 8.20 ) 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 Acked-by: Catalin Marinas --- arch/arm64/Kconfig | 1 + arch/arm64/mm/init.c | 1 + 2 files changed, 2 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..3fb8d50dfdaa 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -160,6 +160,7 @@ void __init arm64_memblock_init(void) memblock_reserve(base, size); } + early_init_fdt_scan_reserved_mem(); dma_contiguous_reserve(0); memblock_allow_resize();