Skip to contentSkip to conversation

of/fdt: Clean up early_init_dt_reserve_memory_arch()

PATCH Applied Peter Collingbourne 2 participants 2 messages Jul 23, 2022 – Jul 25, 2022 Device tree

lore
Share & tools
lore

Peter Collingbourne

author
#0 lore raw

PATCH 1/1 of/fdt: Clean up early_init_dt_reserve_memory_arch()

As of commit 18250b43f7b6 ("of: fdt: Remove early_init_dt_reserve_memory_arch() override capability") this is no longer an arch hook, so rename it to remove the confusing _arch suffix. Also remove some unnecessary indirection from all but one of the callers by calling memblock_reserve() directly instead.

Signed-off-by Peter Collingbourne <[email protected]>
Link https://linux-review.googlesource.com/id/I3362bdd92ae6e47e8f5bac01aa228d32f9d01aad
---
 drivers/of/fdt.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/of/fdt.c +6 -7
index a8f5b6532165..ac43f1788c1b 100644
@@ -477,8 +477,8 @@ void *initial_boot_params __ro_after_init;
 
 static u32 of_fdt_crc32;
 
-static int __init early_init_dt_reserve_memory_arch(phys_addr_t base,
-					phys_addr_t size, bool nomap)
+static int __init early_init_dt_reserve_memory(phys_addr_t base,
+					       phys_addr_t size, bool nomap)
 {
 	if (nomap) {
 		/*

@@ -525,7 +525,7 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
 		size = dt_mem_next_cell(dt_root_size_cells, &prop);
 
 		if (size &&
-		    early_init_dt_reserve_memory_arch(base, size, nomap) == 0) {
+		    early_init_dt_reserve_memory(base, size, nomap) == 0) {
 			pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n",
 				uname, &base, (unsigned long)(size / SZ_1M));
 			if (!nomap)

@@ -644,7 +644,7 @@ void __init early_init_fdt_scan_reserved_mem(void)
 		fdt_get_mem_rsv(initial_boot_params, n, &base, &size);
 		if (!size)
 			break;
-		early_init_dt_reserve_memory_arch(base, size, false);
+		memblock_reserve(base, size);
 	}
 
 	fdt_scan_reserved_mem();

@@ -661,9 +661,8 @@ void __init early_init_fdt_reserve_self(void)
 		return;
 
 	/* Reserve the dtb region */
-	early_init_dt_reserve_memory_arch(__pa(initial_boot_params),
-					  fdt_totalsize(initial_boot_params),
-					  false);
+	memblock_reserve(__pa(initial_boot_params),
+			 fdt_totalsize(initial_boot_params));
 }
 
 /**
Signature · 1 line
2.37.1.359.gd136c6c3e2-goog
maintainer Applied
#1 lore raw
Quoted 6 lines · Peter Collingbourne

As of commit 18250b43f7b6 ("of: fdt: Remove early_init_dt_reserve_memory_arch() override capability") this is no longer an arch hook, so rename it to remove the confusing _arch suffix. Also remove some unnecessary indirection from all but one of the callers by calling memblock_reserve() directly instead.

Quoted 6 lines
Signed-off-by Peter Collingbourne <[email protected]>
Link https://linux-review.googlesource.com/id/I3362bdd92ae6e47e8f5bac01aa228d32f9d01aad
---
 drivers/of/fdt.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Applied, thanks!