From patchwork Fri Aug 9 11:51:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 2841892 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 04A4DBF546 for ; Fri, 9 Aug 2013 11:53:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C05E220362 for ; Fri, 9 Aug 2013 11:53:14 +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 1F81F2034A for ; Fri, 9 Aug 2013 11:53:13 +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 1V7lFe-00033f-02; Fri, 09 Aug 2013 11:53:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7lFZ-0002yv-2t; Fri, 09 Aug 2013 11:52:57 +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 1V7lFK-0002vw-Jy for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 11:52:44 +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 <0MR9007XNIBOWLK0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 20:52:36 +0900 (KST) X-AuditID: cbfee61a-b7f196d000007dfa-ad-5204d803f6b3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 71.30.32250.308D4025; Fri, 09 Aug 2013 20:52:36 +0900 (KST) Received: from localhost.localdomain ([106.116.147.30]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MR900DY2IAQ4070@mmp2.samsung.com>; Fri, 09 Aug 2013 20:52:35 +0900 (KST) From: Marek Szyprowski To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, devicetree@vger.kernel.org Subject: [PATCH v5 3/3] ARM: init: add support for reserved memory defined by device tree Date: Fri, 09 Aug 2013 13:51:59 +0200 Message-id: <1376049119-12655-4-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1376049119-12655-1-git-send-email-m.szyprowski@samsung.com> References: <1376049119-12655-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t9jQV2WGyxBBguOMln8nXSM3WL+kXOs Fq/ObGSzeNPbwWJxtukNu8X2zhnsFl+uPGSy2PT4GqvF2iN32S02vDzIZLH0+kUmiwXHW1gt /kyXszh1/TObxYTpa1ksvn/7xmbxd/smFovDb9qBxh1sY7FYP+M1i4OIx5p5axg9fv+axOjx evIERo/Lfb1MHjtn3WX32Lyk3uP2v8fMHldONLF6rPvzismj/6+BR9+WVYweP1/qeHzeJOex cW5oAF8Ul01Kak5mWWqRvl0CV0bH1PWMBUfYK57tb2BuYFzG1sXIwSEhYCLR8Ya1i5ETyBST uHBvPVCYi0NIYDqjxJvP75ggnHYmiT/HHrODVLEJGEp0ve1iA7FFBNIkZqzawAJSxCywiFXi zJ/NYKOEBaIl2hatYAHZwCKgKjHlmz1ImFfAQ+LUi72MEIsVJOZMsgEJcwp4SnztWcIIYgsB leyaPZt1AiPvAkaGVYyiqQXJBcVJ6bmGesWJucWleel6yfm5mxjBUfJMagfjygaLQ4wCHIxK PLyK25mDhFgTy4orcw8xSnAwK4nwbp/AEiTEm5JYWZValB9fVJqTWnyIUZqDRUmc90CrdaCQ QHpiSWp2ampBahFMlomDU6qBsTp6SnyE1H+u5hAvtpZ4PpWM/vvT1e0FBFemN99lS3kWYbtu 4jqFLRe8Z86+/GpzyvIv61vLg7bICumcfngsvydAS8Hm6C6RwFbTN6UFrd+X5eb9TBCeLq0g /8jhd9bPrR6rbPuaNZmOxFdWcD6+9W43A0vWthTJ/RF66wpqFnmJRVr/PXdeiaU4I9FQi7mo OBEAge6/LY4CAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130809_075242_879770_DB58EF3D X-CRM114-Status: GOOD ( 10.60 ) X-Spam-Score: -5.1 (-----) Cc: Mark Rutland , Laura Abbott , Pawel Moll , Arnd Bergmann , Stephen Warren , Tomasz Figa , Nishanth Peethambaran , Michal Nazarewicz , Grant Likely , Marc , Kyungmin Park , Sylwester Nawrocki , Olof Johansson , Ian Campbell , 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.4 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 Acked-by: Michal Nazarewicz --- 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..7c1c4b2 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -17,6 +17,7 @@ #include #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