From patchwork Fri Jan 5 23:20:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123571 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1403038qgn; Fri, 5 Jan 2018 15:22:20 -0800 (PST) X-Google-Smtp-Source: ACJfBot4rdWjqe78YVSf79n1snYt6RGAVDlH0n7HGV6fOduRiV+kHa2hnjZzapi61vFrvNGm02ge X-Received: by 10.99.112.3 with SMTP id l3mr3725884pgc.152.1515194540530; Fri, 05 Jan 2018 15:22:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194540; cv=none; d=google.com; s=arc-20160816; b=RslgaBFH8tuvwxjl1RalpzVx7Ukx8XtIT8zf8Ok4IJDiSHWSzY2/zaKLSSFTJXFCls UeU+rny7F+XTuEy+0FZdurMOT9isMr7UR6isGy3EQoztNmM6HESeCGrfTqkIYXu9A7Aq 95HFCLs3BMj6KeEJpLWV6hSIyhom4enZCTd+xaHIXeSu7GdKjgTSUidKCQzfy3M2+0z9 M8dtPQlIxFYJOHIjmkCQJKwk2D4IWa6NORATMCArKukGXeDviXpNOJYkUVIQOfT0+knY JELaG4knK22yvEW2ZjneqnL8mx4aqaJjI5NDKyXGND29PwOs72DPE+o38wBL46FtL5hl Zwqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=jS0EDtKp3J7hEq++QbWurWbGjKfPAZ5R+EzwhkTQI1g=; b=i4D2i1taysCfK5K6Lc+6wGrM+76BZXa2Y++c5SQ9Uhy7UDEBB45jIZJZQuWWzW9cZB WbeKoSUiAW/T1nWTMEqXo2kDEF5hjUTbu0mPcQ/CRLvQMUb+7JuW+FfdHu1+v8AYyYYK UU/p9Qnvb9mNu9w1EkQ/bCxEFoVuTCQpVpEZiD1qLvy8abTcgFJ9jcBiDt4fVGOeUtL0 BtqSrP1a3PX9s+hdmk1XRAuApQSCPQZeKRUG/jmKPZJRPCiCDZ6wDO6XFzQJRrISgMxC f1T1p3nA4y3KsFDqSPpKucJTt7632PZsOGtSqZyqJIJe3+uMrjzJ0NyJ3PoNlytfMZ9H ajCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h3si4667161pld.448.2018.01.05.15.22.20; Fri, 05 Jan 2018 15:22:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753451AbeAEXWT (ORCPT + 28 others); Fri, 5 Jan 2018 18:22:19 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:41059 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752644AbeAEXU7 (ORCPT ); Fri, 5 Jan 2018 18:20:59 -0500 Received: by mail-ot0-f193.google.com with SMTP id q39so5177530otb.8; Fri, 05 Jan 2018 15:20:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jS0EDtKp3J7hEq++QbWurWbGjKfPAZ5R+EzwhkTQI1g=; b=FbGnoTw7HrvoWrKVYoz5ZZfFBbfdAMbuUbfaV58qAlIaS2vffj16Aak8cCj8m3hllh ZnkMcKNhnvRu1U3ZRPrwsDncTaS0CRP7PQ+FXNsXceqQa6rrja6UE9owcj/oLFeqCAzO cg+xsICrf5wuKBPtlTGyx2OfgL7w6tyikiVLYDsb+miJLvMmAMteVqMXTGAkB1eqJ4Gv Fp+Pt7xjuSjxBhZj5f4bLt+ckEILskQxqzmcmjv1eihG507Z1Nj5lTxQq8F2htvShnup FVb0zKdZ3WcWJnU1a7wBlAitR8auQZhZpnRavWOuHkvT5WLdfrQWNJz1llmmisSmgYU4 +h4Q== X-Gm-Message-State: AKwxytfD1aixFfOcWcQFonhKWZa9bwbdUTNxX2iPSGwPuUPavKDfG/w8 lA5jWfmKewcwVwwlcgLhhENmCLU= X-Received: by 10.157.63.215 with SMTP id i23mr2915809ote.70.1515194458979; Fri, 05 Jan 2018 15:20:58 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:20:58 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Chris Zankel , Max Filippov , linux-xtensa@linux-xtensa.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Ley Foon Tan , nios2-dev@lists.rocketboards.org, Ralf Baechle , linux-mips@linux-mips.org, James Hogan , linux-metag@vger.kernel.org, Mikael Starvik , Jesper Nilsson , linux-cris-kernel@axis.com Subject: [PATCH 1/7] of/fdt: use memblock_virt_alloc for early alloc Date: Fri, 5 Jan 2018 17:20:48 -0600 Message-Id: <20180105232054.27394-2-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org memblock_virt_alloc() works for both memblock and bootmem, so use it and make early_init_dt_alloc_memory_arch a static function. The arches using bootmem define early_init_dt_alloc_memory_arch as either: __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)) or: alloc_bootmem_align(size, align) Both of these evaluate to the same thing as does memblock_virt_alloc for bootmem. So we can disable the arch specific functions by making early_init_dt_alloc_memory_arch static and they can be removed in subsequent commits. Cc: Frank Rowand Signed-off-by: Rob Herring --- drivers/of/fdt.c | 16 ++++------------ drivers/of/unittest.c | 11 ++++++++--- include/linux/of_fdt.h | 1 - 3 files changed, 12 insertions(+), 16 deletions(-) -- 2.14.1 diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 4675e5ac4d11..444e65aa0d29 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -1183,14 +1184,6 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, return memblock_reserve(base, size); } -/* - * called from unflatten_device_tree() to bootstrap devicetree itself - * Architectures can override this definition if memblock isn't used - */ -void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return __va(memblock_alloc(size, align)); -} #else void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) { @@ -1209,13 +1202,12 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, &base, &size, nomap ? " (nomap)" : ""); return -ENOSYS; } +#endif -void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align) +static void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) { - WARN_ON(1); - return NULL; + return memblock_virt_alloc(size, align); } -#endif bool __init early_init_dt_verify(void *params) { diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 0f8052f1355c..7a9abaae874d 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -5,6 +5,7 @@ #define pr_fmt(fmt) "### dt-test ### " fmt +#include #include #include #include @@ -2053,6 +2054,11 @@ static struct overlay_info overlays[] = { static struct device_node *overlay_base_root; +static void * __init dt_alloc_memory(u64 size, u64 align) +{ + return memblock_virt_alloc(size, align); +} + /* * Create base device tree for the overlay unittest. * @@ -2092,8 +2098,7 @@ void __init unittest_unflatten_overlay_base(void) return; } - info->data = early_init_dt_alloc_memory_arch(size, - roundup_pow_of_two(FDT_V17_SIZE)); + info->data = dt_alloc_memory(size, roundup_pow_of_two(FDT_V17_SIZE)); if (!info->data) { pr_err("alloc for dtb 'overlay_base' failed"); return; @@ -2102,7 +2107,7 @@ void __init unittest_unflatten_overlay_base(void) memcpy(info->data, info->dtb_begin, size); __unflatten_device_tree(info->data, NULL, &info->np_overlay, - early_init_dt_alloc_memory_arch, true); + dt_alloc_memory, true); overlay_base_root = info->np_overlay; } diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 444e6e283828..02c05028d0ba 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -83,7 +83,6 @@ extern void early_init_dt_add_memory_arch(u64 base, u64 size); extern int early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size); extern int early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool no_map); -extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align); extern u64 dt_mem_next_cell(int s, const __be32 **cellp); /* Early flat tree scan hooks */ From patchwork Fri Jan 5 23:20:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123565 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1402161qgn; Fri, 5 Jan 2018 15:21:06 -0800 (PST) X-Google-Smtp-Source: ACJfBos4oTGSG/ZL2cibVKGfDlUOrn7fwqlHlR1Wzp3d5OcbZ8kpI2K/Tw/VmVkBDwBJjlrShknh X-Received: by 10.98.253.16 with SMTP id p16mr4289004pfh.22.1515194466339; Fri, 05 Jan 2018 15:21:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194466; cv=none; d=google.com; s=arc-20160816; b=wN7X3EQipDBGDY2NyW1V9m4WL5jSUWDY424Pl3LNZtuhZMuZueAshon2BzJXFY1v1+ I3Hy7PU6+YjJg7/oNmKe34WunXt/394Vm5ruE73I3jJEckm608of6QNpl7rCtQfGjn9y fZ6KvNt8uNts+a1FvYxedXcgYBYmzInwJFNuR2BWcKksH6zKdIqGFT8GKkyGiE8BTSXm RVp05jRmfO2UqQKs1s63hQlJRPgjMhwIe8YTMksN54cOyBzoIt91WNMBNNQYC/c/hpZC o6rgLI7nFFPQGhqOtDMbied0wd47qTy19uthf5Q0CYtc4i+JYUnTDKwVn9XoioRqlNt0 j6mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=whwEHyrGToQrUN6ilQxTtgOn8ybQ4k1vwPlUBUMHdiQ=; b=YBNkQUBlKuzK8UELoQsOdWFQG1pLU8pYCxCqX+RJWFVZJH+XIZslPhOmhZAi6ad3qU mvFtM45Jfad/zjTCeBMNOFb+C9OmnRO6KLIG56aYU3C/5my9ybNuGTBAYdAWP75SrQWk 7VF9borvZsyKb107Ey9KpM+83ZvkvUXqFlwip4FURDIraorlqg2wOdA47+sAxqGHec3d 4rpaTgc1tYAQ7OgRTEcSExOuVsK3wWnNQIu83X7tCK8wr1+9xVni+oqJxoL36X3TuLuE dPWJbPUDjaA1a1JJkx0L13cVc2sgFg4XJZ1odjK4lXaLmHD90sOPf9uReF/zaCnX7YBZ qaPg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v77si4711446pfa.223.2018.01.05.15.21.06; Fri, 05 Jan 2018 15:21:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753076AbeAEXVD (ORCPT + 28 others); Fri, 5 Jan 2018 18:21:03 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:35724 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752928AbeAEXVA (ORCPT ); Fri, 5 Jan 2018 18:21:00 -0500 Received: by mail-ot0-f193.google.com with SMTP id q5so5186930oth.2; Fri, 05 Jan 2018 15:21:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=whwEHyrGToQrUN6ilQxTtgOn8ybQ4k1vwPlUBUMHdiQ=; b=B6jzm/Uihvl8pEhWDjgylC1EYLvlKE5Xjf/7NzbUcIylNSSPs4gYO8XtF1moq4pHjk wXP4qyJGbsO0Ce0sLIcrpWKaPphKOw1TKSrXn/To1gE/3m6jU8R2JfZoT9fNxFrTiow4 fWDDGpxgjyI08l3szI8bSARMfxH7dzqGlNScvBoPUt05OJOXPOGsfqgQnWFgmjm4Uliy 93kBAHa5CvM8ZFKpEDMd6pqOQoTqnHmnFfdNZU5h5HHZH7x2C1utHZskkCbCRa4q+9/a 3yNMgCIRSQl5NZ0Sn3bOsopsNItdQH4TPyFHrCquKx1n2kcPkWpdWNdYUEEmFTP3oj6n F1BQ== X-Gm-Message-State: AKwxytdkA/rGqk1Py2Zbna84QNEgK31fHaPYULhZzd7GleboD3qPcq81 gNk3uMerDK88zGOq3VxtpSt92PY= X-Received: by 10.157.88.9 with SMTP id r9mr2896735oth.93.1515194459980; Fri, 05 Jan 2018 15:20:59 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.20.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:20:59 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Mikael Starvik , Jesper Nilsson , linux-cris-kernel@axis.com Subject: [PATCH 2/7] cris: remove arch specific early DT functions Date: Fri, 5 Jan 2018 17:20:49 -0600 Message-Id: <20180105232054.27394-3-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the DT core code handles bootmem arches, we can remove the cris specific early_init_dt_alloc_memory_arch function. As the default early_init_dt_add_memory_arch just does a WARN, we can just remove the entire devicetree.c file. Cc: Mikael Starvik Cc: Jesper Nilsson Cc: linux-cris-kernel@axis.com Signed-off-by: Rob Herring --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/cris/kernel/Makefile | 19 ------------------- arch/cris/kernel/devicetree.c | 15 --------------- 2 files changed, 34 deletions(-) delete mode 100644 arch/cris/kernel/devicetree.c -- 2.14.1 diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile index af075a5fb9aa..e69de29bb2d1 100644 --- a/arch/cris/kernel/Makefile +++ b/arch/cris/kernel/Makefile @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# $Id: Makefile,v 1.12 2004/10/19 13:07:43 starvik Exp $ -# -# Makefile for the linux kernel. -# - -CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) -extra-y := vmlinux.lds - -obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o -obj-y += devicetree.o -obj-y += stacktrace.o - -obj-$(CONFIG_MODULES) += crisksyms.o -obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_SYSTEM_PROFILER) += profile.o - -clean: - diff --git a/arch/cris/kernel/devicetree.c b/arch/cris/kernel/devicetree.c deleted file mode 100644 index 36e1c658229f..000000000000 --- a/arch/cris/kernel/devicetree.c +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include - -void __init early_init_dt_add_memory_arch(u64 base, u64 size) -{ - pr_err("%s(%llx, %llx)\n", - __func__, base, size); -} - -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return alloc_bootmem_align(size, align); -} From patchwork Fri Jan 5 23:20:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123570 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1402858qgn; Fri, 5 Jan 2018 15:22:05 -0800 (PST) X-Google-Smtp-Source: ACJfBotuLaYYn0fWWPNzoFzs/EXzOa1OH2foXxZzdeYO19WO7LULpC17IFl1kIrUVskXOqOnsJTc X-Received: by 10.101.82.131 with SMTP id y3mr3760284pgp.306.1515194525246; Fri, 05 Jan 2018 15:22:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194525; cv=none; d=google.com; s=arc-20160816; b=IGMBLig/ofuJZwgcszISGTS6dH5z9qeuHqvT3zpHDS74aHKhcLOA6Yj9U+6QJ0O0b0 g7+Omd/j7NNS0SC3FP69tjcjHdmxkzuXw75xk3glWon/UTf1u8sylQPs3bfvyE1Y5Evh b3Or2sQPshvEim1nAb6F0fANCsXqlALMhtaHTKRr/RHA05E508PtY62qUdpmQF8TprFT KgF/xfQM1rphx25BMJpReVfHu47PX7xMv6iOyQdMRIUuJsUocTf0Wks4uCfugCIc9R/d YDnjJbUGBPuYVUvTy5KCUz9z00CwaHju9G/sgvH4KLiGeLIZMES7ofdp+TqIhP1kypOk 4OmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=YL3YbvmfAddxl/h9/kv4Jb9X0BXDJsT6Xu72L9M5ujE=; b=roLjbopVOXpCrr+JJR3iad3O57+7dQ6wC0kmrY1Xs6gQsJq4w18eyVCmxbZUfYe3w0 M9VSxDehdLZVlUkPmPNaqcSnMuT3uVoHxiazWN3pALp7bPmIHKFqKqCduVr7/k92eH7J 9nIDCGfww9lIKo2Nz88JpVbLIXDhlcWrLOpS2j/X1FYTv27lPB4mJkHFMzeUayR/AiP+ SZ5azR+rd4JKFyE8nGkJgaw3DR8A+cCRorEWRIha1uPv53odRUz15q325PrznVjSp8fG iWVdWcnhX+5+txHW3EAm/Qz33dBu0Ubr+8IvpmIh9yYYwsrtzwE6TZdVSnnvCV/yrvVy X0Xg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t197si4128825pgc.511.2018.01.05.15.22.05; Fri, 05 Jan 2018 15:22:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753427AbeAEXWD (ORCPT + 28 others); Fri, 5 Jan 2018 18:22:03 -0500 Received: from mail-ot0-f194.google.com ([74.125.82.194]:34599 "EHLO mail-ot0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752665AbeAEXVC (ORCPT ); Fri, 5 Jan 2018 18:21:02 -0500 Received: by mail-ot0-f194.google.com with SMTP id p16so2534372otf.1; Fri, 05 Jan 2018 15:21:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YL3YbvmfAddxl/h9/kv4Jb9X0BXDJsT6Xu72L9M5ujE=; b=oruYpG0D0rblym8hhPCp/pKbR7lGRY89kqSm/uOaLd8wgtOm2mYVnMosuCUNcYR49D GkKaPj+kzh8Su+mCj61eJaVZKmLNgMlIQls3pjOyC9LPwGCt+LtnWq9PdxyIac46R/Sr 4O/qTDG3iIb6RDPBKibIbwvXoePJX2FOzf1mveTI90Z8mnfRpL7sJLUaz/gr50STB+Lc EADok8q6AcfmU92YyaCZtW/PC6IKoZCmmL/0+VDCLOr57F3L+LYT0q5ODevvFuSTf82Y Sb8B/kh8g5Qykj13KJl1kr5IQ0XnnZNwcxyJkkAI4T0mJ28VU/qkaMlVa/xUVVBikb1O ycAQ== X-Gm-Message-State: AKwxytf0QAYBbraLY+yTywH7JXDnR8Kzo6H+mSLLU7sSmDSNZ3rPceGE vOC8boKFibMHuNVbYU5zFLUxW/c= X-Received: by 10.157.39.199 with SMTP id c65mr2933369otb.197.1515194460930; Fri, 05 Jan 2018 15:21:00 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.21.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:21:00 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , James Hogan , linux-metag@vger.kernel.org Subject: [PATCH 3/7] metag: remove arch specific early DT functions Date: Fri, 5 Jan 2018 17:20:50 -0600 Message-Id: <20180105232054.27394-4-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the DT core code handles bootmem arches, we can remove the metag specific early_init_dt_alloc_memory_arch function. As the default early_init_dt_add_memory_arch just does a WARN, we can remove it too. Cc: James Hogan Cc: linux-metag@vger.kernel.org Signed-off-by: Rob Herring --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/metag/kernel/devtree.c | 14 -------------- 1 file changed, 14 deletions(-) -- 2.14.1 diff --git a/arch/metag/kernel/devtree.c b/arch/metag/kernel/devtree.c index 18dd7aea9fdc..6af749a64438 100644 --- a/arch/metag/kernel/devtree.c +++ b/arch/metag/kernel/devtree.c @@ -14,26 +14,12 @@ #include #include #include -#include -#include -#include #include #include #include #include -void __init early_init_dt_add_memory_arch(u64 base, u64 size) -{ - pr_err("%s(%llx, %llx)\n", - __func__, base, size); -} - -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return alloc_bootmem_align(size, align); -} - static const void * __init arch_get_next_mach(const char *const **match) { static const struct machine_desc *mdesc = __arch_info_begin; From patchwork Fri Jan 5 23:20:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123569 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1402680qgn; Fri, 5 Jan 2018 15:21:50 -0800 (PST) X-Google-Smtp-Source: ACJfBot3kv4EXm2Q84h7v2T4epG3EgAvXhQXlQG5MzgYjeWAb6JtGPqoJv6VLJelz6pU540hy7ad X-Received: by 10.84.130.6 with SMTP id 6mr4727915plc.134.1515194510244; Fri, 05 Jan 2018 15:21:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194510; cv=none; d=google.com; s=arc-20160816; b=YLo42ITxE91aX1IViJUf9kWSJLs2wiVcssfUFylbhTWaiJdyVbhzBHoAYTOhU9TNtB NPJHmt9v/N7MAclJsEmRkpol2Jr+sFb5OLPlcFV9uJXj3tp0PTmmnheEP0aNzVjseAl5 NThFp6tq7BTUKJD0gykmBQvtBubE10OdJ+EXnSj/ESWgW9B6RMzgT2jvN21KHysLa7ts eIJuc/biFJATtxO5XZIKQm4qxFTlAvUVn1YWqOsGbfdVM7klpcQIXon2BBLbKFVE6HS/ TC3Eva3U99seDEdC+ORf6X+EixgcKYG40YY4/apQ4ixWXIl1RDr66NC4PrxEVZS/XxT7 mdGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0LBnnqjf+JYcv7Hs2WO4+gZN9BgoZl7bR2TdhCTKnpE=; b=AFeZGkeFRCblKD2wcZI8hXleCcMp0cuUICqMHgElD62CGoSlV1j3SvHMQZ8MHNykb9 8a12KfWSsiVIF7EF3oD8IPUHpCpcYIlWFZ5XjSMX5a0u2LatGzMjo/m7fmmvssEps+5Z 7nUWwFFGNawt/iTyXG3AEEooIntJ+lg+4VHWuK+bgTmIBYxCCW4ZZLbJx0p8tyD94Btr hIwVnjm+VvjYC9EB2PRIB4jq3BLsdeo0dc1CSqpohq0T42lyLiginlvhvCid6ycclAHe wI0doEAXbCeTkfiR3F21Idfu3KtZocVYjIxkUmGxeypED5ogSDiP3PtSrnL5MUEmbmSt VmUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t197si4128825pgc.511.2018.01.05.15.21.49; Fri, 05 Jan 2018 15:21:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753402AbeAEXVs (ORCPT + 28 others); Fri, 5 Jan 2018 18:21:48 -0500 Received: from mail-ot0-f196.google.com ([74.125.82.196]:43251 "EHLO mail-ot0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752933AbeAEXVC (ORCPT ); Fri, 5 Jan 2018 18:21:02 -0500 Received: by mail-ot0-f196.google.com with SMTP id p18so2021083otc.10; Fri, 05 Jan 2018 15:21:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0LBnnqjf+JYcv7Hs2WO4+gZN9BgoZl7bR2TdhCTKnpE=; b=QdPRus3cLykatxXj0Xnkwoy9gINZk5yC3CtgyPOAdInUsyr5lm9fmPV2gZU8Y0mGxA bEZ54g9VsVCNAZ+qBOuTEmZM3RUwkEHINU6F6hYZ9emfrJWAYMiDhQ4VWBtEIGOXR4jC suhse/QMEZg89nc58unQJ62Galoy6V8AVc5CYwhEVOVYxm+Ab08sLfjU5VMI8xP2SPPd QfBoF034ur95iZTgSu+TwwuHgCb6tlInPkVT9UWavWPeCPcnvPCJN0YUkgObMY9bKKmn JaEuWFHrpKvvhdn/5uDXOxf6OGOJDXz+2Nm30qhB3Z5ESbRswlzxM/HM4liLKGbhQ/VP BGSw== X-Gm-Message-State: AKwxytfm3gU4P5LoH0Srm30M1Naet3XtFzMkEJtVEPhXtWGzO5UI7T07 lYTfs9JtFSPPZxLwrkWPOH97Bz0= X-Received: by 10.157.21.48 with SMTP id u45mr2212472otf.382.1515194461923; Fri, 05 Jan 2018 15:21:01 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.21.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:21:01 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Ralf Baechle , linux-mips@linux-mips.org Subject: [PATCH 4/7] mips: remove arch specific early_init_dt_alloc_memory_arch Date: Fri, 5 Jan 2018 17:20:51 -0600 Message-Id: <20180105232054.27394-5-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the DT core code handles bootmem arches, we can remove the MIPS specific early_init_dt_alloc_memory_arch function. Cc: Ralf Baechle Cc: linux-mips@linux-mips.org Signed-off-by: Rob Herring --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/mips/kernel/prom.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.14.1 diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 0dbcd152a1a9..89950b7bf536 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -44,11 +44,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) return add_memory_region(base, size, BOOT_MEM_RAM); } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); -} - int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { From patchwork Fri Jan 5 23:20:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123567 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1402343qgn; Fri, 5 Jan 2018 15:21:20 -0800 (PST) X-Google-Smtp-Source: ACJfBovWd45KkFZggndZtnyNWovCLlAMoAB0PHcYYT8XQwp1dsPRQAJdX5Hs7w9cTmRgL5z6tugT X-Received: by 10.101.96.134 with SMTP id t6mr3723265pgu.253.1515194480829; Fri, 05 Jan 2018 15:21:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194480; cv=none; d=google.com; s=arc-20160816; b=FprXjim6P+SwlIFx390eFF9M5skzMxJ+Wi8rvNjQcJZj5kMtcOUx9OwhVM7LPVLH15 /RhLYfG11FGNAg9i/V3Bshi0yCf4HBDqck3TzT3mDWeMnXBTJurlkX1x02hc23ubTkgO PiGdqBqMHmhN6hjMRCuy4ap7u/e1njOXLFAjRD4MD8XDfWLpJ+1KfSMF8fFqe1gInJu5 JqJ6FliPveH7NUYAk/PnwgjD+d8+ywJtAU5cYvVtl1pQgawHy1U1/BVhMkVppKNJ/0aT Y2gzkXHN619roFpQ9t6t0dVHJUqVafTObeN+vzKX68Ay0dd6mlDtVORSIcN5dNnLbMD+ 1Gjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=eFw7Rafm/KKKgxUSSjz5WY5Xb9uMe9aEwCKkj8UEw0E=; b=hzSeXc/iBfkFN852T6tjX917K0n6cBvrCaZIN9PJKDedAIcQl/ChgLBF9jnO92W14c 3z/lsesgePctHI9HxK47J5OBn0BKg6nxA4jX6IKFtLNhNhBoNCtDH89a/bBwRvQLK4d5 RRVRa4crltrMIXtIyRDMT+dUz+79mZFSJ7RaWLA0tKvr2A45r6aWAp8wtnm0zC+jb+/s Hifc3c+ne138DrQ21R+0ZQnjb4uZ7frYaRQhbgbPe3t2irbQc69K6A0lVNftHbzAxpuz AKhHCT2PXCqOLMOwpgKLly+/u2HyUHOBBdSX/zxuBl73UjIEOo+rWr+gS0mBRhAZrzod AfOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d37si4633201plb.735.2018.01.05.15.21.20; Fri, 05 Jan 2018 15:21:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753281AbeAEXVG (ORCPT + 28 others); Fri, 5 Jan 2018 18:21:06 -0500 Received: from mail-ot0-f196.google.com ([74.125.82.196]:36047 "EHLO mail-ot0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753051AbeAEXVD (ORCPT ); Fri, 5 Jan 2018 18:21:03 -0500 Received: by mail-ot0-f196.google.com with SMTP id w4so5170751otg.3; Fri, 05 Jan 2018 15:21:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eFw7Rafm/KKKgxUSSjz5WY5Xb9uMe9aEwCKkj8UEw0E=; b=Wj22XRacrB60Fr7kZaIhl3Z4a3Qq4VKHxw20IiFN/wSAlsA0YEMz3RBgDxKSzQlQY2 M5wHp3ftFFNmDN8vcutqqMfAZxBoYVK+75Y6XPsgR7w+npf80hBeWpunvLjZqaQANzaz 2BbYdJOQRiKUxZ/ji+32A9hNvy5VeUDvtjVlzlwBqYKHDzT/483vSfO8BfQYdPdrdcNm YA2xLvpGsQAL0+SWGRibW/nobvASYnIbr9iK6hHSaM2VTCzh5sKv791totGKrx7nFZzo apZPuvmOQtsw7wuReD/0Kdi91RJGNYefYIEiUCuRWUq89i10+VdqcET2EM8S5SmDS3do MqkA== X-Gm-Message-State: AKwxytc5Z0qUHu+2H0LjYi5A3+3Uxj3ffF05+SLRfLuhgJTLQV8S3uyB 0CP1mqBX6jxzI8WwGj3QurVngd0= X-Received: by 10.157.6.79 with SMTP id 73mr2862708otn.329.1515194463058; Fri, 05 Jan 2018 15:21:03 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.21.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:21:02 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH 5/7] nios2: remove arch specific early_init_dt_alloc_memory_arch Date: Fri, 5 Jan 2018 17:20:52 -0600 Message-Id: <20180105232054.27394-6-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the DT core code handles bootmem arches, we can remove the nios2 specific early_init_dt_alloc_memory_arch function. Cc: Ley Foon Tan Cc: nios2-dev@lists.rocketboards.org Signed-off-by: Rob Herring --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/nios2/kernel/prom.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.14.1 diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index 6688576b3a47..8d7446a4b475 100644 --- a/arch/nios2/kernel/prom.c +++ b/arch/nios2/kernel/prom.c @@ -42,11 +42,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return alloc_bootmem_align(size, align); -} - int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { From patchwork Fri Jan 5 23:20:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123566 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1402220qgn; Fri, 5 Jan 2018 15:21:10 -0800 (PST) X-Google-Smtp-Source: ACJfBosw1zCEOtmUz6nCuAW+XADfBhoeYzTcPrTEFLxgPP7s0vhA66GxjppISIejCmPZHy8copcy X-Received: by 10.99.9.67 with SMTP id 64mr2111857pgj.257.1515194470569; Fri, 05 Jan 2018 15:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515194470; cv=none; d=google.com; s=arc-20160816; b=hbTasjoiNjr9j8yN2PkRpinXqxPtlUbGb54vBZ6wOxyp0Q5cZmZX5xVl/B2Dlg3axj AXXQ9+RtbmsdIygtI7NgFT2pQzFqhaJB852kyJvOMJg3ZAuac6nOWVRh7c0Trr1dMRZN G2o+Ekxuolk2J5NaIWI+dYbz/rMSbenKN3R6IszQYwt7l1iM9EKRfowwmtPv2kp/g9vC 0ayHp0v2KIWhHoNU8vZy3JRvo/NmFxV1N0kgcahHgARiDQLZxKdbK757Xsc9ra8lhs8J vjDfpl8Z0kyS4JIVq2l7H9ubiTLEIHhj+nqCIifHjsMVlgJ3V+1zBmAUAWkIUNP8l2Bd dV5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=pMTx9nf8Kxj9iJQGT654zXlb+0A7X8mCeWrjtE9R/EI=; b=pPPCGIz66NGvYHf5Rv5yAijQnI27aLmRzyukWCNO9tQkRaLnAPWCDZgArs1izJQTbP QeSHs9Lyc6rl12+j9OJaxZ8QsisyS3D3lH53Xv/xSt10/nrp4vhGiJ74KZi//XBwS0c3 sDX29wrhYvx5+6tMjw5BZj9W3NKKcMuzWflOjjB0WVSUo/dZ9gDqL78PIasHDfe8+/x7 t1tqyNPY2gAWnzfQUJw3j79PeteXDdkfyRBBpyZezC0ZadNhxpwKrZ0JIHS3EKXl8B4x uwA0f44p6tZRz4LAOKybu+O75a1r7LDDbERbIuilzMcjdNvgnBIkiiLoKG0CW+8w80QO URkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f5si4707866plf.151.2018.01.05.15.21.10; Fri, 05 Jan 2018 15:21:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbeAEXVI (ORCPT + 28 others); Fri, 5 Jan 2018 18:21:08 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:36045 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752612AbeAEXVE (ORCPT ); Fri, 5 Jan 2018 18:21:04 -0500 Received: by mail-ot0-f193.google.com with SMTP id w4so5170770otg.3; Fri, 05 Jan 2018 15:21:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pMTx9nf8Kxj9iJQGT654zXlb+0A7X8mCeWrjtE9R/EI=; b=PiJUQ2YShMyBjHSa7EOkz0vKbD3myKBeVsIxvB4EfH5trvpB/kRc9aHWUW8bGnxcMB ndiaDNgCfTDFvPMCW9756KSq9Ha9nA8befWZXdKb0+B4ya3P2ZK7cv0/d8V+ZrBoKAMl ppaMwhhXKM4zJPjIEiBHdX/S3ixEk+25a5G8sUdq4x98uUpgqarl1eeVM4cxReVVyJog ynv3imT0y0nwwX87WXS7W+7CXrLSLlTxbeACR24rm3c4Opm4FXFMA752RDwnb8kQXPlp 3dOjzhSaxwMGM17XiQTcv/zkuudKKgwZbserYLrYtAi81g/r7IiAaZLCX3T4FDxwpdJQ uxUA== X-Gm-Message-State: AKwxytc/xtRC6R9f1MMAIO0XozKZ9z0txq3uz4HsojdGkCygTI/oXfbi 4IYbHVqSM1cSAXihKlETUQn/wzY= X-Received: by 10.157.22.132 with SMTP id c4mr2969426ote.381.1515194463974; Fri, 05 Jan 2018 15:21:03 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id u1sm1969998otc.3.2018.01.05.15.21.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 15:21:03 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH 6/7] x86: remove arch specific early_init_dt_alloc_memory_arch Date: Fri, 5 Jan 2018 17:20:53 -0600 Message-Id: <20180105232054.27394-7-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180105232054.27394-1-robh@kernel.org> References: <20180105232054.27394-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the DT core code handles bootmem arches, we can remove the x86 specific early_init_dt_alloc_memory_arch function. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Signed-off-by: Rob Herring --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/x86/kernel/devicetree.c | 6 ------ 1 file changed, 6 deletions(-) -- 2.14.1 diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 76e07698e6d1..25de5f6ca997 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -2,7 +2,6 @@ /* * Architecture specific OF callbacks. */ -#include #include #include #include @@ -39,11 +38,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) BUG(); } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); -} - void __init add_dtb(u64 data) { initial_dtb = data + offsetof(struct setup_data, data);