From patchwork Tue Feb 18 13:38:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 24844 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03D71202B2 for ; Tue, 18 Feb 2014 13:42:21 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id k19sf18942663igc.3 for ; Tue, 18 Feb 2014 05:42:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=bArTHsnDIH+E+hlJ007DJQO8Gt7YdKLDAGQU2x1HGRk=; b=eonm7xAhve8oNQsG/N8o3B1B0wCfZfiv07FSsZhWbqkAMJYkFvM34WuwDwVtXOa4br bge3aDvNjYypyrl/anvIOmGZY6dZjoJarUDoblCtxM81KLflBjwO07OnAF4T0XRR8+8A gnGdl5rx2tYjjcBHw4itXEdbZNqb6rQQPi46GuYLJUhHjY4XlYM8pdS3/Wz3LwA6w1El 6OULKaQy2H67atkR2ZruO2UiRNv9SEYdVgkxIRTT4w88ZwqT0Oh3tCtBo9F//UXt6B9+ yZS0Kb1/tmFKfIagdVllrLOTNnGST6L75TceJJjMXJ/MXtb9l2j6gBVeF1TaS/+23fcp 8yiQ== X-Gm-Message-State: ALoCoQnoQidRZn9AImeMrE/JeG6pkloJ1nZmqH8idmpz6Q0EQ+3nbD08ecw7q9W0kSLAHveroHTq X-Received: by 10.182.22.133 with SMTP id d5mr12883024obf.27.1392730941179; Tue, 18 Feb 2014 05:42:21 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.33.200 with SMTP id j66ls1384093qgj.80.gmail; Tue, 18 Feb 2014 05:42:21 -0800 (PST) X-Received: by 10.52.186.230 with SMTP id fn6mr18124550vdc.14.1392730941049; Tue, 18 Feb 2014 05:42:21 -0800 (PST) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id y6si5510788veb.25.2014.02.18.05.42.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Feb 2014 05:42:21 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id jy13so13815542veb.27 for ; Tue, 18 Feb 2014 05:42:20 -0800 (PST) X-Received: by 10.52.190.1 with SMTP id gm1mr12345351vdc.21.1392730940925; Tue, 18 Feb 2014 05:42:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp217256vcz; Tue, 18 Feb 2014 05:42:20 -0800 (PST) X-Received: by 10.15.45.131 with SMTP id b3mr446829eew.105.1392730939770; Tue, 18 Feb 2014 05:42:19 -0800 (PST) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id s6si40143176eel.35.2014.02.18.05.42.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Feb 2014 05:42:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1WFkuz-0001Od-T4; Tue, 18 Feb 2014 13:41:01 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1WFkus-0001OK-It for linaro-mm-sig@lists.linaro.org; Tue, 18 Feb 2014 13:40:54 +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 <0N17003OS221RE30@mailout3.samsung.com> for linaro-mm-sig@lists.linaro.org; Tue, 18 Feb 2014 22:42:02 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-2d-530363290fda Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 60.D5.29263.92363035; Tue, 18 Feb 2014 22:42:01 +0900 (KST) Received: from amdc1339.mshome.net ([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 <0N17001N61VOJ880@mmp1.samsung.com>; Tue, 18 Feb 2014 22:42:01 +0900 (KST) 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 Date: Tue, 18 Feb 2014 14:38:00 +0100 Message-id: <1392730681-14695-6-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1392730681-14695-1-git-send-email-m.szyprowski@samsung.com> References: <1392730681-14695-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWRW0iTYQCG+/7T/o0GP8vqb4HFwgtFTdPgoySlpL5uIpNu1Kilf7p0OjZP y4vGcB5GOtELJXRtOTHNaa3EOSrcGmmGnWZaHrNFoc4DKF20KblJd8/L+8B78dK4yESIaVlh MacslBZIKAHxbtvLxERm4+lxjpFEuNX4hgfXtTocPnC/J6HBZybhUMAOoK+uhoCDvasAjml9 PDhQ28KDm+MLGLR5J0horrIQ0ONopaDVPcuDTxadGOyY/IRB03AlCQPN4XB0coOCDc1WAupe unlwa8BGwCVnFQH7WpYJ2O0IgJRDqMfYA5D/byNAy00NAHnq6zA0eH+Wh+75Kklk666l0MzE Cwo9s9xF09teHI2PaEnUG1jCkGErDtU/7wZowxaOnrZdvcxkCJJyuAJZKac8fuaGIO/b5jSl GOaX60drMA1Y5ekBn2aZRHb2VRu+ywfYj3N9lB4IaBHzELA6Yx+5G3QYuzK/SgUtioln9Sv6 EIcxZsBuGImghDPNFNvevxYq9jGZrHXRGGKCiWDbF+wgyEIGsWv+3ztz9M7cUba1MSmIfOYi uzkZHTREO0b/vBdvAEIT2NMN9nOKbIXqZq48PlYllatKCnNjs4vkNhD67ZfYDro00AUYGkj2 CtePYekiUlqqUstdgKVxSZgwMgNPFwlzpOo7nLLourKkgFO5wGGakBwUDulOp4mYXGkxl89x Ck75v8VovlgDsrKijkSfmpqzXGjrEPEzIyRwWCCTnXydqPqZWu2q9c05Uz5Mfa3R+Mk0Q68X vL2kLa82DXZ99khWHv/hn8toik64dtsSuGXw26VlyannuZhAwmjXWPG6A335/kPdOT/lcc40 Aau6Io8L78y3C1xDyWUnKq64xY/OJsXFmCWEKk8aH4UrVdJ/jZifDLMCAAA= Cc: Mark Rutland , Pawel Moll , Arnd Bergmann , Stephen Warren , Josh Cartwright , Benjamin Herrenschmidt , Tomasz Figa , Tomasz Figa , Michal Nazarewicz , Olof Johansson , Kyungmin Park , Rob Herring , Kumar Gala , Grant Likely , Ian Campbell , Sascha Hauer Subject: [Linaro-mm-sig] [PATCH v3 5/6] ARM: init: add support for reserved memory defined by device tree X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-mm-sig-bounces@lists.linaro.org Sender: linaro-mm-sig-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Enable reserved memory initialization from device tree. Signed-off-by: Marek Szyprowski --- arch/arm/Kconfig | 1 + arch/arm/mm/init.c | 3 +++ 2 files changed, 4 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..ebafdb479410 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -323,6 +324,8 @@ void __init arm_memblock_init(struct meminfo *mi, if (mdesc->reserve) mdesc->reserve(); + early_init_dt_scan_reserved_mem(); + /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory