DT: consolidate bootmem support

PATCH In review Rob Herring 3 participants 10 messages Jan 5, 2018 – Jan 17, 2018

Subsystems (5)

x86 MIPS Device tree Tensilica Xtensa port (xtensa) +1 more subsystems

lore

Share & tools

lore

Rob Herring

author maintainer

2018-01-05 23:20 UTC #0 lore raw

cover DT: consolidate bootmem support

This series adds support for bootmem to the DT core code and removes the remaining arch specific early_init_dt_alloc_memory_arch implementations.

Compile tested only on arm64, mips, x86, and xtensa.

Rob

Rob Herring (7):
of/fdt: use memblock_virt_alloc for early alloc
cris: remove arch specific early DT functions
metag: remove arch specific early DT functions
mips: remove arch specific early_init_dt_alloc_memory_arch
nios2: remove arch specific early_init_dt_alloc_memory_arch
x86: remove arch specific early_init_dt_alloc_memory_arch
xtensa: remove arch specific early DT functions

 arch/cris/kernel/Makefile     | 19 -------------------
 arch/cris/kernel/devicetree.c | 15 ---------------
 arch/metag/kernel/devtree.c   | 14 --------------
 arch/mips/kernel/prom.c       |  5 -----
 arch/nios2/kernel/prom.c      |  5 -----
 arch/x86/kernel/devicetree.c  |  6 ------
 arch/xtensa/kernel/setup.c    | 12 ------------
 drivers/of/fdt.c              | 16 ++++------------
 drivers/of/unittest.c         | 11 ++++++++---
 include/linux/of_fdt.h        |  1 -
 10 files changed, 12 insertions(+), 92 deletions(-)
 delete mode 100644 arch/cris/kernel/devicetree.c

--
2.14.1

Rob Herring

author maintainer

2018-01-05 23:20 UTC #1 lore raw

PATCH 1/7 of/fdt: use memblock_virt_alloc for early alloc

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 <[email protected]>

Signed-off-by Rob Herring <[email protected]>

---
 drivers/of/fdt.c       | 16 ++++------------
 drivers/of/unittest.c  | 11 ++++++++---
 include/linux/of_fdt.h |  1 -
 3 files changed, 12 insertions(+), 16 deletions(-)

drivers/of/fdt.c +4 ~~-12~~

index 4675e5ac4d11..444e65aa0d29 100644
@@ -14,6 +14,7 @@
 #include <linux/crc32.h>
 #include <linux/kernel.h>
 #include <linux/initrd.h>
+#include <linux/bootmem.h>
 #include <linux/memblock.h>
 #include <linux/mutex.h>
 #include <linux/of.h>

@@ -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)
 {

drivers/of/unittest.c +8 -3

index 0f8052f1355c..7a9abaae874d 100644
@@ -5,6 +5,7 @@
 
 #define pr_fmt(fmt) "### dt-test ### " fmt
 
+#include <linux/bootmem.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/errno.h>

@@ -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;
 }

include/linux/of_fdt.h +0 -1

index 444e6e283828..02c05028d0ba 100644
@@ -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 */

--
2.14.1

Rob Herring

author maintainer

2018-01-05 23:20 UTC #2 lore raw

PATCH 2/7 cris: remove arch specific early DT functions

In reply to Rob Herring

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 <[email protected]>

Cc Jesper Nilsson <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
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

arch/cris/kernel/Makefile +0 ~~-19~~

index af075a5fb9aa..e69de29bb2d1 100644
@@ -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:
-

arch/cris/kernel/devicetree.c deleted +0 ~~-15~~

deleted file mode 100644
index 36e1c658229f..000000000000
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/printk.h>
-
-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);
-}

--
2.14.1

Rob Herring

author maintainer

2018-01-05 23:20 UTC #3 lore raw

PATCH 3/7 metag: remove arch specific early DT functions

In reply to Rob Herring

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 <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
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(-)

arch/metag/kernel/devtree.c +0 ~~-14~~

index 18dd7aea9fdc..6af749a64438 100644
@@ -14,26 +14,12 @@
 #include <linux/init.h>
 #include <linux/export.h>
 #include <linux/types.h>
-#include <linux/bootmem.h>
-#include <linux/memblock.h>
-#include <linux/of.h>
 #include <linux/of_fdt.h>
 
 #include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/mach/arch.h>
 
-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;

--
2.14.1

Rob Herring

author maintainer

2018-01-05 23:20 UTC #4 lore raw

PATCH 4/7 mips: remove arch specific early_init_dt_alloc_memory_arch

In reply to Rob Herring

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 <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
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(-)

arch/mips/kernel/prom.c +0 -5

index 0dbcd152a1a9..89950b7bf536 100644
@@ -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)
 {

--
2.14.1

Rob Herring

author maintainer

2018-01-05 23:20 UTC #5 lore raw

PATCH 5/7 nios2: remove arch specific early_init_dt_alloc_memory_arch

In reply to Rob Herring

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 <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
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(-)

arch/nios2/kernel/prom.c +0 -5

index 6688576b3a47..8d7446a4b475 100644
@@ -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)
 {

--
2.14.1

Tobias Klauser

Reviewed-by on v1 5/7

2018-01-17 11:00 UTC #6 lore raw

Re: [PATCH 5/7] nios2: remove arch specific early_init_dt_alloc_memory_arch

Quoted 6 lines · Rob Herring

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 <[email protected]>
Cc nios2-dev-g9ZBwUv/Ih/[email protected]
Signed-off-by Rob Herring <[email protected]>

Reviewed-by Tobias Klauser <[email protected]>

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Rob Herring

author maintainer

2018-01-05 23:20 UTC #7 lore raw

PATCH 6/7 x86: remove arch specific early_init_dt_alloc_memory_arch

In reply to Rob Herring

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 <[email protected]>

Cc Ingo Molnar <[email protected]>

Cc "H. Peter Anvin" <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
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(-)

arch/x86/kernel/devicetree.c +0 -6

index 76e07698e6d1..25de5f6ca997 100644
@@ -2,7 +2,6 @@
 /*
  * Architecture specific OF callbacks.
  */
-#include <linux/bootmem.h>
 #include <linux/export.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>

@@ -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);

--
2.14.1

Rob Herring

author maintainer

2018-01-05 23:20 UTC #8 lore raw

PATCH 7/7 xtensa: remove arch specific early DT functions

In reply to Rob Herring

Now that the DT core code handles bootmem arches, we can remove the xtensa specific early_init_dt_alloc_memory_arch function. The common early_init_dt_add_memory_arch can be used too now that xtensa switched to memblock.

Cc Chris Zankel <[email protected]>

Cc Max Filippov <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1.

 arch/xtensa/kernel/setup.c | 12 ------------
 1 file changed, 12 deletions(-)

arch/xtensa/kernel/setup.c +0 ~~-12~~

index 08175df7a69e..82bd1a94157c 100644
@@ -20,7 +20,6 @@
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
 #include <linux/screen_info.h>
-#include <linux/bootmem.h>
 #include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/cpu.h>

@@ -218,17 +217,6 @@ static int __init xtensa_dt_io_area(unsigned long node, const char *uname,
 }
 #endif
 
-void __init early_init_dt_add_memory_arch(u64 base, u64 size)
-{
-	size &= PAGE_MASK;
-	memblock_add(base, size);
-}
-
-void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-{
-	return __alloc_bootmem(size, align, 0);
-}
-
 void __init early_init_devtree(void *params)
 {
 	early_init_dt_scan(params);

--
2.14.1

Max Filippov

maintainer Acked-by on v1 7/7

2018-01-15 09:13 UTC #9 lore raw

Re: [PATCH 7/7] xtensa: remove arch specific early DT functions

Hi Rob,

Quoted 9 lines · Rob Herring

Now that the DT core code handles bootmem arches, we can remove the xtensa specific early_init_dt_alloc_memory_arch function. The common early_init_dt_add_memory_arch can be used too now that xtensa switched to memblock.
Cc Chris Zankel <[email protected]>
Cc Max Filippov <[email protected]>
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>

Quoted 6 lines

---
This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1.
 arch/xtensa/kernel/setup.c | 12 ------------
 1 file changed, 12 deletions(-)

Acked-by Max Filippov <[email protected]>

Signature · 2 lines

Thanks.
-- Max