From patchwork Mon Aug 5 06:53:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 2838548 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 381919F3B9 for ; Mon, 5 Aug 2013 06:55:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B8CC2017A for ; Mon, 5 Aug 2013 06:55:53 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FAD020165 for ; Mon, 5 Aug 2013 06:55:52 +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 1V6EhR-00059w-UE; Mon, 05 Aug 2013 06:55:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6EhE-0003jF-3j; Mon, 05 Aug 2013 06:55:12 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6Egq-0003e7-3z for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2013 06:54:48 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MR100DSEPV2YYB0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2013 15:54:39 +0900 (KST) X-AuditID: cbfee61a-b7f196d000007dfa-fb-51ff4c2e0e0b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 85.19.32250.E2C4FF15; Mon, 05 Aug 2013 15:54:38 +0900 (KST) Received: from localhost.localdomain ([106.116.147.30]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MR1001JGPTNTLG1@mmp1.samsung.com>; Mon, 05 Aug 2013 15:54:38 +0900 (KST) From: Marek Szyprowski To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, devicetree@vger.kernel.org Subject: [PATCH v4 4/4] ARM: init: add support for reserved memory defined by device tree Date: Mon, 05 Aug 2013 08:53:44 +0200 Message-id: <1375685624-12103-5-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1375685624-12103-1-git-send-email-m.szyprowski@samsung.com> References: <1375685624-12103-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t9jAV09n/+BBm/umlv8nXSM3WL+kXOs Fq/ObGSzONv0ht1ie+cMdosvVx4yWWx6fI3VYu2Ru+wWG14eZLJYcLyF1eLPdDmLU9c/s1l8 //aNzeLv9k0sFofftLNarJ/xmsVBwOP3r0mMHpf7epk8ds66y+6xeUm9x+1/j5k9rpxoYvVY 9+cVk0f/XwOPvi2rGD1+vtTx+LxJLoA7issmJTUnsyy1SN8ugSuj68wPloLfbBUXb59lamB8 zNrFyMkhIWAi0fx1NzOELSZx4d56ti5GLg4hgUWMEsffbmOGcNqZJOa//MUOUsUmYCjR9baL DcQWEUiTmLFqAwuIzSzQxiLxAsIWFoiWeLZ1BhOIzSKgKvFu/l+wDbwCHhJbFvYDbeYA2qYg MWeSDYjJKeApcfNZJkiFEFDFgv6TbBMYeRcwMqxiFE0tSC4oTkrPNdQrTswtLs1L10vOz93E CA7wZ1I7GFc2WBxiFOBgVOLhVWD/HyjEmlhWXJl7iFGCg1lJhJe9/2+gEG9KYmVValF+fFFp TmrxIUZpDhYlcd4DrdaBQgLpiSWp2ampBalFMFkmDk6pBsYOO8t32y7N3G/bkMV24EGWzqRd 8ulblgbtLWmfZ3hSPG1tUGD8ybunVrPfKGt52SZYN1WqJPLADnFX7wyWPP3Dgg89ykJsb8i0 WM3+PVN7Bttzn+Iw8YafTySqX1rxc79iOK/5XGujZhnv7l21fVtivth7Sq1a9yb5qML7cLfN ljNY3c82hiuxFGckGmoxFxUnAgAOP4YXbAIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130805_025448_390712_A170E974 X-CRM114-Status: GOOD ( 10.75 ) X-Spam-Score: -5.2 (-----) Cc: Laura Abbott , Arnd Bergmann , Tomasz Figa , Nishanth Peethambaran , Michal Nazarewicz , Grant Likely , Marc , Kyungmin Park , Sylwester Nawrocki , Olof Johansson , Sascha Hauer , Marek Szyprowski 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=-2.5 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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: Kyungmin Park --- arch/arm/mm/init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 15225d8..82db8d8 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -377,6 +378,8 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) if (mdesc->reserve) mdesc->reserve(); + dma_reserved_mem_of_reserve(); + /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory