powerpc: kexec: Use of_property_read_reg()
PATCH 1/1 powerpc: kexec: Use of_property_read_reg()
Replace open-coded parsing of "reg" property withof_property_read_reg().
Signed-off-by Rob Herring (Arm) <[email protected]>
--- arch/powerpc/kexec/file_load_64.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)
arch/powerpc/kexec/file_load_64.c +10 -21
@@ -18,6 +18,7 @@#include <linux/of_fdt.h> #include <linux/libfdt.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/memblock.h> #include <linux/slab.h> #include <linux/vmalloc.h>
@@ -376,10 +377,9 @@ static int kdump_setup_usable_lmb(struct drmem_lmb *lmb, const __be32 **usm,static int add_usable_mem_property (void *fdt,struct device_node *dn,struct umem_info *um_info) { -int n_mem_addr_cells, n_mem_size_cells, node; +int node;char path[NODE_PATH_LEN ]; -int i, len, ranges, ret; -const __be32 *prop; +int i, ret;u64 base, end;of_node_get (dn);
@@ -399,40 +399,29 @@ static int add_usable_mem_property(void *fdt, struct device_node *dn, goto out; } -/* Get the address & size cells */ - n_mem_addr_cells =of_n_addr_cells (dn); - n_mem_size_cells =of_n_size_cells (dn); -kexec_dprintk ("address cells: %d, size cells: %d\n" , n_mem_addr_cells, - n_mem_size_cells); - um_info->idx =0 ;if (!check_realloc_usable_mem (um_info,2 )) { ret = -ENOMEM ; goto out; } - prop =of_get_property (dn,"reg" , &len); -if (!prop || len <=0 ) { - ret =0 ; - goto out; - } -/* * "reg" property represents sequence of (addr,size) tuples * each representing a memory range. */ - ranges = (len >>2 ) / (n_mem_addr_cells + n_mem_size_cells); +for (i =0 ; ; i++) { + ret =of_property_read_reg (dn, i, &base, &end); +if (ret) +break ; -for (i =0 ; i < ranges; i++) { - base =of_read_number (prop, n_mem_addr_cells); - prop += n_mem_addr_cells; - end = base +of_read_number (prop, n_mem_size_cells) -1 ; - prop += n_mem_size_cells; + end += base -1 ; ret =add_usable_mem (um_info, base, end);if (ret) goto out; } +if (!i) + goto out;/* * No kdump kernel usable memory found in this memory node.
Signature · 1 line
2.43.0
Michael Ellerman
AppliedQuoted 4 lines · Rob Herring (Arm)
Replace open-coded parsing of "reg" property with
of_property_read_reg().
Applied to powerpc/next.
[1/1] powerpc: kexec: Use of_property_read_reg()
https://git.kernel.org/powerpc/c/cf08b628cd146a3cb597999f4d4dc590068bf011
cheers