Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

EDAC, altera: Simplify calculation of total memory

Use of_address_to_resource() and resource_size() instead of manually
parsing the "reg" property from the "memory" node(s).

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Tested-by: Thor Thayer <thor.thayer@linux.intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20170606235500.22772-3-chris.packham@alliedtelesis.co.nz
Signed-off-by: Borislav Petkov <bp@suse.de>

authored by

Chris Packham and committed by
Borislav Petkov
ff0abed4 133e4455

+7 -15
+7 -15
drivers/edac/altera_edac.c
··· 214 214 static unsigned long get_total_mem(void) 215 215 { 216 216 struct device_node *np = NULL; 217 - const unsigned int *reg, *reg_end; 218 - int len, sw, aw; 219 - unsigned long start, size, total_mem = 0; 217 + struct resource res; 218 + int ret; 219 + unsigned long total_mem = 0; 220 220 221 221 for_each_node_by_type(np, "memory") { 222 - aw = of_n_addr_cells(np); 223 - sw = of_n_size_cells(np); 224 - reg = (const unsigned int *)of_get_property(np, "reg", &len); 225 - reg_end = reg + (len / sizeof(u32)); 222 + ret = of_address_to_resource(np, 0, &res); 223 + if (ret) 224 + continue; 226 225 227 - total_mem = 0; 228 - do { 229 - start = of_read_number(reg, aw); 230 - reg += aw; 231 - size = of_read_number(reg, sw); 232 - reg += sw; 233 - total_mem += size; 234 - } while (reg < reg_end); 226 + total_mem += resource_size(&res); 235 227 } 236 228 edac_dbg(0, "total_mem 0x%lx\n", total_mem); 237 229 return total_mem;