From patchwork Sun Jun 12 06:54:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 9171419 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 381D660574 for ; Sun, 12 Jun 2016 06:59:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29305265B9 for ; Sun, 12 Jun 2016 06:59:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DBA227C8F; Sun, 12 Jun 2016 06:59:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 987CA265B9 for ; Sun, 12 Jun 2016 06:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932191AbcFLGzA (ORCPT ); Sun, 12 Jun 2016 02:55:00 -0400 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:15528 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752853AbcFLGyl (ORCPT ); Sun, 12 Jun 2016 02:54:41 -0400 Received: from sa76r4 (y081184.ppp.asahi-net.or.jp [118.243.81.184]) by mail1.asahi-net.or.jp (Postfix) with ESMTP id 6ACD5228EC; Sun, 12 Jun 2016 15:54:39 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by sa76r4 (Postfix) with ESMTP id 5675712A7E; Sun, 12 Jun 2016 15:54:39 +0900 (JST) X-Virus-Scanned: Debian amavisd-new at sa76r4.localdomain Received: from sa76r4 ([127.0.0.1]) by localhost (sa76r4.localdomain [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T4lafIC6qmPr; Sun, 12 Jun 2016 15:54:39 +0900 (JST) Received: by sa76r4 (Postfix, from userid 1000) id 3A058122F7; Sun, 12 Jun 2016 15:54:39 +0900 (JST) From: Yoshinori Sato To: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yoshinori Sato Subject: [PATCH v2 01/17] sh: Add sh-specific early_init_dt_reserve_memory_arch Date: Sun, 12 Jun 2016 15:54:19 +0900 Message-Id: <1465714475-24111-2-git-send-email-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1465714475-24111-1-git-send-email-ysato@users.sourceforge.jp> References: <1465714475-24111-1-git-send-email-ysato@users.sourceforge.jp> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP sh used P1 address space in early device tree. So need convert P1 to physical address before reserve memory. Signed-off-by: Yoshinori Sato --- arch/sh/boards/of-generic.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c index 57d45dc..fe2d917 100644 --- a/arch/sh/boards/of-generic.c +++ b/arch/sh/boards/of-generic.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -203,3 +204,14 @@ static int __init sh_of_device_init(void) return 0; } arch_initcall_sync(sh_of_device_init); + +int __init early_init_dt_reserve_memory_arch(phys_addr_t base, + phys_addr_t size, bool nomap) +{ + if (nomap) + return memblock_remove(base, size); + + if (base >= P1SEG) + base = base & ~P1SEG; + return memblock_reserve(base, size); +}