From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761843AbcLSCH7 (ORCPT ); Sun, 18 Dec 2016 21:07:59 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:36452 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753301AbcLSCH5 (ORCPT ); Sun, 18 Dec 2016 21:07:57 -0500 From: Serge Semin To: ralf@linux-mips.org, paul.burton@imgtec.com, rabinv@axis.com, matt.redfearn@imgtec.com, james.hogan@imgtec.com, alexander.sverdlin@nokia.com, robh+dt@kernel.org, frowand.list@gmail.com Cc: Sergey.Semin@t-platforms.ru, linux-mips@linux-mips.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Serge Semin Subject: [PATCH 02/21] MIPS memblock: Add dts mem and reserved-mem callbacks Date: Mon, 19 Dec 2016 05:07:27 +0300 Message-Id: <1482113266-13207-3-git-send-email-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1482113266-13207-1-git-send-email-fancer.lancer@gmail.com> References: <1482113266-13207-1-git-send-email-fancer.lancer@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to get a structured table of platform devices, it is widespread amongst modern systems to use fdt'es. MIPS should support one as well. Particularly /memory/ and /reserved-memory/ should be analyzed and corresponding regions registered with memblock subsystem. Signed-off-by: Serge Semin --- arch/mips/kernel/prom.c | 32 ++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 5fcec30..f21eb8c 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,36 @@ char *mips_get_machine_name(void) #ifdef CONFIG_USE_OF void __init early_init_dt_add_memory_arch(u64 base, u64 size) { - return add_memory_region(base, size, BOOT_MEM_RAM); + /* Check whether specified region is well formed */ + if (sanity_check_dt_memory(&base, &size)) + return; + + /* Memory region should be in boot_mem_map, so use the old method */ + add_memory_region(base, size, BOOT_MEM_RAM); +} + +int __init early_init_dt_reserve_memory_arch(phys_addr_t base, + phys_addr_t size, bool nomap) +{ + /* + * NOTE We don't use add_memory_region() method here, since fdt + * reserved-memory regions are declared within already added memory, + * while boot_mem_map consists of unique regions + */ + + /* Check whether region is free. If so just ignore it */ + if (memblock_is_region_reserved(base, size)) { + pr_err("FDT reserve-node %08zx @ %pa overlaps in-use memory\n", + (size_t)size, &base); + return -EBUSY; + } + + /* If it can be mapped, then just reserve the region */ + if (!nomap) + return memblock_reserve(base, size); + + /* Completely remove region if it shouldn't be mapped */ + return memblock_remove(base, size); } void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -- 2.6.6